Merge pull request #382 from jovandeginste/better-options

Improve the page options for scripts and stylesheets
jovandeginste · Jan 6, 2025 · 1195f71 · 1195f71
2 parents a9d1135 + a57844a
commit 1195f71
Show file tree

Hide file tree

Showing 44 changed files with 202 additions and 203 deletions.
diff --git a/views/admin/edit_user.templ b/views/admin/edit_user.templ
@@ -9,7 +9,7 @@ import (
 )
 
 templ EditUser(u *database.User) {
-	@partials.Page(partials.PageOptions{}) {
+	@partials.Page(partials.NewPageOptions()) {
 		<h2>
 			@helpers.IconFor(`admin`)
 			{ i18n.T(ctx, "Manage user '%s'", u.Name) }

diff --git a/views/admin/edit_user_templ.go b/views/admin/edit_user_templ.go
diff --git a/views/admin/root.templ b/views/admin/root.templ
@@ -8,7 +8,7 @@ import (
 )
 
 templ Root(users []*database.User) {
-	@partials.Page(partials.PageOptions{}) {
+	@partials.Page(partials.NewPageOptions()) {
 		<h2>
 			@helpers.IconFor(`admin`)
 			{ i18n.T(ctx, "Manage") }

diff --git a/views/admin/root_templ.go b/views/admin/root_templ.go
diff --git a/views/equipment/add.templ b/views/equipment/add.templ
@@ -7,7 +7,7 @@ import (
 )
 
 templ Add() {
-	@partials.Page(partials.PageOptions{}) {
+	@partials.Page(partials.NewPageOptions()) {
 		<h2>
 			@helpers.IconFor("equipment-add")
 			{ i18n.T(ctx, "Add equipment") }

diff --git a/views/equipment/add_templ.go b/views/equipment/add_templ.go
diff --git a/views/equipment/edit.templ b/views/equipment/edit.templ
@@ -8,7 +8,7 @@ import (
 )
 
 templ Edit(e *database.Equipment) {
-	@partials.Page(partials.PageOptions{}) {
+	@partials.Page(partials.NewPageOptions()) {
 		<div class="gap-4">
 			<h2>{ i18n.T(ctx, "Equipment") }: { e.Name }</h2>
 		</div>

diff --git a/views/equipment/edit_templ.go b/views/equipment/edit_templ.go
diff --git a/views/equipment/list.templ b/views/equipment/list.templ
@@ -9,7 +9,7 @@ import (
 )
 
 templ List(equipment []*database.Equipment) {
-	@partials.Page(partials.PageOptions{}) {
+	@partials.Page(partials.NewPageOptions()) {
 		<div class="items-baseline flex flex-wrap">
 			<h2 class="grow justify-start">
 				@helpers.IconFor("equipment")

diff --git a/views/equipment/list_templ.go b/views/equipment/list_templ.go
diff --git a/views/equipment/show.templ b/views/equipment/show.templ
@@ -8,7 +8,7 @@ import (
 )
 
 templ Show(e *database.Equipment) {
-	@partials.Page(partials.PageOptions{}) {
+	@partials.Page(partials.NewPageOptions()) {
 		{{ currentUser := helpers.CurrentUser(ctx) }}
 		{{ pu := currentUser.PreferredUnits() }}
 		<div class="gap-4">

diff --git a/views/equipment/show_templ.go b/views/equipment/show_templ.go
diff --git a/views/partials/page.go b/views/partials/page.go
@@ -0,0 +1,54 @@
+package partials
+
+type PageOptions struct {
+	Scripts, Styles []string
+}
+
+func NewPageOptions() *PageOptions {
+	return &PageOptions{Scripts: nil, Styles: nil}
+}
+
+func (o *PageOptions) WithScripts(scripts ...string) *PageOptions {
+	return &PageOptions{
+		Scripts: append(o.Scripts, scripts...),
+		Styles:  o.Styles,
+	}
+}
+
+func (o *PageOptions) WithStyles(styles ...string) *PageOptions {
+	return &PageOptions{
+		Scripts: o.Scripts,
+		Styles:  append(o.Styles, styles...),
+	}
+}
+
+func (o *PageOptions) WithCharts() *PageOptions {
+	return o.
+		WithScripts("/dist/apexcharts.min.js").
+		WithStyles("/dist/apexcharts.css")
+}
+
+func (o *PageOptions) WithMaps() *PageOptions {
+	return o.
+		WithScripts("/dist/leaflet.js").
+		WithStyles("/dist/leaflet.css")
+}
+
+func (o *PageOptions) WithHeatMaps() *PageOptions {
+	return o.WithMaps().
+		WithScripts(
+			"/dist/simpleheat.js",
+			"/dist/leaflet-heat.js",
+			"/dist/leaflet.markercluster.js",
+		).
+		WithStyles(
+			"/dist/MarkerCluster.css",
+			"/dist/MarkerCluster.Default.css",
+		)
+}
+
+func (o *PageOptions) WithSharing() *PageOptions {
+	return o.
+		WithScripts("/dist/shareon.iife.js").
+		WithStyles("/dist/shareon.min.css")
+}
diff --git a/views/partials/page.templ b/views/partials/page.templ
@@ -2,16 +2,10 @@ package partials
 
 import "github.com/jovandeginste/workout-tracker/views/helpers"
 
-type PageOptions struct {
-	Scripts []string
-	Styles  []string
-}
-
-templ Page(options PageOptions) {
+templ Page(options *PageOptions) {
 	<!DOCTYPE html>
 	<html>
 		<head>
-			<meta charset="UTF-8"/>
 			for _, script := range options.Scripts {
 				<script src={ helpers.RouteFor(ctx, "assets") + script }></script>
 			}

diff --git a/views/partials/page_templ.go b/views/partials/page_templ.go
diff --git a/views/partials/page_test.go b/views/partials/page_test.go
@@ -0,0 +1,40 @@
+package partials
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestNewPageOptions(t *testing.T) {
+	po := NewPageOptions()
+
+	assert.Empty(t, po.Scripts)
+	assert.Empty(t, po.Styles)
+}
+
+func TestPageOptions_WithScripts(t *testing.T) {
+	po := NewPageOptions().WithScripts("/a.js", "/b.js")
+
+	assert.Contains(t, po.Scripts, "/a.js")
+	assert.Contains(t, po.Scripts, "/b.js")
+}
+
+func TestPageOptions_WithStyles(t *testing.T) {
+	po := NewPageOptions().WithStyles("/a.css", "/b.css")
+
+	assert.Contains(t, po.Styles, "/a.css")
+	assert.Contains(t, po.Styles, "/b.css")
+}
+
+func TestPageOptions_WithScriptsAndStyles(t *testing.T) {
+	po := NewPageOptions().
+		WithScripts("/a.js", "/b.js").
+		WithStyles("/a.css", "/b.css")
+
+	assert.Contains(t, po.Scripts, "/a.js")
+	assert.Contains(t, po.Scripts, "/b.js")
+
+	assert.Contains(t, po.Styles, "/a.css")
+	assert.Contains(t, po.Styles, "/b.css")
+}
diff --git a/views/route_segments/add.templ b/views/route_segments/add.templ
@@ -7,7 +7,7 @@ import (
 )
 
 templ Add() {
-	@partials.Page(partials.PageOptions{}) {
+	@partials.Page(partials.NewPageOptions()) {
 		<h2>
 			@helpers.IconFor("route-segment-add")
 			{ i18n.T(ctx, "Add route segment") }

diff --git a/views/route_segments/add_templ.go b/views/route_segments/add_templ.go
diff --git a/views/route_segments/edit.templ b/views/route_segments/edit.templ
@@ -8,7 +8,7 @@ import (
 )
 
 templ Edit(s *database.RouteSegment) {
-	@partials.Page(partials.PageOptions{}) {
+	@partials.Page(partials.NewPageOptions()) {
 		<div class="gap-4">
 			<h2>
 				@helpers.IconFor("route-segment")

diff --git a/views/route_segments/edit_templ.go b/views/route_segments/edit_templ.go
diff --git a/views/route_segments/list.templ b/views/route_segments/list.templ
@@ -8,7 +8,7 @@ import (
 )
 
 templ List(segments []*database.RouteSegment) {
-	@partials.Page(partials.PageOptions{}) {
+	@partials.Page(partials.NewPageOptions()) {
 		<div class="items-baseline flex flex-wrap">
 			<h2 class="grow justify-start">
 				@helpers.IconFor("route-segment")

diff --git a/views/route_segments/list_templ.go b/views/route_segments/list_templ.go
diff --git a/views/route_segments/show.templ b/views/route_segments/show.templ
@@ -8,14 +8,7 @@ import (
 )
 
 templ Show(s *database.RouteSegment) {
-	@partials.Page(partials.PageOptions{
-		Scripts: []string{
-			"/dist/leaflet.js",
-		},
-		Styles: []string{
-			"/dist/leaflet.css",
-		},
-	}) {
+	@partials.Page(partials.NewPageOptions().WithMaps()) {
 		{{ preferredUnits := helpers.CurrentUser(ctx).PreferredUnits() }}
 		<div class="gap-4">
 			<span class="float-right actions">