From 639ea17a8817b110023cba9b2924232064368ddc Mon Sep 17 00:00:00 2001 From: Asaf Gartner Date: Mon, 11 Mar 2024 20:15:32 +0200 Subject: [PATCH] Timeline and projects for learning jam --- src/templates/mapping.go | 3 ++ src/templates/src/jam_2024_lj_feed.html | 49 ++++++++++++++----- src/templates/src/jam_2024_lj_index.html | 2 +- .../src/layouts/jam_2024_learning_base.html | 24 ++++++++- src/templates/templates.go | 6 +++ src/website/jam.go | 9 ++++ 6 files changed, 79 insertions(+), 14 deletions(-) diff --git a/src/templates/mapping.go b/src/templates/mapping.go index 7a27259..d5fe536 100644 --- a/src/templates/mapping.go +++ b/src/templates/mapping.go @@ -103,6 +103,9 @@ func ProjectToTemplate( func ProjectAndStuffToTemplate(p *hmndata.ProjectAndStuff, url string, theme string) Project { res := ProjectToTemplate(&p.Project, url) res.Logo = ProjectLogoUrl(&p.Project, p.LogoLightAsset, p.LogoDarkAsset, theme) + for _, o := range p.Owners { + res.Owners = append(res.Owners, UserToTemplate(o, theme)) + } return res } diff --git a/src/templates/src/jam_2024_lj_feed.html b/src/templates/src/jam_2024_lj_feed.html index 16fb04b..24acf7b 100644 --- a/src/templates/src/jam_2024_lj_feed.html +++ b/src/templates/src/jam_2024_lj_feed.html @@ -17,7 +17,7 @@ -
+
{{ if and (eq .DaysUntilStart 0) (gt .DaysUntilEnd 0) }} {{ if .SubmittedProjectUrl }} Share your progress @@ -33,26 +33,53 @@ {{ define "content" }}
+
+

Projects

+
+ {{ if .Projects }} + {{ range .Projects }} +
+
+ {{ .Name }} +
+
{{ .Blurb }}
+
+ by + {{ $owners := .Owners }} + {{ range $idx, $owner := .Owners }} + {{ $owner.Name }}{{ if not (lastidx $idx (len $owners)) }},{{ end }} + {{ end }} +
+
+ {{ end }} + {{ if isodd (len .Projects) }} +
+ {{ end }} + {{ end }} +
+

Recent activity

{{ if .TimelineItems }} {{ range .TimelineItems }} -
-
+
+
{{ if .OwnerAvatarUrl }} - + {{ end }}
-
{{ .OwnerName }}
-
{{ timehtml (relativedate .Date) .Date }}
+
+ {{ (index .Projects 0).Name }} + by + {{ .OwnerName }} + {{ timehtml (relativedate .Date) .Date }} +
+
{{ trim .Description }}
- {{ if .Description }} -
{{ trim .Description }}
- {{ end }} {{ range .EmbedMedia }}
{{ if eq .Type mediaimage }} @@ -69,7 +96,7 @@ {{ .EmbedHTML }} {{ else }} {{ end }}
@@ -82,7 +109,7 @@
-
+
{{ svg "hmn_circuit" }}
diff --git a/src/templates/src/jam_2024_lj_index.html b/src/templates/src/jam_2024_lj_index.html index 0cd0535..a85366a 100644 --- a/src/templates/src/jam_2024_lj_index.html +++ b/src/templates/src/jam_2024_lj_index.html @@ -17,7 +17,7 @@
-
+
{{ if eq .DaysUntilStart 0 }} {{ if gt .DaysUntilEnd 0 }} {{ if .SubmittedProjectUrl }} diff --git a/src/templates/src/layouts/jam_2024_learning_base.html b/src/templates/src/layouts/jam_2024_learning_base.html index 97f62f9..d458e41 100644 --- a/src/templates/src/layouts/jam_2024_learning_base.html +++ b/src/templates/src/layouts/jam_2024_learning_base.html @@ -54,6 +54,8 @@ --spacing-6: 8rem; --spacing-7: 16rem; --border-radius-2: 0.25rem; + + --link-color: #8Bd5FF; } body { @@ -65,6 +67,14 @@ font-weight: 700; } + .w2-5 { + width: 3rem; + } + + .link--white { + --link-color: var(--white); + } + .post-content p { /* stupid override, should be done by .post-content instead of .content */ margin: 0.6rem 0; @@ -90,6 +100,10 @@ background: var(--gray); } + .b--charcoal { + border-color: var(--charcoal); + } + .b--rich-gray { border-color: var(--rich-gray); } @@ -108,6 +122,10 @@ color: transparent; } + .c--gray { + color: var(--gray); + } + .btn--jam { border: 1px solid var(--white); border-radius: var(--border-radius-2); @@ -203,7 +221,9 @@ /* not small */ @media screen and (min-width: 35em) { - + .flex-basis-40-ns { + flex-basis: 40%; + } } @@ -212,7 +232,7 @@
-
+
diff --git a/src/templates/templates.go b/src/templates/templates.go index d82e2b2..f17e52e 100644 --- a/src/templates/templates.go +++ b/src/templates/templates.go @@ -287,6 +287,12 @@ var HMNTemplateFuncs = template.FuncMap{ "trim": func(str template.HTML) template.HTML { return template.HTML(strings.TrimSpace(string(str))) }, + "lastidx": func(idx int, l int) bool { + return idx == l-1 + }, + "isodd": func(num int) bool { + return num%2 == 1 + }, // NOTE(asaf): Template specific functions: "projectcarddata": func(project Project, classes string) ProjectCardData { diff --git a/src/website/jam.go b/src/website/jam.go index 0d8fa6f..44f9457 100644 --- a/src/website/jam.go +++ b/src/website/jam.go @@ -144,6 +144,7 @@ func JamFeed2024_Learning(c *RequestContext) ResponseData { ProjectSubmissionUrl string SubmittedProjectUrl string + Projects []templates.Project TimelineItems []templates.TimelineItem } @@ -194,6 +195,13 @@ func JamFeed2024_Learning(c *RequestContext) ResponseData { } } + projects := make([]templates.Project, 0, len(jamProjects)) + for _, jp := range jamProjects { + urlContext := hmndata.UrlContextForProject(&jp.Project) + projectUrl := urlContext.BuildHomepage() + projects = append(projects, templates.ProjectAndStuffToTemplate(&jp, projectUrl, c.Theme)) + } + tmpl := JamFeedData{ BaseData: baseData, UserAvatarUrl: templates.UserAvatarDefaultUrl("dark"), @@ -202,6 +210,7 @@ func JamFeed2024_Learning(c *RequestContext) ResponseData { TwitchEmbedUrl: twitchEmbedUrl, ProjectSubmissionUrl: hmnurl.BuildProjectNewJam(), SubmittedProjectUrl: "", + Projects: projects, TimelineItems: timelineItems, }