Refactor login and signup

js/components/ascribe_forms/form_register_piece.js

@@ -17,6 +17,12 @@ import { getLangText } from '../../utils/lang_utils';
 
 
 let RegisterPieceForm = React.createClass({
+    propTypes: {
+        handleSuccess: React.PropTypes.func,
+        isFineUploaderEditable: React.PropTypes.bool,
+        children: React.PropTypes.element
+    },
+
     getInitialState(){
         return {
             digitalWorkKey: null,

js/components/ascribe_forms/form_signup.js

@@ -23,7 +23,8 @@ let SignupForm = React.createClass({
     propTypes: {
         headerMessage: React.PropTypes.string,
         submitMessage: React.PropTypes.string,
-        handleSuccess: React.PropTypes.func
+        handleSuccess: React.PropTypes.func,
+        children: React.PropTypes.element
     },
 
     mixins: [Router.Navigation],
@@ -120,13 +121,7 @@ let SignupForm = React.createClass({
                         autoComplete="on"
                         required/>
                 </Property>
-                <Property
+                {this.props.children}
-                    name='promo_code'
-                    label={getLangText('Promocode')}>
-                    <input
-                        type="text"
-                        placeholder={getLangText('Enter a promocode here (Optional)')}/>
-                </Property>
                 <Property
                     name="terms"
                     className="ascribe-settings-property-collapsible-toggle"
@@ -138,4 +133,5 @@ let SignupForm = React.createClass({
     }
 });
 
+
 export default SignupForm;

js/components/register_piece.js

@@ -27,7 +27,6 @@ import SlidesContainer from './ascribe_slides_container/slides_container';
 
 
 import { mergeOptions } from '../utils/general_utils';
-import { getCookie } from '../utils/fetch_api_utils';
 import { getLangText } from '../utils/lang_utils';
 
 let RegisterPiece = React.createClass( {

js/components/signup_container.js

@@ -2,8 +2,10 @@
 
 import React from 'react';
 import SignupForm from './ascribe_forms/form_signup';
+import Property from './ascribe_forms/property';
+
+import { getLangText } from '../utils/lang_utils';
 
-// import { getLangText } from '../utils/lang_utils';
 
 let SignupContainer = React.createClass({
     getInitialState() {
@@ -33,8 +35,15 @@ let SignupContainer = React.createClass({
         }
         return (
             <div className="ascribe-login-wrapper">
-                <br/>
+                <SignupForm>
-                <SignupForm handleSuccess={this.handleSuccess}/>
+                    <Property
+                        name='promo_code'
+                        label={getLangText('Promocode')}>
+                        <input
+                            type="text"
+                            placeholder={getLangText('Enter a promocode here (Optional)')}/>
+                    </Property>
+                </SignupForm>
             </div>
         );
     }

js/components/whitelabel/prize/routes.js

@@ -22,6 +22,7 @@ function getRoutes(commonRoutes) {
             <Route name="login" path="login" handler={LoginContainer} />
             <Route name="signup" path="signup" handler={SignupContainer} />
             <Route name="password_reset" path="password_reset" handler={PasswordResetContainer} />
+            <Route name="register_piece" path="register_piece" handler={RegisterPiece} />
         </Route>
     );
 }