Changing the navbar to be a template instead of rewritten

ystv · Mar 4, 2024 · bf5beef · bf5beef
1 parent 3096318
commit bf5beef
Show file tree

Hide file tree

Showing 16 changed files with 95 additions and 167 deletions.
diff --git a/server/templates/_base.tmpl b/server/templates/_base.tmpl
@@ -23,7 +23,8 @@
       <p style="margin-bottom: 10px;">Dark Mode</p>
     </div>
     <br><br>
-    {{block "content" .}}{{end}}
+    {{template "_navbar" .}}
+    {{template "content" .}}
     <br><br>
     {{ $year := thisYear }}
     <footer id="footer">Streamer (version: {{ getVersion }}) - created by Liam Burnand 2022{{if ne $year 2022}}-{{ $year }}{{end}}</footer>

diff --git a/server/templates/_navbar.tmpl b/server/templates/_navbar.tmpl
@@ -0,0 +1,32 @@
+{{define "_navbar"}}
+    {{ $page := .ActivePage }}
+    <div class="tabs is-toggle is-toggle-rounded">
+        <ul>
+            <li {{if eq $page "home"}}class="is-active"{{end}}>
+                <a href="/">
+                    <span>Home</span>
+                </a>
+            </li>
+            <li {{if eq $page "resume"}}class="is-active"{{end}}>
+                <a href="/resume">
+                    <span>Resume</span>
+                </a>
+            </li>
+            <li {{if eq $page "list"}}class="is-active"{{end}}>
+                <a href="/list">
+                    <span>List</span>
+                </a>
+            </li>
+            <li {{if eq $page "save"}}class="is-active"{{end}}>
+                <a href="/save">
+                    <span>Save</span>
+                </a>
+            </li>
+            <li {{if eq $page "recall"}}class="is-active"{{end}}>
+                <a href="/recall">
+                    <span>Recall</span>
+                </a>
+            </li>
+        </ul>
+    </div>
+{{end}}
diff --git a/server/templates/list.tmpl b/server/templates/list.tmpl
@@ -1,33 +1,4 @@
 {{define "content"}}
-    <div class="tabs is-toggle is-toggle-rounded">
-        <ul>
-            <li>
-                <a href="/">
-                    <span>Home</span>
-                </a>
-            </li>
-            <li>
-                <a href="/resume">
-                    <span>Resume</span>
-                </a>
-            </li>
-            <li class="is-active">
-                <a href="/list">
-                    <span>List</span>
-                </a>
-            </li>
-            <li>
-                <a href="/save">
-                    <span>Save</span>
-                </a>
-            </li>
-            <li>
-                <a href="/recall">
-                    <span>Recall</span>
-                </a>
-            </li>
-        </ul>
-    </div>
     <div class="card" id="enter">
         <div class="card-content">
             <p class="title">Listing all streams, active and saved</p>

diff --git a/server/templates/main.tmpl b/server/templates/main.tmpl
@@ -1,33 +1,4 @@
 {{define "content"}}
-    <div class="tabs is-toggle is-toggle-rounded">
-        <ul>
-            <li class="is-active">
-                <a href="/">
-                    <span>Home</span>
-                </a>
-            </li>
-            <li>
-                <a href="/resume">
-                    <span>Resume</span>
-                </a>
-            </li>
-            <li>
-                <a href="/list">
-                    <span>List</span>
-                </a>
-            </li>
-            <li>
-                <a href="/save">
-                    <span>Save</span>
-                </a>
-            </li>
-            <li>
-                <a href="/recall">
-                    <span>Recall</span>
-                </a>
-            </li>
-        </ul>
-    </div>
     <div id="start_window">
         <div class="card">
             <div class="card-content">

diff --git a/server/templates/recall.tmpl b/server/templates/recall.tmpl
@@ -1,33 +1,4 @@
 {{define "content"}}
-    <div class="tabs is-toggle is-toggle-rounded">
-        <ul>
-            <li>
-                <a href="/">
-                    <span>Home</span>
-                </a>
-            </li>
-            <li>
-                <a href="/resume">
-                    <span>Resume</span>
-                </a>
-            </li>
-            <li>
-                <a href="/list">
-                    <span>List</span>
-                </a>
-            </li>
-            <li>
-                <a href="/save">
-                    <span>Save</span>
-                </a>
-            </li>
-            <li class="is-active">
-                <a href="/recall">
-                    <span>Recall</span>
-                </a>
-            </li>
-        </ul>
-    </div>
     <div class="card" id="recall_stream_window">
         <div class="card-content">
             <p class="title">Recall a stream</p><br>

diff --git a/server/templates/resume.tmpl b/server/templates/resume.tmpl
@@ -1,33 +1,4 @@
 {{define "content"}}
