From 6de93f965131a3a54cae5439dcc4a3670288549d Mon Sep 17 00:00:00 2001 From: Gabe Kangas Date: Fri, 24 Jun 2022 21:53:16 -0700 Subject: [PATCH] Move the favicons --- static/golive.html.tmpl | 487 ------------------ .../connected-client-info-handler.ts | 2 +- web/next.config.js | 4 - {webroot => web/public}/favicon.ico | Bin .../img/favicon/android-icon-144x144.png | Bin .../img/favicon/android-icon-192x192.png | Bin .../img/favicon/android-icon-36x36.png | Bin .../img/favicon/android-icon-48x48.png | Bin .../img/favicon/android-icon-72x72.png | Bin .../img/favicon/android-icon-96x96.png | Bin .../img/favicon/apple-icon-114x114.png | Bin .../img/favicon/apple-icon-120x120.png | Bin .../img/favicon/apple-icon-144x144.png | Bin .../img/favicon/apple-icon-152x152.png | Bin .../img/favicon/apple-icon-180x180.png | Bin .../public}/img/favicon/apple-icon-57x57.png | Bin .../public}/img/favicon/apple-icon-60x60.png | Bin .../public}/img/favicon/apple-icon-72x72.png | Bin .../public}/img/favicon/apple-icon-76x76.png | Bin .../img/favicon/apple-icon-precomposed.png | Bin .../public}/img/favicon/apple-icon.png | Bin .../public}/img/favicon/browserconfig.xml | 0 .../public}/img/favicon/favicon-16x16.png | Bin .../public}/img/favicon/favicon-32x32.png | Bin .../public}/img/favicon/favicon-96x96.png | Bin .../public}/img/favicon/ms-icon-144x144.png | Bin .../public}/img/favicon/ms-icon-150x150.png | Bin .../public}/img/favicon/ms-icon-310x310.png | Bin .../public}/img/favicon/ms-icon-70x70.png | Bin {webroot => web/public}/manifest.json | 0 30 files changed, 1 insertion(+), 492 deletions(-) delete mode 100644 static/golive.html.tmpl rename {webroot => web/public}/favicon.ico (100%) rename {webroot => web/public}/img/favicon/android-icon-144x144.png (100%) rename {webroot => web/public}/img/favicon/android-icon-192x192.png (100%) rename {webroot => web/public}/img/favicon/android-icon-36x36.png (100%) rename {webroot => web/public}/img/favicon/android-icon-48x48.png (100%) rename {webroot => web/public}/img/favicon/android-icon-72x72.png (100%) rename {webroot => web/public}/img/favicon/android-icon-96x96.png (100%) rename {webroot => web/public}/img/favicon/apple-icon-114x114.png (100%) rename {webroot => web/public}/img/favicon/apple-icon-120x120.png (100%) rename {webroot => web/public}/img/favicon/apple-icon-144x144.png (100%) rename {webroot => web/public}/img/favicon/apple-icon-152x152.png (100%) rename {webroot => web/public}/img/favicon/apple-icon-180x180.png (100%) rename {webroot => web/public}/img/favicon/apple-icon-57x57.png (100%) rename {webroot => web/public}/img/favicon/apple-icon-60x60.png (100%) rename {webroot => web/public}/img/favicon/apple-icon-72x72.png (100%) rename {webroot => web/public}/img/favicon/apple-icon-76x76.png (100%) rename {webroot => web/public}/img/favicon/apple-icon-precomposed.png (100%) rename {webroot => web/public}/img/favicon/apple-icon.png (100%) rename {webroot => web/public}/img/favicon/browserconfig.xml (100%) rename {webroot => web/public}/img/favicon/favicon-16x16.png (100%) rename {webroot => web/public}/img/favicon/favicon-32x32.png (100%) rename {webroot => web/public}/img/favicon/favicon-96x96.png (100%) rename {webroot => web/public}/img/favicon/ms-icon-144x144.png (100%) rename {webroot => web/public}/img/favicon/ms-icon-150x150.png (100%) rename {webroot => web/public}/img/favicon/ms-icon-310x310.png (100%) rename {webroot => web/public}/img/favicon/ms-icon-70x70.png (100%) rename {webroot => web/public}/manifest.json (100%) diff --git a/static/golive.html.tmpl b/static/golive.html.tmpl deleted file mode 100644 index c773fe52f..000000000 --- a/static/golive.html.tmpl +++ /dev/null @@ -1,487 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - -
-
- ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌ ‌  -
- -
- - diff --git a/web/components/stores/eventhandlers/connected-client-info-handler.ts b/web/components/stores/eventhandlers/connected-client-info-handler.ts index 36ac64060..fe6454ec3 100644 --- a/web/components/stores/eventhandlers/connected-client-info-handler.ts +++ b/web/components/stores/eventhandlers/connected-client-info-handler.ts @@ -10,5 +10,5 @@ export default function handleConnectedClientInfoMessage( const { id, displayName, scopes } = user; setChatDisplayName(displayName); setChatUserId(id); - setIsChatModerator(scopes.includes('moderator')); + setIsChatModerator(scopes?.includes('moderator')); } diff --git a/web/next.config.js b/web/next.config.js index 40a920da6..845894579 100644 --- a/web/next.config.js +++ b/web/next.config.js @@ -33,10 +33,6 @@ module.exports = withLess({ source: '/thumbnail.jpg', destination: 'http://localhost:8080/thumbnail.jpg', // Proxy to Backend to work around CORS. }, - { - source: '/favicon.ico', - destination: 'http://localhost:8080/favicon.ico', // Proxy to Backend to work around CORS. - }, ]; }, }); diff --git a/webroot/favicon.ico b/web/public/favicon.ico similarity index 100% rename from webroot/favicon.ico rename to web/public/favicon.ico diff --git a/webroot/img/favicon/android-icon-144x144.png b/web/public/img/favicon/android-icon-144x144.png similarity index 100% rename from webroot/img/favicon/android-icon-144x144.png rename to web/public/img/favicon/android-icon-144x144.png diff --git a/webroot/img/favicon/android-icon-192x192.png b/web/public/img/favicon/android-icon-192x192.png similarity index 100% rename from webroot/img/favicon/android-icon-192x192.png rename to web/public/img/favicon/android-icon-192x192.png diff --git a/webroot/img/favicon/android-icon-36x36.png b/web/public/img/favicon/android-icon-36x36.png similarity index 100% rename from webroot/img/favicon/android-icon-36x36.png rename to web/public/img/favicon/android-icon-36x36.png diff --git a/webroot/img/favicon/android-icon-48x48.png b/web/public/img/favicon/android-icon-48x48.png similarity index 100% rename from webroot/img/favicon/android-icon-48x48.png rename to web/public/img/favicon/android-icon-48x48.png diff --git a/webroot/img/favicon/android-icon-72x72.png b/web/public/img/favicon/android-icon-72x72.png similarity index 100% rename from webroot/img/favicon/android-icon-72x72.png rename to web/public/img/favicon/android-icon-72x72.png diff --git a/webroot/img/favicon/android-icon-96x96.png b/web/public/img/favicon/android-icon-96x96.png similarity index 100% rename from webroot/img/favicon/android-icon-96x96.png rename to web/public/img/favicon/android-icon-96x96.png diff --git a/webroot/img/favicon/apple-icon-114x114.png b/web/public/img/favicon/apple-icon-114x114.png similarity index 100% rename from webroot/img/favicon/apple-icon-114x114.png rename to web/public/img/favicon/apple-icon-114x114.png diff --git a/webroot/img/favicon/apple-icon-120x120.png b/web/public/img/favicon/apple-icon-120x120.png similarity index 100% rename from webroot/img/favicon/apple-icon-120x120.png rename to web/public/img/favicon/apple-icon-120x120.png diff --git a/webroot/img/favicon/apple-icon-144x144.png b/web/public/img/favicon/apple-icon-144x144.png similarity index 100% rename from webroot/img/favicon/apple-icon-144x144.png rename to web/public/img/favicon/apple-icon-144x144.png diff --git a/webroot/img/favicon/apple-icon-152x152.png b/web/public/img/favicon/apple-icon-152x152.png similarity index 100% rename from webroot/img/favicon/apple-icon-152x152.png rename to web/public/img/favicon/apple-icon-152x152.png diff --git a/webroot/img/favicon/apple-icon-180x180.png b/web/public/img/favicon/apple-icon-180x180.png similarity index 100% rename from webroot/img/favicon/apple-icon-180x180.png rename to web/public/img/favicon/apple-icon-180x180.png diff --git a/webroot/img/favicon/apple-icon-57x57.png b/web/public/img/favicon/apple-icon-57x57.png similarity index 100% rename from webroot/img/favicon/apple-icon-57x57.png rename to web/public/img/favicon/apple-icon-57x57.png diff --git a/webroot/img/favicon/apple-icon-60x60.png b/web/public/img/favicon/apple-icon-60x60.png similarity index 100% rename from webroot/img/favicon/apple-icon-60x60.png rename to web/public/img/favicon/apple-icon-60x60.png diff --git a/webroot/img/favicon/apple-icon-72x72.png b/web/public/img/favicon/apple-icon-72x72.png similarity index 100% rename from webroot/img/favicon/apple-icon-72x72.png rename to web/public/img/favicon/apple-icon-72x72.png diff --git a/webroot/img/favicon/apple-icon-76x76.png b/web/public/img/favicon/apple-icon-76x76.png similarity index 100% rename from webroot/img/favicon/apple-icon-76x76.png rename to web/public/img/favicon/apple-icon-76x76.png diff --git a/webroot/img/favicon/apple-icon-precomposed.png b/web/public/img/favicon/apple-icon-precomposed.png similarity index 100% rename from webroot/img/favicon/apple-icon-precomposed.png rename to web/public/img/favicon/apple-icon-precomposed.png diff --git a/webroot/img/favicon/apple-icon.png b/web/public/img/favicon/apple-icon.png similarity index 100% rename from webroot/img/favicon/apple-icon.png rename to web/public/img/favicon/apple-icon.png diff --git a/webroot/img/favicon/browserconfig.xml b/web/public/img/favicon/browserconfig.xml similarity index 100% rename from webroot/img/favicon/browserconfig.xml rename to web/public/img/favicon/browserconfig.xml diff --git a/webroot/img/favicon/favicon-16x16.png b/web/public/img/favicon/favicon-16x16.png similarity index 100% rename from webroot/img/favicon/favicon-16x16.png rename to web/public/img/favicon/favicon-16x16.png diff --git a/webroot/img/favicon/favicon-32x32.png b/web/public/img/favicon/favicon-32x32.png similarity index 100% rename from webroot/img/favicon/favicon-32x32.png rename to web/public/img/favicon/favicon-32x32.png diff --git a/webroot/img/favicon/favicon-96x96.png b/web/public/img/favicon/favicon-96x96.png similarity index 100% rename from webroot/img/favicon/favicon-96x96.png rename to web/public/img/favicon/favicon-96x96.png diff --git a/webroot/img/favicon/ms-icon-144x144.png b/web/public/img/favicon/ms-icon-144x144.png similarity index 100% rename from webroot/img/favicon/ms-icon-144x144.png rename to web/public/img/favicon/ms-icon-144x144.png diff --git a/webroot/img/favicon/ms-icon-150x150.png b/web/public/img/favicon/ms-icon-150x150.png similarity index 100% rename from webroot/img/favicon/ms-icon-150x150.png rename to web/public/img/favicon/ms-icon-150x150.png diff --git a/webroot/img/favicon/ms-icon-310x310.png b/web/public/img/favicon/ms-icon-310x310.png similarity index 100% rename from webroot/img/favicon/ms-icon-310x310.png rename to web/public/img/favicon/ms-icon-310x310.png diff --git a/webroot/img/favicon/ms-icon-70x70.png b/web/public/img/favicon/ms-icon-70x70.png similarity index 100% rename from webroot/img/favicon/ms-icon-70x70.png rename to web/public/img/favicon/ms-icon-70x70.png diff --git a/webroot/manifest.json b/web/public/manifest.json similarity index 100% rename from webroot/manifest.json rename to web/public/manifest.json