Remove resources from the table of contents

beta
Ben Visness 2 weeks ago
parent 4b9fe628e6
commit 8121830561
  1. 5
      public/style.css
  2. 4
      src/hmnurl/hmnurl_test.go
  3. 6
      src/hmnurl/urls.go
  4. 5
      src/parsing/ggcode.go
  5. 5
      src/rawdata/scss/_education.scss
  6. 6
      src/templates/src/education_index.html
  7. 22
      src/website/education.go
  8. 1
      src/website/routes.go

@ -6353,7 +6353,7 @@ input[type=submit]:not(.button-small), .notice {
.f3 {
font-size: 1.5rem; }
.f4 {
.f4, .edu-article .resource-title {
font-size: 1.25rem; }
.f5 {
@ -8301,6 +8301,9 @@ nav.timecodes {
text-align: center;
margin: 10px 0; }
.edu-article .resource-title {
font-weight: bold; }
.edu-article .note {
color: red; }

@ -211,6 +211,10 @@ func TestEducationArticleDelete(t *testing.T) {
AssertRegexMatch(t, BuildEducationArticleDelete("foo"), RegexEducationArticleDelete, map[string]string{"slug": "foo"})
}
func TestEducationRerender(t *testing.T) {
AssertRegexMatch(t, BuildEducationRerender(), RegexEducationRerender, nil)
}
func TestForum(t *testing.T) {
AssertRegexMatch(t, hmn.BuildForum(nil, 1), RegexForum, nil)
AssertRegexMatch(t, hmn.BuildForum([]string{"wip"}, 2), RegexForum, map[string]string{"subforums": "wip", "page": "2"})

@ -481,6 +481,12 @@ func BuildEducationArticleDelete(slug string) string {
return Url(fmt.Sprintf("/education/%s/delete", slug), nil)
}
var RegexEducationRerender = regexp.MustCompile(`^/education/rerender$`)
func BuildEducationRerender() string {
return Url("/education/rerender", nil)
}
/*
* Forums
*/

@ -60,7 +60,7 @@ var ggcodeTags = map[string]ggcodeTag{
Renderer: func(c ggcodeRendererContext, n *ggcodeNode, entering bool) error {
if entering {
c.W.WriteString(`<div class="edu-resource">`)
c.W.WriteString(fmt.Sprintf(` <a href="%s" target="_blank"><h2>%s</h2></a>`, n.Args["url"], utils.OrDefault(n.Args["name"], "[missing `name`]")))
c.W.WriteString(fmt.Sprintf(` <a class="resource-title" href="%s" target="_blank">%s</a>`, n.Args["url"], utils.OrDefault(n.Args["name"], "[missing `name`]")))
} else {
c.W.WriteString("</div>")
}
@ -212,17 +212,14 @@ type ggcodeDelimiterParser struct {
}
func (p ggcodeDelimiterParser) IsDelimiter(b byte) bool {
fmt.Println("delmit", string(b))
return b == '(' || b == ')'
}
func (p ggcodeDelimiterParser) CanOpenCloser(opener, closer *parser.Delimiter) bool {
fmt.Println("oopen")
return opener.Char == '(' && closer.Char == ')'
}
func (p ggcodeDelimiterParser) OnMatch(consumes int) gast.Node {
fmt.Println("out!")
return p.Node
}

@ -3,6 +3,11 @@
@extend .pa3, .bg--dim, .br3;
}
.resource-title {
@extend .f4;
font-weight: bold;
}
.note {
color: red;
}

@ -40,4 +40,10 @@
</div>
</div>
{{ if and .User .User.IsEduAuthor }}
<div class="mt3">
<b>SECRET AUTHOR MAINTENANCE COMMANDS:</b>
<a href="{{ .RerenderUrl }}">Rerender all content</a>
</div>
{{ end }}
{{ end }}

@ -25,6 +25,7 @@ func EducationIndex(c *RequestContext) ResponseData {
templates.BaseData
Articles []templates.EduArticle
NewArticleUrl string
RerenderUrl string
}
articles, err := fetchEduArticles(c, c.Conn, models.EduArticleTypeArticle, c.CurrentUser)
@ -41,6 +42,7 @@ func EducationIndex(c *RequestContext) ResponseData {
BaseData: getBaseData(c, "Handmade Education", nil),
Articles: tmplArticles,
NewArticleUrl: hmnurl.BuildEducationArticleNew(),
RerenderUrl: hmnurl.BuildEducationRerender(),
}
var res ResponseData
@ -232,6 +234,26 @@ func EducationArticleDeleteSubmit(c *RequestContext) ResponseData {
return res
}
func EducationRerender(c *RequestContext) ResponseData {
everything := utils.Must1(fetchEduArticles(c, c.Conn, 0, c.CurrentUser))
for _, thing := range everything {
newHTML := parsing.ParseMarkdown(thing.CurrentVersion.ContentRaw, parsing.EducationRealMarkdown)
utils.Must1(c.Conn.Exec(c,
`
UPDATE education_article_version
SET content_html = $2
WHERE id = $1
`,
thing.CurrentVersionID,
newHTML,
))
}
res := c.Redirect(hmnurl.BuildEducationIndex(), http.StatusSeeOther)
res.AddFutureNotice("success", "Rerendered all education content.")
return res
}
func fetchEduArticles(
ctx context.Context,
dbConn db.ConnOrTx,

@ -123,6 +123,7 @@ func NewWebsiteRoutes(conn *pgxpool.Pool) http.Handler {
educationPrerelease.GET(hmnurl.RegexEducationGlossary, EducationGlossary)
educationPrerelease.GET(hmnurl.RegexEducationArticleNew, educationAuthorsOnly(EducationArticleNew))
educationPrerelease.POST(hmnurl.RegexEducationArticleNew, educationAuthorsOnly(EducationArticleNewSubmit))
educationPrerelease.GET(hmnurl.RegexEducationRerender, educationAuthorsOnly(EducationRerender))
educationPrerelease.GET(hmnurl.RegexEducationArticle, EducationArticle) // Article stuff must be last so `/glossary` and others do not match as an article slug
educationPrerelease.GET(hmnurl.RegexEducationArticleEdit, educationAuthorsOnly(EducationArticleEdit))
educationPrerelease.POST(hmnurl.RegexEducationArticleEdit, educationAuthorsOnly(EducationArticleEditSubmit))

Loading…
Cancel
Save