implement proper sever route handling

pkg/web/server/routes.go

@@ -6,22 +6,18 @@ import (
 	"strings"
 	"time"
 
+	"github.com/LazyBachelor/LazyPM/pkg/web/handler"
 	"github.com/NYTimes/gziphandler"
 	"github.com/rs/cors"
 )
 
-type Route struct {
-	Pattern  string
-	Handeler http.Handler
-}
-
-func (s *Server) RegisterRoutes(assets embed.FS, routes []Route) http.Handler {
+func (s *Server) RegisterRoutes(assets embed.FS) http.Handler {
 	mux := http.NewServeMux()
 
 	s.handleAssets(mux, assets)
 
-	for _, route := range routes {
-		mux.Handle(route.Pattern, route.Handeler)
+	for _, route := range handler.GetRoutes(s.Services) {
+		mux.Handle(route.Pattern, route.Handler)
 	}
 
 	handler := cors.Default().Handler(mux)

pkg/web/server/server.go

@@ -1,16 +1,16 @@
 package server
 
 import (
-	"github.com/LazyBachelor/LazyPM/internal/service"
 	"embed"
 	"net/http"
 	"time"
+
+	"github.com/LazyBachelor/LazyPM/internal/service"
 )
 
 type Server struct {
 	Address  string
 	Assets   embed.FS
-	Routes   []Route
 	Services *service.Services
 }
 
@@ -20,9 +20,11 @@ func NewServer(props Server) *http.Server {
 		props.Address = "localhost:8080"
 	}
 
+	handler := props.RegisterRoutes(props.Assets)
+
 	return &http.Server{
 		Addr:         props.Address,
-		Handler:      props.RegisterRoutes(props.Assets, props.Routes),
+		Handler:      handler,
 		IdleTimeout:  time.Minute,
 		ReadTimeout:  time.Second * 10,
 		WriteTimeout: time.Second * 10,