From 25cc5ef11b17020aa3314a46b28dd76b9a3efd6c Mon Sep 17 00:00:00 2001 From: Ben Visness Date: Mon, 25 Sep 2023 02:40:45 -0500 Subject: [PATCH] Rework structure of project index. Need new copy. --- public/style.css | 21 +++ src/hmndata/jams.go | 36 ++-- src/hmnurl/hmnurl_test.go | 18 +- src/hmnurl/urls.go | 17 +- src/rawdata/scss/_core.scss | 18 ++ src/templates/src/project_index.html | 112 ++++++++---- src/website/base_data.go | 4 +- src/website/feed.go | 2 +- src/website/projects.go | 251 +++++++++++++++++++-------- 9 files changed, 349 insertions(+), 130 deletions(-) diff --git a/public/style.css b/public/style.css index 574382b..8207383 100644 --- a/public/style.css +++ b/public/style.css @@ -7553,6 +7553,15 @@ article code { .g5 { gap: 4rem; } +.grid { + display: grid; } + +.grid-1 { + grid-template-columns: 1fr; } + +.grid-2 { + grid-template-columns: 1fr 1fr; } + .aspect-ratio--2x1 { padding-bottom: 50%; } @@ -7582,6 +7591,10 @@ article code { column-gap: 2rem; } .cg5-ns { column-gap: 4rem; } + .grid-1-ns { + grid-template-columns: 1fr; } + .grid-2-ns { + grid-template-columns: 1fr 1fr; } .bg--dim-ns { background-color: #f0f0f0; background-color: var(--dim-background); } } @@ -7607,6 +7620,10 @@ article code { column-gap: 2rem; } .cg5-m { column-gap: 4rem; } + .grid-1-m { + grid-template-columns: 1fr; } + .grid-2-m { + grid-template-columns: 1fr 1fr; } .bg--dim-m { background-color: #f0f0f0; background-color: var(--dim-background); } } @@ -7632,6 +7649,10 @@ article code { column-gap: 2rem; } .cg5-l { column-gap: 4rem; } + .grid-1-l { + grid-template-columns: 1fr; } + .grid-2-l { + grid-template-columns: 1fr 1fr; } .bg--dim-l { background-color: #f0f0f0; background-color: var(--dim-background); } } diff --git a/src/hmndata/jams.go b/src/hmndata/jams.go index 181e377..3b206f3 100644 --- a/src/hmndata/jams.go +++ b/src/hmndata/jams.go @@ -17,8 +17,9 @@ type Event struct { type Jam struct { Event - Name string - Slug string + Name string + Slug string + UrlSlug string } var WRJ2021 = Jam{ @@ -26,8 +27,9 @@ var WRJ2021 = Jam{ StartTime: time.Date(2021, 9, 27, 0, 0, 0, 0, time.UTC), EndTime: time.Date(2021, 10, 4, 0, 0, 0, 0, time.UTC), }, - Name: "Wheel Reinvention Jam 2021", - Slug: "WRJ2021", + Name: "Wheel Reinvention Jam 2021", + Slug: "WRJ2021", + UrlSlug: "2021", } var WRJ2022 = Jam{ @@ -35,8 +37,9 @@ var WRJ2022 = Jam{ StartTime: time.Date(2022, 8, 15, 0, 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"))), }, - Name: "Wheel Reinvention Jam 2022", - Slug: "WRJ2022", + Name: "Wheel Reinvention Jam 2022", + Slug: "WRJ2022", + UrlSlug: "2022", } var VJ2023 = Jam{ @@ -44,8 +47,9 @@ var VJ2023 = Jam{ StartTime: time.Date(2023, 4, 14, 0, 0, 0, 0, time.UTC), EndTime: time.Date(2023, 4, 17, 0, 0, 0, 0, time.UTC), }, - Name: "Visibility Jam 2023", - Slug: "VJ2023", + Name: "Visibility Jam 2023", + Slug: "VJ2023", + UrlSlug: "visibility-2023", } var WRJ2023 = Jam{ @@ -53,8 +57,9 @@ var WRJ2023 = Jam{ StartTime: time.Date(2023, 9, 25, 10, 0, 0, 0, utils.Must1(time.LoadLocation("Europe/London"))), EndTime: time.Date(2023, 10, 1, 20, 0, 0, 0, utils.Must1(time.LoadLocation("Europe/London"))), }, - Name: "Wheel Reinvention Jam 2023", - Slug: "WRJ2023", + Name: "Wheel Reinvention Jam 2023", + Slug: "WRJ2023", + UrlSlug: "2023", } var HMS2022 = Event{ @@ -84,6 +89,17 @@ func CurrentJam() *Jam { return nil } +func PreviousJam() *Jam { + now := time.Now() + var mostRecent *Jam + for i, jam := range AllJams { + if jam.EndTime.Before(now) { + mostRecent = &AllJams[i] + } + } + return mostRecent +} + func JamBySlug(slug string) Jam { for _, jam := range AllJams { if jam.Slug == slug { diff --git a/src/hmnurl/hmnurl_test.go b/src/hmnurl/hmnurl_test.go index 1fc502b..cbbaa0a 100644 --- a/src/hmnurl/hmnurl_test.go +++ b/src/hmnurl/hmnurl_test.go @@ -142,9 +142,11 @@ func TestFeed(t *testing.T) { } func TestProjectIndex(t *testing.T) { - AssertRegexMatch(t, BuildProjectIndex(1), RegexProjectIndex, nil) - AssertRegexMatch(t, BuildProjectIndex(2), RegexProjectIndex, map[string]string{"page": "2"}) - assert.Panics(t, func() { BuildProjectIndex(0) }) + AssertRegexMatch(t, BuildProjectIndex(1, ""), RegexProjectIndex, nil) + AssertRegexMatch(t, BuildProjectIndex(2, ""), RegexProjectIndex, map[string]string{"page": "2"}) + AssertRegexMatch(t, BuildProjectIndex(1, "test"), RegexProjectIndex, map[string]string{"category": "test"}) + AssertRegexMatch(t, BuildProjectIndex(2, "test"), RegexProjectIndex, map[string]string{"page": "2", "category": "test"}) + assert.Panics(t, func() { BuildProjectIndex(0, "") }) } func TestProjectNew(t *testing.T) { @@ -415,6 +417,16 @@ func TestJamRecap2023_Visibility(t *testing.T) { AssertSubdomain(t, BuildJamRecap2023_Visibility(), "") } +func TestJamIndex2023(t *testing.T) { + AssertRegexMatch(t, BuildJamIndex2023(), RegexJamIndex2023, nil) + AssertSubdomain(t, BuildJamIndex2023(), "") +} + +func TestJamFeed2023(t *testing.T) { + AssertRegexMatch(t, BuildJamFeed2023(), RegexJamFeed2023, nil) + AssertSubdomain(t, BuildJamFeed2023(), "") +} + func TestTimeMachine(t *testing.T) { AssertRegexMatch(t, BuildTimeMachine(), RegexTimeMachine, nil) AssertSubdomain(t, BuildTimeMachine(), "") diff --git a/src/hmnurl/urls.go b/src/hmnurl/urls.go index af54253..0c143db 100644 --- a/src/hmnurl/urls.go +++ b/src/hmnurl/urls.go @@ -126,6 +126,11 @@ func BuildJamRecap2023_Visibility() string { return Url("/jam/visibility-2023/recap", nil) } +func BuildJamIndexAny(slug string) string { + defer CatchPanic() + return Url(fmt.Sprintf("/jam/%s", slug), nil) +} + var RegexTimeMachine = regexp.MustCompile("^/timemachine$") func BuildTimeMachine() string { @@ -445,17 +450,21 @@ func BuildAtomFeedForShowcase() string { * Projects */ -var RegexProjectIndex = regexp.MustCompile("^/projects(/(?P.+)?)?$") +var RegexProjectIndex = regexp.MustCompile(`^/projects(/(?P[a-z][a-z0-9]+))?(/(?P\d+))?$`) -func BuildProjectIndex(page int) string { +func BuildProjectIndex(page int, category string) string { defer CatchPanic() if page < 1 { panic(oops.New(nil, "page must be >= 1")) } + catpath := "" + if category != "" { + catpath = "/" + category + } if page == 1 { - return Url("/projects", nil) + return Url(fmt.Sprintf("/projects%s", catpath), nil) } else { - return Url(fmt.Sprintf("/projects/%d", page), nil) + return Url(fmt.Sprintf("/projects%s/%d", catpath, page), nil) } } diff --git a/src/rawdata/scss/_core.scss b/src/rawdata/scss/_core.scss index da90023..067cce1 100644 --- a/src/rawdata/scss/_core.scss +++ b/src/rawdata/scss/_core.scss @@ -372,6 +372,18 @@ article code { .g4 { gap: $spacing-large; } .g5 { gap: $spacing-extra-large; } +.grid { + display: grid; +} + +.grid-1 { + grid-template-columns: 1fr; +} + +.grid-2 { + grid-template-columns: 1fr 1fr; +} + .aspect-ratio--2x1 { padding-bottom: 50%; } @@ -392,6 +404,8 @@ article code { .cg3-ns { column-gap: $spacing-medium; } .cg4-ns { column-gap: $spacing-large; } .cg5-ns { column-gap: $spacing-extra-large; } + .grid-1-ns { grid-template-columns: 1fr; } + .grid-2-ns { grid-template-columns: 1fr 1fr; } .bg--dim-ns { @include usevar(background-color, dim-background); @@ -409,6 +423,8 @@ article code { .cg3-m { column-gap: $spacing-medium; } .cg4-m { column-gap: $spacing-large; } .cg5-m { column-gap: $spacing-extra-large; } + .grid-1-m { grid-template-columns: 1fr; } + .grid-2-m { grid-template-columns: 1fr 1fr; } .bg--dim-m { @include usevar(background-color, dim-background); @@ -426,6 +442,8 @@ article code { .cg3-l { column-gap: $spacing-medium; } .cg4-l { column-gap: $spacing-large; } .cg5-l { column-gap: $spacing-extra-large; } + .grid-1-l { grid-template-columns: 1fr; } + .grid-2-l { grid-template-columns: 1fr 1fr; } .bg--dim-l { @include usevar(background-color, dim-background); diff --git a/src/templates/src/project_index.html b/src/templates/src/project_index.html index 36eef58..b30aa72 100644 --- a/src/templates/src/project_index.html +++ b/src/templates/src/project_index.html @@ -4,13 +4,13 @@ {{ end }} -{{ define "content" }} +{{ define "all_projects" }}
- {{ with .CarouselProjects }} + {{ with .OfficialProjects }}
{{ range $index, $project := . }} -
+

{{ $project.Name }}

@@ -31,42 +31,55 @@
{{ end }} -
-
-
-
-
- 4 RSS Feed – New Projects -
-
- {{ template "pagination.html" .Pagination }} -
-
- -
- {{ range .Projects }} -
+
+ {{ if .OfficialProjects }} +
+

Official Projects

+

These projects are boop boop hahahaa:

+
+ {{ range .OfficialProjects }} {{ template "project_card.html" projectcarddata . "" }} -
- {{ end }} + {{ end }} +
+ See more »
- -
-
-
{{ template "pagination.html" .Pagination }}
-
-
-
-
+ {{ end }} + {{ if .PersonalProjects }} +

Personal Projects

-

Many community members have projects of their own that are currently works in progress. Here's a few:

- {{ range .PersonalProjects }} -
+

Many community members have projects of their own. Here's a few:

+
+ {{ range .PersonalProjects }} {{ template "project_card.html" projectcarddata . "" }} -
- {{ end }} + {{ end }} +
+ See more »
-
+ {{ end }} + {{ if .CurrentJamProjects }} +
+

JAM! NOWS!

+

wowowowow

+
+ {{ range .CurrentJamProjects }} + {{ template "project_card.html" projectcarddata . "" }} + {{ end }} +
+ See more » +
+ {{ end }} + {{ if .PreviousJamProjects }} +
+

JAM! THENS!

+

nonononoono

+
+ {{ range .PreviousJamProjects }} + {{ template "project_card.html" projectcarddata . "" }} + {{ end }} +
+ See more » +
+ {{ end }}
@@ -76,3 +89,34 @@ }); {{ end }} + +{{ define "single_category" }} +
+
+
+
+
+ {{ template "pagination.html" .Pagination }} +
+
+ +
+ {{ range .PageProjects }} + {{ template "project_card.html" projectcarddata . "" }} + {{ end }} +
+ +
+
+
{{ template "pagination.html" .Pagination }}
+
+
+{{ end }} + +{{ define "content" }} + {{ if .AllProjects }} + {{ template "all_projects" . }} + {{ else }} + {{ template "single_category" . }} + {{ end }} +{{ end }} diff --git a/src/website/base_data.go b/src/website/base_data.go index 8f391c5..c4949ab 100644 --- a/src/website/base_data.go +++ b/src/website/base_data.go @@ -72,7 +72,7 @@ func getBaseData(c *RequestContext, title string, breadcrumbs []templates.Breadc LoginWithDiscordUrl: hmnurl.BuildLoginWithDiscord(c.FullUrl()), HMNHomepageUrl: hmnurl.BuildHomepage(), - ProjectIndexUrl: hmnurl.BuildProjectIndex(1), + ProjectIndexUrl: hmnurl.BuildProjectIndex(1, ""), PodcastUrl: hmnurl.BuildPodcast(), FishbowlUrl: hmnurl.BuildFishbowlIndex(), ForumsUrl: hmnurl.HMNProjectContext.BuildForum(nil, 1), @@ -85,7 +85,7 @@ func getBaseData(c *RequestContext, title string, breadcrumbs []templates.Breadc AboutUrl: hmnurl.BuildAbout(), ManifestoUrl: hmnurl.BuildManifesto(), CommunicationGuidelinesUrl: hmnurl.BuildCommunicationGuidelines(), - ProjectIndexUrl: hmnurl.BuildProjectIndex(1), + ProjectIndexUrl: hmnurl.BuildProjectIndex(1, ""), RolesUrl: hmnurl.BuildStaffRolesIndex(), ContactUrl: hmnurl.BuildContactPage(), SearchActionUrl: "https://duckduckgo.com", diff --git a/src/website/feed.go b/src/website/feed.go index e0e9929..7e9ed3a 100644 --- a/src/website/feed.go +++ b/src/website/feed.go @@ -149,7 +149,7 @@ func AtomFeed(c *RequestContext) ResponseData { feedData.FeedType = FeedTypeProjects feedData.FeedID = FeedIDProjects feedData.AtomFeedUrl = hmnurl.BuildAtomFeedForProjects() - feedData.FeedUrl = hmnurl.BuildProjectIndex(1) + feedData.FeedUrl = hmnurl.BuildProjectIndex(1, "") c.Perf.StartBlock("SQL", "Fetching projects") _, hasAll := c.Req.URL.Query()["all"] diff --git a/src/website/projects.go b/src/website/projects.go index 149ef38..b77f28d 100644 --- a/src/website/projects.go +++ b/src/website/projects.go @@ -6,7 +6,6 @@ import ( "fmt" "image" "io" - "math" "math/rand" "net/http" "path" @@ -29,7 +28,7 @@ import ( "github.com/teacat/noire" ) -const maxPersonalProjects = 5 +const maxPersonalProjects = 10 const maxProjectOwners = 5 func ProjectCSS(c *RequestContext) ResponseData { @@ -75,41 +74,143 @@ func ProjectCSS(c *RequestContext) ResponseData { type ProjectTemplateData struct { templates.BaseData - Pagination templates.Pagination - CarouselProjects []templates.Project - Projects []templates.Project - PersonalProjects []templates.Project + AllProjects bool - ProjectAtomFeedUrl string - WIPForumUrl string + // Stuff for all projects + OfficialProjects []templates.Project + OfficialProjectsLink string + PersonalProjects []templates.Project + PersonalProjectsLink string + CurrentJamProjects []templates.Project + CurrentJamLink string + PreviousJamProjects []templates.Project + PreviousJamLink string + + // Stuff for pages of projects only + Pagination templates.Pagination + PageProjects []templates.Project } func ProjectIndex(c *RequestContext) ResponseData { - const projectsPerPage = 20 - const maxCarouselProjects = 10 - const maxPersonalProjects = 10 + cat := c.PathParams["category"] + pageStr := c.PathParams["page"] - officialProjects, err := hmndata.FetchProjects(c, c.Conn, c.CurrentUser, hmndata.ProjectsQuery{ + currentJam := hmndata.CurrentJam() + previousJam := hmndata.PreviousJam() + + if cat == "" && pageStr == "" { + const projectsPerSection = 8 + + officialProjects, err := getShuffledOfficialProjects(c) + if err != nil { + return c.ErrorResponse(http.StatusInternalServerError, err) + } + + personalProjects, err := getPersonalProjects(c, "") + if err != nil { + return c.ErrorResponse(http.StatusInternalServerError, err) + } + + var currentJamProjects []templates.Project + if currentJam != nil { + var err error + currentJamProjects, err = getPersonalProjects(c, currentJam.Slug) + if err != nil { + return c.ErrorResponse(http.StatusInternalServerError, err) + } + } + + previousJamProjects, err := getPersonalProjects(c, previousJam.Slug) + if err != nil { + return c.ErrorResponse(http.StatusInternalServerError, err) + } + + baseData := getBaseDataAutocrumb(c, "Projects") + tmpl := ProjectTemplateData{ + BaseData: baseData, + + AllProjects: true, + + OfficialProjects: officialProjects[:utils.IntMin(len(officialProjects), projectsPerSection)], + OfficialProjectsLink: hmnurl.BuildProjectIndex(1, "official"), + PersonalProjects: personalProjects[:utils.IntMin(len(personalProjects), projectsPerSection)], + PersonalProjectsLink: hmnurl.BuildProjectIndex(1, "personal"), + CurrentJamProjects: currentJamProjects[:utils.IntMin(len(currentJamProjects), projectsPerSection)], + // CurrentJamLink set later + PreviousJamProjects: previousJamProjects[:utils.IntMin(len(previousJamProjects), projectsPerSection)], + PreviousJamLink: hmnurl.BuildJamIndexAny(previousJam.UrlSlug), + } + + if hmndata.CurrentJam() != nil { + tmpl.CurrentJamLink = hmnurl.BuildJamIndexAny(hmndata.CurrentJam().UrlSlug) + } + + var res ResponseData + res.MustWriteTemplate("project_index.html", tmpl, c.Perf) + return res + } else { + const projectsPerPage = 20 + + var projects []templates.Project + var err error + switch cat { + case hmndata.WRJ2022.UrlSlug: + projects, err = getPersonalProjects(c, hmndata.WRJ2022.Slug) + case hmndata.VJ2023.Slug: + projects, err = getPersonalProjects(c, hmndata.VJ2023.Slug) + case hmndata.WRJ2023.Slug: + projects, err = getPersonalProjects(c, hmndata.WRJ2023.Slug) + case "personal": + projects, err = getPersonalProjects(c, "") + case "official": + projects, err = getShuffledOfficialProjects(c) + default: + return c.Redirect(hmnurl.BuildProjectIndex(1, ""), http.StatusSeeOther) + } + if err != nil { + return c.ErrorResponse(http.StatusInternalServerError, err) + } + + page, numPages, ok := getPageInfo(pageStr, len(projects), projectsPerPage) + if !ok { + return c.Redirect(hmnurl.BuildProjectIndex(1, cat), http.StatusSeeOther) + } + pagination := templates.Pagination{ + Current: page, + Total: numPages, + + FirstUrl: hmnurl.BuildProjectIndex(1, cat), + LastUrl: hmnurl.BuildProjectIndex(numPages, cat), + NextUrl: hmnurl.BuildProjectIndex(utils.IntClamp(1, page+1, numPages), cat), + PreviousUrl: hmnurl.BuildProjectIndex(utils.IntClamp(1, page-1, numPages), cat), + } + + firstProjectIndex := (page - 1) * projectsPerPage + endIndex := utils.IntMin(firstProjectIndex+projectsPerPage, len(projects)) + pageProjects := projects[firstProjectIndex:endIndex] + + baseData := getBaseData(c, "Projects", []templates.Breadcrumb{ + {"Projects", hmnurl.BuildProjectIndex(1, "")}, + }) + var res ResponseData + res.MustWriteTemplate("project_index.html", ProjectTemplateData{ + BaseData: baseData, + + AllProjects: false, + + Pagination: pagination, + PageProjects: pageProjects, + }, c.Perf) + return res + } +} + +func getShuffledOfficialProjects(c *RequestContext) ([]templates.Project, error) { + official, err := hmndata.FetchProjects(c, c.Conn, c.CurrentUser, hmndata.ProjectsQuery{ Types: hmndata.OfficialProjects, }) if err != nil { - return c.ErrorResponse(http.StatusInternalServerError, oops.New(err, "failed to fetch projects")) - } - - numPages := int(math.Ceil(float64(len(officialProjects)) / projectsPerPage)) - page, numPages, ok := getPageInfo(c.PathParams["page"], len(officialProjects), feedPostsPerPage) - if !ok { - return c.Redirect(hmnurl.BuildProjectIndex(1), http.StatusSeeOther) - } - - pagination := templates.Pagination{ - Current: page, - Total: numPages, - - FirstUrl: hmnurl.BuildProjectIndex(1), - LastUrl: hmnurl.BuildProjectIndex(numPages), - NextUrl: hmnurl.BuildProjectIndex(utils.IntClamp(1, page+1, numPages)), - PreviousUrl: hmnurl.BuildProjectIndex(utils.IntClamp(1, page-1, numPages)), + return nil, oops.New(err, "failed to fetch projects") } c.Perf.StartBlock("PROJECTS", "Grouping and sorting") @@ -118,7 +219,7 @@ func ProjectIndex(c *RequestContext) ResponseData { var recentProjects []templates.Project var restProjects []templates.Project now := time.Now() - for _, p := range officialProjects { + for _, p := range official { templateProject := templates.ProjectAndStuffToTemplate(&p, hmndata.UrlContextForProject(&p.Project).BuildHomepage(), c.Theme) if p.Project.Slug == "hero" { @@ -146,60 +247,58 @@ func ProjectIndex(c *RequestContext) ResponseData { featuredProjects = append([]templates.Project{*handmadeHero}, featuredProjects...) } - orderedProjects := make([]templates.Project, 0, len(featuredProjects)+len(recentProjects)+len(restProjects)) - orderedProjects = append(orderedProjects, featuredProjects...) - orderedProjects = append(orderedProjects, recentProjects...) - orderedProjects = append(orderedProjects, restProjects...) + officialProjects := make([]templates.Project, 0, len(featuredProjects)+len(recentProjects)+len(restProjects)) + officialProjects = append(officialProjects, featuredProjects...) + officialProjects = append(officialProjects, recentProjects...) + officialProjects = append(officialProjects, restProjects...) - firstProjectIndex := (page - 1) * projectsPerPage - endIndex := utils.IntMin(firstProjectIndex+projectsPerPage, len(orderedProjects)) - pageProjects := orderedProjects[firstProjectIndex:endIndex] - - var carouselProjects []templates.Project - if page == 1 { - carouselProjects = featuredProjects[:utils.IntMin(len(featuredProjects), maxCarouselProjects)] - } c.Perf.EndBlock() - // Fetch and highlight a random selection of personal projects - var personalProjects []templates.Project - { - projects, err := hmndata.FetchProjects(c, c.Conn, c.CurrentUser, hmndata.ProjectsQuery{ - Types: hmndata.PersonalProjects, - }) - if err != nil { - return c.ErrorResponse(http.StatusInternalServerError, oops.New(err, "failed to fetch personal projects")) - } + return officialProjects, nil +} - sort.Slice(projects, func(i, j int) bool { - p1 := projects[i].Project - p2 := projects[j].Project - return p2.AllLastUpdated.Before(p1.AllLastUpdated) // sort backwards - recent first - }) - - for i, p := range projects { - if i >= maxPersonalProjects { - break - } - templateProject := templates.ProjectAndStuffToTemplate(&p, hmndata.UrlContextForProject(&p.Project).BuildHomepage(), c.Theme) - personalProjects = append(personalProjects, templateProject) - } +func getPersonalProjects(c *RequestContext, jamSlug string) ([]templates.Project, error) { + var slugs []string + if jamSlug != "" { + slugs = []string{jamSlug} } - baseData := getBaseDataAutocrumb(c, "Projects") - var res ResponseData - res.MustWriteTemplate("project_index.html", ProjectTemplateData{ - BaseData: baseData, + projects, err := hmndata.FetchProjects(c, c.Conn, c.CurrentUser, hmndata.ProjectsQuery{ + Types: hmndata.PersonalProjects, + JamSlugs: slugs, + }) + if err != nil { + return nil, oops.New(err, "failed to fetch personal projects") + } - Pagination: pagination, - CarouselProjects: carouselProjects, - Projects: pageProjects, - PersonalProjects: personalProjects, + sort.Slice(projects, func(i, j int) bool { + p1 := projects[i].Project + p2 := projects[j].Project + return p2.AllLastUpdated.Before(p1.AllLastUpdated) // sort backwards - recent first + }) - ProjectAtomFeedUrl: hmnurl.BuildAtomFeedForProjects(), - WIPForumUrl: hmnurl.HMNProjectContext.BuildForum([]string{"wip"}, 1), - }, c.Perf) - return res + var personalProjects []templates.Project + for _, p := range projects { + templateProject := templates.ProjectAndStuffToTemplate(&p, hmndata.UrlContextForProject(&p.Project).BuildHomepage(), c.Theme) + personalProjects = append(personalProjects, templateProject) + } + + return personalProjects, nil +} + +func jamLink(jamSlug string) string { + switch jamSlug { + case hmndata.WRJ2021.Slug: + return hmnurl.BuildJamIndex2021() + case hmndata.WRJ2022.Slug: + return hmnurl.BuildJamIndex2022() + case hmndata.WRJ2023.Slug: + return hmnurl.BuildJamIndex2023() + case hmndata.VJ2023.Slug: + return hmnurl.BuildJamIndex2023_Visibility() + default: + return "" + } } type ProjectHomepageData struct {