From 5dd4880d4c7dd8204196ebde91b0642b24833958 Mon Sep 17 00:00:00 2001 From: Ben Visness Date: Tue, 12 Mar 2024 23:20:35 -0500 Subject: [PATCH] heaaaghghghghg jam time yayaya --- src/hmnurl/urls.go | 7 + .../src/include/jam_2024_lj_bannerbig.html | 23 ++ .../src/include/jam_2024_lj_bannersmall.html | 19 ++ .../src/include/jam_2024_lj_description.html | 7 +- .../src/include/jam_2024_lj_feeditems.html | 4 +- .../src/include/jam_2024_lj_guidelines.html | 2 +- .../src/include/jam_2024_lj_projects.html | 31 ++- src/templates/src/jam_2024_lj_feed.html | 38 +--- .../src/jam_2024_lj_guidelines_index.html | 16 ++ src/templates/src/jam_2024_lj_index.html | 63 ++---- .../src/layouts/jam_2024_learning_base.html | 33 ++- src/templates/src/project_index.html | 2 + src/website/jam.go | 205 ++++++++++-------- src/website/routes.go | 1 + 14 files changed, 267 insertions(+), 184 deletions(-) create mode 100644 src/templates/src/include/jam_2024_lj_bannerbig.html create mode 100644 src/templates/src/include/jam_2024_lj_bannersmall.html create mode 100644 src/templates/src/jam_2024_lj_guidelines_index.html diff --git a/src/hmnurl/urls.go b/src/hmnurl/urls.go index ab77e622..eaf1187b 100644 --- a/src/hmnurl/urls.go +++ b/src/hmnurl/urls.go @@ -140,6 +140,13 @@ func BuildJamFeed2024_Learning() string { return Url("/jam/learning-2024/feed", nil) } +var RegexJamGuidelines2024_Learning = regexp.MustCompile("^/jam/learning-2024/guidelines$") + +func BuildJamGuidelines2024_Learning() string { + defer CatchPanic() + return Url("/jam/learning-2024/guidelines", nil) +} + func BuildJamIndexAny(slug string) string { defer CatchPanic() return Url(fmt.Sprintf("/jam/%s", slug), nil) diff --git a/src/templates/src/include/jam_2024_lj_bannerbig.html b/src/templates/src/include/jam_2024_lj_bannerbig.html new file mode 100644 index 00000000..d916970b --- /dev/null +++ b/src/templates/src/include/jam_2024_lj_bannerbig.html @@ -0,0 +1,23 @@ +
+
+ +
+ Learning Jam +
+
+
Learn
+
March 15-17, 2024
+
+
+
Share
+
March 22-24, 2024
+
+
+
+ {{ if gt .DaysUntilEnd 0 }} +
+ Join the Discord +
+ {{ end }} +
+
diff --git a/src/templates/src/include/jam_2024_lj_bannersmall.html b/src/templates/src/include/jam_2024_lj_bannersmall.html new file mode 100644 index 00000000..48150f73 --- /dev/null +++ b/src/templates/src/include/jam_2024_lj_bannersmall.html @@ -0,0 +1,19 @@ +
+
+ +
+
+ Learning Jam +
March 15 - 24, 2024
+
+
+ {{ if and (not .SubmittedProjectUrl) (gt .DaysUntilEnd 0) }} + Create your project + {{ else }} + Join the Discord + {{ end }} + Guidelines
{{ svg "chevron-right" }}
 +
+
+
+
diff --git a/src/templates/src/include/jam_2024_lj_description.html b/src/templates/src/include/jam_2024_lj_description.html index 7d83d6ad..01d27688 100644 --- a/src/templates/src/include/jam_2024_lj_description.html +++ b/src/templates/src/include/jam_2024_lj_description.html @@ -2,10 +2,13 @@

What is a Learning Jam?

- The Learning Jam is a cool good time. + The Learning Jam is an opportunity for you to learn something new.

- TODO + Unlike traditional game jams, and unlike our previous programming jams, the goal of the Learning Jam is knowledge. It's an opportunity to throw yourself at a topic and learn everything you can about it—and then, to turn around and share that knowledge with others. +

+

+ The jam takes place over two weekends. On the first weekend, you'll learn as much as you can about your topic of choice. On the second, you'll share what you learned in whatever form you like—writeup, video, Minecraft mod, whatever.

diff --git a/src/templates/src/include/jam_2024_lj_feeditems.html b/src/templates/src/include/jam_2024_lj_feeditems.html index 4a0d9890..b9269a7b 100644 --- a/src/templates/src/include/jam_2024_lj_feeditems.html +++ b/src/templates/src/include/jam_2024_lj_feeditems.html @@ -2,8 +2,8 @@
{{ if .OwnerAvatarUrl }} - - + + {{ end }}
diff --git a/src/templates/src/include/jam_2024_lj_guidelines.html b/src/templates/src/include/jam_2024_lj_guidelines.html index be8782a4..d8eb875e 100644 --- a/src/templates/src/include/jam_2024_lj_guidelines.html +++ b/src/templates/src/include/jam_2024_lj_guidelines.html @@ -51,7 +51,7 @@

Mar 15-17: Learn!

- {{ if eq .DaysUntilStart 0 }} + {{ if and (eq .DaysUntilStart 0) (not .SubmittedProjectUrl) }} Create a Handmade Network project {{ else }} Create a Handmade Network project diff --git a/src/templates/src/include/jam_2024_lj_projects.html b/src/templates/src/include/jam_2024_lj_projects.html index 1a77a9dd..e0bc495c 100644 --- a/src/templates/src/include/jam_2024_lj_projects.html +++ b/src/templates/src/include/jam_2024_lj_projects.html @@ -1,18 +1,29 @@ {{ if .Projects }} -

+
{{ range .Projects }}
-
- {{ .Name }} + {{ if gt (len .Owners) 1 }} +
+ {{ range .Owners }} + + + + {{ end }} +
+ {{ else }} + {{ range .Owners }} + + +
+ {{ .Name }} +
+ + {{ end }} + {{ end }} +
+ {{ .Name }}
{{ .Blurb }}
-
- by - {{ $owners := .Owners }} - {{ range $idx, $owner := .Owners }} - {{ $owner.Name }}{{ if not (lastidx $idx (len $owners)) }},{{ end }} - {{ end }} -
{{ end }} {{ if isodd (len .Projects) }} diff --git a/src/templates/src/jam_2024_lj_feed.html b/src/templates/src/jam_2024_lj_feed.html index de965b30..121e6fa9 100644 --- a/src/templates/src/jam_2024_lj_feed.html +++ b/src/templates/src/jam_2024_lj_feed.html @@ -1,46 +1,22 @@ {{ template "jam_2024_learning_base.html" . }} {{ define "content-top" }} -
-
- -
-
Learning Jam
-
-
-
Learn
-
March 15-17, 2024
-
-
-
Share
-
March 22-24, 2024
-
-
-
-
- {{ if and (eq .DaysUntilStart 0) (gt .DaysUntilEnd 0) }} - {{ if .SubmittedProjectUrl }} - Share your progress - {{ else }} - Create your project - {{ end }} - {{ end }} - Join the Discord -
-
-
+ {{ template "jam_2024_lj_bannersmall.html" . }} {{ end }} {{ define "content" }}
-

Projects

+

Projects

{{ template "jam_2024_lj_projects.html" .Projects }}
{{ if .TimelineItems }}
-

Recent Updates

-
+

All updates

+

+ See what community members are learning about their topics. You can share your own updates via your project page or using the !til command on Discord. +

+
{{ template "jam_2024_lj_feeditems.html" .TimelineItems }}
diff --git a/src/templates/src/jam_2024_lj_guidelines_index.html b/src/templates/src/jam_2024_lj_guidelines_index.html new file mode 100644 index 00000000..822978fe --- /dev/null +++ b/src/templates/src/jam_2024_lj_guidelines_index.html @@ -0,0 +1,16 @@ +{{ template "jam_2024_learning_base.html" . }} + +{{ define "content-top" }} + {{ template "jam_2024_lj_bannersmall.html" . }} +{{ end }} + +{{ define "content" }} +
+ {{ template "jam_2024_lj_guidelines.html" . }} + +
+{{ end }} diff --git a/src/templates/src/jam_2024_lj_index.html b/src/templates/src/jam_2024_lj_index.html index 590cea90..6f916476 100644 --- a/src/templates/src/jam_2024_lj_index.html +++ b/src/templates/src/jam_2024_lj_index.html @@ -1,39 +1,11 @@ {{ template "jam_2024_learning_base.html" . }} {{ define "content-top" }} -
-
- -
-
Learning Jam
-
-
-
Learn
-
March 15-17, 2024
-
-
-
Share
-
March 22-24, 2024
-
-
-
-
- {{ if eq .DaysUntilStart 0 }} - {{ if gt .DaysUntilEnd 0 }} - {{ if .SubmittedProjectUrl }} - Share your progress - {{ else }} - Create your project - {{ end }} - Recent activity - {{ else }} - See the results - {{ end }} - {{ end }} - Join the Discord -
-
-
+ {{ if or (gt .DaysUntilStart 0) (eq .DaysUntilEnd 0) }} + {{ template "jam_2024_lj_bannerbig.html" . }} + {{ else }} + {{ template "jam_2024_lj_bannersmall.html" . }} + {{ end }} {{ end }} {{ define "content" }} @@ -63,14 +35,20 @@ {{ template "jam_2024_lj_description.html" . }} {{ if .TimelineItems }}
-

Recent Updates

-
+

Recent updates

+

+ See what community members are learning about their topics. You can share your own updates via your project page or using the !til command on Discord. +

+
{{ template "jam_2024_lj_feeditems.html" .TimelineItems }} + + See all updates
{{ svg "chevron-right" }}
+
{{ end }}
-

Projects

+

Projects

{{ template "jam_2024_lj_projects.html" .Projects }}
{{ else }} @@ -82,7 +60,7 @@ {{ template "jam_2024_lj_description.html" . }} {{ with .TwitchEmbedUrl }}
-

Recap Show

+

Recap show

Watch the livestream celebrating all the submissions:

@@ -92,7 +70,14 @@
{{ end }}
-

Projects

- {{ template "jam_2024_lj_projects.html" .Projects }} +
+

Submitted projects

+ + See all updates
{{ svg "chevron-right" }}
+ +
+
+ {{ template "jam_2024_lj_projects.html" .Projects }} +
{{ end }} diff --git a/src/templates/src/layouts/jam_2024_learning_base.html b/src/templates/src/layouts/jam_2024_learning_base.html index d458e41c..eea55a6f 100644 --- a/src/templates/src/layouts/jam_2024_learning_base.html +++ b/src/templates/src/layouts/jam_2024_learning_base.html @@ -55,7 +55,7 @@ --spacing-7: 16rem; --border-radius-2: 0.25rem; - --link-color: #8Bd5FF; + --link-color: transparent; } body { @@ -115,10 +115,13 @@ color: transparent; } - .c--theme-gradient-light { + a, .c--theme-gradient-light { background: var(--theme-gradient-light); background-clip: text; -webkit-background-clip: text; + } + + .c--theme-gradient-light { color: transparent; } @@ -134,6 +137,10 @@ background-color: var(--bg-button); } + .btn--jam.small { + padding: var(--spacing-1) var(--spacing-2); + } + .btn--jam:hover { background-color: var(--bg-button-hover); } @@ -187,16 +194,23 @@ padding-right: 0.6rem; } - .user-avatar-header { - width: 1.8rem; + .user-avatar { border-radius: 999px; background-color: rgba(0, 0, 0, 0.4); } + .user-avatar.header { + width: 1.8rem; + } + .jam-logo { max-width: 18rem; } + .jam-logo-small { + max-width: 8rem; + } + .jam-title { /* align with the width of the logo */ font-size: 2.76rem; @@ -208,6 +222,15 @@ margin-right: -0.03em; } + .jam-title.small { + font-size: 2.25rem; + /* align with the text's actual bounding box */ + line-height: 1.18; + margin-top: -0.18em; + margin-left: -0.03em; + margin-right: -0.03em; + } + /* not small */ @media screen and (min-width: 35em) { .jam-logo { @@ -241,7 +264,7 @@ Projects Jams - +
diff --git a/src/templates/src/project_index.html b/src/templates/src/project_index.html index a6c3e86e..72a421f8 100644 --- a/src/templates/src/project_index.html +++ b/src/templates/src/project_index.html @@ -132,6 +132,8 @@ 2023 Wheel Reinvention Jam {{- else if eq . "visibility-2023" -}} 2023 Visibility Jam + {{- else if eq . "learning-2024" -}} + 2024 Learning Jam {{- else -}} ??? {{- end -}} diff --git a/src/website/jam.go b/src/website/jam.go index ac98b476..9061c60c 100644 --- a/src/website/jam.go +++ b/src/website/jam.go @@ -46,32 +46,12 @@ func JamsIndex(c *RequestContext) ResponseData { func JamIndex2024_Learning(c *RequestContext) ResponseData { var res ResponseData - daysUntilStart := daysUntil(hmndata.LJ2024.StartTime) - daysUntilEnd := daysUntil(hmndata.LJ2024.EndTime) - baseData := getBaseDataAutocrumb(c, hmndata.LJ2024.Name) - baseData.OpenGraphItems = []templates.OpenGraphItem{ - {Property: "og:title", Value: "Learning Jam"}, - {Property: "og:site_name", Value: "Handmade Network"}, - {Property: "og:type", Value: "website"}, - {Property: "og:image", Value: hmnurl.BuildPublic("learningjam2024/2024LJOpenGraph.png", true)}, - {Property: "og:description", Value: "A two-weekend jam where you dive deep into a topic, then share it with the rest of the community."}, - {Property: "og:url", Value: hmnurl.BuildJamIndex2024_Learning()}, - {Name: "twitter:card", Value: "summary_large_image"}, - {Name: "twitter:image", Value: hmnurl.BuildPublic("learningjam2024/2024LJTwitterCard.png", true)}, - } + baseData.OpenGraphItems = opengraphLJ2024 - type JamPageData struct { - templates.BaseData - UserAvatarUrl string - DaysUntilStart, DaysUntilEnd int - TwitchEmbedUrl string - NewProjectUrl string - SubmittedProjectUrl string - JamFeedUrl string - - Projects JamProjectDataLJ2024 - TimelineItems []templates.TimelineItem + jamBaseData, err := getLJ2024BaseData(c) + if err != nil { + return c.ErrorResponse(http.StatusInternalServerError, err) } feedData, err := getLJ2024FeedData(c, 5) @@ -79,65 +59,35 @@ func JamIndex2024_Learning(c *RequestContext) ResponseData { return c.ErrorResponse(http.StatusInternalServerError, err) } + type JamPageData struct { + templates.BaseData + JamBaseDataLJ2024 + TwitchEmbedUrl string + + Projects JamProjectDataLJ2024 + TimelineItems []templates.TimelineItem + } + tmpl := JamPageData{ - BaseData: baseData, - UserAvatarUrl: templates.UserAvatarDefaultUrl("dark"), - DaysUntilStart: daysUntilStart, - DaysUntilEnd: daysUntilEnd, - TwitchEmbedUrl: getTwitchEmbedUrl(c), - NewProjectUrl: hmnurl.BuildProjectNewJam(), - SubmittedProjectUrl: "", - JamFeedUrl: hmnurl.BuildJamFeed2024_Learning(), + BaseData: baseData, + JamBaseDataLJ2024: jamBaseData, + TwitchEmbedUrl: getTwitchEmbedUrl(c), Projects: feedData.Projects, TimelineItems: feedData.TimelineItems, } - if c.CurrentUser != nil { - tmpl.UserAvatarUrl = templates.UserAvatarUrl(c.CurrentUser, "dark") - projects, err := hmndata.FetchProjects(c, c.Conn, c.CurrentUser, hmndata.ProjectsQuery{ - OwnerIDs: []int{c.CurrentUser.ID}, - JamSlugs: []string{hmndata.LJ2024.Slug}, - Limit: 1, - }) - if err != nil { - return c.ErrorResponse(http.StatusInternalServerError, oops.New(err, "failed to fetch jam projects for current user")) - } - if len(projects) > 0 { - urlContext := hmndata.UrlContextForProject(&projects[0].Project) - tmpl.SubmittedProjectUrl = urlContext.BuildHomepage() - } - } - res.MustWriteTemplate("jam_2024_lj_index.html", tmpl, c.Perf) return res } func JamFeed2024_Learning(c *RequestContext) ResponseData { - daysUntilStart := daysUntil(hmndata.LJ2024.StartTime) - daysUntilEnd := daysUntil(hmndata.LJ2024.EndTime) - baseData := getBaseDataAutocrumb(c, hmndata.LJ2024.Name) - baseData.OpenGraphItems = []templates.OpenGraphItem{ - {Property: "og:title", Value: "Learning Jam"}, - {Property: "og:site_name", Value: "Handmade Network"}, - {Property: "og:type", Value: "website"}, - {Property: "og:image", Value: hmnurl.BuildPublic("learningjam2024/2024LJOpenGraph.png", true)}, - {Property: "og:description", Value: "A two-weekend jam where you dive deep into a topic, then teach it to the rest of the community."}, - {Property: "og:url", Value: hmnurl.BuildJamFeed2024_Learning()}, - {Name: "twitter:card", Value: "summary_large_image"}, - {Name: "twitter:image", Value: hmnurl.BuildPublic("learningjam2024/2024LJTwitterCard.png", true)}, - } + baseData.OpenGraphItems = opengraphLJ2024 - type JamFeedData struct { - templates.BaseData - UserAvatarUrl string - DaysUntilStart, DaysUntilEnd int - ProjectSubmissionUrl string - SubmittedProjectUrl string - - Projects JamProjectDataLJ2024 - TimelineItems []templates.TimelineItem + jamBaseData, err := getLJ2024BaseData(c) + if err != nil { + return c.ErrorResponse(http.StatusInternalServerError, err) } feedData, err := getLJ2024FeedData(c, 0) @@ -145,31 +95,20 @@ func JamFeed2024_Learning(c *RequestContext) ResponseData { return c.ErrorResponse(http.StatusInternalServerError, err) } - tmpl := JamFeedData{ - BaseData: baseData, - UserAvatarUrl: templates.UserAvatarDefaultUrl("dark"), - DaysUntilStart: daysUntilStart, - DaysUntilEnd: daysUntilEnd, - ProjectSubmissionUrl: hmnurl.BuildProjectNewJam(), - SubmittedProjectUrl: "", - Projects: feedData.Projects, - TimelineItems: feedData.TimelineItems, + type JamFeedData struct { + templates.BaseData + JamBaseDataLJ2024 + + Projects JamProjectDataLJ2024 + TimelineItems []templates.TimelineItem } - if c.CurrentUser != nil { - tmpl.UserAvatarUrl = templates.UserAvatarUrl(c.CurrentUser, "dark") - projects, err := hmndata.FetchProjects(c, c.Conn, c.CurrentUser, hmndata.ProjectsQuery{ - OwnerIDs: []int{c.CurrentUser.ID}, - JamSlugs: []string{hmndata.LJ2024.Slug}, - Limit: 1, - }) - if err != nil { - return c.ErrorResponse(http.StatusInternalServerError, oops.New(err, "failed to fetch jam projects for current user")) - } - if len(projects) > 0 { - urlContext := hmndata.UrlContextForProject(&projects[0].Project) - tmpl.SubmittedProjectUrl = urlContext.BuildHomepage() - } + tmpl := JamFeedData{ + BaseData: baseData, + JamBaseDataLJ2024: jamBaseData, + + Projects: feedData.Projects, + TimelineItems: feedData.TimelineItems, } var res ResponseData @@ -177,6 +116,51 @@ func JamFeed2024_Learning(c *RequestContext) ResponseData { return res } +func JamGuidelines2024_Learning(c *RequestContext) ResponseData { + baseData := getBaseDataAutocrumb(c, hmndata.LJ2024.Name) + baseData.OpenGraphItems = opengraphLJ2024 + + jamBaseData, err := getLJ2024BaseData(c) + if err != nil { + return c.ErrorResponse(http.StatusInternalServerError, err) + } + + type JamGuidelinesData struct { + templates.BaseData + JamBaseDataLJ2024 + } + + tmpl := JamGuidelinesData{ + BaseData: baseData, + JamBaseDataLJ2024: jamBaseData, + } + + var res ResponseData + res.MustWriteTemplate("jam_2024_lj_guidelines_index.html", tmpl, c.Perf) + return res +} + +var opengraphLJ2024 = []templates.OpenGraphItem{ + {Property: "og:title", Value: "Learning Jam"}, + {Property: "og:site_name", Value: "Handmade Network"}, + {Property: "og:type", Value: "website"}, + {Property: "og:image", Value: hmnurl.BuildPublic("learningjam2024/2024LJOpenGraph.png", true)}, + {Property: "og:description", Value: "A two-weekend jam where you dive deep into a topic, then share it with the rest of the community."}, + {Property: "og:url", Value: hmnurl.BuildJamIndex2024_Learning()}, + {Name: "twitter:card", Value: "summary_large_image"}, + {Name: "twitter:image", Value: hmnurl.BuildPublic("learningjam2024/2024LJTwitterCard.png", true)}, +} + +type JamBaseDataLJ2024 struct { + UserAvatarUrl string + DaysUntilStart, DaysUntilEnd int + JamUrl string + JamFeedUrl string + NewProjectUrl string + SubmittedProjectUrl string + GuidelinesUrl string +} + type JamProjectDataLJ2024 struct { Projects []templates.Project NewProjectUrl string @@ -189,6 +173,39 @@ type JamFeedDataLJ2024 struct { projects []hmndata.ProjectAndStuff } +func getLJ2024BaseData(c *RequestContext) (JamBaseDataLJ2024, error) { + daysUntilStart := daysUntil(hmndata.LJ2024.StartTime) + daysUntilEnd := daysUntil(hmndata.LJ2024.EndTime) + + tmpl := JamBaseDataLJ2024{ + UserAvatarUrl: templates.UserAvatarDefaultUrl("dark"), + DaysUntilStart: daysUntilStart, + DaysUntilEnd: daysUntilEnd, + JamUrl: hmnurl.BuildJamIndex2024_Learning(), + JamFeedUrl: hmnurl.BuildJamFeed2024_Learning(), + NewProjectUrl: hmnurl.BuildProjectNewJam(), + GuidelinesUrl: hmnurl.BuildJamGuidelines2024_Learning(), + } + + if c.CurrentUser != nil { + tmpl.UserAvatarUrl = templates.UserAvatarUrl(c.CurrentUser, "dark") + projects, err := hmndata.FetchProjects(c, c.Conn, c.CurrentUser, hmndata.ProjectsQuery{ + OwnerIDs: []int{c.CurrentUser.ID}, + JamSlugs: []string{hmndata.LJ2024.Slug}, + Limit: 1, + }) + if err != nil { + return JamBaseDataLJ2024{}, oops.New(err, "failed to fetch jam projects for current user") + } + if len(projects) > 0 { + urlContext := hmndata.UrlContextForProject(&projects[0].Project) + tmpl.SubmittedProjectUrl = urlContext.BuildHomepage() + } + } + + return tmpl, nil +} + // 0 for no limit on timeline items. func getLJ2024FeedData(c *RequestContext, maxTimelineItems int) (JamFeedDataLJ2024, error) { jamProjects, err := hmndata.FetchProjects(c, c.Conn, c.CurrentUser, hmndata.ProjectsQuery{ @@ -247,7 +264,7 @@ func getTwitchEmbedUrl(c *RequestContext) string { FROM twitch_latest_status WHERE twitch_login = $1 `, - "carlsagan42", + "handmadenetwork", ) if err != nil { c.Logger.Warn().Err(err).Msg("failed to query Twitch status for the HMN account") diff --git a/src/website/routes.go b/src/website/routes.go index d1231e09..3ecd7e9f 100644 --- a/src/website/routes.go +++ b/src/website/routes.go @@ -73,6 +73,7 @@ func NewWebsiteRoutes(conn *pgxpool.Pool) http.Handler { hmnOnly.GET(hmnurl.RegexJamFeed2023, JamFeed2023) hmnOnly.GET(hmnurl.RegexJamIndex2024_Learning, JamIndex2024_Learning) hmnOnly.GET(hmnurl.RegexJamFeed2024_Learning, JamFeed2024_Learning) + hmnOnly.GET(hmnurl.RegexJamGuidelines2024_Learning, JamGuidelines2024_Learning) hmnOnly.GET(hmnurl.RegexTimeMachine, TimeMachine) hmnOnly.GET(hmnurl.RegexTimeMachineSubmissions, TimeMachineSubmissions)