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

Artist responsive; playURIs bug; menu reveal

Browse Source
This commit is contained in:
James Barnsley
2016-11-24 08:11:41 +13:00
parent b72ab52004
commit 09e2ff7572
13 changed files with 95 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/js/views/Album.js
View File

@ -12,6 +12,7 @@ import ArtistGrid from '../components/ArtistGrid'
import FollowButton from '../components/FollowButton'
import Dater from '../components/Dater'
import LazyLoadListener from '../components/LazyLoadListener'
import SidebarToggleButton from '../components/SidebarToggleButton'
import * as helpers from '../helpers'
import * as mopidyActions from '../services/mopidy/actions'
@ -69,6 +70,7 @@ class Album extends React.Component{
return (
<div className="view album-view">
<SidebarToggleButton />
<div className="intro">
<Thumbnail size="large" images={ this.props.album.images } />
<ArtistGrid artists={ this.props.album.artists } />

1
src/js/views/App.js
View File

@ -114,7 +114,6 @@ class App extends React.Component{
<div className={className}>
<Sidebar />
<main>
<SidebarToggleButton />
{this.props.children}
</main>
<ContextMenu state={this.props.context_menu} />

11
src/js/views/Artist.js
View File

@ -13,6 +13,7 @@ import Parallax from '../components/Parallax'
import ArtistList from '../components/ArtistList'
import ArtistGrid from '../components/ArtistGrid'
import FollowButton from '../components/FollowButton'
import SidebarToggleButton from '../components/SidebarToggleButton'
import * as helpers from '../helpers'
import * as mopidyActions from '../services/mopidy/actions'
@ -81,7 +82,7 @@ class Artist extends React.Component{
if( this.state.sub_view == 'related_artists' ){
return (
<div>
<div className="body related-artists">
<h4 className="left-padding">Related artists</h4>
<section className="grid-wrapper no-top-padding">
{ this.props.artist.related_artists ? <ArtistGrid artists={ this.props.artist.related_artists } /> : null }
@ -90,7 +91,7 @@ class Artist extends React.Component{
)
}else if( this.state.sub_view == 'biography' ){
return (
<div>
<div className="body biography">
<h4 className="left-padding">Biography</h4>
<section className="text-wrapper no-top-padding">
<p>Biography here</p>
@ -101,7 +102,7 @@ class Artist extends React.Component{
// default body
return (
<div>
<div className="body overview">
<div className="col w70">
<h4 className="left-padding">Top tracks</h4>
{ this.props.artist.tracks ? <TrackList tracks={ this.props.artist.tracks } /> : null }
@ -109,7 +110,7 @@ class Artist extends React.Component{
<div className="col w5"></div>
<div className="col w25">
<div className="col w25 related-artists">
<h4>Related artists</h4>
{ this.props.artist.related_artists ? <ArtistList artists={ this.props.artist.related_artists.slice(0,6) } /> : null }
</div>
@ -135,6 +136,8 @@ class Artist extends React.Component{
return (
<div className="view artist-view">
<SidebarToggleButton />
<div className="intro">
<Thumbnail size="huge" images={ images } />

4
src/js/views/Playlist.js
View File

@ -11,6 +11,7 @@ import Dater from '../components/Dater'
import ConfirmationButton from '../components/ConfirmationButton'
import LazyLoadListener from '../components/LazyLoadListener'
import FollowButton from '../components/FollowButton'
import SidebarToggleButton from '../components/SidebarToggleButton'
import * as helpers from '../helpers'
import * as uiActions from '../services/ui/actions'
@ -130,6 +131,9 @@ class Playlist extends React.Component{
return (
<div className="view playlist-view">
<SidebarToggleButton />
<div className="intro">
<Thumbnail size="large" images={ this.props.playlist.images } />