diff --git a/src/hmnurl/urls.go b/src/hmnurl/urls.go index 8708468c..8ee16af3 100644 --- a/src/hmnurl/urls.go +++ b/src/hmnurl/urls.go @@ -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 */ diff --git a/src/templates/src/include/header.html b/src/templates/src/include/header.html index 261f3a55..6130f33d 100644 --- a/src/templates/src/include/header.html +++ b/src/templates/src/include/header.html @@ -84,10 +84,7 @@
Resources
{{ svg "chevron-down-thick" }}
diff --git a/src/templates/src/library_not_ported_yet.html b/src/templates/src/library_not_ported_yet.html deleted file mode 100644 index c6a246c2..00000000 --- a/src/templates/src/library_not_ported_yet.html +++ /dev/null @@ -1,8 +0,0 @@ -{{ template "base.html" . }} - -{{ define "content" }} -
-

The library is coming back soon.

-

The previous library wasn't everything we wanted it to be. Watch this space.

-
-{{ end }} diff --git a/src/templates/types.go b/src/templates/types.go index d6c2f7d6..8810e102 100644 --- a/src/templates/types.go +++ b/src/templates/types.go @@ -52,7 +52,6 @@ type Header struct { FishbowlUrl string ForumsUrl string ConferencesUrl string - LibraryUrl string EducationUrl string Project *ProjectHeader diff --git a/src/website/base_data.go b/src/website/base_data.go index c9ec89d6..1c0e6078 100644 --- a/src/website/base_data.go +++ b/src/website/base_data.go @@ -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{ diff --git a/src/website/library.go b/src/website/library.go deleted file mode 100644 index 17d58c8c..00000000 --- a/src/website/library.go +++ /dev/null @@ -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 -} diff --git a/src/website/routes.go b/src/website/routes.go index 55e21217..028d9883 100644 --- a/src/website/routes.go +++ b/src/website/routes.go @@ -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