Browse Source

authModel 컬럼 추가

pull/2/head
sanguu516(박상현) 1 year ago
parent
commit
a5d549dd88
  1. 2
      src/modules/account/login/models/authModel.ts
  2. 8
      src/modules/account/login/sagas/authSaga.ts
  3. 14
      src/views/laanc/FlightPlan.js
  4. 21
      src/views/laanc/LeftMenu.js

2
src/modules/account/login/models/authModel.ts

@ -38,6 +38,8 @@ export interface LoginData {
} }
export interface UserData { export interface UserData {
email: string;
hpno: string;
steCd: string; steCd: string;
regDt: string; regDt: string;
mdfcnDt: string; mdfcnDt: string;

8
src/modules/account/login/sagas/authSaga.ts

@ -39,14 +39,17 @@ function* userLoginSaga(action: ActionType<typeof Actions.login.request>) {
cookieStorage.setCookie(COOKIE_REFRESH_TOKEN, data.refreshToken); cookieStorage.setCookie(COOKIE_REFRESH_TOKEN, data.refreshToken);
const user = yield call(authAPI.getUserProfile, data.cstmrSno); const user = yield call(authAPI.getUserProfile, data.cstmrSno);
// if (data.userId) { // if (data.userId) {
// cookieStorage.setCookie('SAVE_USR_ID', data.userId); // cookieStorage.setCookie('SAVE_USR_ID', data.userId);
// } else { // } else {
// cookieStorage.removeCookie('SAVE_USR_ID'); // cookieStorage.removeCookie('SAVE_USR_ID');
// } // }
yield put(Actions.login.success({ ...user.data })); yield put(
Actions.login.success({
...user.data
})
);
} catch (error) { } catch (error) {
yield put(Actions.login.failure(error)); yield put(Actions.login.failure(error));
@ -93,7 +96,6 @@ function* checkAuthencationSaga() {
cookieStorage.setCookie(COOKIE_ACCESS_TOKEN, accessToken); cookieStorage.setCookie(COOKIE_ACCESS_TOKEN, accessToken);
// storageService.session.setItem(STORAGE_SESSION_ICT, user.icToken); // storageService.session.setItem(STORAGE_SESSION_ICT, user.icToken);
yield put( yield put(
Actions.check.success({ Actions.check.success({
isLogin: true, isLogin: true,

14
src/views/laanc/FlightPlan.js

@ -3,7 +3,7 @@ import { Search } from 'react-feather';
import { BiBuildings, BiGridAlt } from 'react-icons/bi'; import { BiBuildings, BiGridAlt } from 'react-icons/bi';
import { CgTrees } from 'react-icons/cg'; import { CgTrees } from 'react-icons/cg';
import { VscRadioTower } from 'react-icons/vsc'; import { VscRadioTower } from 'react-icons/vsc';
import { useDispatch, useSelector } from 'react-redux'; import { useDispatch, useSelector, shallowEqual } from 'react-redux';
import Flatpickr from 'react-flatpickr'; import Flatpickr from 'react-flatpickr';
import '@styles/react/libs/flatpickr/flatpickr.scss'; import '@styles/react/libs/flatpickr/flatpickr.scss';
import { ErrorModal } from '../../components/modal/ErrorModal'; import { ErrorModal } from '../../components/modal/ErrorModal';
@ -35,16 +35,16 @@ import {
import { useHistory } from 'react-router-dom'; import { useHistory } from 'react-router-dom';
const FlightPlan = props => { const FlightPlan = props => {
const [detailData, setDetailData] = useState(initFlightBas.initDetail); const [detailData, setDetailData] = useState(initFlightBas.initDetail);
const user = useSelector(state => state.authState);
const [modal2, setModal2] = useState({ const [modal2, setModal2] = useState({
isOpen: false, isOpen: false,
title: '', title: '',
desc: '' desc: ''
}); });
const history = useHistory(); const history = useHistory();
const handleChange = ({ name, value, type, index, pIndex }) => { const handleChange = ({ name, value, type, index, pIndex }) => {
// 입력 값에서 숫자 이외의 문자를 제거 // 입력 값에서 숫자 이외의 문자를 제거
console.log('>>', name);
const arrName = `${type}List`; const arrName = `${type}List`;
@ -90,8 +90,6 @@ const FlightPlan = props => {
break; break;
} }
}; };
console.log('>>>', detailData);
const handlerNext = () => { const handlerNext = () => {
const reg_email = const reg_email =
/^([0-9a-zA-Z_\.-]+)@([0-9a-zA-Z_-]+)(\.[0-9a-zA-Z_-]+){1,2}$/; /^([0-9a-zA-Z_\.-]+)@([0-9a-zA-Z_-]+)(\.[0-9a-zA-Z_-]+){1,2}$/;
@ -179,7 +177,11 @@ const FlightPlan = props => {
}); });
return false; return false;
} else handleClick(2); } else {
//api 호출 부분
handleClick(2);
}
}; };
const handleClick = value => { const handleClick = value => {

21
src/views/laanc/LeftMenu.js

@ -4,13 +4,19 @@ import kac_logo from '../../assets/images/kac_logo_wh.png';
import FlightPlan from './FlightPlan'; import FlightPlan from './FlightPlan';
import Apply from './Apply'; import Apply from './Apply';
import { useState } from 'react'; import { useState } from 'react';
import { AiOutlinePoweroff, AiOutlineExclamation } from 'react-icons/ai';
import WebsocketClient from '../../components/websocket/WebsocketClient';
import UserDropdown from '../../@core/layouts/components/navbar/UserDropdown';
function LeftMenu() { function LeftMenu() {
const [step, setStep] = useState(1); const [step, setStep] = useState(1);
const handlerStep = step => { const handlerStep = step => {
setStep(step); setStep(step);
}; };
const handlerLogout = () => {
dispatch(Actions.logout.request());
};
return ( return (
<> <>
<div className='left-menu'> <div className='left-menu'>
@ -18,6 +24,19 @@ function LeftMenu() {
<img src={logo} width='80' /> <img src={logo} width='80' />
<span>PAL</span> <span>PAL</span>
</h1> </h1>
<ul className='left-menu-nav'></ul>
<ul className='left-menu-footer'>
<li>
<AiOutlinePoweroff
size={25}
className='logout-btn'
onClick={handlerLogout}
/>
</li>
<li style={{ marginLeft: '8px' }}>
<WebsocketClient />
</li>
</ul>
</div> </div>
<div className='right-menu active'> <div className='right-menu active'>
<button className='right-layer-btn' onClick={() => {}}></button> <button className='right-layer-btn' onClick={() => {}}></button>

Loading…
Cancel
Save