Skip to content

Commit 0bfea63

Browse files
committed
fix: move blog handlers to single handler
This reverts commit 880deb8.
1 parent 79ce1bc commit 0bfea63

2 files changed

Lines changed: 8 additions & 7 deletions

File tree

main.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,9 @@ func main() {
3434

3535
serv.AddRoute("GET /", root.Handler)
3636
serv.AddRoute("GET /health", health.Handler)
37-
serv.AddRoute("GET /blog", blog.Handler)
3837
serv.AddRoute("GET /blog/rss.xml", blog.RssHandler)
3938
serv.AddRoute("GET /blog/atom.xml", blog.AtomHandler)
40-
serv.AddRoute("GET /blog/{article...}", blog.ArticleHandler)
39+
serv.AddRoute("GET /blog/{article...}", blog.Handler)
4140
serv.AddRoute("GET /contact", contact.Handler)
4241
serv.AddRoute("GET /resume", resume.Handler)
4342

pkg/routes/blog/blog.go

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,18 @@ func init() {
2525
}
2626

2727
func Handler(serv *app.Server, w http.ResponseWriter, r *http.Request) (templ.Component, error) {
28-
serv.Cache_route(w, r, 3600)
29-
return serv.Template(blog(getSortedArticles(Articles))), nil
30-
}
31-
32-
func ArticleHandler(serv *app.Server, w http.ResponseWriter, r *http.Request) (templ.Component, error) {
3328
article_name, err := url.PathUnescape(r.PathValue("article"))
3429
if err != nil {
3530
return nil, fmt.Errorf("Failed to get article: %s", err)
3631
}
3732

33+
// root /blog
34+
if article_name == "" {
35+
serv.Cache_route(w, r, 3600)
36+
return serv.Template(blog(getSortedArticles(Articles))), nil
37+
}
38+
39+
// query article
3840
a, ok := Articles[strings.ToLower(article_name)]
3941
if !ok {
4042
return nil, errors.New("Article not found")

0 commit comments

Comments
 (0)