rename templates (clean up)

assets/views/artwork.jet.html

@@ -1,7 +1,7 @@
 {{- extends "layout/default" }}
 {{- block body() }}
 <div class="container illust" id="checkpoint">
-  {{- include "components/artwork" .Illust }}
+  {{- include "fragments/artwork" .Illust }}
   <div class="illust-other-works">
     <div class="artwork-container-header">
       <a class="illust-other-works-author" href="/users/{{ .Illust.User.ID }}"><img src="{{ .Illust.User.Avatar }}"
@@ -14,7 +14,7 @@
     <div class="artwork-container-scroll">
       {{- range .Illust.RecentWorks }}
       <div class="artwork-small artwork">
-        {{- include "components/thumbnail-dt" . }}
+        {{- include "fragments/thumbnail-dt" . }}
       </div>
       {{- end }}
     </div>
@@ -51,7 +51,7 @@
 <div class="container">
   <h2>Related works</h2>
   <div class="artwork-container">
-    {{- include "components/small-tn" .Illust.RelatedWorks }}
+    {{- include "fragments/small-tn" .Illust.RelatedWorks }}
   </div>
 </div>
 {{- end }}

assets/views/artworkMulti.jet.html

@@ -2,7 +2,7 @@
 {{- block body() }}
 {{- range .Artworks }}
 <div class="container illust">
-{{- include "components/artwork" . }}
+{{- include "fragments/artwork" . }}
 </div>
 {{- end }}
 {{- end }}

assets/views/discovery.jet.html

@@ -14,7 +14,7 @@
     <a href='{{replaceQuery(.Queries, "mode", "r18")}}' class="switch-button">R-18</a>
   </div>
   <div class="artwork-container">
-    {{- include "components/small-tn" .Artworks }}
+    {{- include "fragments/small-tn" .Artworks }}
   </div>
   <div class="pagination">
     <a href="" class="pagination-button">Reload</a>

assets/views/following.jet.html

@@ -8,7 +8,7 @@
     <a href="/following_works?mode=safe&page=1" class="switch-button">Safe</a>
     <a href="/following_works?mode=r18&page=1" class="switch-button">R-18</a>
   </div>
-  <div class="artwork-container">{{ include "components/small-tn" .Artworks }}</div>
+  <div class="artwork-container">{{ include "fragments/small-tn" .Artworks }}</div>
   <div class="pagination">
     {{- url := "/self/following_works" + "?mode=" + .Mode + "&page=" }}
     <small>Page {{ .CurPage }}</small>

assets/views/index.jet.html

@@ -9,7 +9,7 @@
     <a href="/ranking?content=all">See more</a>
   </div>
   <div class="artwork-container-scroll">
-    {{- include "components/ranking-tn" .NoTokenData.Contents }}
+    {{- include "fragments/ranking-tn" .NoTokenData.Contents }}
   </div>
 
   {{- else }}
@@ -23,18 +23,18 @@
     <a href="/self/followingWorks">See more</a>
   </div>
   <div class="artwork-container-scroll">
-    {{- include "components/small-tn" .Data.Following }}
+    {{- include "fragments/small-tn" .Data.Following }}
   </div>
   <br />
   <h2>Recommended works</h2>
   <div class="artwork-container">
-    {{- include "components/small-tn" .Data.Recommended }}
+    {{- include "fragments/small-tn" .Data.Recommended }}
   </div>
   <br />
   {{- range .Data.RecommendByTags }}
   <h2>Recommended illustrations tagged <a href="/tags/{{.Name}}">#{{.Name}}</a></h2>
   <div class="artwork-container">
-    {{- include "components/small-tn" .Artworks }}
+    {{- include "fragments/small-tn" .Artworks }}
   </div>
   <br />
   {{- end }}

assets/views/newest.jet.html

@@ -7,6 +7,6 @@
     <a href="/newest" class="switch-button">Safe</a>
     <a href="/newest?mode=r18" class="switch-button">R-18</a>
   </div>
-  <div class="artwork-container">{{ include "components/small-tn" .Items }}</div>
+  <div class="artwork-container">{{ include "fragments/small-tn" .Items }}</div>
 </div>
 {{- end }}

assets/views/novel.jet.html

@@ -124,7 +124,7 @@
   </div>
   <div class="novel-container">
     {{- range .NovelRelated }}
-    {{- include "components/novel-tn" . }}
+    {{- include "fragments/novel-tn" . }}
     {{- end }}
   </div>
 </div>

assets/views/novelDiscovery.jet.html

@@ -16,7 +16,7 @@
   </div>
   <div class="novel-container">
       {{- range .Novels }}
-        {{- include "components/novel-tn" . }}
+        {{- include "fragments/novel-tn" . }}
     {{- end }}
   </div>
   <div class="pagination">

assets/views/rank.jet.html

@@ -1,5 +1,5 @@
 {{- extends "layout/default" }}
-{{- import "components/switcher" }}
+{{- import "blocks/switcher" }}
 {{- block body() }}
 
 <div class="container">
@@ -70,7 +70,7 @@
   <br />
 
   <div class="artwork-container">
-    {{- include "components/ranking-tn" .Data.Contents }}
+    {{- include "fragments/ranking-tn" .Data.Contents }}
   </div>
 
   <div class="pagination">

assets/views/tag.jet.html

@@ -1,5 +1,5 @@
 {{- extends "layout/default" }}
-{{- import "components/switcher" }}
+{{- import "blocks/switcher" }}
 {{- block body() }}
 
 <div class="container">
