add favicon middleware

prismelabs · Jan 16, 2024 · 0bd0a83 · 0bd0a83
1 parent f96b6c2
commit 0bd0a83
Show file tree

Hide file tree

Showing 18 changed files with 99 additions and 5 deletions.
diff --git a/cmd/server/fiber.go b/cmd/server/fiber.go
@@ -16,6 +16,7 @@ func ProvideFiber(
 	requestIdMiddleware middlewares.RequestId,
 	staticMiddleware middlewares.Static,
 	withSessionMiddleware middlewares.WithSession,
+	faviconMiddleware middlewares.Favicon,
 	getSignUpHandler handlers.GetSignUp,
 	postSignUpHander handlers.PostSignUp,
 	getSignInHandler handlers.GetSignIn,
@@ -50,6 +51,8 @@ func ProvideFiber(
 	app.Use(fiber.Handler(loggerMiddleware))
 
 	// Public endpoints.
+	app.Use(fiber.Handler(faviconMiddleware))
+
 	app.Use("/static", fiber.Handler(staticMiddleware))
 
 	app.Get("/sign_up", fiber.Handler(getSignUpHandler))

diff --git a/cmd/server/wire.go b/cmd/server/wire.go
@@ -30,6 +30,7 @@ func initialize(logger BootstrapLogger) App {
 		middlewares.ProvideAccessLog,
 		middlewares.ProvideLogger,
 		middlewares.ProvideWithSession,
+		middlewares.ProvideFavicon,
 		handlers.ProvideGetSignUp,
 		handlers.ProvidePostSignUp,
 		handlers.ProvideGetSignIn,

diff --git a/cmd/server/wire_gen.go b/cmd/server/wire_gen.go
diff --git a/internal/embedded/static/android-chrome-192x192.png b/internal/embedded/static/android-chrome-192x192.png
diff --git a/internal/embedded/static/android-chrome-512x512.png b/internal/embedded/static/android-chrome-512x512.png
diff --git a/internal/embedded/static/apple-touch-icon.png b/internal/embedded/static/apple-touch-icon.png
diff --git a/internal/embedded/static/browserconfig.xml b/internal/embedded/static/browserconfig.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<browserconfig>
+    <msapplication>
+        <tile>
+            <square150x150logo src="/static/mstile-150x150.png"/>
+            <TileColor>#da532c</TileColor>
+        </tile>
+    </msapplication>
+</browserconfig>
diff --git a/internal/embedded/static/favicon-16x16.png b/internal/embedded/static/favicon-16x16.png
diff --git a/internal/embedded/static/favicon-32x32.png b/internal/embedded/static/favicon-32x32.png
diff --git a/internal/embedded/static/favicon.ico b/internal/embedded/static/favicon.ico
diff --git a/internal/embedded/static/mstile-150x150.png b/internal/embedded/static/mstile-150x150.png
diff --git a/internal/embedded/static/safari-pinned-tab.svg b/internal/embedded/static/safari-pinned-tab.svg
diff --git a/internal/embedded/static/site.webmanifest b/internal/embedded/static/site.webmanifest
@@ -0,0 +1,19 @@
+{
+    "name": "",
+    "short_name": "",
+    "icons": [
+        {
+            "src": "/static/android-chrome-192x192.png",
+            "sizes": "192x192",
+            "type": "image/png"
+        },
+        {
+            "src": "/static/android-chrome-512x512.png",
+            "sizes": "512x512",
+            "type": "image/png"
+        }
+    ],
+    "theme_color": "#ffffff",
+    "background_color": "#ffffff",
+    "display": "standalone"
+}
diff --git a/internal/embedded/views/partials/favicon.html b/internal/embedded/views/partials/favicon.html
@@ -0,0 +1,9 @@
+<link rel="apple-touch-icon" sizes="180x180" href="/static/apple-touch-icon.png">
+<link rel="icon" type="image/png" sizes="32x32" href="/static/favicon-32x32.png">
+<link rel="icon" type="image/png" sizes="16x16" href="/static/favicon-16x16.png">
+<link rel="manifest" href="/static/site.webmanifest">
+<link rel="mask-icon" href="/static/safari-pinned-tab.svg" color="#5bbad5">
+<link rel="shortcut icon" href="/static/favicon.ico">
+<meta name="msapplication-TileColor" content="#da532c">
+<meta name="msapplication-config" content="/static/browserconfig.xml">
+<meta name="theme-color" content="#ffffff">
diff --git a/internal/embedded/views/partials/head.html b/internal/embedded/views/partials/head.html
@@ -1,4 +1 @@
-<head>
-	<title>{{ template "title" }}</title>
-	{{ template "css" }}
-</head>
+{{- template "partials/favicon" -}}
diff --git a/internal/embedded/views/sign_in.html b/internal/embedded/views/sign_in.html
@@ -3,6 +3,7 @@
 
 <head>
 	<title>Sign In - Prisme Analytics</title>
+	{{ template "partials/head" }}
 	{{ template "partials/tailwindcss" }}
 </head>
 

diff --git a/internal/embedded/views/sign_up.html b/internal/embedded/views/sign_up.html
@@ -3,6 +3,7 @@
 
 <head>
 	<title>Sign Up - Prisme Analytics</title>
+	{{ template "partials/head" }}
 	{{ template "partials/tailwindcss" }}
 </head>
 

diff --git a/internal/middlewares/favicon.go b/internal/middlewares/favicon.go
@@ -0,0 +1,20 @@
+package middlewares
+
+import (
+	"net/http"
+
+	"github.com/gofiber/fiber/v2"
+	"github.com/gofiber/fiber/v2/middleware/favicon"
+	"github.com/prismelabs/prismeanalytics/internal/embedded"
+)
+
+type Favicon fiber.Handler
+
+// ProvideFavicon is a wire provider for in memory favicon middleware.
+func ProvideFavicon() Favicon {
+	return favicon.New(favicon.Config{
+		File:       "static/favicon.ico",
+		URL:        "",
+		FileSystem: http.FS(embedded.Static),
+	})
+}