diff --git a/client/src/components/player.vue b/client/src/components/player.vue index 888b953..e3b2d9d 100644 --- a/client/src/components/player.vue +++ b/client/src/components/player.vue @@ -35,7 +35,7 @@ - +
-
+
{ - if ( - to.matched.some((record) => record.meta.requiresAuth) && - !process.env.SERVER - ) { - if (store.state.user && store.state.user?.id) { + // console.log(to); + // console.log(process.env.SERVER); + // if ( + // to.matched.some((record) => record.meta.requiresAuth) && + // !process.env.SERVER + // ) { + // if (store.state.user && store.state.user?.id) { + // next(); + // } else { + // next({ name: 'home' }); + // this.$store.dispatch('setShowAuthModal', true); + // } + // } else { + // next(); + // } + + // console.log(to); + // console.log(from); + if (to.meta.isAuth) { + if (store.state.user) { next(); } else { next({ name: 'home' }); - this.$store.dispatch('setShowAuthModal', true); } } else { next(); diff --git a/client/src/router/routes.js b/client/src/router/routes.js index 6bc4bb8..9352d0a 100644 --- a/client/src/router/routes.js +++ b/client/src/router/routes.js @@ -79,7 +79,7 @@ const routes = [ component: profile, meta: { title: 'Личный кабинет', - isAuth: false, + isAuth: true, }, children: [ { diff --git a/client/src/services/app.js b/client/src/services/app.js index 075289b..2781502 100644 --- a/client/src/services/app.js +++ b/client/src/services/app.js @@ -2,6 +2,7 @@ import { urlPath as settings } from '@/settings'; import { REST, RESTError } from './rest'; // запросы на сервер Django +// console.log(settings); export default class extends REST { static get settings() { @@ -56,7 +57,9 @@ export default class extends REST { } static getCheckFavoriteSong(id) { - return this._get(`radio/song/check_is_favorite/${id}`, {}, {}) + // return this._get(`radio/song/check_is_favorite/${id}`, {}, {}) + return this._get(`radio/song/${id}/check_is_favorite`, {}, {}) + .then((data) => { return data; }) @@ -74,7 +77,9 @@ export default class extends REST { }); } static getAudio(id) { - return this._get(`radio/song/get_audio/${id}`, {}, {}, false, true) + // return this._get(`radio/song/get_audio/${id}`, {}, {}, false, true) + return this._get(`radio/song/${id}/get_audio/`, {}, {}, false, true) + .then((data) => { return data; }) @@ -82,8 +87,9 @@ export default class extends REST { throw new RESTError(error, 'Ошибка при получениии песни'); }); } - static createFavoriteForUser(params) { - return this._post(`radio/song/add_favorite`, {}, params) + static createFavoriteForUser(id) { + // return this._post(`radio/song/add_favorite`, {}, params) + return this._post(`radio/song/${id}/add_favorite`, {}, {}) .then((data) => { return data; }) @@ -159,8 +165,9 @@ export default class extends REST { }); } - static addSongToPlaylist(params) { - return this._post(`radio/playlists/add_to_playlist`, {}, params) + static addSongToPlaylist(id) { + // return this._post(`radio/playlists/add_to_playlist`, {}, params) + return this._post(`radio/playlists/${id}/add_to_playlist`, {}, {}) .then((data) => { return data; }) @@ -168,8 +175,9 @@ export default class extends REST { throw new RESTError(error, 'Ошибка при получении плейлистов'); }); } - static removeSongToPlaylist(params) { - return this._post(`radio/playlists/delete_song_with_playlist`, {}, params) + static removeSongToPlaylist(id) { + // return this._post(`radio/playlists/delete_song_with_playlist`, {}, params) + return this._post(`radio/playlists/${id}/delete_song_with_playlist`, {}, {}) .then((data) => { return data; }) @@ -177,8 +185,9 @@ export default class extends REST { throw new RESTError(error, 'Ошибка при удаления треков из плейлиста'); }); } - static updatePlaylist(params) { - return this._post(`radio/playlists/update_playlist`, {}, params) + static updatePlaylist(id) { + // return this._post(`radio/playlists/update_playlist`, {}, params) + return this._post(`radio/playlists/${id}/update_playlist`, {}, {}) .then((data) => { return data; })