rename internal/ui packages

pierres · pierres · commit 40ba4063fd90 · 2026-03-09T17:12:44.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -7,8 +7,8 @@
 /pkgstats*.db*
 /dist
 /node_modules
-/internal/ui/packagepage/icons/*
-!/internal/ui/packagepage/icons/.gitkeep
+/internal/ui/packagelist/icons/*
+!/internal/ui/packagelist/icons/.gitkeep
 *_templ.go
 /tmp/*
 !/tmp/.gitkeep
diff --git a/internal/ui/apidoc/handler.go b/internal/ui/apidoc/handler.go
@@ -1,4 +1,4 @@
-package apidocpage
+package apidoc
 
 import (
 	"net/http"
diff --git a/internal/ui/apidoc/templates.templ b/internal/ui/apidoc/templates.templ
@@ -1,4 +1,4 @@
-package apidocpage
+package apidoc
 
 templ APIDocContent() {
 	<h1 class="mb-4">API</h1>
diff --git a/internal/ui/country/handler.go b/internal/ui/country/handler.go
@@ -1,4 +1,4 @@
-package countrypage
+package country
 
 import (
 	"net/http"
diff --git a/internal/ui/country/handler_test.go b/internal/ui/country/handler_test.go
@@ -1,4 +1,4 @@
-package countrypage
+package country
 
 import (
 	"context"
diff --git a/internal/ui/country/templates.templ b/internal/ui/country/templates.templ
@@ -1,4 +1,4 @@
-package countrypage
+package country
 
 import "pkgstatsd/internal/countries"
 
diff --git a/internal/ui/httperror/handler.go b/internal/ui/httperror/handler.go
@@ -1,4 +1,4 @@
-package errorpage
+package httperror
 
 import (
 	"net/http"
diff --git a/internal/ui/httperror/handler_test.go b/internal/ui/httperror/handler_test.go
@@ -1,4 +1,4 @@
-package errorpage
+package httperror
 
 import (
 	"net/http"
@@ -19,7 +19,7 @@ func TestErrorPageCacheControl(t *testing.T) {
 	})
 
 	// Apply middleware in the same order as main.go:
-	// errorpage.Middleware wraps the handler, CacheControl is outer
+	// httperror.Middleware wraps the handler, CacheControl is outer
 	handler := web.CacheControl(5 * time.Minute)(Middleware(manifest)(notFound))
 
 	req := httptest.NewRequest(http.MethodGet, "/nonexistent", nil)
diff --git a/internal/ui/httperror/templates.templ b/internal/ui/httperror/templates.templ
@@ -1,4 +1,4 @@
-package errorpage
+package httperror
 
 templ NotFoundContent(path string) {
 	<div class="alert alert-danger" role="alert">
diff --git a/internal/ui/packagelist/handler.go b/internal/ui/packagelist/handler.go
@@ -1,4 +1,4 @@
-package packagepage
+package packagelist
 
 import (
 	"net/http"
diff --git a/internal/ui/packagelist/handler_test.go b/internal/ui/packagelist/handler_test.go
@@ -1,4 +1,4 @@
-package packagepage
+package packagelist
 
 import (
 	"context"
diff --git a/internal/ui/packagelist/icons.go b/internal/ui/packagelist/icons.go
@@ -1,4 +1,4 @@
-package packagepage
+package packagelist
 
 import _ "embed"
 
diff --git a/internal/ui/packagelist/icons/.gitkeep b/internal/ui/packagelist/icons/.gitkeep
diff --git a/internal/ui/packagelist/templates.templ b/internal/ui/packagelist/templates.templ
@@ -1,4 +1,4 @@
-package packagepage
+package packagelist
 
 import (
 	"fmt"
diff --git a/internal/ui/routes.go b/internal/ui/routes.go
@@ -10,9 +10,9 @@ import (
 	"pkgstatsd/internal/operatingsystems"
 	"pkgstatsd/internal/packages"
 	"pkgstatsd/internal/systemarchitectures"
-	"pkgstatsd/internal/ui/apidocpage"
+	"pkgstatsd/internal/ui/apidoc"
 	"pkgstatsd/internal/ui/compare"
-	"pkgstatsd/internal/ui/countrypage"
+	"pkgstatsd/internal/ui/country"
 	"pkgstatsd/internal/ui/fun"
 	"pkgstatsd/internal/ui/fundetail"
 	"pkgstatsd/internal/ui/gettingstarted"
@@ -21,7 +21,7 @@ import (
 	"pkgstatsd/internal/ui/legal"
 	uios "pkgstatsd/internal/ui/operatingsystems"
 	"pkgstatsd/internal/ui/packagedetail"
-	"pkgstatsd/internal/ui/packagepage"
+	"pkgstatsd/internal/ui/packagelist"
 	uisysarch "pkgstatsd/internal/ui/systemarchitectures"
 )
 
@@ -41,15 +41,15 @@ func RegisterRoutes(
 ) {
 	home.NewHandler(manifest).RegisterRoutes(mux)
 	gettingstarted.NewHandler(manifest).RegisterRoutes(mux)
-	packagepage.NewHandler(pkgRepo, manifest).RegisterRoutes(mux)
+	packagelist.NewHandler(pkgRepo, manifest).RegisterRoutes(mux)
 	packagedetail.NewHandler(pkgRepo, manifest).RegisterRoutes(mux)
 	compare.NewHandler(pkgRepo, manifest).RegisterRoutes(mux)
-	countrypage.NewHandler(countriesRepo, manifest).RegisterRoutes(mux)
+	country.NewHandler(countriesRepo, manifest).RegisterRoutes(mux)
 	uisysarch.NewHandler(systemArchRepo, manifest).RegisterRoutes(mux)
 	uios.NewHandler(osRepo, manifest).RegisterRoutes(mux)
 	fun.NewHandler(manifest).RegisterRoutes(mux)
 	fundetail.NewHandler(pkgRepo, manifest).RegisterRoutes(mux)
-	apidocpage.NewHandler(manifest).RegisterRoutes(mux)
+	apidoc.NewHandler(manifest).RegisterRoutes(mux)
 	legal.NewHandler(manifest).RegisterRoutes(mux)
 
 	handleAssets(mux, assets)
diff --git a/main.go b/main.go
@@ -20,7 +20,7 @@ import (
 	"pkgstatsd/internal/submit"
 	"pkgstatsd/internal/systemarchitectures"
 	"pkgstatsd/internal/ui"
-	"pkgstatsd/internal/ui/errorpage"
+	"pkgstatsd/internal/ui/httperror"
 	uilayout "pkgstatsd/internal/ui/layout"
 	"pkgstatsd/internal/web"
 )
@@ -116,7 +116,7 @@ func run(cfg config.Config) error {
 		web.SecureHeaders(),
 		web.CORS(),
 		ui.LegacyMiddleware,
-		errorpage.Middleware(manifest),
+		httperror.Middleware(manifest),
 		web.CacheControl(defaultCacheMaxAge),
 	)
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package apidocpage`
	`1`	`+package apidoc`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"net/http"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package countrypage`
	`1`	`+package country`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"net/http"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package errorpage`
	`1`	`+package httperror`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"net/http"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package packagepage`
	`1`	`+package packagelist`
`2`	`2`
`3`	`3`	`import (`
`4`	`4`	`"net/http"`