From 625a9f16f5f34fd2250d83ecbeb7a0b0c8ee6e39 Mon Sep 17 00:00:00 2001
From: Lauri Ojansivu <x@xet7.org>
Date: Thu, 6 Oct 2022 14:31:54 +0300
Subject: [PATCH] Refine subpath deployment support. Part 2.

Thanks to xet7 !

Related https://github.com/wekan/wekan/pull/4712
---
 client/components/main/layouts.jade | 12 ++++++------
 public/site.webmanifest             | 20 ++++++++++----------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/client/components/main/layouts.jade b/client/components/main/layouts.jade
index ed0339353..22de2b52c 100644
--- a/client/components/main/layouts.jade
+++ b/client/components/main/layouts.jade
@@ -6,12 +6,12 @@ head
     where the application is deployed with a path prefix, but it seems to be
     difficult to do that cleanly with Blaze -- at least without adding extra
     packages.
-  link(rel="shortcut icon" type="image/x-icon" href="/favicon.ico")
-  link(rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png")
-  link(rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png")
-  link(rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png")
-  // link(rel="manifest" href="/site.webmanifest")
-  link(rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5")
+  link(rel="shortcut icon" type="image/x-icon" href="favicon.ico")
+  link(rel="apple-touch-icon" sizes="180x180" href="apple-touch-icon.png")
+  link(rel="icon" type="image/png" sizes="32x32" href="favicon-32x32.png")
+  link(rel="icon" type="image/png" sizes="16x16" href="favicon-16x16.png")
+  link(rel="manifest" href="site.webmanifest")
+  link(rel="mask-icon" href="safari-pinned-tab.svg" color="#5bbad5")
   meta(name="apple-mobile-web-app-title" content="Wekan")
   meta(name="application-name" content="Wekan")
   meta(name="msapplication-TileColor" content="#00aba9")
diff --git a/public/site.webmanifest b/public/site.webmanifest
index 4017ee3b1..fce01a20f 100644
--- a/public/site.webmanifest
+++ b/public/site.webmanifest
@@ -3,38 +3,38 @@
     "short_name": "Wekan",
     "icons": [
         {
-            "src": "/android-chrome-192x192.png",
+            "src": "android-chrome-192x192.png",
             "sizes": "192x192",
             "type": "image/png"
         },
         {
-            "src": "/android-chrome-512x512.png",
+            "src": "android-chrome-512x512.png",
             "sizes": "512x512",
             "type": "image/png"
         },
         {
-            "src": "/Square150x150Logo.scale-100.png",
+            "src": "Square150x150Logo.scale-100.png",
             "sizes": "150x150",
             "type": "image/png"
         },
         {
-            "src": "/Square44x44Logo.scale-100.png",
+            "src": "Square44x44Logo.scale-100.png",
             "sizes": "44x44",
             "type": "image/png"
         },
         {
-            "src": "/StoreLogo.scale-100.png",
+            "src": "StoreLogo.scale-100.png",
             "sizes": "50x50",
             "type": "image/png"
         },
         {
-            "src": "/maskable_icon.png",
+            "src": "maskable_icon.png",
             "sizes": "474x474",
             "type": "image/png",
             "purpose": "maskable"
         },
         {
-            "src": "/monochrome-icon-512x512.png",
+            "src": "monochrome-icon-512x512.png",
             "sizes": "512x512",
             "type": "image/png",
             "purpose": "monochrome"
@@ -42,19 +42,19 @@
     ],
     "screenshots" : [
       {
-        "src": "/screenshot1.webp",
+        "src": "screenshot1.webp",
         "sizes": "1280x720",
         "type": "image/webp"
       },
       {
-        "src": "/screenshot2.webp",
+        "src": "screenshot2.webp",
         "sizes": "1280x720",
         "type": "image/webp"
       }
     ],
     "theme_color": "#ffffff",
     "background_color": "#ffffff",
-    "start_url": "/sign-in",
+    "start_url": "sign-in",
     "display": "standalone",
     "orientation": "any",
     "categories": ["productivity"],