more changes but unsure of state had to trash last set fof changes and try repair.

This commit is contained in:
2025-04-01 15:50:15 +01:00
parent 5aaddf16f1
commit 0e20cc023c
13 changed files with 525 additions and 313 deletions

64
handlers/home.go Normal file
View File

@@ -0,0 +1,64 @@
package handlers
import (
"database/sql"
"html/template"
"log"
"net/http"
"sort"
"synlotto-website/helpers"
"synlotto-website/models"
)
// Home shows latest Thunderball results
func Home(db *sql.DB) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
rows, err := db.Query(`
SELECT id, draw_date, machine, ballset, ball1, ball2, ball3, ball4, ball5, thunderball
FROM results_thunderball
ORDER BY id DESC
`)
if err != nil {
log.Println("❌ DB error:", err)
http.Error(w, "Database error", http.StatusInternalServerError)
return
}
defer rows.Close()
var results []models.ThunderballResult
for rows.Next() {
var res models.ThunderballResult
err := rows.Scan(
&res.Id, &res.DrawDate, &res.Machine, &res.BallSet,
&res.Ball1, &res.Ball2, &res.Ball3, &res.Ball4, &res.Ball5, &res.Thunderball,
)
if err != nil {
log.Println("❌ Row scan error:", err)
continue
}
res.SortedBalls = []int{
res.Ball1, res.Ball2, res.Ball3, res.Ball4, res.Ball5,
}
sort.Ints(res.SortedBalls)
results = append(results, res)
}
context := BuildTemplateContext(db, w, r)
context["Data"] = results
tmpl := template.Must(template.New("").Funcs(helpers.TemplateFuncs()).ParseFiles(
"templates/layout.html",
"templates/topbar.html",
"templates/index.html",
))
err = tmpl.ExecuteTemplate(w, "layout", context)
if err != nil {
log.Println("❌ Template error:", err)
http.Error(w, "Error rendering homepage", http.StatusInternalServerError)
}
}
}

View File

@@ -0,0 +1,60 @@
package handlers
import (
"database/sql"
"net/http"
"synlotto-website/helpers"
"synlotto-website/models"
"synlotto-website/storage"
"github.com/gorilla/csrf"
)
type TemplateData map[string]interface{}
func BuildTemplateContext(db *sql.DB, w http.ResponseWriter, r *http.Request) TemplateData {
session, _ := helpers.GetSession(w, r)
var flash string
if f, ok := session.Values["flash"].(string); ok {
flash = f
delete(session.Values, "flash")
session.Save(r, w)
}
var currentUser *models.User
var isAdmin bool
notificationCount := 0
notifications := []models.Notification{}
messageCount := 0
messages := []models.Message{}
switch v := session.Values["user_id"].(type) {
case int:
currentUser = models.GetUserByID(v)
case int64:
currentUser = models.GetUserByID(int(v))
}
if currentUser != nil {
isAdmin = currentUser.IsAdmin
notificationCount = storage.GetNotificationCount(db, currentUser.Id)
notifications = storage.GetRecentNotifications(db, currentUser.Id, 15)
messageCount, _ = storage.GetMessageCount(db, currentUser.Id)
messages = storage.GetRecentMessages(db, currentUser.Id, 15)
}
return TemplateData{
"CSRFField": csrf.TemplateField(r),
"Flash": flash,
"User": currentUser,
"IsAdmin": isAdmin,
"NotificationCount": notificationCount,
"Notifications": notifications,
"MessageCount": messageCount,
"Messages": messages,
}
}