From 31f8cffec1d6fadb7733ea06fe74bb33ce163bbb Mon Sep 17 00:00:00 2001 From: marcsello Date: Thu, 26 Nov 2020 04:44:55 +0100 Subject: [PATCH] Added collections loading --- src/App.vue | 12 ++++-- src/components/BigChungusLoader.vue | 29 ++++++++++++++ src/components/CollectionsListElement.vue | 29 ++++++++++++++ src/components/LoadingScreen.vue | 16 -------- src/router/index.js | 30 +++++++++++++-- src/views/Collection.vue | 13 +++++++ src/views/Collections.vue | 46 +++++++++++++++++++++++ src/views/Home.vue | 17 --------- src/views/Login.vue | 3 +- src/views/Track.vue | 15 ++++++++ 10 files changed, 167 insertions(+), 43 deletions(-) create mode 100644 src/components/BigChungusLoader.vue create mode 100644 src/components/CollectionsListElement.vue delete mode 100644 src/components/LoadingScreen.vue create mode 100644 src/views/Collection.vue create mode 100644 src/views/Collections.vue delete mode 100644 src/views/Home.vue create mode 100644 src/views/Track.vue diff --git a/src/App.vue b/src/App.vue index f489655..dcf3b54 100644 --- a/src/App.vue +++ b/src/App.vue @@ -13,21 +13,21 @@
- +
+ + \ No newline at end of file diff --git a/src/components/CollectionsListElement.vue b/src/components/CollectionsListElement.vue new file mode 100644 index 0000000..6e34046 --- /dev/null +++ b/src/components/CollectionsListElement.vue @@ -0,0 +1,29 @@ + + + + + \ No newline at end of file diff --git a/src/components/LoadingScreen.vue b/src/components/LoadingScreen.vue deleted file mode 100644 index 7c80ec2..0000000 --- a/src/components/LoadingScreen.vue +++ /dev/null @@ -1,16 +0,0 @@ - - - \ No newline at end of file diff --git a/src/router/index.js b/src/router/index.js index 4dc620c..00fa92b 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1,6 +1,8 @@ import Vue from 'vue' import VueRouter from 'vue-router' -import Home from '@/views/Home.vue' +import Collections from '@/views/Collections.vue' +import Collection from "@/views/Collection"; +import Track from "@/views/Track"; import Login from "@/views/Login"; @@ -11,8 +13,28 @@ Vue.use(VueRouter) const routes = [ { path: '/', - name: 'Home', - component: Home, + name: 'Collections', + component: Collections, + meta: { + allowVisit(authorized) { + return authorized; + } + } + }, + { + path: '/collection/:id', + name: 'Collection', + component: Collection, + meta: { + allowVisit(authorized) { + return authorized; + } + } + }, + { + path: '/track/:id', + name: 'Track', + component: Track, meta: { allowVisit(authorized) { return authorized; @@ -62,7 +84,7 @@ router.beforeEach((to, from, next) => { } if (authorized) { - next({name: 'Home'}) + next({name: 'Collections'}) } else { next({name: 'Login'}) } diff --git a/src/views/Collection.vue b/src/views/Collection.vue new file mode 100644 index 0000000..28dc7a5 --- /dev/null +++ b/src/views/Collection.vue @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/src/views/Collections.vue b/src/views/Collections.vue new file mode 100644 index 0000000..64ed4ec --- /dev/null +++ b/src/views/Collections.vue @@ -0,0 +1,46 @@ + + + diff --git a/src/views/Home.vue b/src/views/Home.vue deleted file mode 100644 index bc50fab..0000000 --- a/src/views/Home.vue +++ /dev/null @@ -1,17 +0,0 @@ - - - diff --git a/src/views/Login.vue b/src/views/Login.vue index 974373f..74e15d0 100644 --- a/src/views/Login.vue +++ b/src/views/Login.vue @@ -76,8 +76,7 @@ export default { this.$store.dispatch('storeUserData', name).then(() => { - this.$router.push('/').catch(() => { - }); + this.$router.push({name: "Collections"}).catch(() => {}); this.processing = false; }); diff --git a/src/views/Track.vue b/src/views/Track.vue new file mode 100644 index 0000000..40cb6e6 --- /dev/null +++ b/src/views/Track.vue @@ -0,0 +1,15 @@ + + + + + \ No newline at end of file