Merge branch 'hindawi-theme' of gitlab.coko.foundation:xpub/xpub-faraday into hindawi-theme

packages/component-manuscript-manager/src/routes/fragments/notifications/notifications.js

@@ -227,6 +227,7 @@ const sendAuthorsEmail = async ({
       return {
         ...author,
         isConfirmed: user.isConfirmed,
+        passwordResetToken: user.passwordResetToken,
         ...getEmailCopy({
           customId,
           emailType: author.isSubmitting

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

@@ -27,6 +27,7 @@ const SignUpInvitation = ({
         initialValues={initialValues}
         journal={journal}
         onSubmit={nextStep}
+        type={type}
       />
     )}
     {step === 1 && (

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

@@ -76,7 +76,7 @@ export default compose(
           return {
             onSubmitText: 'CONFIRM',
             onSubmit: confirmInvitation,
-            onBack: () => history.push('/'),
+            onBack: prevStep,
           }
       }
     },

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

@@ -32,7 +32,7 @@ const AgreeCheckbox = ({ value, onChange }) => (
   </Row>
 )
 
-const Step0 = ({ journal, handleSubmit, initialValues, error }) =>
+const Step0 = ({ journal, handleSubmit, initialValues, error, type }) =>
   !isUndefined(initialValues) ? (
     <Fragment>
       <Row mb={2} mt={3}>
@@ -55,7 +55,7 @@ const Step0 = ({ journal, handleSubmit, initialValues, error }) =>
       </Row>
 
       <Row mb={2}>
-        <Item mr={1} vertical>
+        <ItemOverrideAlert mr={1} vertical>
           <Label required>Title</Label>
           <ValidatedField
             component={input => (
@@ -68,7 +68,7 @@ const Step0 = ({ journal, handleSubmit, initialValues, error }) =>
             name="title"
             validate={[requiredValidator]}
           />
-        </Item>
+        </ItemOverrideAlert>
         <ItemOverrideAlert ml={1} vertical>
           <Label required>Country</Label>
           <ValidatedField
@@ -116,7 +116,7 @@ const Step0 = ({ journal, handleSubmit, initialValues, error }) =>
       </Row>
 
       <Button mt={4} onClick={handleSubmit}>
-        PROCEED TO SET EMAIL AND PASSWORD
+        PROCEED TO SET {type === 'signup' && 'EMAIL AND'} PASSWORD
       </Button>
 
       <Row mt={3}>

packages/hindawi-theme/src/elements/Menu.js

@@ -20,6 +20,7 @@ export default {
     color: ${th('colorText')};
     line-height: ${th('gridUnit')};
     padding: 0 ${th('gridUnit')};
+    font-family: ${th('fontWriting')};
   `,
   Opener: css`
     border-color: ${props =>

packages/xpub-faraday/config/upload-validations.js

@@ -6,7 +6,8 @@ module.exports = {
       'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
       'application/pdf',
       'application/msword',
-      'application/vnd.oasis.opendocument.tex',
+      'application/vnd.oasis.opendocument.text',
+      'text/plain',
       'application/rdf+xml',
     ])
     .error(new Error('Document type is not allowed.')),
@@ -16,7 +17,8 @@ module.exports = {
       'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
       'application/pdf',
       'application/msword',
-      'application/vnd.oasis.opendocument.tex',
+      'application/vnd.oasis.opendocument.text',
+      'text/plain',
       'application/rdf+xml',
     ])
     .error(new Error('Document type is not allowed.')),
@@ -25,6 +27,9 @@ module.exports = {
       'application/vnd.openxmlformats-officedocument.wordprocessingml.document',
       'application/pdf',
       'application/msword',
+      'application/vnd.oasis.opendocument.text',
+      'text/plain',
+      'application/rdf+xml',
     ])
     .error(new Error('Document type is not allowed.')),
   review: Joi.any(),