Set favicon

drjole · Oct 18, 2024 · 2570a43 · 2570a43
1 parent a214c51
commit 2570a43
Show file tree

Hide file tree

Showing 12 changed files with 38 additions and 6 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -14,6 +14,7 @@ repos:
             types: ["erb"]
             entry: bundle
             args: ["exec", "erb-format", "--write", "--print-width", "120"]
+            exclude: ".*\\.json\\.erb"
           - id: prettier
             name: prettier
             language: system

diff --git a/app/assets/images/favicon/apple-touch-icon.png b/app/assets/images/favicon/apple-touch-icon.png
diff --git a/app/assets/images/favicon/favicon-48x48.png b/app/assets/images/favicon/favicon-48x48.png
diff --git a/app/assets/images/favicon/favicon.ico b/app/assets/images/favicon/favicon.ico
diff --git a/app/assets/images/favicon/favicon.svg b/app/assets/images/favicon/favicon.svg
diff --git a/app/assets/images/favicon/web-app-manifest-192x192.png b/app/assets/images/favicon/web-app-manifest-192x192.png
diff --git a/app/assets/images/favicon/web-app-manifest-512x512.png b/app/assets/images/favicon/web-app-manifest-512x512.png
diff --git a/app/views/application/_favicon.html.erb b/app/views/application/_favicon.html.erb
@@ -0,0 +1,5 @@
+<link rel="icon" type="image/png" href="<%= asset_path 'favicon/favicon-48x48.png' %>" sizes="48x48"/>
+<link rel="icon" type="image/svg+xml" href="<%= asset_path 'favicon/favicon.svg' %>"/>
+<link rel="shortcut icon" href="<%= asset_path 'favicon/favicon.ico' %>"/>
+<link rel="apple-touch-icon" sizes="180x180" href="<%= asset_path 'favicon/apple-touch-icon.png' %>"/>
+<link rel="manifest" href="<%= pwa_manifest_path(format: :json) %>"/>
diff --git a/app/views/shared/_flashes.html.erb → app/views/application/_flashes.html.erb b/app/views/shared/_flashes.html.erb → app/views/application/_flashes.html.erb
diff --git a/app/views/shared/_navigation.html.erb → app/views/application/_navigation.html.erb b/app/views/shared/_navigation.html.erb → app/views/application/_navigation.html.erb
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html class="text-[24px] text-white bg-mars bg-no-repeat bg-cover bg-center bg-fixed">
   <head>
-    <title><%= content_for(:title) || "Terraforming Mars Stats" %></title>
+    <title><%= content_for(:title) || "TM Stats" %></title>
     <meta name="viewport" content="width=device-width,initial-scale=1">
     <meta name="apple-mobile-web-app-capable" content="yes">
     <meta name="mobile-web-app-capable" content="yes">
@@ -23,11 +23,13 @@
     <%= javascript_importmap_tags %>
 
     <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap-icons@1.11.3/font/bootstrap-icons.min.css">
+
+    <%= render "application/favicon" %>
   </head>
 
   <body class="container mx-auto px-2 my-2">
-    <%= render "shared/navigation" %>
-    <%= render "shared/flashes" %>
+    <%= render "navigation" %>
+    <%= render "flashes" %>
     <%= yield %>
   </body>
 </html>
diff --git a/app/views/pwa/manifest.json.erb b/app/views/pwa/manifest.json.erb
@@ -1,3 +1,24 @@
-{ "name": "Tmstats", "icons": [ { "src": "/icon.png", "type": "image/png", "sizes": "512x512" }, { "src": "/icon.png",
-"type": "image/png", "sizes": "512x512", "purpose": "maskable" } ], "start_url": "/", "display": "standalone", "scope":
-"/", "description": "Tmstats.", "theme_color": "red", "background_color": "red" }
+{
+  "name": "TM Stats",
+  "short_name": "TM Stats",
+  "icons": [
+    {
+      "src": "<%= asset_path 'favicon/web-app-manifest-192x192.png' %>",
+      "sizes": "192x192",
+      "type": "image/png",
+      "purpose": "maskable"
+    },
+    {
+      "src": "<%= asset_path 'favicon/web-app-manifest-512x512.png' %>",
+      "sizes": "512x512",
+      "type": "image/png",
+      "purpose": "maskable"
+    }
+  ],
+  "start_url": "/",
+  "display": "standalone",
+  "scope": "/",
+  "description": "TM Stats",
+  "theme_color": "#0f172a",
+  "background_color": "#0f172a"
+}