From 55ccd8ea8efce815032b1112e4a9544242497ecb Mon Sep 17 00:00:00 2001 From: LandaMm Date: Tue, 20 May 2025 18:45:45 +0200 Subject: [PATCH] feat: serve frontend --- cmd/hspguard/api/api.go | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/cmd/hspguard/api/api.go b/cmd/hspguard/api/api.go index 813f545..1b9116a 100644 --- a/cmd/hspguard/api/api.go +++ b/cmd/hspguard/api/api.go @@ -5,7 +5,6 @@ import ( "log" "net/http" "os" - "path/filepath" "gitea.local/admin/hspguard/internal/auth" imiddleware "gitea.local/admin/hspguard/internal/middleware" @@ -31,18 +30,27 @@ func (s *APIServer) Run() error { router := chi.NewRouter() router.Use(middleware.Logger) - workDir, _ := os.Getwd() - staticDir := http.Dir(filepath.Join(workDir, "static")) - FileServer(router, "/static", staticDir) + // workDir, _ := os.Getwd() + // staticDir := http.Dir(filepath.Join(workDir, "static")) + // FileServer(router, "/static", staticDir) router.Route("/api/v1", func(r chi.Router) { r.Use(imiddleware.WithSkipper(imiddleware.AuthMiddleware, "/api/v1/login", "/api/v1/register")) userHandler := user.NewUserHandler(s.repo) - userHandler.RegisterRoutes(router, r) + userHandler.RegisterRoutes(r) authHandler := auth.NewAuthHandler(s.repo) - authHandler.RegisterRoutes(router, r) + authHandler.RegisterRoutes(r) + }) + + router.Get("/*", func(w http.ResponseWriter, r *http.Request) { + path := "./dist" + r.URL.Path + if _, err := os.Stat(path); os.IsNotExist(err) { + http.ServeFile(w, r, "./dist/index.html") + return + } + http.FileServer(http.Dir("./dist")).ServeHTTP(w, r) }) // Handle unknown routes