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

Bunched action calls; Library artists and albums

Browse Source
This commit is contained in:
James Barnsley
2017-01-14 22:32:39 +13:00
parent 539748b112
commit ce4c26f18b
9 changed files with 164 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/js/views/library/LibraryAlbums.js
View File

@ -24,16 +24,16 @@ class LibraryAlbums extends React.Component{
}
componentDidMount(){
this.props.spotifyActions.getLibraryAlbums();
if (!this.props.library_albums) this.props.spotifyActions.getLibraryAlbums();
}
loadMore(){
if( !this.props.albums_more ) return
this.props.spotifyActions.getURL( this.props.albums_more, 'SPOTIFY_LIBRARY_ALBUMS_LOADED_MORE' );
if( !this.props.library_albums_more ) return
this.props.spotifyActions.getURL( this.props.library_albums_more, 'SPOTIFY_LIBRARY_ALBUMS_LOADED' );
}
renderView(){
if( !this.props.albums ) return null
renderView(albums){
if (!albums || albums.length <= 0) return null
if( this.props.view == 'list' ){
var columns = [
@ -60,20 +60,20 @@ class LibraryAlbums extends React.Component{
]
return (
<section className="list-wrapper">
<List rows={this.props.albums} columns={columns} link_prefix={global.baseURL+"album/"} />
<List rows={albums} columns={columns} link_prefix={global.baseURL+"album/"} />
</section>
)
}else if( this.props.view == 'thumbnails' ){
return (
<section className="grid-wrapper">
{ this.props.albums ? <AlbumGrid albums={this.props.albums} /> : null }
<AlbumGrid albums={albums} />
</section>
)
}else{
return (
<section className="grid-wrapper albums-detail-subview">
{
this.props.albums.map( album => {
albums.map( album => {
return (
<div className="album" key={album.uri}>
<Link to={global.baseURL+'album/'+album.uri}>
@ -96,6 +96,16 @@ class LibraryAlbums extends React.Component{
}
render(){
var albums = []
if (this.props.library_albums && this.props.albums){
for (var i = 0; i < this.props.library_albums.length; i++){
var uri = this.props.library_albums[i]
if (this.props.albums.hasOwnProperty(uri)){
albums.push(this.props.albums[uri])
}
}
}
var view_options = [
{
@ -119,7 +129,7 @@ class LibraryAlbums extends React.Component{
return (
<div className="view library-albums-view">
<Header icon="cd" title="My albums" actions={actions} />
{ this.renderView() }
{ this.renderView(albums) }
<LazyLoadListener loadMore={ () => this.loadMore() }/>
</div>
);
@ -136,8 +146,9 @@ class LibraryAlbums extends React.Component{
const mapStateToProps = (state, ownProps) => {
return {
view: state.ui.library_albums_view,
albums: state.spotify.library_albums,
albums_more: state.spotify.library_albums_more,
albums: state.ui.albums,
library_albums: state.ui.library_albums,
library_albums_more: state.ui.library_albums_more,
}
}

34
src/js/views/library/LibraryArtists.js
View File

@ -20,19 +20,16 @@ class LibraryArtists extends React.Component{
super(props);
}
// on render
componentDidMount(){
this.props.spotifyActions.getLibraryArtists();
if (!this.props.library_artists) this.props.spotifyActions.getLibraryArtists();
}
loadMore(){
if( !this.props.artists_more ) return
this.props.spotifyActions.getURL( this.props.artists_more, 'SPOTIFY_LIBRARY_ARTISTS_LOADED_MORE' );
if( !this.props.library_artists_more ) return
this.props.spotifyActions.getURL( this.props.library_artists_more, 'SPOTIFY_LIBRARY_ARTISTS_LOADED' );
}
renderView(){
if( !this.props.artists ) return null
renderView(artists){
if( this.props.view == 'list' ){
var columns = [
{
@ -48,13 +45,13 @@ class LibraryArtists extends React.Component{
]
return (
<section className="list-wrapper">
<List rows={this.props.artists} columns={columns} link_prefix={global.baseURL+"artist/"} show_source_icon={true} />
<List rows={artists} columns={columns} link_prefix={global.baseURL+"artist/"} show_source_icon={true} />
</section>
)
}else{
return (
<section className="grid-wrapper">
<ArtistGrid artists={this.props.artists} />
<ArtistGrid artists={artists} />
</section>
)
}
@ -62,6 +59,16 @@ class LibraryArtists extends React.Component{
render(){
var artists = []
if (this.props.library_artists && this.props.artists){
for (var i = 0; i < this.props.library_artists.length; i++){
var uri = this.props.library_artists[i]
if (this.props.artists.hasOwnProperty(uri)){
artists.push(this.props.artists[uri])
}
}
}
var view_options = [
{
value: 'thumbnails',
@ -80,7 +87,7 @@ class LibraryArtists extends React.Component{
return (
<div className="view library-artists-view">
<Header icon="mic" title="My artists" actions={actions} />
{ this.renderView() }
{ this.renderView(artists) }
<LazyLoadListener loadMore={ () => this.loadMore() }/>
</div>
);
@ -96,9 +103,10 @@ class LibraryArtists extends React.Component{
const mapStateToProps = (state, ownProps) => {
return {
view: state.ui.library_artists_view,
artists: state.spotify.library_artists,
artists_more: state.spotify.library_artists_more
artists: state.ui.artists,
library_artists: state.ui.library_artists,
library_artists_more: state.ui.library_artists_more,
view: state.ui.library_artists_view
}
}