Merge branch 'master' of http://gitea.palntour.com/pav/pav-fe-kac

src/@core/layouts/components/navbar/NavbarUser.js

@@ -15,13 +15,13 @@ const NavbarUser = props => {
   const { topMenuCd } = useSelector(state => state.menuState);
 
   // ** Function to toggle Theme (Light/Dark)
-  const ThemeToggler = () => {
-    if (skin === 'dark') {
-      return <Sun className='ficon' onClick={() => setSkin('light')} />;
-    } else {
-      return <Moon className='ficon' onClick={() => setSkin('dark')} />;
-    }
-  };
+  // const ThemeToggler = () => {
+  //   if (skin === 'dark') {
+  //     return <Sun className='ficon' onClick={() => setSkin('light')} />;
+  //   } else {
+  //     return <Moon className='ficon' onClick={() => setSkin('dark')} />;
+  //   }
+  // };
 
   const handlerTopMenu = type => {
     dispatch(Actions.dispatchTopMenu(type));
@@ -131,13 +131,13 @@ const NavbarUser = props => {
           </NavLink>
         </NavItem>
       </Nav>
-      <div className='bookmark-wrapper d-flex align-items-center'>
+      {/* <div className='bookmark-wrapper d-flex align-items-center'>
         <NavItem className='d-none d-lg-block'>
           <NavLink className='nav-link-style'>
             <ThemeToggler />
           </NavLink>
         </NavItem>
-      </div>
+      </div> */}
       {/* <div className='bookmark-wrapper d-flex align-items-center'>
         <NavItem className='d-none d-lg-block'>
           <NavLink className='nav-link-style'>

src/components/account/login/AccountLogin.js

@@ -22,9 +22,11 @@ import { useEffect, useState } from 'react';
 import { ErrorModal } from '../../modal/ErrorModal';
 import * as Actions from '../../../modules/account/login/actions/authAction';
 import { useDispatch, useSelector } from 'react-redux';
+import { useSkin } from '../../../utility/hooks/useSkin';
 
 export const AccountLogin = ({ props }) => {
   const dispatch = useDispatch();
+  const [, setSkin] = useSkin();
   const { isLogin, message } = useSelector(state => state.authState);
 
   const [loginForm, setLoginForm] = useState({
@@ -84,6 +86,8 @@ export const AccountLogin = ({ props }) => {
   }, [message]);
 
   useEffect(() => {
+    setSkin('light');
+
     if (isLogin) {
       props.history.push('/');
 

src/views/control/main/ControlMain.js

@@ -34,8 +34,6 @@ import {
   ctrlDrawTypeChangeAction,
   objectUnClickAction
 } from '../../../modules/control/map/actions/controlMapActions';
-import { useSkin } from '../../../utility/hooks/useSkin';
-import { NavLink } from 'reactstrap';
 
 const ControlMain = () => {
   const dispatch = useDispatch();
@@ -64,7 +62,6 @@ const ControlMain = () => {
 
   const [openAlarmList, setOpenAlarmList] = useState(false);
   const [openSetting, setOpenSetting] = useState(true);
-  const [skin, setSkin] = useSkin();
   const history = useHistory();
 
   const openMenu = val => {
@@ -204,11 +201,6 @@ const ControlMain = () => {
               )}
             </button>
           </li>
-          <li>
-            <NavLink className='nav-link-style'>
-              <ThemeToggler />
-            </NavLink>
-          </li>
         </ul>
         <ul className='left-menu-footer'>
           {/* <li>