@@ -97,18 +97,18 @@
   <h2>Popular artworks</h2>
   <h3>Recent</h3>
   <div class="artwork-container-scroll">
-    {{- include "components/small-tn" .Data.Popular.Recent }}
+    {{- include "fragments/small-tn" .Data.Popular.Recent }}
   </div>
   <h3>All Time</h3>
   <div class="artwork-container-scroll">
-    {{- include "components/small-tn" .Data.Popular.Permanent }}
+    {{- include "fragments/small-tn" .Data.Popular.Permanent }}
   </div>
   {{- end }}
   {* Switchers here *}
   <br />
   <h2>Works</h2>
   <div class="artwork-container">
-    {{- include "components/small-tn" .Data.Artworks.Artworks }}
+    {{- include "fragments/small-tn" .Data.Artworks.Artworks }}
   </div>
 
   <div class="pagination">

assets/views/temp.jet.html

@@ -1,5 +1,4 @@
-{{- extends "layout/default" }}
-{{- block body() }}
+{* this is scratch area to put code snippets *}
 
   {{- if Token }}
   <div class="switcher">
@@ -12,17 +11,17 @@
     <a href="/self/following_works">See more</a>
   </div>
   <div class="artwork-container-scroll">
-    {{- include "components/small-tn" .Artworks.Following }}
+    {{- include "fragments/small-tn" .Artworks.Following }}
   </div>
   <br />
   <h2>Recently completed commissions</h2>
   <div class="artwork-container">
-    {{- include "components/small-tn" .Artworks.Commissions }}
+    {{- include "fragments/small-tn" .Artworks.Commissions }}
   </div>
   <br />
   <h2>Recommended works</h2>
   <div class="artwork-container">
-    {{- include "components/small-tn" .Artworks.Recommended }}
+    {{- include "fragments/small-tn" .Artworks.Recommended }}
   </div>
   <br />
 
@@ -84,13 +83,13 @@
 
   <h2>Works by recommended users</h2>
   <div class="artwork-container">
-    {{- include "components/small-tn" .Artworks.Users }}
+    {{- include "fragments/small-tn" .Artworks.Users }}
   </div>
   <br />
   {{- range .Artworks.RecommendByTags }}
   <h2>Recommended illustrations tagged #{{.Name}}</h2>
   <div class="artwork-container">
-    {{- include "components/small-tn" .Artworks }}
+    {{- include "fragments/small-tn" .Artworks }}
   </div>
   <br />
   {{- end }}
@@ -98,7 +97,7 @@
   <p>Please check out the sidebar for more features. There used to be a small ranking container here...</p>
   {* <h2>Newest works</h2>
        <div class="artwork-container-scroll">
-       {{- include "components/small-tn" .Artworks.Newest }}
+       {{- include "fragments/small-tn" .Artworks.Newest }}
        </div>
        {{- else }}
        <p><a href="/login">Login</a> to access more features!</p>
@@ -164,4 +163,3 @@
   <br /> *}
 
   {{- end }}
-{{- end }}

assets/views/user.jet.html

@@ -63,7 +63,7 @@
       <div class="artwork-actions"><a href="{{combinedUrl}}">View all art on this page</a></div>
     </div>
     <div class="artwork-container">
-      {{- include "components/small-tn" .User.Artworks }}
+      {{- include "fragments/small-tn" .User.Artworks }}
     </div>
     {{- else }}
 
@@ -72,7 +72,7 @@
     </div>
     <div class="novel-container">
       {{- range .User.Novels }}
-      {{- include "components/novel-tn" . }}
+      {{- include "fragments/novel-tn" . }}
       {{- end }}
     </div>
     {{- end }}

main.go

@@ -22,7 +22,7 @@ import (
 func main() {
 	config.GlobalConfig.LoadConfig()
 	audit.Init(config.GlobalConfig.InDevelopment)
-	template.Init(config.GlobalConfig.InDevelopment)
+	template.Init(config.GlobalConfig.InDevelopment, "assets/views")
 
 	// Initialize and start the proxy checker
 	ctx_timeout, cancel := context.WithTimeout(context.Background(), 10 * time.Second)

server/template/render.go

@@ -17,15 +17,15 @@ import (
 // global variable, yes.
 var views *jet.Set
 
-func Init(DisableCache bool) {
+func Init(DisableCache bool, assetsLocation string) {
 	if DisableCache {
 		views = jet.NewSet(
-			jet.NewOSFileSystemLoader("assets/views"),
+			jet.NewOSFileSystemLoader(assetsLocation),
 			jet.InDevelopmentMode(), // disable cache
 		)
 	} else {
 		views = jet.NewSet(
-			jet.NewOSFileSystemLoader("assets/views"),
+			jet.NewOSFileSystemLoader(assetsLocation),
 		)
 	}
 	for fn_name, fn := range GetTemplateFunctions() {

server/template/render_test.go

@@ -6,7 +6,6 @@ package template_test
 import (
 	"io"
 	"log"
-	"os"
 	"reflect"
 	"strings"
 	"testing"
@@ -19,12 +18,7 @@ import (
 )
 
 func TestMain(m *testing.M) {
-	err := os.Chdir("..")
-	if err != nil {
-		panic(err)
-	}
-	template.Init(false)
-
+	template.Init(false, "../../assets/views")
 	m.Run()
 }
 

test.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
-go test ./template
+go test ./server/template
 
 # install as pre-commit hook:
 # cp test.sh ~/.git/hooks/pre-commit