From 56aeb5c4ee1a1931f651027542d60dde1f1a40b5 Mon Sep 17 00:00:00 2001
From: booploops <49113086+booploops@users.noreply.github.com>
Date: Thu, 3 Feb 2022 21:08:55 -0800
Subject: [PATCH] components and pages are now stored in browserwindow.ts

---
 src/main/base/browserwindow.ts |  45 ++++++++++++
 src/renderer/views/main.ejs    | 128 +--------------------------------
 2 files changed, 48 insertions(+), 125 deletions(-)

diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts
index 1e4011bd..144cfbff 100644
--- a/src/main/base/browserwindow.ts
+++ b/src/main/base/browserwindow.ts
@@ -26,6 +26,51 @@ export class BrowserWindow {
         env: {
             platform: process.platform,
             dev: app.isPackaged,
+            components: [
+                "pages/podcasts",
+                "pages/apple-account-settings",
+                "pages/library-songs",
+                "pages/browse",
+                "pages/settings",
+                "pages/listen_now",
+                "pages/home",
+                "pages/artist-feed",
+                "pages/cider-playlist",
+                "pages/recordLabel",
+                "pages/collection-list",
+                "pages/apple-curator",
+                "pages/artist",
+                "pages/search",
+                "pages/about",
+                "pages/library-videos",
+                "components/mediaitem-artwork",
+                "components/artwork-material",
+                "components/menu-panel",
+                "components/sidebar-playlist",
+                "components/spatial-properties",
+                "components/audio-settings",
+                "components/qrcode-modal",
+                "components/equalizer",
+                "components/add-to-playlist",
+                "components/queue",
+                "components/queue-item",
+                "components/mediaitem-scroller-horizontal",
+                "components/mediaitem-scroller-horizontal-large",
+                "components/mediaitem-scroller-horizontal-sp",
+                "components/mediaitem-scroller-horizontal-mvview",
+                "components/mediaitem-list-item",
+                "components/mediaitem-hrect",
+                "components/mediaitem-square",
+                "components/mediaitem-square-sp",
+                "components/mediaitem-mvview",
+                "components/libraryartist-item",
+                "components/listennow-child",
+                "components/mediaitem-mvview-sp",
+                "components/animatedartwork-view",
+                "components/lyrics-view",
+                "components/fullscreen",
+                "components/miniplayer",
+            ]
         },
     };
     private options: any = {
diff --git a/src/renderer/views/main.ejs b/src/renderer/views/main.ejs
index 1ba8628e..a4710132 100644
--- a/src/renderer/views/main.ejs
+++ b/src/renderer/views/main.ejs
@@ -44,54 +44,9 @@
     <%- include('app/panels'); %>
 </div>
 
-
-<!-- Apple Settings Page -->
-<%- include('pages/podcasts') %>
-<!-- Apple Settings Page -->
-<%- include('pages/apple-account-settings') %>
-<!-- Library - Songs -->
-<%- include('pages/library-songs') %>
-
-<!-- Media Item Artwork-->
-<%- include("components/mediaitem-artwork"); %>
-<!-- Browse -->
-<%- include('pages/browse') %>
-
-<!-- Settings -->
-<%- include('pages/settings') %>
-
-<!-- Listen Now -->
-<%- include('pages/listen_now') %>
-
-<!-- Home -->
-<%- include('pages/home') %>
-
-<!-- Artist Feed -->
-<%- include('pages/artist-feed') %>
-
-<!-- Playlists / Albums -->
-<%- include('pages/cider-playlist') %>
-
-<!-- Record Label -->
-<%- include('pages/recordLabel') %>
-
-<!-- Collection List -->
-<%- include('pages/collection-list') %>
-
-<!-- Apple Curator -->
-<%- include('pages/apple-curator') %>
-
-<!-- Artist Page -->
-<%- include('pages/artist') %>
-
-<!-- Search -->
-<%- include('pages/search') %>
-
-<!-- About -->
-<%- include('pages/about') %>
-
-
-<%- include('pages/library-videos') %>
+<% for(var i=0; i < Object.keys(env.components).length ; i++) {%>
+    <%- include(env.components[i]); %>
+<% } %>
 
 <script type="text/x-template"
         id="am-musiccovershelf">
@@ -108,83 +63,6 @@
     </button>
 </script>
 
-<!-- Artwork Material -->
-<%- include('components/artwork-material') %>
-<!-- Menu Panel -->
-<%- include('components/menu-panel') %>
-<!-- Playlist Listing -->
-<%- include('components/sidebar-playlist')
-%>
-<!-- Spatial Properties -->
-<%- include('components/spatial-properties')
-%>
-<!-- Audio Settings -->
-<%- include('components/audio-settings')
-%>
-<!-- QRCode Modal -->
-<%- include('components/qrcode-modal')
-%>
-<!-- Equalizer -->
-<%- include('components/equalizer')
-%>
-<!-- Add to playlist -->
-<%- include('components/add-to-playlist')
-%>
-<!-- Queue -->
-<%- include('components/queue')
-%>
-<!-- Queue Item -->
-<%- include('components/queue-item')
-%>
-<!-- Horizontal MediaItem Scroller -->
-<%- include('components/mediaitem-scroller-horizontal')
-%>
-<!-- Horizontal MediaItem Scroller (Large) -->
-<%- include('components/mediaitem-scroller-horizontal-large')
-%>
-<!-- Horizontal MediaItem Scroller (SP : Special) -->
-<%- include('components/mediaitem-scroller-horizontal-sp')
-%>
-<!-- Horizontal MediaItem Scroller (MV) -->
-<%- include('components/mediaitem-scroller-horizontal-mvview')
-%>
-<!-- MediaItem List Item -->
-<%- include('components/mediaitem-list-item')
-%>
-<!-- MediaItem Horizontal Rectangle -->
-<%- include('components/mediaitem-hrect')
-%>
-<!-- MediaItem Square -->
-<%- include('components/mediaitem-square')
-%>
-<!-- MediaItem Square SP -->
-<%- include('components/mediaitem-square-sp')
-%>
-<!-- MediaItem MusicVideo -->
-<%- include('components/mediaitem-mvview')
-%>
-<!-- MediaItem MusicVideo -->
-<%- include('components/libraryartist-item')
-%>
-<%- include('components/listennow-child')
-%>
-<!-- MediaItem MusicVideo SP -->
-<%- include('components/mediaitem-mvview-sp')
-%>
-<!-- Animated Artwork View -->
-<%- include('components/animatedartwork-view')
-%>
-<!-- Lyrics View -->
-<%- include('components/lyrics-view')
-%>
-<!-- Fullscreen View -->
-<%- include('components/fullscreen')
-%>
-
-<!-- Miniplayer View -->
-<%- include('components/miniplayer')
-%>
-
 <script
         src="musickit.js?v=1"></script>
 <script>