From 768ef0d8364535aea337ccdaa5e2187a97a4ee95 Mon Sep 17 00:00:00 2001
From: Chris Mann <chris@lesgrandsvoisins.com>
Date: Thu, 27 Jul 2023 15:40:37 +0200
Subject: [PATCH] Refactor Site-Wide Data

---
 templates/layout.html |  2 +-
 templates/passwd.html |  2 +-
 view-home.go          |  3 ++-
 view.go               | 25 +++++++++++++++++++++++++
 4 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/templates/layout.html b/templates/layout.html
index 070d5bc..5d69c38 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -19,7 +19,7 @@
 
 <body>
   <div class="container mb-4">
-    <h1><a href="/">GVoisins.org > {{ template "title" .}}</a></h1>
+    <h1><a href="/">App.LesGrandsVoisins.Com > {{ template "title" .}}</a></h1>
     <nav role="navigation">
       <div id="menuToggle">
         <!--
diff --git a/templates/passwd.html b/templates/passwd.html
index 220a769..f85b709 100644
--- a/templates/passwd.html
+++ b/templates/passwd.html
@@ -18,7 +18,7 @@
        Nouveau mot de passe enregistré.
     </div>
   {{else}}
-    <form method="POST" class="mt-4" onsubmit="javascript:var password = document.getElementById('password');var password2 = document.getElementById('password2'); if (password.value != password.value) {alert('Les maux de passe ne sont pas identiques entre l\'initial et la confirmation.');return false;}; message = checkPasswordStrength(password.value); if (message) {alert(message);return false}else{return true;}">
+    <form method="POST" class="mt-4" onsubmit="javascript:var password = document.getElementById('password');var password2 = document.getElementById('password2'); if (password.value != password2.value) {alert('Les maux de passe ne sont pas identiques entre l\'initial et la confirmation.');return false;}; message = checkPasswordStrength(password.value); if (message) {alert(message);return false}else{return true;}">
       <div class="form-group">
         <label for="password">Nouveau mot de passe :</label>
         <input type="password" id="password" name="password" class="form-control" minlength="8" required />
diff --git a/view-home.go b/view-home.go
index d895793..536b21e 100644
--- a/view-home.go
+++ b/view-home.go
@@ -35,6 +35,7 @@ func handleHome(w http.ResponseWriter, r *http.Request) {
 			LoggedIn:  true,
 		},
 	}
-	templateHome.Execute(w, data)
+	execTemplate(w, templateHome, &data.Common, &data.Login, *config, data)
+	// templateHome.Execute(w, data)
 
 }
diff --git a/view.go b/view.go
index bf3f508..6bbc6d8 100644
--- a/view.go
+++ b/view.go
@@ -5,6 +5,9 @@ package main
 
 import (
 	"html/template"
+	"net/http"
+
+	// "net/http"
 	"strings"
 
 	"github.com/go-ldap/ldap/v3"
@@ -18,6 +21,8 @@ type NestedCommonTplData struct {
 	LoggedIn       bool
 	Success        bool
 	WarningMessage string
+	WebsiteName    string
+	WebsiteURL     string
 }
 type NestedLoginTplData struct {
 	Login    *LoginStatus
@@ -240,6 +245,10 @@ type SendMailTplData struct {
 	EmailContentVars EmailContentVarsTplData
 }
 
+type WrapperTemplate struct {
+	Template *template.Template
+}
+
 var templatePath = "./templates"
 
 func getTemplate(name string) *template.Template {
@@ -250,3 +259,19 @@ func getTemplate(name string) *template.Template {
 		templatePath+"/"+name,
 	))
 }
+
+type LayoutTemplateData struct {
+	Common NestedCommonTplData
+	Login  NestedLoginTplData
+	Data   any
+}
+
+func execTemplate(w http.ResponseWriter, t *template.Template, commonData *NestedCommonTplData, loginData *NestedLoginTplData, config ConfigFile, data any) error {
+	commonData.WebsiteURL = config.WebAddress
+	commonData.WebsiteName = config.Org
+	return t.Execute(w, LayoutTemplateData{
+		Common: *commonData,
+		Login:  *loginData,
+		Data:   data,
+	})
+}
