From c5e458be8c77254afe4d3ba99a806dd9606b2dc9 Mon Sep 17 00:00:00 2001 From: Ben Visness Date: Fri, 9 Feb 2024 15:02:58 -0600 Subject: [PATCH] Lay out top section --- public/learningjam2023/logo.svg | 1 + src/templates/src/jam_2024_lj_index.html | 52 ++++-- .../src/layouts/jam_2024_learning_base.html | 164 +++++++++++------- src/website/routes.go | 2 +- 4 files changed, 137 insertions(+), 82 deletions(-) create mode 100644 public/learningjam2023/logo.svg diff --git a/public/learningjam2023/logo.svg b/public/learningjam2023/logo.svg new file mode 100644 index 0000000..c77a73e --- /dev/null +++ b/public/learningjam2023/logo.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/templates/src/jam_2024_lj_index.html b/src/templates/src/jam_2024_lj_index.html index c7a4b13..6a0a6f8 100644 --- a/src/templates/src/jam_2024_lj_index.html +++ b/src/templates/src/jam_2024_lj_index.html @@ -1,16 +1,39 @@ {{ template "jam_2024_learning_base.html" . }} + +{{ define "extrahead" }} + +{{ end }} + {{ define "content-top" }} -
- -
The Learning Jam
-
-
-
Learn
-
March 15-17, 2024
-
-
-
Teach
-
March 22-24, 2024
+
+
+ +
+
Learning Jam
+
+
+
Learn
+
March 15-17, 2024
+
+
+
Teach
+
March 22-24, 2024
+
{{ if lt .DaysUntilStart 0 }} @@ -23,16 +46,17 @@ Recent activity
{{ end }} -
- Join the Discord +
+ Join the Discord
+
{{ end }} {{ define "content" }}
diff --git a/src/templates/src/layouts/jam_2024_learning_base.html b/src/templates/src/layouts/jam_2024_learning_base.html index e8cf1ab..d7f7267 100644 --- a/src/templates/src/layouts/jam_2024_learning_base.html +++ b/src/templates/src/layouts/jam_2024_learning_base.html @@ -35,95 +35,125 @@ + + {{ template "extrahead" . }}
-
+
HANDMADE
diff --git a/src/website/routes.go b/src/website/routes.go index 74d7d77..d1231e0 100644 --- a/src/website/routes.go +++ b/src/website/routes.go @@ -61,7 +61,7 @@ func NewWebsiteRoutes(conn *pgxpool.Pool) http.Handler { hmnOnly.GET(hmnurl.RegexJamsIndex, JamsIndex) hmnOnly.GET(hmnurl.RegexJamIndex, func(c *RequestContext) ResponseData { - return c.Redirect(hmnurl.BuildJamIndex2023(), http.StatusFound) + return c.Redirect(hmnurl.BuildJamIndex2024_Learning(), http.StatusFound) }) hmnOnly.GET(hmnurl.RegexJamIndex2021, JamIndex2021) hmnOnly.GET(hmnurl.RegexJamIndex2022, JamIndex2022)