diff --git a/templates/asset.qtpl b/assets/assets.qtpl
similarity index 100%
rename from templates/asset.qtpl
rename to assets/assets.qtpl
diff --git a/templates/asset.qtpl.go b/assets/assets.qtpl.go
similarity index 86%
rename from templates/asset.qtpl.go
rename to assets/assets.qtpl.go
index cfecdf5..83a3131 100644
--- a/templates/asset.qtpl.go
+++ b/assets/assets.qtpl.go
@@ -1,28 +1,28 @@
-// Code generated by qtc from "asset.qtpl". DO NOT EDIT.
+// Code generated by qtc from "assets.qtpl". DO NOT EDIT.
// See https://github.com/valyala/quicktemplate for details.
-//line templates/asset.qtpl:1
-package templates
+//line assets/assets.qtpl:1
+package assets
-//line templates/asset.qtpl:1
+//line assets/assets.qtpl:1
import (
qtio422016 "io"
qt422016 "github.com/valyala/quicktemplate"
)
-//line templates/asset.qtpl:1
+//line assets/assets.qtpl:1
var (
_ = qtio422016.Copy
_ = qt422016.AcquireByteBuffer
)
-//line templates/asset.qtpl:1
+//line assets/assets.qtpl:1
func StreamDefaultCSS(qw422016 *qt422016.Writer) {
-//line templates/asset.qtpl:1
+//line assets/assets.qtpl:1
qw422016.N().S(`
`)
-//line templates/asset.qtpl:2
+//line assets/assets.qtpl:2
qw422016.N().S(`.modal__title { font-size: 2rem; }
.modal__confirmation-msg { margin: 0 0 .5rem 0; }
.modal__action { display: inline-block; font-size: 1rem; padding: .25rem; border-radius: .25rem; }
@@ -295,168 +295,168 @@ mark { background: rgba(130, 80, 30, 5); color: inherit; }
.backlinks { display: none; }
`)
-//line templates/asset.qtpl:2
+//line assets/assets.qtpl:2
qw422016.N().S(`
`)
-//line templates/asset.qtpl:3
+//line assets/assets.qtpl:3
}
-//line templates/asset.qtpl:3
+//line assets/assets.qtpl:3
func WriteDefaultCSS(qq422016 qtio422016.Writer) {
-//line templates/asset.qtpl:3
+//line assets/assets.qtpl:3
qw422016 := qt422016.AcquireWriter(qq422016)
-//line templates/asset.qtpl:3
+//line assets/assets.qtpl:3
StreamDefaultCSS(qw422016)
-//line templates/asset.qtpl:3
+//line assets/assets.qtpl:3
qt422016.ReleaseWriter(qw422016)
-//line templates/asset.qtpl:3
+//line assets/assets.qtpl:3
}
-//line templates/asset.qtpl:3
+//line assets/assets.qtpl:3
func DefaultCSS() string {
-//line templates/asset.qtpl:3
+//line assets/assets.qtpl:3
qb422016 := qt422016.AcquireByteBuffer()
-//line templates/asset.qtpl:3
+//line assets/assets.qtpl:3
WriteDefaultCSS(qb422016)
-//line templates/asset.qtpl:3
+//line assets/assets.qtpl:3
qs422016 := string(qb422016.B)
-//line templates/asset.qtpl:3
+//line assets/assets.qtpl:3
qt422016.ReleaseByteBuffer(qb422016)
-//line templates/asset.qtpl:3
+//line assets/assets.qtpl:3
return qs422016
-//line templates/asset.qtpl:3
+//line assets/assets.qtpl:3
}
// Next three are from https://remixicon.com/
-//line templates/asset.qtpl:6
+//line assets/assets.qtpl:6
func StreamIconHTTP(qw422016 *qt422016.Writer) {
-//line templates/asset.qtpl:6
+//line assets/assets.qtpl:6
qw422016.N().S(`
`)
-//line templates/asset.qtpl:7
+//line assets/assets.qtpl:7
qw422016.N().S(`
`)
-//line templates/asset.qtpl:7
+//line assets/assets.qtpl:7
qw422016.N().S(`
`)
-//line templates/asset.qtpl:8
+//line assets/assets.qtpl:8
}
-//line templates/asset.qtpl:8
+//line assets/assets.qtpl:8
func WriteIconHTTP(qq422016 qtio422016.Writer) {
-//line templates/asset.qtpl:8
+//line assets/assets.qtpl:8
qw422016 := qt422016.AcquireWriter(qq422016)
-//line templates/asset.qtpl:8
+//line assets/assets.qtpl:8
StreamIconHTTP(qw422016)
-//line templates/asset.qtpl:8
+//line assets/assets.qtpl:8
qt422016.ReleaseWriter(qw422016)
-//line templates/asset.qtpl:8
+//line assets/assets.qtpl:8
}
-//line templates/asset.qtpl:8
+//line assets/assets.qtpl:8
func IconHTTP() string {
-//line templates/asset.qtpl:8
+//line assets/assets.qtpl:8
qb422016 := qt422016.AcquireByteBuffer()
-//line templates/asset.qtpl:8
+//line assets/assets.qtpl:8
WriteIconHTTP(qb422016)
-//line templates/asset.qtpl:8
+//line assets/assets.qtpl:8
qs422016 := string(qb422016.B)
-//line templates/asset.qtpl:8
+//line assets/assets.qtpl:8
qt422016.ReleaseByteBuffer(qb422016)
-//line templates/asset.qtpl:8
+//line assets/assets.qtpl:8
return qs422016
-//line templates/asset.qtpl:8
+//line assets/assets.qtpl:8
}
-//line templates/asset.qtpl:10
+//line assets/assets.qtpl:10
func StreamIconGemini(qw422016 *qt422016.Writer) {
-//line templates/asset.qtpl:10
+//line assets/assets.qtpl:10
qw422016.N().S(`
`)
-//line templates/asset.qtpl:11
+//line assets/assets.qtpl:11
qw422016.N().S(`
`)
-//line templates/asset.qtpl:11
+//line assets/assets.qtpl:11
qw422016.N().S(`
`)
-//line templates/asset.qtpl:12
+//line assets/assets.qtpl:12
}
-//line templates/asset.qtpl:12
+//line assets/assets.qtpl:12
func WriteIconGemini(qq422016 qtio422016.Writer) {
-//line templates/asset.qtpl:12
+//line assets/assets.qtpl:12
qw422016 := qt422016.AcquireWriter(qq422016)
-//line templates/asset.qtpl:12
+//line assets/assets.qtpl:12
StreamIconGemini(qw422016)
-//line templates/asset.qtpl:12
+//line assets/assets.qtpl:12
qt422016.ReleaseWriter(qw422016)
-//line templates/asset.qtpl:12
+//line assets/assets.qtpl:12
}
-//line templates/asset.qtpl:12
+//line assets/assets.qtpl:12
func IconGemini() string {
-//line templates/asset.qtpl:12
+//line assets/assets.qtpl:12
qb422016 := qt422016.AcquireByteBuffer()
-//line templates/asset.qtpl:12
+//line assets/assets.qtpl:12
WriteIconGemini(qb422016)
-//line templates/asset.qtpl:12
+//line assets/assets.qtpl:12
qs422016 := string(qb422016.B)
-//line templates/asset.qtpl:12
+//line assets/assets.qtpl:12
qt422016.ReleaseByteBuffer(qb422016)
-//line templates/asset.qtpl:12
+//line assets/assets.qtpl:12
return qs422016
-//line templates/asset.qtpl:12
+//line assets/assets.qtpl:12
}
-//line templates/asset.qtpl:14
+//line assets/assets.qtpl:14
func StreamIconMailto(qw422016 *qt422016.Writer) {
-//line templates/asset.qtpl:14
+//line assets/assets.qtpl:14
qw422016.N().S(`
`)
-//line templates/asset.qtpl:15
+//line assets/assets.qtpl:15
qw422016.N().S(`
`)
-//line templates/asset.qtpl:15
+//line assets/assets.qtpl:15
qw422016.N().S(`
`)
-//line templates/asset.qtpl:16
+//line assets/assets.qtpl:16
}
-//line templates/asset.qtpl:16
+//line assets/assets.qtpl:16
func WriteIconMailto(qq422016 qtio422016.Writer) {
-//line templates/asset.qtpl:16
+//line assets/assets.qtpl:16
qw422016 := qt422016.AcquireWriter(qq422016)
-//line templates/asset.qtpl:16
+//line assets/assets.qtpl:16
StreamIconMailto(qw422016)
-//line templates/asset.qtpl:16
+//line assets/assets.qtpl:16
qt422016.ReleaseWriter(qw422016)
-//line templates/asset.qtpl:16
+//line assets/assets.qtpl:16
}
-//line templates/asset.qtpl:16
+//line assets/assets.qtpl:16
func IconMailto() string {
-//line templates/asset.qtpl:16
+//line assets/assets.qtpl:16
qb422016 := qt422016.AcquireByteBuffer()
-//line templates/asset.qtpl:16
+//line assets/assets.qtpl:16
WriteIconMailto(qb422016)
-//line templates/asset.qtpl:16
+//line assets/assets.qtpl:16
qs422016 := string(qb422016.B)
-//line templates/asset.qtpl:16
+//line assets/assets.qtpl:16
qt422016.ReleaseByteBuffer(qb422016)
-//line templates/asset.qtpl:16
+//line assets/assets.qtpl:16
return qs422016
-//line templates/asset.qtpl:16
+//line assets/assets.qtpl:16
}
// This is a modified version of https://www.svgrepo.com/svg/232085/rat
-//line templates/asset.qtpl:19
+//line assets/assets.qtpl:19
func StreamIconGopher(qw422016 *qt422016.Writer) {
-//line templates/asset.qtpl:19
+//line assets/assets.qtpl:19
qw422016.N().S(`
`)
-//line templates/asset.qtpl:20
+//line assets/assets.qtpl:20
qw422016.N().S(`
`)
-//line templates/asset.qtpl:20
+//line assets/assets.qtpl:20
qw422016.N().S(`
`)
-//line templates/asset.qtpl:21
+//line assets/assets.qtpl:21
}
-//line templates/asset.qtpl:21
+//line assets/assets.qtpl:21
func WriteIconGopher(qq422016 qtio422016.Writer) {
-//line templates/asset.qtpl:21
+//line assets/assets.qtpl:21
qw422016 := qt422016.AcquireWriter(qq422016)
-//line templates/asset.qtpl:21
+//line assets/assets.qtpl:21
StreamIconGopher(qw422016)
-//line templates/asset.qtpl:21
+//line assets/assets.qtpl:21
qt422016.ReleaseWriter(qw422016)
-//line templates/asset.qtpl:21
+//line assets/assets.qtpl:21
}
-//line templates/asset.qtpl:21
+//line assets/assets.qtpl:21
func IconGopher() string {
-//line templates/asset.qtpl:21
+//line assets/assets.qtpl:21
qb422016 := qt422016.AcquireByteBuffer()
-//line templates/asset.qtpl:21
+//line assets/assets.qtpl:21
WriteIconGopher(qb422016)
-//line templates/asset.qtpl:21
+//line assets/assets.qtpl:21
qs422016 := string(qb422016.B)
-//line templates/asset.qtpl:21
+//line assets/assets.qtpl:21
qt422016.ReleaseByteBuffer(qb422016)
-//line templates/asset.qtpl:21
+//line assets/assets.qtpl:21
return qs422016
-//line templates/asset.qtpl:21
+//line assets/assets.qtpl:21
}
diff --git a/templates/default.css b/assets/default.css
similarity index 100%
rename from templates/default.css
rename to assets/default.css
diff --git a/templates/icon/gemini-protocol-icon.svg b/assets/icon/gemini-protocol-icon.svg
similarity index 100%
rename from templates/icon/gemini-protocol-icon.svg
rename to assets/icon/gemini-protocol-icon.svg
diff --git a/templates/icon/gopher-protocol-icon.svg b/assets/icon/gopher-protocol-icon.svg
similarity index 100%
rename from templates/icon/gopher-protocol-icon.svg
rename to assets/icon/gopher-protocol-icon.svg
diff --git a/templates/icon/http-protocol-icon.svg b/assets/icon/http-protocol-icon.svg
similarity index 100%
rename from templates/icon/http-protocol-icon.svg
rename to assets/icon/http-protocol-icon.svg
diff --git a/templates/icon/mailto-protocol-icon.svg b/assets/icon/mailto-protocol-icon.svg
similarity index 100%
rename from templates/icon/mailto-protocol-icon.svg
rename to assets/icon/mailto-protocol-icon.svg
diff --git a/main.go b/main.go
index 288ff7f..ba4ce5b 100644
--- a/main.go
+++ b/main.go
@@ -1,5 +1,5 @@
//go:generate go get -u github.com/valyala/quicktemplate/qtc
-//go:generate qtc -dir=templates
+//go:generate qtc -dir=assets
//go:generate qtc -dir=views
package main
@@ -12,10 +12,10 @@ import (
"os"
"strings"
+ "github.com/bouncepaw/mycorrhiza/assets"
"github.com/bouncepaw/mycorrhiza/history"
"github.com/bouncepaw/mycorrhiza/hyphae"
"github.com/bouncepaw/mycorrhiza/shroom"
- "github.com/bouncepaw/mycorrhiza/templates"
"github.com/bouncepaw/mycorrhiza/user"
"github.com/bouncepaw/mycorrhiza/util"
"github.com/bouncepaw/mycorrhiza/views"
@@ -102,7 +102,7 @@ func handlerStyle(w http.ResponseWriter, rq *http.Request) {
http.ServeFile(w, rq, util.WikiDir+"/static/common.css")
} else {
w.Header().Set("Content-Type", "text/css;charset=utf-8")
- w.Write([]byte(templates.DefaultCSS()))
+ w.Write([]byte(assets.DefaultCSS()))
}
if bytes, err := ioutil.ReadFile(util.WikiDir + "/static/custom.css"); err == nil {
w.Write(bytes)
@@ -126,13 +126,13 @@ func handlerIcon(w http.ResponseWriter, rq *http.Request) {
w.Header().Set("Content-Type", "image/svg+xml")
switch iconName {
case "gemini":
- w.Write([]byte(templates.IconGemini()))
+ w.Write([]byte(assets.IconGemini()))
case "mailto":
- w.Write([]byte(templates.IconMailto()))
+ w.Write([]byte(assets.IconMailto()))
case "gopher":
- w.Write([]byte(templates.IconGopher()))
+ w.Write([]byte(assets.IconGopher()))
default:
- w.Write([]byte(templates.IconHTTP()))
+ w.Write([]byte(assets.IconHTTP()))
}
}