diff --git a/src/@core/layouts/components/navbar/UserDropdown.js b/src/@core/layouts/components/navbar/UserDropdown.js index 04214b81..cf7af13f 100644 --- a/src/@core/layouts/components/navbar/UserDropdown.js +++ b/src/@core/layouts/components/navbar/UserDropdown.js @@ -2,7 +2,7 @@ // ** Custom Components import Avatar from '@components/avatar'; // ** Default Avatar Image -import defaultAvatar from '@src/assets/images/portrait/small/avatar-s-11.jpg'; +import defaultAvatar from '@src/assets/images/portrait/small/kac_Porty02.jpg'; // ** Utils import { isUserLoggedIn } from '@utils'; import { useEffect, useState } from 'react'; diff --git a/src/assets/images/portrait/small/kac_Porty02.jpg b/src/assets/images/portrait/small/kac_Porty02.jpg new file mode 100644 index 00000000..161b7d25 Binary files /dev/null and b/src/assets/images/portrait/small/kac_Porty02.jpg differ diff --git a/src/components/account/login/AccountLogin.js b/src/components/account/login/AccountLogin.js index b3c4c625..0b221033 100644 --- a/src/components/account/login/AccountLogin.js +++ b/src/components/account/login/AccountLogin.js @@ -23,7 +23,7 @@ export const AccountLogin = ({ props }) => { // 로그인 폼 const [loginForm, setLoginForm] = useState({ - userId: 'palnet', + userId: '', userPswd: '' }); diff --git a/src/components/basis/dron/BasisIdntform.js b/src/components/basis/dron/BasisIdntform.js index 250b84e4..de98a8f9 100644 --- a/src/components/basis/dron/BasisIdntform.js +++ b/src/components/basis/dron/BasisIdntform.js @@ -17,7 +17,6 @@ import { X } from 'react-feather'; import Repeater from '@components/repeater'; export const BasisIdntfForm = props => { - return ( @@ -160,8 +159,8 @@ export const BasisIdntfForm = props => { {...(props.data[i].disabled === undefined ? { disabled: false } : props.data[i].disabled - ? { disabled: true } - : { disabled: false })} + ? { disabled: true } + : { disabled: false })} > 삭제 @@ -181,8 +180,8 @@ export const BasisIdntfForm = props => { color='primary' size='sm' onClick={props.addData} - disabled={!props.isMyGroup} - // disabled={props.isDisabled} + disabled={!props.isMyGroup || props.data.length > 0} + // disabled={props.isDisabled} > + 추가 @@ -192,7 +191,7 @@ export const BasisIdntfForm = props => { size='sm' onClick={props.handlerSave} disabled={!props.isMyGroup} - // disabled={props.isDisabled} + // disabled={props.isDisabled} > 저장 diff --git a/src/containers/basis/dron/BasisIdntfContainer.js b/src/containers/basis/dron/BasisIdntfContainer.js index 85ce00ab..dba9e579 100644 --- a/src/containers/basis/dron/BasisIdntfContainer.js +++ b/src/containers/basis/dron/BasisIdntfContainer.js @@ -14,7 +14,7 @@ export const BasisIdntfContainer = props => { const { listIdntf, detail, isRefreshIdntf } = useSelector( state => state.dronState ); - + console.log(listIdntf); // 유저 정보 const { user } = useSelector(state => state.authState);