From 27bab723234dc9a195323c4f5e1f7a2b8ecbc354 Mon Sep 17 00:00:00 2001 From: Maxim Lebedev Date: Thu, 16 Mar 2023 22:18:33 +0600 Subject: [PATCH] :truck: Moved assets to web/static --- main.go | 5 +++-- {assets => web/static}/android-chrome-192x192.png | Bin {assets => web/static}/android-chrome-512x512.png | Bin {assets => web/static}/apple-touch-icon.png | Bin {assets => web/static}/favicon.ico | Bin {assets => web/static}/icon.svg | 0 {assets => web/static}/site.webmanifest | 0 7 files changed, 3 insertions(+), 2 deletions(-) rename {assets => web/static}/android-chrome-192x192.png (100%) rename {assets => web/static}/android-chrome-512x512.png (100%) rename {assets => web/static}/apple-touch-icon.png (100%) rename {assets => web/static}/favicon.ico (100%) rename {assets => web/static}/icon.svg (100%) rename {assets => web/static}/site.webmanifest (100%) diff --git a/main.go b/main.go index cef8571..eaa376d 100644 --- a/main.go +++ b/main.go @@ -16,6 +16,7 @@ import ( "net/url" "os" "os/signal" + "path/filepath" "runtime" "runtime/pprof" "strings" @@ -106,7 +107,7 @@ var ( //nolint:gochecknoglobals var cpuProfilePath, memProfilePath string -//go:embed assets/* +//go:embed web/static/* var staticFS embed.FS //nolint:gochecknoinits @@ -156,7 +157,7 @@ func main() { var opts NewAppOptions var err error - if opts.Static, err = fs.Sub(staticFS, "assets"); err != nil { + if opts.Static, err = fs.Sub(staticFS, filepath.Join("web", "static")); err != nil { logger.Fatalln(err) } diff --git a/assets/android-chrome-192x192.png b/web/static/android-chrome-192x192.png similarity index 100% rename from assets/android-chrome-192x192.png rename to web/static/android-chrome-192x192.png diff --git a/assets/android-chrome-512x512.png b/web/static/android-chrome-512x512.png similarity index 100% rename from assets/android-chrome-512x512.png rename to web/static/android-chrome-512x512.png diff --git a/assets/apple-touch-icon.png b/web/static/apple-touch-icon.png similarity index 100% rename from assets/apple-touch-icon.png rename to web/static/apple-touch-icon.png diff --git a/assets/favicon.ico b/web/static/favicon.ico similarity index 100% rename from assets/favicon.ico rename to web/static/favicon.ico diff --git a/assets/icon.svg b/web/static/icon.svg similarity index 100% rename from assets/icon.svg rename to web/static/icon.svg diff --git a/assets/site.webmanifest b/web/static/site.webmanifest similarity index 100% rename from assets/site.webmanifest rename to web/static/site.webmanifest