ascribe/onion
1
0
Fork 0
mirror of https://github.com/ascribe/onion.git synced 2024-12-22 09:23:13 +01:00
Code Issues Releases Wiki Activity

Merge pull request #169 from ascribe/AG-112-visual-changes-to-23vivi

Browse Source 
Ag 112 visual changes to 23vivi
This commit is contained in:
Tim Daubenschütz 2016-03-07 14:14:11 +01:00
commit 5e6b483149
18 changed files with 210 additions and 225 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
js/components/ascribe_app.js
View File

@ -21,6 +21,7 @@ let AscribeApp = React.createClass({
render() {
const { activeRoute, children, currentUser, routes, whitelabel } = this.props;
const Footer = activeRoute && activeRoute.footer;
return (
<div className="ascribe-app ascribe-default-app">
@ -34,7 +35,7 @@ let AscribeApp = React.createClass({
{/* Routes are injected here */}
{children}
</AppRouteWrapper>
<Footer activeRoute={activeRoute} />
{Footer ? <Footer /> : null}
</div>
);
}

8
js/components/ascribe_forms/form_login.js
View File

@ -22,7 +22,8 @@ let LoginForm = React.createClass({
propTypes: {
headerMessage: React.PropTypes.string,
submitMessage: React.PropTypes.string,
location: React.PropTypes.object
location: React.PropTypes.object,
whitelabelName: React.PropTypes.string
},
mixins: [History],
@ -46,7 +47,8 @@ let LoginForm = React.createClass({
render() {
const { headerMessage,
location: { query: { email: emailQuery } },
submitMessage } = this.props;
submitMessage,
whitelabelName } = this.props;
return (
<Form
@ -67,7 +69,7 @@ let LoginForm = React.createClass({
</span>
}>
<div className="ascribe-form-header">
<h3>{headerMessage}</h3>
<h3>{whitelabelName ? `Welcome to ${whitelabelName}` : headerMessage}</h3>
</div>
<Property
name='email'

20
js/components/ascribe_forms/form_signup.js
View File

@ -28,7 +28,8 @@ let SignupForm = React.createClass({
React.PropTypes.arrayOf(React.PropTypes.element),
React.PropTypes.element,
React.PropTypes.string
])
]),
whitelabelName: React.PropTypes.string
},
mixins: [History],
@ -61,11 +62,8 @@ let SignupForm = React.createClass({
const { children,
headerMessage,
location: { query: { email: emailQuery } },
submitMessage } = this.props;
const tooltipPassword = getLangText('Your password must be at least 10 characters') + '.\n ' +
getLangText('This password is securing your digital property like a bank account') + '.\n ' +
getLangText('Store it in a safe place') + '!';
submitMessage,
whitelabelName } = this.props;
return (
<Form
@ -85,7 +83,7 @@ let SignupForm = React.createClass({
</span>
}>
<div className="ascribe-form-header">
<h3>{headerMessage}</h3>
<h3>{whitelabelName ? `Welcome to ${whitelabelName}` : headerMessage}</h3>
</div>
<Property
name='email'
@ -99,18 +97,16 @@ let SignupForm = React.createClass({
</Property>
<Property
name='password'
label={getLangText('Password')}
tooltip={tooltipPassword}>
label={getLangText('Password')}>
<input
type="password"
placeholder={getLangText('Use a combination of minimum 10 chars and numbers')}
placeholder={getLangText('Use a combination of minimum 10 characters and numbers')}
autoComplete="on"
required/>
</Property>
<Property
name='password_confirm'
label={getLangText('Confirm Password')}
tooltip={tooltipPassword}>
label={getLangText('Confirm Password')}>
<input
type="password"
placeholder={getLangText('Enter your password once again')}

9
js/components/footer.js
View File

@ -4,13 +4,10 @@ import React from 'react';
import { getLangText } from '../utils/lang_utils';
let Footer = React.createClass({
propTypes: {
activeRoute: React.PropTypes.object.isRequired
},
const Footer = React.createClass({
render() {
return !this.props.activeRoute.hideFooter ? (
return (
<div className="ascribe-footer hidden-print">
<p className="ascribe-sub-sub-statement">
<br />
@ -28,7 +25,7 @@ let Footer = React.createClass({
<a href="https://www.linkedin.com/company/4816284?trk=vsrp_companies_res_name&trkInfo=VSRPsearchId%3A122827941425632318075%2CVSRPtargetId%3A4816284%2CVSRPcmpt%3Aprimary" className="social social-linked-in" target="_blank"></a>
</p>
</div>
) : null;
);
}
});

24
js/components/header.js
View File

@ -82,16 +82,12 @@ let Header = React.createClass({
getPoweredBy() {
return (
<AclProxy
aclObject={this.props.whitelabel}
aclName="acl_view_powered_by">
<li>
<a className="pull-right ascribe-powered-by" href="https://www.ascribe.io/" target="_blank">
<span id="powered">{getLangText('powered by')} </span>
<span className="icon-ascribe-logo"></span>
</a>
</li>
</AclProxy>
<li>
<a className="pull-right ascribe-powered-by" href="https://www.ascribe.io/" target="_blank">
<span id="powered">{getLangText('powered by')} </span>
<span className="icon-ascribe-logo"></span>
</a>
</li>
);
},
@ -130,7 +126,7 @@ let Header = React.createClass({
},
render() {
const { currentUser, routes } = this.props;
const { currentUser, routes, whitelabel } = this.props;
const { unfilteredPieceListCount } = this.state;
let account;
@ -211,7 +207,11 @@ let Header = React.createClass({
className="hidden-print">
<CollapsibleNav eventKey={0}>
<Nav navbar left>
{this.getPoweredBy()}
<AclProxy
aclObject={whitelabel}
aclName="acl_view_powered_by">
{this.getPoweredBy()}
</AclProxy>
</Nav>
<Nav navbar right>
<HeaderNotificationDebug show={false} />

9
js/components/login_container.js
View File

@ -20,13 +20,18 @@ let LoginContainer = React.createClass({
},
render() {
const { whitelabel: { name: whitelabelName },
location } = this.props;
setDocumentTitle(getLangText('Log in'));
return (
<div className="ascribe-login-wrapper">
<LoginForm location={this.props.location} />
<LoginForm
location={location}
whitelabelName={whitelabelName} />
<div className="ascribe-login-text">
{getLangText('Not an ascribe user')}&#63; <Link to="/signup">{getLangText('Sign up')}...</Link><br/>
{getLangText(`Not a ${whitelabelName || 'ascribe'} user`)}&#63; <Link to="/signup">{getLangText('Sign up')}...</Link><br/>
{getLangText('Forgot my password')}&#63; <Link to="/password_reset">{getLangText('Rescue me')}...</Link>
</div>
</div>

6
js/components/signup_container.js
View File

@ -34,7 +34,8 @@ let SignupContainer = React.createClass({
},
render() {
const { location } = this.props;
const { location,
whitelabel: { name: whitelabelName } } = this.props;
const { message, submitted } = this.state;
setDocumentTitle(getLangText('Sign up'));
@ -53,9 +54,10 @@ let SignupContainer = React.createClass({
<div className="ascribe-login-wrapper">
<SignupForm
handleSuccess={this.handleSuccess}
whitelabelName={whitelabelName}
location={location}/>
<div className="ascribe-login-text">
{getLangText('Already an ascribe user')}&#63; <Link to="/login">{getLangText('Log in')}...</Link><br/>
{getLangText(`Already a ${whitelabelName || 'ascribe'} user`)}&#63; <Link to="/login">{getLangText('Log in')}...</Link><br/>
</div>
</div>

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

@ -12,7 +12,6 @@ import Hero from './components/pr_hero';
import AppBase from '../../../app_base';
import AppRouteWrapper from '../../../app_route_wrapper';
import Footer from '../../../footer';
import Header from '../../../header';
import { getSubdomain } from '../../../../utils/general_utils';
@ -35,6 +34,7 @@ let PRApp = React.createClass({
const { activeRoute, children, currentUser, history, routes, whitelabel } = this.props;
const subdomain = getSubdomain();
const path = activeRoute && activeRoute.path;
const Footer = activeRoute && activeRoute.footer;
let style = {};
let header;
@ -64,7 +64,7 @@ let PRApp = React.createClass({
{/* Routes are injected here */}
{children}
</AppRouteWrapper>
<Footer activeRoute={activeRoute} />
{Footer ? <Footer /> : null}
</div>
);
}

72
js/components/whitelabel/prize/prize_routes.js
View File

@ -35,115 +35,91 @@ const ROUTES = {
sluice: (
<Route path='/' component={SPApp}>
<IndexRoute
component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SPLanding)}
hideFooter />
component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SPLanding)} />
<Route
path='login'
component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SPLoginContainer)}
hideFooter />
component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SPLoginContainer)} />
<Route
path='logout'
component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)}
hideFooter />
component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)} />
<Route
path='signup'
component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SPSignupContainer)}
hideFooter />
component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SPSignupContainer)} />
<Route
path='password_reset'
component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)}
hideFooter />
component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)} />
<Route
path='settings'
component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SPSettingsContainer)}
hideFooter />
component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SPSettingsContainer)} />
<Route
path='register_piece'
component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SPRegisterPiece)}
headerTitle={getLangText('+ NEW WORK')}
hideFooter />
headerTitle={getLangText('+ NEW WORK')} />
<Route
path='collection'
component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SPPieceList)}
headerTitle={getLangText('COLLECTION')}
hideFooter />
headerTitle={getLangText('COLLECTION')} />
<Route
path='pieces/:pieceId'
component={SluicePieceContainer}
hideFooter />
component={SluicePieceContainer} />
<Route
path='editions/:editionId'
component={EditionContainer}
hideFooter />
component={EditionContainer} />
<Route
path='coa_verify'
component={CoaVerifyContainer}
hideFooter />
component={CoaVerifyContainer} />
<Route
path='*'
component={ErrorNotFoundPage}
hideFooter />
component={ErrorNotFoundPage} />
</Route>
),
portfolioreview: (
<Route path='/' component={PRApp}>
<IndexRoute
component={ProxyHandler(AuthPrizeRoleRedirect({ to: '/collection', when: ['is_admin', 'is_judge', 'is_jury'] }))(PRLanding)}
hideFooter />
component={ProxyHandler(AuthPrizeRoleRedirect({ to: '/collection', when: ['is_admin', 'is_judge', 'is_jury'] }))(PRLanding)} />
<Route
path='register_piece'
component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(PRRegisterPiece)}
hideFooter />
component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(PRRegisterPiece)} />
<Route
path='collection'
component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SPPieceList)}
headerTitle={getLangText('SUBMISSIONS')}
hideFooter />
headerTitle={getLangText('SUBMISSIONS')} />
<Route
path='login'
component={ProxyHandler(
AuthPrizeRoleRedirect({ to: '/collection', when: ['is_admin', 'is_judge', 'is_jury'] }),
AuthRedirect({to: '/register_piece', when: 'loggedIn'})
)(SPLoginContainer)}
hideFooter />
)(SPLoginContainer)} />
<Route
path='logout'
component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)}
hideFooter />
component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)} />
<Route
path='signup'
component={ProxyHandler(
AuthPrizeRoleRedirect({ to: '/collection', when: ['is_admin', 'is_judge', 'is_jury'] }),
AuthRedirect({to: '/register_piece', when: 'loggedIn'})
)(SPSignupContainer)}
hideFooter />
)(SPSignupContainer)} />
<Route
path='password_reset'
component={ProxyHandler(
AuthPrizeRoleRedirect({ to: '/collection', when: ['is_admin', 'is_judge', 'is_jury'] }),
AuthRedirect({to: '/register_piece', when: 'loggedIn'})
)(PasswordResetContainer)}
hideFooter />
)(PasswordResetContainer)} />
<Route
path='settings'
component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SPSettingsContainer)}
hideFooter />
component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SPSettingsContainer)} />
<Route
path='pieces/:pieceId'
component={SPPieceContainer}
hideFooter />
component={SPPieceContainer} />
<Route
path='editions/:editionId'
component={EditionContainer}
hideFooter />
component={EditionContainer} />
<Route
path='coa_verify'
component={CoaVerifyContainer}
hideFooter />
component={CoaVerifyContainer} />
<Route
path='*'
component={ErrorNotFoundPage}
hideFooter />
component={ErrorNotFoundPage} />
</Route>
)
};

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

