From a47e8a39b670c0a0b3c5a6197879562ee03d1daf Mon Sep 17 00:00:00 2001
From: Eden Kirin <eden@ekirin.com>
Date: Tue, 6 Feb 2024 20:36:27 +0100
Subject: [PATCH] Remove fiber ctx from render

---
 app/handlers/{render.go => helpers.go} | 9 ++++++---
 app/handlers/home.go                   | 2 +-
 app/handlers/login.go                  | 4 ++--
 app/handlers/protected_page.go         | 2 +-
 app/handlers/requesthandler.go         | 5 -----
 5 files changed, 10 insertions(+), 12 deletions(-)
 rename app/handlers/{render.go => helpers.go} (51%)
 delete mode 100644 app/handlers/requesthandler.go

diff --git a/app/handlers/render.go b/app/handlers/helpers.go
similarity index 51%
rename from app/handlers/render.go
rename to app/handlers/helpers.go
index 575a30e..0d2e4fe 100644
--- a/app/handlers/render.go
+++ b/app/handlers/helpers.go
@@ -1,16 +1,19 @@
 package handlers
 
 import (
+	"fiber-sessions/app/router/requests"
+
 	"github.com/a-h/templ"
-	"github.com/gofiber/fiber/v2"
 	"github.com/gofiber/fiber/v2/middleware/adaptor"
 )
 
+type RequestHandler = func(request *requests.Request) error
+
 // example taken from https://github.com/a-h/templ/tree/main/examples/integration-gofiber
-func Render(c *fiber.Ctx, component templ.Component, options ...func(*templ.ComponentHandler)) error {
+func Render(request *requests.Request, component templ.Component, options ...func(*templ.ComponentHandler)) error {
 	componentHandler := templ.Handler(component)
 	for _, o := range options {
 		o(componentHandler)
 	}
-	return adaptor.HTTPHandler(componentHandler)(c)
+	return adaptor.HTTPHandler(componentHandler)(request.Ctx)
 }
diff --git a/app/handlers/home.go b/app/handlers/home.go
index 67abc1b..2c489da 100644
--- a/app/handlers/home.go
+++ b/app/handlers/home.go
@@ -10,6 +10,6 @@ func Home(request *requests.Request) error {
 		Title:      "Welcome to the demo",
 		ActivePage: "home",
 	}
-	Render(request.Ctx, templates.Home(request, pc))
+	Render(request, templates.Home(request, pc))
 	return nil
 }
diff --git a/app/handlers/login.go b/app/handlers/login.go
index ab3b680..cfc6c96 100644
--- a/app/handlers/login.go
+++ b/app/handlers/login.go
@@ -11,7 +11,7 @@ var pcLogin templates.PageContext = templates.PageContext{
 }
 
 func Login(request *requests.Request) error {
-	Render(request.Ctx, templates.RenderLogin(request, pcLogin))
+	Render(request, templates.RenderLogin(request, pcLogin))
 	return nil
 }
 
@@ -42,6 +42,6 @@ func LoginSubmit(request *requests.Request) error {
 		content.LoginError = "Invalid username or password"
 	}
 
-	Render(request.Ctx, templates.LoginFormContent(content))
+	Render(request, templates.LoginFormContent(content))
 	return nil
 }
diff --git a/app/handlers/protected_page.go b/app/handlers/protected_page.go
index 793ebbc..686445f 100644
--- a/app/handlers/protected_page.go
+++ b/app/handlers/protected_page.go
@@ -10,6 +10,6 @@ func ProtectedPage(request *requests.Request) error {
 		Title:      "Protected page",
 		ActivePage: "protected-page",
 	}
-	Render(request.Ctx, templates.ProtectedPage(request, pc))
+	Render(request, templates.ProtectedPage(request, pc))
 	return nil
 }
diff --git a/app/handlers/requesthandler.go b/app/handlers/requesthandler.go
deleted file mode 100644
index 271f17d..0000000
--- a/app/handlers/requesthandler.go
+++ /dev/null
@@ -1,5 +0,0 @@
-package handlers
-
-import "fiber-sessions/app/router/requests"
-
-type RequestHandler = func(request *requests.Request) error