SynLotto/website
1
0
Fork 0
Code Issues 19 Pull Requests Actions Packages Projects 5 Releases Wiki Activity

Refactor: Centralize template loading and improve error handling

Browse Source 
- Introduced helpers.LoadTemplateFiles() for consistent layout + topbar rendering
- Replaced repeated template.ParseFiles() calls across handlers
- Created generic RenderError(w, r, statusCode) helper
- Replaced old Render403 with flexible RenderError
- Updated AdminOnly middleware to render 403 errors with context
- Added 500.html template for graceful panic fallback
- Prepared structure for future error codes (404, 429, etc.)
This commit is contained in:
Ross Healy
2025-04-02 09:12:13 +01:00
parent f5653f737d
commit 2498b33a9c
16 changed files with 69 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
handlers/account.go
View File

@@ -1,7 +1,6 @@
package handlers
import (
"html/template"
"log"
"net/http"
"synlotto-website/helpers"
@@ -18,12 +17,7 @@ func Login(w http.ResponseWriter, r *http.Request) {
http.Redirect(w, r, "/", http.StatusSeeOther)
return
}
tmpl := template.Must(template.New("login.html").Funcs(helpers.TemplateFuncs()).ParseFiles(
"templates/layout.html",
"templates/topbar.html",
"templates/account/login.html",
))
tmpl := helpers.LoadTemplateFiles("login.html", "templates/account/login.html")
context := helpers.TemplateContext(w, r, models.TemplateData{})
context["csrfField"] = csrf.TemplateField(r)
@@ -101,10 +95,7 @@ func Logout(w http.ResponseWriter, r *http.Request) {
func Signup(w http.ResponseWriter, r *http.Request) {
if r.Method == http.MethodGet {
tmpl := template.Must(template.ParseFiles(
"templates/layout.html",
"templates/account/signup.html",
))
tmpl := helpers.LoadTemplateFiles("signup.html", "templates/account/signup.html")
tmpl.ExecuteTemplate(w, "layout", map[string]interface{}{
"csrfField": csrf.TemplateField(r),

12
handlers/admin/audit.go
View File

@@ -2,7 +2,6 @@ package handlers
import (
"database/sql"
"html/template"
"log"
"net/http"
"synlotto-website/helpers"
@@ -46,10 +45,8 @@ func AdminAccessLogHandler(db *sql.DB) http.HandlerFunc {
}
context["AuditLogs"] = logs
tmpl := template.Must(template.New("").Funcs(helpers.TemplateFuncs()).ParseFiles(
"templates/layout.html",
"templates/admin/logs/access_log.html",
))
tmpl := helpers.LoadTemplateFiles("access_log.html", "templates/admin/logs/access_log.html")
_ = tmpl.ExecuteTemplate(w, "layout", context)
})
}
@@ -84,10 +81,7 @@ func AuditLogHandler(db *sql.DB) http.HandlerFunc {
context["AuditLogs"] = logs
tmpl := template.Must(template.New("").Funcs(helpers.TemplateFuncs()).ParseFiles(
"templates/layout.html",
"templates/admin/logs/audit.html",
))
tmpl := helpers.LoadTemplateFiles("audit.html", "templates/admin/logs/audit.html")
err = tmpl.ExecuteTemplate(w, "layout", context)
if err != nil {

6
handlers/admin/dashboard.go
View File

@@ -2,7 +2,6 @@ package handlers
import (
"database/sql"
"html/template"
"log"
"net/http"
@@ -55,10 +54,7 @@ func AdminDashboardHandler(db *sql.DB) http.HandlerFunc {
}
context["MatchLogs"] = logs
tmpl := template.Must(template.New("").Funcs(helpers.TemplateFuncs()).ParseFiles(
"templates/layout.html",
"templates/admin/dashboard.html",
))
tmpl := helpers.LoadTemplateFiles("dashboard.html", "templates/admin/dashboard.html")
err = tmpl.ExecuteTemplate(w, "layout", context)
if err != nil {

13
handlers/admin/draws.go
View File

@@ -2,7 +2,6 @@ package handlers
import (
"database/sql"
"html/template"
"log"
"net/http"
@@ -31,10 +30,8 @@ func NewDrawHandler(db *sql.DB) http.HandlerFunc {
return
}
tmpl := template.Must(template.New("new_draw").Funcs(helpers.TemplateFuncs()).ParseFiles(
"templates/layout.html",
"templates/admin/draws/new_draw.html",
))
tmpl := helpers.LoadTemplateFiles("new_draw", "templates/admin/draws/new_draw.html")
tmpl.ExecuteTemplate(w, "layout", context)
})
}
@@ -103,10 +100,8 @@ func ListDrawsHandler(db *sql.DB) http.HandlerFunc {
context["Draws"] = draws
tmpl := template.Must(template.New("draw_list").Funcs(helpers.TemplateFuncs()).ParseFiles(
"templates/layout.html",
"templates/admin/draws/list.html",
))
tmpl := helpers.LoadTemplateFiles("list.html", "templates/admin/draws/list.html")
tmpl.ExecuteTemplate(w, "layout", context)
})
}

9
handlers/admin/manualtriggers.go
View File

@@ -3,7 +3,6 @@ package handlers
import (
"database/sql"
"fmt"
"html/template"
"log"
"net/http"
"net/url"
@@ -18,7 +17,6 @@ func AdminTriggersHandler(db *sql.DB) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
context := helpers.TemplateContext(w, r, models.TemplateData{})
// Inject flash message if available
if flash := r.URL.Query().Get("flash"); flash != "" {
context["Flash"] = flash
}
@@ -69,16 +67,11 @@ func AdminTriggersHandler(db *sql.DB) http.HandlerFunc {
flashMsg = "⚠️ Unknown action."
}
// Redirect back with flash message
http.Redirect(w, r, "/admin/triggers?flash="+url.QueryEscape(flashMsg), http.StatusSeeOther)
return
}
// Render the admin trigger page
tmpl := template.Must(template.New("").Funcs(helpers.TemplateFuncs()).ParseFiles(
"templates/layout.html",
"templates/admin/triggers.html",
))
tmpl := helpers.LoadTemplateFiles("triggers.html", "templates/admin/triggers.html")
err := tmpl.ExecuteTemplate(w, "layout", context)
if err != nil {

13
handlers/admin/prizes.go
View File

@@ -3,7 +3,6 @@ package handlers
import (
"database/sql"
"fmt"
"html/template"
"net/http"
"strconv"
"synlotto-website/helpers"
@@ -13,10 +12,8 @@ import (
func AddPrizesHandler(db *sql.DB) http.HandlerFunc {
return helpers.AuthMiddleware(func(w http.ResponseWriter, r *http.Request) {
if r.Method == http.MethodGet {
tmpl := template.Must(template.New("").Funcs(helpers.TemplateFuncs()).ParseFiles(
"templates/layout.html",
"templates/admin/draws/prizes/add_prizes.html",
))
tmpl := helpers.LoadTemplateFiles("add_prizes.html", "templates/admin/draws/prizes/add_prizes.html")
tmpl.ExecuteTemplate(w, "layout", helpers.TemplateContext(w, r, models.TemplateData{}))
return
}
@@ -47,10 +44,8 @@ func AddPrizesHandler(db *sql.DB) http.HandlerFunc {
func ModifyPrizesHandler(db *sql.DB) http.HandlerFunc {
return helpers.AuthMiddleware(func(w http.ResponseWriter, r *http.Request) {
if r.Method == http.MethodGet {
tmpl := template.Must(template.New("").Funcs(helpers.TemplateFuncs()).ParseFiles(
"templates/layout.html",
"templates/admin/draws/prizes/modify_prizes.html",
))
tmpl := helpers.LoadTemplateFiles("modify_prizes.html", "templates/admin/draws/prizes/modify_prizes.html")
tmpl.ExecuteTemplate(w, "layout", helpers.TemplateContext(w, r, models.TemplateData{}))
return
}

8
handlers/draw_handler.go
View File

@@ -2,7 +2,6 @@ package handlers
import (
"database/sql"
"html/template"
"log"
"net/http"
@@ -18,11 +17,7 @@ func NewDraw(db *sql.DB) http.HandlerFunc {
context["Page"] = "new_draw"
context["Data"] = nil
tmpl := template.Must(template.New("").Funcs(helpers.TemplateFuncs()).ParseFiles(
"templates/layout.html",
"templates/topbar.html",
"templates/new_draw.html",
))
tmpl := helpers.LoadTemplateFiles("new_draw.html", "templates/new_draw.html") // ToDo: may need removing or moving add draw should be admin functionality and only when manually required. Potential live drawing of numbers in the future.
err := tmpl.ExecuteTemplate(w, "layout", context)
if err != nil {
@@ -48,7 +43,6 @@ func Submit(w http.ResponseWriter, r *http.Request) {
Thunderball: helpers.Atoi(r.FormValue("thunderball")),
}
// For now you're appending to memory - can replace with DB insert later
Draws = append(Draws, draw)
log.Printf("📅 %s | 🛠 %s | 🎱 %d | 🔢 %d,%d,%d,%d,%d | ⚡ %d\n",

7
handlers/home.go
View File

@@ -2,7 +2,6 @@ package handlers
import (
"database/sql"
"html/template"
"log"
"net/http"
"synlotto-website/helpers"
@@ -13,11 +12,7 @@ func Home(db *sql.DB) http.HandlerFunc {
data := BuildTemplateData(db, w, r)
context := helpers.TemplateContext(w, r, data)
tmpl := template.Must(template.New("index.html").Funcs(helpers.TemplateFuncs()).ParseFiles(
"templates/layout.html",
"templates/topbar.html",
"templates/index.html",
))
tmpl := helpers.LoadTemplateFiles("index.html", "templates/index.html")
err := tmpl.ExecuteTemplate(w, "layout", context)
if err != nil {

17
handlers/notifications.go
View File

@@ -5,7 +5,6 @@ import (
"log"
"net/http"
"strconv"
"text/template"
"synlotto-website/helpers"
"synlotto-website/storage"
@@ -16,13 +15,7 @@ func NotificationsHandler(db *sql.DB) http.HandlerFunc {
data := BuildTemplateData(db, w, r)
context := helpers.TemplateContext(w, r, data)
tmpl := template.Must(template.New("notifications.html").
Funcs(helpers.TemplateFuncs()).
ParseFiles(
"templates/layout.html",
"templates/topbar.html",
"templates/account/notifications.html",
))
tmpl := helpers.LoadTemplateFiles("notifications.html", "templates/account/notifications.html")
err := tmpl.ExecuteTemplate(w, "layout", context)
if err != nil {
@@ -63,13 +56,7 @@ func MarkNotificationReadHandler(db *sql.DB) http.HandlerFunc {
context := helpers.TemplateContext(w, r, data)
context["Notification"] = notification
tmpl := template.Must(template.New("read.html").
Funcs(helpers.TemplateFuncs()).
ParseFiles(
"templates/layout.html",
"templates/topbar.html",
"templates/account/notifications/read.html",
))
tmpl := helpers.LoadTemplateFiles("read.html", "templates/account/notifications/read.html")
err = tmpl.ExecuteTemplate(w, "layout", context)
if err != nil {

6
handlers/results.go
View File

@@ -2,7 +2,6 @@ package handlers
import (
"database/sql"
"html/template"
"log"
"net"
"net/http"
@@ -110,10 +109,7 @@ func ResultsThunderball(db *sql.DB) http.HandlerFunc {
noResultsMsg = "No results found for \"" + query + "\""
}
tmpl := template.Must(template.New("").Funcs(helpers.TemplateFuncs()).ParseFiles(
"templates/layout.html",
"templates/results/thunderball.html",
))
tmpl := helpers.LoadTemplateFiles("thunderball.html", "templates/results/thunderball.html")
err = tmpl.ExecuteTemplate(w, "layout", map[string]interface{}{
"Results": results,

11
handlers/ticket_handler.go
View File

@@ -3,7 +3,6 @@ package handlers
import (
"database/sql"
"fmt"
"html/template"
"io"
"log"
"net/http"
@@ -44,10 +43,7 @@ func AddTicket(db *sql.DB) http.HandlerFunc {
context["csrfField"] = csrf.TemplateField(r)
context["DrawDates"] = drawDates
tmpl := template.Must(template.New("").Funcs(helpers.TemplateFuncs()).ParseFiles(
"templates/layout.html",
"templates/account/tickets/add_ticket.html",
))
tmpl := helpers.LoadTemplateFiles("add_ticket.html", "templates/account/tickets/add_ticket.html")
err = tmpl.ExecuteTemplate(w, "layout", context)
if err != nil {
@@ -362,10 +358,7 @@ func GetMyTickets(db *sql.DB) http.HandlerFunc {
context := helpers.TemplateContext(w, r, models.TemplateData{})
context["Tickets"] = tickets
tmpl := template.Must(template.New("").Funcs(helpers.TemplateFuncs()).ParseFiles(
"templates/layout.html",
"templates/account/tickets/my_tickets.html",
))
tmpl := helpers.LoadTemplateFiles("my_tickets.html", "templates/account/tickets/my_tickets.html")
err = tmpl.ExecuteTemplate(w, "layout", context)
if err != nil {