feat(signup): add TC and PP, confirm password

packages/components-faraday/src/components/SignUp/SignUpInvitationForm.js

@@ -17,6 +17,7 @@ const SignUpInvitation = ({
   journal,
   onSubmit,
   nextStep,
+  prevStep,
   initialValues,
   type = 'invitation',
   subtitle = defaultSubtitle,
@@ -41,6 +42,7 @@ const SignUpInvitation = ({
         initialValues={initialValues}
         journal={journal}
         onSubmit={onSubmit}
+        prevStep={prevStep}
         type={type}
       />
     )}

packages/components-faraday/src/components/SignUp/SignUpInvitationPage.js

@@ -65,20 +65,19 @@ export default compose(
     nextStep: ({ changeStep }) => () => changeStep(step => step + 1),
     prevStep: ({ changeStep }) => () => changeStep(step => step - 1),
     submitConfirmation: ({
-      initialValues: { email, token },
+      initialValues: { email = '', token = '' },
       history,
-      ...rest
     }) => confirmUser(email, token, history),
     signUp: ({ history }) => signUpUser(history),
   }),
   withProps(({ location, type, signUp, submitConfirmation }) => {
     const params = new URLSearchParams(location.search)
-    const email = params.get('email')
-    const token = params.get('token')
-    const title = params.get('title')
-    const lastName = params.get('lastName')
-    const firstName = params.get('firstName')
-    const affiliation = params.get('affiliation')
+    const email = params.get('email') || ''
+    const token = params.get('token') || ''
+    const title = params.get('title') || ''
+    const lastName = params.get('lastName') || ''
+    const firstName = params.get('firstName') || ''
+    const affiliation = params.get('affiliation') || ''
 
     return {
       initialValues: {

packages/components-faraday/src/components/SignUp/SignUpStep0.js

@@ -2,11 +2,18 @@ import React from 'react'
 import { isUndefined } from 'lodash'
 import { reduxForm } from 'redux-form'
 import { required } from 'xpub-validators'
-import { Button, ValidatedField, TextField, Menu } from '@pubsweet/ui'
+import { Button, ValidatedField, TextField, Menu, Checkbox } from '@pubsweet/ui'
 
 import { FormItems } from '../UIComponents'
 
-const { FormContainer, Row, RowItem, Label } = FormItems
+const {
+  FormContainer,
+  Row,
+  RowItem,
+  Label,
+  PrivatePolicy,
+  DefaultText,
+} = FormItems
 
 const Step0 = ({ journal, handleSubmit, initialValues, error }) =>
   !isUndefined(initialValues) ? (
@@ -48,6 +55,29 @@ const Step0 = ({ journal, handleSubmit, initialValues, error }) =>
           />
         </RowItem>
       </Row>
+      <Row justify="left">
+        <ValidatedField
+          component={input => (
+            <Checkbox checked={input.value} type="checkbox" {...input} />
+          )}
+          name="agreeTC"
+          validate={[required]}
+        />
+        <DefaultText>
+          By creating this account, you agree to the{' '}
+          <a href="https://www.hindawi.com/terms/">Terms of Service</a>.
+        </DefaultText>
+      </Row>
+      <Row>
+        <PrivatePolicy>
+          This account information will be processed by us in accordance with
+          our Privacy Policy for the purpose of registering your Faraday account
+          and allowing you to use the services available via the Faraday
+          platform. Please read our{' '}
+          <a href="https://www.hindawi.com/privacy/">Privacy Policy</a> for
+          further information.
+        </PrivatePolicy>
+      </Row>
       <Row>
         <RowItem centered>
           <Button primary type="submit">

packages/components-faraday/src/components/SignUp/SignUpStep1.js

@@ -4,13 +4,14 @@ import { required } from 'xpub-validators'
 import { Button, ValidatedField, TextField } from '@pubsweet/ui'
 
 import { FormItems } from '../UIComponents'
+import { passwordValidator, emailValidator } from '../utils'
 
 const { Row, Err, Label, RowItem, FormContainer } = FormItems
 
 const PasswordField = input => <TextField {...input} type="password" />
 const EmailField = input => <TextField {...input} type="email" />
 
-const Step1 = ({ journal, handleSubmit, error, type }) => (
+const Step1 = ({ handleSubmit, error, type, prevStep }) => (
   <FormContainer onSubmit={handleSubmit}>
     {type === 'signup' && (
       <Row>
@@ -19,7 +20,7 @@ const Step1 = ({ journal, handleSubmit, error, type }) => (
           <ValidatedField
             component={EmailField}
             name="email"
-            validate={[required]}
+            validate={[required, emailValidator]}
           />
         </RowItem>
       </Row>
@@ -52,6 +53,9 @@ const Step1 = ({ journal, handleSubmit, error, type }) => (
       </Row>
     )}
     <Row>
+      <Button onClick={prevStep} type="button">
+        BACK
+      </Button>
       <Button primary type="submit">
         CONFIRM
       </Button>
@@ -63,4 +67,5 @@ export default reduxForm({
   form: 'signUpInvitation',
   destroyOnUnmount: false,
   forceUnregisterOnUnmount: true,
+  validate: passwordValidator,
 })(Step1)

packages/components-faraday/src/components/UIComponents/FormItems.js

@@ -7,6 +7,9 @@ const defaultText = css`
   font-family: ${th('fontReading')};
   font-size: ${th('fontSizeBaseSmall')};
 `
+export const DefaultText = styled.div`
+  ${defaultText};
+`
 
 export const RootContainer = styled.div`
   background-color: ${th('backgroundColorReverse')};
@@ -49,7 +52,7 @@ export const Row = styled.div`
   align-items: flex-start;
   display: flex;
   flex-direction: row;
-  justify-content: space-evenly;
+  justify-content: ${({ justify }) => justify || 'space-evenly'};
   margin: ${({ noMargin }) =>
     noMargin ? 0 : css`calc(${th('subGridUnit')} * 2) 0`};
 
@@ -126,4 +129,9 @@ export const CustomRadioGroup = styled.div`
   }
 `
 
+export const PrivatePolicy = styled.div`
+  ${defaultText};
+  text-align: justify;
+`
+
 export const TextAreaField = input => <Textarea {...input} height={70} />

packages/components-faraday/src/components/utils.js

@@ -74,6 +74,20 @@ const generatePasswordHash = () =>
       .slice(4),
   ).join('')
 
+export const passwordValidator = values => {
+  const errors = {}
+  if (!values.password) {
+    errors.password = 'Required'
+  }
+  if (!values.confirmPassword) {
+    errors.confirmPassword = 'Required'
+  } else if (values.confirmPassword !== values.password) {
+    errors.confirmPassword = 'Password mismatched'
+  }
+
+  return errors
+}
+
 export const parseSignupAuthor = ({ token, confirmPassword, ...values }) => ({
   ...values,
   admin: false,

packages/xpub-faraday/config/validations.js

@@ -125,6 +125,7 @@ module.exports = {
     handlingEditor: Joi.boolean(),
     invitationToken: Joi.string().allow(''),
     confirmationToken: Joi.string().allow(''),
+    agreeTC: Joi.boolean(),
   },
   team: {
     group: Joi.string(),