From 36617f7dfba6b1b4798d2a38937086878e71afb3 Mon Sep 17 00:00:00 2001 From: AKP Date: Tue, 5 Apr 2022 13:56:20 +0100 Subject: Add static file hosting Signed-off-by: AKP --- assets/logo_dark.png | Bin 0 -> 5193 bytes assets/logo_light.png | Bin 0 -> 5651 bytes walrss/internal/http/http.go | 3 + walrss/internal/http/views/page.qtpl.html | 10 +- walrss/internal/static/assets/bootstrap-icons.css | 1704 ++++++++++++++++++++ .../internal/static/assets/bootstrap.bundle.min.js | 7 + walrss/internal/static/assets/bootstrap.min.css | 7 + walrss/internal/static/assets/htmx.min.js | 1 + walrss/internal/static/assets/logo_dark.png | Bin 0 -> 5193 bytes walrss/internal/static/assets/logo_light.png | Bin 0 -> 5651 bytes walrss/internal/static/static.go | 19 + walrss/internal/urls/urls.go | 2 + 12 files changed, 1749 insertions(+), 4 deletions(-) create mode 100644 assets/logo_dark.png create mode 100644 assets/logo_light.png create mode 100644 walrss/internal/static/assets/bootstrap-icons.css create mode 100644 walrss/internal/static/assets/bootstrap.bundle.min.js create mode 100644 walrss/internal/static/assets/bootstrap.min.css create mode 100644 walrss/internal/static/assets/htmx.min.js create mode 100644 walrss/internal/static/assets/logo_dark.png create mode 100644 walrss/internal/static/assets/logo_light.png create mode 100644 walrss/internal/static/static.go diff --git a/assets/logo_dark.png b/assets/logo_dark.png new file mode 100644 index 0000000..6059c1d Binary files /dev/null and b/assets/logo_dark.png differ diff --git a/assets/logo_light.png b/assets/logo_light.png new file mode 100644 index 0000000..e06fc16 Binary files /dev/null and b/assets/logo_light.png differ diff --git a/walrss/internal/http/http.go b/walrss/internal/http/http.go index 5d27cb2..67be3c2 100644 --- a/walrss/internal/http/http.go +++ b/walrss/internal/http/http.go @@ -4,6 +4,7 @@ import ( "github.com/codemicro/walrss/walrss/internal/core" "github.com/codemicro/walrss/walrss/internal/http/views" "github.com/codemicro/walrss/walrss/internal/state" + "github.com/codemicro/walrss/walrss/internal/static" "github.com/codemicro/walrss/walrss/internal/urls" "github.com/gofiber/fiber/v2" "github.com/rs/zerolog/log" @@ -87,6 +88,8 @@ func (s *Server) registerHandlers() { s.app.Get(urls.NewFeedItem, s.newFeedItem) s.app.Post(urls.NewFeedItem, s.newFeedItem) + + s.app.Use(urls.Statics, static.NewHandler()) } func (s *Server) Run() error { diff --git a/walrss/internal/http/views/page.qtpl.html b/walrss/internal/http/views/page.qtpl.html index 872b468..f7e7cba 100644 --- a/walrss/internal/http/views/page.qtpl.html +++ b/walrss/internal/http/views/page.qtpl.html @@ -1,3 +1,5 @@ +{% import "github.com/walrss/walrss/internal/urls" %} + {% interface Page { Title() @@ -13,10 +15,10 @@ Page prints a page implementing Page interface. {%s= makePageTitle(p) %} - - - - + + + + ")}}function fr(){var e=z().querySelector('meta[name="htmx-config"]');if(e){return S(e.content)}else{return null}}function cr(){var e=fr();if(e){U.config=Q(U.config,e)}}lr(function(){cr();ur();var e=z().body;ct(e);var t=z().querySelectorAll("[hx-trigger='restored'],[data-hx-trigger='restored']");e.addEventListener("htmx:abort",function(e){var t=e.target;var r=_(t);if(r&&r.xhr){r.xhr.abort()}});window.onpopstate=function(e){if(e.state&&e.state.htmx){Ot();W(t,function(e){$(e,"htmx:restored",{document:z(),triggerEvent:$})})}};setTimeout(function(){$(e,"htmx:load",{})},0)});return U}()}); \ No newline at end of file diff --git a/walrss/internal/static/assets/logo_dark.png b/walrss/internal/static/assets/logo_dark.png new file mode 100644 index 0000000..6059c1d Binary files /dev/null and b/walrss/internal/static/assets/logo_dark.png differ diff --git a/walrss/internal/static/assets/logo_light.png b/walrss/internal/static/assets/logo_light.png new file mode 100644 index 0000000..e06fc16 Binary files /dev/null and b/walrss/internal/static/assets/logo_light.png differ diff --git a/walrss/internal/static/static.go b/walrss/internal/static/static.go new file mode 100644 index 0000000..2ee5d71 --- /dev/null +++ b/walrss/internal/static/static.go @@ -0,0 +1,19 @@ +package static + +import ( + "embed" + "net/http" + + "github.com/gofiber/fiber/v2" + "github.com/gofiber/fiber/v2/middleware/filesystem" +) + +//go:embed assets +var assets embed.FS + +func NewHandler() fiber.Handler { + return filesystem.New(filesystem.Config{ + Root: http.FS(assets), + PathPrefix: "assets", + }) +} diff --git a/walrss/internal/urls/urls.go b/walrss/internal/urls/urls.go index a5dd782..87fb45c 100644 --- a/walrss/internal/urls/urls.go +++ b/walrss/internal/urls/urls.go @@ -20,6 +20,8 @@ const ( New = "/new" NewFeedItem = New + "/feed" + + Statics = "/statics" ) func Expand(template string, replacements ...interface{}) string { -- cgit v1.2.3-70-g09d2