diff --git a/mopidy_iris/static/.htaccess b/mopidy_iris/static/.htaccess index d27b7e9a..e44f19be 100755 --- a/mopidy_iris/static/.htaccess +++ b/mopidy_iris/static/.htaccess @@ -6,6 +6,10 @@ RewriteBase / # TODO: Look to move this into the Thumbnail component RewriteRule ^images/(.*)$ http://%{HTTP_HOST}:6680/images/$1 [NC,L] +# Rewrite /iris subfolder +RewriteRule ^iris/(.*)$ /$1 [NC,L] + +# All nont-file requests go to React RewriteCond %{REQUEST_FILENAME} !-f RewriteCond %{REQUEST_FILENAME} !-d RewriteRule . /index.html [L] diff --git a/src/.htaccess b/src/.htaccess index d27b7e9a..aeead89e 100755 --- a/src/.htaccess +++ b/src/.htaccess @@ -1,6 +1,6 @@ RewriteEngine On -RewriteBase / +RewriteBase /iris/ # Handle Mopidy-Images requests # TODO: Look to move this into the Thumbnail component diff --git a/src/index.html b/src/index.html index 896d3387..2a509960 100755 --- a/src/index.html +++ b/src/index.html @@ -13,8 +13,8 @@ - - + + @@ -25,6 +25,6 @@ - + \ No newline at end of file diff --git a/src/js/components/AlbumGrid.js b/src/js/components/AlbumGrid.js index ebb3bd7c..a981989d 100755 --- a/src/js/components/AlbumGrid.js +++ b/src/js/components/AlbumGrid.js @@ -17,7 +17,7 @@ export default class AlbumGrid extends React.Component{ { this.props.albums.map( (album, index) => { - return + return } ) } diff --git a/src/js/components/ArtistGrid.js b/src/js/components/ArtistGrid.js index a5fdc8fb..7dc83808 100755 --- a/src/js/components/ArtistGrid.js +++ b/src/js/components/ArtistGrid.js @@ -17,7 +17,7 @@ export default class ArtistGrid extends React.Component{ { this.props.artists.map( (artist, index) => { - return + return } ) } diff --git a/src/js/components/ArtistList.js b/src/js/components/ArtistList.js index d9168f55..babaa2cb 100755 --- a/src/js/components/ArtistList.js +++ b/src/js/components/ArtistList.js @@ -18,7 +18,7 @@ export default class ArtistList extends React.Component{ this.props.artists.map( (artist, index) => { if( artist.uri ){ return ( - + { artist.name } diff --git a/src/js/components/ArtistSentence.js b/src/js/components/ArtistSentence.js index 174a3e2e..dfe527c6 100755 --- a/src/js/components/ArtistSentence.js +++ b/src/js/components/ArtistSentence.js @@ -24,7 +24,7 @@ export default class ArtistSentence extends React.Component{ } if( !artist.name ) artist.name = '-' if( artist.uri ){ - var content = { artist.name } + var content = { artist.name } }else{ var content = { artist.name } } diff --git a/src/js/components/CategoryGrid.js b/src/js/components/CategoryGrid.js index b27a444e..b4a92770 100755 --- a/src/js/components/CategoryGrid.js +++ b/src/js/components/CategoryGrid.js @@ -18,7 +18,7 @@ export default class CategoryGrid extends React.Component{ { this.props.categories.map( (category, index) => { - return + return } ) } diff --git a/src/js/components/ContextMenu.js b/src/js/components/ContextMenu.js index 8117ac95..59a893ab 100755 --- a/src/js/components/ContextMenu.js +++ b/src/js/components/ContextMenu.js @@ -228,9 +228,7 @@ class ContextMenu extends React.Component{ var items = this.getItems(trigger) var height = 0 - if (items) height = items.length * 34 - - console.log(style.top, height) + if (items) height = items.length * 34 // this is an approximation of how tall each menu item is if (this.props.context_menu.position_x > (window.innerWidth - 154)) className += ' right-align' if (this.props.context_menu.position_x > (window.innerWidth - 308)) className += ' right-align-submenu' diff --git a/src/js/components/List.js b/src/js/components/List.js index 07c2d298..78707a9f 100755 --- a/src/js/components/List.js +++ b/src/js/components/List.js @@ -49,7 +49,7 @@ export default class List extends React.Component{ } } - if (key_string === 'owner') return {value.id} + if (key_string === 'owner') return {value.id} if (key[0] === 'artists') return if (value === true) return if (typeof(value) === 'number') return {value.toLocaleString()} diff --git a/src/js/components/PlaylistGrid.js b/src/js/components/PlaylistGrid.js index f2dc2310..f8d703c3 100755 --- a/src/js/components/PlaylistGrid.js +++ b/src/js/components/PlaylistGrid.js @@ -18,7 +18,7 @@ export default class PlaylistGrid extends React.Component{ { this.props.playlists.map( (playlist, index) => { - return + return } ) } diff --git a/src/js/components/PlaylistListItem.js b/src/js/components/PlaylistListItem.js index c5d7cb6e..f9639176 100755 --- a/src/js/components/PlaylistListItem.js +++ b/src/js/components/PlaylistListItem.js @@ -15,7 +15,7 @@ export default class PlaylistListItem extends React.Component{ renderOwner(){ if( !this.props.item.owner ) return null; return ( - + { this.props.item.owner.id } ); @@ -25,7 +25,7 @@ export default class PlaylistListItem extends React.Component{ if( !this.props.item ) return null return ( - + {this.props.item.name} diff --git a/src/js/components/SearchForm.js b/src/js/components/SearchForm.js index 46790630..0099b816 100755 --- a/src/js/components/SearchForm.js +++ b/src/js/components/SearchForm.js @@ -20,7 +20,7 @@ class SearchForm extends React.Component{ handleSubmit(e){ e.preventDefault(); - browserHistory.push('/search/'+this.state.query); + browserHistory.push(global.baseURL+'search/'+this.state.query); return false } diff --git a/src/js/components/Sidebar.js b/src/js/components/Sidebar.js index baa766e4..006d1d72 100755 --- a/src/js/components/Sidebar.js +++ b/src/js/components/Sidebar.js @@ -31,7 +31,7 @@ class Sidebar extends React.Component{