Make assets directory structure better

endigma · Mar 25, 2021 · 66e6d18 · 66e6d18
1 parent 93db267
commit 66e6d18
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 6 deletions.
diff --git a/assets/static/page.html → assets/page.html b/assets/static/page.html → assets/page.html
@@ -18,8 +18,8 @@
     {{ end }}
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.2/css/all.min.css"/>
     <link href="https://fonts.googleapis.com/css2?family=Fira+Mono&family=Fira+Sans&display=swap" rel="stylesheet">
-    <link href="{{ .Prefix }}/serve/style.css" rel="stylesheet">
-    <link href="{{ .Prefix }}/serve/vars.css" rel="stylesheet">
+    <link href="{{ .Prefix }}/static/style.css" rel="stylesheet">
+    <link href="{{ .Prefix }}/static/vars.css" rel="stylesheet">
 </head>
 
 <body>

diff --git a/assets/serve/style.css → assets/static/style.css b/assets/serve/style.css → assets/static/style.css
diff --git a/assets/serve/vars.css → assets/static/vars.css b/assets/serve/vars.css → assets/static/vars.css
diff --git a/docs/usage.md b/docs/usage.md
@@ -2,6 +2,8 @@
 Title: usage
 ---
 
+# usage
+
 ### yaml header
 
 in the document we use the yaml header for certain things. these things are:

diff --git a/example.toml b/example.toml
@@ -41,4 +41,4 @@ linenumbersintable = true
 tabwidth = 4
 # determines whether the syntax highlighter uses class names or hardcoded css
 # if you enable this it renders highlightstyle useless
-useclasses = false
+useclasses = false
diff --git a/handler/handler.go b/handler/handler.go
@@ -70,6 +70,6 @@ func Handler(rw http.ResponseWriter, req *http.Request) {
 
 	page.Raw = path
 
-	tmpl := template.Must(template.ParseFiles(structure.Conf.General.WorkDir + "assets/static/page.html"))
+	tmpl := template.Must(template.ParseFiles(structure.Conf.General.WorkDir + "assets/page.html"))
 	tmpl.Execute(rw, page)
 }
diff --git a/main.go b/main.go
@@ -40,8 +40,8 @@ func main() {
 
 	log.Debug(structure.Conf.General.WorkDir)
 
-	fs := http.FileServer(http.Dir(structure.Conf.General.WorkDir + "assets/serve"))
-	http.Handle(structure.Conf.General.Prefix+"/serve/", http.StripPrefix(structure.Conf.General.Prefix+"/serve/", fs))
+	fs := http.FileServer(http.Dir(structure.Conf.General.WorkDir + "assets/static"))
+	http.Handle(structure.Conf.General.Prefix+"/static/", http.StripPrefix(structure.Conf.General.Prefix+"/static/", fs))
 
 	fs2 := http.FileServer(http.Dir(structure.Conf.General.WorkDir + "assets/public"))
 	http.Handle(structure.Conf.General.Prefix+"/public/", http.StripPrefix(structure.Conf.General.Prefix+"/public/", fs2))
-Original file line number
+Diff line change
@@ Expand Up / @@ -2,6 +2,8 @@ @@
     Title: usage
     ---
+    # usage
     ### yaml header
     in the document we use the yaml header for certain things. these things are:
@@ Expand Down @@