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

Not requiring spotipy; Moving core into new service

Browse Source
This commit is contained in:
James Barnsley
2017-08-02 10:53:30 +12:00
parent fc4780deb4
commit 0c134459ea
38 changed files with 1309 additions and 1274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -219,13 +219,13 @@ class LibraryAlbums extends React.Component{
const mapStateToProps = (state, ownProps) => {
return {
load_queue: state.ui.load_queue,
albums: state.core.albums,
view: state.ui.library_albums_view,
albums: state.ui.albums,
sort: (state.ui.library_albums_sort ? state.ui.library_albums_sort : 'name'),
sort_reverse: (state.ui.library_albums_sort_reverse ? true : false),
library_albums: state.ui.library_albums,
library_albums_started: state.ui.library_albums_started,
library_albums_more: state.ui.library_albums_more
library_albums: state.core.library_albums,
library_albums_started: state.core.library_albums_started,
library_albums_more: state.core.library_albums_more
}
}

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

@ -168,14 +168,14 @@ class LibraryArtists extends React.Component{
const mapStateToProps = (state, ownProps) => {
return {
load_queue: state.ui.load_queue,
artists: state.ui.artists,
artists: state.core.artists,
library_artists: state.core.library_artists,
library_artists_started: state.core.library_artists_started,
library_artists_more: state.core.library_artists_more,
library_artists_started: state.core.library_artists_started,
sort: (state.ui.library_artists_sort ? state.ui.library_artists_sort : 'name'),
sort_reverse: (state.ui.library_artists_sort_reverse ? true : false),
library_artists: state.ui.library_artists,
library_artists_started: state.ui.library_artists_started,
library_artists_more: state.ui.library_artists_more,
library_artists_started: state.ui.library_artists_started,
view: state.ui.library_artists_view
view: state.core.library_artists_view
}
}

4
src/js/views/library/LibraryLocalAlbums.js
View File

@ -184,8 +184,8 @@ const mapStateToProps = (state, ownProps) => {
return {
load_queue: state.ui.load_queue,
mopidy_connected: state.mopidy.connected,
albums: state.ui.albums,
local_albums: state.ui.local_albums,
albums: state.core.albums,
local_albums: state.core.local_albums,
view: state.ui.library_local_albums_view,
sort: (state.ui.library_local_albums_sort ? state.ui.library_local_albums_sort : 'name'),
sort_reverse: (state.ui.library_local_albums_sort_reverse ? true : false)

4
src/js/views/library/LibraryLocalArtists.js
View File

@ -94,8 +94,8 @@ const mapStateToProps = (state, ownProps) => {
return {
load_queue: state.ui.load_queue,
mopidy_connected: state.mopidy.connected,
local_artists: state.ui.local_artists,
artists: state.ui.artists
local_artists: state.core.local_artists,
artists: state.core.artists
}
}

12
src/js/views/library/LibraryPlaylists.js
View File

@ -231,12 +231,12 @@ const mapStateToProps = (state, ownProps) => {
slim_mode: state.ui.slim_mode,
load_queue: state.ui.load_queue,
me_id: (state.spotify.me ? state.spotify.me.id : (state.ui.config && state.ui.config.spotify_username ? state.ui.config.spotify_username : false)),
view: state.ui.library_playlists_view,
filter: (state.ui.library_playlists_filter ? state.ui.library_playlists_filter : 'all'),
sort: (state.ui.library_playlists_sort ? state.ui.library_playlists_sort : 'name'),
sort_reverse: (state.ui.library_playlists_sort_reverse ? true : false),
library_playlists: state.ui.library_playlists,
playlists: state.ui.playlists
view: state.core.library_playlists_view,
filter: (state.core.library_playlists_filter ? state.core.library_playlists_filter : 'all'),
sort: (state.core.library_playlists_sort ? state.core.library_playlists_sort : 'name'),
sort_reverse: (state.core.library_playlists_sort_reverse ? true : false),
library_playlists: state.core.library_playlists,
playlists: state.core.playlists
}
}