diff --git a/src/hmnurl/hmnurl_test.go b/src/hmnurl/hmnurl_test.go index 2b9d8e1..bd35d3c 100644 --- a/src/hmnurl/hmnurl_test.go +++ b/src/hmnurl/hmnurl_test.go @@ -32,10 +32,6 @@ func TestHomepage(t *testing.T) { AssertSubdomain(t, BuildProjectHomepage("hero"), "hero") } -func TestProjectIndex(t *testing.T) { - AssertRegexMatch(t, BuildProjectIndex(), RegexProjectIndex, nil) -} - func TestShowcase(t *testing.T) { AssertRegexMatch(t, BuildShowcase(), RegexShowcase, nil) } @@ -70,6 +66,10 @@ func TestLogoutAction(t *testing.T) { AssertRegexMatch(t, BuildLogoutAction(), RegexLogoutAction, nil) } +func TestRegister(t *testing.T) { + AssertRegexMatch(t, BuildRegister(), RegexRegister, nil) +} + func TestStaticPages(t *testing.T) { AssertRegexMatch(t, BuildManifesto(), RegexManifesto, nil) AssertRegexMatch(t, BuildAbout(), RegexAbout, nil) @@ -94,6 +94,20 @@ func TestFeed(t *testing.T) { assert.Panics(t, func() { BuildFeedWithPage(0) }) } +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) }) +} + +func TestProjectNew(t *testing.T) { + AssertRegexMatch(t, BuildProjectNew(), RegexProjectNew, nil) +} + +func TestProjectNotApproved(t *testing.T) { + AssertRegexMatch(t, BuildProjectNotApproved("test"), RegexProjectNotApproved, map[string]string{"slug": "test"}) +} + func TestPodcast(t *testing.T) { AssertRegexMatch(t, BuildPodcast(""), RegexPodcast, nil) AssertSubdomain(t, BuildPodcast(""), "") diff --git a/src/hmnurl/urls.go b/src/hmnurl/urls.go index 6c2cd37..0160f86 100644 --- a/src/hmnurl/urls.go +++ b/src/hmnurl/urls.go @@ -16,8 +16,6 @@ Any function in this package whose name starts with Build is required to be cove This helps ensure that we don't generate URLs that can't be routed. */ -// TODO(asaf): Make this whole file only crash in Dev - var RegexHomepage = regexp.MustCompile("^/$") func BuildHomepage() string { @@ -29,13 +27,6 @@ func BuildProjectHomepage(projectSlug string) string { return ProjectUrl("/", nil, projectSlug) } -var RegexProjectIndex = regexp.MustCompile("^/projects$") - -func BuildProjectIndex() string { - defer CatchPanic() - return Url("/projects", nil) -} - var RegexShowcase = regexp.MustCompile("^/showcase$") func BuildShowcase() string { @@ -80,6 +71,13 @@ func BuildLogoutAction() string { return Url("/logout", nil) } +var RegexRegister = regexp.MustCompile("^/_register$") + +func BuildRegister() string { + defer CatchPanic() + return Url("/_register", nil) +} + /* * Static Pages */ @@ -186,6 +184,40 @@ func BuildAtomFeedForShowcase() string { return Url("/atom/showcase", nil) } +/* +* Projects + */ + +var RegexProjectIndex = regexp.MustCompile("^/projects(/(?P.+)?)?$") + +func BuildProjectIndex(page int) string { + defer CatchPanic() + if page < 1 { + panic(oops.New(nil, "page must be >= 1")) + } + if page == 1 { + return Url("/projects", nil) + } else { + return Url(fmt.Sprintf("/projects/%d", page), nil) + } +} + +var RegexProjectNew = regexp.MustCompile("^/projects/new$") + +func BuildProjectNew() string { + defer CatchPanic() + + return Url("/projects/new", nil) +} + +var RegexProjectNotApproved = regexp.MustCompile("^/p/(?P.+)$") + +func BuildProjectNotApproved(slug string) string { + defer CatchPanic() + + return Url(fmt.Sprintf("/p/%s", slug), nil) +} + /* * Podcast */ diff --git a/src/models/project.go b/src/models/project.go index 236908b..193b5f3 100644 --- a/src/models/project.go +++ b/src/models/project.go @@ -24,15 +24,26 @@ const ( ProjectLifecycleLTS ) +// NOTE(asaf): Just checking the lifecycle is not sufficient. Visible projects also must have flags = 0. +var VisibleProjectLifecycles = []ProjectLifecycle{ + ProjectLifecycleActive, + ProjectLifecycleHiatus, + ProjectLifecycleLTSRequired, // NOTE(asaf): LTS means complete + ProjectLifecycleLTS, +} + +const RecentProjectUpdateTimespanSec = 60 * 60 * 24 * 28 // NOTE(asaf): Four weeks + type Project struct { ID int `db:"id"` ForumID *int `db:"forum_id"` - Slug string `db:"slug"` - Name string `db:"name"` - Blurb string `db:"blurb"` - Description string `db:"description"` + Slug string `db:"slug"` + Name string `db:"name"` + Blurb string `db:"blurb"` + Description string `db:"description"` + ParsedDescription string `db:"descparsed"` Lifecycle ProjectLifecycle `db:"lifecycle"` // TODO(asaf): Ensure we only fetch projects in the correct lifecycle phase everywhere. @@ -42,6 +53,8 @@ type Project struct { LogoLight string `db:"logolight"` LogoDark string `db:"logodark"` + Flags int `db:"flags"` // NOTE(asaf): Flags is currently only used to mark a project as hidden. Flags == 1 means hidden. Flags == 0 means visible. + Featured bool `db:"featured"` DateApproved time.Time `db:"date_approved"` AllLastUpdated time.Time `db:"all_last_updated"` } diff --git a/src/templates/mapping.go b/src/templates/mapping.go index ba0f7a7..80244b5 100644 --- a/src/templates/mapping.go +++ b/src/templates/mapping.go @@ -51,17 +51,50 @@ func (p *Post) AddUrls(projectSlug string, subforums []string, threadId int, pos p.QuoteUrl = hmnurl.BuildForumPostQuote(projectSlug, subforums, threadId, postId) } -func ProjectToTemplate(p *models.Project) Project { - return Project{ - Name: p.Name, - Subdomain: p.Subdomain(), - Color1: p.Color1, - Color2: p.Color2, - Url: hmnurl.BuildProjectHomepage(p.Slug), - Blurb: p.Blurb, +var LifecycleBadgeClasses = map[models.ProjectLifecycle]string{ + models.ProjectLifecycleUnapproved: "", + models.ProjectLifecycleApprovalRequired: "", + models.ProjectLifecycleActive: "", + models.ProjectLifecycleHiatus: "notice-hiatus", + models.ProjectLifecycleDead: "notice-dead", + models.ProjectLifecycleLTSRequired: "", + models.ProjectLifecycleLTS: "notice-lts", +} - LogoLight: hmnurl.BuildUserFile(p.LogoLight), - LogoDark: hmnurl.BuildUserFile(p.LogoDark), +var LifecycleBadgeStrings = map[models.ProjectLifecycle]string{ + models.ProjectLifecycleUnapproved: "", + models.ProjectLifecycleApprovalRequired: "", + models.ProjectLifecycleActive: "", + models.ProjectLifecycleHiatus: "On Hiatus", + models.ProjectLifecycleDead: "Dead", + models.ProjectLifecycleLTSRequired: "", + models.ProjectLifecycleLTS: "Complete", +} + +func ProjectToTemplate(p *models.Project, theme string) Project { + logo := p.LogoLight + if theme == "dark" { + logo = p.LogoDark + } + var url string + if p.Lifecycle == models.ProjectLifecycleUnapproved || p.Lifecycle == models.ProjectLifecycleApprovalRequired { + url = hmnurl.BuildProjectNotApproved(p.Slug) + } else { + url = hmnurl.BuildProjectHomepage(p.Slug) + } + return Project{ + Name: p.Name, + Subdomain: p.Subdomain(), + Color1: p.Color1, + Color2: p.Color2, + Url: url, + Blurb: p.Blurb, + ParsedDescription: template.HTML(p.ParsedDescription), + + Logo: hmnurl.BuildUserFile(logo), + + LifecycleBadgeClass: LifecycleBadgeClasses[p.Lifecycle], + LifecycleString: LifecycleBadgeStrings[p.Lifecycle], IsHMN: p.IsHMN(), diff --git a/src/templates/src/atom.xml b/src/templates/src/atom.xml index 9e028e2..e437b78 100644 --- a/src/templates/src/atom.xml +++ b/src/templates/src/atom.xml @@ -37,7 +37,7 @@ {{ .ProfileUrl }} {{ end }} - {{ .LogoLight }} + {{ .Logo }} {{ .Blurb }} {{ end }} diff --git a/src/templates/src/include/header.html b/src/templates/src/include/header.html index 9951a0e..c907acf 100644 --- a/src/templates/src/include/header.html +++ b/src/templates/src/include/header.html @@ -1,5 +1,4 @@
- {{/* TODO: All the URLs in here are wrong. */}}
{{ if .User }} {{ if .User.IsSuperuser }} @@ -31,19 +30,22 @@
{{ end }} -
+
- {{ if not .Project.IsHMN }} + {{ if .IsProjectPage }} {{ end }} + {{ if not .IsProjectPage }} + Projects + {{ end }} {{ if .Project.HasBlog }} - Blog + {{ if .IsProjectPage }}Blog{{ else }}News{{ end }} {{ end }} {{ if .Project.HasForum }} Forums diff --git a/src/templates/src/include/project_card.html b/src/templates/src/include/project_card.html new file mode 100644 index 0000000..d2dd969 --- /dev/null +++ b/src/templates/src/include/project_card.html @@ -0,0 +1,16 @@ +{{- /*gotype: git.handmade.network/hmn/hmn/src/templates.ProjectCardData*/ -}} + +
+
+
+
+

{{ .Project.Name }}

+
{{ .Project.Blurb }}
+
+ {{ if .Project.LifecycleString }} + {{ .Project.LifecycleString }} + {{ end }} +
+
+ + diff --git a/src/templates/src/project_index.html b/src/templates/src/project_index.html new file mode 100644 index 0000000..32cd839 --- /dev/null +++ b/src/templates/src/project_index.html @@ -0,0 +1,152 @@ +{{ template "base.html" . }} + +{{ define "content" }} +
+ {{ with .CarouselProjects }} +
+
+
+ {{ range $index, $project := . }} +
+
+ +

{{ $project.Name }}

+ +
+ {{ $project.ParsedDescription }} +
+
+
+
+ +
+ +
+
+ {{ end }} +
+
+ {{ range $index, $project := . }} +
+ {{ template "project_card.html" projectcarddata $project "h-100" }} +
+ {{ end }} +
+
+
+ {{ range $index, $project := . }} +
+ {{ end }} +
+
+ {{ end }} +
+
+
+
+ 4 RSS Feed – New Projects + {{ template "pagination.html" .Pagination }} +
+ +
+ {{ range .Projects }} +
+ {{ template "project_card.html" projectcarddata . ""}} +
+ {{ end }} +
+ +
+
+
{{ template "pagination.html" .Pagination }}
+
+
+
+
+ {{ if not .UserPendingProject }} +
+

Submit a Project

+ 
your-project-here.handmade.network
+

+ Developing something cool? Building a tool, game, website, etc. + that meshes with the Handmade philosophy? +

+ {{ if .User }} +

+ Submit a Project +

+ {{ else }} +

+ Become a member now to submit a project to the site! +

+

+ Register + or + Log In +

+ {{ end }} +
+ {{ else }} +
+

Project pending

+

Thanks for considering us as a home for
{{ .UserPendingProject.Name }}!

+
+ {{ if .UserPendingProjectUnderReview }} +

We see it's ready for review by an administrator, great! We'll try and get back to you in a timely manner.

+ {{ else }} +

When you're ready for us to review it, let us know using the checkbox on {{ .UserPendingProject.Name }}'s profile editor.

+ {{ end }} +
+ {{ end }} + {{ if .UserApprovedProjects }} +
+ {{ if .UserPendingProject }} +

Your other projects

+ {{ else }} +

Your projects

+ {{ end }} + {{ range .UserApprovedProjects }} +
+ {{ template "project_card.html" projectcarddata . "" }} +
+ {{ end }} +
+ {{ end }} +
+
+
+
+ + +{{ end }} diff --git a/src/templates/templates.go b/src/templates/templates.go index cf1628d..aad8cb9 100644 --- a/src/templates/templates.go +++ b/src/templates/templates.go @@ -158,6 +158,14 @@ var HMNTemplateFuncs = template.FuncMap{ "noescape": func(str string) template.HTML { return template.HTML(str) }, + + // NOTE(asaf): Template specific functions: + "projectcarddata": func(project Project, classes string) ProjectCardData { + return ProjectCardData{ + Project: &project, + Classes: classes, + } + }, } type ErrInvalidHexColor struct { diff --git a/src/templates/types.go b/src/templates/types.go index d18a6ff..0ee8179 100644 --- a/src/templates/types.go +++ b/src/templates/types.go @@ -20,8 +20,9 @@ type BaseData struct { Project Project User *User - Header Header - Footer Footer + IsProjectPage bool + Header Header + Footer Footer } type Header struct { @@ -32,6 +33,7 @@ type Header struct { RegisterUrl string HMNHomepageUrl string ProjectHomepageUrl string + ProjectIndexUrl string BlogUrl string ForumsUrl string WikiUrl string @@ -86,16 +88,19 @@ type Post struct { } type Project struct { - Name string - Subdomain string - Color1 string - Color2 string - Url string - Blurb string - Owners []User + Name string + Subdomain string + Color1 string + Color2 string + Url string + Blurb string + ParsedDescription template.HTML + Owners []User - LogoDark string - LogoLight string + Logo string + + LifecycleBadgeClass string + LifecycleString string IsHMN bool @@ -192,6 +197,11 @@ type ThreadListItem struct { Content string } +type ProjectCardData struct { + Project *Project + Classes string +} + type Breadcrumb struct { Name, Url string Current bool diff --git a/src/website/feed.go b/src/website/feed.go index 58ec7d8..7fc8825 100644 --- a/src/website/feed.go +++ b/src/website/feed.go @@ -183,7 +183,7 @@ func AtomFeed(c *RequestContext) ResponseData { feedData.FeedType = FeedTypeProjects feedData.FeedID = FeedIDProjects feedData.AtomFeedUrl = hmnurl.BuildAtomFeedForProjects() - feedData.FeedUrl = hmnurl.BuildProjectIndex() + feedData.FeedUrl = hmnurl.BuildProjectIndex(1) c.Perf.StartBlock("SQL", "Fetching projects") type projectResult struct { @@ -192,10 +192,15 @@ func AtomFeed(c *RequestContext) ResponseData { projects, err := db.Query(c.Context(), c.Conn, projectResult{}, ` SELECT $columns - FROM handmade_project AS project + FROM + handmade_project AS project + WHERE + project.lifecycle = ANY($1) + AND project.flags = 0 ORDER BY date_approved DESC - LIMIT $1 + LIMIT $2 `, + models.VisibleProjectLifecycles, itemsPerFeed, ) if err != nil { @@ -205,7 +210,7 @@ func AtomFeed(c *RequestContext) ResponseData { projectMap := make(map[int]*templates.Project) for _, p := range projects.ToSlice() { project := p.(*projectResult).Project - templateProject := templates.ProjectToTemplate(&project) + templateProject := templates.ProjectToTemplate(&project, c.Theme) templateProject.UUID = uuid.NewSHA1(uuid.NameSpaceURL, []byte(templateProject.Url)).URN() projectIds = append(projectIds, project.ID) diff --git a/src/website/landing.go b/src/website/landing.go index 2d53565..1c6f08b 100644 --- a/src/website/landing.go +++ b/src/website/landing.go @@ -55,12 +55,12 @@ func Index(c *RequestContext) ResponseData { SELECT $columns FROM handmade_project WHERE - (flags = 0 AND NOT lifecycle = ANY($1)) + (flags = 0 AND lifecycle = ANY($1)) OR id = $2 ORDER BY all_last_updated DESC LIMIT $3 `, - []models.ProjectLifecycle{models.ProjectLifecycleUnapproved, models.ProjectLifecycleApprovalRequired}, + models.VisibleProjectLifecycles, models.HMNProjectID, numProjectsToGet*2, // hedge your bets against projects that don't have any content ) @@ -140,7 +140,7 @@ func Index(c *RequestContext) ResponseData { } landingPageProject := LandingPageProject{ - Project: templates.ProjectToTemplate(proj), + Project: templates.ProjectToTemplate(proj, c.Theme), ForumsUrl: forumsUrl, } diff --git a/src/website/projects.go b/src/website/projects.go new file mode 100644 index 0000000..8656d9f --- /dev/null +++ b/src/website/projects.go @@ -0,0 +1,203 @@ +package website + +import ( + "math" + "math/rand" + "net/http" + "strconv" + "time" + + "git.handmade.network/hmn/hmn/src/db" + "git.handmade.network/hmn/hmn/src/hmnurl" + "git.handmade.network/hmn/hmn/src/models" + "git.handmade.network/hmn/hmn/src/oops" + "git.handmade.network/hmn/hmn/src/templates" + "git.handmade.network/hmn/hmn/src/utils" +) + +type ProjectTemplateData struct { + templates.BaseData + + Pagination templates.Pagination + CarouselProjects []templates.Project + Projects []templates.Project + + UserPendingProjectUnderReview bool + UserPendingProject *templates.Project + UserApprovedProjects []templates.Project + + ProjectAtomFeedUrl string + ManifestoUrl string + NewProjectUrl string + RegisterUrl string + LoginUrl string +} + +func ProjectIndex(c *RequestContext) ResponseData { + const projectsPerPage = 20 + const maxCarouselProjects = 10 + + page := 1 + pageString, hasPage := c.PathParams["page"] + if hasPage && pageString != "" { + if pageParsed, err := strconv.Atoi(pageString); err == nil { + page = pageParsed + } else { + return c.Redirect(hmnurl.BuildProjectIndex(1), http.StatusSeeOther) + } + } + + if page < 1 { + return c.Redirect(hmnurl.BuildProjectIndex(1), http.StatusSeeOther) + } + + c.Perf.StartBlock("SQL", "Fetching all visible projects") + type projectResult struct { + Project models.Project `db:"project"` + } + allProjects, err := db.Query(c.Context(), c.Conn, projectResult{}, + ` + SELECT $columns + FROM + handmade_project AS project + WHERE + project.lifecycle = ANY($1) + AND project.flags = 0 + ORDER BY project.date_approved ASC + `, + models.VisibleProjectLifecycles, + ) + if err != nil { + return ErrorResponse(http.StatusInternalServerError, oops.New(err, "failed to fetch projects")) + } + allProjectsSlice := allProjects.ToSlice() + c.Perf.EndBlock() + + numPages := int(math.Ceil(float64(len(allProjectsSlice)) / projectsPerPage)) + + if page > numPages { + return c.Redirect(hmnurl.BuildProjectIndex(numPages), 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)), + } + + var userApprovedProjects []templates.Project + var userPendingProject *templates.Project + userPendingProjectUnderReview := false + if c.CurrentUser != nil { + c.Perf.StartBlock("SQL", "fetching user projects") + type UserProjectQuery struct { + Project models.Project `db:"project"` + } + userProjectsResult, err := db.Query(c.Context(), c.Conn, UserProjectQuery{}, + ` + SELECT $columns + FROM + handmade_project AS project + INNER JOIN handmade_project_groups AS project_groups ON project_groups.project_id = project.id + INNER JOIN auth_user_groups AS user_groups ON user_groups.group_id = project_groups.group_id + WHERE + user_groups.user_id = $1 + `, + c.CurrentUser.ID, + ) + if err != nil { + return ErrorResponse(http.StatusInternalServerError, oops.New(err, "failed to fetch user projects")) + } + for _, project := range userProjectsResult.ToSlice() { + p := project.(*UserProjectQuery).Project + if p.Lifecycle == models.ProjectLifecycleUnapproved || p.Lifecycle == models.ProjectLifecycleApprovalRequired { + if userPendingProject == nil { + // NOTE(asaf): Technically a user could have more than one pending project. + // For example, if they created one project themselves and were added as an additional owner to another user's project. + // So we'll just take the first one. I don't think it matters. I guess it especially won't matter after Projects 2.0. + tmplProject := templates.ProjectToTemplate(&p, c.Theme) + userPendingProject = &tmplProject + userPendingProjectUnderReview = (p.Lifecycle == models.ProjectLifecycleApprovalRequired) + } + } else { + userApprovedProjects = append(userApprovedProjects, templates.ProjectToTemplate(&p, c.Theme)) + } + } + c.Perf.EndBlock() + } + + c.Perf.StartBlock("PROJECTS", "Grouping and sorting") + var handmadeHero *templates.Project + var featuredProjects []templates.Project + var recentProjects []templates.Project + var restProjects []templates.Project + now := time.Now() + for _, p := range allProjectsSlice { + project := &p.(*projectResult).Project + templateProject := templates.ProjectToTemplate(project, c.Theme) + if project.Slug == "hero" { + // NOTE(asaf): Handmade Hero gets special treatment. Must always be first in the list. + handmadeHero = &templateProject + continue + } + if project.Featured { + featuredProjects = append(featuredProjects, templateProject) + } else if now.Sub(project.AllLastUpdated).Seconds() < models.RecentProjectUpdateTimespanSec { + recentProjects = append(recentProjects, templateProject) + } else { + restProjects = append(restProjects, templateProject) + } + } + + _, randSeed := now.ISOWeek() + random := rand.New(rand.NewSource(int64(randSeed))) + random.Shuffle(len(featuredProjects), func(i, j int) { featuredProjects[i], featuredProjects[j] = featuredProjects[j], featuredProjects[i] }) + random.Shuffle(len(recentProjects), func(i, j int) { recentProjects[i], recentProjects[j] = recentProjects[j], recentProjects[i] }) + random.Shuffle(len(restProjects), func(i, j int) { restProjects[i], restProjects[j] = restProjects[j], restProjects[i] }) + + if handmadeHero != nil { + // NOTE(asaf): As mentioned above, inserting HMH first. + 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...) + + 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() + + baseData := getBaseData(c) + baseData.Title = "Project List" + var res ResponseData + res.WriteTemplate("project_index.html", ProjectTemplateData{ + BaseData: baseData, + + Pagination: pagination, + CarouselProjects: carouselProjects, + Projects: pageProjects, + + UserPendingProjectUnderReview: userPendingProjectUnderReview, + UserPendingProject: userPendingProject, + UserApprovedProjects: userApprovedProjects, + + ProjectAtomFeedUrl: hmnurl.BuildAtomFeedForProjects(), + ManifestoUrl: hmnurl.BuildManifesto(), + NewProjectUrl: hmnurl.BuildProjectNew(), + RegisterUrl: hmnurl.BuildRegister(), + LoginUrl: hmnurl.BuildLoginPage(c.FullUrl()), + }, c.Perf) + return res +} diff --git a/src/website/routes.go b/src/website/routes.go index eebeafd..90652cc 100644 --- a/src/website/routes.go +++ b/src/website/routes.go @@ -106,9 +106,9 @@ func NewWebsiteRoutes(conn *pgxpool.Pool, perfCollector *perf.PerfCollector) htt mainRoutes.GET(hmnurl.RegexFeed, Feed) mainRoutes.GET(hmnurl.RegexAtomFeed, AtomFeed) - // TODO(asaf): Trailing slashes break these + mainRoutes.GET(hmnurl.RegexProjectIndex, ProjectIndex) + mainRoutes.GET(hmnurl.RegexForumThread, ForumThread) - // mainRoutes.GET(`^/(?Pforums(/cat)*)/t/(?P\d+)/p/(?P\d+)$`, ForumPost) mainRoutes.GET(hmnurl.RegexForumCategory, ForumCategory) mainRoutes.GET(hmnurl.RegexProjectCSS, ProjectCSS) @@ -131,11 +131,12 @@ func getBaseData(c *RequestContext) templates.BaseData { } return templates.BaseData{ - Project: templates.ProjectToTemplate(c.CurrentProject), + Project: templates.ProjectToTemplate(c.CurrentProject, c.Theme), LoginPageUrl: hmnurl.BuildLoginPage(c.FullUrl()), User: templateUser, Theme: c.Theme, ProjectCSSUrl: hmnurl.BuildProjectCSS(c.CurrentProject.Color1), + IsProjectPage: !c.CurrentProject.IsHMN(), Header: templates.Header{ AdminUrl: hmnurl.BuildHomepage(), // TODO(asaf) MemberSettingsUrl: hmnurl.BuildHomepage(), // TODO(asaf) @@ -144,6 +145,7 @@ func getBaseData(c *RequestContext) templates.BaseData { RegisterUrl: hmnurl.BuildHomepage(), // TODO(asaf) HMNHomepageUrl: hmnurl.BuildHomepage(), // TODO(asaf) ProjectHomepageUrl: hmnurl.BuildProjectHomepage(c.CurrentProject.Slug), + ProjectIndexUrl: hmnurl.BuildProjectIndex(1), BlogUrl: hmnurl.BuildBlog(c.CurrentProject.Slug, 1), ForumsUrl: hmnurl.BuildForumCategory(c.CurrentProject.Slug, nil, 1), WikiUrl: hmnurl.BuildWiki(c.CurrentProject.Slug), @@ -159,7 +161,7 @@ func getBaseData(c *RequestContext) templates.BaseData { ManifestoUrl: hmnurl.BuildManifesto(), CodeOfConductUrl: hmnurl.BuildCodeOfConduct(), CommunicationGuidelinesUrl: hmnurl.BuildCommunicationGuidelines(), - ProjectIndexUrl: hmnurl.BuildProjectIndex(), + ProjectIndexUrl: hmnurl.BuildProjectIndex(1), ForumsUrl: hmnurl.BuildForumCategory(models.HMNProjectSlug, nil, 1), ContactUrl: hmnurl.BuildContactPage(), SitemapUrl: hmnurl.BuildSiteMap(),