...including the nav and stuff

This commit is contained in:
Ben Visness 2022-11-05 16:23:12 -05:00
parent f0597f3eb8
commit 084b13ae34
7 changed files with 7 additions and 36 deletions

View File

@ -701,18 +701,11 @@ func (c *UrlContext) BuildBlogPostReply(threadId int, postId int) string {
}
/*
* Library
* Library (old)
*/
var RegexLibraryAny = regexp.MustCompile(`^/library`)
var RegexLibrary = regexp.MustCompile(`^/library$`)
func BuildLibrary() string {
defer CatchPanic()
return Url("/library", nil)
}
/*
* Episode Guide
*/

View File

@ -84,10 +84,7 @@
<div class="root-item">
<a>Resources <div class="dib svgicon ml1">{{ svg "chevron-down-thick" }}</div></a>
<div class="submenu b--theme-dark">
<a href="{{ .Header.LibraryUrl }}">Library</a>
{{ if and .User .User.IsEduTester }}
<a href="{{ .Header.EducationUrl }}">Education</a>
{{ end }}
<a href="{{ .Header.EducationUrl }}">Education</a>
</div>
</div>
</div>

View File

@ -1,8 +0,0 @@
{{ template "base.html" . }}
{{ define "content" }}
<div class="center ph2 pv5">
<h2>The library is coming back soon.</h2>
<p>The previous library wasn't everything we wanted it to be. Watch this space.</p>
</div>
{{ end }}

View File

@ -52,7 +52,6 @@ type Header struct {
FishbowlUrl string
ForumsUrl string
ConferencesUrl string
LibraryUrl string
EducationUrl string
Project *ProjectHeader

View File

@ -12,7 +12,8 @@ func getBaseDataAutocrumb(c *RequestContext, title string) templates.BaseData {
}
// NOTE(asaf): If you set breadcrumbs, the breadcrumb for the current project will automatically be prepended when necessary.
// If you pass nil, no breadcrumbs will be created.
//
// If you pass nil, no breadcrumbs will be created.
func getBaseData(c *RequestContext, title string, breadcrumbs []templates.Breadcrumb) templates.BaseData {
var project models.Project
if c.CurrentProject != nil {
@ -75,7 +76,6 @@ func getBaseData(c *RequestContext, title string, breadcrumbs []templates.Breadc
FishbowlUrl: hmnurl.BuildFishbowlIndex(),
ForumsUrl: hmnurl.HMNProjectContext.BuildForum(nil, 1),
ConferencesUrl: hmnurl.BuildConferences(),
LibraryUrl: hmnurl.BuildLibrary(),
EducationUrl: hmnurl.BuildEducationIndex(),
},
Footer: templates.Footer{

View File

@ -1,9 +0,0 @@
package website
func LibraryNotPortedYet(c *RequestContext) ResponseData {
baseData := getBaseData(c, "Library", nil)
var res ResponseData
res.MustWriteTemplate("library_not_ported_yet.html", baseData, c.Perf)
return res
}

View File

@ -130,10 +130,9 @@ func NewWebsiteRoutes(conn *pgxpool.Pool) http.Handler {
hmnOnly.POST(hmnurl.RegexAPICheckUsername, csrfMiddleware(APICheckUsername))
hmnOnly.GET(hmnurl.RegexLibraryAny, LibraryNotPortedYet)
// hmnOnly.GET(hmnurl.RegexLibraryAny, func(c *RequestContext) ResponseData {
// return c.Redirect(hmnurl.BuildEducationIndex(), http.StatusFound)
// })
hmnOnly.GET(hmnurl.RegexLibraryAny, func(c *RequestContext) ResponseData {
return c.Redirect(hmnurl.BuildEducationIndex(), http.StatusFound)
})
// Project routes can appear either at the root (e.g. hero.handmade.network/edit)
// or on a personal project path (e.g. handmade.network/p/123/hero/edit). So, we