Skip to content

Commit 633da5c

Browse files
committed
Minor fixes
1 parent 7b70c6c commit 633da5c

File tree

5 files changed

+9
-7
lines changed

5 files changed

+9
-7
lines changed

src/hmndata/jams.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,8 @@ var AllJams = []Jam{
143143
WRJ2025,
144144
}
145145

146+
var LatestJam = WRJ2025 // NOTE(asaf): The /jam route will redirect here
147+
146148
func CurrentJam() *Jam {
147149
now := time.Now()
148150
for i, jam := range AllJams {

src/templates/src/include/jam_2024_lj_sections.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -392,9 +392,9 @@ <h2 class="dib c--theme-gradient-light">Why?</h2>
392392
{{ end }}
393393

394394
{{ define "lj2024-projects" }}
395-
{{ if . }}
395+
{{ if .JamProjects }}
396396
<div class="flex flex-row flex-wrap g2 link--white">
397-
{{ range . }}
397+
{{ range .JamProjects }}
398398
<div class="flex-basis-40-ns flex-grow-1 flex-shrink-1 bg--rich-gray pa3 flex flex-column g1">
399399
{{ if gt (len .Owners) 1 }}
400400
<div class="flex g2">
@@ -420,7 +420,7 @@ <h2 class="dib c--theme-gradient-light">Why?</h2>
420420
<div class="flex-grow-1">{{ .Blurb }}</div>
421421
</div>
422422
{{ end }}
423-
{{ if isodd (len .) }}
423+
{{ if isodd (len .JamProjects) }}
424424
<div class="flex-basis-40-ns flex-grow-1 flex-shrink-1"></div>
425425
{{ end }}
426426
</div>

src/templates/src/include/jam_2025_wrj_includes.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,7 @@ <h2 class="f3 pb3">Watch the recap</h2>
423423
<p>Watch the live recap show celebrating all of this year&apos;s amazing submissions.</p>
424424
<div class="aspect-ratio aspect-ratio--16x9">
425425
{{ if .RecapStreamEmbedUrl }}
426-
<iframe class="aspect-ratio--object" src="https://www.youtube-nocookie.com/embed/lXCoA4sotGg" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" allowfullscreen></iframe>
426+
<iframe class="aspect-ratio--object" src="{{ .RecapStreamEmbedUrl }}" title="YouTube video player" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" allowfullscreen></iframe>
427427
{{ else if .TwitchEmbedUrl }}
428428
<iframe class="aspect-ratio--object" src="{{ .TwitchEmbedUrl }}" allowfullscreen frameborder="0"></iframe>
429429
{{ end }}

src/templates/src/jam_2024_lj_index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ <h2 class="c--theme-gradient-light">Recent updates</h2>
4747
{{ end }}
4848
<div class="ph3 pv4 bb b--rich-gray">
4949
<h2 class="c--theme-gradient-light mb3">Projects</h2>
50-
{{ template "lj2024-projects" .JamProjects }}
50+
{{ template "lj2024-projects" . }}
5151
</div>
5252
{{ else }}
5353
{{ template "lj2024-guidelines" . }}
@@ -73,7 +73,7 @@ <h2 class="c--theme-gradient-light mb0">Submitted projects</h2>
7373
</a>
7474
</div>
7575
<div class="mt3">
76-
{{ template "lj2024-projects" .JamProjects }}
76+
{{ template "lj2024-projects" . }}
7777
</div>
7878
</div>
7979
{{ end }}

src/website/routes.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ func NewWebsiteRoutes(conn *pgxpool.Pool, perfCollector *perf.PerfCollector) htt
113113

114114
hmnOnly.GET(hmnurl.RegexJamsIndex, JamsIndex)
115115
hmnOnly.GET(hmnurl.RegexJamIndex, func(c *RequestContext) ResponseData {
116-
return c.Redirect(hmnurl.BuildJamGenericIndex(hmndata.XRay2025.UrlSlug), http.StatusFound)
116+
return c.Redirect(hmnurl.BuildJamGenericIndex(hmndata.LatestJam.UrlSlug), http.StatusFound)
117117
})
118118
hmnOnly.GET(hmnurl.RegexJamIndex2021, JamIndex2021)
119119
hmnOnly.GET(hmnurl.RegexJamIndex2022, JamIndex2022)

0 commit comments

Comments
 (0)