From eb6e3cb20a7ead5deedade404017dabb326c15b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim=20Daubensch=C3=BCtz?= Date: Tue, 11 Aug 2015 14:47:28 +0200 Subject: [PATCH] finishing boilerplate for wallet app + prefixing whitelabel specific files --- js/app.js | 1 - ..._container.js => prize_piece_container.js} | 0 .../components/{hero.js => prize_hero.js} | 0 .../{landing.js => prize_landing.js} | 0 ..._container.js => prize_login_container.js} | 0 .../{piece_list.js => prize_piece_list.js} | 0 ...ister_piece.js => prize_register_piece.js} | 0 ...ntainer.js => prize_settings_container.js} | 0 ...container.js => prize_signup_container.js} | 0 .../{api_urls.js => prize_api_urls.js} | 6 +- ...ants.js => prize_application_constants.js} | 4 +- .../whitelabel/prize/{app.js => prize_app.js} | 2 +- .../prize/{routes.js => prize_routes.js} | 16 +++--- .../components/wallet_register_piece.js | 57 +++++++++++++++++++ .../wallet/constants/wallet_api_urls.js | 11 ++++ .../constants/wallet_application_constants.js | 9 +++ .../wallet/{app.js => wallet_app.js} | 0 .../wallet/{routes.js => wallet_routes.js} | 16 +++--- js/constants/api_urls.js | 7 ++- js/routes.js | 5 +- 20 files changed, 109 insertions(+), 25 deletions(-) rename js/components/whitelabel/prize/components/ascribe_detail/{piece_container.js => prize_piece_container.js} (100%) rename js/components/whitelabel/prize/components/{hero.js => prize_hero.js} (100%) rename js/components/whitelabel/prize/components/{landing.js => prize_landing.js} (100%) rename js/components/whitelabel/prize/components/{login_container.js => prize_login_container.js} (100%) rename js/components/whitelabel/prize/components/{piece_list.js => prize_piece_list.js} (100%) rename js/components/whitelabel/prize/components/{register_piece.js => prize_register_piece.js} (100%) rename js/components/whitelabel/prize/components/{settings_container.js => prize_settings_container.js} (100%) rename js/components/whitelabel/prize/components/{signup_container.js => prize_signup_container.js} (100%) rename js/components/whitelabel/prize/constants/{api_urls.js => prize_api_urls.js} (89%) rename js/components/whitelabel/prize/constants/{application_prize_constants.js => prize_application_constants.js} (74%) rename js/components/whitelabel/prize/{app.js => prize_app.js} (95%) rename js/components/whitelabel/prize/{routes.js => prize_routes.js} (73%) create mode 100644 js/components/whitelabel/wallet/components/wallet_register_piece.js create mode 100644 js/components/whitelabel/wallet/constants/wallet_api_urls.js create mode 100644 js/components/whitelabel/wallet/constants/wallet_application_constants.js rename js/components/whitelabel/wallet/{app.js => wallet_app.js} (100%) rename js/components/whitelabel/wallet/{routes.js => wallet_routes.js} (71%) diff --git a/js/app.js b/js/app.js index 81a8fb82..6115a0aa 100644 --- a/js/app.js +++ b/js/app.js @@ -44,7 +44,6 @@ requests.defaults({ }); - class AppGateway { start() { diff --git a/js/components/whitelabel/prize/components/ascribe_detail/piece_container.js b/js/components/whitelabel/prize/components/ascribe_detail/prize_piece_container.js similarity index 100% rename from js/components/whitelabel/prize/components/ascribe_detail/piece_container.js rename to js/components/whitelabel/prize/components/ascribe_detail/prize_piece_container.js diff --git a/js/components/whitelabel/prize/components/hero.js b/js/components/whitelabel/prize/components/prize_hero.js similarity index 100% rename from js/components/whitelabel/prize/components/hero.js rename to js/components/whitelabel/prize/components/prize_hero.js diff --git a/js/components/whitelabel/prize/components/landing.js b/js/components/whitelabel/prize/components/prize_landing.js similarity index 100% rename from js/components/whitelabel/prize/components/landing.js rename to js/components/whitelabel/prize/components/prize_landing.js diff --git a/js/components/whitelabel/prize/components/login_container.js b/js/components/whitelabel/prize/components/prize_login_container.js similarity index 100% rename from js/components/whitelabel/prize/components/login_container.js rename to js/components/whitelabel/prize/components/prize_login_container.js diff --git a/js/components/whitelabel/prize/components/piece_list.js b/js/components/whitelabel/prize/components/prize_piece_list.js similarity index 100% rename from js/components/whitelabel/prize/components/piece_list.js rename to js/components/whitelabel/prize/components/prize_piece_list.js diff --git a/js/components/whitelabel/prize/components/register_piece.js b/js/components/whitelabel/prize/components/prize_register_piece.js similarity index 100% rename from js/components/whitelabel/prize/components/register_piece.js rename to js/components/whitelabel/prize/components/prize_register_piece.js diff --git a/js/components/whitelabel/prize/components/settings_container.js b/js/components/whitelabel/prize/components/prize_settings_container.js similarity index 100% rename from js/components/whitelabel/prize/components/settings_container.js rename to js/components/whitelabel/prize/components/prize_settings_container.js diff --git a/js/components/whitelabel/prize/components/signup_container.js b/js/components/whitelabel/prize/components/prize_signup_container.js similarity index 100% rename from js/components/whitelabel/prize/components/signup_container.js rename to js/components/whitelabel/prize/components/prize_signup_container.js diff --git a/js/components/whitelabel/prize/constants/api_urls.js b/js/components/whitelabel/prize/constants/prize_api_urls.js similarity index 89% rename from js/components/whitelabel/prize/constants/api_urls.js rename to js/components/whitelabel/prize/constants/prize_api_urls.js index 480e8d4f..8ef92daa 100644 --- a/js/components/whitelabel/prize/constants/api_urls.js +++ b/js/components/whitelabel/prize/constants/prize_api_urls.js @@ -1,8 +1,8 @@ 'use strict'; -import AppPrizeConstants from './application_prize_constants'; +import AppPrizeConstants from './prize_application_constants'; -function getApiUrls(subdomain) { +function getPrizeApiUrls(subdomain) { return { 'pieces_list': AppPrizeConstants.prizeApiEndpoint + subdomain + '/pieces/', 'users_login': AppPrizeConstants.prizeApiEndpoint + subdomain + '/users/login/', @@ -20,4 +20,4 @@ function getApiUrls(subdomain) { }; } -export default getApiUrls; +export default getPrizeApiUrls; diff --git a/js/components/whitelabel/prize/constants/application_prize_constants.js b/js/components/whitelabel/prize/constants/prize_application_constants.js similarity index 74% rename from js/components/whitelabel/prize/constants/application_prize_constants.js rename to js/components/whitelabel/prize/constants/prize_application_constants.js index 6026193b..9ba87a37 100644 --- a/js/components/whitelabel/prize/constants/application_prize_constants.js +++ b/js/components/whitelabel/prize/constants/prize_application_constants.js @@ -2,8 +2,8 @@ import AppConstants from '../../../../constants/application_constants'; -let constants = { +let prizeConstants = { prizeApiEndpoint: AppConstants.apiEndpoint + 'prizes/' }; -export default constants; \ No newline at end of file +export default prizeConstants; \ No newline at end of file diff --git a/js/components/whitelabel/prize/app.js b/js/components/whitelabel/prize/prize_app.js similarity index 95% rename from js/components/whitelabel/prize/app.js rename to js/components/whitelabel/prize/prize_app.js index 8876aa8c..137c2cf4 100644 --- a/js/components/whitelabel/prize/app.js +++ b/js/components/whitelabel/prize/prize_app.js @@ -2,7 +2,7 @@ import React from 'react'; import Router from 'react-router'; -import Hero from './components/hero'; +import Hero from './components/prize_hero'; import Header from '../../header'; // import Footer from '../../footer'; import GlobalNotification from '../../global_notification'; diff --git a/js/components/whitelabel/prize/routes.js b/js/components/whitelabel/prize/prize_routes.js similarity index 73% rename from js/components/whitelabel/prize/routes.js rename to js/components/whitelabel/prize/prize_routes.js index 16e57e50..1384d26b 100644 --- a/js/components/whitelabel/prize/routes.js +++ b/js/components/whitelabel/prize/prize_routes.js @@ -3,18 +3,18 @@ import React from 'react'; import Router from 'react-router'; -import Landing from './components/landing'; -import LoginContainer from './components/login_container'; +import Landing from './components/prize_landing'; +import LoginContainer from './components/prize_login_container'; import LogoutContainer from '../../../components/logout_container'; -import SignupContainer from './components/signup_container'; +import SignupContainer from './components/prize_signup_container'; import PasswordResetContainer from '../../../components/password_reset_container'; -import PrizeRegisterPiece from './components/register_piece'; -import PrizePieceList from './components/piece_list'; -import PrizePieceContainer from './components/ascribe_detail/piece_container'; +import PrizeRegisterPiece from './components/prize_register_piece'; +import PrizePieceList from './components/prize_piece_list'; +import PrizePieceContainer from './components/ascribe_detail/prize_piece_container'; import EditionContainer from '../../ascribe_detail/edition_container'; -import SettingsContainer from './components/settings_container'; +import SettingsContainer from './components/prize_settings_container'; -import App from './app'; +import App from './prize_app'; import AppConstants from '../../../constants/application_constants'; let Route = Router.Route; diff --git a/js/components/whitelabel/wallet/components/wallet_register_piece.js b/js/components/whitelabel/wallet/components/wallet_register_piece.js new file mode 100644 index 00000000..6b4d88fa --- /dev/null +++ b/js/components/whitelabel/wallet/components/wallet_register_piece.js @@ -0,0 +1,57 @@ +'use strict'; + +import React from 'react'; +import RegisterPiece from '../../../register_piece'; +import Property from '../../../ascribe_forms/property'; +import InputTextAreaToggable from '../../../ascribe_forms/input_textarea_toggable'; +import InputCheckbox from '../../../ascribe_forms/input_checkbox'; + +import { getLangText } from '../../../../utils/lang_utils'; + + +let WalletRegisterPiece = React.createClass({ + render() { + return ( + + + + + + + + + + + {' ' + getLangText('I agree to the Terms of Service the art price') + ' '} + ( + {getLangText('read')} + ) + + + + + ); + } +}); + +export default WalletRegisterPiece; diff --git a/js/components/whitelabel/wallet/constants/wallet_api_urls.js b/js/components/whitelabel/wallet/constants/wallet_api_urls.js new file mode 100644 index 00000000..60ee8658 --- /dev/null +++ b/js/components/whitelabel/wallet/constants/wallet_api_urls.js @@ -0,0 +1,11 @@ +'use strict'; + +import WalletAppConstants from './wallet_application_constants'; + +function getPrizeApiUrls(subdomain) { + return { + 'pieces_list': WalletAppConstants.walletApiEndpoint + subdomain + '/pieces/' + }; +} + +export default getPrizeApiUrls; \ No newline at end of file diff --git a/js/components/whitelabel/wallet/constants/wallet_application_constants.js b/js/components/whitelabel/wallet/constants/wallet_application_constants.js new file mode 100644 index 00000000..bc0d73fd --- /dev/null +++ b/js/components/whitelabel/wallet/constants/wallet_application_constants.js @@ -0,0 +1,9 @@ +'use strict'; + +import AppConstants from '../../../../constants/application_constants'; + +let walletConstants = { + walletApiEndpoint: AppConstants.apiEndpoint + 'wallets/' +}; + +export default walletConstants; \ No newline at end of file diff --git a/js/components/whitelabel/wallet/app.js b/js/components/whitelabel/wallet/wallet_app.js similarity index 100% rename from js/components/whitelabel/wallet/app.js rename to js/components/whitelabel/wallet/wallet_app.js diff --git a/js/components/whitelabel/wallet/routes.js b/js/components/whitelabel/wallet/wallet_routes.js similarity index 71% rename from js/components/whitelabel/wallet/routes.js rename to js/components/whitelabel/wallet/wallet_routes.js index 82cc458f..3dc07c6d 100644 --- a/js/components/whitelabel/wallet/routes.js +++ b/js/components/whitelabel/wallet/wallet_routes.js @@ -3,17 +3,17 @@ import React from 'react'; import Router from 'react-router'; -import LoginContainer from './components/login_container'; +import LoginContainer from '../../../components/login_container'; import LogoutContainer from '../../../components/logout_container'; -import SignupContainer from './components/signup_container'; +import SignupContainer from '../../../components/signup_container'; import PasswordResetContainer from '../../../components/password_reset_container'; import WalletRegisterPiece from './components/wallet_register_piece'; -import PieceList from '../../piece_list'; -import PieceContainer from '../../ascribe_detail/piece_container'; -import EditionContainer from '../../ascribe_detail/edition_container'; -import SettingsContainer from './components/settings_container'; +import PieceList from '../../../components/piece_list'; +import PieceContainer from '../../../components/ascribe_detail/piece_container'; +import EditionContainer from '../../../components/ascribe_detail/edition_container'; +import SettingsContainer from '../../../components/settings_container'; -import App from './app'; +import WalletApp from './wallet_app'; import AppConstants from '../../../constants/application_constants'; let Route = Router.Route; @@ -22,7 +22,7 @@ let baseUrl = AppConstants.baseUrl; function getRoutes() { return ( - + diff --git a/js/constants/api_urls.js b/js/constants/api_urls.js index c11a5df2..f56879e5 100644 --- a/js/constants/api_urls.js +++ b/js/constants/api_urls.js @@ -1,7 +1,10 @@ 'use strict'; import AppConstants from './application_constants'; -import getPrizeApiUrls from '../components/whitelabel/prize/constants/api_urls'; + +import getPrizeApiUrls from '../components/whitelabel/prize/constants/prize_api_urls'; +import getWalletApiUrls from '../components/whitelabel/wallet/constants/wallet_api_urls'; + import { update } from '../utils/general_utils'; @@ -62,6 +65,8 @@ export function updateApiUrls(type, subdomain) { if (type === 'prize') { newUrls = getPrizeApiUrls(subdomain); + } else if(type === 'wallet') { + newUrls = getWalletApiUrls(subdomain); } update(ApiUrls, newUrls); } diff --git a/js/routes.js b/js/routes.js index f7ea2ea6..4ee71070 100644 --- a/js/routes.js +++ b/js/routes.js @@ -3,7 +3,8 @@ import React from 'react'; import Router from 'react-router'; -import getPrizeRoutes from './components/whitelabel/prize/routes'; +import getPrizeRoutes from './components/whitelabel/prize/prize_routes'; +import getWalletRoutes from './components/whitelabel/wallet/wallet_routes'; import getDefaultRoutes from './components/routes'; import PieceList from './components/piece_list'; @@ -47,6 +48,8 @@ function getRoutes(type) { if (type === 'prize') { routes = getPrizeRoutes(COMMON_ROUTES); + } else if(type === 'wallet') { + routes = getWalletRoutes(COMMON_ROUTES); } else { routes = getDefaultRoutes(COMMON_ROUTES); }