From 21481aca98559a1955843aeec799669f87a16935 Mon Sep 17 00:00:00 2001 From: Norbaev Date: Thu, 27 Jun 2024 10:30:37 +0500 Subject: [PATCH 1/4] =?UTF-8?q?=D0=BF=D0=BE=D0=BB=D1=83=D1=87=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20=D0=BE=20?= =?UTF-8?q?=D1=82=D1=80=D0=B5=D0=BA=D0=B5=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B4?= =?UTF-8?q?=20=D0=BF=D0=BE=D0=B4=D0=BA=D0=BB=D1=8E=D1=87=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=D0=BC=20=D1=81=D1=82=D1=80=D0=B8=D0=BC=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/src/components/player.vue | 11 +++++++++-- client/src/services/audio.js | 4 ++-- client/src/settings/index.js | 1 - client/src/store/index.js | 2 ++ 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/client/src/components/player.vue b/client/src/components/player.vue index 709e1bf..6749bc8 100644 --- a/client/src/components/player.vue +++ b/client/src/components/player.vue @@ -157,10 +157,11 @@ export default { }, created() { this.connectionPlayer(); + this.initializationInfo(); }, mounted() { - this.initializationInfo(); this.$store.dispatch('initPlayer'); + // console.log(this.$store.state); if (this.user?.id) { this.checkSongIsFavorite(); this.getSongList(); @@ -189,8 +190,13 @@ export default { }, methods: { async initializationInfo() { - return app.getNowplaying().then((responce) => responce.now_playing.song); + return app.getNowplaying().then((responce) => { + console.log(responce.now_playing.song); + this.$store.dispatch('setCurrentPlay', responce.now_playing.song); + console.log(this.$store.state); + }); }, + connectionPlayer() { if (this.connection) { this.connection.removePlay(); @@ -241,6 +247,7 @@ export default { }; delete params.unique_id; this.$store.dispatch('setCurrentPlay', params); + console.log(this.$store.state); } } } diff --git a/client/src/services/audio.js b/client/src/services/audio.js index ed180db..532793d 100644 --- a/client/src/services/audio.js +++ b/client/src/services/audio.js @@ -57,8 +57,8 @@ export default class extends REST { }; } - onHandler(event) { - this.connection.onmessage = event; + onHandler(callback) { + this.connection.onmessage = callback; } static getPlayList(station, params) { // return this._get(`station/${station}/playlists`, params, {}).then((data) => { diff --git a/client/src/settings/index.js b/client/src/settings/index.js index 705a3fc..39de1f0 100644 --- a/client/src/settings/index.js +++ b/client/src/settings/index.js @@ -41,5 +41,4 @@ const robotsTxt = { }, ], }; -console.log(urlPath); export { selfUrl, ajax, cache, urlPath, urlPathAudio, selfPath, robotsTxt }; diff --git a/client/src/store/index.js b/client/src/store/index.js index 52ed48e..630528b 100644 --- a/client/src/store/index.js +++ b/client/src/store/index.js @@ -62,6 +62,7 @@ export default createStore({ state.player = { ...state.player, ...params }; }, initPlayer(state) { + // console.log('mutation initPlayer', state); state.player.target = document.createElement('audio'); state.player.target.src = ''; state.player.target.preload = 'auto'; @@ -126,6 +127,7 @@ export default createStore({ context.commit('setPlayer', params); }, initPlayer(context) { + // console.log('action initPlayer'); context.commit('initPlayer'); }, handlerPlayer(context, params) { From 23d25d25fabbb7fbb88562fe6dff41f56e286c55 Mon Sep 17 00:00:00 2001 From: Norbaev Date: Thu, 27 Jun 2024 11:10:07 +0500 Subject: [PATCH 2/4] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=20initializationIn?= =?UTF-8?q?fo=20-=20=D0=B7=D0=B0=D0=BF=D0=B8=D1=81=D1=8C=20=D0=BF=D0=BE?= =?UTF-8?q?=D0=BB=D1=8F=20isLoader?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/src/components/player.vue | 23 ++++++++++++++++------- client/src/store/index.js | 1 + 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/client/src/components/player.vue b/client/src/components/player.vue index 6749bc8..d50d9a9 100644 --- a/client/src/components/player.vue +++ b/client/src/components/player.vue @@ -156,8 +156,8 @@ export default { }, }, created() { - this.connectionPlayer(); this.initializationInfo(); + this.connectionPlayer(); }, mounted() { this.$store.dispatch('initPlayer'); @@ -189,12 +189,20 @@ export default { } }, methods: { - async initializationInfo() { - return app.getNowplaying().then((responce) => { - console.log(responce.now_playing.song); - this.$store.dispatch('setCurrentPlay', responce.now_playing.song); - console.log(this.$store.state); - }); + initializationInfo() { + app + .getNowplaying() + .then((responce) => { + console.log(responce.now_playing.song); + this.$store.dispatch('setCurrentPlay', { + ...this.currentPlay, + isLoader: false, + ...responce.now_playing.song, + }); + console.log(this.player.target.src); + // console.log(this.$store.state); + }) + .catch((error) => console.log(error)); }, connectionPlayer() { @@ -237,6 +245,7 @@ export default { data.np.station.listen_url, ); this.$store.dispatch('changePlayer', data.np.station.listen_url); + console.log(this.player); const params = { ...this.currentPlay, ...data.np.now_playing.song, diff --git a/client/src/store/index.js b/client/src/store/index.js index 630528b..b8db9f2 100644 --- a/client/src/store/index.js +++ b/client/src/store/index.js @@ -93,6 +93,7 @@ export default createStore({ state.player.target.pause(); } if (params.play) { + console.log(state); if (state.player.target.readyState >= 3) { state.currentPlay.isPlay = true; state.player.target.play(); From 69122bae1e9d2ecc19c7361d6318c9e20378c910 Mon Sep 17 00:00:00 2001 From: Norbaev Date: Thu, 27 Jun 2024 14:28:36 +0500 Subject: [PATCH 3/4] =?UTF-8?q?getNowplaying=20-=20=D1=84=D0=B8=D0=BA?= =?UTF-8?q?=D1=81=20=D0=B4=D0=B2=D0=BE=D0=B9=D0=BD=D0=BE=D0=B3=D0=BE=20?= =?UTF-8?q?=D1=81=D0=BB=D0=B5=D1=88=20=D0=B2=20=D0=B7=D0=B0=D0=BF=D1=80?= =?UTF-8?q?=D0=BE=D1=81=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/src/services/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/services/app.js b/client/src/services/app.js index f0c3050..8f171ae 100644 --- a/client/src/services/app.js +++ b/client/src/services/app.js @@ -217,7 +217,7 @@ export default class extends REST { } static getNowplaying(station, params) { - return this._get('/radio/song/get_nowplaying/', params, {}) + return this._get('radio/song/get_nowplaying', params, {}) .then((data) => { return data; }) From 81bbe3939b741cf9c541d2261dafce0d90daae24 Mon Sep 17 00:00:00 2001 From: Norbaev Date: Thu, 27 Jun 2024 15:23:03 +0500 Subject: [PATCH 4/4] =?UTF-8?q?=D1=83=D0=B4=D0=B0=D0=BB=D0=B8=D0=BB=20tuga?= =?UTF-8?q?n=20=D0=B8=D0=B7=20quasar.config.js?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- client/quasar.config.js | 8 ++++---- client/src/services/app.js | 2 -- client/src/store/index.js | 4 +--- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/client/quasar.config.js b/client/quasar.config.js index 2817dcb..3937e54 100644 --- a/client/quasar.config.js +++ b/client/quasar.config.js @@ -219,9 +219,9 @@ module.exports = configure(function (ctx) { }, manifest: { - name: 'Tugan App', - short_name: 'Tugan App', - description: 'A Tugan project', + name: 'IT Radio App', + short_name: 'IT Radio App', + description: 'IT Radio project', display: 'standalone', orientation: 'portrait', background_color: '#ffffff', @@ -284,7 +284,7 @@ module.exports = configure(function (ctx) { builder: { // https://www.electron.build/configuration/configuration - appId: 'tugan', + appId: 'it-radio', }, // "chain" is a webpack-chain object https://github.com/neutrinojs/webpack-chain diff --git a/client/src/services/app.js b/client/src/services/app.js index 8f171ae..075289b 100644 --- a/client/src/services/app.js +++ b/client/src/services/app.js @@ -229,5 +229,3 @@ export default class extends REST { }); } } - -// console.log(Django.getNowplaying()); diff --git a/client/src/store/index.js b/client/src/store/index.js index b8db9f2..155b7b6 100644 --- a/client/src/store/index.js +++ b/client/src/store/index.js @@ -39,7 +39,7 @@ export default createStore({ }, }; }, - plugins: [vuexPersist.plugin], + // plugins: [vuexPersist.plugin], mutations: { user(state, user) { state.user = user; @@ -62,7 +62,6 @@ export default createStore({ state.player = { ...state.player, ...params }; }, initPlayer(state) { - // console.log('mutation initPlayer', state); state.player.target = document.createElement('audio'); state.player.target.src = ''; state.player.target.preload = 'auto'; @@ -128,7 +127,6 @@ export default createStore({ context.commit('setPlayer', params); }, initPlayer(context) { - // console.log('action initPlayer'); context.commit('initPlayer'); }, handlerPlayer(context, params) {