fix: extract html rendering

handler/index_and_404.go

@@ -3,7 +3,6 @@ package handler
 import (
 	"me-fit/service"
 	"me-fit/template"
-	"me-fit/types"
 	"me-fit/utils"
 
 	"net/http"
@@ -16,14 +15,14 @@ type IndexHandler interface {
 }
 
 type IndexHandlerImpl struct {
-	service        service.AuthService
-	serverSettings *types.ServerSettings
+	service service.AuthService
+	render  *Render
 }
 
-func NewIndexHandler(service service.AuthService, serverSettings *types.ServerSettings) IndexHandler {
+func NewIndexHandler(service service.AuthService, render *Render) IndexHandler {
 	return IndexHandlerImpl{
-		service:        service,
-		serverSettings: serverSettings,
+		service: service,
+		render:  render,
 	}
 }
 
@@ -35,20 +34,15 @@ func (handler IndexHandlerImpl) handleIndexAnd404() http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		user, _ := handler.service.GetUserFromSessionId(utils.GetSessionID(r))
 
-		var comp templ.Component = nil
-		userComp := service.UserInfoComp(user)
+		var comp templ.Component
 
 		if r.URL.Path != "/" {
-			comp = template.Layout(template.NotFound(), userComp, handler.serverSettings.Environment)
+			comp = template.NotFound()
 			w.WriteHeader(http.StatusNotFound)
 		} else {
-			comp = template.Layout(template.Index(), userComp, handler.serverSettings.Environment)
+			comp = template.Index()
 		}
 
-		err := comp.Render(r.Context(), w)
-		if err != nil {
-			utils.LogError("Failed to render index", err)
-			http.Error(w, "Failed to render index", http.StatusInternalServerError)
-		}
+		handler.render.RenderLayout(r, w, comp, user)
 	}
 }