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

All URILink and LinksSentences now define URI type

Browse Source
This commit is contained in:
James Barnsley
2021-01-09 22:52:45 +13:00
parent 67889670a1
commit a8c6b8b9e6
22 changed files with 152 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/js/views/Queue.js
View File

@ -42,7 +42,7 @@ const Artwork = ({
<Link to="/kiosk-mode" className="thumbnail__actions__item">
<Icon name="expand" type="fontawesome" />
</Link>
<URILink uri={album_uri} className="thumbnail__actions__item">
<URILink type="album" uri={album_uri} className="thumbnail__actions__item">
<Icon name="album" />
</URILink>
</Thumbnail>
@ -176,6 +176,7 @@ class Queue extends React.Component {
{addedFromItems[0].images && (
<URILink
uri={addedFromItems[0].uri}
type={addedFromItems[0].type}
className="current-track__added-from__thumbnail"
>
<Thumbnail
@ -188,7 +189,10 @@ class Queue extends React.Component {
)}
<div className="current-track__added-from__text">
{'Playing from '}
<LinksSentence items={addedFromItems} />
<LinksSentence
items={addedFromItems}
type={addedFromItems[0].type}
/>
{uri_type === 'radio' && (
<span className="flag flag--blue">
{i18n('now_playing.current_track.radio')}
@ -270,15 +274,10 @@ class Queue extends React.Component {
{!stream_title && !current_track && (<span>-</span>)}
</div>
{
(current_track && current_track.artists && (
<LinksSentence
className="current-track__artists"
items={current_track.artists}
/>
))
|| <LinksSentence className="current-track__artists" />
}
<LinksSentence
className="current-track__artists"
items={current_track ? current_track.artists : null}
/>
{this.renderAddedFrom()}