feat: bundle frontend with API executable

backend/main.go

@@ -2,13 +2,18 @@ package main
 
 import (
 	"context"
+	"fmt"
 	"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"
 
+	"github.com/go-chi/chi/v5"
+	"github.com/go-chi/chi/v5/middleware"
 	_ "github.com/joho/godotenv/autoload"
 )
 
@@ -23,11 +28,14 @@ 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, s.Router)
+		e <- http.ListenAndServe(port, r)
 	}()
 
 	ctx, stop := signal.NotifyContext(context.Background(), os.Interrupt)
@@ -44,3 +52,44 @@ func main() {
 		log.Fatalf("Error running server: %v", err)
 	}
 }
+
+func setupFrontend(r chi.Router, s *server.Server) {
+	r.Use(middleware.Recoverer)
+
+	r.Get("/@{user}", a)
+	r.Get("/@{user}/{member}", a)
+
+	r.Mount("/api", s.Router)
+
+	r.NotFound(func(w http.ResponseWriter, r *http.Request) {
+		var (
+			data []byte
+			err  error
+		)
+
+		if strings.HasSuffix(r.URL.Path, ".js") {
+			data, err = frontend.Data.ReadFile("dist" + r.URL.Path)
+			w.Header().Add("content-type", "application/javascript")
+		} else if strings.HasSuffix(r.URL.Path, ".css") {
+			data, err = frontend.Data.ReadFile("dist" + r.URL.Path)
+			w.Header().Add("content-type", "text/css")
+		} else if strings.HasSuffix(r.URL.Path, ".map") {
+			data, err = frontend.Data.ReadFile("dist" + r.URL.Path)
+		} else {
+			data, err = frontend.Data.ReadFile("dist/index.html")
+			w.Header().Add("content-type", "text/html")
+		}
+		if err != nil {
+			panic(err)
+		}
+
+		w.Write(data)
+	})
+}
+
+func a(w http.ResponseWriter, r *http.Request) {
+	user := chi.URLParam(r, "user")
+	member := chi.URLParam(r, "member")
+
+	fmt.Fprintf(w, "user: %v, member: %v", user, member)
+}

backend/routes/auth/discord.go

@@ -1,7 +1,6 @@
 package auth
 
 import (
-	"fmt"
 	"net/http"
 	"os"
 
@@ -85,13 +84,13 @@ func (s *Server) discordCallback(w http.ResponseWriter, r *http.Request) error {
 			return err
 		}
 
-		fmt.Println(token)
-
 		render.JSON(w, r, discordCallbackResponse{
 			HasAccount: true,
 			Token:      token,
 			User:       &u,
 		})
+		return nil
+
 	} else if err != db.ErrUserNotFound { // internal error
 		return err
 	}