From 52276ba99540d6c61195772ccdd50944e96f4959 Mon Sep 17 00:00:00 2001 From: Gabriel Arakaki Giovanini Date: Wed, 19 Jul 2023 20:24:19 +0200 Subject: feat: Move settings from `html/template` to qtpl --- pkg/view/settings.go | 18 ++++++---------- templates/settings.html | 44 -------------------------------------- templates/settings.qtpl | 56 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 62 insertions(+), 56 deletions(-) delete mode 100644 templates/settings.html create mode 100644 templates/settings.qtpl diff --git a/pkg/view/settings.go b/pkg/view/settings.go index 14f4e49..bee3dc2 100644 --- a/pkg/view/settings.go +++ b/pkg/view/settings.go @@ -3,9 +3,9 @@ package view import ( "github.com/valyala/fasthttp" - "git.sr.ht/~gabrielgio/img" "git.sr.ht/~gabrielgio/img/pkg/database/repository" "git.sr.ht/~gabrielgio/img/pkg/ext" + "git.sr.ht/~gabrielgio/img/templates" ) type ( @@ -14,11 +14,6 @@ type ( settingsRepository repository.SettingsRepository userRepository repository.UserRepository } - - SettingsPage struct { - Settings *repository.Settings - Users []*repository.User - } ) func NewSettingsView( @@ -42,13 +37,12 @@ func (self *SettingsView) Index(ctx *fasthttp.RequestCtx) error { return err } - return img.Render(ctx, "settings.html", &img.HTMLView[*SettingsPage]{ - Title: "Settings", - Data: &SettingsPage{ - Settings: s, - Users: users, - }, + templates.WritePageTemplate(ctx, &templates.SettingsPage{ + Settings: s, + Users: users, }) + + return nil } func (self *SettingsView) Save(ctx *fasthttp.RequestCtx) error { diff --git a/templates/settings.html b/templates/settings.html deleted file mode 100644 index 8c08773..0000000 --- a/templates/settings.html +++ /dev/null @@ -1,44 +0,0 @@ -{{template "layout.html" .}} -{{define "title"}} {{.Title}} {{end}} -{{define "content"}} -
-
-
-
-
- -
-
-
-
- -
-
-
- -
-
-
-
- {{range .Data.Users}} -
-
-
- {{.Username}} -
-
- {{.Path}} -
- -
-
- {{end}} -
-
-{{end}} diff --git a/templates/settings.qtpl b/templates/settings.qtpl new file mode 100644 index 0000000..509cddd --- /dev/null +++ b/templates/settings.qtpl @@ -0,0 +1,56 @@ +{% import "git.sr.ht/~gabrielgio/img/pkg/database/repository" %} + +{% code +type SettingsPage struct { + Settings *repository.Settings + Users []*repository.User +} +%} + +{% func (p *SettingsPage) Title() %}Settings{% endfunc %} + +{% func (p *SettingsPage) Content() %} +
+
+
+
+
+ +
+
+
+
+ +
+
+
+ +
+
+
+
+ {% for _, user := range p.Users %} +
+
+
+ {%s user.Username %} +
+
+ {%s user.Path %} +
+ +
+
+ {% endfor %} +
+
+{% endfunc %} + +{% func (p *SettingsPage) Script() %} +{% endfunc %} -- cgit v1.2.3