show dashboard also to admins

georgesimos · Nov 9, 2019 · 52b75ff · 52b75ff
1 parent 691b215
commit 52b75ff
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 21 deletions.
diff --git a/client/src/layouts/Dashboard/components/Sidebar/Sidebar.js b/client/src/layouts/Dashboard/components/Sidebar/Sidebar.js
@@ -1,4 +1,5 @@
 import React, { Component } from 'react';
+import { connect } from 'react-redux';
 import { NavLink } from 'react-router-dom';
 import {
   withStyles,
@@ -18,7 +19,7 @@ import styles from './styles';
 
 class Sidebar extends Component {
   render() {
-    const { classes } = this.props;
+    const { classes, user } = this.props;
     return (
       <section className={classes.root}>
         <List component="div" disablePadding>
@@ -87,20 +88,21 @@ class Sidebar extends Component {
               primary="Reservations"
             />
           </ListItem>
-          <ListItem
-            activeClassName={classes.activeListItem}
-            className={classes.listItem}
-            component={NavLink}
-            to="/admin/users">
-            <ListItemIcon className={classes.listItemIcon}>
-              <PeopleIcon />
-            </ListItemIcon>
-            <ListItemText
-              classes={{ primary: classes.listItemText }}
-              primary="Users"
-            />
-          </ListItem>
-
+          {user && user.role === 'superadmin' && (
+            <ListItem
+              activeClassName={classes.activeListItem}
+              className={classes.listItem}
+              component={NavLink}
+              to="/admin/users">
+              <ListItemIcon className={classes.listItemIcon}>
+                <PeopleIcon />
+              </ListItemIcon>
+              <ListItemText
+                classes={{ primary: classes.listItemText }}
+                primary="Users"
+              />
+            </ListItem>
+          )}
           <ListItem
             activeClassName={classes.activeListItem}
             className={classes.listItem}
@@ -156,4 +158,13 @@ class Sidebar extends Component {
   }
 }
 
-export default withStyles(styles)(Sidebar);
+const mapStateToProps = state => ({
+  user: state.authState.user
+});
+
+const mapDispatchToProps = {};
+
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(withStyles(styles)(Sidebar));
diff --git a/client/src/layouts/Dashboard/components/Topbar/Topbar.js b/client/src/layouts/Dashboard/components/Topbar/Topbar.js
@@ -53,7 +53,7 @@ class Topbar extends Component {
           </div>
 
           <NavLink className={classes.title} to="/">
-            Return
+            Cinema App
           </NavLink>
 
           <IconButton

diff --git a/client/src/layouts/Public/components/Navbar/Navbar.js b/client/src/layouts/Public/components/Navbar/Navbar.js
@@ -44,7 +44,7 @@ class Navbar extends Component {
             <Link className={classes.navLink} to="/">
               Home
             </Link>
-            {user && user.role === 'superadmin' && (
+            {user && user.role !== 'guest' && (
               <Link className={classes.navLink} to="/admin/dashboard">
                 Dashboard
               </Link>
@@ -102,7 +102,7 @@ class Navbar extends Component {
                   Home
                 </Link>
               </li>
-              {user && user.role === 'superadmin' && (
+              {user && user.role !== 'guest' && (
                 <li className={classes.innerNavListItem}>
                   <Link className={classes.innerNavLink} to="/admin/dashboard">
                     Dashboard

diff --git a/client/src/pages/Public/Login/components/LoginForm.js b/client/src/pages/Public/Login/components/LoginForm.js
@@ -83,7 +83,7 @@ function LoginForm(props) {
   const handleFieldChange = e =>
     setValues({
       ...values,
-      [e.target.name]: [e.target.value]
+      [e.target.name]: e.target.value
     });
 
   return (
@@ -110,6 +110,7 @@ function LoginForm(props) {
           type="text"
           value={values.username}
           variant="outlined"
+          placeholder="Use demo1"
         />
         <TextField
           className={classes.textField}
@@ -119,6 +120,7 @@ function LoginForm(props) {
           type="password"
           value={values.password}
           variant="outlined"
+          placeholder="Use demo123456"
         />
       </div>
 

diff --git a/server/src/routes/users.js b/server/src/routes/users.js
@@ -200,7 +200,8 @@ router.patch("/users/:id", auth, async (req, res) => {
     "phone",
     "username",
     "email",
-    "password"
+    "password",
+    "role"
   ];
   const isValidOperation = updates.every(update =>
     allowedUpdates.includes(update)