Changed AppBar background colour and chaned the logo

package.json

@@ -3,7 +3,7 @@
   "version": "0.1.0",
   "private": true,
   "engines": {
-    "node": "10.15.3"
+    "node": "10.19.0"
   },
   "dependencies": {
     "@amcharts/amcharts4": "^4.7.18",

src/app/routes/Dashboard/Dashboard.js

@@ -101,7 +101,7 @@ const Dashboard = () => {
                             </div>
                         </Fragment>}
                 </div>
-            </div>}
+            </div>
 
         </div>
     )

src/components/UserInfo/index.js

@@ -6,6 +6,7 @@ import MenuItem from '@material-ui/core/MenuItem';
 import {logout} from '../../store/actions/auth';
 import IntlMessages from '../../util/IntlMessages';
 import { Redirect } from 'react-router';
+import people from '../../assets/images/dashboard/avatar13.jpg'
 // import ArrowDropDownCircleIcon from '@material-ui/icons/ArrowDropDownCircle';
 
 const UserInfo = () => {
@@ -33,7 +34,7 @@ const UserInfo = () => {
     <div className="user-profile d-flex flex-row align-items-center">
       <Avatar
         alt='...'
-        src={"https://via.placeholder.com/50x50"}
+        src={people}
         className="user-avatar "
       />
       <div className="user-detail">

src/containers/AppLayout/Vertical/Header/index.js

@@ -15,6 +15,14 @@ import { switchLanguage, toggleCollapsedNav } from "../../../../store/actions/Se
 import IntlMessages from "../../../../util/IntlMessages";
 import LanguageSwitcher from "../../../../components/LanguageSwitcher/index";
 import UserInfo from '../../../../components/UserInfo'
+import {makeStyles} from '@material-ui/core'
+
+const useStyles=makeStyles((theme)=>({
+  container:{
+    backgroundColor:'#5A6AB2',
+    paddingLeft:'4%'
+  }
+}))
 
 /**
  * This shows the header of the application
@@ -24,6 +32,7 @@ import UserInfo from '../../../../components/UserInfo'
  */
 
 const Header =()=> {
+  const classes=useStyles()
 
   const dispatch = useDispatch();
   const { drawerType, locale, navCollapsed } = useSelector(({settings}) => settings);
@@ -62,7 +71,7 @@ const Header =()=> {
     const drawerStyle = drawerType.includes(FIXED_DRAWER) ? "d-block d-xl-none" : drawerType.includes(COLLAPSED_DRAWER) ? "d-block" : "d-none";
 
     return (
-      <AppBar className="app-main-header">
+      <AppBar className={`app-main-header `} className={classes.container}  >
         <Toolbar className="app-toolbar" disableGutters={false}>
 
           <IconButton className={`jr-menu-icon mr-3 ${drawerStyle}`} aria-label="Menu"
@@ -71,7 +80,7 @@ const Header =()=> {
           </IconButton>
 
           <Link to='/app' className="app-logo mr-2 d-none d-sm-block" >
-            <img src={require("../../../../assets/images/logo.jpg")} alt="DMS" title="DMS"/>
+            <img src={require("../../../../assets/images/dashboard/hiveLogo_BG.png")} alt="DMS" title="DMS"/>
           </Link>
           {/* <div style={{minWidth: '100px', maxWidth: '80%'}}>
             <marquee>Drone MX710 is flying from Dharan to Biratnagar, Drone MX710 is flying from Dharan to Biratnagar</marquee>

src/containers/Customizer/SideNavOption.js

@@ -9,9 +9,23 @@ import {
   COLLAPSED_DRAWER,
   FIXED_DRAWER,
   MINI_DRAWER,
+  HORIZONTAL_NAVIGATION,
+  VERTICAL_NAVIGATION
 } from 'constants/ActionTypes'
 
+// import {
+//   ABOVE_THE_HEADER,
+//   BELOW_THE_HEADER,
+//   COLLAPSED_DRAWER,
+//   FIXED_DRAWER,
+//   HORIZONTAL_NAVIGATION,
+//   INSIDE_THE_HEADER,
+//   MINI_DRAWER,
+//   VERTICAL_NAVIGATION
+// } from "../../../constants/ActionTypes";
+
 import { setDrawerType} from '../../actions/index';
+// import { setDrawerType} from '../../store/actions/index';
 
 import {Button, ButtonGroup} from 'reactstrap';
 
@@ -22,15 +36,15 @@ const Customizer =()=> {
   const drawerType = useSelector(({settings}) => settings.drawerType);
 
  const setFixedDrawer = () => {
-   dispatch(setDrawerType(FIXED_DRAWER));
+   dispatch(setDrawerType(VERTICAL_NAVIGATION));
   };
 
   const setCollapsedDrawer = () => {
     dispatch(setDrawerType(COLLAPSED_DRAWER));
   };
 
   const setMiniDrawer = () => {
-    dispatch(setDrawerType(MINI_DRAWER));
+    dispatch(setDrawerType(VERTICAL_NAVIGATION));
   };
 
 
@@ -39,13 +53,13 @@ const Customizer =()=> {
 
           <ButtonGroup>
             <Button color="default"
-                    className={`jr-btn  ${drawerType === FIXED_DRAWER && 'active' } `}
+                    className={`jr-btn  ${drawerType === VERTICAL_NAVIGATION && 'active' } `}
                     onClick={setFixedDrawer}>Fixed</Button>
             <Button color="default"
                     className={`jr-btn ${drawerType === COLLAPSED_DRAWER && 'active'} `}
                     onClick={setCollapsedDrawer}>Collapsed</Button>
             <Button color="default"
-                    className={`jr-btn ${drawerType === MINI_DRAWER && 'active' } `}
+                    className={`jr-btn ${drawerType === VERTICAL_NAVIGATION && 'active' } `}
                     onClick={setMiniDrawer}>Mini</Button>
           </ButtonGroup>
 
@@ -55,3 +69,4 @@ const Customizer =()=> {
 
 export default (Customizer);
 
+

src/store/actions/auth.js

@@ -145,9 +145,10 @@ export const signIn = (email, password) => {
             email: email,
             password: password
         };
-        // console.log(authData);
+        console.log("trying to signin",authData);
         // let url = 'https://www.googleapis.com/identitytoolkit/v3/relyingparty/signupNewUser?key=AIzaSyDL3N1A50XmBEQGRPrAN2zCudp9mpIe28I';
         // const url = './auth.js';
+
         const url = '/users/login';
         axios.post(url, authData, {
             headers: headers

src/store/reducers/Settings.js

@@ -101,4 +101,4 @@ import {
   };
 
   export default settings;
-  
+

src/styles/app-rtl.scss

@@ -200,6 +200,7 @@
   & .app-main-header {
     left: 0;
     right: $side-nav-width;
+
 
     @media screen and (max-width: 1199px) {
       left: 0;