feat: song list xsmall view

This commit is contained in:
Deluan
2020-02-05 18:16:00 -05:00
parent cc229dcee6
commit c57007db52
3 changed files with 36 additions and 20 deletions
+2 -5
View File
@@ -3,7 +3,7 @@ import { useDispatch, useSelector } from 'react-redux'
import { fetchUtils, useAuthState, useDataProvider } from 'react-admin'
import ReactJkMusicPlayer from 'react-jinke-music-player'
import 'react-jinke-music-player/assets/index.css'
import { markScrobbled, syncQueue } from './queue'
import { scrobble, syncQueue } from './queue'
const defaultOptions = {
bounds: 'body',
@@ -55,7 +55,7 @@ const Player = () => {
}
const item = queue.queue.find((item) => item.id === info.id)
if (item && !item.scrobbled) {
dispatch(markScrobbled(info.id, true))
dispatch(scrobble(info.id))
fetchUtils.fetchJson(
`/rest/scrobble?u=admin&p=enc:73756e6461&f=json&v=1.8.0&c=NavidromeUI&id=${info.id}&submission=true`
)
@@ -63,13 +63,10 @@ const Player = () => {
}
const OnAudioPlay = (info) => {
console.log('AUDIOPLAY: ', info)
if (info.duration) {
dispatch(markScrobbled(info.id, false))
fetchUtils.fetchJson(
`/rest/scrobble?u=admin&p=enc:73756e6461&f=json&v=1.8.0&c=NavidromeUI&id=${info.id}&submission=false`
)
//
dataProvider.getOne('keepalive', { id: info.id })
}
}
+4 -4
View File
@@ -30,9 +30,9 @@ const syncQueue = (data) => ({
data
})
const markScrobbled = (id, submission = false) => ({
const scrobble = (id) => ({
type: PLAYER_SCROBBLE,
data: { id, submission }
data: id
})
const playQueueReducer = (
@@ -52,7 +52,7 @@ const playQueueReducer = (
const newQueue = previousState.queue.map((item) => {
return {
...item,
scrobbled: item.scrobbled || (item.id === data.id && data.submission)
scrobbled: item.scrobbled || (item.id === data)
}
})
return { queue: newQueue, clear: false }
@@ -61,4 +61,4 @@ const playQueueReducer = (
}
}
export { addTrack, setTrack, syncQueue, markScrobbled, playQueueReducer }
export { addTrack, setTrack, syncQueue, scrobble, playQueueReducer }