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

Default images

Browse Source
This commit is contained in:
James Barnsley
2017-07-07 08:19:47 +12:00
parent b0ac97f940
commit 2cdc024568
8 changed files with 17 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
src/assets/backgrounds/browse-albums.jpg
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 48 KiB

BIN
src/assets/backgrounds/browse-default.jpg Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 52 KiB

BIN
src/assets/backgrounds/browse-tunein.jpg Executable file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 49 KiB

113
src/assets/icons/cd.svg
View File

@ -3,117 +3,12 @@
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
viewBox="0 0 16 16" style="enable-background:new 0 0 16 16;" xml:space="preserve">
<style type="text/css">
.st0{display:none;}
.st1{display:inline;}
.st2{display:inline;stroke:#000000;stroke-width:1.4173;stroke-miterlimit:10;}
.st3{display:inline;fill:none;stroke:#000000;stroke-width:1.4173;stroke-linejoin:round;stroke-miterlimit:10;}
.st4{stroke:#000000;stroke-width:1.4173;stroke-miterlimit:10;}
.st5{fill:none;stroke:#000000;stroke-width:1.4173;stroke-miterlimit:10;}
.st6{display:none;fill:none;stroke:#000000;stroke-width:2.2677;stroke-miterlimit:10;}
.st7{display:none;fill:none;stroke:#000000;stroke-width:2.2677;stroke-linecap:round;stroke-miterlimit:10;}
.st8{display:none;fill:none;stroke:#010101;stroke-width:1.8546;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;}
.st9{display:inline;fill:#010101;stroke:#010101;stroke-width:1.3704;stroke-miterlimit:10;}
.st10{display:inline;fill:none;stroke:#010101;stroke-width:0.8504;stroke-miterlimit:10;}
.st11{display:inline;fill:none;stroke:#010101;stroke-width:1.8546;stroke-miterlimit:10;}
.st12{fill:none;stroke:#000000;stroke-width:0.5669;stroke-miterlimit:10;}
.st0{fill:none;stroke:#000000;stroke-width:1.4173;stroke-miterlimit:10;}
</style>
<g class="st0">
<g class="st1">
<g>
<g>
<path d="M3.9,1.1C3.4,0.8,3.1,1,3.1,1.6v12.7c0,0.6,0.4,0.8,0.8,0.4l9.4-6.2c0.5-0.3,0.5-0.8,0-1.1L3.9,1.1z"/>
</g>
</g>
</g>
</g>
<g class="st0">
<circle class="st1" cx="8" cy="7.9" r="1"/>
<path class="st1" d="M8,0.7c-4,0-7.3,3.2-7.3,7.3c0,4,3.2,7.3,7.3,7.3c4,0,7.2-3.2,7.2-7.3C15.3,3.9,12,0.7,8,0.7z M9.8,9.7L3.9,12
l2.4-5.8l5.8-2.4L9.8,9.7z"/>
</g>
<g class="st0">
<circle class="st2" cx="8.1" cy="11.8" r="2.4"/>
<polyline class="st3" points="10.5,11.8 10.5,1.6 14.5,5.7 "/>
<line class="st3" x1="1.6" y1="1.9" x2="7.7" y2="1.9"/>
<line class="st3" x1="1.6" y1="4.3" x2="7.7" y2="4.3"/>
<line class="st3" x1="1.6" y1="6.7" x2="7.7" y2="6.7"/>
</g>
<g class="st0">
<circle class="st2" cx="12.3" cy="10.3" r="2.4"/>
<circle class="st2" cx="3.8" cy="12.3" r="2.4"/>
<polyline class="st3" points="6.2,12.3 6.2,3.1 14.7,1.1 14.7,10.3 "/>
</g>
<path class="st0" d="M15.3,9.2V6.7l-2-0.4C13.1,6,13,5.8,12.9,5.5L14,3.8L12.3,2l-1.7,1.1C10.3,3,10.1,2.9,9.8,2.8l-0.4-2H6.9
l-0.4,2C6.2,2.9,6,3,5.7,3.2L4,2L2.2,3.8l1.2,1.7C3.3,5.8,3.2,6,3.1,6.3L1,6.7v2.5l2,0.4c0.1,0.3,0.2,0.5,0.3,0.8l-1.2,1.7L4,13.8
l1.7-1.2C6,12.8,6.2,12.9,6.5,13L6.9,15h2.5L9.8,13c0.3-0.1,0.5-0.2,0.8-0.3l1.7,1.2l1.7-1.7l-1.2-1.7c0.1-0.3,0.2-0.5,0.3-0.8
L15.3,9.2z M8.1,9.9c-1.1,0-2-0.9-2-2c0-1.1,0.9-2,2-2c1.1,0,2,0.9,2,2C10.1,9,9.2,9.9,8.1,9.9z"/>
<g class="st0">
<g class="st1">
<path class="st4" d="M13.9,13.1c0,0.3-0.2,0.5-0.5,0.5H2.6c-0.3,0-0.5-0.2-0.5-0.5V5.4c0-0.3,0.2-0.5,0.5-0.5h10.8
c0.3,0,0.5,0.2,0.5,0.5V13.1z"/>
</g>
<g class="st1">
<path d="M2.7,2.8c0-0.3,0.2-0.5,0.5-0.5h3.9c0.3,0,0.5,0.2,0.5,0.5v1.6c0,0.3-0.2,0.5-0.5,0.5H3.2c-0.3,0-0.5-0.2-0.5-0.5V2.8z"/>
<path class="st5" d="M2.7,2.8c0-0.3,0.2-0.5,0.5-0.5h3.9c0.3,0,0.5,0.2,0.5,0.5v1.6c0,0.3-0.2,0.5-0.5,0.5H3.2
c-0.3,0-0.5-0.2-0.5-0.5V2.8z"/>
</g>
</g>
<path class="st0" d="M1.5,4.1c0,0,4.3-3.9,8.4-1.4c4.1,2.4,5.4,5.6,3.6,7.9C11.4,7.4,10.3,5.8,6,4.5c0,0,6.8,4.3,8,9.3
c-0.2,1.1-1.2,0.3-1.2,0.3l-1.1-1.8c0,0-2.1,1.6-4.6-0.5C2.9,8.1,6.2,4,1.5,4.1z"/>
<path class="st0" d="M8,0.8c-0.2,0-0.3,0.1-0.4,0.4l-2,4L1.2,5.8C0.8,5.9,0.7,6,0.7,6.2c0,0.1,0.1,0.3,0.2,0.4l3.2,3.1l-0.8,4.4
c0,0.1,0,0.1,0,0.2c0,0.1,0,0.2,0.1,0.3c0.1,0.1,0.2,0.1,0.3,0.1c0.1,0,0.2,0,0.4-0.1l4-2.1l4,2.1c0.1,0.1,0.2,0.1,0.4,0.1
c0.1,0,0.2,0,0.3-0.1s0.1-0.2,0.1-0.3c0-0.1,0-0.1,0-0.2l-0.8-4.4l3.2-3.1c0.2-0.2,0.2-0.3,0.2-0.4c0-0.2-0.2-0.4-0.5-0.4l-4.4-0.6
l-2-4C8.3,0.9,8.2,0.8,8,0.8L8,0.8z"/>
<circle class="st5" cx="8" cy="8" r="6.6"/>
<circle class="st5" cx="8" cy="8" r="2.1"/>
<path d="M5.7,8c0-1.2,1-2.3,2.3-2.3c0.3,0,0.6,0.1,0.9,0.2l1.8-4C9.9,1.6,9,1.4,8,1.4C4.4,1.4,1.4,4.4,1.4,8c0,0.8,0.2,1.6,0.4,2.4
<circle class="st0" cx="8" cy="8" r="6.6"/>
<circle class="st0" cx="8" cy="8" r="2.1"/>
<path d="M5.7,8c0-1.2,1-2.3,2.3-2.3c0.3,0,0.6,0.1,0.9,0.2l1.8-4C9.9,1.6,9,1.4,8,1.4c-3.6,0-6.6,3-6.6,6.6c0,0.8,0.2,1.6,0.4,2.4
l4-1.6C5.8,8.6,5.7,8.3,5.7,8z"/>
<path d="M14.1,5.6l-4,1.6c0.1,0.3,0.2,0.5,0.2,0.8c0,1.2-1,2.3-2.3,2.3c-0.3,0-0.6-0.1-0.9-0.2L5.3,14C6.1,14.4,7,14.6,8,14.6
c3.6,0,6.6-2.9,6.6-6.6C14.6,7.2,14.4,6.4,14.1,5.6z"/>
<g class="st0">
<rect x="2" y="1.9" class="st1" width="5" height="5"/>
<rect x="9.1" y="9" class="st1" width="5" height="5"/>
<rect x="2" y="9" class="st1" width="5" height="5"/>
<rect x="9.1" y="1.9" class="st1" width="5" height="5"/>
</g>
<circle class="st6" cx="6.9" cy="7" r="4.5"/>
<line class="st7" x1="10.2" y1="9.9" x2="14.5" y2="14.2"/>
<polyline class="st8" points="4.8,1.6 11.2,7.9 4.8,14.3 "/>
<polyline class="st8" points="11.2,14.3 4.8,7.9 11.2,1.6 "/>
<g class="st0">
<rect x="2.1" y="3.3" class="st9" width="2.3" height="2.3"/>
<line class="st10" x1="7.3" y1="3.1" x2="13.9" y2="3.1"/>
<line class="st10" x1="7.3" y1="4.8" x2="13.9" y2="4.8"/>
<line class="st10" x1="7.3" y1="6.4" x2="13.9" y2="6.4"/>
<line class="st10" x1="7.3" y1="9.5" x2="13.9" y2="9.5"/>
<line class="st10" x1="7.3" y1="11.1" x2="13.9" y2="11.1"/>
<line class="st10" x1="7.3" y1="12.8" x2="13.9" y2="12.8"/>
<rect x="2.1" y="9.7" class="st9" width="2.3" height="2.3"/>
</g>
<g class="st0">
<rect x="2.8" y="2.7" class="st9" width="3.8" height="3.8"/>
<rect x="2.8" y="9.3" class="st9" width="3.8" height="3.8"/>
<rect x="9.5" y="2.7" class="st9" width="3.8" height="3.8"/>
<rect x="9.5" y="9.3" class="st9" width="3.8" height="3.8"/>
</g>
<g class="st0">
<line class="st11" x1="1.7" y1="3.4" x2="14.3" y2="3.4"/>
<line class="st11" x1="1.7" y1="7.9" x2="14.3" y2="7.9"/>
<line class="st11" x1="1.7" y1="12.5" x2="14.3" y2="12.5"/>
</g>
<g class="st0">
<g class="st1">
<path d="M3.4,14.5c-0.1,0.1-0.3,0.1-0.4,0L1.5,13c-0.1-0.1-0.1-0.3,0-0.4l5.3-6.2c0.1-0.1,0.3-0.1,0.4,0l2.4,2.4
c0.1,0.1,0.1,0.3,0,0.4L3.4,14.5z"/>
<path class="st12" d="M3.4,14.5c-0.1,0.1-0.3,0.1-0.4,0L1.5,13c-0.1-0.1-0.1-0.3,0-0.4l5.3-6.2c0.1-0.1,0.3-0.1,0.4,0l2.4,2.4
c0.1,0.1,0.1,0.3,0,0.4L3.4,14.5z"/>
</g>
<g class="st1">
<path d="M11,8c0.1,0.1,0.3,0.2,0.5,0.2c0,0,1.5-0.3,2.1-1c1.3-1.3,1.3-3.5,0-4.9s-3.5-1.3-4.9,0c-0.7,0.7-1,2.1-1,2.1
c0,0.2,0,0.4,0.2,0.5L11,8z"/>
<path class="st12" d="M11,8c0.1,0.1,0.3,0.2,0.5,0.2c0,0,1.5-0.3,2.1-1c1.3-1.3,1.3-3.5,0-4.9s-3.5-1.3-4.9,0
c-0.7,0.7-1,2.1-1,2.1c0,0.2,0,0.4,0.2,0.5L11,8z"/>
</g>
</g>
</svg>

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 6.4 KiB

After

Width:  |  Height:  |  Size: 900 B

2
src/js/components/Sidebar.js
View File

@ -80,7 +80,7 @@ class Sidebar extends React.Component{
<Icon name="music" />
Tracks
</Link>
<Link className={this.linkClassName('library/local')} to={global.baseURL+"library/browse"}>
<Link className={this.linkClassName('library/browse')} to={global.baseURL+"library/browse"}>
<Icon name="folder" />
Browse
</Link>

4
src/js/index.js
View File

@ -75,9 +75,9 @@ ReactDOM.render(
<Route path="library/albums" component={LibraryAlbums} />
<Route path="library/tracks" component={LibraryTracks} />
<Route path="library/playlists" component={LibraryPlaylists} />
<Route path="library/browse/local-artists" component={LibraryLocalArtists} />
<Route path="library/browse/local-albums" component={LibraryLocalAlbums} />
<Route path="library/browse(/:uri)" component={LibraryBrowse} />
<Route path="library/local/artists" component={LibraryLocalArtists} />
<Route path="library/local/albums" component={LibraryLocalAlbums} />
</Route>
</Router>

2
src/js/services/mopidy/actions.js
View File

@ -185,7 +185,7 @@ export function getPlaylist( uri ){
export function getDirectory( uri ){
return {
type: 'MOPIDY_GET_DIRECTORY',
data: { uri: uri }
data: { uri: (uri ? decodeURIComponent(uri) : null) }
}
}

14
src/js/views/library/LibraryBrowse.js
View File

@ -60,7 +60,7 @@ class LibraryBrowse extends React.Component{
{},
directory[i],
{
uri: directory[i].uri.replace('?','|')
uri: encodeURIComponent(directory[i].uri)
}
))
}
@ -123,12 +123,12 @@ class LibraryBrowse extends React.Component{
var grid_items = [
{
name: 'Local artists',
link: global.baseURL+'library/local/artists',
link: global.baseURL+'library/browse/local-artists',
icons: ['assets/backgrounds/browse-artists.jpg']
},
{
name: 'Local albums',
link: global.baseURL+'library/local/albums',
link: global.baseURL+'library/browse/local-albums',
icons: ['assets/backgrounds/browse-albums.jpg']
}
]
@ -156,13 +156,17 @@ class LibraryBrowse extends React.Component{
directory.icons = ['assets/backgrounds/browse-tunigo.jpg']
break
case 'Tunein':
directory.icons = ['assets/backgrounds/browse-tunein.jpg']
break
default:
directory.icons = ['assets/backgrounds/browse-albums.jpg']
directory.icons = ['assets/backgrounds/browse-default.jpg']
}
grid_items.push({
name: directory.name,
link: global.baseURL+'library/browse/'+directory.uri.replace('?','|').replace('/','%2F'),
link: global.baseURL+'library/browse/'+encodeURIComponent(directory.uri),
icons: directory.icons
})
}