diff --git a/admin/templates.go b/admin/templates.go index 12cdf08..ab4517e 100644 --- a/admin/templates.go +++ b/admin/templates.go @@ -11,44 +11,44 @@ import ( var indexTemplate = template.Must(template.ParseFiles( filepath.Join("admin", "views", "layout.html"), - filepath.Join("views", "prideflag.html"), + filepath.Join("view", "prideflag.html"), filepath.Join("admin", "components", "release", "release-list-item.html"), filepath.Join("admin", "views", "index.html"), )) var loginTemplate = template.Must(template.ParseFiles( filepath.Join("admin", "views", "layout.html"), - filepath.Join("views", "prideflag.html"), + filepath.Join("view", "prideflag.html"), filepath.Join("admin", "views", "login.html"), )) var loginTOTPTemplate = template.Must(template.ParseFiles( filepath.Join("admin", "views", "layout.html"), - filepath.Join("views", "prideflag.html"), + filepath.Join("view", "prideflag.html"), filepath.Join("admin", "views", "login-totp.html"), )) var registerTemplate = template.Must(template.ParseFiles( filepath.Join("admin", "views", "layout.html"), - filepath.Join("views", "prideflag.html"), + filepath.Join("view", "prideflag.html"), filepath.Join("admin", "views", "register.html"), )) var logoutTemplate = template.Must(template.ParseFiles( filepath.Join("admin", "views", "layout.html"), - filepath.Join("views", "prideflag.html"), + filepath.Join("view", "prideflag.html"), filepath.Join("admin", "views", "logout.html"), )) var accountTemplate = template.Must(template.ParseFiles( filepath.Join("admin", "views", "layout.html"), - filepath.Join("views", "prideflag.html"), + filepath.Join("view", "prideflag.html"), filepath.Join("admin", "views", "edit-account.html"), )) var totpSetupTemplate = template.Must(template.ParseFiles( filepath.Join("admin", "views", "layout.html"), - filepath.Join("views", "prideflag.html"), + filepath.Join("view", "prideflag.html"), filepath.Join("admin", "views", "totp-setup.html"), )) var totpConfirmTemplate = template.Must(template.ParseFiles( filepath.Join("admin", "views", "layout.html"), - filepath.Join("views", "prideflag.html"), + filepath.Join("view", "prideflag.html"), filepath.Join("admin", "views", "totp-confirm.html"), )) @@ -79,23 +79,23 @@ var logsTemplate = template.Must(template.New("layout.html").Funcs(template.Func }, }).ParseFiles( filepath.Join("admin", "views", "layout.html"), - filepath.Join("views", "prideflag.html"), + filepath.Join("view", "prideflag.html"), filepath.Join("admin", "views", "logs.html"), )) var releaseTemplate = template.Must(template.ParseFiles( filepath.Join("admin", "views", "layout.html"), - filepath.Join("views", "prideflag.html"), + filepath.Join("view", "prideflag.html"), filepath.Join("admin", "views", "edit-release.html"), )) var artistTemplate = template.Must(template.ParseFiles( filepath.Join("admin", "views", "layout.html"), - filepath.Join("views", "prideflag.html"), + filepath.Join("view", "prideflag.html"), filepath.Join("admin", "views", "edit-artist.html"), )) var trackTemplate = template.Must(template.ParseFiles( filepath.Join("admin", "views", "layout.html"), - filepath.Join("views", "prideflag.html"), + filepath.Join("view", "prideflag.html"), filepath.Join("admin", "components", "release", "release-list-item.html"), filepath.Join("admin", "views", "edit-track.html"), )) diff --git a/templates/templates.go b/templates/templates.go index 8d1a5ca..4c5793b 100644 --- a/templates/templates.go +++ b/templates/templates.go @@ -6,23 +6,30 @@ import ( ) var IndexTemplate = template.Must(template.ParseFiles( - filepath.Join("views", "layout.html"), - filepath.Join("views", "header.html"), - filepath.Join("views", "footer.html"), - filepath.Join("views", "prideflag.html"), - filepath.Join("views", "index.html"), + filepath.Join("view", "layout.html"), + filepath.Join("view", "header.html"), + filepath.Join("view", "footer.html"), + filepath.Join("view", "prideflag.html"), + filepath.Join("view", "index.html"), )) var MusicTemplate = template.Must(template.ParseFiles( - filepath.Join("views", "layout.html"), - filepath.Join("views", "header.html"), - filepath.Join("views", "footer.html"), - filepath.Join("views", "prideflag.html"), - filepath.Join("views", "music.html"), + filepath.Join("view", "layout.html"), + filepath.Join("view", "header.html"), + filepath.Join("view", "footer.html"), + filepath.Join("view", "prideflag.html"), + filepath.Join("view", "music.html"), )) var MusicGatewayTemplate = template.Must(template.ParseFiles( - filepath.Join("views", "layout.html"), - filepath.Join("views", "header.html"), - filepath.Join("views", "footer.html"), - filepath.Join("views", "prideflag.html"), - filepath.Join("views", "music-gateway.html"), + filepath.Join("view", "layout.html"), + filepath.Join("view", "header.html"), + filepath.Join("view", "footer.html"), + filepath.Join("view", "prideflag.html"), + filepath.Join("view", "music-gateway.html"), +)) +var BlogTemplate = template.Must(template.ParseFiles( + filepath.Join("view", "layout.html"), + filepath.Join("view", "header.html"), + filepath.Join("view", "footer.html"), + filepath.Join("view", "prideflag.html"), + filepath.Join("view", "blog.html"), )) diff --git a/views/404.html b/view/404.html similarity index 100% rename from views/404.html rename to view/404.html diff --git a/views/footer.html b/view/footer.html similarity index 100% rename from views/footer.html rename to view/footer.html diff --git a/views/header.html b/view/header.html similarity index 100% rename from views/header.html rename to view/header.html diff --git a/views/index.html b/view/index.html similarity index 100% rename from views/index.html rename to view/index.html diff --git a/views/layout.html b/view/layout.html similarity index 100% rename from views/layout.html rename to view/layout.html diff --git a/views/music-gateway.html b/view/music-gateway.html similarity index 100% rename from views/music-gateway.html rename to view/music-gateway.html diff --git a/views/music.html b/view/music.html similarity index 100% rename from views/music.html rename to view/music.html diff --git a/views/prideflag.html b/view/prideflag.html similarity index 100% rename from views/prideflag.html rename to view/prideflag.html