From 556bf0c39c2b9c095f50269177bb93284ca51342 Mon Sep 17 00:00:00 2001
From: Bogdan Cochior <bogdan.cochior@thinslices.com>
Date: Thu, 5 Jul 2018 12:58:39 +0300
Subject: [PATCH] style(signup): fix UI error issues
---
.../src/components/Admin/EditUserForm.js | 3 +++
.../src/components/SignUp/SignUpInvitationForm.js | 2 --
.../src/components/SignUp/SignUpInvitationPage.js | 14 +++++++++++---
.../src/components/UIComponents/FormItems.js | 2 +-
4 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/packages/components-faraday/src/components/Admin/EditUserForm.js b/packages/components-faraday/src/components/Admin/EditUserForm.js
index 20971b7fa..716b8f55a 100644
--- a/packages/components-faraday/src/components/Admin/EditUserForm.js
+++ b/packages/components-faraday/src/components/Admin/EditUserForm.js
@@ -113,6 +113,9 @@ const Row = styled.div`
const RowItem = styled.div`
flex: 1;
margin-right: calc(${th('subGridUnit')}*3);
+ label + div[role='alert'] {
+ margin-top: 0;
+ }
`
const Title = styled.h4`
diff --git a/packages/components-faraday/src/components/SignUp/SignUpInvitationForm.js b/packages/components-faraday/src/components/SignUp/SignUpInvitationForm.js
index 41ff717c9..798ee6587 100644
--- a/packages/components-faraday/src/components/SignUp/SignUpInvitationForm.js
+++ b/packages/components-faraday/src/components/SignUp/SignUpInvitationForm.js
@@ -11,8 +11,6 @@ your password.`
const SignUpInvitation = ({
step,
- email,
- token,
error,
journal,
onSubmit,
diff --git a/packages/components-faraday/src/components/SignUp/SignUpInvitationPage.js b/packages/components-faraday/src/components/SignUp/SignUpInvitationPage.js
index 177421d07..89bed246e 100644
--- a/packages/components-faraday/src/components/SignUp/SignUpInvitationPage.js
+++ b/packages/components-faraday/src/components/SignUp/SignUpInvitationPage.js
@@ -6,7 +6,7 @@ import { loginUser } from 'pubsweet-component-login/actions'
import { compose, withState, withProps, withHandlers } from 'recompose'
import SignUpInvitation from './SignUpInvitationForm'
-import { handleError, parseSignupAuthor } from '../utils'
+import { parseSignupAuthor } from '../utils'
const login = (dispatch, values, history) =>
dispatch(loginUser(values))
@@ -18,7 +18,7 @@ const login = (dispatch, values, history) =>
if (err) {
const errorMessage = get(JSON.parse(err), 'error')
throw new SubmissionError({
- password: errorMessage || 'Something went wrong',
+ confirmPassword: errorMessage || 'Something went wrong',
})
}
})
@@ -56,7 +56,15 @@ const signUpUser = history => (values, dispatch) =>
})
})
})
- .catch(handleError)
+ .catch(error => {
+ const err = get(error, 'response')
+ if (err) {
+ const errorMessage = get(JSON.parse(err), 'message')
+ throw new SubmissionError({
+ confirmPassword: errorMessage || 'Something went wrong',
+ })
+ }
+ })
export default compose(
withJournal,
diff --git a/packages/components-faraday/src/components/UIComponents/FormItems.js b/packages/components-faraday/src/components/UIComponents/FormItems.js
index fae32ecf2..3d8841a25 100644
--- a/packages/components-faraday/src/components/UIComponents/FormItems.js
+++ b/packages/components-faraday/src/components/UIComponents/FormItems.js
@@ -56,7 +56,7 @@ export const Row = styled.div`
margin: ${({ noMargin }) =>
noMargin ? 0 : css`calc(${th('subGridUnit')} * 2) 0`};
- div[role='alert'] {
+ label + div[role='alert'] {
margin-top: 0;
}
`
--
GitLab