Refactoring for Gin, NoSurf and SCS continues.

internal/helpers/template/build.go

@@ -2,24 +2,33 @@ package helpers
 
 import (
 	"html/template"
-	"log"
 	"net/http"
 	"strings"
 	"time"
 
-	helpers "synlotto-website/internal/helpers/http"
+	httpHelpers "synlotto-website/internal/helpers/http"
 	"synlotto-website/internal/models"
-	"synlotto-website/internal/platform/config"
 
-	"github.com/gorilla/csrf"
+	"github.com/justinas/nosurf"
 )
 
-func TemplateContext(w http.ResponseWriter, r *http.Request, data models.TemplateData) map[string]interface{} {
-	cfg := config.Get()
-	if cfg == nil {
-		log.Println("⚠️ Config not initialized!")
+// ToDo should these structs be here?
+type siteMeta struct {
+	Name               string
+	CopyrightYearStart int
+}
+
+var meta siteMeta
+
+func InitSiteMeta(name string, yearStart, yearEnd int) {
+	meta = siteMeta{
+		Name:               name,
+		CopyrightYearStart: yearStart,
 	}
-	session, _ := helpers.GetSession(w, r)
+}
+
+func TemplateContext(w http.ResponseWriter, r *http.Request, data models.TemplateData) map[string]interface{} {
+	session, _ := httpHelpers.GetSession(w, r)
 
 	var flash string
 	if f, ok := session.Values["flash"].(string); ok {
@@ -29,7 +38,7 @@ func TemplateContext(w http.ResponseWriter, r *http.Request, data models.Templat
 	}
 
 	return map[string]interface{}{
-		"CSRFField":          csrf.TemplateField(r),
+		"CSRFToken":          nosurf.Token(r),
 		"Flash":              flash,
 		"User":               data.User,
 		"IsAdmin":            data.IsAdmin,
@@ -37,8 +46,8 @@ func TemplateContext(w http.ResponseWriter, r *http.Request, data models.Templat
 		"Notifications":      data.Notifications,
 		"MessageCount":       data.MessageCount,
 		"Messages":           data.Messages,
-		"SiteName":           cfg.Site.SiteName,
-		"CopyrightYearStart": cfg.Site.CopyrightYearStart,
+		"SiteName":           meta.Name,
+		"CopyrightYearStart": meta.CopyrightYearStart,
 	}
 }
 
@@ -57,9 +66,8 @@ func TemplateFuncs() template.FuncMap {
 		"min": func(a, b int) int {
 			if a < b {
 				return a
-			} else {
-				return b
 			}
+			return b
 		},
 		"intVal": func(p *int) int {
 			if p == nil {
@@ -102,12 +110,11 @@ func LoadTemplateFiles(name string, files ...string) *template.Template {
 		"templates/main/footer.html",
 	}
 	all := append(shared, files...)
-
 	return template.Must(template.New(name).Funcs(TemplateFuncs()).ParseFiles(all...))
 }
 
 func SetFlash(w http.ResponseWriter, r *http.Request, message string) {
-	session, _ := helpers.GetSession(w, r)
+	session, _ := httpHelpers.GetSession(w, r)
 	session.Values["flash"] = message
 	session.Save(r, w)
 }

internal/helpers/template/error.go

@@ -1,39 +0,0 @@
-package helpers
-
-import (
-	"fmt"
-	"log"
-	"net/http"
-	"os"
-
-	"synlotto-website/internal/models"
-)
-
-func RenderError(w http.ResponseWriter, r *http.Request, statusCode int) {
-	log.Printf("⚙️ RenderError called with status: %d", statusCode)
-
-	context := TemplateContext(w, r, models.TemplateData{})
-
-	pagePath := fmt.Sprintf("templates/error/%d.html", statusCode)
-	log.Printf("📄 Checking for template file: %s", pagePath)
-
-	if _, err := os.Stat(pagePath); err != nil {
-		log.Printf("🚫 Template file missing: %s", err)
-		http.Error(w, http.StatusText(statusCode), statusCode)
-		return
-	}
-
-	log.Println("✅ Template file found, loading...")
-
-	tmpl := LoadTemplateFiles(fmt.Sprintf("%d.html", statusCode), pagePath)
-
-	w.WriteHeader(statusCode)
-	err := tmpl.ExecuteTemplate(w, "layout", context)
-	if err != nil {
-		log.Printf("❌ Failed to render error page layout: %v", err)
-		http.Error(w, http.StatusText(statusCode), statusCode)
-		return
-	}
-
-	log.Println("✅ Successfully rendered error page") // ToDo: log these to database
-}

internal/helpers/template/pagination.go

@@ -4,6 +4,7 @@ import (
 	"database/sql"
 )
 
+// ToDo: Sql shouldnt be here.
 func GetTotalPages(db *sql.DB, tableName, whereClause string, args []interface{}, pageSize int) (totalPages, totalCount int) {
 	query := "SELECT COUNT(*) FROM " + tableName + " " + whereClause
 	row := db.QueryRow(query, args...)