Restore the library since we're not actually rolling out education yet

src/hmnurl/urls.go

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

src/templates/src/include/header.html

@@ -84,7 +84,10 @@
                     <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 }}
                         </div>
                     </div>
                 </div>

src/templates/types.go

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

src/website/base_data.go

@@ -75,6 +75,7 @@ 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{

src/website/library.go

@@ -0,0 +1,9 @@
+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
+}

src/website/middlewares.go

@@ -75,6 +75,16 @@ func adminsOnly(h Handler) Handler {
 	}
 }
 
+func educationBetaTestersOnly(h Handler) Handler {
+	return func(c *RequestContext) ResponseData {
+		if c.CurrentUser == nil || !c.CurrentUser.CanSeeUnpublishedEducationContent() {
+			return FourOhFour(c)
+		}
+
+		return h(c)
+	}
+}
+
 func educationAuthorsOnly(h Handler) Handler {
 	return func(c *RequestContext) ResponseData {
 		if c.CurrentUser == nil || !c.CurrentUser.CanAuthorEducation() {

src/website/routes.go

@@ -117,21 +117,25 @@ func NewWebsiteRoutes(conn *pgxpool.Pool) http.Handler {
 	hmnOnly.GET(hmnurl.RegexFishbowlIndex, FishbowlIndex)
 	hmnOnly.GET(hmnurl.RegexFishbowl, Fishbowl)
 
-	hmnOnly.GET(hmnurl.RegexEducationIndex, EducationIndex)
+	educationPrerelease := hmnOnly.WithMiddleware(educationBetaTestersOnly)
-	hmnOnly.GET(hmnurl.RegexEducationGlossary, EducationGlossary)
+	{
-	hmnOnly.GET(hmnurl.RegexEducationArticleNew, educationAuthorsOnly(EducationArticleNew))
+		educationPrerelease.GET(hmnurl.RegexEducationIndex, EducationIndex)
-	hmnOnly.POST(hmnurl.RegexEducationArticleNew, educationAuthorsOnly(EducationArticleNewSubmit))
+		educationPrerelease.GET(hmnurl.RegexEducationGlossary, EducationGlossary)
-	hmnOnly.GET(hmnurl.RegexEducationArticle, EducationArticle) // Article stuff must be last so `/glossary` and others do not match as an article slug
+		educationPrerelease.GET(hmnurl.RegexEducationArticleNew, educationAuthorsOnly(EducationArticleNew))
-	hmnOnly.GET(hmnurl.RegexEducationArticleEdit, educationAuthorsOnly(EducationArticleEdit))
+		educationPrerelease.POST(hmnurl.RegexEducationArticleNew, educationAuthorsOnly(EducationArticleNewSubmit))
-	hmnOnly.POST(hmnurl.RegexEducationArticleEdit, educationAuthorsOnly(EducationArticleEditSubmit))
+		educationPrerelease.GET(hmnurl.RegexEducationArticle, EducationArticle) // Article stuff must be last so `/glossary` and others do not match as an article slug
-	hmnOnly.GET(hmnurl.RegexEducationArticleDelete, educationAuthorsOnly(EducationArticleDelete))
+		educationPrerelease.GET(hmnurl.RegexEducationArticleEdit, educationAuthorsOnly(EducationArticleEdit))
-	hmnOnly.POST(hmnurl.RegexEducationArticleDelete, educationAuthorsOnly(csrfMiddleware(EducationArticleDeleteSubmit)))
+		educationPrerelease.POST(hmnurl.RegexEducationArticleEdit, educationAuthorsOnly(EducationArticleEditSubmit))
+		educationPrerelease.GET(hmnurl.RegexEducationArticleDelete, educationAuthorsOnly(EducationArticleDelete))
+		educationPrerelease.POST(hmnurl.RegexEducationArticleDelete, educationAuthorsOnly(csrfMiddleware(EducationArticleDeleteSubmit)))
+	}
 
 	hmnOnly.POST(hmnurl.RegexAPICheckUsername, csrfMiddleware(APICheckUsername))
 
-	hmnOnly.GET(hmnurl.RegexLibraryAny, func(c *RequestContext) ResponseData {
+	hmnOnly.GET(hmnurl.RegexLibraryAny, LibraryNotPortedYet)
-		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