add vuex store for player state

This commit is contained in:
Jonas Heinrich 2020-10-23 17:49:24 +02:00
parent cba38a1250
commit 6f433a6f1a
6 changed files with 62 additions and 14 deletions

5
package-lock.json generated
View File

@ -11410,6 +11410,11 @@
"date-format-parse": "^0.2.5" "date-format-parse": "^0.2.5"
} }
}, },
"vuex": {
"version": "3.5.1",
"resolved": "https://registry.npmjs.org/vuex/-/vuex-3.5.1.tgz",
"integrity": "sha512-w7oJzmHQs0FM9LXodfskhw9wgKBiaB+totOdb8sNzbTB2KDCEEwEs29NzBZFh/lmEK1t5tDmM1vtsO7ubG1DFw=="
},
"watchpack": { "watchpack": {
"version": "1.7.4", "version": "1.7.4",
"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.4.tgz", "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.7.4.tgz",

View File

@ -39,7 +39,8 @@
"jquery": "^3.5.1", "jquery": "^3.5.1",
"music-metadata": "^7.4.1", "music-metadata": "^7.4.1",
"vue": "^2.6.12", "vue": "^2.6.12",
"vue-router": "^3.4.7" "vue-router": "^3.4.7",
"vuex": "^3.5.1"
}, },
"browserslist": [ "browserslist": [
"extends @nextcloud/browserslist-config" "extends @nextcloud/browserslist-config"

View File

@ -1,7 +1,6 @@
<template> <template>
<Content app-name="radio"> <Content app-name="radio">
<Navigation <Navigation @changeVolume="changeVolume" />
@changeVolume="changeVolume" />
<AppContent> <AppContent>
<Breadcrumbs class="breadcrumbs"> <Breadcrumbs class="breadcrumbs">
<Breadcrumb title="Home" href="/" /> <Breadcrumb title="Home" href="/" />
@ -10,12 +9,12 @@
href="/Top" /> href="/Top" />
</Breadcrumbs> </Breadcrumbs>
<Table <Table
v-if="!loading" v-if="!pageLoading"
:station-data="tableData" :station-data="tableData"
@doPlay="doPlay" @doPlay="doPlay"
@doFavor="doFavor" /> @doFavor="doFavor" />
<EmptyContent <EmptyContent
v-if="loading" v-if="pageLoading"
icon="icon-loading" /> icon="icon-loading" />
</AppContent> </AppContent>
</Content> </Content>
@ -34,6 +33,7 @@ import { Howl } from 'howler'
import { generateUrl } from '@nextcloud/router' import { generateUrl } from '@nextcloud/router'
import { showError } from '@nextcloud/dialogs' import { showError } from '@nextcloud/dialogs'
import axios from '@nextcloud/axios' import axios from '@nextcloud/axios'
import store from '../store'
let audioPlayer = null let audioPlayer = null
@ -51,8 +51,15 @@ export default {
data: () => ({ data: () => ({
tableData: [], tableData: [],
offset: 0, offset: 0,
loading: false, pageLoading: false,
}), }),
provide: {
player: {
isPlaying: false,
isBuffering: false,
volume: 0,
},
},
watch: { watch: {
$route: 'onRoute', $route: 'onRoute',
}, },
@ -102,6 +109,8 @@ export default {
* @param {Object} station Station object * @param {Object} station Station object
*/ */
doPlay(station) { doPlay(station) {
this.player.isPlaying = true
if (audioPlayer !== null) { if (audioPlayer !== null) {
audioPlayer.fade(1, 0, 500) // FIXME persistent volume state audioPlayer.fade(1, 0, 500) // FIXME persistent volume state
// FIXME fade out // FIXME fade out
@ -118,12 +127,23 @@ export default {
this.unload() this.unload()
} }
}, },
onplay() {
store.player.isPlaying = true
store.player.isBuffering = false
},
onpause() {
store.player.isPlaying = false
store.player.isBuffering = false
},
onload() {
store.player.isBuffering = true
},
}) })
audioPlayer.play() audioPlayer.play()
audioPlayer.fade(0.1, 1, 500) // FIXME persistent volume state audioPlayer.fade(0.1, 1, 500) // FIXME persistent volume state
const stationMetadata = document.getElementById('stationMetadata') /* const stationMetadata = document.getElementById('stationMetadata')
stationMetadata.textContent = station.name stationMetadata.textContent = station.name */
}, },
/** /**
* Fetching radio stations using Radio-Browser.info API * Fetching radio stations using Radio-Browser.info API
@ -132,7 +152,7 @@ export default {
// FIXME https://de1.api.radio-browser.info/json/stations/lastchange?limit=10 // FIXME https://de1.api.radio-browser.info/json/stations/lastchange?limit=10
const vm = this const vm = this
if (vm.offset === 0) { if (vm.offset === 0) {
vm.loading = true vm.pageLoading = true
} }
this.$jquery.getJSON('https://de1.api.radio-browser.info/json/stations', this.$jquery.getJSON('https://de1.api.radio-browser.info/json/stations',
{ {
@ -143,7 +163,7 @@ export default {
'User-Agent': 'Nextcloud Radio/1.0.0', // FIXME global version, doesnt seem to work 'User-Agent': 'Nextcloud Radio/1.0.0', // FIXME global version, doesnt seem to work
}) })
.done(function(data) { .done(function(data) {
vm.loading = false vm.pageLoading = false
vm.tableData = vm.tableData.concat(data) vm.tableData = vm.tableData.concat(data)
vm.offset += 20 vm.offset += 20
}) })

View File

@ -2,10 +2,10 @@
<div id="app-settings"> <div id="app-settings">
<div <div
class="wrap" class="wrap"
:class="{ buffering: isBuffering }"> :class="{ buffering: player.isBuffering }">
<button <button
class="player" class="player"
:class="isPlaying ? 'pause' : 'play'" /> :class="player.isPlaying ? 'pause' : 'play'" />
</div> </div>
<div id="volumeicon" class="full" /> <div id="volumeicon" class="full" />
<input <input
@ -16,17 +16,19 @@
min="0" min="0"
max="1" max="1"
step=".05" step=".05"
value="this.volume"
@input="changeVolume"> @input="changeVolume">
<span class="stationMetadata" /> <span class="stationMetadata" />
{{ player.isPlaying }}
</div> </div>
</template> </template>
<script> <script>
export default { export default {
data: () => ({ data: () => ({
isPlaying: true, sliderVal: 0,
isBuffering: true,
}), }),
inject: ['player'],
methods: { methods: {
changeVolume() { changeVolume() {
this.$emit('changeVolume', this.sliderVal) this.$emit('changeVolume', this.sliderVal)

View File

@ -21,6 +21,7 @@
*/ */
import Vue from 'vue' import Vue from 'vue'
import router from './router' import router from './router'
import store from './store'
import { translate, translatePlural } from '@nextcloud/l10n' import { translate, translatePlural } from '@nextcloud/l10n'
@ -34,6 +35,7 @@ Vue.prototype.$jquery = jquery
export default new Vue({ export default new Vue({
el: '#content', el: '#content',
store,
router, router,
render: h => h(App), render: h => h(App),
}) })

18
src/store.js Normal file
View File

@ -0,0 +1,18 @@
import Vue from 'vue'
import Vuex from 'vuex'
Vue.use(Vuex)
export default new Vuex.Store({
player: {
isPlaying: false,
isBuffering: false,
volume: 0,
count: 0,
},
mutations: {
increment(player) {
player.count++
},
},
strict: true,
})