From b9c30379ee91369d274660bc70ffc13e2fb8ca6f Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 11 Jul 2022 22:35:20 +0200 Subject: [PATCH] don't serve frontend from api server anymore --- .gitignore | 35 ++++++++------------------------- backend/main.go | 51 +------------------------------------------------ 2 files changed, 9 insertions(+), 77 deletions(-) diff --git a/.gitignore b/.gitignore index ee52162..20a948a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,28 +1,9 @@ -.env - -# Logs -logs -*.log -npm-debug.log* -yarn-debug.log* -yarn-error.log* -pnpm-debug.log* -lerna-debug.log* - +.vscode node_modules -frontend/dist/* -dist-ssr -!frontend/dist/.empty -*.local -frontend/style.css - -# Editor directories and files -.vscode/* -!.vscode/extensions.json -.idea -.DS_Store -*.suo -*.ntvs* -*.njsproj -*.sln -*.sw? +*.log* +.nuxt +.nitro +.cache +.output +.env +dist diff --git a/backend/main.go b/backend/main.go index 7403748..7d4c64c 100644 --- a/backend/main.go +++ b/backend/main.go @@ -2,19 +2,13 @@ package main import ( "context" - "io/fs" "net/http" "os" "os/signal" - "strings" "codeberg.org/u1f320/pronouns.cc/backend/log" "codeberg.org/u1f320/pronouns.cc/backend/server" - "codeberg.org/u1f320/pronouns.cc/frontend" - "emperror.dev/errors" - "github.com/go-chi/chi/v5" - "github.com/go-chi/chi/v5/middleware" _ "github.com/joho/godotenv/autoload" ) @@ -29,14 +23,11 @@ func main() { // mount api routes mountRoutes(s) - r := chi.NewMux() - setupFrontend(r, s) - e := make(chan error) // run server in another goroutine (for gracefully shutting down, see below) go func() { - e <- http.ListenAndServe(port, r) + e <- http.ListenAndServe(port, s.Router) }() ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt) @@ -53,43 +44,3 @@ func main() { log.Fatalf("Error running server: %v", err) } } - -func setupFrontend(r chi.Router, s *server.Server) { - r.Use(middleware.Recoverer) - - r.Get("/@{user}", nil) - r.Get("/@{user}/{member}", nil) - - r.Mount("/api", s.Router) - - r.NotFound(func(w http.ResponseWriter, r *http.Request) { - data, err := frontend.Data.ReadFile("dist" + r.URL.Path) - if err != nil { - if errors.Is(err, fs.ErrNotExist) { - data, err = frontend.Data.ReadFile("dist/index.html") - if err != nil && !errors.Is(err, fs.ErrNotExist) { - log.Errorf("serving frontend file: %v", err) - http.Error(w, "Internal server error", http.StatusInternalServerError) - return - } - - http.Error(w, "Not found", http.StatusNotFound) - return - } - - log.Errorf("serving frontend file: %v", err) - http.Error(w, "Internal server error", http.StatusInternalServerError) - return - } - - if strings.HasSuffix(r.URL.Path, ".js") { - w.Header().Add("content-type", "application/javascript") - } else if strings.HasSuffix(r.URL.Path, ".css") { - w.Header().Add("content-type", "text/css") - } else { - w.Header().Add("content-type", "text/html") - } - - w.Write(data) - }) -}