diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts index 7f81c72c..d16eaeee 100644 --- a/src/main/base/browserwindow.ts +++ b/src/main/base/browserwindow.ts @@ -89,6 +89,7 @@ export class BrowserWindow { "pages/plugin-renderer", "pages/keybinds", "pages/oobe", + "components/app-content", "components/mediaitem-artwork", "components/artwork-material", "components/menu-panel", @@ -129,150 +130,150 @@ export class BrowserWindow { { page: "library-recentlyadded", component: ``, - condition: "page == 'library-recentlyadded'" + condition: "$root.page == 'library-recentlyadded'" }, { page: "plugin-renderer", component: ``, - condition: "page == 'plugin-renderer'" + condition: "$root.page == 'plugin-renderer'" }, { page: "zoo", component: "", - condition: "page == 'zoo'" + condition: "$root.page == 'zoo'" }, { page: "podcasts", component: ``, - condition: `page == 'podcasts'` + condition: `$root.page == 'podcasts'` }, { page: "library-videos", component: ``, - condition: `page == 'library-videos'` + condition: `$root.page == 'library-videos'` }, { page: "apple-account-settings", component: ``, - condition: `page == 'apple-account-settings'` + condition: `$root.page == 'apple-account-settings'` }, { page: "about", component: ``, - condition: `page == 'about'` + condition: `$root.page == 'about'` }, { page: "cider-artist", - component: ``, - condition: `page == 'artist-page' && artistPage.data.attributes` + component: ``, + condition: `$root.page == 'artist-page' && $root.artistPage.data.attributes` }, { page: "collection-list", - component: ``, - condition: `page == 'collection-list'` + component: ``, + condition: `$root.page == 'collection-list'` }, { page: "home", component: ``, - condition: `page == 'home'` + condition: `$root.page == 'home'` }, { page: "artist-feed", component: ``, - condition: `page == 'artist-feed'` + condition: `$root.page == 'artist-feed'` }, { page: "playlist-inline", - component: ``, - condition: `modals.showPlaylist` + component: ``, + condition: `$root.modals.showPlaylist` }, { page: "playlist_", - component: ``, - condition: `page.includes('playlist_')` + component: ``, + condition: `$root.page.includes('playlist_')` }, { page: "album_", - component: ``, - condition: `page.includes('album_')` + component: ``, + condition: `$root.page.includes('album_')` }, { page: "recordLabel_", - component: ``, - condition: `page.includes('recordLabel_')` + component: ``, + condition: `$root.page.includes('recordLabel_')` }, { page: "multiroom", - component: ``, - condition: `page.includes('multiroom')` + component: ``, + condition: `$root.page.includes('multiroom')` }, { page: "curator_", - component: ``, - condition: `page.includes('curator_')` + component: ``, + condition: `$root.page.includes('curator_')` }, { page: "browsepage", - component: ``, - condition: `page == 'browse'`, + component: ``, + condition: `$root.page == 'browse'`, onEnter: `` }, { page: "groupings", - component: ``, - condition: `page == 'groupings'`, + component: ``, + condition: `$root.page == 'groupings'`, onEnter: `` }, { page: "charts", - component: ``, - condition: `page == 'charts'`, + component: ``, + condition: `$root.page == 'charts'`, onEnter: `` }, { page: "listen_now", - component: ``, - condition: `page == 'listen_now'`, + component: ``, + condition: `$root.page == 'listen_now'`, onEnter: `` }, { page: "radio", - component: ``, - condition: `page == 'radio'`, + component: ``, + condition: `$root.page == 'radio'`, onEnter: `` }, { page: "settings", component: ``, - condition: `page == 'settings'` + condition: `$root.page == 'settings'` }, { page: "installed-themes", component: ``, - condition: `page == 'installed-themes'` + condition: `$root.page == 'installed-themes'` }, { page: "search", - component: ``, - condition: `page == 'search'` + component: ``, + condition: `$root.page == 'search'` }, { page: "library-songs", - component: ``, - condition: `page == 'library-songs'`, + component: ``, + condition: `$root.page == 'library-songs'`, onEnter: `` }, { page: "library-albums", - component: ``, - condition: `page == 'library-albums'`, + component: ``, + condition: `$root.page == 'library-albums'`, onEnter: `` }, { page: "library-artists", component: ``, - condition: `page == 'library-artists'`, + condition: `$root.page == 'library-artists'`, onEnter: `` }, { page: "appleCurator", - component: ``, - condition: `page.includes('appleCurator')` + component: ``, + condition: `$root.page.includes('appleCurator')` }, { page: "themes-github", component: ``, - condition: `page == 'themes-github'` + condition: `$root.page == 'themes-github'` }, { page: "plugins-github", component: ``, - condition: `page == 'plugins-github'` + condition: `$root.page == 'plugins-github'` }, { page: "remote-pair", component: ``, - condition: `page == 'remote-pair'` + condition: `$root.page == 'remote-pair'` }, { page: "audiolabs", component: ``, - condition: `page == 'audiolabs'` + condition: `$root.page == 'audiolabs'` }, { page: "replay", component: ``, - condition: `page == 'replay'` + condition: `$root.page == 'replay'` } ] }, diff --git a/src/renderer/views/app/app-content.ejs b/src/renderer/views/app/app-content.ejs deleted file mode 100644 index ed10c736..00000000 --- a/src/renderer/views/app/app-content.ejs +++ /dev/null @@ -1,42 +0,0 @@ -
- - - - <% for(var i=0; i < Object.keys(env.appRoutes).length ; i++) {%> - - v-on:enter="<%- env.appRoutes[i].onEnter %>" - <% - } - %> - :name="chrome.desiredPageTransition"> - - - <% } %> - - - - - - - - - - -
\ No newline at end of file diff --git a/src/renderer/views/app/app-navigation.ejs b/src/renderer/views/app/app-navigation.ejs index dba05cd0..382dab2a 100644 --- a/src/renderer/views/app/app-navigation.ejs +++ b/src/renderer/views/app/app-navigation.ejs @@ -135,7 +135,7 @@ <%- include("sidebar") %> - <%- include("app-content") %> +
diff --git a/src/renderer/views/components/app-content.ejs b/src/renderer/views/components/app-content.ejs new file mode 100644 index 00000000..611a67f5 --- /dev/null +++ b/src/renderer/views/components/app-content.ejs @@ -0,0 +1,57 @@ + + + \ No newline at end of file diff --git a/src/renderer/views/components/sidebar-playlist.ejs b/src/renderer/views/components/sidebar-playlist.ejs index 8a252226..8565c642 100644 --- a/src/renderer/views/components/sidebar-playlist.ejs +++ b/src/renderer/views/components/sidebar-playlist.ejs @@ -126,9 +126,9 @@ } }) - if (typeof this.$parent.getChildren == "function") { - this.$parent.getChildren() - console.log(this.$parent.children) + if (typeof this.$root.getChildren == "function") { + this.$root.getChildren() + console.log(this.$root.children) } await this.getChildren() this.$root.sortPlaylists() diff --git a/src/renderer/views/main.ejs b/src/renderer/views/main.ejs index 34c5c9dd..9b5aad5d 100644 --- a/src/renderer/views/main.ejs +++ b/src/renderer/views/main.ejs @@ -122,7 +122,7 @@