182aff6 Refactor the templating renderer, add manager page · gordon

M cmd/main.go +0 -1


@@ -28,7 +28,6 @@ func main() {
28	28		if err != nil {
29	29		log.Fatal(err)
30	30		}
31		-
32	31		// Pass memDb to the app with the rest of the configs
33	32		a.DB = memDb
34	33


@@ -28,7 +28,6 @@ func main() {
28		if err != nil {	28	if err != nil {
29		log.Fatal(err)	29	log.Fatal(err)
30		}	30	}
31	-
32		// Pass memDb to the app with the rest of the configs	31	// Pass memDb to the app with the rest of the configs
33		a.DB = memDb	32	a.DB = memDb
34			33

M internal/app/app.go +1 -1


@@ -22,7 +22,7 @@ func init() {
22	22		appEnv = os.Getenv("APP_ENV")
23	23		if appEnv == "" {
24	24		appEnv = "prod" // Default to "prod" if APP_ENV is not set
25		-	}
	25	+	}
26	26		}
27	27
28	28		type App struct {


@@ -22,7 +22,7 @@ func init() {
22		appEnv = os.Getenv("APP_ENV")	22		appEnv = os.Getenv("APP_ENV")
23		if appEnv == "" {	23		if appEnv == "" {
24		appEnv = "prod" // Default to "prod" if APP_ENV is not set	24		appEnv = "prod" // Default to "prod" if APP_ENV is not set
25	-	}	25	+	}
26		}	26		}
27			27
28		type App struct {	28		type App struct {

M internal/gotemplate/models/html/admin/manager.gohtml +20 -0

@@ -0,0 +1,20 @@
	1	+	<!-- manager.gohtml -->
	2	+	{{template "header.gohtml" .}}
	3	+	<!DOCTYPE html>
	4	+	<html lang="en">
	5	+
	6	+	<body class="bg-zinc-200 flex flex-col md:flex-row p-4 md:p-8 p-0">
	7	+	{{template "leftmenu.gohtml" .}}
	8	+	<!-- Main content here -->
	9	+	<div class="flex-1 flex flex-col md:pt-10 space-y-4 p-4 md:ml-4">
	10	+	<div class="flex flex-col md:flex-row space-y-4 md:space-y-0 md:space-x-4 flex-grow">
	11	+	<div class="flex-grow bg-white p-4 rounded-md shadow mb-4">
	12	+	<h1>hello world</h1>
	13	+	</div>
	14	+	</div>
	15	+
	16	+	<!-- footer -->
	17	+	{{template "footer.gohtml" .}}
	18	+	</body>
	19	+
	20	+	</html>⏎̸

@@ -0,0 +1,20 @@
	1	+	<!-- manager.gohtml -->
	2	+	{{template "header.gohtml" .}}
	3	+	<!DOCTYPE html>
	4	+	<html lang="en">
	5	+
	6	+	<body class="bg-zinc-200 flex flex-col md:flex-row p-4 md:p-8 p-0">
	7	+	{{template "leftmenu.gohtml" .}}
	8	+	<!-- Main content here -->
	9	+	<div class="flex-1 flex flex-col md:pt-10 space-y-4 p-4 md:ml-4">
	10	+	<div class="flex flex-col md:flex-row space-y-4 md:space-y-0 md:space-x-4 flex-grow">
	11	+	<div class="flex-grow bg-white p-4 rounded-md shadow mb-4">
	12	+	<h1>hello world</h1>
	13	+	</div>
	14	+	</div>
	15	+
	16	+	<!-- footer -->
	17	+	{{template "footer.gohtml" .}}
	18	+	</body>
	19	+
	20	+	</html>⏎̸

R internal/gotemplate/models/html/fragments/components.gohtml → internal/gotemplate/models/html/components.gohtml +0 -0 renamed, 100% similar

renamed, 100% similar

A internal/gotemplate/models/html/fragments/manager.gohtml +0 -0

no textual change.

M internal/gotemplate/render/html.go +18 -5


@@ -42,20 +42,33 @@ func (r Renderer) Render(data interface{}, a app.App) (string, error) {
42	42		return buf.String(), nil
43	43		}
44	44
45		-	// GetRenderer function returns a new Renderer instance
46		-	func GetHTMLRenderer(pathStr string, filename string, fs fs.FS, a app.App) (Renderer, error) {
47		-	// Join path and filename
48		-	fullPath := path.Join(pathStr, filename)
	45	+	// GetHTMLRenderer function returns a new Renderer instance
	46	+	func GetHTMLRenderer(mainPath string, filename string, fs fs.FS, a app.App, fragmentsPath ...string) (Renderer, error) {
	47	+	// Full path to the main template
	48	+	fullPath := path.Join(mainPath, filename)
49	49		// Check if the file exists in the provided fs.FS using fs.Open
50	50		file, err := fs.Open(fullPath)
51	51		if err != nil {
52	52		return nil, fmt.Errorf("failed to open %s: %w", filename, err)
53	53		}
54		-	file.Close() // Close the file after checking
	54	+	file.Close()
	55	+
	56	+	// Parse the main template
55	57		tmpl, err := template.New(filename).ParseFS(fs, fullPath)
56	58		if err != nil {
57	59		return nil, fmt.Errorf("failed to parse %s: %w", filename, err)
58	60		}
	61	+
	62	+	// If a fragments path is provided, parse the fragment templates
	63	+	if len(fragmentsPath) > 0 && fragmentsPath[0] != "" {
	64	+	fragmentsGlob := path.Join(fragmentsPath[0], "*.gohtml")
	65	+	_, err = tmpl.ParseFS(fs, fragmentsGlob)
	66	+	if err != nil {
	67	+	return nil, fmt.Errorf("failed to parse fragments: %w", err)
	68	+	}
	69	+	}
	70	+
	71	+	// Return the Renderer instance
59	72		return &Renderer{
60	73		Template: tmpl,
61	74		BuildVersion: a.Config.General.BuildVersion,

 	return buf.String(), nil
 }
-// GetRenderer function returns a new Renderer instance
+// GetHTMLRenderer function returns a new Renderer instance
-func GetHTMLRenderer(pathStr string, filename string, fs fs.FS, a *app.App) (*Renderer, error) {
+func GetHTMLRenderer(mainPath string, filename string, fs fs.FS, a *app.App, fragmentsPath ...string) (*Renderer, error) {
-	// Join path and filename
+	// Full path to the main template
-	fullPath := path.Join(pathStr, filename)
+	fullPath := path.Join(mainPath, filename)
 	// Check if the file exists in the provided fs.FS using fs.Open
 	file, err := fs.Open(fullPath)
 	if err != nil {
 		return nil, fmt.Errorf("failed to open %s: %w", filename, err)
 	}
-	file.Close() // Close the file after checking
+	file.Close()
+	// Parse the main template
 	tmpl, err := template.New(filename).ParseFS(fs, fullPath)
 	if err != nil {
 		return nil, fmt.Errorf("failed to parse %s: %w", filename, err)
 	}
+	// If a fragments path is provided, parse the fragment templates
+	if len(fragmentsPath) > 0 && fragmentsPath[0] != "" {
+		fragmentsGlob := path.Join(fragmentsPath[0], "*.gohtml")
+		_, err = tmpl.ParseFS(fs, fragmentsGlob)
+		if err != nil {
+			return nil, fmt.Errorf("failed to parse fragments: %w", err)
+		}
+	}
+	// Return the Renderer instance
 	return &Renderer{
 		Template:     tmpl,
 		BuildVersion: a.Config.General.BuildVersion,

M internal/httpserve/handler/adminroutes.go +37 -2

@@ -1,6 +1,9 @@
1	1		package handler
2	2
3	3		import (
	4	+	"fmt"
	5	+	"net/http"
	6	+
4	7		"github.com/bnema/gordon/internal/app"
5	8		"github.com/bnema/gordon/internal/gotemplate/render"
6	9		"github.com/bnema/gordon/internal/httpserve/middleware"

@@ -8,6 +11,11 @@ import (
8	11		"github.com/labstack/echo/v4"
9	12		)
10	13
	14	+	var (
	15	+	mainPath = "html/admin"
	16	+	fragmentsPath = "html/fragments"
	17	+	)
	18	+
11	19		// Handle the admin route to display index.gohtml from the templateFS with the data from strings.yml
12	20		func AdminRoute(c echo.Context, a *app.App) error {
13	21		lang := c.Get(middleware.LangKey).(string)

@@ -18,8 +26,7 @@ func AdminRoute(c echo.Context, a *app.App) error {
18	26		}
19	27
20	28		// Navigate inside the fs.FS to get the template
21		-	path := "html/admin"
22		-	rendererData, err := render.GetHTMLRenderer(path, "index.gohtml", a.TemplateFS, a)
	29	+	rendererData, err := render.GetHTMLRenderer(mainPath, "index.gohtml", a.TemplateFS, a, fragmentsPath)
23	30		if err != nil {
24	31		return err
25	32		}

@@ -37,3 +44,31 @@ func AdminRoute(c echo.Context, a *app.App) error {
37	44
38	45		return c.HTML(200, renderedHTML)
39	46		}
	47	+
	48	+	func AdminManagerRoute(c echo.Context, a *app.App) error {
	49	+	lang := c.Get(middleware.LangKey).(string)
	50	+	yamlData := webui.StringsYamlData{}
	51	+	err := webui.ReadStringsDataFromYAML(lang, a.TemplateFS, "strings.yml", &yamlData)
	52	+	if err != nil {
	53	+	fmt.Printf("Error reading YAML: %v\n", err)
	54	+	return echo.NewHTTPError(http.StatusInternalServerError, "Failed to load language data")
	55	+	}
	56	+
	57	+	// Navigate inside the fs.FS to get the template
	58	+	rendererData, err := render.GetHTMLRenderer(mainPath, "manager.gohtml", a.TemplateFS, a, fragmentsPath)
	59	+	if err != nil {
	60	+	return err
	61	+	}
	62	+
	63	+	// Create a data map to pass to the renderer
	64	+	data := map[string]interface{}{
	65	+	"CurrentLang": yamlData.CurrentLang,
	66	+	}
	67	+
	68	+	renderedHTML, err := rendererData.Render(data, a)
	69	+	if err != nil {
	70	+	return err
	71	+	}
	72	+
	73	+	return c.HTML(200, renderedHTML)
	74	+	}

@@ -1,6 +1,9 @@
1		package handler	1		package handler
2			2
3		import (	3		import (
			4	+	"fmt"
			5	+	"net/http"
			6	+
4		"github.com/bnema/gordon/internal/app"	7		"github.com/bnema/gordon/internal/app"
5		"github.com/bnema/gordon/internal/gotemplate/render"	8		"github.com/bnema/gordon/internal/gotemplate/render"
6		"github.com/bnema/gordon/internal/httpserve/middleware"	9		"github.com/bnema/gordon/internal/httpserve/middleware"

@@ -8,6 +11,11 @@ import (
8		"github.com/labstack/echo/v4"	11		"github.com/labstack/echo/v4"
9		)	12		)
10			13
			14	+	var (
			15	+	mainPath = "html/admin"
			16	+	fragmentsPath = "html/fragments"
			17	+	)
			18	+
11		// Handle the admin route to display index.gohtml from the templateFS with the data from strings.yml	19		// Handle the admin route to display index.gohtml from the templateFS with the data from strings.yml
12		func AdminRoute(c echo.Context, a *app.App) error {	20		func AdminRoute(c echo.Context, a *app.App) error {
13		lang := c.Get(middleware.LangKey).(string)	21		lang := c.Get(middleware.LangKey).(string)

@@ -18,8 +26,7 @@ func AdminRoute(c echo.Context, a *app.App) error {
18		}	26		}
19			27
20		// Navigate inside the fs.FS to get the template	28		// Navigate inside the fs.FS to get the template
21	-	path := "html/admin"	29	+	rendererData, err := render.GetHTMLRenderer(mainPath, "index.gohtml", a.TemplateFS, a, fragmentsPath)
22	-	rendererData, err := render.GetHTMLRenderer(path, "index.gohtml", a.TemplateFS, a)
23		if err != nil {	30		if err != nil {
24		return err	31		return err
25		}	32		}

@@ -37,3 +44,31 @@ func AdminRoute(c echo.Context, a *app.App) error {
37			44
38		return c.HTML(200, renderedHTML)	45		return c.HTML(200, renderedHTML)
39		}	46		}
			47	+
			48	+	func AdminManagerRoute(c echo.Context, a *app.App) error {
			49	+	lang := c.Get(middleware.LangKey).(string)
			50	+	yamlData := webui.StringsYamlData{}
			51	+	err := webui.ReadStringsDataFromYAML(lang, a.TemplateFS, "strings.yml", &yamlData)
			52	+	if err != nil {
			53	+	fmt.Printf("Error reading YAML: %v\n", err)
			54	+	return echo.NewHTTPError(http.StatusInternalServerError, "Failed to load language data")
			55	+	}
			56	+
			57	+	// Navigate inside the fs.FS to get the template
			58	+	rendererData, err := render.GetHTMLRenderer(mainPath, "manager.gohtml", a.TemplateFS, a, fragmentsPath)
			59	+	if err != nil {
			60	+	return err
			61	+	}
			62	+
			63	+	// Create a data map to pass to the renderer
			64	+	data := map[string]interface{}{
			65	+	"CurrentLang": yamlData.CurrentLang,
			66	+	}
			67	+
			68	+	renderedHTML, err := rendererData.Render(data, a)
			69	+	if err != nil {
			70	+	return err
			71	+	}
			72	+
			73	+	return c.HTML(200, renderedHTML)
			74	+	}

M internal/httpserve/router.go +6 -2


@@ -41,10 +41,14 @@ func bindStaticRoute(e echo.Echo, a app.App, path string) {
41	41		})
42	42		}
43	43
44		-	func bindAdminRoute(e echo.Echo, a app.App, path string) {
45		-	e.GET(path, func(c echo.Context) error {
	44	+	func bindAdminRoute(e echo.Echo, a app.App, adminPath string) {
	45	+	e.GET(adminPath, func(c echo.Context) error {
46	46		return handler.AdminRoute(c, a)
47	47		}, middleware.RequireLogin) // Require login
	48	+
	49	+	e.GET(adminPath+"/manager", func(c echo.Context) error {
	50	+	return handler.AdminManagerRoute(c, a)
	51	+	})
48	52		}
49	53
50	54		func bindLoginRoute(e echo.Echo, a app.App, adminPath string) {

 	})
 }
-func bindAdminRoute(e *echo.Echo, a *app.App, path string) {
+func bindAdminRoute(e *echo.Echo, a *app.App, adminPath string) {
-	e.GET(path, func(c echo.Context) error {
+	e.GET(adminPath, func(c echo.Context) error {
 		return handler.AdminRoute(c, a)
 	}, middleware.RequireLogin) // Require login
+	e.GET(adminPath+"/manager", func(c echo.Context) error {
+		return handler.AdminManagerRoute(c, a)
+	})
 }
 func bindLoginRoute(e *echo.Echo, a *app.App, adminPath string) {

M pkg/utils/parser/yaml.go +0 -1


@@ -36,7 +36,6 @@ import (
36	36		func OpenYamlFile(fs fs.FS, filename string, out interface{}, dir ...string) error {
37	37		// Construct the full path of the YAML file
38	38		fullPath := filename
39		-	fmt.Println("Trying to open file at:", fullPath)
40	39		if len(dir) > 0 {
41	40		fullPath = filepath.Join(dir[0], filename)
42	41		}


@@ -36,7 +36,6 @@ import (
36		func OpenYamlFile(fs fs.FS, filename string, out interface{}, dir ...string) error {	36	func OpenYamlFile(fs fs.FS, filename string, out interface{}, dir ...string) error {
37		// Construct the full path of the YAML file	37	// Construct the full path of the YAML file
38		fullPath := filename	38	fullPath := filename
39	-	fmt.Println("Trying to open file at:", fullPath)
40		if len(dir) > 0 {	39	if len(dir) > 0 {
41		fullPath = filepath.Join(dir[0], filename)	40	fullPath = filepath.Join(dir[0], filename)
42		}	41	}