feat: Update Makefile and server configuration; improve CORS settings and static file serving

Author: dev-bre

Makefile

@@ -11,9 +11,9 @@ build:
 
 # Run the application
 run:
-	@go run cmd/api/main.go &
-	@npm install --prefer-offline --no-fund --prefix ./frontend
-	@npm run dev --prefix ./frontend
+	@go run cmd/api/main.go 
+# @npm install --prefer-offline --no-fund --prefix ./frontend
+# @npm run dev --prefix ./frontend
 # Create DB container
 docker-run:
 	@if docker compose up --build 2>/dev/null; then \

cmd/api/main.go

@@ -9,9 +9,6 @@ import (
 	"syscall"
 	"time"
 	"trakrlog/internal/server"
-
-	"github.com/gin-contrib/static"
-	"github.com/gin-gonic/gin"
 )
 
 func gracefulShutdown(apiServer *http.Server, done chan bool) {
@@ -52,23 +49,13 @@ func main() {
 	// store.Options.Secure = false                  // set to true in production (HTTPS)
 	// store.Options.SameSite = http.SameSiteLaxMode // helps prevent CSRF
 
-	// Serve static files
-	var router = server.Handler.(*gin.Engine)
-	router.Use(static.Serve("/", static.LocalFile("../apps/frontend/dist", true)))
-
-	// Serve React app for client-side routes (SPA fallback) - only for non-dashboard routes
-	router.NoRoute(func(c *gin.Context) {
-		c.File("../apps/frontend/dist/index.html")
-	})
-
 	// Create a done channel to signal when the shutdown is complete
 	done := make(chan bool, 1)
 
 	// Run graceful shutdown in a separate goroutine
 	go gracefulShutdown(server, done)
 
 	// Start the server
-	log.Println("Starting server on localhost:4000")
 	err := server.ListenAndServe()
 	if err != nil && err != http.ErrServerClosed {
 		panic(fmt.Sprintf("http server error: %s", err))

internal/server/routes.go

@@ -4,33 +4,34 @@ import (
 	"net/http"
 
 	"github.com/gin-contrib/cors"
+	"github.com/gin-contrib/static"
 	"github.com/gin-gonic/gin"
 )
 
 func (s *Server) RegisterRouter() http.Handler {
 	router := gin.Default()
 
 	router.Use(cors.New(cors.Config{
-		AllowOrigins:     []string{"http://localhost:5173"}, // Add your frontend URL
+		AllowOrigins:     []string{"http://localhost:4000", "https://trakrlog.com", "https://www.trakrlog.com"}, // Add your frontend URL
 		AllowMethods:     []string{"GET", "POST", "PUT", "DELETE", "OPTIONS", "PATCH"},
 		AllowHeaders:     []string{"Accept", "Authorization", "Content-Type"},
 		AllowCredentials: true, // Enable cookies/auth
 	}))
 
-	router.GET("/", s.HelloWorldHandler)
+	// Serve static files from the React app build directory
+	router.Use(static.Serve("/", static.LocalFile("frontend/dist", true)))
 
-	router.GET("/health", s.healthHandler)
+	// Serve React app for client-side routes (SPA fallback) - only for non-dashboard routes
+	router.NoRoute(func(c *gin.Context) {
+		c.File("frontend/dist/index.html")
+	})
 
 	return router
 }
 
-func (s *Server) HelloWorldHandler(c *gin.Context) {
-	resp := make(map[string]string)
-	resp["message"] = "Hello World"
+// func (s *Server) HelloWorldHandler(c *gin.Context) {
+// 	resp := make(map[string]string)
+// 	resp["message"] = "Hello World"
 
-	c.JSON(http.StatusOK, resp)
-}
-
-func (s *Server) healthHandler(c *gin.Context) {
-	c.JSON(http.StatusOK, s.db.Health())
-}
+// 	c.JSON(http.StatusOK, resp)
+// }

internal/server/routes_test.go

@@ -1,32 +1,25 @@
 package server
 
-import (
-	"github.com/gin-gonic/gin"
-	"net/http"
-	"net/http/httptest"
-	"testing"
-)
-
-func TestHelloWorldHandler(t *testing.T) {
-	s := &Server{}
-	r := gin.New()
-	r.GET("/", s.HelloWorldHandler)
-	// Create a test HTTP request
-	req, err := http.NewRequest("GET", "/", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	// Create a ResponseRecorder to record the response
-	rr := httptest.NewRecorder()
-	// Serve the HTTP request
-	r.ServeHTTP(rr, req)
-	// Check the status code
-	if status := rr.Code; status != http.StatusOK {
-		t.Errorf("Handler returned wrong status code: got %v want %v", status, http.StatusOK)
-	}
-	// Check the response body
-	expected := "{\"message\":\"Hello World\"}"
-	if rr.Body.String() != expected {
-		t.Errorf("Handler returned unexpected body: got %v want %v", rr.Body.String(), expected)
-	}
-}
+// func TestHelloWorldHandler(t *testing.T) {
+// 	s := &Server{}
+// 	r := gin.New()
+// 	r.GET("/", s.HelloWorldHandler)
+// 	// Create a test HTTP request
+// 	req, err := http.NewRequest("GET", "/", nil)
+// 	if err != nil {
+// 		t.Fatal(err)
+// 	}
+// 	// Create a ResponseRecorder to record the response
+// 	rr := httptest.NewRecorder()
+// 	// Serve the HTTP request
+// 	r.ServeHTTP(rr, req)
+// 	// Check the status code
+// 	if status := rr.Code; status != http.StatusOK {
+// 		t.Errorf("Handler returned wrong status code: got %v want %v", status, http.StatusOK)
+// 	}
+// 	// Check the response body
+// 	expected := "{\"message\":\"Hello World\"}"
+// 	if rr.Body.String() != expected {
+// 		t.Errorf("Handler returned unexpected body: got %v want %v", rr.Body.String(), expected)
+// 	}
+// }

internal/server/server.go

@@ -2,10 +2,13 @@ package server
 
 import (
 	"fmt"
+	"log"
 	"net/http"
+	"os"
+	"strconv"
 	"time"
 
-	_ "github.com/joho/godotenv/autoload"
+	"github.com/joho/godotenv"
 
 	"trakrlog/internal/database"
 )
@@ -17,7 +20,13 @@ type Server struct {
 }
 
 func NewServer() *http.Server {
-	port := 4000 // strconv.Atoi(os.Getenv("PORT"))
+	// Load .env file explicitly
+	if err := godotenv.Load(); err != nil {
+		log.Println("Warning: .env file not found, using system environment variables")
+		//panic(err)
+	}
+
+	port, _ := strconv.Atoi(os.Getenv("PORT"))
 	fmt.Printf("Starting server on port %d\n", port)
 	NewServer := &Server{
 		port: port,