diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..ef78831 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "x"] + path = x + url = https://forge.capytal.company/loreddev/x diff --git a/go.mod b/go.mod index 0845342..eab5b74 100644 --- a/go.mod +++ b/go.mod @@ -1,9 +1,9 @@ module forge.capytal.company/capytal/www -go 1.22.7 +go 1.23.3 -toolchain go1.22.8 +require forge.capytal.company/loreddev/x v0.0.0 -require forge.capytal.company/capytalcode/project-comicverse v0.0.0-20241213195940-67230ba75d8a +replace forge.capytal.company/loreddev/x => ./x require github.com/a-h/templ v0.2.793 diff --git a/go.sum b/go.sum index 83a265b..dab7b07 100644 --- a/go.sum +++ b/go.sum @@ -1,9 +1,3 @@ -forge.capytal.company/capytalcode/project-comicverse v0.0.0-20241024232831-478dd0216e72 h1:HpAsKmgSWME9bfpvicXlZF/+ZZW92w6DXoscsqNB1j8= -forge.capytal.company/capytalcode/project-comicverse v0.0.0-20241024232831-478dd0216e72/go.mod h1:COqB9i9nyQrQUz/ZqMvN98V7rh0t7vdXmBV36G8Q+7Q= -forge.capytal.company/capytalcode/project-comicverse v0.0.0-20241213195940-67230ba75d8a h1:PDmA2uCzFdn+CdS3C+Pg1YGhJERgMjwgCjUEUaIDZTM= -forge.capytal.company/capytalcode/project-comicverse v0.0.0-20241213195940-67230ba75d8a/go.mod h1:COqB9i9nyQrQUz/ZqMvN98V7rh0t7vdXmBV36G8Q+7Q= -github.com/a-h/templ v0.2.778 h1:VzhOuvWECrwOec4790lcLlZpP4Iptt5Q4K9aFxQmtaM= -github.com/a-h/templ v0.2.778/go.mod h1:lq48JXoUvuQrU0VThrK31yFwdRjTCnIE5bcPCM9IP1w= github.com/a-h/templ v0.2.793 h1:Io+/ocnfGWYO4VHdR0zBbf39PQlnzVCVVD+wEEs6/qY= github.com/a-h/templ v0.2.793/go.mod h1:lq48JXoUvuQrU0VThrK31yFwdRjTCnIE5bcPCM9IP1w= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= diff --git a/handlers/pages/about.templ b/handlers/pages/about.templ index 62be68e..67484a6 100644 --- a/handlers/pages/about.templ +++ b/handlers/pages/about.templ @@ -5,7 +5,7 @@ import ( "forge.capytal.company/capytal/www/templates/layouts" - "forge.capytal.company/capytalcode/project-comicverse/lib/router/rerrors" + "forge.capytal.company/loreddev/x/groute/router/rerrors" ) type AboutPage struct{} diff --git a/handlers/pages/error.templ b/handlers/pages/error.templ index f183ffc..0206962 100644 --- a/handlers/pages/error.templ +++ b/handlers/pages/error.templ @@ -4,9 +4,9 @@ package pages import ( "fmt" - "forge.capytal.company/capytalcode/project-comicverse/lib/router/rerrors" - "forge.capytal.company/capytal/www/templates/layouts" + + "forge.capytal.company/loreddev/x/groute/router/rerrors" ) type ErrorPage struct{} diff --git a/handlers/pages/index.templ b/handlers/pages/index.templ index bb7e5c3..25a076d 100644 --- a/handlers/pages/index.templ +++ b/handlers/pages/index.templ @@ -6,7 +6,7 @@ import ( "forge.capytal.company/capytal/www/assets" "forge.capytal.company/capytal/www/templates/layouts" - "forge.capytal.company/capytalcode/project-comicverse/lib/router/rerrors" + "forge.capytal.company/loreddev/x/groute/router/rerrors" ) type IndexPage struct{} diff --git a/handlers/pages/routes.go b/handlers/pages/routes.go index 556916c..6f688d1 100644 --- a/handlers/pages/routes.go +++ b/handlers/pages/routes.go @@ -3,8 +3,8 @@ package pages import ( "log/slog" - "forge.capytal.company/capytalcode/project-comicverse/lib/router" - "forge.capytal.company/capytalcode/project-comicverse/lib/router/rerrors" + "forge.capytal.company/loreddev/x/groute/router" + "forge.capytal.company/loreddev/x/groute/router/rerrors" ) func Routes(log *slog.Logger) router.Router { diff --git a/libs/blog/blog.go b/libs/blog/blog.go index a7c82f5..e4c9a14 100644 --- a/libs/blog/blog.go +++ b/libs/blog/blog.go @@ -6,7 +6,8 @@ import ( "log" "net/http" "path" - "forge.capytal.company/capytalcode/project-comicverse/lib/router/rerrors" + + "forge.capytal.company/loreddev/x/groute/router/rerrors" ) func NewGiteaBlog(owner, repo, endpoint string) *GiteaBlog { diff --git a/main.go b/main.go index 4b1fadd..ee20d4b 100644 --- a/main.go +++ b/main.go @@ -14,8 +14,9 @@ import ( "forge.capytal.company/capytal/www/configs" "forge.capytal.company/capytal/www/handlers/pages" - "forge.capytal.company/capytalcode/project-comicverse/lib/middleware" - "forge.capytal.company/capytalcode/project-comicverse/lib/router" + + "forge.capytal.company/loreddev/x/groute/middleware" + "forge.capytal.company/loreddev/x/groute/router" ) var ( diff --git a/x b/x new file mode 160000 index 0000000..c0854de --- /dev/null +++ b/x @@ -0,0 +1 @@ +Subproject commit c0854dea2c1e35b051a73e998e099dc4319f36a5