Continued work on messages and notifications.

internal/handlers/account/messages/archive.go

@@ -7,20 +7,46 @@ package accountMessageHandler
 import (
 	"net/http"
 
+	templateHelpers "synlotto-website/internal/helpers/template"
+
+	"synlotto-website/internal/logging"
+	"synlotto-website/internal/models"
+	"synlotto-website/internal/platform/bootstrap"
+
 	"github.com/gin-gonic/gin"
+	"github.com/justinas/nosurf"
 )
 
 // GET /account/messages/archived
 // Renders: web/templates/account/messages/archived.html
 func (h *AccountMessageHandlers) ArchivedList(c *gin.Context) {
+	app := c.MustGet("app").(*bootstrap.App)
+	sm := app.SessionManager
+
 	userID := mustUserID(c)
 	msgs, err := h.Svc.ListArchived(userID)
 	if err != nil {
-		c.AbortWithStatusJSON(http.StatusInternalServerError, gin.H{"error": "failed to load archived messages"})
+		logging.Info("❌ list archived error: %v", err)
+		c.String(http.StatusInternalServerError, "Failed to load archived messages")
 		return
 	}
-	c.HTML(http.StatusOK, "account/messages/archived.html", gin.H{
-		"title":    "Archived Messages",
-		"messages": msgs,
-	})
+
+	ctx := templateHelpers.TemplateContext(c.Writer, c.Request, models.TemplateData{})
+	if f := sm.PopString(c.Request.Context(), "flash"); f != "" {
+		ctx["Flash"] = f
+	}
+	ctx["CSRFToken"] = nosurf.Token(c.Request)
+	ctx["Title"] = "Archived Messages"
+	ctx["Messages"] = msgs
+
+	tmpl := templateHelpers.LoadTemplateFiles(
+		"layout.html",
+		"web/templates/account/messages/archived.html",
+	)
+
+	c.Status(http.StatusOK)
+	if err := tmpl.ExecuteTemplate(c.Writer, "layout", ctx); err != nil {
+		logging.Info("❌ Template render error: %v", err)
+		c.String(http.StatusInternalServerError, "Error rendering archived messages")
+	}
 }