From cc119f1cbb0b3bbd0c5453a5b9c5ce4c7f2a5df5 Mon Sep 17 00:00:00 2001 From: Benedikt Peetz Date: Sat, 21 Mar 2026 19:30:39 +0100 Subject: build(treewide): Provide a working `manifest.json` file The previous one had no really working images. --- .gitignore | 2 ++ Trunk.toml | 7 ++++++- index.html | 24 +++++++++++++++++++++++- input.css | 3 --- nix/package.nix | 5 ++++- public/favicon.ico | Bin 15406 -> 0 bytes public/input.css | 3 +++ public/logo.svg | 6 ++++++ public/manifest.json | 26 ++++++++++++++++++++++---- scripts/generate_logo.sh | 30 ++++++++++++++++++++++++++++++ 10 files changed, 96 insertions(+), 10 deletions(-) delete mode 100644 input.css delete mode 100644 public/favicon.ico create mode 100644 public/input.css create mode 100644 public/logo.svg create mode 100755 scripts/generate_logo.sh diff --git a/.gitignore b/.gitignore index 8914bee..cefbd74 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,8 @@ /setup/target /dist +/public/favicon.ico + /public/tailwindcss-output.css /references diff --git a/Trunk.toml b/Trunk.toml index c16525c..fc54ece 100644 --- a/Trunk.toml +++ b/Trunk.toml @@ -1,7 +1,12 @@ [[hooks]] stage = "pre_build" command = "tailwindcss" -command_arguments = ["-i", "input.css", "-o", "public/tailwindcss-output.css"] +command_arguments = ["-i", "public/input.css", "-o", "dist/tailwindcss-output.css"] + +[[hooks]] +stage = "pre_build" +command = "./scripts/generate_logo.sh" +command_arguments = [] [serve] addresses = ["127.0.0.1"] diff --git a/index.html b/index.html index 7085f94..3772400 100644 --- a/index.html +++ b/index.html @@ -25,7 +25,7 @@ + + + + + + diff --git a/input.css b/input.css deleted file mode 100644 index b5c61c9..0000000 --- a/input.css +++ /dev/null @@ -1,3 +0,0 @@ -@tailwind base; -@tailwind components; -@tailwind utilities; diff --git a/nix/package.nix b/nix/package.nix index 1bcc0ae..e692242 100644 --- a/nix/package.nix +++ b/nix/package.nix @@ -16,6 +16,7 @@ tailwindcss, wasm-bindgen-cli_0_2_104, binaryen, + imagemagick, }: craneLib.buildPackage { pname = "rocie-mobile"; @@ -37,7 +38,8 @@ craneLib.buildPackage { "input.css" "Trunk.toml" "manifest.json" - "favicon.ico" + "logo.svg" + "generate_logo.sh" ]) || (lib.strings.hasSuffix ".rs" (builtins.baseNameOf name)); }; @@ -54,6 +56,7 @@ craneLib.buildPackage { tailwindcss wasm-bindgen-cli_0_2_104 binaryen # for wasm-opt + imagemagick # needed for the generate_logo.sh command ]; buildInputs = [ diff --git a/public/favicon.ico b/public/favicon.ico deleted file mode 100644 index 2ba8527..0000000 Binary files a/public/favicon.ico and /dev/null differ diff --git a/public/input.css b/public/input.css new file mode 100644 index 0000000..b5c61c9 --- /dev/null +++ b/public/input.css @@ -0,0 +1,3 @@ +@tailwind base; +@tailwind components; +@tailwind utilities; diff --git a/public/logo.svg b/public/logo.svg new file mode 100644 index 0000000..93750a7 --- /dev/null +++ b/public/logo.svg @@ -0,0 +1,6 @@ + diff --git a/public/manifest.json b/public/manifest.json index 5ea8b9d..1c89288 100644 --- a/public/manifest.json +++ b/public/manifest.json @@ -1,13 +1,31 @@ { "name": "Rocie", + "short_name": "Rocie ", "icons": [ { - "src": "favicon.ico", - "type": "image/png", - "sizes": "512x512" + "src": "./favicon-1024.png", + "sizes": "1024x1024", + "type": "image/png" + } + { + "src": "./favicon-512.png", + "sizes": "512x512", + "type": "image/png" + } + { + "src": "./favicon-256.png", + "sizes": "256x256", + "type": "image/png" + } + { + "src": "./favicon-128.png", + "sizes": "128x128", + "type": "image/png" } ], - "start_url": "/", + "start_url": null, + "background_color": "#333131", + "theme_color": "#333131", "display": "standalone", "prefer_related_applications": false } diff --git a/scripts/generate_logo.sh b/scripts/generate_logo.sh new file mode 100755 index 0000000..af89bc8 --- /dev/null +++ b/scripts/generate_logo.sh @@ -0,0 +1,30 @@ +#! /bin/sh + +if [ -f "./dist/favicon-1024.png" ]; then + # Bail out early + exit 0 +fi + +set -x + +magick ./public/logo.svg -resize 1024x1024 -transparent white ./dist/favicon-1024.png + +magick ./dist/favicon-1024.png -resize 16x16 ./dist/favicon-16.png +magick ./dist/favicon-1024.png -resize 32x32 ./dist/favicon-32.png +magick ./dist/favicon-1024.png -resize 64x64 ./dist/favicon-64.png +magick ./dist/favicon-1024.png -resize 128x128 ./dist/favicon-128.png +magick ./dist/favicon-1024.png -resize 256x256 ./dist/favicon-256.png +magick ./dist/favicon-1024.png -resize 512x512 ./dist/favicon-512.png + +magick \ + ./dist/favicon-16.png \ + ./dist/favicon-32.png \ + ./dist/favicon-64.png \ + ./dist/favicon-128.png \ + ./dist/favicon-256.png \ + ./dist/favicon-512.png \ + ./dist/favicon-1024.png \ + -colors 256 \ + ./public/favicon.ico + +# vim: ft=sh -- cgit 1.4.1