Browse Source

테마토글 삭제 및 light 모드 적용

pull/2/head
hhjk00 1 year ago
parent
commit
a0df3c6e92
  1. 18
      src/@core/layouts/components/navbar/NavbarUser.js
  2. 4
      src/components/account/login/AccountLogin.js
  3. 8
      src/views/control/main/ControlMain.js

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

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

4
src/components/account/login/AccountLogin.js

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

8
src/views/control/main/ControlMain.js

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

Loading…
Cancel
Save