consolidate view and views directories

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"),
 ))

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"),
 ))