diff --git a/src/components/ZoneMusic.vue b/src/components/ZoneMusic.vue
index cdcd688..4a4f062 100644
--- a/src/components/ZoneMusic.vue
+++ b/src/components/ZoneMusic.vue
@@ -2,23 +2,19 @@
-
+
@@ -38,7 +34,7 @@ export default defineComponent({
}
},
setup(_, { emit }) {
- const { isMusicAvailable, withMusic, setWithMusic } = useMusic()
+ const { isMusicAvailable, hasMusic, setHasMusic } = useMusic()
const play = () => {
emit('play')
@@ -48,7 +44,7 @@ export default defineComponent({
emit('pause')
}
- return { isMusicAvailable, withMusic, setWithMusic, play, pause }
+ return { isMusicAvailable, hasMusic, setHasMusic, play, pause }
}
})
diff --git a/src/hooks/useMusic.ts b/src/hooks/useMusic.ts
index 685c986..e886ada 100644
--- a/src/hooks/useMusic.ts
+++ b/src/hooks/useMusic.ts
@@ -5,12 +5,12 @@ import { State, RootActions } from '@/store'
export const useMusic = () => {
const isIOS =
navigator.platform && /iPad|iPhone|iPod/.test(navigator.platform)
- const { withMusic } = useGetters>(['withMusic'])
- const { setWithMusic } = useActions(['setWithMusic'])
+ const { hasMusic } = useGetters>(['hasMusic'])
+ const { setHasMusic } = useActions(['setHasMusic'])
return {
isMusicAvailable: !isIOS,
- withMusic,
- setWithMusic
+ hasMusic,
+ setHasMusic
}
}
diff --git a/src/store/index.ts b/src/store/index.ts
index 401badb..5a6f578 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -6,14 +6,14 @@ Vue.use(Vuex)
export interface State {
interval: number
- withMusic: boolean
+ hasMusic: boolean
dev1: string | null
dev2: string | null
}
export interface RootActions extends ActionTree {
setInterval: (ctx: ActionContext, payload: number) => void
- setWithMusic: (ctx: ActionContext, payload: boolean) => void
+ setHasMusic: (ctx: ActionContext, payload: boolean) => void
setDev1: (ctx: ActionContext, payload: string) => void
setDev2: (ctx: ActionContext, payload: string) => void
}
@@ -31,13 +31,13 @@ const SET_DEV_2 = 'SET_DEV_2'
const store = new Vuex.Store({
state: {
interval: 5,
- withMusic: true,
+ hasMusic: true,
dev1: null,
dev2: null
},
getters: {
interval: ({ interval }) => interval,
- withMusic: ({ withMusic }) => withMusic,
+ hasMusic: ({ hasMusic }) => hasMusic,
dev1: ({ dev1 }) => dev1,
dev2: ({ dev2 }) => dev2
},
@@ -45,8 +45,8 @@ const store = new Vuex.Store({
[SET_INTERVAL](state, interval: number) {
state.interval = interval
},
- [WITH_MUSIC](state, withMusic: boolean) {
- state.withMusic = withMusic
+ [WITH_MUSIC](state, hasMusic: boolean) {
+ state.hasMusic = hasMusic
},
[SET_DEV_1](state, dev1: string) {
state.dev1 = dev1
@@ -61,8 +61,8 @@ const store = new Vuex.Store({
commit(SET_INTERVAL, interval)
}
},
- setWithMusic({ commit }, withMusic: boolean) {
- commit(WITH_MUSIC, withMusic)
+ setHasMusic({ commit }, hasMusic: boolean) {
+ commit(WITH_MUSIC, hasMusic)
},
setDev1({ commit }, dev1: string) {
commit(SET_DEV_1, dev1)