This commit is contained in:
James Barnsley
2017-08-04 16:08:57 +12:00
parent c34c187007
commit 4213a513da
5 changed files with 35 additions and 8 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 91 KiB

View File

@ -107,7 +107,7 @@ class Services extends React.Component{
}
renderSendAuthorizationButton(){
if( !this.props.spotify.authorized ) return null
if (!this.props.spotify.authorized) return null
return (
<button onClick={e => this.props.uiActions.openModal('send_authorization', {}) }>
@ -197,6 +197,7 @@ class Services extends React.Component{
const mapStateToProps = (state, ownProps) => {
return {
core: state.core,
spotify: state.spotify
}
}

View File

@ -333,7 +333,7 @@ const PusherMiddleware = (function(){
locale: (action.config.locale ? action.config.locale : null),
country: (action.config.country ? action.config.country : null),
authorization_url: (action.config.authorization_url ? action.config.authorization_url : null),
backend_username: (action.config.backend_username ? action.config.backend_username : null)
backend_username: (action.config.spotify_username ? action.config.spotify_username : null)
}))
next( action )
break

View File

@ -4,6 +4,7 @@ import FontAwesome from 'react-fontawesome'
import { Link } from 'react-router'
import Header from '../components/Header'
import Parallax from '../components/Parallax'
import System from '../components/Settings/System'
import Services from '../components/Settings/Services'
import Debug from '../components/Settings/Debug'
@ -77,13 +78,17 @@ export default class Settings extends React.Component {
render(){
return (
<div className="view settings-view">
<Header icon="cog" title="Settings" />
<Header className="overlay" icon="cog" title="Settings" />
<div className="intro">
<div className="liner">
<Parallax image="/iris/assets/backgrounds/settings.jpg" />
{this.renderSubViewMenu()}
</div>
</div>
<section className="content-wrapper">
{this.renderSubViewMenu()}
{this.renderSubView()}
</section>
</div>

View File

@ -1,8 +1,29 @@
.settings-view {
.sub-views {
padding-bottom: 40px;
.intro {
position: relative;
@include clearfix();
.parallax {
position: absolute;
z-index: 0;
top: 0;
right: 0;
bottom: 0;
left: 0;
height: auto;
}
.liner {
position: relative;
z-index: 1;
padding: 20vh 40px 0;
.sub-views {
position: relative;
}
}
}
.services {