-    <div class="tabs is-toggle is-toggle-rounded">
-        <ul>
-            <li>
-                <a href="/">
-                    <span>Home</span>
-                </a>
-            </li>
-            <li class="is-active">
-                <a href="/resume">
-                    <span>Resume</span>
-                </a>
-            </li>
-            <li>
-                <a href="/list">
-                    <span>List</span>
-                </a>
-            </li>
-            <li>
-                <a href="/save">
-                    <span>Save</span>
-                </a>
-            </li>
-            <li>
-                <a href="/recall">
-                    <span>Recall</span>
-                </a>
-            </li>
-        </ul>
-    </div>
     <div class="card" id="enter_window">
         <div class="card-content">
             <p class="title">Resume a stream</p><br>

diff --git a/server/templates/save.tmpl b/server/templates/save.tmpl
@@ -1,33 +1,4 @@
 {{define "content"}}
-    <div class="tabs is-toggle is-toggle-rounded">
-        <ul>
-            <li>
-                <a href="/">
-                    <span>Home</span>
-                </a>
-            </li>
-            <li>
-                <a href="/resume">
-                    <span>Resume</span>
-                </a>
-            </li>
-            <li>
-                <a href="/list">
-                    <span>List</span>
-                </a>
-            </li>
-            <li class="is-active">
-                <a href="/save">
-                    <span>Save</span>
-                </a>
-            </li>
-            <li>
-                <a href="/recall">
-                    <span>Recall</span>
-                </a>
-            </li>
-        </ul>
-    </div>
     <div id="save_window">
         <div class="card">
             <div class="card-content">

diff --git a/server/templates/templates.go b/server/templates/templates.go
@@ -29,6 +29,7 @@ const (
 	ErrorTemplate            Template = "error.tmpl"
 	NotFound404Template      Template = "404NotFound.tmpl"
 	baseTemplate             Template = "_base.tmpl"
+	navbarTemplate           Template = "_navbar.tmpl"
 	statusComponentsTemplate Template = "_statusComponents.tmpl"
 	stopComponentsTemplate   Template = "_stopComponents.tmpl"
 )
