ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2025-02-14 21:10:27 +01:00
Code Issues Releases Wiki Activity

Standardize render structure across main app and white label apps

Browse Source 
Also fixes some whitelabel landing pages broken from the
standardization and removes unnecessary class names
This commit is contained in:
Brett Sun 2016-01-19 15:04:46 +01:00
parent 7e1cfbb490
commit efbc605fc8
8 changed files with 60 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/components/ascribe_app.js
View File

@ -22,10 +22,10 @@ let AscribeApp = React.createClass({
const { children, routes } = this.props; const { children, routes } = this.props;
return ( return (
<div className="container ascribe-default-app"> <div className="ascribe-default-app">
<Header routes={routes} /> <Header routes={routes} />
{/* Routes are injected here */} <div className="container ascribe-body">
<div className="ascribe-body"> {/* Routes are injected here */}
{children} {children}
</div> </div>
</div> </div>

9
js/components/whitelabel/prize/portfolioreview/pr_app.js
View File

@ -75,11 +75,12 @@ let PRApp = React.createClass({
} }
return ( return (
<div> <div
style={style}
className={'ascribe-prize-app'}>
{header} {header}
<div <div className="container ascribe-body">
style={style} {/* Routes are injected here */}
className={'container ascribe-prize-app client--' + subdomain}>
{children} {children}
</div> </div>
</div> </div>

6
js/components/whitelabel/prize/simple_prize/prize_app.js
View File

@ -38,10 +38,12 @@ let PrizeApp = React.createClass({
} }
return ( return (
<div className={'container ascribe-prize-app client--' + subdomain}> <div className="ascribe-prize-app">
{header} {header}
{this.props.children} <div className="container ascribe-body">
{/* Routes are injected here */}
{children} {children}
</div>
</div> </div>
); );
} }

2
js/components/whitelabel/wallet/components/23vivi/23vivi_landing.js
View File

@ -36,7 +36,7 @@ let Vivi23Landing = React.createClass({
render() { render() {
return ( return (
<div className="container ascribe-form-wrapper vivi23-landing"> <div className="ascribe-form-wrapper vivi23-landing">
<div className="row"> <div className="row">
<div className="col-xs-12"> <div className="col-xs-12">
<div className="row vivi23-landing--header"> <div className="row vivi23-landing--header">

64
js/components/whitelabel/wallet/components/cyland/cyland_landing.js
View File

@ -57,38 +57,40 @@ let CylandLanding = React.createClass({
setDocumentTitle('CYLAND MediaArtLab'); setDocumentTitle('CYLAND MediaArtLab');
return ( return (
<div className="container ascribe-form-wrapper cyland-landing"> <div className="container">
<div className="row"> <div className="ascribe-form-wrapper cyland-landing">
<div className="col-xs-12"> <div className="row">
<div className="row" style={{border: '1px solid #CCC', padding: '2em'}}> <div className="col-xs-12">
<img src={this.state.whitelabel.logo} width="400px"/> <div className="row" style={{border: '1px solid #CCC', padding: '2em'}}>
<div style={{marginTop: '1em'}}> <img src={this.state.whitelabel.logo} width="400px"/>
{getLangText('Submissions to Cyland Archive are powered by') + ' '} <div style={{marginTop: '1em'}}>
<span> {getLangText('Submissions to Cyland Archive are powered by') + ' '}
<span className="icon-ascribe-logo"></span> <span>
</span> <span className="icon-ascribe-logo"></span>
</span>
</div>
</div> </div>
</div> <div className="row" style={{border: '1px solid #CCC', borderTop: 'none', padding: '2em'}}>
<div className="row" style={{border: '1px solid #CCC', borderTop: 'none', padding: '2em'}}> <div className="col-xs-6">
<div className="col-xs-6"> <p>
<p> {getLangText('Existing ascribe user?')}
{getLangText('Existing ascribe user?')} </p>
</p> <LinkContainer to="/login">
<LinkContainer to="/login"> <Button>
<Button> {getLangText('Log in')}
{getLangText('Log in')} </Button>
</Button> </LinkContainer>
</LinkContainer> </div>
</div> <div className="col-xs-6">
<div className="col-xs-6"> <p>
<p> {getLangText('Do you need an account?')}
{getLangText('Do you need an account?')} </p>
</p> <LinkContainer to="/signup">
<LinkContainer to="/signup"> <Button>
<Button> {getLangText('Sign up')}
{getLangText('Sign up')} </Button>
</Button> </LinkContainer>
</LinkContainer> </div>
</div> </div>
</div> </div>
</div> </div>

7
js/components/whitelabel/wallet/wallet_app.js
View File

@ -40,9 +40,10 @@ let WalletApp = React.createClass({
// In react-router 1.0, Routes have no 'name' property anymore. To keep functionality however, // In react-router 1.0, Routes have no 'name' property anymore. To keep functionality however,
// we split the path by the first occurring slash and take the first splitter. // we split the path by the first occurring slash and take the first splitter.
return ( return (
<div className={classNames('ascribe-wallet-app', 'route--' + (path ? path.split('/')[0] : 'landing'))}> <div className={classNames('ascribe-wallet-app', `route--${(path ? path.split('/')[0] : 'landing')}`)}>
<div className='container'> {header}
{header} <div className="container ascribe-body">
{/* Routes are injected here */}
{children} {children}
</div> </div>
</div> </div>

5
sass/whitelabel/wallet/23vivi/23vivi_custom_style.scss
View File

@ -20,8 +20,13 @@ $vivi23--highlight-color: #de2600;
vertical-align: middle; vertical-align: middle;
} }
.hero {
display: none;
}
.vivi23-landing { .vivi23-landing {
font-weight: normal; font-weight: normal;
padding: 0 15px;
text-align: center; text-align: center;
} }

5
sass/whitelabel/wallet/cyland/cyland_custom_style.scss
View File

@ -178,8 +178,13 @@ $cyland--button-sec-color: #515151;
vertical-align: middle; vertical-align: middle;
} }
.hero {
display: none;
}
.cyland-landing { .cyland-landing {
font-weight: normal; font-weight: normal;
padding: 0 15px;
text-align: center; text-align: center;
} }
} }