fix for login page ready

globaldothealth · Mar 8, 2022 · b89820c · b89820c
1 parent b707862
commit b89820c
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 7 deletions.
diff --git a/verification/curator-service/ui/src/components/SnackbarAlert/index.tsx b/verification/curator-service/ui/src/components/SnackbarAlert/index.tsx
@@ -1,11 +1,11 @@
-import React from 'react';
+import React, { ReactNode } from 'react';
 import Snackbar from '@material-ui/core/Snackbar';
 import MuiAlert, { AlertProps } from '@material-ui/lab/Alert';
 
 interface SnackbarAlertProps {
-    isOpen: boolean;
+    isOpen: boolean | undefined;
     onClose: (value: boolean) => void;
-    message: string;
+    message: string | ReactNode;
     type: 'success' | 'warning' | 'info' | 'error';
     durationMs?: number;
 }

diff --git a/verification/curator-service/ui/src/components/landing-page/LandingPage.tsx b/verification/curator-service/ui/src/components/landing-page/LandingPage.tsx
@@ -48,6 +48,9 @@ const useStyles = makeStyles((theme: Theme) => ({
     body: {
         display: 'flex',
         marginTop: '20px',
+        [theme.breakpoints.down(770)]: {
+            marginBottom: '60px',
+        },
     },
     description: {
         color: theme.custom.palette.landingPage.descriptionTextColor,

diff --git a/verification/curator-service/ui/src/components/landing-page/PartnerLogos.tsx b/verification/curator-service/ui/src/components/landing-page/PartnerLogos.tsx
@@ -32,6 +32,7 @@ const useStyles = makeStyles((theme: Theme) => ({
         marginTop: '10px',
         '&.fullWidth': {
             justifyContent: 'space-evenly',
+            alignItems: 'center',
         },
     },
     logo: {

diff --git a/verification/curator-service/ui/src/components/landing-page/SignUpForm.tsx b/verification/curator-service/ui/src/components/landing-page/SignUpForm.tsx
@@ -63,10 +63,19 @@ const useStyles = makeStyles((theme: Theme) => ({
         // margin: '35px 0 0 0',
         fontWeight: 400,
     },
+    googleButtonContainer: {
+        marginBottom: '50px',
+    },
     formFlexContainer: {
         display: 'flex',
-        gap: '79px',
+        columnGap: '79px',
         marginTop: '20px',
+        flexWrap: 'wrap',
+    },
+    passwordBlockContainer: {
+        [theme.breakpoints.down(649)]: {
+            marginTop: '30px',
+        },
     },
 }));
 
@@ -207,7 +216,7 @@ export default function SignUpForm({
                         />
                     </div>
 
-                    <div>
+                    <div className={classes.passwordBlockContainer}>
                         <FormControl
                             disabled={disabled}
                             className={classes.inpputField}
@@ -300,7 +309,8 @@ export default function SignUpForm({
                             </FormHelperText>
                         </FormControl>
                     </div>
-                    <div>
+
+                    <div className={classes.googleButtonContainer}>
                         <div>
                             <Typography className={classes.title}>
                                 Or sign up with Google

diff --git a/verification/curator-service/ui/src/redux/auth/slice.ts b/verification/curator-service/ui/src/redux/auth/slice.ts
@@ -12,7 +12,7 @@ import {
 
 export interface SnackbarProps {
     isOpen: boolean;
-    message: string;
+    message: string | undefined;
 }
 
 interface AuthState {