From 127b97e588a2ecce7a56434b7115953f38136a18 Mon Sep 17 00:00:00 2001
From: Jamil <jamilbk@users.noreply.github.com>
Date: Wed, 28 Feb 2024 12:03:42 -0800
Subject: [PATCH] fix(portal|website): Fix static paths for website and elixir
 (#3802)

Phoenix VerifiedRoutes expects directories for `statics` where we were
passing filenames too.

These are removed since they're not required -- all of the top level
files we need to serve at the root don't need VerifiedRoutes.

For the website, the files were named incorrectly.


The above issues were causing 404s on both the website and portal.
---
 elixir/apps/api/lib/api.ex                          |   2 +-
 elixir/apps/web/lib/web.ex                          |   2 +-
 .../web/lib/web/components/layouts/root.html.heex   |   4 ++--
 .../images}/android-chrome-192x192.png              | Bin
 .../images}/android-chrome-512x512.png              | Bin
 .../app/{apple-touch-icon.png => apple-icon.png}    | Bin
 website/src/app/{favicon.svg => icon.svg}           |   0
 .../app/{site.webmanifest => manifest.webmanifest}  |   4 ++--
 8 files changed, 6 insertions(+), 6 deletions(-)
 rename website/{src/app => public/images}/android-chrome-192x192.png (100%)
 rename website/{src/app => public/images}/android-chrome-512x512.png (100%)
 rename website/src/app/{apple-touch-icon.png => apple-icon.png} (100%)
 rename website/src/app/{favicon.svg => icon.svg} (100%)
 rename website/src/app/{site.webmanifest => manifest.webmanifest} (75%)

diff --git a/elixir/apps/api/lib/api.ex b/elixir/apps/api/lib/api.ex
index 3c124e727..bbd6629e7 100644
--- a/elixir/apps/api/lib/api.ex
+++ b/elixir/apps/api/lib/api.ex
@@ -1,5 +1,5 @@
 defmodule API do
-  def static_paths, do: ~w(assets fonts images favicon.ico site.webmanifest robots.txt)
+  def static_paths, do: ~w(assets fonts images)
 
   def router do
     quote do
diff --git a/elixir/apps/web/lib/web.ex b/elixir/apps/web/lib/web.ex
index 1a184d0b9..c2f64849d 100644
--- a/elixir/apps/web/lib/web.ex
+++ b/elixir/apps/web/lib/web.ex
@@ -18,7 +18,7 @@ defmodule Web do
   """
 
   def static_paths,
-    do: ~w(assets fonts images .well-known favicon.ico site.webmanifest robots.txt)
+    do: ~w(assets fonts images .well-known)
 
   def router do
     quote do
diff --git a/elixir/apps/web/lib/web/components/layouts/root.html.heex b/elixir/apps/web/lib/web/components/layouts/root.html.heex
index f6dad3242..c4a3018ad 100644
--- a/elixir/apps/web/lib/web/components/layouts/root.html.heex
+++ b/elixir/apps/web/lib/web/components/layouts/root.html.heex
@@ -4,10 +4,10 @@
     <meta charset="utf-8" />
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <meta name="viewport" content="width=client-width, initial-scale=1" />
-    <link rel="icon" href={~p"/favicon.ico"} sizes="any" />
+    <link rel="icon" href="/favicon.ico" sizes="any" />
     <link rel="icon" href={~p"/images/favicon.svg"} type="image/svg+xml" />
     <link rel="apple-touch-icon" href={~p"/images/apple-touch-icon.png"} />
-    <link rel="manifest" href={~p"/site.webmanifest"} />
+    <link rel="manifest" href="/site.webmanifest" />
     <meta name="theme-color" content="#331700" />
     <meta name="csrf-token" content={get_csrf_token()} />
     <.live_title suffix=" · Firezone">
diff --git a/website/src/app/android-chrome-192x192.png b/website/public/images/android-chrome-192x192.png
similarity index 100%
rename from website/src/app/android-chrome-192x192.png
rename to website/public/images/android-chrome-192x192.png
diff --git a/website/src/app/android-chrome-512x512.png b/website/public/images/android-chrome-512x512.png
similarity index 100%
rename from website/src/app/android-chrome-512x512.png
rename to website/public/images/android-chrome-512x512.png
diff --git a/website/src/app/apple-touch-icon.png b/website/src/app/apple-icon.png
similarity index 100%
rename from website/src/app/apple-touch-icon.png
rename to website/src/app/apple-icon.png
diff --git a/website/src/app/favicon.svg b/website/src/app/icon.svg
similarity index 100%
rename from website/src/app/favicon.svg
rename to website/src/app/icon.svg
diff --git a/website/src/app/site.webmanifest b/website/src/app/manifest.webmanifest
similarity index 75%
rename from website/src/app/site.webmanifest
rename to website/src/app/manifest.webmanifest
index 608df8860..175eb56e9 100644
--- a/website/src/app/site.webmanifest
+++ b/website/src/app/manifest.webmanifest
@@ -3,12 +3,12 @@
     "short_name": "Firezone",
     "icons": [
         {
-            "src": "/android-chrome-192x192.png",
+            "src": "/images/android-chrome-192x192.png",
             "sizes": "192x192",
             "type": "image/png"
         },
         {
-            "src": "/android-chrome-512x512.png",
+            "src": "/images/android-chrome-512x512.png",
             "sizes": "512x512",
             "type": "image/png"
         }