fix errors in main/index.js

calblueprint · Oct 27, 2020 · 03af54d · 03af54d
1 parent 10b27cb
commit 03af54d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/app/javascript/components/Main/index.js b/app/javascript/components/Main/index.js
@@ -64,7 +64,9 @@ function Main(props) {
       disableFocusRipple
       disableTouchRipple
       className={classes.navBarItem}
-      onClick={() => (window.location.href = '/admin')}
+      onClick={() => {
+        window.location.href = '/admin';
+      }}
     >
       <ExitToAppIcon />
       <div className={classes.navText}> Admin View </div>
@@ -80,6 +82,7 @@ function Main(props) {
       case 'Assessments':
         return <BarChartIcon />;
       default:
+        return null;
     }
   };
 
@@ -126,6 +129,7 @@ function Main(props) {
           <ActionItemCreationPage {...contentProps}></ActionItemCreationPage>
         );
       default:
+        return null;
     }
   };
 
@@ -160,13 +164,12 @@ function Main(props) {
                   <div className={classes.navText}> Sign Out </div>
                 </ListItem>
                 {props.isAdmin ? renderAdminButton() : null}
-                {props.userType !== 'participant'
-                  ? Object.entries({
+                {props.userType !== 'participant' &&
+                  Object.entries({
                     Dashboard: '/',
                     'Bulk Assign': '/assignments',
-                      Assessments: '/studio_assessments',
-                    }).map(n => getButton(n[0], n[1]))
-                  : null}
+                    Assessments: '/studio_assessments',
+                  }).map(n => getButton(n[0], n[1]))}
               </List>
             </Grid>
             <Grid

diff --git a/package.json b/package.json
@@ -46,8 +46,8 @@
     "axios": "^0.19.0",
     "babel-eslint": "^10.0.3",
     "babel-plugin-transform-react-remove-prop-types": "^0.4.24",
-    "dotenv": "^8.2.0",
     "date-fns": "^2.12.0",
+    "dotenv": "^8.2.0",
     "draft-js": "^0.11.2",
     "draft-js-plugins-editor": "^3.0.0",
     "draftail": "^1.3.0",