From 3481816b99ec9fb44e08cf0a5499ee3e2b78cc1c Mon Sep 17 00:00:00 2001
From: julia <midnight@trainwit.ch>
Date: Fri, 27 Dec 2024 11:55:03 +0000
Subject: [PATCH] [bugfix] Make the logo icon / wordmark on mobile/simple UI
 appear (#4)

At least for the logo-symbol-wordmark.svg, this appears to usually be added
by some ruby code in application.html.haml, but since we have a static index.html
this never gets inserted into the HTML. Rather than embedding it into the HTML,
just make the two logos pull from files in public/.

This does not update the branding of the files, just makes them appear.

Reviewed-on: https://codeberg.org/superseriousbusiness/masto-fe-standalone/pulls/4
Co-authored-by: julia <midnight@trainwit.ch>
Co-committed-by: julia <midnight@trainwit.ch>
---
 app/javascript/flavours/glitch/components/logo.jsx         | 6 ++----
 app/javascript/mastodon/components/logo.tsx                | 6 ++----
 app/javascript/images/logo.svg => public/logo-icon.svg     | 0
 {app/javascript/images => public}/logo-symbol-wordmark.svg | 0
 4 files changed, 4 insertions(+), 8 deletions(-)
 rename app/javascript/images/logo.svg => public/logo-icon.svg (100%)
 rename {app/javascript/images => public}/logo-symbol-wordmark.svg (100%)

diff --git a/app/javascript/flavours/glitch/components/logo.jsx b/app/javascript/flavours/glitch/components/logo.jsx
index 16ca9f80f..3d7d1116f 100644
--- a/app/javascript/flavours/glitch/components/logo.jsx
+++ b/app/javascript/flavours/glitch/components/logo.jsx
@@ -1,14 +1,12 @@
-import logo from 'mastodon/../images/logo.svg';
-
 export const WordmarkLogo = () => (
   <svg viewBox='0 0 261 66' className='logo logo--wordmark' role='img'>
     <title>Mastodon</title>
-    <use xlinkHref='#logo-symbol-wordmark' />
+    <use xlinkHref='/logo-symbol-wordmark.svg#logo-symbol-wordmark' />
   </svg>
 );
 
 export const SymbolLogo = () => (
-  <img src={logo} alt='Mastodon' className='logo logo--icon' />
+  <img src='/logo-icon.svg' alt='Mastodon' className='logo logo--icon' />
 );
 
 export default WordmarkLogo;
diff --git a/app/javascript/mastodon/components/logo.tsx b/app/javascript/mastodon/components/logo.tsx
index 928aa29a7..1c6cfd67c 100644
--- a/app/javascript/mastodon/components/logo.tsx
+++ b/app/javascript/mastodon/components/logo.tsx
@@ -1,12 +1,10 @@
-import logo from 'mastodon/../images/logo.svg';
-
 export const WordmarkLogo: React.FC = () => (
   <svg viewBox='0 0 261 66' className='logo logo--wordmark' role='img'>
     <title>Mastodon</title>
-    <use xlinkHref='#logo-symbol-wordmark' />
+    <use xlinkHref='/logo-symbol-wordmark.svg#logo-symbol-wordmark' />
   </svg>
 );
 
 export const SymbolLogo: React.FC = () => (
-  <img src={logo} alt='Mastodon' className='logo logo--icon' />
+  <img src='/logo-icon.svg' alt='Mastodon' className='logo logo--icon' />
 );
diff --git a/app/javascript/images/logo.svg b/public/logo-icon.svg
similarity index 100%
rename from app/javascript/images/logo.svg
rename to public/logo-icon.svg
diff --git a/app/javascript/images/logo-symbol-wordmark.svg b/public/logo-symbol-wordmark.svg
similarity index 100%
rename from app/javascript/images/logo-symbol-wordmark.svg
rename to public/logo-symbol-wordmark.svg