diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts index c9c3d0a5..93144c9d 100644 --- a/src/main/base/browserwindow.ts +++ b/src/main/base/browserwindow.ts @@ -50,8 +50,213 @@ export class BrowserWindow { dev: app.isPackaged, osRelease: os.release(), updatable: !process.windowsStore || !process.mas, - components: require("./vcomponents.json"), - appRoutes: require("./vrouting.json") + components: [ + "pages/podcasts", + "pages/apple-account-settings", + "pages/library-songs", + "pages/library-albums", + "pages/library-artists", + "pages/browse", + "pages/groupings", + "pages/settings", + "pages/installed-themes", + "pages/listen_now", + "pages/radio", + "pages/home", + "pages/artist-feed", + "pages/cider-playlist", + "pages/playlist-inline", + "pages/recordLabel", + "pages/cider-multiroom", + "pages/collection-list", + "pages/apple-curator", + "pages/artist", + "pages/search", + "pages/about", + "pages/library-videos", + "pages/remote-pair", + "pages/themes-github", + "pages/plugins-github", + "pages/replay", + "pages/audiolabs", + "pages/zoo", + "pages/plugin-renderer", + "pages/keybinds", + "components/mediaitem-artwork", + "components/artwork-material", + "components/menu-panel", + "components/sidebar-playlist", + "components/audio-settings", + "components/plugin-menu", + "components/audio-controls", + "components/audio-playbackrate", + "components/qrcode-modal", + "components/moreinfo-modal", + "components/equalizer", + "components/add-to-playlist", + "components/queue", + "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-mvview", + // "components/libraryartist-item", + "components/listennow-child", + "components/mediaitem-mvview-sp", + "components/animatedartwork-view", + "components/listitem-horizontal", + "components/lyrics-view", + "components/fullscreen", + "components/miniplayer", + "components/castmenu", + "components/airplay-modal", + "components/artist-chip", + "components/hello-world", + "components/inline-collection-list", + ], + appRoutes: [ + { + page: "plugin-renderer", + component: ``, + condition: "page == 'plugin-renderer'" + }, + { + page: "zoo", + component: "", + condition: "page == 'zoo'" + }, + { + page: "podcasts", + component: ``, + condition: `page == 'podcasts'` + }, { + page: "library-videos", + component: ``, + condition: `page == 'library-videos'` + }, { + page: "apple-account-settings", + component: ``, + condition: `page == 'apple-account-settings'` + }, { + page: "about", + component: ``, + condition: `page == 'about'` + }, { + page: "cider-artist", + component: ``, + condition: `page == 'artist-page' && artistPage.data.attributes` + }, { + page: "collection-list", + component: ``, + condition: `page == 'collection-list'` + }, { + page: "home", + component: ``, + condition: `page == 'home'` + }, { + page: "artist-feed", + component: ``, + condition: `page == 'artist-feed'` + }, { + page: "playlist-inline", + component: ``, + condition: `modals.showPlaylist` + }, { + page: "playlist_", + component: ``, + condition: `page.includes('playlist_')` + }, { + page: "album_", + component: ``, + condition: `page.includes('album_')` + }, { + page: "recordLabel_", + component: ``, + condition: `page.includes('recordLabel_')` + }, { + page: "multiroom", + component: ``, + condition: `page.includes('multiroom')` + }, { + page: "curator_", + component: ``, + condition: `page.includes('curator_')` + }, { + page: "browsepage", + component: ``, + condition: `page == 'browse'`, + onEnter: `` + },{ + page: "groupings", + component: ``, + condition: `page == 'groupings'`, + onEnter: `` + }, { + page: "listen_now", + component: ``, + condition: `page == 'listen_now'`, + onEnter: `` + }, { + page: "radio", + component: ``, + condition: `page == 'radio'`, + onEnter: `` + }, { + page: "settings", + component: ``, + condition: `page == 'settings'` + }, { + page: "installed-themes", + component: ``, + condition: `page == 'installed-themes'` + }, { + page: "search", + component: ``, + condition: `page == 'search'` + }, { + page: "library-songs", + component: ``, + condition: `page == 'library-songs'`, + onEnter: `` + }, { + page: "library-albums", + component: ``, + condition: `page == 'library-albums'`, + onEnter: `` + }, { + page: "library-artists", + component: ``, + condition: `page == 'library-artists'`, + onEnter: `` + }, { + page: "appleCurator", + component: ``, + condition: `page.includes('appleCurator')` + }, { + page: "themes-github", + component: ``, + condition: `page == 'themes-github'` + }, { + page: "plugins-github", + component: ``, + condition: `page == 'plugins-github'` + }, { + page: "remote-pair", + component: ``, + condition: `page == 'remote-pair'` + }, { + page: "audiolabs", + component: ``, + condition: `page == 'audiolabs'` + }, { + page: "replay", + component: ``, + condition: `page == 'replay'` + } + ] }, }; private options: any = { @@ -274,7 +479,7 @@ export class BrowserWindow { const impulseExternals = join(utils.getPath("externals"), "/impulses/") const impulseFile = join(impulseExternals, req.params.file) if(existsSync(impulseFile)) { - res.sendFile(impulseFile) + res.sendFile(impulseFile) }else{ res.sendFile(join(utils.getPath('srcPath'), "./renderer/audio/impulses/" + req.params.file)) } @@ -1284,4 +1489,3 @@ export class BrowserWindow { console.log('remote broadcasted') } } -