Removing SSL config - non HTTPS can't use SSL anyway

This commit is contained in:
James Barnsley
2018-10-04 21:07:25 +13:00
parent 5d827902e4
commit 62fe788395
9 changed files with 14100 additions and 10787 deletions

View File

@ -10,6 +10,8 @@ import TrackList from '../../components/TrackList'
import GridItem from '../../components/GridItem'
import DropdownField from '../../components/Fields/DropdownField'
import Icon from '../../components/Icon'
import URILink from '../../components/URILink'
import ErrorBoundary from '../../components/ErrorBoundary'
import * as helpers from '../../helpers'
import * as uiActions from '../../services/ui/actions'
@ -63,6 +65,45 @@ class LibraryBrowse extends React.Component{
this.props.uiActions.hideContextMenu();
}
renderBreadcrumbs(){
if (this.props.params.uri){
var parent_uri = this.props.params.uri;
} else {
return null;
}
if (parent_uri.startsWith('file://')){
var uri = parent_uri.replace('file:///','');
var uri_elements = uri.split('/');
return (
<h4>
{uri_elements.map((uri_element, index) => {
// Reconstruct a URL to this element
var uri = "file://";
for (var i = 0; i <= index; i++){
uri += "/"+uri_elements[i];
}
return (
<span key={uri}>
{index > 0 ? <span>&nbsp; <Icon type="fontawesome" name="angle-right" /> &nbsp;&nbsp;</span> : null}
<URILink type="browse" uri={uri}>
{uri_element}
</URILink>
</span>
);
})}
</h4>
);
}
return null;
}
renderSubdirectories(subdirectories){
if (this.props.view == 'list'){
return (
@ -152,15 +193,19 @@ class LibraryBrowse extends React.Component{
{title}
</Header>
<section className="content-wrapper">
<ErrorBoundary>
{subdirectories ? this.renderSubdirectories(subdirectories) : null}
{this.renderBreadcrumbs()}
{tracks ? <TrackList
tracks={this.props.directory.tracks}
uri={"iris:browse:"+this.props.params.uri}
className="library-local-track-list"
/> : null }
{subdirectories ? this.renderSubdirectories(subdirectories) : null}
{tracks ? <TrackList
tracks={this.props.directory.tracks}
uri={"iris:browse:"+this.props.params.uri}
className="library-local-track-list"
/> : null }
</ErrorBoundary>
</section>
</div>
);
@ -229,21 +274,23 @@ class LibraryBrowse extends React.Component{
Browse
</Header>
<section className="content-wrapper">
<div className="grid category-grid">
{
grid_items.map(
(item, index) => {
return (
<GridItem
item={item}
key={index}
type="category"
onClick={e => hashHistory.push(item.link)}
/>
)
}
)
}
<div className="grid category-grid">
<ErrorBoundary>
{
grid_items.map(
(item, index) => {
return (
<GridItem
item={item}
key={index}
type="category"
onClick={e => hashHistory.push(item.link)}
/>
)
}
)
}
</ErrorBoundary>
</div>
</section>
</div>