diff --git a/src/App.vue b/src/App.vue index 08ab759..6821c36 100644 --- a/src/App.vue +++ b/src/App.vue @@ -9,6 +9,11 @@ + +
+ asdasdasdasdasd
@@ -92,4 +97,16 @@ export default { #loading-screen { margin: 45vh auto 0 auto; } + +#player-holder { + position: fixed; + left: 0; + right: 0; + bottom: 0; + height: 60px; +} + +#player-spacer { + height: 60px; +} diff --git a/src/api/index.js b/src/api/index.js index 488a066..babb91a 100644 --- a/src/api/index.js +++ b/src/api/index.js @@ -131,8 +131,8 @@ export default new class { return this._performApiCall('get', `/lists/${id}`, null, true, 200); } - getTrackFromList(listid, trackid) { - return this._performApiCall('get', `/lists/${listid}/${trackid}`, null, true, 200); + getItem(id) { + return this._performApiCall('get', `/items/${id}`, null, true, 200); } } \ No newline at end of file diff --git a/src/assets/spotify.png b/src/assets/spotify.png new file mode 100755 index 0000000..3542e5e Binary files /dev/null and b/src/assets/spotify.png differ diff --git a/src/router/index.js b/src/router/index.js index c28e990..e128269 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2,7 +2,7 @@ import Vue from 'vue' import VueRouter from 'vue-router' import Collections from '@/views/Collections.vue' import Collection from "@/views/Collection"; -import Track from "@/views/Track"; +import Item from "@/views/Item"; import Login from "@/views/Login"; @@ -32,9 +32,9 @@ const routes = [ } }, { - path: '/track/:id', - name: 'Track', - component: Track, + path: '/item/:id', + name: 'Item', + component: Item, meta: { allowVisit(authorized) { return authorized; diff --git a/src/store/index.js b/src/store/index.js index 8d7d234..399332b 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -8,7 +8,8 @@ export default new Vuex.Store({ userdata: { name: null }, - appReady: false + appReady: false, + playerActive: false }, mutations: { storeUserData(state, username) { diff --git a/src/views/Collection.vue b/src/views/Collection.vue index 13acffb..a2f8501 100644 --- a/src/views/Collection.vue +++ b/src/views/Collection.vue @@ -9,17 +9,16 @@ - + @@ -58,6 +57,11 @@ export default { tracklist: [] } }, + methods: { + rowClicked(data) { + this.$router.push({name: 'Item', params: {id: data.id}}); + } + }, mounted() { this.$api.getList(this.$route.params.id).then((data) => { if (data) { @@ -75,6 +79,9 @@ export default { } - \ No newline at end of file diff --git a/src/views/Item.vue b/src/views/Item.vue new file mode 100644 index 0000000..d4e7c2b --- /dev/null +++ b/src/views/Item.vue @@ -0,0 +1,64 @@ + + + + + \ No newline at end of file diff --git a/src/views/Track.vue b/src/views/Track.vue deleted file mode 100644 index 40cb6e6..0000000 --- a/src/views/Track.vue +++ /dev/null @@ -1,15 +0,0 @@ - - - - - \ No newline at end of file