Merge remote-tracking branch 'origin/develop' into develop
This commit is contained in:
commit
85ef419d4e
9 changed files with 15 additions and 100 deletions
|
@ -59,7 +59,6 @@ export class BrowserWindow {
|
|||
"pages/settings",
|
||||
"pages/installed-themes",
|
||||
"pages/listen_now",
|
||||
"pages/radio",
|
||||
"pages/home",
|
||||
"pages/artist-feed",
|
||||
"pages/cider-playlist",
|
||||
|
@ -113,7 +112,6 @@ export class BrowserWindow {
|
|||
"components/artist-chip",
|
||||
"components/hello-world",
|
||||
"components/inline-collection-list",
|
||||
"components/radio-child",
|
||||
],
|
||||
appRoutes: [
|
||||
{
|
||||
|
@ -188,11 +186,6 @@ export class BrowserWindow {
|
|||
component: `<cider-listen-now :data="listennow"></cider-listen-now>`,
|
||||
condition: `page == 'listen_now'`,
|
||||
onEnter: ``
|
||||
}, {
|
||||
page: "radio",
|
||||
component: `<cider-radio :data="radio"></cider-radio>`,
|
||||
condition: `page == 'radio'`,
|
||||
onEnter: ``
|
||||
}, {
|
||||
page: "settings",
|
||||
component: `<cider-settings></cider-settings>`,
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue