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

src/components/account/find/AccountFindPassword.js

@@ -56,11 +56,21 @@ export const AccountFindPassword =  props => {
   }, []);
 
   const handlerSend = async() => {
-    if(!inputId || !inputHpno) {
+    if(!inputId) {
       setModal({
         isOpen: true,
         title: '인증번호 발송',
-        desc: '빈칸을 채워주세요.',
+        desc: '아이디를 입력해 주세요.',
+        color: 'modal-danger'
+      })
+      return;
+    }
+
+    if(!inputHpno) {
+      setModal({
+        isOpen: true,
+        title: '인증번호 발송',
+        desc: '휴대폰 번호를 입력해 주세요.',
         color: 'modal-danger'
       })
       return;
@@ -126,6 +136,12 @@ export const AccountFindPassword =  props => {
         setIsRunning(false);
         // setValue('crtfyNo', '');
         // setCrtfyNo('');
+        setModal({
+          isOpen: true,
+          title: '인증번호 만료',
+          desc: '인증번호가 만료되었습니다.',
+          color: 'modal-danger'
+        })
       }
     }, 1000);
 
@@ -137,11 +153,21 @@ export const AccountFindPassword =  props => {
   }
 
   const handlerConfirm = async() => {
-    if(!inputId || !inputHpno) {
+    if(!inputId) {
       setModal({
         isOpen: true,
-        title: '인증번호 인증',
+        title: '인증번호 발송',
-        desc: '빈칸을 채워주세요.',
+        desc: '아이디를 입력해 주세요.',
+        color: 'modal-danger'
+      })
+      return;
+    }
+
+    if(!inputHpno) {
+      setModal({
+        isOpen: true,
+        title: '인증번호 발송',
+        desc: '휴대폰 번호를 입력해 주세요.',
         color: 'modal-danger'
       })
       return;
@@ -183,7 +209,7 @@ export const AccountFindPassword =  props => {
       setModal({
         isOpen: true,
         title: '비밀번호 변경',
-        desc: '빈칸을 채워주세요.',
+        desc: '비밀번호를 입력해 주세요.',
         color: 'modal-danger'
       })
       return;
@@ -194,7 +220,7 @@ export const AccountFindPassword =  props => {
       setModal({
         isOpen: true,
         title: '비밀번호 변경',
-        desc: '8자 이상, 20자 미만 영문자/숫자/특수문자(@$!%*#?&) 조합하여 입력해주세요.',
+        desc: '8자 이상, 20자 미만 영문자/숫자/특수문자(@$!%*#?&) 조합하여 입력해 주세요.',
         color: 'modal-danger'
       })
       return;
@@ -242,12 +268,17 @@ export const AccountFindPassword =  props => {
         setInputCrtfy(crtfyhp)
       }
     } else if(name == 'newPw') {
+      const regex = /^[A-Za-z0-9@$!%*#?&]{0,20}$/;
+      if(regex.test(value)) {
         newpw = value;
         setInputNewPw(newpw);
-      // }
+      }
     } else if(name == 'newPwCk') {
+      const regex = /^[A-Za-z0-9@$!%*#?&]{0,20}$/;
+      if(regex.test(value)) {
         newpwck = value;
         setInputNewPwCk(newpwck);
+      }
     }
   }
 

src/components/account/find/AccountFindUserId.js

@@ -52,11 +52,21 @@ export const AccountFindUserId =  props  => {
   }, []);
 
   const handlerSend = async() => {
-    if(!inputName || !inputHpno) {
+    if(!inputName) {
       setModal({
         isOpen: true,
         title: '인증번호 발송',
-        desc: '빈칸을 채워주세요.',
+        desc: '이름을 입력해 주세요.',
+        color: 'modal-danger'
+      })
+      return;
+    }
+
+    if(!inputHpno) {
+      setModal({
+        isOpen: true,
+        title: '인증번호 발송',
+        desc: '휴대폰 번호를 입력해 주세요.',
         color: 'modal-danger'
       })
       return;
@@ -121,6 +131,12 @@ export const AccountFindUserId =  props  => {
         setIsRunning(false);
         // setValue('crtfyNo', '');
         // setCrtfyNo('');
+        setModal({
+          isOpen: true,
+          title: '인증번호 만료',
+          desc: '인증번호가 만료되었습니다.',
+          color: 'modal-danger'
+        })
       }
     }, 1000);
 
@@ -132,11 +148,21 @@ export const AccountFindUserId =  props  => {
   }
 
   const handlerConfirm = async() => {
-    if(!inputName || !inputHpno) {
+    if(!inputHpno) {
+      setModal({
+        isOpen: true,
+        title: '인증번호 인증',
+        desc: '휴대폰 번호를 입력 해주세요.',
+        color: 'modal-danger'
+      })
+      return;
+    }
+
+    if(!inputName) {
       setModal({
         isOpen: true,
         title: '인증번호 인증',
-        desc: '빈칸을 채워주세요.',
+        desc: '이름을 입력 해주세요.',
         color: 'modal-danger'
       })
       return;

src/components/account/register/AccountRegister.js

@@ -8,6 +8,7 @@ import { AccountRegisterComplete } from './AccountRegisterComplete';
 
 export const AccountRegister = ({ props }) => {
   const [stepper, setStepper] = useState(null);
+  const [memberName, setMemberName] = useState();
   const ref = useRef(null);
 
   // console.log(props);
@@ -36,6 +37,8 @@ export const AccountRegister = ({ props }) => {
           stepper={stepper}
           type='wizard-horizontal'
           movePage={movePage}
+          memberName={memberName}
+          setMemberName={setMemberName}
         />
       )
     },
@@ -48,6 +51,7 @@ export const AccountRegister = ({ props }) => {
           stepper={stepper}
           type='wizard-horizontal'
           movePage={movePage}
+          memberName={memberName}
         />
       )
     }

src/components/account/register/AccountRegisterComplete.js

@@ -20,8 +20,9 @@ import {
 import AppCollapse from '@components/app-collapse';
 import Select from 'react-select';
 import { selectThemeColors } from '@utils';
+import { useSelector } from 'react-redux';
 
-export const AccountRegisterComplete = ({ stepper, type, movePage }) => {
+export const AccountRegisterComplete = ({ stepper, type, movePage, memberName}) => {
   const handlerLogin = () => {
     movePage('/account/login');
   };
@@ -30,7 +31,7 @@ export const AccountRegisterComplete = ({ stepper, type, movePage }) => {
     <Fragment>
       <div className='complete-txt'>
         <img src={completeImg} />
-        <span className='big-txt'>환영합니다. 홍길동 님</span>
+        <span className='big-txt'>환영합니다. {memberName}님</span>
         <span className='d-block'>
           모든 회원가입절차가 완료되었습니다. 로그인 후 사용해주세요.
         </span>

src/components/account/register/AccountRegisterForm.js

@@ -25,7 +25,7 @@ import { useDispatch, useSelector } from 'react-redux';
 import { accountApi } from '../../../modules/account/register/apis/accountApi';
 import * as Actions from '../../../modules/account/register/actions/accountAction';
 
-export const AccountRegisterForm = ({ stepper, type, movePage }) => {
+export const AccountRegisterForm = ({ stepper, type, movePage, testName, setMemberName }) => {
   const { agreeTerms } = useSelector(state => state.accountState);
   const [minutes_Counter, setMinutes_Counter] = useState('03');
   const [seconds_Counter, setSeconds_Counter] = useState('00');
@@ -198,9 +198,9 @@ export const AccountRegisterForm = ({ stepper, type, movePage }) => {
         });
         return false;
       }
-      // dispatch(
+      dispatch(
-      //   Actions.register.request({ data: data, agreeTerms: agreeTerms })
+        Actions.register.request({ data: data, agreeTerms: agreeTerms })
-      // );
+      );
       const res = await accountApi.register({
         data: data,
         agreeTerms: agreeTerms
@@ -272,6 +272,10 @@ export const AccountRegisterForm = ({ stepper, type, movePage }) => {
     // console.log(register);
     const { name, value } = e.target;
 
+    if(name == 'memberName') {
+      setMemberName(value);
+    }
+
     if (name == 'brthdyDate') {
       const regex = /^[0-9\b]{0,8}$/;
 

src/components/analysis/simulation/AnalysisSimulationDetail.js

@@ -210,7 +210,7 @@ export const AnalysisSimulationDetail = props => {
                 </div> */}
                 {props.stcsList?.map(item => {
                   return (
-                    <div
+                    <div key={item.timeCd}
                       className={
                         props.timeCd === item.timeCd
                           ? 'simulation-date-num date-num-focus'

src/components/analysis/simulation/AnalysisSimulationReport.js

@@ -6,7 +6,6 @@ import { Button, Input, InputGroup } from 'reactstrap';
 
 export const AnalysisSimulationReport = props => {
   // console.log(props.params);
-  console.log(11111111111111);
   return (
     <div className='left-layer'>
       <div className='layer-content'>

src/components/analysis/simulation/AnalysisSimulatorSlider.js

@@ -40,7 +40,6 @@ const AnalysisSimulatorSlider = ({
   };
 
   useEffect(() => {
-    console.log(playCount);
   }, [playCount]);
   return (
     <div className='simulation-slider'>

src/components/basis/dron/BasisDronImage.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { Edit, Image, Trash2 } from 'react-feather';
-import { Button, Label, Media } from 'reactstrap';
+import { Button, Label, Media, Modal, ModalHeader, ModalBody, ModalFooter } from 'reactstrap';
 
 export const BasisDronImage = props => {
   return (
@@ -50,6 +50,29 @@ export const BasisDronImage = props => {
             </span>
           </Button.Ripple>
         </div>
+        <div className='vertically-centered-modal'>
+          <Modal
+            isOpen={props.modal.isOpen}
+            toggle={() => props.setModal({ ...props.modal, isOpen: !props.modal.isOpen })}
+            modalClassName={props.modal.color}
+            className='modal-dialog-centered'
+          >
+            <ModalHeader
+              toggle={() => props.setModal({ ...props.modal, isOpen: !props.modal.isOpen })}
+            >
+              {props.modal.title}
+            </ModalHeader>
+            <ModalBody>{props.modal.desc}</ModalBody>
+            <ModalFooter>
+                <Button
+                  color='danger'
+                  onClick={() => props.setModal({ ...props.modal, isOpen: !props.modal.isOpen })}
+                >
+                  확인
+                </Button>
+            </ModalFooter>
+          </Modal>
+        </div>
         {/* <div className='sm-txt mt-1'>이미지 최적 크기 300*300</div> */}
       </Media>
     </Media>

src/components/basis/group/BasisGroupDetailJoinSearch.js

@@ -61,7 +61,7 @@ export const BasisGroupDetailJoinSearch = props => {
                                   type='text'
                                   id='groupNm'
                                   name='groupNm'
-                                  value={props.params.groupNm}
+                                  value={props.params.groupNm || ''}
                                   onChange={props.handlerInput}
                                   bsSize='sm'
                                   placeholder='그룹명을 입력하세요'
@@ -84,7 +84,7 @@ export const BasisGroupDetailJoinSearch = props => {
                                   id='groupId'
                                   name='groupId'
                                   onChange={props.handlerInput}
-                                  value={props.params.groupId}
+                                  value={props.params.groupId || ''}
                                   onKeyPress={props.onKeyPress}
                                   bsSize='sm'
                                   placeholder='그룹코드를 입력하세요'

src/components/basis/group/BasisGroupUsersSearch.js

@@ -61,7 +61,7 @@ export const BasisGroupUsersSearch = props => {
                                   type='text'
                                   id='groupNm'
                                   name='groupNm'
-                                  value={props.params.groupNm}
+                                  value={props.params.groupNm || ''}
                                   onChange={props.handlerInput}
                                   onKeyPress={props.onKeyPress}
                                   bsSize='sm'
@@ -87,7 +87,7 @@ export const BasisGroupUsersSearch = props => {
                                   type='text'
                                   id='memberName'
                                   name='memberName'
-                                  value={props.params.memberName}
+                                  value={props.params.memberName || ''}
                                   onChange={props.handlerInput}
                                   onKeyPress={props.onKeyPress}
                                   bsSize='sm'

src/containers/account/find/AccounFindTabContainer.js

@@ -1,10 +1,15 @@
 import { AccountFindTab } from "../../../components/account/find/AccountFindTab";
-
 import loginImg from '../../../assets/images/login01.png';
-
+import { Button } from 'reactstrap'
 import '../../../assets/css/custom.css';
+import { useHistory } from 'react-router-dom'
 
 export const AccountFindTabContainer = () => {
+  const history = useHistory();
+
+  const handlerRegister = () => {
+    history.push(`/account/register`)
+  }
 
   return (
     <>
@@ -17,6 +22,14 @@ export const AccountFindTabContainer = () => {
           <div className='pal-card'>
             <AccountFindTab  />
           </div>
+          <div className='user-search-link'>
+            <Button.Ripple
+              color='flat-warning'
+              onClick={handlerRegister}
+            >
+              회원가입 바로가기
+            </Button.Ripple>
+          </div>
         </div>
       </div>
     </>

src/containers/basis/dron/BasisDronDetailContainer.js

@@ -54,7 +54,12 @@ export const BasisDronDetailContainer = props => {
     },
     resolver: yupResolver(validationSchema)
   });
-
+  const [modal, setModal] = useState({
+    isOpen: false,
+    title: '',
+    desc: '',
+    color: ''
+  })
   useEffect(() => {
     if (props.id) {
       handlerSearch();
@@ -96,7 +101,21 @@ export const BasisDronDetailContainer = props => {
   const handlerImageChange = e => {
     const reader = new FileReader(),
       files = e.target.files;
-    saveFileAPI(files[0]);
+        if(!(files[0] == undefined)){
+          if(!(files[0].size == 0)){
+          const fileSize = files[0].size/1048576;
+            if(fileSize > 10) {
+              setModal({
+                isOpen: true,
+                title: '이미지 용량 초과',
+                desc: '10MB 이하의 파일만 등록 가능합니다',
+                color: 'modal-danger'
+              })
+            return;
+            }
+          }
+        }
+      saveFileAPI(files[0]);
   };
 
   const handlerImageDelete = () => {
@@ -148,6 +167,8 @@ export const BasisDronDetailContainer = props => {
           handlerImageDelete={handlerImageDelete}
           data={register}
           img={img}
+          modal={modal}
+          setModal={setModal}
         />
       </Col>
       <Col md={7} lg={9}>

src/modules/control/gp/sagas/controlGpSaga.ts

@@ -27,6 +27,7 @@ function* getControlGpSaga(
             if (controlGroupAuthInfo.length > 0) {
                 controlGroupAuthInfo.forEach((auth) => {
                     if (auth.groupAuthCd === 'CREATER' || auth.groupAuthCd === 'ADMIN') {
+                        
                         if (gpsData.length > 0) return false;
 
                         gpsData = data.filter(gps => auth.idntfNum === gps.objectId);
@@ -38,11 +39,10 @@ function* getControlGpSaga(
                         gpsData.filter(gps => auth.createUserId && auth.idntfNum === gps.objectId);
                     }
                 });
-            } 
+            }             
             
-            console.log('gps data >>>> ', data);
          */
-        
+            console.log('websocket data :: ', data);
 
         yield put(
             Actions.controlGpAction.success({