@@ -50,7 +51,7 @@ func (t *Templater) RenderTemplate(w io.Writer, data interface{}, mainTmpl Templ
 
 	t1.Funcs(t.getFuncMaps())
 
-	t1, err = t1.ParseFS(tmpls, baseTemplate.String(), statusComponentsTemplate.String(), stopComponentsTemplate.String(), mainTmpl.String())
+	t1, err = t1.ParseFS(tmpls, baseTemplate.String(), navbarTemplate.String(), statusComponentsTemplate.String(), stopComponentsTemplate.String(), mainTmpl.String())
 
 	if err != nil {
 		log.Printf("failed to get templates for template(RenderTemplate): %+v", err)
@@ -74,15 +75,15 @@ func (t *Templater) getFuncMaps() template.FuncMap {
 // This section is for go template linter
 var (
 	AllTemplates = [][]string{
-		{"facebookHelp.tmpl", "_base.tmpl", "_statusComponents.tmpl", "_stopComponents.tmpl"},
-		{"list.tmpl", "_base.tmpl", "_statusComponents.tmpl", "_stopComponents.tmpl"},
-		{"main.tmpl", "_base.tmpl", "_statusComponents.tmpl", "_stopComponents.tmpl"},
-		{"recall.tmpl", "_base.tmpl", "_statusComponents.tmpl", "_stopComponents.tmpl"},
-		{"resume.tmpl", "_base.tmpl", "_statusComponents.tmpl", "_stopComponents.tmpl"},
-		{"save.tmpl", "_base.tmpl", "_statusComponents.tmpl", "_stopComponents.tmpl"},
-		{"youtubeHelp.tmpl", "_base.tmpl", "_statusComponents.tmpl", "_stopComponents.tmpl"},
-		{"error.tmpl", "_base.tmpl", "_statusComponents.tmpl", "_stopComponents.tmpl"},
-		{"404NotFound.tmpl", "_base.tmpl", "_statusComponents.tmpl", "_stopComponents.tmpl"},
+		{"facebookHelp.tmpl", "_base.tmpl", "_navbar.tmpl", "_statusComponents.tmpl", "_stopComponents.tmpl"},
+		{"list.tmpl", "_base.tmpl", "_navbar.tmpl", "_statusComponents.tmpl", "_stopComponents.tmpl"},
+		{"main.tmpl", "_base.tmpl", "_navbar.tmpl", "_statusComponents.tmpl", "_stopComponents.tmpl"},
+		{"recall.tmpl", "_base.tmpl", "_navbar.tmpl", "_statusComponents.tmpl", "_stopComponents.tmpl"},
+		{"resume.tmpl", "_base.tmpl", "_navbar.tmpl", "_statusComponents.tmpl", "_stopComponents.tmpl"},
+		{"save.tmpl", "_base.tmpl", "_navbar.tmpl", "_statusComponents.tmpl", "_stopComponents.tmpl"},
+		{"youtubeHelp.tmpl", "_base.tmpl", "_navbar.tmpl", "_statusComponents.tmpl", "_stopComponents.tmpl"},
+		{"error.tmpl", "_base.tmpl", "_navbar.tmpl", "_statusComponents.tmpl", "_stopComponents.tmpl"},
+		{"404NotFound.tmpl", "_base.tmpl", "_navbar.tmpl", "_statusComponents.tmpl", "_stopComponents.tmpl"},
 	}
 
 	_ = AllTemplates

diff --git a/server/views/errors.go b/server/views/errors.go
@@ -19,8 +19,9 @@ func (v *Views) CustomHTTPErrorHandler(err error, c echo.Context) {
 	}
 	c.Response().WriteHeader(status)
 	var data struct {
-		Code  int
-		Error any
+		ActivePage string
+		Code       int
+		Error      any
 	}
 	if he == nil {
 		data.Error = err
@@ -35,5 +36,9 @@ func (v *Views) CustomHTTPErrorHandler(err error, c echo.Context) {
 }
 
 func (v *Views) Error404(c echo.Context) error {
-	return v.template.RenderTemplate(c.Response().Writer, nil, templates.NotFound404Template)
+	data := struct {
+		ActivePage string
+	}{}
+
+	return v.template.RenderTemplate(c.Response().Writer, data, templates.NotFound404Template)
 }
diff --git a/server/views/facebookHelp.go b/server/views/facebookHelp.go
@@ -25,5 +25,9 @@ func (v *Views) FacebookHelpFunc(c echo.Context) error {
 		log.Println("facebook called")
 	}
 
-	return v.template.RenderTemplate(c.Response().Writer, nil, templates.FacebookHelpTemplate)
+	data := struct {
+		ActivePage string
+	}{}
+
+	return v.template.RenderTemplate(c.Response().Writer, data, templates.FacebookHelpTemplate)
 }
diff --git a/server/views/home.go b/server/views/home.go
@@ -40,9 +40,11 @@ func (v *Views) HomeFunc(c echo.Context) error {
 	}
 
 	data := struct {
-		Error string
+		ActivePage string
+		Error      string
 	}{
-		Error: err,
+		ActivePage: "home",
+		Error:      err,
 	}
 
 	return v.template.RenderTemplate(c.Response().Writer, data, templates.MainTemplate)

diff --git a/server/views/list.go b/server/views/list.go
@@ -28,7 +28,13 @@ func (v *Views) ListFunc(c echo.Context) error {
 			log.Println("List GET called")
 		}
 
-		return v.template.RenderTemplate(c.Response().Writer, nil, templates.ListTemplate)
+		data := struct {
+			ActivePage string
+		}{
+			ActivePage: "list",
+		}
+
+		return v.template.RenderTemplate(c.Response().Writer, data, templates.ListTemplate)
 	} else if c.Request().Method == "POST" {
 		if v.conf.Verbose {
 			log.Println("List POST called")

diff --git a/server/views/recall.go b/server/views/recall.go
@@ -18,7 +18,13 @@ func (v *Views) RecallFunc(c echo.Context) error {
 			log.Println("Recall GET called")
 		}
 
-		return v.template.RenderTemplate(c.Response().Writer, nil, templates.RecallTemplate)
+		data := struct {
+			ActivePage string
+		}{
+			ActivePage: "recall",
+		}
+
+		return v.template.RenderTemplate(c.Response().Writer, data, templates.RecallTemplate)
 	} else if c.Request().Method == "POST" {
 		if v.conf.Verbose {
 			log.Println("Recall POST called")

diff --git a/server/views/resume.go b/server/views/resume.go
@@ -17,7 +17,13 @@ func (v *Views) ResumeFunc(c echo.Context) error {
 			log.Println("Resume GET called")
 		}
 
-		return v.template.RenderTemplate(c.Response().Writer, nil, templates.ResumeTemplate)
+		data := struct {
+			ActivePage string
+		}{
+			ActivePage: "resume",
+		}
+
+		return v.template.RenderTemplate(c.Response().Writer, data, templates.ResumeTemplate)
 	} else if c.Request().Method == "POST" {
 		if v.conf.Verbose {
 			log.Println("Resume POST called")

diff --git a/server/views/save.go b/server/views/save.go
@@ -18,7 +18,13 @@ func (v *Views) SaveFunc(c echo.Context) error {
 			log.Println("Save GET called")
 		}
 
-		return v.template.RenderTemplate(c.Response().Writer, nil, templates.SaveTemplate)
+		data := struct {
+			ActivePage string
+		}{
+			ActivePage: "save",
+		}
+
+		return v.template.RenderTemplate(c.Response().Writer, data, templates.SaveTemplate)
 	} else if c.Request().Method == "POST" {
 		if v.conf.Verbose {
 			log.Println("Save POST called")

diff --git a/server/views/youtubeHelp.go b/server/views/youtubeHelp.go
@@ -25,5 +25,9 @@ func (v *Views) YoutubeHelpFunc(c echo.Context) error {
 		log.Println("YouTube called")
 	}
 
-	return v.template.RenderTemplate(c.Response().Writer, nil, templates.YouTubeHelpTemplate)
+	data := struct {
+		ActivePage string
+	}{}
+
+	return v.template.RenderTemplate(c.Response().Writer, data, templates.YouTubeHelpTemplate)
 }