From 0ab41922aa2938f8ef2336b3882b049fa390d47e Mon Sep 17 00:00:00 2001
From: uzairr <uzairr@yahoo.com>
Date: Tue, 5 Jan 2021 03:44:34 +0500
Subject: [PATCH] fix spacing issues on login and register page

---
 src/logistration/InstitutionLogistration.jsx         |  4 ++--
 src/logistration/LoginPage.jsx                       |  4 ++--
 src/logistration/RegistrationPage.jsx                |  4 ++--
 src/logistration/messages.jsx                        |  2 +-
 src/logistration/tests/LoginPage.test.jsx            |  5 +++--
 src/logistration/tests/RegistrationPage.test.jsx     |  2 +-
 .../tests/__snapshots__/LoginPage.test.jsx.snap      | 10 +++++-----
 .../__snapshots__/RegistrationPage.test.jsx.snap     | 12 ++++++------
 8 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/logistration/InstitutionLogistration.jsx b/src/logistration/InstitutionLogistration.jsx
index eb058b54..f8475cf1 100644
--- a/src/logistration/InstitutionLogistration.jsx
+++ b/src/logistration/InstitutionLogistration.jsx
@@ -10,7 +10,7 @@ export const RenderInstitutionButton = props => {
   if (secondaryProviders !== undefined && secondaryProviders.length > 0) {
     return (
       <Button
-        className="mb-2"
+        className="mb-2 mt-2"
         block
         variant="outline-primary"
         onClick={onSubmitHandler}
@@ -55,7 +55,7 @@ const InstitutionLogistration = props => {
             <h4>or</h4>
           </div>
           <Button
-            variant="outline-primary"
+            variant="primary"
             onClick={onSubmitHandler}
           >
             {buttonTitle}
diff --git a/src/logistration/LoginPage.jsx b/src/logistration/LoginPage.jsx
index 0e2967be..734df297 100644
--- a/src/logistration/LoginPage.jsx
+++ b/src/logistration/LoginPage.jsx
@@ -170,7 +170,7 @@ class LoginPage extends React.Component {
                     secondaryProviders={thirdPartyAuthContext.secondaryProviders}
                     buttonTitle={intl.formatMessage(messages['logistration.login.institution.login.button'])}
                   />
-                  <div className="mb-4">
+                  <div className="mb-4 mt-3">
                     <h4>{intl.formatMessage(messages['logistration.or.sign.in.with'])}</h4>
                   </div>
                 </>
@@ -218,7 +218,7 @@ class LoginPage extends React.Component {
                 </Hyperlink>
                 <StatefulButton
                   type="submit"
-                  className="btn-primary submit"
+                  className="btn-primary"
                   state={submitState}
                   labels={{
                     default: intl.formatMessage(messages['logistration.sign.in.button']),
diff --git a/src/logistration/RegistrationPage.jsx b/src/logistration/RegistrationPage.jsx
index 9731fdc8..f01837e0 100644
--- a/src/logistration/RegistrationPage.jsx
+++ b/src/logistration/RegistrationPage.jsx
@@ -466,7 +466,7 @@ class RegistrationPage extends React.Component {
                   <h4 className="d-block mx-auto mb-4">
                     {intl.formatMessage(messages['logistration.create.an.account.using'])}
                   </h4>
-                  <div className="row tpa-container">
+                  <div className="row tpa-container mb-3">
                     <SocialAuthProviders socialAuthProviders={providers} referrer={REGISTER_PAGE} />
                   </div>
                   <RenderInstitutionButton
@@ -579,7 +579,7 @@ class RegistrationPage extends React.Component {
                 { this.state.enableOptionalField ? this.addExtraOptionalFields() : null}
                 <StatefulButton
                   type="button"
-                  className="btn-primary submit mt-4"
+                  className="btn-primary"
                   state={submitState}
                   labels={{
                     default: intl.formatMessage(messages['logistration.create.account.button']),
diff --git a/src/logistration/messages.jsx b/src/logistration/messages.jsx
index 27018d60..c7758c4c 100644
--- a/src/logistration/messages.jsx
+++ b/src/logistration/messages.jsx
@@ -7,7 +7,7 @@ const messages = defineMessages({
     description: 'Button label that appears on login page',
   },
   'logistration.create.account.button': {
-    id: 'ogistration.create.account.button',
+    id: 'logistration.create.account.button',
     defaultMessage: 'Create Account',
     description: 'Button label that appears on register page',
   },
diff --git a/src/logistration/tests/LoginPage.test.jsx b/src/logistration/tests/LoginPage.test.jsx
index 93afdd1f..02e6cbad 100644
--- a/src/logistration/tests/LoginPage.test.jsx
+++ b/src/logistration/tests/LoginPage.test.jsx
@@ -127,7 +127,8 @@ describe('LoginPage', () => {
     const loginPage = mount(reduxWrapper(<IntlLoginPage {...props} />));
 
     loginPage.find('input#loginPassword').simulate('change', { target: { value: 'test', name: 'password' } });
-    loginPage.find('button.submit').simulate('click');
+    loginPage.find('button.btn-primary').simulate('click');
+
     expect(loginPage.find('LoginPage').state('errors')).toEqual(errorState);
   });
 
@@ -136,7 +137,7 @@ describe('LoginPage', () => {
     const loginPage = mount(reduxWrapper(<IntlLoginPage {...props} />));
 
     loginPage.find('input#loginEmail').simulate('change', { target: { value: 'test@example.com', name: 'email' } });
-    loginPage.find('button.submit').simulate('click');
+    loginPage.find('button.btn-primary').simulate('click');
     expect(loginPage.find('LoginPage').state('errors')).toEqual(errorState);
   });
 
diff --git a/src/logistration/tests/RegistrationPage.test.jsx b/src/logistration/tests/RegistrationPage.test.jsx
index 95714f6c..682e5c1e 100644
--- a/src/logistration/tests/RegistrationPage.test.jsx
+++ b/src/logistration/tests/RegistrationPage.test.jsx
@@ -219,7 +219,7 @@ describe('./RegistrationPage.js', () => {
     store.dispatch = jest.fn(store.dispatch);
 
     const registrationPage = mount(reduxWrapper(<IntlRegistrationPage {...props} />));
-    registrationPage.find('button.submit').simulate('click');
+    registrationPage.find('button.btn-primary').simulate('click');
     expect(store.dispatch).not.toHaveBeenCalledWith(registerNewUser(formPayload));
   });
 
diff --git a/src/logistration/tests/__snapshots__/LoginPage.test.jsx.snap b/src/logistration/tests/__snapshots__/LoginPage.test.jsx.snap
index 4d7a9234..e8b57928 100644
--- a/src/logistration/tests/__snapshots__/LoginPage.test.jsx.snap
+++ b/src/logistration/tests/__snapshots__/LoginPage.test.jsx.snap
@@ -141,7 +141,7 @@ exports[`LoginPage should match TPA provider snapshot 1`] = `
         <button
           aria-disabled={false}
           aria-live="assertive"
-          className="pgn__stateful-btn pgn__stateful-btn-state-default btn-primary submit btn btn-primary"
+          className="pgn__stateful-btn pgn__stateful-btn-state-default btn-primary btn btn-primary"
           disabled={false}
           onClick={[Function]}
           type="submit"
@@ -333,7 +333,7 @@ exports[`LoginPage should match default section snapshot 1`] = `
         <button
           aria-disabled={false}
           aria-live="assertive"
-          className="pgn__stateful-btn pgn__stateful-btn-state-default btn-primary submit btn btn-primary"
+          className="pgn__stateful-btn pgn__stateful-btn-state-default btn-primary btn btn-primary"
           disabled={false}
           onClick={[Function]}
           type="submit"
@@ -491,7 +491,7 @@ exports[`LoginPage should match forget password alert message snapshot 1`] = `
         <button
           aria-disabled={false}
           aria-live="assertive"
-          className="pgn__stateful-btn pgn__stateful-btn-state-default btn-primary submit btn btn-primary"
+          className="pgn__stateful-btn pgn__stateful-btn-state-default btn-primary btn btn-primary"
           disabled={false}
           onClick={[Function]}
           type="submit"
@@ -649,7 +649,7 @@ exports[`LoginPage should match pending button state snapshot 1`] = `
         <button
           aria-disabled={true}
           aria-live="assertive"
-          className="pgn__stateful-btn pgn__stateful-btn-state-pending btn-primary submit disabled btn btn-primary"
+          className="pgn__stateful-btn pgn__stateful-btn-state-pending btn-primary disabled btn btn-primary"
           disabled={false}
           onClick={[Function]}
           type="submit"
@@ -833,7 +833,7 @@ exports[`LoginPage should show error message 1`] = `
         <button
           aria-disabled={false}
           aria-live="assertive"
-          className="pgn__stateful-btn pgn__stateful-btn-state-default btn-primary submit btn btn-primary"
+          className="pgn__stateful-btn pgn__stateful-btn-state-default btn-primary btn btn-primary"
           disabled={false}
           onClick={[Function]}
           type="submit"
diff --git a/src/logistration/tests/__snapshots__/RegistrationPage.test.jsx.snap b/src/logistration/tests/__snapshots__/RegistrationPage.test.jsx.snap
index 4e7aa841..594227a4 100644
--- a/src/logistration/tests/__snapshots__/RegistrationPage.test.jsx.snap
+++ b/src/logistration/tests/__snapshots__/RegistrationPage.test.jsx.snap
@@ -155,7 +155,7 @@ exports[`./RegistrationPage.js should display no password field when current pro
         <button
           aria-disabled={false}
           aria-live="assertive"
-          className="pgn__stateful-btn pgn__stateful-btn-state-default btn-primary submit mt-4 btn btn-primary"
+          className="pgn__stateful-btn pgn__stateful-btn-state-default btn-primary btn btn-primary"
           disabled={false}
           onClick={[Function]}
           type="button"
@@ -203,7 +203,7 @@ exports[`./RegistrationPage.js should match TPA provider snapshot 1`] = `
           Create an account using
         </h4>
         <div
-          className="row tpa-container"
+          className="row tpa-container mb-3"
         >
           <button
             className="btn-social btn-oa2-apple-id"
@@ -380,7 +380,7 @@ exports[`./RegistrationPage.js should match TPA provider snapshot 1`] = `
         <button
           aria-disabled={false}
           aria-live="assertive"
-          className="pgn__stateful-btn pgn__stateful-btn-state-default btn-primary submit mt-4 btn btn-primary"
+          className="pgn__stateful-btn pgn__stateful-btn-state-default btn-primary btn btn-primary"
           disabled={false}
           onClick={[Function]}
           type="button"
@@ -565,7 +565,7 @@ exports[`./RegistrationPage.js should match default section snapshot 1`] = `
         <button
           aria-disabled={false}
           aria-live="assertive"
-          className="pgn__stateful-btn pgn__stateful-btn-state-default btn-primary submit mt-4 btn btn-primary"
+          className="pgn__stateful-btn pgn__stateful-btn-state-default btn-primary btn btn-primary"
           disabled={false}
           onClick={[Function]}
           type="button"
@@ -750,7 +750,7 @@ exports[`./RegistrationPage.js should match pending button state snapshot 1`] =
         <button
           aria-disabled={true}
           aria-live="assertive"
-          className="pgn__stateful-btn pgn__stateful-btn-state-pending btn-primary submit mt-4 disabled btn btn-primary"
+          className="pgn__stateful-btn pgn__stateful-btn-state-pending btn-primary disabled btn btn-primary"
           disabled={false}
           onClick={[Function]}
           type="button"
@@ -970,7 +970,7 @@ exports[`./RegistrationPage.js should show error message on 409 1`] = `
         <button
           aria-disabled={false}
           aria-live="assertive"
-          className="pgn__stateful-btn pgn__stateful-btn-state-default btn-primary submit mt-4 btn btn-primary"
+          className="pgn__stateful-btn pgn__stateful-btn-state-default btn-primary btn btn-primary"
           disabled={false}
           onClick={[Function]}
           type="button"