From a0df3c6e923fcea8bfad923aa3d6c13a9ee5b1ad Mon Sep 17 00:00:00 2001 From: hhjk00 Date: Fri, 22 Sep 2023 11:35:48 +0900 Subject: [PATCH] =?UTF-8?q?=ED=85=8C=EB=A7=88=ED=86=A0=EA=B8=80=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C=20=EB=B0=8F=20light=20=EB=AA=A8=EB=93=9C=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../layouts/components/navbar/NavbarUser.js | 18 +++++++++--------- src/components/account/login/AccountLogin.js | 4 ++++ src/views/control/main/ControlMain.js | 8 -------- 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/src/@core/layouts/components/navbar/NavbarUser.js b/src/@core/layouts/components/navbar/NavbarUser.js index 6c0978a..775f63d 100644 --- a/src/@core/layouts/components/navbar/NavbarUser.js +++ b/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 setSkin('light')} />; - } else { - return setSkin('dark')} />; - } - }; + // const ThemeToggler = () => { + // if (skin === 'dark') { + // return setSkin('light')} />; + // } else { + // return setSkin('dark')} />; + // } + // }; const handlerTopMenu = type => { dispatch(Actions.dispatchTopMenu(type)); @@ -131,13 +131,13 @@ const NavbarUser = props => { -
+ {/*
-
+
*/} {/*
diff --git a/src/components/account/login/AccountLogin.js b/src/components/account/login/AccountLogin.js index 4a5a801..028134a 100644 --- a/src/components/account/login/AccountLogin.js +++ b/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('/'); diff --git a/src/views/control/main/ControlMain.js b/src/views/control/main/ControlMain.js index 3710705..f220d99 100644 --- a/src/views/control/main/ControlMain.js +++ b/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 = () => { )} -
  • - - - -
    • {/*