secstate/Iris
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merging track library with history, fixes #285

Browse Source
This commit is contained in:
James Barnsley
2018-06-09 17:41:33 +12:00
parent 31a5577d5c
commit cd5908630c
11 changed files with 169 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/js/components/Track.js
View File

@ -196,21 +196,27 @@ export default class Track extends React.Component{
let track_columns = [];
let track_actions = [];
if (track.type == 'history'){
if (this.props.context == 'history'){
track_columns.push(
<span className="col name" key="name">
{track.name ? track.name : <span className="uri-placeholder grey-text">{track.uri}</span>}
{track.name ? track.name : <span className="grey-text">{track.uri}</span>}
{track.explicit ? <span className="flag dark">EXPLICIT</span> : null}
</span>
)
track_columns.push(
<span className="col source" key="source">
{helpers.uriSource(track.uri)}
<span className="col artists" key="artists">
{track.artists ? <ArtistSentence artists={track.artists} /> : '-'}
</span>
)
track_columns.push(
<span className="col album" key="album">
{album}
</span>
)
track_columns.push(
<span className="col played_at" key="played_at">
{track.played_at ? <span><Dater type="ago" data={track.played_at} /> ago</span> : null}
{track.played_at ? <span><Dater type="ago" data={track.played_at} /> ago</span> : '-'}
</span>
)