refactor: url linking to DRY

darklab8 · Jan 21, 2024 · 6be6931 · 6be6931
1 parent 622f3d9
commit 6be6931
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 9 deletions.
diff --git a/blog/about/about.go b/blog/about/about.go
@@ -1,6 +1,9 @@
 package about
 
-import "darklab_blog/blog/common/compon"
+import (
+	"darklab_blog/blog/common/compon"
+	"darklab_blog/blog/common/urls"
+)
 
 type About struct {
 	compon.Component
@@ -9,7 +12,7 @@ type About struct {
 func NewAbout() *About {
 	return &About{
 		compon.NewComponent(
-			"about.html",
+			urls.About,
 			AboutT(),
 		),
 	}

diff --git a/blog/articles/home.go b/blog/articles/home.go
@@ -1,6 +1,9 @@
 package articles
 
-import "darklab_blog/blog/common/compon"
+import (
+	"darklab_blog/blog/common/compon"
+	"darklab_blog/blog/common/urls"
+)
 
 /*
 Article navigation page
@@ -13,7 +16,7 @@ type Home struct {
 func NewHome() *Home {
 	return &Home{
 		compon.NewComponent(
-			"index.html",
+			urls.Home,
 			HomeT(),
 		),
 	}

diff --git a/blog/common/menu.templ b/blog/common/menu.templ
@@ -2,6 +2,7 @@ package common
 
 import (
     	"darklab_blog/blog/settings"
+        "darklab_blog/blog/common/urls"
 )
 
 templ NavElem(url string) {
@@ -15,11 +16,11 @@ templ Menu() {
         @NavElem(settings.SiteRoot) {
             Articles
         }
-        @NavElem(settings.SiteRoot + "pet_projects.html") {
+        @NavElem(settings.SiteRoot + urls.PetProjects) {
             Pet projects
         }
-        @NavElem(settings.SiteRoot + "about.html") {
+        @NavElem(settings.SiteRoot + urls.About) {
             About
-        }
+        } 
     </menu>
 }
diff --git a/blog/common/urls/urls.go b/blog/common/urls/urls.go
@@ -0,0 +1,9 @@
+package urls
+
+const (
+	Home = "index.html"
+
+	About = "about.html"
+
+	PetProjects = "pet_projects.html"
+)
diff --git a/blog/pet_projects/pet_projects.go b/blog/pet_projects/pet_projects.go
@@ -1,6 +1,9 @@
 package pet_projects
 
-import "darklab_blog/blog/common/compon"
+import (
+	"darklab_blog/blog/common/compon"
+	"darklab_blog/blog/common/urls"
+)
 
 type PetProjects struct {
 	compon.Component
@@ -9,7 +12,7 @@ type PetProjects struct {
 func NewPetProjects() *PetProjects {
 	return &PetProjects{
 		compon.NewComponent(
-			"pet_projects.html",
+			urls.PetProjects,
 			PetProjectsT(),
 		),
 	}