diff options
| author | Gabriel Arakaki Giovanini <mail@gabrielgio.me> | 2023-07-19 21:13:34 +0200 |
|---|---|---|
| committer | Gabriel Arakaki Giovanini <mail@gabrielgio.me> | 2023-07-19 21:13:34 +0200 |
| commit | 049b9acbd9635c206f5eeb01074b5d63803c4cd5 (patch) | |
| tree | fe2caacb21445edcb93f13ab73ed5f0d1430c65a | |
| parent | b8b6d3037c524575f140650ac243c16df6a98a92 (diff) | |
| download | lens-049b9acbd9635c206f5eeb01074b5d63803c4cd5.tar.gz lens-049b9acbd9635c206f5eeb01074b5d63803c4cd5.tar.bz2 lens-049b9acbd9635c206f5eeb01074b5d63803c4cd5.zip | |
ref: Remove static fs on root
Go embed does allow to load parent folder, so I move static fs to
static folder as I think it fits better there than in the root of the
project.
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | cmd/server/main.go | 4 | ||||
| -rw-r--r-- | static.go | 10 | ||||
| -rw-r--r-- | static/square.svg | 199 | ||||
| -rw-r--r-- | static/static.go | 6 |
5 files changed, 208 insertions, 13 deletions
@@ -1,5 +1,5 @@ vendor/ -static/ +static/main.css bin/ media_cache/ templates/*.qtpl.go diff --git a/cmd/server/main.go b/cmd/server/main.go index 8f163df..1591102 100644 --- a/cmd/server/main.go +++ b/cmd/server/main.go @@ -16,7 +16,6 @@ import ( "gorm.io/driver/sqlite" "gorm.io/gorm" - "git.sr.ht/~gabrielgio/img" "git.sr.ht/~gabrielgio/img/pkg/database/localfs" "git.sr.ht/~gabrielgio/img/pkg/database/repository" "git.sr.ht/~gabrielgio/img/pkg/database/sql" @@ -25,6 +24,7 @@ import ( "git.sr.ht/~gabrielgio/img/pkg/view" "git.sr.ht/~gabrielgio/img/pkg/worker" "git.sr.ht/~gabrielgio/img/pkg/worker/scanner" + "git.sr.ht/~gabrielgio/img/static" ) func main() { @@ -72,7 +72,7 @@ func main() { } r := router.New() - r.GET("/static/{filepath:*}", ext.FileServer(img.StaticFS, "static/")) + r.GET("/static/{filepath:*}", ext.FileServer(static.Static, "static/")) // repository var ( diff --git a/static.go b/static.go deleted file mode 100644 index 06f1459..0000000 --- a/static.go +++ /dev/null @@ -1,10 +0,0 @@ -package img - -import ( - "embed" -) - -var ( - //go:embed static/* - StaticFS embed.FS -) diff --git a/static/square.svg b/static/square.svg new file mode 100644 index 0000000..31c56cc --- /dev/null +++ b/static/square.svg @@ -0,0 +1,199 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+
+<svg fill="#000000" width="800px" height="800px" viewBox="0 0 64 64" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
+
+<rect id="Icons" x="-1152" y="-64" width="1280" height="800" style="fill:none;"/>
+
+<g id="Icons1" serif:id="Icons">
+
+<g id="Strike">
+
+</g>
+
+<g id="H1">
+
+</g>
+
+<g id="H2">
+
+</g>
+
+<g id="H3">
+
+</g>
+
+<g id="list-ul">
+
+</g>
+
+<g id="hamburger-1">
+
+</g>
+
+<g id="hamburger-2">
+
+</g>
+
+<g id="list-ol">
+
+</g>
+
+<g id="list-task">
+
+</g>
+
+<g id="trash">
+
+</g>
+
+<g id="vertical-menu">
+
+</g>
+
+<g id="horizontal-menu">
+
+</g>
+
+<g id="sidebar-2">
+
+</g>
+
+<g id="Pen">
+
+</g>
+
+<g id="Pen1" serif:id="Pen">
+
+</g>
+
+<g id="clock">
+
+</g>
+
+<g id="external-link">
+
+</g>
+
+<g id="hr">
+
+</g>
+
+<g id="info">
+
+</g>
+
+<g id="warning">
+
+</g>
+
+<g id="plus-circle">
+
+</g>
+
+<g id="minus-circle">
+
+</g>
+
+<g id="vue">
+
+</g>
+
+<g id="cog">
+
+</g>
+
+<g id="logo">
+
+</g>
+
+<g id="radio-check">
+
+</g>
+
+<g id="eye-slash">
+
+</g>
+
+<g id="eye">
+
+</g>
+
+<g id="toggle-off">
+
+</g>
+
+<path id="square" d="M50.005,56l-35.989,0c-3.309,0 -5.995,-2.686 -5.995,-5.995l0,-36.011c0,-3.308 2.686,-5.995 5.995,-5.995l35.989,0c3.309,0 5.995,2.687 5.995,5.995l0,36.011c0,3.309 -2.686,5.995 -5.995,5.995Zm-0.993,-4.001c1.65,0 2.989,-1.339 2.989,-2.989l0,-34.021c0,-1.649 -1.339,-2.989 -2.989,-2.989l-34.003,0c-1.65,0 -2.989,1.34 -2.989,2.989l0,34.021c0,1.65 1.339,2.989 2.989,2.989l34.003,0Z"/>
+
+<g id="shredder">
+
+</g>
+
+<g id="spinner--loading--dots-" serif:id="spinner [loading, dots]">
+
+</g>
+
+<g id="react">
+
+</g>
+
+<g id="check-selected">
+
+</g>
+
+<g id="turn-off">
+
+</g>
+
+<g id="code-block">
+
+</g>
+
+<g id="user">
+
+</g>
+
+<g id="coffee-bean">
+
+</g>
+
+<g id="coffee-beans">
+
+<g id="coffee-bean1" serif:id="coffee-bean">
+
+</g>
+
+</g>
+
+<g id="coffee-bean-filled">
+
+</g>
+
+<g id="coffee-beans-filled">
+
+<g id="coffee-bean2" serif:id="coffee-bean">
+
+</g>
+
+</g>
+
+<g id="clipboard">
+
+</g>
+
+<g id="clipboard-paste">
+
+</g>
+
+<g id="clipboard-copy">
+
+</g>
+
+<g id="Layer1">
+
+</g>
+
+</g>
+
+</svg>
diff --git a/static/static.go b/static/static.go new file mode 100644 index 0000000..ada0434 --- /dev/null +++ b/static/static.go @@ -0,0 +1,6 @@ +package static + +import "embed" + +//go:embed * +var Static embed.FS |
