From 3d294096f8c760e3a008ec560de7294b9f8375a8 Mon Sep 17 00:00:00 2001
From: Norbaev <timnrbv@gmail.com>
Date: Tue, 2 Jul 2024 18:02:41 +0500
Subject: [PATCH] =?UTF-8?q?=D0=BE=D1=82=D0=BA=D1=80=D1=8B=D1=82=D0=B8?=
 =?UTF-8?q?=D0=B5=20=D0=BC=D0=BE=D0=B4=D0=B0=D0=BB=D1=8C=D0=BD=D0=BE=D0=B3?=
 =?UTF-8?q?=D0=BE=20=D0=BE=D0=BA=D0=BD=D0=B0=20=D0=BF=D1=80=D0=B8=20=D0=BF?=
 =?UTF-8?q?=D0=BE=D0=BF=D1=8B=D1=82=D0=BA=D0=B5=20=D0=BF=D0=B5=D1=80=D0=B5?=
 =?UTF-8?q?=D0=BA=D0=BB=D1=8E=D1=87=D0=B8=D1=82=D1=8C=D1=81=D1=8F=20=D0=BD?=
 =?UTF-8?q?=D0=B0=20=D0=BF=D0=BB=D0=B5=D0=B9=D0=BB=D0=B8=D1=81=D1=82=20-?=
 =?UTF-8?q?=20=D0=BF=D1=80=D0=B8=20=D1=83=D0=BB=D0=BE=D0=B2=D0=B8=D0=B8=20?=
 =?UTF-8?q?=D0=BE=D1=82=D1=81=D1=83=D1=82=D1=81=D1=82=D0=B2=D0=B8=D1=8F=20?=
 =?UTF-8?q?=D0=B0=D0=B2=D1=82=D0=BE=D1=80=D0=B8=D0=B7=D0=B0=D1=86=D0=B8?=
 =?UTF-8?q?=D0=B8=20=D0=B8=20=D0=BF=D0=BB=D0=B5=D0=B9=D0=BB=D0=B8=D1=81?=
 =?UTF-8?q?=D1=82=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/src/boot/main.js                 |  2 +-
 client/src/components/inputs/toggle.vue |  1 +
 client/src/components/player.vue        | 34 ++++++++++++-------------
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/client/src/boot/main.js b/client/src/boot/main.js
index 822cfb2..50fa759 100644
--- a/client/src/boot/main.js
+++ b/client/src/boot/main.js
@@ -73,7 +73,7 @@ export default boot(async ({ app, router }) => {
       }),
       toggle: createInput(toggle, {
         props: ['placeholder', 'disabled', 'readonly'],
-        emits: ['toggle'],
+        // emits: ['toggle', 'customEvent'],
       }),
     },
   };
diff --git a/client/src/components/inputs/toggle.vue b/client/src/components/inputs/toggle.vue
index a3757a3..ac5c269 100644
--- a/client/src/components/inputs/toggle.vue
+++ b/client/src/components/inputs/toggle.vue
@@ -17,6 +17,7 @@
 import { defineProps, ref, onUpdated, computed } from 'vue';
 
 export default {
+  name: 'toggle',
   props: {
     context: {
       type: Object,
diff --git a/client/src/components/player.vue b/client/src/components/player.vue
index 5408c4e..888b953 100644
--- a/client/src/components/player.vue
+++ b/client/src/components/player.vue
@@ -46,14 +46,15 @@
         </template>
         <div class="player__tools">
           <q-skeleton v-if="loaderPlay" class="player__tools m--skeleton" />
-          <FormKit
-            v-else
-            @click="toggleMyMusic"
-            v-model="isUserMusic"
-            type="toggle"
-            label="Включить мою музыку"
-            :disabled="!user?.id || userSongList.length === 0"
-          />
+          <div v-else @click="toggleMyMusic">
+            <FormKit
+              v-model="isUserMusic"
+              type="toggle"
+              label="Включить мою музыку"
+              :disabled="!user?.id || userSongList.length === 0"
+            />
+          </div>
+
           <q-skeleton v-if="loaderPlay" class="player__tools m--skeleton" />
           <div v-else class="player__volume">
             <span
@@ -112,9 +113,9 @@ export default {
       isPlayRadio: false,
       connection: null,
       isUserMusic: !this.$store.state.currentPlay.live,
+      bolTemp: true, // Заглушка для теста
       songVolume: 0.5,
-      // Локальное значение для хранения громкости перед toggleVolume
-      preToggleVol: null,
+      preToggleVol: null, // Локальное значение для хранения громкости перед toggleVolume
       playerInfo: {
         progress: 0,
         currentTime: 0,
@@ -246,7 +247,7 @@ export default {
         // Первый ответ
         jsonData?.connect?.subs?.['station:it-radio']?.publications?.[0]?.data;
       // console.log('getPlaying', data);
-      console.log(data);
+      // console.log(data);
 
       if (!data) return;
       if (this.currentPlay.live) {
@@ -254,7 +255,7 @@ export default {
         const dataUrl = data.np.station.listen_url;
         // Объект с данными музыки
         const dataSong = data.np.now_playing.song;
-        console.log(dataSong);
+        // console.log(dataSong);
         const playerUrl = this.player.target.src;
         if (dataUrl !== playerUrl) {
           // console.log('data.np.station.listen_url', dataUrl);
@@ -380,6 +381,10 @@ export default {
         this.$store.dispatch('handlerPlayer', { volume: this.songVolume });
       }
     },
+    toggleMyMusic(e) {
+      if (this.user?.id) return;
+      this.$store.dispatch('setModal', { auth: true });
+    },
   },
   getAudio(id) {
     app
@@ -442,10 +447,5 @@ export default {
     if (!paddedSeconds) paddedSeconds = '00';
     return `${paddedMinutes}:${paddedSeconds}`;
   },
-  toggleMyMusic() {
-    console.log('toggleMyMusic');
-    if (this.user.id) return;
-    this.$store.dispatch('setModal', { auth: true });
-  },
 };
 </script>