From 6301c0fe467ca8b57524c4c1f9e942206d9bd2f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Daubensch=C3=BCtz?= <tim@ascribe.io>
Date: Mon, 7 Mar 2016 13:45:40 +0100
Subject: [PATCH] Refactor to route specific footer

---
 js/components/header.js                       | 24 ++++++------
 .../prize/portfolioreview/pr_app.js           |  1 -
 .../prize/simple_prize/prize_app.js           |  1 -
 .../components/23vivi/23vivi_landing.js       |  2 +-
 .../wallet/components/market/market_footer.js | 27 ++++++++++++++
 js/components/whitelabel/wallet/wallet_app.js |  1 -
 .../whitelabel/wallet/wallet_routes.js        | 37 +++++++++++++------
 sass/whitelabel/wallet/index.scss             |  1 +
 sass/whitelabel/wallet/market/index.scss      |  1 +
 .../wallet/market/market_footer.scss          | 15 ++++++++
 10 files changed, 82 insertions(+), 28 deletions(-)
 create mode 100644 js/components/whitelabel/wallet/components/market/market_footer.js
 create mode 100644 sass/whitelabel/wallet/market/index.scss
 create mode 100644 sass/whitelabel/wallet/market/market_footer.scss

diff --git a/js/components/header.js b/js/components/header.js
index ed04a736..181e14c0 100644
--- a/js/components/header.js
+++ b/js/components/header.js
@@ -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} />
diff --git a/js/components/whitelabel/prize/portfolioreview/pr_app.js b/js/components/whitelabel/prize/portfolioreview/pr_app.js
index 1639e750..2d097c75 100644
--- a/js/components/whitelabel/prize/portfolioreview/pr_app.js
+++ b/js/components/whitelabel/prize/portfolioreview/pr_app.js
@@ -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';
diff --git a/js/components/whitelabel/prize/simple_prize/prize_app.js b/js/components/whitelabel/prize/simple_prize/prize_app.js
index dd1556c5..43d7ebc9 100644
--- a/js/components/whitelabel/prize/simple_prize/prize_app.js
+++ b/js/components/whitelabel/prize/simple_prize/prize_app.js
@@ -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';
diff --git a/js/components/whitelabel/wallet/components/23vivi/23vivi_landing.js b/js/components/whitelabel/wallet/components/23vivi/23vivi_landing.js
index 2a1cd0bc..06fdccb6 100644
--- a/js/components/whitelabel/wallet/components/23vivi/23vivi_landing.js
+++ b/js/components/whitelabel/wallet/components/23vivi/23vivi_landing.js
@@ -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>
diff --git a/js/components/whitelabel/wallet/components/market/market_footer.js b/js/components/whitelabel/wallet/components/market/market_footer.js
new file mode 100644
index 00000000..6d033fdb
--- /dev/null
+++ b/js/components/whitelabel/wallet/components/market/market_footer.js
@@ -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;
diff --git a/js/components/whitelabel/wallet/wallet_app.js b/js/components/whitelabel/wallet/wallet_app.js
index c40d075c..e382377b 100644
--- a/js/components/whitelabel/wallet/wallet_app.js
+++ b/js/components/whitelabel/wallet/wallet_app.js
@@ -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';
diff --git a/js/components/whitelabel/wallet/wallet_routes.js b/js/components/whitelabel/wallet/wallet_routes.js
index 75e59487..d94d8130 100644
--- a/js/components/whitelabel/wallet/wallet_routes.js
+++ b/js/components/whitelabel/wallet/wallet_routes.js
@@ -37,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';
 
@@ -249,44 +250,56 @@ let ROUTES = {
             <IndexRoute component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(Vivi23Landing)} />
             <Route
                 path='login'
-                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(LoginContainer)} />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(LoginContainer)}
+                footer={MarketFooter} />
             <Route
                 path='logout'
-                component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)} />
+                component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)}
+                footer={MarketFooter} />
             <Route
                 path='signup'
-                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SignupContainer)} />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(SignupContainer)}
+                footer={MarketFooter} />
             <Route
                 path='password_reset'
-                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)} />
+                component={ProxyHandler(AuthRedirect({to: '/collection', when: 'loggedIn'}))(PasswordResetContainer)}
+                footer={MarketFooter} />
             <Route
                 path='settings'
-                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SettingsContainer)} />
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(SettingsContainer)}
+                footer={MarketFooter} />
             <Route
                 path='contract_settings'
-                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(ContractSettings)} />
+                component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(ContractSettings)}
+                footer={MarketFooter} />
             <Route
                 path='register_piece'
                 component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(MarketRegisterPiece)}
                 headerTitle={getLangText('+ NEW WORK')}
-                aclName='acl_wallet_submit' />
+                aclName='acl_wallet_submit'
+                footer={MarketFooter} />
             <Route
                 path='collection'
                 component={ProxyHandler(AuthRedirect({to: '/login', when: 'loggedOut'}))(Vivi23PieceList)}
                 headerTitle={getLangText('COLLECTION')}
-                disableOn='noPieces' />
+                disableOn='noPieces'
+                footer={MarketFooter} />
             <Route
                 path='pieces/:pieceId'
-                component={MarketPieceContainer} />
+                component={MarketPieceContainer}
+                footer={MarketFooter} />
             <Route
                 path='editions/:editionId'
-                component={MarketEditionContainer} />
+                component={MarketEditionContainer}
+                footer={MarketFooter} />
             <Route
                 path='coa_verify'
-                component={CoaVerifyContainer} />
+                component={CoaVerifyContainer}
+                footer={MarketFooter} />
             <Route
                 path='*'
-                component={ErrorNotFoundPage} />
+                component={ErrorNotFoundPage}
+                footer={MarketFooter} />
         </Route>
     ),
     'polline': (
diff --git a/sass/whitelabel/wallet/index.scss b/sass/whitelabel/wallet/index.scss
index 0871f3d6..99c78a1f 100644
--- a/sass/whitelabel/wallet/index.scss
+++ b/sass/whitelabel/wallet/index.scss
@@ -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;
diff --git a/sass/whitelabel/wallet/market/index.scss b/sass/whitelabel/wallet/market/index.scss
new file mode 100644
index 00000000..706b7b51
--- /dev/null
+++ b/sass/whitelabel/wallet/market/index.scss
@@ -0,0 +1 @@
+@import 'market_footer';
diff --git a/sass/whitelabel/wallet/market/market_footer.scss b/sass/whitelabel/wallet/market/market_footer.scss
new file mode 100644
index 00000000..90fb94d2
--- /dev/null
+++ b/sass/whitelabel/wallet/market/market_footer.scss
@@ -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;
+    }
+}