|
@@ -7,22 +7,44 @@ import { sortableContainer, sortableElement } from 'react-sortable-hoc';
|
|
|
import { arrayMoveImmutable } from 'array-move';
|
|
|
|
|
|
|
|
|
-const Track = ({ track: { _id, url, originalFileName, id3: { title, artist, album } } }) =>
|
|
|
+const Track = ({ track, audio, setTrack, playTrack, pauseTrack }) =>
|
|
|
<li style={{ border: '1px solid black', display: 'flex', alignItems: 'center' }}>
|
|
|
<div style={{ marginRight: '2%' }}>
|
|
|
- <button style={{ padding: '10px', margin: '2px' }}> {`[>] / [ || ]`} </button>
|
|
|
+ <button
|
|
|
+ style={{ padding: '10px', margin: '2px' }}
|
|
|
+ onClick={()=> {setTrack(track); console.log('treg',track)}}
|
|
|
+ > {`SET`} </button>
|
|
|
+
|
|
|
+ <button
|
|
|
+ style={{ padding: '10px', margin: '2px' }}
|
|
|
+ onClick={()=> {playTrack(audio, track); console.log('playing')}}
|
|
|
+ > {`[>]`} </button>
|
|
|
+
|
|
|
+ <button
|
|
|
+ style={{ padding: '10px', margin: '2px' }}
|
|
|
+ onClick={()=> {pauseTrack(audio, track); console.log('pause')}}
|
|
|
+ > {`[ || ]`} </button>
|
|
|
+
|
|
|
<button style={{ padding: '10px', margin: '2px' }}>+</button>
|
|
|
</div>
|
|
|
<div style={{ textAlign: 'left' }}>
|
|
|
- <h5>{artist || 'Artist: unknown'}</h5>
|
|
|
- <h6>{album || 'Album: unknown'}</h6>
|
|
|
- <h5>{title || originalFileName}</h5>
|
|
|
- <p>{_id}</p>
|
|
|
- <p>{url}</p>
|
|
|
+ <h5>{track.id3.artist || 'Artist: unknown'}</h5>
|
|
|
+ <h6>{track.id3.album || 'Album: unknown'}</h6>
|
|
|
+ <h5>{track.id3.title || track.originalFileName}</h5>
|
|
|
+ <p>{track._id}</p>
|
|
|
+ <p>{track.url}</p>
|
|
|
</div>
|
|
|
</li>
|
|
|
|
|
|
-const SortableItem = sortableElement(Track);
|
|
|
+const TrackConnect = connect(
|
|
|
+ state => ({audio: state.player.track || {}}),
|
|
|
+ {
|
|
|
+ setTrack: action.actionTrackSet,
|
|
|
+ playTrack: action.actionTrackPlay,
|
|
|
+ pauseTrack: action.actionTrackPause
|
|
|
+ })(Track)
|
|
|
+
|
|
|
+const SortableItem = sortableElement(TrackConnect);
|
|
|
|
|
|
const SortableContainer = sortableContainer(({ children }) => {
|
|
|
return <ul>{children}</ul>;
|