diff --git a/gulpfile.js b/gulpfile.js
index afa0d5a9..01b7c350 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -73,8 +73,8 @@ gulp.task('js:build', function() {
gulp.task('serve', ['browser-sync', 'run-server', 'sass:build', 'sass:watch', 'copy'], function() {
bundle(true);
- // opens the browser window with the correct url, which is localhost.com
- opn('http://www.localhost.com:3000');
+ // opens the browser window with the correct url, which is localhost:300
+ opn('http://localhost:3000');
});
gulp.task('jest', function(done) {
diff --git a/js/components/header.js b/js/components/header.js
index 6863dc5d..84e66e39 100644
--- a/js/components/header.js
+++ b/js/components/header.js
@@ -130,7 +130,6 @@ let Header = React.createClass({
const { unfilteredPieceListCount } = this.state;
let account;
- let signup;
let navRoutesLinks;
if (currentUser.username) {
@@ -188,13 +187,6 @@ let Header = React.createClass({
);
- signup = (
-
-
- {getLangText('SIGNUP')}
-
-
- );
}
return (
@@ -216,7 +208,6 @@ let Header = React.createClass({
{navRoutesLinks}
diff --git a/js/components/login_container.js b/js/components/login_container.js
index c66d0b21..9c804df3 100644
--- a/js/components/login_container.js
+++ b/js/components/login_container.js
@@ -31,7 +31,6 @@ let LoginContainer = React.createClass({
location={location}
whitelabelName={whitelabelName} />
- {getLangText(`Not a ${whitelabelName || 'ascribe'} user`)}? {getLangText('Sign up')}...
{getLangText('Forgot my password')}? {getLangText('Rescue me')}...
diff --git a/js/components/whitelabel/prize/portfolioreview/components/pr_landing.js b/js/components/whitelabel/prize/portfolioreview/components/pr_landing.js
index 4cb925a8..2114ddf4 100644
--- a/js/components/whitelabel/prize/portfolioreview/components/pr_landing.js
+++ b/js/components/whitelabel/prize/portfolioreview/components/pr_landing.js
@@ -57,15 +57,6 @@ const PRLanding = React.createClass({
if (this.state.prize && this.state.prize.active) {
return (
-
-
-
-
-
- {getLangText('or, already an ascribe user?')}
-
-
-
- {getLangText('Do you need an account?')}
-
-
-
- {getLangText('Sign up')}
-
-
-
diff --git a/js/components/whitelabel/wallet/components/lumenus/lumenus_landing.js b/js/components/whitelabel/wallet/components/lumenus/lumenus_landing.js
index 093b0ad1..e0d0c435 100644
--- a/js/components/whitelabel/wallet/components/lumenus/lumenus_landing.js
+++ b/js/components/whitelabel/wallet/components/lumenus/lumenus_landing.js
@@ -48,16 +48,6 @@ let LumenusLanding = React.createClass({
-
-
- {getLangText('Do you need an account?')}
-
-
-
- {getLangText('Sign up')}
-
-
-
diff --git a/js/components/whitelabel/wallet/components/market/market_landing.js b/js/components/whitelabel/wallet/components/market/market_landing.js
index 9b14804e..63d4b3c1 100644
--- a/js/components/whitelabel/wallet/components/market/market_landing.js
+++ b/js/components/whitelabel/wallet/components/market/market_landing.js
@@ -52,16 +52,6 @@ let MarketLanding = React.createClass({
-
-
- {getLangText('Do you need an account?')}
-
-
-
- {getLangText('Sign up')}
-
-
-
diff --git a/js/components/whitelabel/wallet/components/polline/polline_landing.js b/js/components/whitelabel/wallet/components/polline/polline_landing.js
index c27d56c6..d4778f94 100644
--- a/js/components/whitelabel/wallet/components/polline/polline_landing.js
+++ b/js/components/whitelabel/wallet/components/polline/polline_landing.js
@@ -46,16 +46,6 @@ let PollineLanding = React.createClass({
-
-
- {getLangText('Do you need an account?')}
-
-
-
- {getLangText('Sign up')}
-
-
-
diff --git a/js/components/whitelabel/wallet/wallet_routes.js b/js/components/whitelabel/wallet/wallet_routes.js
index 007fd657..1d84433d 100644
--- a/js/components/whitelabel/wallet/wallet_routes.js
+++ b/js/components/whitelabel/wallet/wallet_routes.js
@@ -1,7 +1,7 @@
'use strict';
import React from 'react';
-import { Route, IndexRoute } from 'react-router';
+import { Route, IndexRoute, Redirect } from 'react-router';
import { ProxyHandler, AuthRedirect } from '../../../components/ascribe_routes/proxy_handler';
@@ -9,7 +9,6 @@ import { ProxyHandler, AuthRedirect } from '../../../components/ascribe_routes/p
import CoaVerifyContainer from '../../../components/coa_verify_container';
import LoginContainer from '../../../components/login_container';
import LogoutContainer from '../../../components/logout_container';
-import SignupContainer from '../../../components/signup_container';
import PasswordResetContainer from '../../../components/password_reset_container';
import PieceList from '../../../components/piece_list';
import PieceContainer from '../../../components/ascribe_detail/piece_container';
@@ -69,9 +68,8 @@ let ROUTES = {
-
+
+
@@ -113,9 +111,8 @@ let ROUTES = {
-
+
+
@@ -158,9 +155,8 @@ let ROUTES = {
-
+
+
@@ -212,9 +208,8 @@ let ROUTES = {
-
+
+
@@ -259,10 +254,8 @@ let ROUTES = {
path='logout'
component={ProxyHandler(AuthRedirect({to: '/', when: 'loggedOut'}))(LogoutContainer)}
footer={MarketFooter} />
-
+
+
-
+
+
@@ -351,9 +343,8 @@ let ROUTES = {
-
+
+
@@ -388,9 +379,8 @@ let ROUTES = {
-
+
+
@@ -425,9 +415,8 @@ let ROUTES = {
-
+
+
@@ -461,9 +450,8 @@ let ROUTES = {
-
+
+
diff --git a/js/routes.js b/js/routes.js
index 6baba4de..48548b93 100644
--- a/js/routes.js
+++ b/js/routes.js
@@ -1,7 +1,7 @@
'use strict';
import React from 'react';
-import { Route } from 'react-router';
+import { Route, Redirect } from 'react-router';
import getPrizeRoutes from './components/whitelabel/prize/prize_routes';
import getWalletRoutes from './components/whitelabel/wallet/wallet_routes';
@@ -14,7 +14,6 @@ import EditionContainer from './components/ascribe_detail/edition_container';
import LoginContainer from './components/login_container';
import LogoutContainer from './components/logout_container';
-import SignupContainer from './components/signup_container';
import PasswordResetContainer from './components/password_reset_container';
import ContractSettings from './components/ascribe_settings/contract_settings';
@@ -49,10 +48,8 @@ const COMMON_ROUTES = (
headerTitle={getLangText('COLLECTION')}
disableOn='noPieces'
footer={Footer} />
-
+
+
{
.capture('hover on login submit', (actions, find) => {
actions.mouseMove(find('.ascribe-form button[type=submit]'));
})
- .capture('hover on sign up link', (actions, find) => {
- actions.mouseMove(find('.ascribe-login-text a[href="/signup"]'));
- })
.capture('login form filled with focus', (actions, find) => {
const emailInput = find('.ascribe-form input[name=email]');
@@ -94,22 +91,6 @@ gemini.suite('Basic', (suite) => {
});
});
- gemini.suite('Sign up', (signUpSuite) => {
- signUpSuite
- .setUrl('/signup')
- .capture('sign up', (actions, find) => {
- actions.waitForElementToShow('.ascribe-form', TIMEOUTS.NORMAL);
- })
- .capture('sign up form filled with focus', (actions, find) => {
- actions.sendKeys(find('.ascribe-form input[name=email]'), MAIN_USER.email);
- actions.sendKeys(find('.ascribe-form input[name=password]'), MAIN_USER.password);
- actions.sendKeys(find('.ascribe-form input[name=password_confirm]'), MAIN_USER.password);
- })
- .capture('sign up form filled with check', (actions, find) => {
- actions.click(find('.ascribe-form input[type="checkbox"] ~ .checkbox'));
- });
- });
-
gemini.suite('Password reset', (passwordResetSuite) => {
passwordResetSuite
.setUrl('/password_reset')
diff --git a/test/gemini/tests/whitelabel/ikonotv/ikonotv.js b/test/gemini/tests/whitelabel/ikonotv/ikonotv.js
index 81e936e9..d1556854 100644
--- a/test/gemini/tests/whitelabel/ikonotv/ikonotv.js
+++ b/test/gemini/tests/whitelabel/ikonotv/ikonotv.js
@@ -59,9 +59,6 @@ gemini.suite('Ikonotv', (suite) => {
.capture('hover on login submit', (actions, find) => {
actions.mouseMove(find('.ascribe-form button[type=submit]'));
})
- .capture('hover on sign up link', (actions, find) => {
- actions.mouseMove(find('.ascribe-login-text a[href="/signup"]'));
- })
.capture('login form filled with focus', (actions, find) => {
const emailInput = find('.ascribe-form input[name=email]');
@@ -75,20 +72,6 @@ gemini.suite('Ikonotv', (suite) => {
actions.click(find('.ascribe-form-header'));
});
});
-
- gemini.suite('Sign up', (signUpSuite) => {
- signUpSuite
- .setUrl('/signup')
- .capture('sign up')
- .capture('sign up form filled with focus', (actions, find) => {
- actions.sendKeys(find('.ascribe-form input[name=email]'), MAIN_USER.email);
- actions.sendKeys(find('.ascribe-form input[name=password]'), MAIN_USER.password);
- actions.sendKeys(find('.ascribe-form input[name=password_confirm]'), MAIN_USER.password);
- })
- .capture('sign up form filled with check', (actions, find) => {
- actions.click(find('.ascribe-form input[type="checkbox"] ~ .checkbox'));
- });
- });
});
// TODO: add more tests for ikonotv specific pages after authentication
diff --git a/test/gemini/tests/whitelabel/shared/whitelabel_basic.js b/test/gemini/tests/whitelabel/shared/whitelabel_basic.js
index 0d5ac26b..61501268 100644
--- a/test/gemini/tests/whitelabel/shared/whitelabel_basic.js
+++ b/test/gemini/tests/whitelabel/shared/whitelabel_basic.js
@@ -37,9 +37,6 @@ gemini.suite('Whitelabel basic', (suite) => {
.capture('hover on login submit', (actions, find) => {
actions.mouseMove(find('.ascribe-form button[type=submit]'));
})
- .capture('hover on sign up link', (actions, find) => {
- actions.mouseMove(find('.ascribe-login-text a[href="/signup"]'));
- })
.capture('login form filled with focus', (actions, find) => {
const emailInput = find('.ascribe-form input[name=email]');
@@ -54,26 +51,6 @@ gemini.suite('Whitelabel basic', (suite) => {
});
});
- gemini.suite('Sign up', (signUpSuite) => {
- signUpSuite
- .setUrl('/signup')
- // See Ikono
- .skip(/Ikono/)
- .capture('sign up', (actions, find) => {
- actions.waitForElementToShow('.ascribe-form', TIMEOUTS.NORMAL);
- // Wait in case the form reloads due to other assets loading
- actions.wait(500);
- })
- .capture('sign up form filled with focus', (actions, find) => {
- actions.sendKeys(find('.ascribe-form input[name=email]'), MAIN_USER.email);
- actions.sendKeys(find('.ascribe-form input[name=password]'), MAIN_USER.password);
- actions.sendKeys(find('.ascribe-form input[name=password_confirm]'), MAIN_USER.password);
- })
- .capture('sign up form filled with check', (actions, find) => {
- actions.click(find('.ascribe-form input[type="checkbox"] ~ .checkbox'));
- });
- });
-
gemini.suite('Password reset', (passwordResetSuite) => {
passwordResetSuite
.setUrl('/password_reset')