Students
/
ITRadio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of git.flexites.org:Students/ITRadio

This commit is contained in:
Mike0001-droid 2024-07-03 17:57:57 +05:00
parent c7d54cbbfd 838c14a4ff
commit 1cb37882bf
4 changed files with 47 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
client/src/components/player.vue
View File

@ -35,7 +35,7 @@
</template>
</span>
</div>
<template v-if="user?.id">
<div @click="handleAuthRequired">
<q-skeleton v-if="loaderPlay" class="player__favorites m--skeleton" />
<div
v-else
@ -43,10 +43,10 @@
:class="[isFavorites && 'm--active']"
@click="handlerFavorites"
></div>
</template>
</div>
<div class="player__tools">
<q-skeleton v-if="loaderPlay" class="player__tools m--skeleton" />
<div v-else @click="toggleMyMusic">
<div v-else @click="handleAuthRequired">
<FormKit
v-model="isUserMusic"
type="toggle"
@ -271,8 +271,7 @@ export default {
actionCurrentPlay(song) {
// console.log('actionCurrentPlay', data);
const currentPlay = {
...this.currentPlay,
// Инфа про текущий трек
...this.currentPlay, // Инфа про текущий трек
...song,
// azura_id: song.id,
isLoader: false,
@ -366,14 +365,14 @@ export default {
}
},
changeVolume() {
console.log(this.songVolume);
// console.log(this.songVolume);
this.$store.dispatch('handlerPlayer', { volume: this.songVolume });
},
toggleVolume() {
if (this.songVolume === 0) {
this.songVolume = this.preToggleVol;
// console.log(this.songVolume);
this.$store.dispatch('handlerPlayer', { volume: this.songVolume });
this.$store.dispatch('handlerPlayer', { volume: this.preToggleVol });
} else {
this.preToggleVol = this.songVolume;
this.songVolume = 0.0;
@ -381,7 +380,7 @@ export default {
this.$store.dispatch('handlerPlayer', { volume: this.songVolume });
}
},
toggleMyMusic(e) {
handleAuthRequired(e) {
if (this.user?.id) return;
this.$store.dispatch('setModal', { auth: true });
},

26
client/src/router/index.js
View File

@ -49,15 +49,29 @@ export default route(function (/* { store, ssrContext } */) {
});
Router.beforeEach((to, from, next) => {
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();

2
client/src/router/routes.js
View File

@ -79,7 +79,7 @@ const routes = [
component: profile,
meta: {
title: 'Личный кабинет',
isAuth: false,
isAuth: true,
},
children: [
{

29
client/src/services/app.js
View File

@ -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;
})