From 6c53688e069bff5a532314da032b38a14da3e40c Mon Sep 17 00:00:00 2001 From: Asaf Gartner Date: Thu, 8 Jul 2021 10:40:30 +0300 Subject: [PATCH] Project page --- public/style.css | 94 +++---- src/hmnurl/hmnurl_test.go | 4 + src/hmnurl/urls.go | 8 + src/rawdata/scss/_carousel.scss | 74 ++++++ src/rawdata/scss/_projects.scss | 70 ----- src/rawdata/scss/style.scss | 1 + src/templates/mapping.go | 25 +- src/templates/src/include/header.html | 7 +- src/templates/src/include/timeline_item.html | 33 +++ src/templates/src/project_homepage.html | 108 ++++++++ src/templates/src/project_index.html | 26 +- src/templates/src/user_profile.html | 37 +-- src/templates/types.go | 14 +- src/website/forums.go | 2 +- src/website/projects.go | 260 +++++++++++++++++++ src/website/requesthandling.go | 11 - src/website/routes.go | 34 ++- 17 files changed, 609 insertions(+), 199 deletions(-) create mode 100644 src/rawdata/scss/_carousel.scss create mode 100644 src/templates/src/include/timeline_item.html create mode 100644 src/templates/src/project_homepage.html diff --git a/public/style.css b/public/style.css index 548fb10..3d0b8df 100644 --- a/public/style.css +++ b/public/style.css @@ -3231,7 +3231,7 @@ code, .code { .w1 { width: 1rem; } -.w2, .project-carousel-container .project-carousel-button.active { +.w2, .carousel-container .carousel-button.active { width: 2rem; } .w3 { @@ -9288,52 +9288,6 @@ span.icon-rss::before { background-color: #aa7d30; background-color: var(--notice-lts-reqd-color); } -.project-carousel-container { - width: 50rem; } - .project-carousel-container .project-carousel { - box-sizing: content-box; - position: relative; - height: 12rem; } - @media screen and (min-width: 60em) { - .project-carousel-container .project-carousel { - height: 16rem; } } - .project-carousel-container .project-carousel-item { - position: absolute; - top: 0; - left: 0; } - .project-carousel-container .project-carousel-item:not(.active) { - display: none; } - .project-carousel-container .project-carousel-item br { - line-height: 0.6em; } - .project-carousel-container .project-carousel-description { - max-height: 14rem; - overflow: hidden; } - .project-carousel-container .project-carousel-fade { - position: absolute; - left: 0; - right: 0; - bottom: 0; - height: 30px; - background: linear-gradient( rgba(240, 240, 240, 0) , #f0f0f0 ); - background: linear-gradient( var(--dim-background-transparent) , var(--dim-background) ); } - .project-carousel-container .project-carousel-item-small:not(.active) { - display: none; } - .project-carousel-container .project-carousel-button { - border: 1px solid; - border-color: #999; - border-color: var(--dimmer-color); - cursor: pointer; - transition: all 100ms ease-in-out; } - .project-carousel-container .project-carousel-button:hover { - background-color: #bbb; - background-color: var(--dimmest-color); } - .project-carousel-container .project-carousel-button.active { - border-color: #666; - border-color: var(--theme-color); } - .project-carousel-container .project-carousel-button.active:hover { - background-color: #ccc; - background-color: var(--theme-color-dimmest); } - .project-card { color: black; color: var(--fg-font-color); @@ -9546,3 +9500,49 @@ span.icon-rss::before { .timeline-modal .container { width: auto; max-height: calc(100vh - 2rem); } } + +.carousel-container { + width: 50rem; } + .carousel-container .carousel { + box-sizing: content-box; + position: relative; } + .carousel-container .carousel-item { + position: absolute; + top: 0; + left: 0; } + .carousel-container .carousel-item:not(.active) { + display: none; } + .carousel-container .carousel-item br { + line-height: 0.6em; } + .carousel-container .carousel-description { + max-height: 14rem; + overflow: hidden; } + .carousel-container .carousel-fade { + position: absolute; + left: 0; + right: 0; + bottom: 0; + height: 30px; + background: linear-gradient( rgba(240, 240, 240, 0) , #f0f0f0 ); + background: linear-gradient( var(--dim-background-transparent) , var(--dim-background) ); } + .carousel-container .carousel-item-small { + position: absolute; + top: 0; + left: 0; } + .carousel-container .carousel-item-small:not(.active) { + display: none; } + .carousel-container .carousel-button { + border: 1px solid; + border-color: #999; + border-color: var(--dimmer-color); + cursor: pointer; + transition: all 100ms ease-in-out; } + .carousel-container .carousel-button:hover { + background-color: #bbb; + background-color: var(--dimmest-color); } + .carousel-container .carousel-button.active { + border-color: #666; + border-color: var(--theme-color); } + .carousel-container .carousel-button.active:hover { + background-color: #ccc; + background-color: var(--theme-color-dimmest); } diff --git a/src/hmnurl/hmnurl_test.go b/src/hmnurl/hmnurl_test.go index 3176495..b14cecb 100644 --- a/src/hmnurl/hmnurl_test.go +++ b/src/hmnurl/hmnurl_test.go @@ -112,6 +112,10 @@ func TestProjectNotApproved(t *testing.T) { AssertRegexMatch(t, BuildProjectNotApproved("test"), RegexProjectNotApproved, map[string]string{"slug": "test"}) } +func TestProjectEdit(t *testing.T) { + AssertRegexMatch(t, BuildProjectEdit("test", "foo"), RegexProjectEdit, 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 6a0cf44..3cb9360 100644 --- a/src/hmnurl/urls.go +++ b/src/hmnurl/urls.go @@ -232,6 +232,14 @@ func BuildProjectNotApproved(slug string) string { return Url(fmt.Sprintf("/p/%s", slug), nil) } +var RegexProjectEdit = regexp.MustCompile("^/p/(?P.+)/edit$") + +func BuildProjectEdit(slug string, section string) string { + defer CatchPanic() + + return ProjectUrlWithFragment(fmt.Sprintf("/p/%s/edit", slug), nil, "", section) +} + /* * Podcast */ diff --git a/src/rawdata/scss/_carousel.scss b/src/rawdata/scss/_carousel.scss new file mode 100644 index 0000000..ca1eacd --- /dev/null +++ b/src/rawdata/scss/_carousel.scss @@ -0,0 +1,74 @@ +.carousel-container { + width: 50rem; + + .carousel { + box-sizing: content-box; + position: relative; + // height: 12rem; + + @media #{$breakpoint-large} { + // height: $height-5; + } + } + + .carousel-item { + position: absolute; + top: 0; + left: 0; + + &:not(.active) { + display: none; + } + + br { + line-height: 0.6em; + } + } + + .carousel-description { + max-height: 14rem; + overflow: hidden; + } + + .carousel-fade { + position: absolute; + left: 0; + right: 0; + bottom: 0; + height: 30px; + + @include usevar(background, "linear-gradient(" dim-background-transparent "," dim-background ")") + } + + .carousel-item-small { + position: absolute; + top: 0; + left: 0; + + &:not(.active) { + display: none; + } + } + + .carousel-button { + border: 1px solid; + @include usevar(border-color, dimmer-color); + cursor: pointer; + + transition: all 100ms ease-in-out; + + &:hover { + @include usevar(background-color, dimmest-color); + } + + &.active { + @include usevar(border-color, theme-color); + @extend .w2; + + &:hover { + @include usevar(background-color, theme-color-dimmest); + } + } + } +} + diff --git a/src/rawdata/scss/_projects.scss b/src/rawdata/scss/_projects.scss index 7c45efe..09f0444 100644 --- a/src/rawdata/scss/_projects.scss +++ b/src/rawdata/scss/_projects.scss @@ -93,76 +93,6 @@ @include usevar(background-color, notice-lts-reqd-color); } -.project-carousel-container { - width: 50rem; - - .project-carousel { - box-sizing: content-box; - position: relative; - height: 12rem; - - @media #{$breakpoint-large} { - height: $height-5; - } - } - - .project-carousel-item { - position: absolute; - top: 0; - left: 0; - - &:not(.active) { - display: none; - } - - br { - line-height: 0.6em; - } - } - - .project-carousel-description { - max-height: 14rem; - overflow: hidden; - } - - .project-carousel-fade { - position: absolute; - left: 0; - right: 0; - bottom: 0; - height: 30px; - - @include usevar(background, "linear-gradient(" dim-background-transparent "," dim-background ")") - } - - .project-carousel-item-small { - &:not(.active) { - display: none; - } - } - - .project-carousel-button { - border: 1px solid; - @include usevar(border-color, dimmer-color); - cursor: pointer; - - transition: all 100ms ease-in-out; - - &:hover { - @include usevar(background-color, dimmest-color); - } - - &.active { - @include usevar(border-color, theme-color); - @extend .w2; - - &:hover { - @include usevar(background-color, theme-color-dimmest); - } - } - } -} - .project-card { @include usevar(color, 'fg-font-color'); @include usevar(background-color, 'card-background'); diff --git a/src/rawdata/scss/style.scss b/src/rawdata/scss/style.scss index e9460cc..17733b2 100644 --- a/src/rawdata/scss/style.scss +++ b/src/rawdata/scss/style.scss @@ -23,3 +23,4 @@ @import 'showcase'; @import 'streams'; @import 'timeline'; +@import 'carousel'; diff --git a/src/templates/mapping.go b/src/templates/mapping.go index a9fa260..a7df12b 100644 --- a/src/templates/mapping.go +++ b/src/templates/mapping.go @@ -216,16 +216,25 @@ func ParseKnownServicesForLink(link *models.Link) (serviceName string, userData func LinkToTemplate(link *models.Link) Link { name := "" - if link.Name != nil { - name = *link.Name - } + /* + // NOTE(asaf): While Name and Key are separate things, Name is almost always the same as Key in the db, which looks weird. + // So we're just going to ignore Name until we decide it's worth reusing. + if link.Name != nil { + name = *link.Name + } + */ serviceName, serviceUserData := ParseKnownServicesForLink(link) + if serviceUserData != "" { + name = serviceUserData + } + if name == "" { + name = link.Value + } return Link{ - Key: link.Key, - ServiceName: serviceName, - ServiceUserData: serviceUserData, - Name: name, - Value: link.Value, + Key: link.Key, + Name: name, + Icon: serviceName, + Url: link.Value, } } diff --git a/src/templates/src/include/header.html b/src/templates/src/include/header.html index 62ccc24..8db3973 100644 --- a/src/templates/src/include/header.html +++ b/src/templates/src/include/header.html @@ -64,10 +64,9 @@ {{ if false }} Episode Guide {{ end }} - {{/* {% if showEditLink == True %} */}} - {{/* {{ if false }} - 0 Settings - {{ end }} */}} + {{ if .Header.EditUrl }} + 0 Settings + {{ end }}
diff --git a/src/templates/src/include/timeline_item.html b/src/templates/src/include/timeline_item.html new file mode 100644 index 0000000..7b374f4 --- /dev/null +++ b/src/templates/src/include/timeline_item.html @@ -0,0 +1,33 @@ +{{ if timelinepostitem . }} +
+ +
+ {{ template "breadcrumbs.html" .Breadcrumbs }} +
{{ .TypeTitle }}: {{ .Title }}
+
+ {{ .OwnerName }} — {{ timehtml (relativedate .Date) .Date }} +
+
+
+{{ else if timelinesnippetitem . }} +
+ +

{{ .Description }}

+
+ {{ if snippetvideo . }} +
+
+{{ end }} + diff --git a/src/templates/src/project_homepage.html b/src/templates/src/project_homepage.html new file mode 100644 index 0000000..f002798 --- /dev/null +++ b/src/templates/src/project_homepage.html @@ -0,0 +1,108 @@ +{{ template "base.html" . }} + +{{ define "extrahead" }} + {{ range .Screenshots }} + + {{ end }} +{{ end }} + +{{ define "content" }} +
+
+ {{ range .Notices }} +
+ {{ .Content }} +
+ {{ end }} + {{ with .Screenshots }} +
+
+
+ {{ range $index, $screenshot := . }} +
+
+
+ {{ end }} +
+
+ {{ range $index, $screenshot := . }} +
+
+
+ {{ end }} +
+
+
+ {{ range $index, $screenshot := . }} +
+ {{ end }} +
+
+ {{ end }} +
+ {{ .Project.ParsedDescription }} +
+ {{ with .RecentActivity }} +
+

Recent Activity

+
+ {{ range . }} + {{ template "timeline_item.html" . }} + {{ end }} +
+
+ {{ end }} + {{/* TODO(asaf): Add timeline items for project */}} +
+
+
+ {{ .Project.Name }} Logo +
+
+ {{ range $i, $owner := .Owners }} +
+ + {{ $owner.Name }} +
+ {{ end }} +
+ {{ range .ProjectLinks }} +
+
{{ .Key }}
+
{{ .Name }}
+
+ {{ end }} +
+
+
+
+ +{{ end }} diff --git a/src/templates/src/project_index.html b/src/templates/src/project_index.html index 32cd839..829df2a 100644 --- a/src/templates/src/project_index.html +++ b/src/templates/src/project_index.html @@ -3,19 +3,19 @@ {{ define "content" }}
{{ with .CarouselProjects }} -
-
+
+
{{ range $index, $project := . }} -
+

{{ $project.Name }}

 -
+
{{ $project.ParsedDescription }}
-
+
@@ -27,7 +27,7 @@
{{ range $index, $project := . }} -
+
{{ template "project_card.html" projectcarddata $project "h-100" }}
{{ end }} @@ -36,7 +36,7 @@
{{ range $index, $project := . }}
{{ end }} @@ -123,16 +123,16 @@ diff --git a/src/templates/src/user_profile.html b/src/templates/src/user_profile.html index 58c5653..9040a20 100644 --- a/src/templates/src/user_profile.html +++ b/src/templates/src/user_profile.html @@ -37,38 +37,7 @@
{{ range .TimelineItems }} - {{ if timelinepostitem . }} -
- -
- {{ template "breadcrumbs.html" .Breadcrumbs }} -
{{ .TypeTitle }}: {{ .Title }}
-
- {{ .OwnerName }} — {{ timehtml (relativedate .Date) .Date }} -
-
-
- {{ else if timelinesnippetitem . }} -
- -

{{ .Description }}

-
- {{ if snippetvideo . }} -
-
- {{ end }} + {{ template "timeline_item.html" . }} {{ end }}
@@ -103,9 +72,9 @@ {{ end }} {{ range .ProfileUserLinks }} -
+
{{ .Key }}
-
{{ if .ServiceUserData }}{{ .ServiceUserData }}{{ else }}{{ .Value }}{{ end }}
+
{{ .Name }}
{{ end }}
diff --git a/src/templates/types.go b/src/templates/types.go index 24d62d5..1037923 100644 --- a/src/templates/types.go +++ b/src/templates/types.go @@ -141,11 +141,15 @@ type User struct { } type Link struct { - Key string - ServiceName string - ServiceUserData string - Name string - Value string + Key string + Name string + Url string + Icon string +} + +type Notice struct { + Content template.HTML + Class string } type Session struct { diff --git a/src/website/forums.go b/src/website/forums.go index a46006c..74715c9 100644 --- a/src/website/forums.go +++ b/src/website/forums.go @@ -66,7 +66,7 @@ func ForumCategory(c *RequestContext) ResponseData { } c.Perf.EndBlock() - numPages := int(math.Ceil(float64(numThreads) / threadsPerPage)) + numPages := utils.IntMax(int(math.Ceil(float64(numThreads)/threadsPerPage)), 1) page := 1 pageString, hasPage := c.PathParams["page"] diff --git a/src/website/projects.go b/src/website/projects.go index 8b430df..62d862a 100644 --- a/src/website/projects.go +++ b/src/website/projects.go @@ -1,10 +1,14 @@ package website import ( + "errors" + "fmt" + "html/template" "math" "math/rand" "net/http" "strconv" + "strings" "time" "git.handmade.network/hmn/hmn/src/db" @@ -204,3 +208,259 @@ func ProjectIndex(c *RequestContext) ResponseData { } return res } + +type ProjectHomepageData struct { + templates.BaseData + Project templates.Project + Owners []templates.User + Notices []templates.Notice + Screenshots []string + ProjectLinks []templates.Link + Licenses []templates.Link + RecentActivity []templates.TimelineItem +} + +func ProjectHomepage(c *RequestContext) ResponseData { + maxRecentActivity := 15 + var project *models.Project + + if c.CurrentProject.IsHMN() { + slug, hasSlug := c.PathParams["slug"] + if hasSlug && slug != "" { + slug = strings.ToLower(slug) + if slug == models.HMNProjectSlug { + return c.Redirect(hmnurl.BuildHomepage(), http.StatusSeeOther) + } + c.Perf.StartBlock("SQL", "Fetching project by slug") + type projectQuery struct { + Project models.Project `db:"Project"` + } + projectQueryResult, err := db.QueryOne(c.Context(), c.Conn, projectQuery{}, + ` + SELECT $columns + FROM + handmade_project AS project + WHERE + LOWER(project.slug) = $1 + `, + slug, + ) + c.Perf.EndBlock() + if err != nil { + if errors.Is(err, db.ErrNoMatchingRows) { + return FourOhFour(c) + } else { + return ErrorResponse(http.StatusInternalServerError, oops.New(err, "failed to fetch project by slug")) + } + } + project = &projectQueryResult.(*projectQuery).Project + if project.Lifecycle != models.ProjectLifecycleUnapproved && project.Lifecycle != models.ProjectLifecycleApprovalRequired { + return c.Redirect(hmnurl.BuildProjectHomepage(project.Slug), http.StatusSeeOther) + } + } + } else { + project = c.CurrentProject + } + + if project == nil { + return FourOhFour(c) + } + + c.Perf.StartBlock("SQL", "Fetching project owners") + type ownerQuery struct { + Owner models.User `db:"auth_user"` + } + ownerQueryResult, err := db.Query(c.Context(), c.Conn, ownerQuery{}, + ` + SELECT $columns + FROM + auth_user + INNER JOIN auth_user_groups AS user_groups ON auth_user.id = user_groups.user_id + INNER JOIN handmade_project_groups AS project_groups ON user_groups.group_id = project_groups.group_id + WHERE + project_groups.project_id = $1 + `, + project.ID, + ) + if err != nil { + return ErrorResponse(http.StatusInternalServerError, oops.New(err, "failed to fetch owners for project")) + } + ownerQueryData := ownerQueryResult.ToSlice() + c.Perf.EndBlock() + + canView := false + canEdit := false + if c.CurrentUser != nil { + if c.CurrentUser.IsSuperuser { + canView = true + canEdit = true + } else { + for _, ownerRow := range ownerQueryData { + if ownerRow.(*ownerQuery).Owner.ID == c.CurrentUser.ID { + canView = true + canEdit = true + break + } + } + } + } + if !canView { + if project.Flags == 0 { + for _, lc := range models.VisibleProjectLifecycles { + if project.Lifecycle == lc { + canView = true + break + } + } + } + } + + if !canView { + return FourOhFour(c) + } + + c.Perf.StartBlock("SQL", "Fetching screenshots") + type screenshotQuery struct { + Filename string `db:"screenshot.file"` + } + screenshotQueryResult, err := db.Query(c.Context(), c.Conn, screenshotQuery{}, + ` + SELECT $columns + FROM + handmade_imagefile AS screenshot + INNER JOIN handmade_project_screenshots ON screenshot.id = handmade_project_screenshots.imagefile_id + WHERE + handmade_project_screenshots.project_id = $1 + `, + project.ID, + ) + if err != nil { + return ErrorResponse(http.StatusInternalServerError, oops.New(err, "failed to fetch screenshots for project")) + } + c.Perf.EndBlock() + + c.Perf.StartBlock("SQL", "Fetching project links") + type projectLinkQuery struct { + Link models.Link `db:"link"` + } + projectLinkResult, err := db.Query(c.Context(), c.Conn, projectLinkQuery{}, + ` + SELECT $columns + FROM + handmade_links as link + WHERE + link.project_id = $1 + ORDER BY link.ordering ASC + `, + project.ID, + ) + if err != nil { + return ErrorResponse(http.StatusInternalServerError, oops.New(err, "failed to fetch project links")) + } + c.Perf.EndBlock() + + c.Perf.StartBlock("SQL", "Fetch category tree") + categoryTree := models.GetFullCategoryTree(c.Context(), c.Conn) + lineageBuilder := models.MakeCategoryLineageBuilder(categoryTree) + c.Perf.EndBlock() + + c.Perf.StartBlock("SQL", "Fetching project timeline") + type postQuery struct { + Post models.Post `db:"post"` + Thread models.Thread `db:"thread"` + Author models.User `db:"author"` + } + postQueryResult, err := db.Query(c.Context(), c.Conn, postQuery{}, + ` + SELECT $columns + FROM + handmade_post AS post + INNER JOIN handmade_thread AS thread ON thread.id = post.thread_id + INNER JOIN auth_user AS author ON author.id = post.author_id + WHERE + post.project_id = $1 + ORDER BY post.postdate DESC + LIMIT $2 + `, + project.ID, + maxRecentActivity, + ) + if err != nil { + return ErrorResponse(http.StatusInternalServerError, oops.New(err, "failed to fetch project posts")) + } + c.Perf.EndBlock() + + var projectHomepageData ProjectHomepageData + + projectHomepageData.BaseData = getBaseData(c) + if canEdit { + projectHomepageData.BaseData.Header.EditUrl = hmnurl.BuildProjectEdit(project.Slug, "") + } + projectHomepageData.Project = templates.ProjectToTemplate(project, c.Theme) + for _, ownerRow := range ownerQueryData { + projectHomepageData.Owners = append(projectHomepageData.Owners, templates.UserToTemplate(&ownerRow.(*ownerQuery).Owner, c.Theme)) + } + + if project.Flags == 1 { + hiddenNotice := templates.Notice{ + Class: "hidden", + Content: "NOTICE: This project is hidden. It is currently visible only to owners and site admins.", + } + projectHomepageData.Notices = append(projectHomepageData.Notices, hiddenNotice) + } + + if project.Lifecycle != models.ProjectLifecycleActive { + var lifecycleNotice templates.Notice + switch project.Lifecycle { + case models.ProjectLifecycleUnapproved: + lifecycleNotice.Class = "unapproved" + lifecycleNotice.Content = template.HTML(fmt.Sprintf( + "NOTICE: This project has not yet been submitted for approval. It is only visible to owners. Please submit it for approval when the project content is ready for review.", + hmnurl.BuildProjectEdit(project.Slug, "submit"), + )) + case models.ProjectLifecycleApprovalRequired: + lifecycleNotice.Class = "unapproved" + lifecycleNotice.Content = template.HTML("NOTICE: This project is awaiting approval. It is only visible to owners and site admins.") + case models.ProjectLifecycleHiatus: + lifecycleNotice.Class = "hiatus" + lifecycleNotice.Content = template.HTML("NOTICE: This project is on hiatus and may not update for a while.") + case models.ProjectLifecycleDead: + lifecycleNotice.Class = "dead" + lifecycleNotice.Content = template.HTML("NOTICE: Site staff have marked this project as being dead. If you intend to revive it, please contact a member of the Handmade Network staff.") + case models.ProjectLifecycleLTSRequired: + lifecycleNotice.Class = "lts-reqd" + lifecycleNotice.Content = template.HTML("NOTICE: This project is awaiting approval for maintenance-mode status.") + case models.ProjectLifecycleLTS: + lifecycleNotice.Class = "lts" + lifecycleNotice.Content = template.HTML("NOTICE: This project has reached a state of completion.") + } + projectHomepageData.Notices = append(projectHomepageData.Notices, lifecycleNotice) + } + + for _, screenshot := range screenshotQueryResult.ToSlice() { + projectHomepageData.Screenshots = append(projectHomepageData.Screenshots, hmnurl.BuildUserFile(screenshot.(*screenshotQuery).Filename)) + } + + for _, link := range projectLinkResult.ToSlice() { + projectHomepageData.ProjectLinks = append(projectHomepageData.ProjectLinks, templates.LinkToTemplate(&link.(*projectLinkQuery).Link)) + } + + for _, post := range postQueryResult.ToSlice() { + projectHomepageData.RecentActivity = append(projectHomepageData.RecentActivity, PostToTimelineItem( + lineageBuilder, + &post.(*postQuery).Post, + &post.(*postQuery).Thread, + project, + nil, + &post.(*postQuery).Author, + c.Theme, + )) + } + + var res ResponseData + err = res.WriteTemplate("project_homepage.html", projectHomepageData, c.Perf) + if err != nil { + return ErrorResponse(http.StatusInternalServerError, oops.New(err, "failed to render project homepage template")) + } + return res +} diff --git a/src/website/requesthandling.go b/src/website/requesthandling.go index b643df4..c046b92 100644 --- a/src/website/requesthandling.go +++ b/src/website/requesthandling.go @@ -38,13 +38,6 @@ type RouteBuilder struct { type Handler func(c *RequestContext) ResponseData -func WrapStdHandler(h http.Handler) Handler { - return func(c *RequestContext) (res ResponseData) { - h.ServeHTTP(&res, c.Req) - return res - } -} - type Middleware func(h Handler) Handler func (rb *RouteBuilder) Handle(methods []string, regex *regexp.Regexp, h Handler) { @@ -70,10 +63,6 @@ func (rb *RouteBuilder) POST(regex *regexp.Regexp, h Handler) { rb.Handle([]string{http.MethodPost}, regex, h) } -func (rb *RouteBuilder) StdHandler(regex *regexp.Regexp, h http.Handler) { - rb.Handle([]string{""}, regex, WrapStdHandler(h)) -} - func (r *Router) ServeHTTP(rw http.ResponseWriter, req *http.Request) { path := req.URL.Path for _, route := range r.Routes { diff --git a/src/website/routes.go b/src/website/routes.go index 834bd0f..54fb963 100644 --- a/src/website/routes.go +++ b/src/website/routes.go @@ -5,10 +5,12 @@ import ( "errors" "fmt" "net/http" + "net/url" "strings" "time" "git.handmade.network/hmn/hmn/src/auth" + "git.handmade.network/hmn/hmn/src/config" "git.handmade.network/hmn/hmn/src/db" "git.handmade.network/hmn/hmn/src/hmnurl" "git.handmade.network/hmn/hmn/src/logging" @@ -117,16 +119,19 @@ func NewWebsiteRoutes(conn *pgxpool.Pool, perfCollector *perf.PerfCollector) htt // TODO(asaf): login/logout shouldn't happen on subdomains. We should verify that in the middleware. routes.POST(hmnurl.RegexLoginAction, Login) routes.GET(hmnurl.RegexLogoutAction, Logout) - routes.StdHandler(hmnurl.RegexPublic, - http.StripPrefix("/public/", http.FileServer(http.Dir("public"))), - ) + + routes.GET(hmnurl.RegexPublic, func(c *RequestContext) ResponseData { + var res ResponseData + http.StripPrefix("/public/", http.FileServer(http.Dir("public"))).ServeHTTP(&res, c.Req) + AddCORSHeaders(c, &res) + return res + }) mainRoutes.GET(hmnurl.RegexHomepage, func(c *RequestContext) ResponseData { if c.CurrentProject.IsHMN() { return Index(c) } else { - // TODO: Return the project landing page - panic("route not implemented") + return ProjectHomepage(c) } }) staticPages.GET(hmnurl.RegexManifesto, Manifesto) @@ -145,6 +150,7 @@ func NewWebsiteRoutes(conn *pgxpool.Pool, perfCollector *perf.PerfCollector) htt mainRoutes.GET(hmnurl.RegexSnippet, Snippet) mainRoutes.GET(hmnurl.RegexProjectIndex, ProjectIndex) mainRoutes.GET(hmnurl.RegexUserProfile, UserProfile) + mainRoutes.GET(hmnurl.RegexProjectNotApproved, ProjectHomepage) // NOTE(asaf): Any-project routes: mainRoutes.Handle([]string{http.MethodGet, http.MethodPost}, hmnurl.RegexForumNewThread, authMiddleware(ForumNewThread)) @@ -198,7 +204,7 @@ func getBaseData(c *RequestContext) templates.BaseData { LibraryUrl: hmnurl.BuildLibrary(c.CurrentProject.Slug), ManifestoUrl: hmnurl.BuildManifesto(), EpisodeGuideUrl: hmnurl.BuildHomepage(), // TODO(asaf) - EditUrl: hmnurl.BuildHomepage(), // TODO(asaf) + EditUrl: "", SearchActionUrl: hmnurl.BuildHomepage(), // TODO(asaf) }, Footer: templates.Footer{ @@ -349,6 +355,22 @@ func LoadCommonWebsiteData(c *RequestContext) (bool, ResponseData) { return true, ResponseData{} } +func AddCORSHeaders(c *RequestContext, res *ResponseData) { + parsed, err := url.Parse(config.Config.BaseUrl) + if err != nil { + c.Logger.Error().Str("Config.BaseUrl", config.Config.BaseUrl).Msg("Config.BaseUrl cannot be parsed. Skipping CORS headers") + return + } + origin := "" + origins, found := c.Req.Header["Origin"] + if found { + origin = origins[0] + } + if strings.HasSuffix(origin, parsed.Host) { + res.Header().Add("Access-Control-Allow-Origin", origin) + } +} + // Given a session id, fetches user data from the database. Will return nil if // the user cannot be found, and will only return an error if it's serious. func getCurrentUserAndSession(c *RequestContext, sessionId string) (*models.User, *models.Session, error) {