Browse Source

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

feature/auth
sanguu 2 years ago
parent
commit
af7357690b
  1. 229
      src/components/account/mypage/AccountMypageForm.js
  2. 712
      src/containers/account/mypage/AccountMypageContainer.js
  3. 1
      src/containers/basis/flight/aprv/FlightPlanAprvContainer.js
  4. 15
      src/containers/basis/group/BasisGroupContainer.js
  5. 13
      src/containers/basis/group/BasisGroupDetailContainer.js

229
src/components/account/mypage/AccountMypageForm.js

@ -1,10 +1,27 @@
// ** React Imports
import { useState, useEffect } from 'react'
import { useState, useEffect } from 'react';
import {
Card, CardBody, Row, Col, Nav, NavItem, NavLink, TabContent, TabPane, Alert, FormGroup, Form, Input, Label, Button,
Modal, ModalHeader, ModalBody, ModalFooter
} from 'reactstrap'
Card,
CardBody,
Row,
Col,
Nav,
NavItem,
NavLink,
TabContent,
TabPane,
Alert,
FormGroup,
Form,
Input,
Label,
Button,
Modal,
ModalHeader,
ModalBody,
ModalFooter
} from 'reactstrap';
// ** Styles
import '../../../assets/css/custom.css';
@ -12,12 +29,28 @@ import '../../../assets/css/custom.css';
//const [detailData, setDetailData] = useState(userPage.UserPageData);
import { useHistory } from 'react-router-dom';
const AccountMypageForm = ({ userInfo,handlerSmsSend,isCrtfy,seconds_Counter,handler,minutes_Counter, isRunning ,formModal, handlerUpdate,modal,handlerSmsConfirm,handlerChange,handlerInput,inputHpno,inputCrtfy,okinput}) => {
const AccountMypageForm = ({
userInfo,
handlerSmsSend,
isCrtfy,
seconds_Counter,
handler,
minutes_Counter,
isRunning,
formModal,
handlerUpdate,
modal,
handlerSmsConfirm,
handlerChange,
handlerInput,
inputHpno,
inputCrtfy,
okinput,
handlerWidthrow
}) => {
const history = useHistory();
function handleUseHitory() {
history.push('/');
}
@ -29,24 +62,45 @@ const AccountMypageForm = ({ userInfo,handlerSmsSend,isCrtfy,seconds_Counter,han
<CardBody className='card-body-tab-cont'>
<TabPane tabId='1'>
<div className='search-info-box'>
{userInfo ?
{userInfo ? (
<Row>
<Col className='list-input' md='3' sm='12'>
<FormGroup>
<Label for='memberName'>이름</Label>
<Input type='text' id='memberName' bsSize='sm' placeholder='' value={userInfo.memberName || ''} disabled />
<Input
type='text'
id='memberName'
bsSize='sm'
placeholder=''
value={userInfo.memberName || ''}
disabled
/>
</FormGroup>
</Col>
<Col className='list-input' md='3' sm='12'>
<FormGroup>
<Label for='brithdyDate'>생년월일</Label>
<Input type='text' id='brithdyDate' bsSize='sm' placeholder='' value={userInfo.brthdyDate || ""} disabled />
<Input
type='text'
id='brithdyDate'
bsSize='sm'
placeholder=''
value={userInfo.brthdyDate || ''}
disabled
/>
</FormGroup>
</Col>
<Col className='list-input' md='3' sm='12'>
<FormGroup>
<Label for='cenderCD'>성별</Label>
<Input type='select' name='select' bsSize='sm' id='cenderCD' value={userInfo.genderCd || ""} disabled >
<Input
type='select'
name='select'
bsSize='sm'
id='cenderCD'
value={userInfo.genderCd || ''}
disabled
>
<option>남자</option>
<option>여자</option>
</Input>
@ -55,7 +109,12 @@ const AccountMypageForm = ({ userInfo,handlerSmsSend,isCrtfy,seconds_Counter,han
<Col className='list-input' md='3' sm='12'>
<FormGroup>
<Label for='cntryCD'>국가코드</Label>
<Input type='select' name='select' bsSize='sm' id='cntryCD' >
<Input
type='select'
name='select'
bsSize='sm'
id='cntryCD'
>
<option>대한민국</option>
</Input>
</FormGroup>
@ -63,13 +122,28 @@ const AccountMypageForm = ({ userInfo,handlerSmsSend,isCrtfy,seconds_Counter,han
<Col className='list-input' md='3' sm='12'>
<FormGroup>
<Label for='userId'>ID</Label>
<Input type='text' id='userId' bsSize='sm' placeholder='' value={userInfo.userId || ""} disabled />
<Input
type='text'
id='userId'
bsSize='sm'
placeholder=''
value={userInfo.userId || ''}
disabled
/>
</FormGroup>
</Col>
<Col className='list-input' md='3' sm='12'>
<FormGroup>
<Label for='email'>E-mail</Label>
<Input type='text' id='email' name='email' bsSize='sm' placeholder='' defaultValue={userInfo.email} onChange={(e) => handlerInput(e)} />
<Input
type='text'
id='email'
name='email'
bsSize='sm'
placeholder=''
defaultValue={userInfo.email}
onChange={e => handlerInput(e)}
/>
</FormGroup>
</Col>
<Col className='list-input' md='3' sm='12'>
@ -77,12 +151,24 @@ const AccountMypageForm = ({ userInfo,handlerSmsSend,isCrtfy,seconds_Counter,han
<Label className='form-label' for='clncd'>
휴대폰 번호
</Label>
<div className='user-phone-btn' >
<Button.Ripple type='button' color='primary' onClick={handler}>
<div className='user-phone-btn'>
<Button.Ripple
type='button'
color='primary'
onClick={handler}
>
<span className='d-sm-inline-block'>변경</span>
</Button.Ripple>
</div>
<Input type='number' name='clncd' id='hpno' bsSize='sm' placeholder='' disabled value={!okinput ? userInfo.hpno || "" : inputHpno } />
<Input
type='number'
name='clncd'
id='hpno'
bsSize='sm'
placeholder=''
disabled
value={!okinput ? userInfo.hpno || '' : inputHpno}
/>
<div>
<Modal
isOpen={formModal}
@ -95,23 +181,51 @@ const AccountMypageForm = ({ userInfo,handlerSmsSend,isCrtfy,seconds_Counter,han
<ModalBody>
<div className='modal-box'>
<p className='ti'>휴대폰 번호 변경</p>
<p className='txt'>변경할 휴대폰 번호로 인증을 완료해 주세요.</p>
<p className='txt'>
변경할 휴대폰 번호로 인증을 완료해 주세요.
</p>
</div>
<Row>
<Col className='list-input' md='12'>
<FormGroup>
<Row className='input-inline-btn'>
<Col md='8'>
<Label className='form-label' for='hpno'>휴대폰 번호</Label>
<Input type='number' name='hpno' id='hpno' bsSize='sm' value={inputHpno} onChange={handlerChange} placeholder='01012345678' />
<Label
className='form-label'
for='hpno'
>
휴대폰 번호
</Label>
<Input
type='number'
name='hpno'
id='hpno'
bsSize='sm'
value={inputHpno}
onChange={handlerChange}
placeholder='01012345678'
/>
</Col>
<Col md='4' xs='12'>
{/* 발송 버튼을 누르면 남은시간 d-none를 빼주세여~ 그럼나타나여~ */}
<span className={!isRunning || isCrtfy ? 'time d-none' : 'time'}>
남은시간 {minutes_Counter}:{seconds_Counter}
<span
className={
!isRunning || isCrtfy
? 'time d-none'
: 'time'
}
>
남은시간 {minutes_Counter}:
{seconds_Counter}
</span>
<Button.Ripple type='button' color='secondary' onClick={handlerSmsSend}>
<span className='d-sm-inline-block'>인증번호 발송</span>
<Button.Ripple
type='button'
color='secondary'
onClick={handlerSmsSend}
>
<span className='d-sm-inline-block'>
인증번호 발송
</span>
</Button.Ripple>
</Col>
</Row>
@ -121,7 +235,12 @@ const AccountMypageForm = ({ userInfo,handlerSmsSend,isCrtfy,seconds_Counter,han
<FormGroup>
<Row className='input-inline-btn'>
<Col md='8'>
<Label className='form-label' for='crtfyNo'>인증번호</Label>
<Label
className='form-label'
for='crtfyNo'
>
인증번호
</Label>
<Input
type='number'
name='crtfyhpNo'
@ -129,11 +248,9 @@ const AccountMypageForm = ({ userInfo,handlerSmsSend,isCrtfy,seconds_Counter,han
bsSize='sm'
value={inputCrtfy}
onChange={handlerChange}
{...isRunning ?
{}
:
{disabled:true}
}
{...(isRunning
? {}
: { disabled: true })}
/>
</Col>
<Col md='4' xs='12'>
@ -141,13 +258,13 @@ const AccountMypageForm = ({ userInfo,handlerSmsSend,isCrtfy,seconds_Counter,han
type='button'
color='secondary'
onClick={handlerSmsConfirm}
{...isRunning ?
{}
:
{disabled:true}
}
{...(isRunning
? {}
: { disabled: true })}
>
<span className='d-sm-inline-block'>인증하기</span>
<span className='d-sm-inline-block'>
인증하기
</span>
</Button.Ripple>
</Col>
</Row>
@ -156,10 +273,7 @@ const AccountMypageForm = ({ userInfo,handlerSmsSend,isCrtfy,seconds_Counter,han
</Row>
</ModalBody>
<ModalFooter>
<Button
color='primary'
onClick={handler}
>
<Button color='primary' onClick={handler}>
확인
</Button>
</ModalFooter>
@ -168,24 +282,43 @@ const AccountMypageForm = ({ userInfo,handlerSmsSend,isCrtfy,seconds_Counter,han
</FormGroup>
</Col>
</Row>
: <></>
}
) : (
<></>
)}
</div>
<div className='d-flex justify-content-between'>
<div>
<Button.Ripple className='mr-1' color='primary' size='sm' onClick={handlerUpdate}>저장</Button.Ripple>
<Button.Ripple color='danger' size='sm' onClick={handleUseHitory}>취소</Button.Ripple>
<Button.Ripple
className='mr-1'
color='primary'
size='sm'
onClick={handlerUpdate}
>
저장
</Button.Ripple>
<Button.Ripple
color='danger'
size='sm'
onClick={handleUseHitory}
>
취소
</Button.Ripple>
</div>
<div>
<Button.Ripple color='danger' size='sm'>회원탈퇴</Button.Ripple>
<Button.Ripple
color='danger'
size='sm'
onClick={() => handlerWidthrow()}
>
회원탈퇴
</Button.Ripple>
</div>
</div>
</TabPane>
</CardBody>
</Card>
</Col>
</Row>
)
}
);
};
export default AccountMypageForm;

712
src/containers/account/mypage/AccountMypageContainer.js

@ -1,362 +1,412 @@
// ** React Imports
import { useState, useEffect } from 'react'
import { useParams, Link } from 'react-router-dom'
import { useSelector, useDispatch } from 'react-redux'
import { useState, useEffect } from 'react';
import { useParams, Link } from 'react-router-dom';
import { useSelector, useDispatch } from 'react-redux';
// ** Styles
import '../../../assets/css/custom.css';
// ** Third Party Components
import { User, Info, CreditCard, Lock, Check, X } from 'react-feather'
import { User, Info, CreditCard, Lock, Check, X } from 'react-feather';
import {
Card, CardBody, Row, Col, Nav, NavItem, NavLink, TabContent, TabPane, Alert, FormGroup, Form, Input, Label, Button,
Modal, ModalHeader, ModalBody, ModalFooter
} from 'reactstrap'
Card,
CardBody,
Row,
Col,
Nav,
NavItem,
NavLink,
TabContent,
TabPane,
Alert,
FormGroup,
Form,
Input,
Label,
Button,
Modal,
ModalHeader,
ModalBody,
ModalFooter
} from 'reactstrap';
import { accountApi } from '../../../modules/account/register/apis/accountApi';
import AccountMypagePwForm from '../../../components/account/mypage/AccountMypagePwForm';
import AccountMypageForm from '../../../components/account/mypage/AccountMypageForm';
import { userPageAction, userupdateAction } from '../../../modules/account/login/actions/authAction';
import {
userPageAction,
userupdateAction
} from '../../../modules/account/login/actions/authAction';
import { MessageErrorModal } from '../../../components/message/MessageErrorModal';
import { MessageInfoModal } from '../../../components/message/MessageInfoModal';
import { USER_LIST } from '../../../modules/basis/group/actions/basisGroupAction';
import { ConfirmModal } from '../../../components/modal/ConfirmModal';
// ** Function to toggle tabs
const AccountMypageContainer = () => {
const [activeTab, setActiveTab] = useState('1'),
store = useSelector(state => state.users),
dispatch = useDispatch(),
{ id } = useParams()
const toggle = tab => setActiveTab(tab)
const [formModal, setFormModal] = useState(false)
const { userPage } = useSelector(state => state.UserPageState);
const { user } = useSelector(state => state.authState);
const { userPwPage } = useSelector(state => state.UserPwState);
const [userInfo, setUserInfo] = useState();
const [inputHpno, setInputHpno] = useState('');
const [inputCrtfy, setInputCrtfy] = useState('');
const [minutes_Counter, setMinutes_Counter] = useState('03');
const [seconds_Counter, setSeconds_Counter] = useState('00');
const [timer, setTimer] = useState(null);
const [isRunning, setIsRunning] = useState(false);
const [sendCount, setSendCount] = useState(0);
const [isCrtfy, setIsCrtfy] = useState(false);
const [okinput, setOkinput] = useState(false)
const [okcheck, setOkcheck] = useState('');
const [modal, setModal] = useState({
isOpen: false,
title: '',
desc: '',
color: ''
});
const [activeTab, setActiveTab] = useState('1'),
store = useSelector(state => state.users),
dispatch = useDispatch(),
{ id } = useParams();
const timerStart = count => {
let minutes, seconds;
const timer = setInterval(() => {
setIsRunning(true);
minutes = parseInt(count / 60, 10);
seconds = parseInt(count % 60, 10);
minutes = minutes < 10 ? '0' + minutes : minutes;
seconds = seconds < 10 ? '0' + seconds : seconds;
setMinutes_Counter(minutes);
setSeconds_Counter(seconds);
//타이머 끝
if (--count < 0) {
clearInterval(timer);
setIsRunning(false);
setInputCrtfy('crtfyhpNo', '');
// setCrtfyNo('');
setModal({
isOpen: true,
title: '인증번호 만료',
desc: '인증번호가 만료되었습니다.',
color: 'modal-danger'
})
}
}, 1000);
setTimer(timer);
return () => {
clearInterval(timer);
};
};
useEffect(() => {
if (userInfo) {
setOkcheck(!okinput ? userInfo.hpno : inputHpno)
}
}, [userInfo])
//휴대폰 인증번호 보내기
const handlerSmsSend = async () => {
// const vData = getValues();
if (!inputHpno) {
setModal({
isOpen: true,
title: '인증번호 발송',
desc: '휴대폰 번호를 입력해 주세요.',
color: 'modal-danger'
});
return;
}
if (sendCount >= 3) {
setModal({
isOpen: true,
title: '인증번호 발송',
desc: '인증번호 발송은 3회까지만 가능합니다.',
color: 'modal-danger'
});
return;
}
if(inputHpno.length < 11) {
setModal({
isOpen: true,
title: '인증번호 발송',
desc: '올바른 번호를 입력해 주세요.',
color: 'modal-danger'
})
return;
}
const res = await accountApi.crtfyhp(inputHpno);
if (!res.data.result) {
if (res.data.code === -1) {
setModal({
isOpen: true,
title: '인증번호 발송',
desc: '이미 가입된 휴대폰입니다.',
color: 'modal-danger'
});
} else {
setModal({
isOpen: true,
title: '인증번호 발송',
desc: '인증번호 발송을 실패하였습니다.',
color: 'modal-danger'
});
}
return;
} else {
{
setModal({
isOpen: true,
title: '인증번호 발송',
desc: '인증번호를 발송했습니다.',
color: 'modal-primary'
});
}
}
// console.log(res);
if (isRunning) {
clearInterval(timer);
}
setIsRunning(true);
setSendCount(sendCount + 1);
timerStart(180);
// handlerSmsSend();
};
const toggle = tab => setActiveTab(tab);
const [formModal, setFormModal] = useState(false);
const { userPage } = useSelector(state => state.UserPageState);
const { user } = useSelector(state => state.authState);
const { userPwPage } = useSelector(state => state.UserPwState);
const [userInfo, setUserInfo] = useState();
const [inputHpno, setInputHpno] = useState('');
const [inputCrtfy, setInputCrtfy] = useState('');
const [minutes_Counter, setMinutes_Counter] = useState('03');
const [seconds_Counter, setSeconds_Counter] = useState('00');
const [timer, setTimer] = useState(null);
const [isRunning, setIsRunning] = useState(false);
const [sendCount, setSendCount] = useState(0);
const [isCrtfy, setIsCrtfy] = useState(false);
const [okinput, setOkinput] = useState(false);
const [okcheck, setOkcheck] = useState('');
const [modal, setModal] = useState({
isOpen: false,
title: '',
desc: '',
color: ''
});
const [quite, setQuite] = useState({
isOpen: false,
title: '',
desc: '',
color: ''
});
const timerStart = count => {
let minutes, seconds;
const timer = setInterval(() => {
setIsRunning(true);
minutes = parseInt(count / 60, 10);
seconds = parseInt(count % 60, 10);
minutes = minutes < 10 ? '0' + minutes : minutes;
seconds = seconds < 10 ? '0' + seconds : seconds;
setMinutes_Counter(minutes);
setSeconds_Counter(seconds);
useEffect(() => {
// setIsRunning(true);
if (isRunning) {
clearInterval(timer);
}
return () => {
clearInterval(timer);
// setIsRunning(false);
};
}, []);
//휴대폰 인증하기
const handlerSmsConfirm = async () => {
//const vData = getValues();
if (!inputHpno) {
setModal({
isOpen: true,
title: '인증번호 인증',
desc: '휴대폰 번호를 입력해 주세요.',
color: 'modal-danger'
});
return false;
}
if (!inputCrtfy) {
setModal({
isOpen: true,
title: '인증번호 인증',
desc: '인증번호를 입력해 주세요.',
color: 'modal-danger'
});
return false;
}
const res = await accountApi.crtfyhpConfirm(inputHpno, inputCrtfy);
if (!res.data.result) {
setModal({
isOpen: true,
title: '인증번호 인증',
desc: '인증번호가 잘못되었습니다.',
color: 'modal-danger'
})
}
else if (res?.data.code === 0) {
setModal({
isOpen: true,
title: '인증번호 발송',
desc: '인증번호가 발송되었습니다.',
color: 'modal-primary'
})
} else {
setModal({
isOpen: true,
title: '인증번호 성공',
desc: '인증되었습니다',
color: 'modal-primary'
})
setOkinput(!okinput);
}
setIsRunning(true);
setIsCrtfy(true);
//타이머 끝
if (--count < 0) {
clearInterval(timer);
setIsRunning(false);
setInputCrtfy('crtfyhpNo', '');
// setCrtfyNo('');
setModal({
isOpen: true,
title: '인증번호 만료',
desc: '인증번호가 만료되었습니다.',
color: 'danger'
});
}
}, 1000);
setTimer(timer);
return () => {
clearInterval(timer);
};
};
useEffect(() => {
if (userInfo) {
setOkcheck(!okinput ? userInfo.hpno : inputHpno);
}
}, [userInfo]);
//휴대폰 인증번호 보내기
const handlerSmsSend = async () => {
// const vData = getValues();
useEffect(() => {
if (userPage)
setUserInfo(userPage[0])
}, [userPage])
if (!inputHpno) {
setModal({
isOpen: true,
title: '인증번호 발송',
desc: '휴대폰 번호를 입력해 주세요.',
color: 'danger'
});
return;
}
if (sendCount >= 3) {
setModal({
isOpen: true,
title: '인증번호 발송',
desc: '인증번호 발송은 3회까지만 가능합니다.',
color: 'danger'
});
return;
}
if (inputHpno.length < 11) {
setModal({
isOpen: true,
title: '인증번호 발송',
desc: '올바른 번호를 입력해 주세요.',
color: 'danger'
});
return;
}
const res = await accountApi.crtfyhp(inputHpno);
const handlerInput = e => {
const { name, value } = e.target;
setUserInfo({
...userInfo,
[name]: value
if (!res.data.result) {
if (res.data.code === -1) {
setModal({
isOpen: true,
title: '인증번호 발송',
desc: '이미 가입된 휴대폰입니다.',
color: 'danger'
});
} else {
setModal({
isOpen: true,
title: '인증번호 발송',
desc: '인증번호 발송을 실패하였습니다.',
color: 'danger'
});
}
return;
} else {
{
setModal({
isOpen: true,
title: '인증번호 발송',
desc: '인증번호를 발송했습니다.',
color: 'primary'
});
}
}
// console.log(res);
if (isRunning) {
clearInterval(timer);
}
setIsRunning(true);
setSendCount(sendCount + 1);
timerStart(180);
// handlerSmsSend();
};
useEffect(() => {
// setIsRunning(true);
if (isRunning) {
clearInterval(timer);
}
return () => {
clearInterval(timer);
// setIsRunning(false);
};
}, []);
//휴대폰 인증하기
const handlerSmsConfirm = async () => {
//const vData = getValues();
useEffect(() => {
if (user) {
dispatch(userPageAction.request(user.cstmrSno));
}
}, []);
if (!inputHpno) {
setModal({
isOpen: true,
title: '인증번호 인증',
desc: '휴대폰 번호를 입력해 주세요.',
color: 'danger'
});
const handler = () => {
setFormModal(!formModal)
return false;
}
if (!inputCrtfy) {
setModal({
isOpen: true,
title: '인증번호 인증',
desc: '인증번호를 입력해 주세요.',
color: 'danger'
});
return false;
}
let hpno = '';
let crtfyhp = '';
const handlerChange = (e) => {
const { name, value } = e.target;
if (name == 'hpno') {
const regex = /^[0-9]{0,11}$/;
if(regex.test(value)){
hpno = value;
setInputHpno(hpno)
}
} else if (name == 'crtfyhpNo') {
const regex = /^[0-9]{0,6}$/;
if(regex.test(value)) {
crtfyhp = value;
setInputCrtfy(crtfyhp)
}
}
const res = await accountApi.crtfyhpConfirm(inputHpno, inputCrtfy);
if (!res.data.result) {
setModal({
isOpen: true,
title: '인증번호 인증',
desc: '인증번호가 잘못되었습니다.',
color: 'danger'
});
} else if (res?.data.code === 0) {
setModal({
isOpen: true,
title: '인증번호 발송',
desc: '인증번호가 발송되었습니다.',
color: 'primary'
});
} else {
setModal({
isOpen: true,
title: '인증번호 성공',
desc: '인증되었습니다',
color: 'primary'
});
setOkinput(!okinput);
}
//업데이트
const handlerUpdate = () => {
const param = {
cstmrSno: user.cstmrSno,
email: userInfo.email,
updateUserId: userInfo.userId,
hpno: okcheck
}
dispatch(userupdateAction.request(param));
setIsRunning(true);
setIsCrtfy(true);
};
useEffect(() => {
if (userPage) setUserInfo(userPage[0]);
}, [userPage]);
const handlerInput = e => {
const { name, value } = e.target;
setUserInfo({
...userInfo,
[name]: value
});
};
useEffect(() => {
if (user) {
dispatch(userPageAction.request(user.cstmrSno));
}
}, []);
const handler = () => {
setFormModal(!formModal);
};
let hpno = '';
let crtfyhp = '';
const handlerChange = e => {
const { name, value } = e.target;
if (name == 'hpno') {
const regex = /^[0-9]{0,11}$/;
if (regex.test(value)) {
hpno = value;
setInputHpno(hpno);
}
} else if (name == 'crtfyhpNo') {
const regex = /^[0-9]{0,6}$/;
if (regex.test(value)) {
crtfyhp = value;
setInputCrtfy(crtfyhp);
}
}
};
//업데이트
const handlerUpdate = () => {
const param = {
cstmrSno: user.cstmrSno,
email: userInfo.email,
updateUserId: userInfo.userId,
hpno: okcheck
};
return (
<div className='pal-card'>
<div className='card-body-tab-menu'>
<Nav pills>
<NavItem>
<NavLink active={activeTab === '1'} onClick={() => toggle('1')}>
<User size={14} />
<span className='align-middle d-none d-sm-block'>내정보</span>
</NavLink>
</NavItem>
<NavItem>
<NavLink active={activeTab === '2'} onClick={() => toggle('2')}>
<Lock size={14} />
<span className='align-middle d-none d-sm-block'>비밀번호 변경</span>
</NavLink>
</NavItem>
</Nav>
</div>
{activeTab == 1 ? <AccountMypageForm
userInfo={userInfo}
handler={handler}
formModal={formModal}
handlerUpdate={handlerUpdate}
handlerInput={handlerInput}
inputHpno={inputHpno}
inputCrtfy={inputCrtfy}
okinput={okinput}
handlerChange={handlerChange}
handlerSmsConfirm={handlerSmsConfirm}
modal={modal}
isRunning={isRunning}
minutes_Counter={minutes_Counter}
seconds_Counter={seconds_Counter}
handlerSmsSend={handlerSmsSend}
isCrtfy={isCrtfy}
/>
:
<></>
}
{activeTab == 2 ?
<AccountMypagePwForm
user={user}
/>
:
<></>
}
<div className='vertically-centered-modal'>
<Modal
isOpen={modal.isOpen}
toggle={() => setModal({ ...modal, isOpen: !modal.isOpen })}
modalClassName={modal.color}
className='modal-dialog-centered'
>
<ModalHeader
toggle={() => setModal({ ...modal, isOpen: !modal.isOpen })}
>
{modal.title}
</ModalHeader>
<ModalBody>{modal.desc}</ModalBody>
<ModalFooter>
<Button
color='danger'
onClick={() => setModal({ ...modal, isOpen: !modal.isOpen })}
>
확인
</Button>{' '}
</ModalFooter>
</Modal>
</div>
<MessageErrorModal />
<MessageInfoModal />
</div>
)
}
dispatch(userupdateAction.request(param));
};
const handlerTest = () => {
setQuite({
isOpen: true,
title: '탈퇴 확인',
desc: '정말로 탈퇴 하시겠습니까?'
});
return;
};
const waitwait = () => {
// alert('아직 탈퇴 못해용~');
setModal({
isOpen: true,
title: '탈퇴 확인',
desc: '탈퇴가 완료되었습니다.',
color: 'primary'
});
return;
};
return (
<div className='pal-card'>
<div className='card-body-tab-menu'>
<Nav pills>
<NavItem>
<NavLink active={activeTab === '1'} onClick={() => toggle('1')}>
<User size={14} />
<span className='align-middle d-none d-sm-block'>내정보</span>
</NavLink>
</NavItem>
<NavItem>
<NavLink active={activeTab === '2'} onClick={() => toggle('2')}>
<Lock size={14} />
<span className='align-middle d-none d-sm-block'>
비밀번호 변경
</span>
</NavLink>
</NavItem>
</Nav>
</div>
{activeTab == 1 ? (
<>
<AccountMypageForm
userInfo={userInfo}
handler={handler}
formModal={formModal}
handlerUpdate={handlerUpdate}
handlerInput={handlerInput}
inputHpno={inputHpno}
inputCrtfy={inputCrtfy}
okinput={okinput}
handlerChange={handlerChange}
handlerSmsConfirm={handlerSmsConfirm}
modal={modal}
isRunning={isRunning}
minutes_Counter={minutes_Counter}
seconds_Counter={seconds_Counter}
handlerSmsSend={handlerSmsSend}
isCrtfy={isCrtfy}
handlerWidthrow={handlerTest}
/>
<ConfirmModal
modal={quite}
setModal={setQuite}
handlerConfirm={waitwait}
color='danger'
/>
</>
) : (
<></>
)}
{activeTab == 2 ? <AccountMypagePwForm user={user} /> : <></>}
<div className='vertically-centered-modal'>
<Modal
isOpen={modal.isOpen}
toggle={() => setModal({ ...modal, isOpen: !modal.isOpen })}
modalClassName={'modal-' + `${modal.color}`}
className='modal-dialog-centered'
>
<ModalHeader
toggle={() => setModal({ ...modal, isOpen: !modal.isOpen })}
>
{modal.title}
</ModalHeader>
<ModalBody>{modal.desc}</ModalBody>
<ModalFooter>
<Button
color={modal.color}
onClick={() => setModal({ ...modal, isOpen: !modal.isOpen })}
>
확인
</Button>{' '}
</ModalFooter>
</Modal>
</div>
<MessageErrorModal />
<MessageInfoModal />
</div>
);
};
export default AccountMypageContainer;

1
src/containers/basis/flight/aprv/FlightPlanAprvContainer.js

@ -230,6 +230,7 @@ const FlightPlanAprvContainer = () => {
handleClickAprv={handleClickAprv}
joinList={joinList}
selectGroup={selectGroup}
handleChangeSelected={handleChangeSelected}
/>
</>
) : (

15
src/containers/basis/group/BasisGroupContainer.js

@ -65,11 +65,24 @@ export const BasisGroupContainer = props => {
// minWidth: '102px',
sortable: true,
cell: row => {
return <Link to={`/basis/group/detail/${row.groupId}`}>상세보기</Link>;
// return <Link to={`/basis/group/detail/${row.groupId}`}>상세보기</Link>;
return (
<Button.Ripple
color='primary'
className='badge badge-primary'
onClick={() => handleDetail(row.groupId)}
>
상세보기
</Button.Ripple>
);
}
}
];
const handleDetail = groupId => {
history.push(`/basis/group/detail/${groupId}`);
};
const joinColumns = [
{
name: '그룹명',

13
src/containers/basis/group/BasisGroupDetailContainer.js

@ -83,10 +83,15 @@ export const BasisGroupDetailContainer = () => {
const handlerInput = e => {
const { name, value } = e.target;
setGroupData({
...groupData,
[name]: value
});
if (name == 'groupNm') {
const regex = /^[ㄱ-힣A-Za-z0-9]{0,11}$/;
if (regex.test(value)) {
setGroupData({
...groupData,
[name]: value
});
}
}
};
return (

Loading…
Cancel
Save