code review

unstructuredstudio · Oct 23, 2023 · 436e749 · 436e749
1 parent e86a4fb
commit 436e749
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/zubhub_frontend/zubhub/src/assets/js/styles/views/search_results/searchResultsStyles.js b/zubhub_frontend/zubhub/src/assets/js/styles/views/search_results/searchResultsStyles.js
@@ -139,6 +139,8 @@ export const resultModal = (theme) => ({
     [theme.breakpoints.down('400')]: {
       marginTop: '65%'
     }
-  }
+  },
+  containerStylesOverrides: { boxShadow: 'none' }, 
+  titleStylesOverrides: { textAlign: 'center'}
 })
 
diff --git a/zubhub_frontend/zubhub/src/views/login/Login.jsx b/zubhub_frontend/zubhub/src/views/login/Login.jsx
@@ -61,14 +61,12 @@ function Login(props) {
   };
 
   const { show_password } = state;
-  const { t } = props;
-
-  const styleOverridesPresent = Object.keys(props?.styleOverrides).length > 0
+  const { t } = props
 
   return (
     <Box className={classes.root}>
       <Container className={classes.containerStyle} >
-        <Card className={classes.cardStyle} style={ styleOverridesPresent ? {...props.styleOverrides.containerStyles } : {}}>
+        <Card className={clsx([classes.cardStyle, props.styleOverrides?.containerStyles])}>
           <CardActionArea>
             <CardContent>
               <form
@@ -82,8 +80,7 @@ function Login(props) {
                   variant="h5"
                   component="h2"
                   color="textPrimary"
-                  className={classes.titleStyle}
-                  style={{...props.styleOverrides.titleStyles}}
+                  className={clsx([classes.titleStyle, props.styleOverrides?.titleStyles])}
                 >
                   {props.primaryTitle ?? t('login.welcomeMsg.primary')}
                 </Typography>

diff --git a/zubhub_frontend/zubhub/src/views/search_results/SearchResults.jsx b/zubhub_frontend/zubhub/src/views/search_results/SearchResults.jsx
@@ -147,7 +147,7 @@ function SearchResults(props) {
     } else {
       return (
         <Grid container spacing={3}>
-          {results.map(project => (
+          {results?.map(project => (
             <Grid
               item
               xs={12}
@@ -203,8 +203,7 @@ function SearchResults(props) {
           <Login {...props}
            primaryTitle='Log in or Sign up to search for projects'
            secondaryTitle='' 
-           styleOverrides={{ containerStyles: {boxShadow: 'none'}, titleStyles: { textAlign: 'center'}}}
-           withoutShadow 
+           styleOverrides={{containerStyles: modalClasses.containerStylesOverrides, titleStyles: modalClasses.titleStylesOverrides}}
           />
         </Grid>
       </Container>

diff --git a/zubhub_frontend/zubhub/src/views/search_results/searchResultsScripts.js b/zubhub_frontend/zubhub/src/views/search_results/searchResultsScripts.js
@@ -31,7 +31,7 @@ export const getQueryParams = url => {
  */
 export const fetchPage = (page, props, query_string, type) => {
   if (type === SearchType.PROJECTS) {
-    if (props.auth.token) {
+    if (props.auth?.token) {
       return props.searchProjects({
         page,
         query_string,