From 838c14a4fff9a242c920e6d969768ddd822dab35 Mon Sep 17 00:00:00 2001
From: Norbaev <timnrbv@gmail.com>
Date: Wed, 3 Jul 2024 17:50:21 +0500
Subject: [PATCH] =?UTF-8?q?=D1=80=D0=BE=D1=83=D1=82=D1=8B=20=D0=B4=D0=BB?=
 =?UTF-8?q?=D1=8F=20=D0=B0=D0=B2=D1=82=D0=BE=D1=80=D0=B8=D0=B7=D0=BE=D0=B2?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7?=
 =?UTF-8?q?=D0=BE=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D0=B5=D0=B9=20=D0=B1=D0=BE?=
 =?UTF-8?q?=D0=BB=D1=8C=D1=88=D0=B5=20=D0=BD=D0=B5=20=D0=B4=D0=BE=D1=81?=
 =?UTF-8?q?=D1=82=D1=83=D0=BF=D1=8B=20=D0=B1=D0=B5=D0=B7=20=D0=B0=D0=B2?=
 =?UTF-8?q?=D1=82=D0=BE=D1=80=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/components/player.vue | 12 ++++++------
 client/src/router/index.js       | 26 ++++++++++++++++++++------
 client/src/router/routes.js      |  2 +-
 3 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/client/src/components/player.vue b/client/src/components/player.vue
index 30474a8..e3b2d9d 100644
--- a/client/src/components/player.vue
+++ b/client/src/components/player.vue
@@ -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"
@@ -365,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;
@@ -380,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 });
     },
diff --git a/client/src/router/index.js b/client/src/router/index.js
index 13e852c..961566d 100644
--- a/client/src/router/index.js
+++ b/client/src/router/index.js
@@ -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();
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: [
       {