diff --git a/frontend/public/android-chrome-192x192.png b/frontend/public/favicon/android-chrome-192x192.png similarity index 100% rename from frontend/public/android-chrome-192x192.png rename to frontend/public/favicon/android-chrome-192x192.png diff --git a/frontend/public/android-chrome-512x512.png b/frontend/public/favicon/android-chrome-512x512.png similarity index 100% rename from frontend/public/android-chrome-512x512.png rename to frontend/public/favicon/android-chrome-512x512.png diff --git a/frontend/public/apple-touch-icon.png b/frontend/public/favicon/apple-touch-icon.png similarity index 100% rename from frontend/public/apple-touch-icon.png rename to frontend/public/favicon/apple-touch-icon.png diff --git a/frontend/public/browserconfig.xml b/frontend/public/favicon/browserconfig.xml similarity index 73% rename from frontend/public/browserconfig.xml rename to frontend/public/favicon/browserconfig.xml index 5aecc916b9eebf3b9bc86cc1a97199fe4a037743..28c1987b473a80c9f1c9747ed32afd1dd5d6f7b1 100644 --- a/frontend/public/browserconfig.xml +++ b/frontend/public/favicon/browserconfig.xml @@ -2,7 +2,7 @@ - + #00aba9 diff --git a/frontend/public/favicon-16x16.png b/frontend/public/favicon/favicon-16x16.png similarity index 100% rename from frontend/public/favicon-16x16.png rename to frontend/public/favicon/favicon-16x16.png diff --git a/frontend/public/favicon-32x32.png b/frontend/public/favicon/favicon-32x32.png similarity index 100% rename from frontend/public/favicon-32x32.png rename to frontend/public/favicon/favicon-32x32.png diff --git a/frontend/public/favicon.ico b/frontend/public/favicon/favicon.ico similarity index 100% rename from frontend/public/favicon.ico rename to frontend/public/favicon/favicon.ico diff --git a/frontend/public/mstile-150x150.png b/frontend/public/favicon/mstile-150x150.png similarity index 100% rename from frontend/public/mstile-150x150.png rename to frontend/public/favicon/mstile-150x150.png diff --git a/frontend/public/safari-pinned-tab.svg b/frontend/public/favicon/safari-pinned-tab.svg similarity index 100% rename from frontend/public/safari-pinned-tab.svg rename to frontend/public/favicon/safari-pinned-tab.svg diff --git a/frontend/public/index.html b/frontend/public/index.html index 70703bfc0fb1ed4083003ab9b41a1bd56d8e42ac..1b731effff5a26e2815fdb3039870c823e0af40d 100644 --- a/frontend/public/index.html +++ b/frontend/public/index.html @@ -3,15 +3,16 @@ - - + - - - - - + + + + + + + Codies diff --git a/frontend/public/logo192.png b/frontend/public/logo192.png deleted file mode 100644 index fc44b0a3796c0e0a64c3d858ca038bd4570465d9..0000000000000000000000000000000000000000 Binary files a/frontend/public/logo192.png and /dev/null differ diff --git a/frontend/public/logo512.png b/frontend/public/logo512.png deleted file mode 100644 index a4e47a6545bc15971f8f63fba70e4013df88a664..0000000000000000000000000000000000000000 Binary files a/frontend/public/logo512.png and /dev/null differ diff --git a/frontend/public/site.webmanifest b/frontend/public/manifest.json similarity index 60% rename from frontend/public/site.webmanifest rename to frontend/public/manifest.json index b20abb7cbb2903c45280ba3540710669aeb63163..d80c7fb5d4c5a748f733f0e58ce4b216c0cf0147 100644 --- a/frontend/public/site.webmanifest +++ b/frontend/public/manifest.json @@ -1,18 +1,19 @@ { - "name": "", - "short_name": "", + "short_name": "Codies", + "name": "Codies", "icons": [ { - "src": "/android-chrome-192x192.png", + "src": "/favicon/android-chrome-192x192.png", "sizes": "192x192", "type": "image/png" }, { - "src": "/android-chrome-512x512.png", + "src": "/favicon/android-chrome-512x512.png", "sizes": "512x512", "type": "image/png" } ], + "start_url": ".", "theme_color": "#ffffff", "background_color": "#ffffff", "display": "standalone" diff --git a/main.go b/main.go index 37c2ffc55c93b0a8257c1fd7c3a5732f3c7260b2..a415e29ab820e81be522502b079c3146250fc4b9 100644 --- a/main.go +++ b/main.go @@ -58,12 +58,7 @@ func main() { r := chi.NewMux() r.Use(middleware.Heartbeat("/ping")) r.Use(middleware.Recoverer) - - r.Group(func(r chi.Router) { - r.Use(middleware.Compress(5)) - fs := http.Dir("./frontend/build") - r.NotFound(http.FileServer(fs).ServeHTTP) - }) + r.NotFound(staticRouter().ServeHTTP) r.Group(func(r chi.Router) { r.Use(middleware.NoCache) @@ -204,6 +199,24 @@ func main() { log.Fatal(g.Wait()) } +func staticRouter() http.Handler { + fs := http.Dir("./frontend/build") + fsh := http.FileServer(fs) + + r := chi.NewMux() + r.Use(middleware.Compress(5)) + + r.Handle("/static/*", fsh) + r.Handle("/favicon/*", fsh) + + r.Group(func(r chi.Router) { + r.Use(middleware.NoCache) + r.Handle("/*", fsh) + }) + + return r +} + func httpErr(w http.ResponseWriter, code int) { http.Error(w, http.StatusText(code), code) }