@ -7,7 +7,6 @@ import Hero from './components/prize_hero';
import AppBase from '../../../app_base';
import AppRouteWrapper from '../../../app_route_wrapper';
import Footer from '../../../footer';
import Header from '../../../header';
import { getSubdomain } from '../../../../utils/general_utils';
@ -29,6 +28,7 @@ let PrizeApp = React.createClass({
const { activeRoute, children, currentUser, history, routes, whitelabel } = this.props;
const subdomain = getSubdomain();
const path = activeRoute && activeRoute.path;
const Footer = activeRoute && activeRoute.footer;
let header = null;
// if the path of the current activeRoute is not defined, then this is the IndexRoute
@ -52,7 +52,7 @@ let PrizeApp = React.createClass({
{/* Routes are injected here */}
{children}
</AppRouteWrapper>
<Footer activeRoute={activeRoute} />
{Footer ? <Footer /> : null}
</div>
);
}

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

@ -36,7 +36,7 @@ let Vivi23Landing = React.createClass({
src={this.props.whitelabel.logo}
height="75" />
<div>
{getLangText('23VIVI Marketplace is powered by') + ' '}
{getLangText('23VIVI digital wallet is powered by') + ' '}
<span className="icon-ascribe-logo" />
</div>
</div>

27
js/components/whitelabel/wallet/components/market/market_footer.js Normal file
View File

@ -0,0 +1,27 @@
'use strict';
import React from 'react';
import { getLangText } from '../../../../../utils/lang_utils';
const MarketFooter = React.createClass({
render() {
return (
<div className="container hidden-print">
<div className="row">
<div className="whitelabel-footer">
<hr/>
<span id="powered">{getLangText('Digital wallet powered by')} </span>
<a className="ascribe-powered-by" href="https://www.ascribe.io/" target="_blank">
<span className="icon-ascribe-logo"></span>
</a>
</div>
</div>
</div>
);
}
});
export default MarketFooter;

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

@ -5,7 +5,6 @@ import classNames from 'classnames';
import AppBase from '../../app_base';
import AppRouteWrapper from '../../app_route_wrapper';
import Footer from '../../footer';
import Header from '../../header';
import { getSubdomain } from '../../../utils/general_utils';
@ -27,6 +26,7 @@ let WalletApp = React.createClass({
const { activeRoute, children, currentUser, history, routes, whitelabel } = this.props;
const subdomain = getSubdomain();
const path = activeRoute && activeRoute.path;
const Footer = activeRoute && activeRoute.footer;
let header = null;
// if the path of the current activeRoute is not defined, then this is the IndexRoute
@ -53,7 +53,7 @@ let WalletApp = React.createClass({
{/* Routes are injected here */}
{children}
</AppRouteWrapper>
<Footer activeRoute={activeRoute} />
{Footer ? <Footer /> : null}
</div>
);
}

188
js/components/whitelabel/wallet/wallet_routes.js
View File

@ -17,6 +17,7 @@ import EditionContainer from '../../../components/ascribe_detail/edition_contain
import SettingsContainer from '../../../components/ascribe_settings/settings_container';
import ContractSettings from '../../../components/ascribe_settings/contract_settings';
import ErrorNotFoundPage from '../../../components/error_not_found_page';
import Footer from '../../../components/footer.js';
import CCRegisterPiece from './components/cc/cc_register_piece';
@ -36,6 +37,7 @@ import MarketPieceList from './components/market/market_piece_list';
import MarketRegisterPiece from './components/market/market_register_piece';
import MarketPieceContainer from './components/market/market_detail/market_piece_container';
import MarketEditionContainer from './components/market/market_detail/market_edition_container';
import MarketFooter from './components/market/market_footer';
import LumenusLanding from './components/lumenus/lumenus_landing';
@ -57,301 +59,247 @@ let ROUTES = {
'cyland': (
<Route path='/' component={WalletApp}>
<IndexRoute
component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(CylandLanding)}
hideFooter />
component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(CylandLanding)} />
<Route
path='login'
component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(LoginContainer)}
hideFooter />
component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(LoginContainer)} />
<Route
path='logout'
component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)}
hideFooter />
component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)} />
<Route
path='signup'
component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SignupContainer)}
hideFooter />
component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SignupContainer)} />
<Route
path='password_reset'
component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)}
hideFooter />
component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)} />
<Route
path='settings'
component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SettingsContainer)}
hideFooter />
component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SettingsContainer)} />
<Route
path='contract_settings'
component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(ContractSettings)}
hideFooter />
component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(ContractSettings)} />
<Route
path='register_piece'
component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(CylandRegisterPiece)}
headerTitle={getLangText('+ NEW WORK')}
aclName='acl_wallet_submit'
hideFooter />
aclName='acl_wallet_submit' />
<Route
path='collection'
component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(CylandPieceList)}
headerTitle={getLangText('COLLECTION')}
disableOn='noPieces'
hideFooter />
disableOn='noPieces' />
<Route
path='editions/:editionId'
component={EditionContainer}
hideFooter />
component={EditionContainer} />
<Route
path='coa_verify'
component={CoaVerifyContainer}
hideFooter />
component={CoaVerifyContainer} />
<Route
path='pieces/:pieceId'
component={CylandPieceContainer}
hideFooter />
component={CylandPieceContainer} />
<Route
path='*'
component={ErrorNotFoundPage}
hideFooter />
component={ErrorNotFoundPage} />
</Route>
),
'cc': (
<Route path='/' component={WalletApp}>
<Route
path='login'
component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(LoginContainer)}
hideFooter />
component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(LoginContainer)} />
<Route
path='logout'
component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)}
hideFooter />
component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)} />
<Route
path='signup'
component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SignupContainer)}
hideFooter />
component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SignupContainer)} />
<Route
path='password_reset'
component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)}
hideFooter />
component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)} />
<Route
path='settings'
component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SettingsContainer)}
hideFooter />
component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SettingsContainer)} />
<Route
path='contract_settings'
component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(ContractSettings)}
hideFooter />
component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(ContractSettings)} />
<Route
path='register_piece'
component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(CCRegisterPiece)}
headerTitle={getLangText('+ NEW WORK')}
hideFooter />
headerTitle={getLangText('+ NEW WORK')} />
<Route
path='collection'
component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(PieceList)}
headerTitle={getLangText('COLLECTION')}
disableOn='noPieces'
hideFooter />
disableOn='noPieces' />
<Route
path='pieces/:pieceId'
component={PieceContainer}
hideFooter />
component={PieceContainer} />
<Route
path='editions/:editionId'
component={EditionContainer}
hideFooter />
component={EditionContainer} />
<Route
path='coa_verify'
component={CoaVerifyContainer}
hideFooter />
component={CoaVerifyContainer} />
<Route
path='*'
component={ErrorNotFoundPage}
hideFooter />
component={ErrorNotFoundPage} />
</Route>
),
'ikonotv': (
<Route path='/' component={WalletApp}>
<IndexRoute
component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(IkonotvLanding)}
hideFooter />
component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(IkonotvLanding)} />
<Route
path='login'
component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(LoginContainer)}
hideFooter />
component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(LoginContainer)} />
<Route
path='logout'
component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)}
hideFooter />
component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)} />
<Route
path='signup'
component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SignupContainer)}
hideFooter />
component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SignupContainer)} />
<Route
path='password_reset'
component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)}
hideFooter />
component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)} />
<Route
path='settings'
component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SettingsContainer)}
hideFooter />
component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SettingsContainer)} />
<Route
path='contract_settings'
component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(ContractSettings)}
hideFooter />
component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(ContractSettings)} />
<Route
path='request_loan'
component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SendContractAgreementForm)}
headerTitle={getLangText('SEND NEW CONTRACT')}
aclName='acl_create_contractagreement'
hideFooter />
aclName='acl_create_contractagreement' />
<Route
path='register_piece'
component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(IkonotvRegisterPiece)}
headerTitle={getLangText('+ NEW WORK')}
aclName='acl_wallet_submit'
hideFooter />
aclName='acl_wallet_submit' />
<Route
path='collection'
component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(IkonotvPieceList)}
headerTitle={getLangText('COLLECTION')}
disableOn='noPieces'
hideFooter />
disableOn='noPieces' />
<Route
path='contract_notifications'
component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(IkonotvContractNotifications)}
hideFooter />
component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(IkonotvContractNotifications)} />
<Route
path='pieces/:pieceId'
component={IkonotvPieceContainer}
hideFooter />
component={IkonotvPieceContainer} />
<Route
path='editions/:editionId'
component={EditionContainer}
hideFooter />
component={EditionContainer} />
<Route
path='coa_verify'
component={CoaVerifyContainer}
hideFooter />
component={CoaVerifyContainer} />
<Route
path='*'
component={ErrorNotFoundPage}
hideFooter />
component={ErrorNotFoundPage} />
</Route>
),
'lumenus': (
<Route path='/' component={WalletApp}>
<IndexRoute
component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(LumenusLanding)}
hideFooter />
component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(LumenusLanding)} />
<Route
path='login'
component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(LoginContainer)}
hideFooter />
component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(LoginContainer)} />
<Route
path='logout'
component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)}
hideFooter />
component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)} />
<Route
path='signup'
component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SignupContainer)}
hideFooter />
component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SignupContainer)} />
<Route
path='password_reset'
component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)}
hideFooter />
component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)} />
<Route
path='settings'
component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SettingsContainer)}
hideFooter />
component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SettingsContainer)} />
<Route
path='contract_settings'
component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(ContractSettings)}
hideFooter />
component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(ContractSettings)} />
<Route
path='register_piece'
component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(MarketRegisterPiece)}
headerTitle={getLangText('+ NEW WORK')}
aclName='acl_wallet_submit'
hideFooter />
aclName='acl_wallet_submit' />
<Route
path='collection'
component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(MarketPieceList)}
headerTitle={getLangText('COLLECTION')}
disableOn='noPieces'
hideFooter />
disableOn='noPieces' />
<Route
path='pieces/:pieceId'
component={MarketPieceContainer}
hideFooter />
component={MarketPieceContainer} />
<Route
path='editions/:editionId'
component={MarketEditionContainer}
hideFooter />
component={MarketEditionContainer} />
<Route
path='coa_verify'
component={CoaVerifyContainer}
hideFooter />
component={CoaVerifyContainer} />
<Route
path='*'
component={ErrorNotFoundPage}
hideFooter />
component={ErrorNotFoundPage} />
</Route>
),
'23vivi': (
<Route path='/' component={WalletApp}>
<IndexRoute component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(Vivi23Landing)}
hideFooter />
<IndexRoute component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(Vivi23Landing)} />
<Route
path='login'
component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(LoginContainer)}
hideFooter />
footer={MarketFooter} />
<Route
path='logout'
component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)}
hideFooter />
footer={MarketFooter} />
<Route
path='signup'
component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SignupContainer)}
hideFooter />
footer={MarketFooter} />
<Route
path='password_reset'
component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)}
hideFooter />
footer={MarketFooter} />
<Route
path='settings'
component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SettingsContainer)}
hideFooter />
footer={MarketFooter} />
<Route
path='contract_settings'
component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(ContractSettings)}
hideFooter />
footer={MarketFooter} />
<Route
path='register_piece'
component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(MarketRegisterPiece)}
headerTitle={getLangText('+ NEW WORK')}
aclName='acl_wallet_submit'
hideFooter />
footer={MarketFooter} />
<Route
path='collection'
component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(Vivi23PieceList)}
headerTitle={getLangText('COLLECTION')}
disableOn='noPieces'
hideFooter />
footer={MarketFooter} />
<Route
path='pieces/:pieceId'
component={MarketPieceContainer}
hideFooter />
footer={MarketFooter} />
<Route
path='editions/:editionId'
component={MarketEditionContainer}
hideFooter />
footer={MarketFooter} />
<Route
path='coa_verify'
component={CoaVerifyContainer}
hideFooter />
footer={MarketFooter} />
<Route
path='*'
component={ErrorNotFoundPage}
hideFooter />
footer={MarketFooter} />
</Route>
),
'polline': (

38
js/routes.js
View File

@ -25,6 +25,8 @@ import ErrorNotFoundPage from './components/error_not_found_page';
import RegisterPiece from './components/register_piece';
import Footer from './components/footer';
import { ProxyHandler, AuthRedirect } from './components/ascribe_routes/proxy_handler';
import { getLangText } from './utils/lang_utils';
@ -34,35 +36,47 @@ const COMMON_ROUTES = (
<Route path='/' component={AscribeApp}>
<Route
path='login'
component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(LoginContainer)} />
component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(LoginContainer)}
footer={Footer} />
<Route
path='register_piece'
component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(RegisterPiece)}
headerTitle={getLangText('+ NEW WORK')} />
headerTitle={getLangText('+ NEW WORK')}
footer={Footer} />
<Route
path='collection'
component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(PieceList)}
headerTitle={getLangText('COLLECTION')}
disableOn='noPieces' />
disableOn='noPieces'
footer={Footer} />
<Route
path='signup'
component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SignupContainer)} />
component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SignupContainer)}
footer={Footer} />
<Route
path='logout'
component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(LogoutContainer)}/>
<Route path='pieces/:pieceId' component={PieceContainer} />
<Route path='editions/:editionId' component={EditionContainer} />
component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(LogoutContainer)}
footer={Footer} />
<Route path='pieces/:pieceId' component={PieceContainer}
footer={Footer} />
<Route path='editions/:editionId' component={EditionContainer}
footer={Footer} />
<Route
path='password_reset'
component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)} />
component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)}
footer={Footer} />
<Route
path='settings'
component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SettingsContainer)} />
component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SettingsContainer)}
footer={Footer} />
<Route
path='contract_settings'
component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(ContractSettings)} />
<Route path='coa_verify' component={CoaVerifyContainer} />
<Route path='*' component={ErrorNotFoundPage} />
component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(ContractSettings)}
footer={Footer} />
<Route path='coa_verify' component={CoaVerifyContainer}
footer={Footer} />
<Route path='*' component={ErrorNotFoundPage}
footer={Footer} />
</Route>
);

1
sass/whitelabel/wallet/index.scss
View File

@ -5,6 +5,7 @@
@import 'polline/polline_custom_style';
@import 'artcity/artcity_custom_style';
@import 'demo/demo_custom_style';
@import 'market/index';
.ascribe-wallet-app {
border-radius: 0;

1
sass/whitelabel/wallet/market/index.scss Normal file
View File

@ -0,0 +1 @@
@import 'market_footer';

15
sass/whitelabel/wallet/market/market_footer.scss Normal file
View File

@ -0,0 +1,15 @@
.whitelabel-footer {
text-align: center;
margin-top: 4em;
padding: 1em 0 1em 0;
hr {
background-color: rgba(0, 0, 0, 0);
//border: 0;
margin-bottom: 1.5em;
}
.ascribe-powered-by {
font-weight: 300 !important;
}
}