added routes package and serve in server package

backend/internal/category/GetAllCategories.go

@@ -1,41 +0,0 @@
-package category
-
-import "backend/model"
-
-func GetAllCategories() ([]model.Category, error) {
-	return []model.Category{
-		{
-			Title: "Electronics",
-			Icon:  "😀",
-			Type:  "expense",
-		},
-		{
-			Title: "Clothing",
-			Icon:  "😁",
-			Type:  "expense",
-		},
-		{
-			Title: "Books",
-			Icon:  "😂",
-			Subcategories: []model.Subcategory{
-				{
-					Title: "Fiction",
-				},
-				{
-					Title: "Non-Fiction",
-				},
-			},
-			Type: "expense",
-		},
-		{
-			Title: "Salary",
-			Icon:  "😀",
-			Type:  "income",
-		},
-		{
-			Title: "asdf",
-			Icon:  "😀",
-			Type:  "income",
-		},
-	}, nil
-}

backend/main.go

@@ -2,33 +2,12 @@ package main
 
 import (
 	"backend/server"
-	"log"
-	"os"
-	"strconv"
 
 	"github.com/gofiber/fiber/v2"
 )
 
 func main() {
 	app := fiber.New()
-
 	server.Configure(app)
-
+	server.Serve(app)
-	enableTls, err := strconv.ParseBool(os.Getenv("ENABLE_TLS"))
-	if err != nil {
-		log.Fatalf("error read tls configuration, %v", err)
-	}
-	if enableTls {
-		log.Fatal(
-			app.ListenTLS(
-				os.Getenv("HTTP_ADDRESS"),
-				os.Getenv("CERT_FILE"),
-				os.Getenv("KEY_FILE"),
-			),
-		)
-	} else {
-		log.Fatal(
-			app.Listen(os.Getenv("HTTP_ADDRESS")),
-		)
-	}
 }

backend/routes/CategoryRoutes.go

@@ -0,0 +1,13 @@
+package routes
+
+import (
+	"backend/api"
+
+	"github.com/gofiber/fiber/v2"
+)
+
+func CategoryRoutes(group fiber.Router) {
+	categoryGroup := group.Group("/category")
+	categoryGroup.Get("/", api.GetAllCategories)
+	categoryGroup.Post("/", api.CreateCategory)
+}

backend/routes/OperationRoutes.go

@@ -0,0 +1,12 @@
+package routes
+
+import (
+	"backend/api"
+
+	"github.com/gofiber/fiber/v2"
+)
+
+func OperationRoutes(group fiber.Router) {
+	operationGroup := group.Group("/operation")
+	operationGroup.Get("/", api.GetAllOperation)
+}

backend/routes/UsersRoutes.go

@@ -0,0 +1,13 @@
+package routes
+
+import (
+	"backend/api"
+
+	"github.com/gofiber/fiber/v2"
+)
+
+func UsersRoutes(group fiber.Router) {
+	usersGroup := group.Group("/users")
+	usersGroup.Get("/", api.GetAllUsers)
+	usersGroup.Get("/user", api.GetUserData)
+}

backend/server/InitMiddlewares.go

@@ -12,9 +12,9 @@ func InitMiddlewares(app *fiber.App) {
 	app.Use(
 		cors.New(
 			cors.Config{
-				AllowOrigins:     "https://localhost:3000,https://localhost:43243",
+				AllowOrigins:     "*",
 				AllowHeaders:     "*",
-				AllowCredentials: true,
+				AllowCredentials: false,
 			},
 		),
 		jwtware.New(

backend/server/configure.go

@@ -3,6 +3,7 @@ package server
 import (
 	"backend/api"
 	"backend/database"
+	"backend/routes"
 	"backend/utils"
 
 	"github.com/gofiber/fiber/v2"
@@ -13,21 +14,12 @@ func Configure(app *fiber.App) {
 	utils.LoadEnv("wallet.conf")
 	database.InitDatabase()
 	log.SetLevel(log.LevelDebug)
-
 	app.Static("/", "../frontend/build")
 	apiGroup := app.Group("/api")
-
 	apiGroup.Post("/token", api.Login)
 	InitMiddlewares(app)
 
-	usersGroup := apiGroup.Group("/users")
+	routes.UsersRoutes(apiGroup)
-	usersGroup.Get("/", api.GetAllUsers)
+	routes.OperationRoutes(apiGroup)
-	usersGroup.Get("/user", api.GetUserData)
+	routes.CategoryRoutes(apiGroup)
-
-	operationGroup := apiGroup.Group("/operation")
-	operationGroup.Get("/", api.GetAllOperation)
-
-	categoryGroup := apiGroup.Group("/category")
-	categoryGroup.Get("/", api.GetAllCategories)
-	categoryGroup.Post("/", api.CreateCategory)
 }

backend/server/serve.go

@@ -0,0 +1,29 @@
+package server
+
+import (
+	"log"
+	"os"
+	"strconv"
+
+	"github.com/gofiber/fiber/v2"
+)
+
+func Serve(app *fiber.App) {
+	enableTls, err := strconv.ParseBool(os.Getenv("ENABLE_TLS"))
+	if err != nil {
+		log.Fatalf("error read tls configuration, %v", err)
+	}
+	if enableTls {
+		log.Fatal(
+			app.ListenTLS(
+				os.Getenv("HTTP_ADDRESS"),
+				os.Getenv("CERT_FILE"),
+				os.Getenv("KEY_FILE"),
+			),
+		)
+	} else {
+		log.Fatal(
+			app.Listen(os.Getenv("HTTP_ADDRESS")),
+		)
+	}
+}