diff --git a/handler/announce.go b/handler/announce.go
index 3bfc8a2..cbb8d90 100644
--- a/handler/announce.go
+++ b/handler/announce.go
@@ -14,7 +14,7 @@ import (
)
func AnnounceIndex(ctx *gin.Context) {
- ctx.HTML(http.StatusOK, "announce.tmpl", gin.H{
+ ctx.HTML(http.StatusOK, "common/announce.html", gin.H{
"title": "Love Live! 学园偶像祭 非官方服务器",
"content": template.HTML("目前开发完毕的功能包括:登录、相册、Live、个人信息。
其他功能仍在开发中,有报错属于正常现象。"),
})
diff --git a/main.go b/main.go
index 749dc37..eac5d52 100644
--- a/main.go
+++ b/main.go
@@ -18,7 +18,7 @@ func main() {
// Router
r := gin.Default()
r.Static("/static", "static")
- r.LoadHTMLGlob("static/*.tmpl")
+ r.LoadHTMLGlob("static/templates/**/*.html")
// /
r.Any("/", func(ctx *gin.Context) {
@@ -99,7 +99,7 @@ func main() {
// Web
// Manga
r.GET("/manga", func(ctx *gin.Context) {
- ctx.HTML(http.StatusOK, "manga.tmpl", gin.H{})
+ ctx.HTML(http.StatusOK, "common/manga.html", gin.H{})
})
r.Run(":80") // listen and serve on 0.0.0.0:8080 (for windows "localhost:8080")
diff --git a/static/manga.tmpl b/static/manga.tmpl
deleted file mode 100644
index 30b2c16..0000000
--- a/static/manga.tmpl
+++ /dev/null
@@ -1,253 +0,0 @@
-{{ define "manga.tmpl" }}
-
-
-

- {{ .content }}
+{{ .content }}
-
+