Fix schedule page

pymedusa · Jul 5, 2018 · e313d16 · e313d16
1 parent b918362
commit e313d16
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 26 deletions.
diff --git a/themes-default/slim/static/js/router.js b/themes-default/slim/static/js/router.js
@@ -5,6 +5,7 @@ if (!window.router) {
     const configComponent = httpVueLoader('js/templates/config.vue');
     const addShowsComponent = httpVueLoader('js/templates/add-shows.vue');
     const addRecommendedComponent = httpVueLoader('js/templates/add-recommended.vue');
+    // const scheduleComponent = httpVueLoader('js/templates/schedule.vue');
     const notFoundComponent = httpVueLoader('js/templates/http/404.vue');
 
     const router = new VueRouter({
@@ -34,6 +35,14 @@ if (!window.router) {
                 header: 'Add Recommended Shows'
             },
             component: addRecommendedComponent
+        }, {
+            path: '/schedule',
+            name: 'schedule',
+            meta: {
+                title: 'Schedule',
+                header: 'Schedule'
+            },
+            // component: scheduleComponent
         }, {
             path: '/not-found',
             name: 'not-found',

diff --git a/themes-default/slim/views/schedule.mako b/themes-default/slim/views/schedule.mako
@@ -13,17 +13,12 @@ const startVue = () => {
         store,
         el: '#vue-wrap',
         router,
-        metaInfo: {
-            title: 'Schedule'
-        },
-        data() {
-            return {
-                header: 'Schedule'
-            };
-        },
         computed: Object.assign(
             store.mapState(['shows']),
             {
+                header() {
+                    return this.$route.meta.header;
+                },
                 layout: {
                     get() {
                         const { config } = this;

diff --git a/themes/dark/assets/js/router.js b/themes/dark/assets/js/router.js
@@ -5,6 +5,7 @@ if (!window.router) {
     const configComponent = httpVueLoader('js/templates/config.vue');
     const addShowsComponent = httpVueLoader('js/templates/add-shows.vue');
     const addRecommendedComponent = httpVueLoader('js/templates/add-recommended.vue');
+    // const scheduleComponent = httpVueLoader('js/templates/schedule.vue');
     const notFoundComponent = httpVueLoader('js/templates/http/404.vue');
 
     const router = new VueRouter({
@@ -34,6 +35,14 @@ if (!window.router) {
                 header: 'Add Recommended Shows'
             },
             component: addRecommendedComponent
+        }, {
+            path: '/schedule',
+            name: 'schedule',
+            meta: {
+                title: 'Schedule',
+                header: 'Schedule'
+            },
+            // component: scheduleComponent
         }, {
             path: '/not-found',
             name: 'not-found',

diff --git a/themes/dark/assets/js/router.js.map b/themes/dark/assets/js/router.js.map
diff --git a/themes/dark/templates/schedule.mako b/themes/dark/templates/schedule.mako
@@ -13,17 +13,12 @@ const startVue = () => {
         store,
         el: '#vue-wrap',
         router,
-        metaInfo: {
-            title: 'Schedule'
-        },
-        data() {
-            return {
-                header: 'Schedule'
-            };
-        },
         computed: Object.assign(
             store.mapState(['shows']),
             {
+                header() {
+                    return this.$route.meta.header;
+                },
                 layout: {
                     get() {
                         const { config } = this;

diff --git a/themes/light/assets/js/router.js b/themes/light/assets/js/router.js
@@ -5,6 +5,7 @@ if (!window.router) {
     const configComponent = httpVueLoader('js/templates/config.vue');
     const addShowsComponent = httpVueLoader('js/templates/add-shows.vue');
     const addRecommendedComponent = httpVueLoader('js/templates/add-recommended.vue');
+    // const scheduleComponent = httpVueLoader('js/templates/schedule.vue');
     const notFoundComponent = httpVueLoader('js/templates/http/404.vue');
 
     const router = new VueRouter({
@@ -34,6 +35,14 @@ if (!window.router) {
                 header: 'Add Recommended Shows'
             },
             component: addRecommendedComponent
+        }, {
+            path: '/schedule',
+            name: 'schedule',
+            meta: {
+                title: 'Schedule',
+                header: 'Schedule'
+            },
+            // component: scheduleComponent
         }, {
             path: '/not-found',
             name: 'not-found',

diff --git a/themes/light/assets/js/router.js.map b/themes/light/assets/js/router.js.map
diff --git a/themes/light/templates/schedule.mako b/themes/light/templates/schedule.mako
@@ -13,17 +13,12 @@ const startVue = () => {
         store,
         el: '#vue-wrap',
         router,
-        metaInfo: {
-            title: 'Schedule'
-        },
-        data() {
-            return {
-                header: 'Schedule'
-            };
-        },
         computed: Object.assign(
             store.mapState(['shows']),
             {
+                header() {
+                    return this.$route.meta.header;
+                },
                 layout: {
                     get() {
                         const { config } = this;