diff --git a/src/hmndata/jams.go b/src/hmndata/jams.go index db53eea..96a7f1b 100644 --- a/src/hmndata/jams.go +++ b/src/hmndata/jams.go @@ -28,7 +28,7 @@ var WRJ2021 = Jam{ var WRJ2022 = Jam{ Name: "Wheel Reinvention Jam 2022", Slug: "WRJ2022", - StartTime: time.Date(2022, 8, 3, 8, 0, 0, 0, utils.Must1(time.LoadLocation("America/Los_Angeles"))), + StartTime: time.Date(2022, 8, 15, 8, 0, 0, 0, utils.Must1(time.LoadLocation("America/Los_Angeles"))), EndTime: time.Date(2022, 8, 22, 8, 0, 0, 0, utils.Must1(time.LoadLocation("America/Los_Angeles"))), } diff --git a/src/templates/src/landing.html b/src/templates/src/landing.html index 0b6dc0e..abd4b2b 100644 --- a/src/templates/src/landing.html +++ b/src/templates/src/landing.html @@ -146,7 +146,20 @@

Wheel Reinvention Jam

-
August 15 - 21. Change the status quo.
+
+ August 15 - 21. + {{ if gt .JamDaysUntilEnd 0 }} + {{ if eq .JamDaysUntilStart 0 }} + Happening now. + {{ else if eq .JamDaysUntilStart 1 }} + Starting tomorrow. + {{ else }} + In {{ .JamDaysUntilStart }} days. + {{ end }} + {{ else }} + See the results. + {{ end }} +
diff --git a/src/templates/src/layouts/wheeljam_2022_base.html b/src/templates/src/layouts/wheeljam_2022_base.html index 13797dc..8b7bd26 100644 --- a/src/templates/src/layouts/wheeljam_2022_base.html +++ b/src/templates/src/layouts/wheeljam_2022_base.html @@ -27,7 +27,6 @@ - @@ -264,6 +263,31 @@ margin-top: 1.6rem; } } + + h3.mt0 { + margin-top: 0; /* ugh seriously */ + } + + .back-to-normal * { + font-family: "Fira Sans", sans-serif; + } + + .back-to-normal h1, + .back-to-normal h2, + .back-to-normal h3, + .back-to-normal h4, + .back-to-normal h5 + { + font-weight: 500; + margin: 0; + margin-bottom: 0.5rem; + font-size: 1.5rem; + line-height: 1.25em; + } + + .back-to-normal a { + text-decoration: none; + } diff --git a/src/templates/src/project_edit.html b/src/templates/src/project_edit.html index 259d4ca..5838783 100644 --- a/src/templates/src/project_edit.html +++ b/src/templates/src/project_edit.html @@ -90,16 +90,15 @@ {{ if .ProjectSettings.JamParticipation }}
Jam Participation
-
- {{ range .ProjectSettings.JamParticipation }} -
-
{{ .JamName }}:
-
- - -
+
+ {{ range .ProjectSettings.JamParticipation }} +
+ + +
+ {{ end }}
- {{ end }} +
{{ end }} {{ if and .Editing .User.IsStaff }}
diff --git a/src/templates/src/wheeljam_2022_feed.html b/src/templates/src/wheeljam_2022_feed.html index fd9eeff..59dfd69 100644 --- a/src/templates/src/wheeljam_2022_feed.html +++ b/src/templates/src/wheeljam_2022_feed.html @@ -5,39 +5,6 @@ #title { margin-top: 0; } - - h3.mt0 { - margin-top: 0; /* ugh seriously */ - } - - .back-to-normal * { - font-family: "Fira Sans", sans-serif; - } - - .back-to-normal h1, - .back-to-normal h2, - .back-to-normal h3, - .back-to-normal h4, - .back-to-normal h5 - { - font-weight: 500; - margin: 0; - margin-bottom: 0.5rem; - font-size: 1.5rem; - line-height: 1.25em; - } - - .back-to-normal a { - text-decoration: none; - } - - @media screen and (min-width: 30em) { - /* not small styles */ - } - - @media screen and (min-width: 30em) { - /* large styles */ - }
@@ -50,7 +17,7 @@
-
+
{{ if eq .DaysUntilEnd 0 }}

Project updates

{{ else }} diff --git a/src/templates/src/wheeljam_2022_index.html b/src/templates/src/wheeljam_2022_index.html index 5210bea..755d249 100644 --- a/src/templates/src/wheeljam_2022_index.html +++ b/src/templates/src/wheeljam_2022_index.html @@ -3,6 +3,21 @@ {{ define "content" }} {{ $discordInviteURL := "https://discord.gg/zFt8Rf59?event=1004511448107602031" }} + +

Wheel Reinvention Jam

@@ -22,14 +37,14 @@
{{ if gt .DaysUntilStart 0 }} Find a project - {{ else }} - {{ if gt .DaysUntilEnd 0 }} - {{ if .SubmittedProjectUrl }} - Share your progress - {{ else }} - Create your project - {{ end }} + {{ else if gt .DaysUntilEnd 0 }} + {{ if .SubmittedProjectUrl }} + Share your progress + {{ else }} + Create your project {{ end }} + {{ else }} + See the results {{ end }} Join the Discord
@@ -50,13 +65,27 @@

- {{ if not (eq .ShowcaseJson "[]") }} + {{ if eq .DaysUntilEnd 0 }} +
+
+

Submitted projects

+
+ {{ range .JamProjects }} + {{ template "project_card.html" projectcarddata . "" }} + {{ end }} +
+ +
+
+ {{ else if and (eq .DaysUntilStart 0) (not (eq .ShowcaseJson "[]")) }}
{{ if gt .DaysUntilEnd 0 }}

Recent updates

- These screenshots and videos were shared by jam participants in #project-showcase on our Discord. Join us and share what you're working on! + These screenshots and videos were shared by jam participants in #project-showcase on our Discord. Join us and share what you're working on! See all ➜

{{ else }}

Community showcase

@@ -66,10 +95,114 @@ {{ end }}
+ + {{ template "showcase_templates.html" }} + + {{ else }}
@@ -229,110 +362,6 @@
- - {{ template "showcase_templates.html" }} - -