diff --git a/app/app.go b/app/app.go index 9ef02ed..175ba96 100644 --- a/app/app.go +++ b/app/app.go @@ -14,8 +14,8 @@ import ( "forge.capytal.company/capytalcode/project-comicverse/configs" "forge.capytal.company/capytalcode/project-comicverse/handlers/pages" devPages "forge.capytal.company/capytalcode/project-comicverse/handlers/pages/dev" - "forge.capytal.company/capytalcode/project-comicverse/router" - "forge.capytal.company/capytalcode/project-comicverse/router/middleware" + "forge.capytal.company/capytalcode/project-comicverse/lib/middleware" + "forge.capytal.company/capytalcode/project-comicverse/lib/router" ) type App struct { diff --git a/handlers/pages/dashboard.templ b/handlers/pages/dashboard.templ index 4ab71ca..f6f0906 100644 --- a/handlers/pages/dashboard.templ +++ b/handlers/pages/dashboard.templ @@ -5,9 +5,9 @@ import ( "errors" "log" - "forge.capytal.company/capytalcode/project-comicverse/router/rerrors" + "forge.capytal.company/capytalcode/project-comicverse/lib/router/rerrors" + "forge.capytal.company/capytalcode/project-comicverse/lib/cookies" "forge.capytal.company/capytalcode/project-comicverse/templates/layouts" - "forge.capytal.company/capytalcode/project-comicverse/router/cookies" ) type Dashboard struct{} diff --git a/handlers/pages/dev/colors.templ b/handlers/pages/dev/colors.templ index 62d5d57..9d183ff 100644 --- a/handlers/pages/dev/colors.templ +++ b/handlers/pages/dev/colors.templ @@ -5,7 +5,7 @@ import ( "fmt" "strings" - "forge.capytal.company/capytalcode/project-comicverse/router/rerrors" + "forge.capytal.company/capytalcode/project-comicverse/lib/router/rerrors" "forge.capytal.company/capytalcode/project-comicverse/templates/layouts" ) diff --git a/handlers/pages/dev/routes.go b/handlers/pages/dev/routes.go index 5f0d22f..6789724 100644 --- a/handlers/pages/dev/routes.go +++ b/handlers/pages/dev/routes.go @@ -3,7 +3,7 @@ package dev import ( "net/http" - "forge.capytal.company/capytalcode/project-comicverse/router" + "forge.capytal.company/capytalcode/project-comicverse/lib/router" ) func Routes() router.Router { diff --git a/handlers/pages/error.templ b/handlers/pages/error.templ index 6de0560..7b1a86a 100644 --- a/handlers/pages/error.templ +++ b/handlers/pages/error.templ @@ -3,7 +3,7 @@ package pages import ( "fmt" - "forge.capytal.company/capytalcode/project-comicverse/router/rerrors" + "forge.capytal.company/capytalcode/project-comicverse/lib/router/rerrors" "forge.capytal.company/capytalcode/project-comicverse/templates/layouts" ) diff --git a/handlers/pages/routes.go b/handlers/pages/routes.go index 7dbed57..b09bcd1 100644 --- a/handlers/pages/routes.go +++ b/handlers/pages/routes.go @@ -4,8 +4,8 @@ import ( "log/slog" "net/http" - "forge.capytal.company/capytalcode/project-comicverse/router" - "forge.capytal.company/capytalcode/project-comicverse/router/rerrors" + "forge.capytal.company/capytalcode/project-comicverse/lib/router" + "forge.capytal.company/capytalcode/project-comicverse/lib/router/rerrors" ) func Routes(logger *slog.Logger) router.Router { @@ -20,7 +20,6 @@ func Routes(logger *slog.Logger) router.Router { if r.URL.Path != "/" { rerrors.NotFound().ServeHTTP(w, r) } - }) return r diff --git a/router/cookies/cookies.go b/lib/cookies/cookies.go similarity index 100% rename from router/cookies/cookies.go rename to lib/cookies/cookies.go diff --git a/router/middleware/cache.go b/lib/middleware/cache.go similarity index 100% rename from router/middleware/cache.go rename to lib/middleware/cache.go diff --git a/router/middleware/dev.go b/lib/middleware/dev.go similarity index 100% rename from router/middleware/dev.go rename to lib/middleware/dev.go diff --git a/router/middleware/middleware.go b/lib/middleware/middleware.go similarity index 100% rename from router/middleware/middleware.go rename to lib/middleware/middleware.go diff --git a/router/default.go b/lib/router/default.go similarity index 85% rename from router/default.go rename to lib/router/default.go index 065d0c1..1cb9c54 100644 --- a/router/default.go +++ b/lib/router/default.go @@ -3,7 +3,7 @@ package router import ( "net/http" - "forge.capytal.company/capytalcode/project-comicverse/router/middleware" + "forge.capytal.company/capytalcode/project-comicverse/lib/middleware" ) var DefaultRouter = NewRouter() diff --git a/router/rerrors/400s.go b/lib/router/rerrors/400s.go similarity index 100% rename from router/rerrors/400s.go rename to lib/router/rerrors/400s.go diff --git a/router/rerrors/500s.go b/lib/router/rerrors/500s.go similarity index 100% rename from router/rerrors/500s.go rename to lib/router/rerrors/500s.go diff --git a/router/rerrors/errors.go b/lib/router/rerrors/errors.go similarity index 100% rename from router/rerrors/errors.go rename to lib/router/rerrors/errors.go diff --git a/router/router.go b/lib/router/router.go similarity index 95% rename from router/router.go rename to lib/router/router.go index 36a43d6..cc02f2f 100644 --- a/router/router.go +++ b/lib/router/router.go @@ -4,7 +4,7 @@ import ( "net/http" "path" - "forge.capytal.company/capytalcode/project-comicverse/router/middleware" + "forge.capytal.company/capytalcode/project-comicverse/lib/middleware" ) type Router interface {