From d93c5a8de751e2c0bf4d672e1225b1539cb0858c Mon Sep 17 00:00:00 2001 From: = Date: Fri, 22 Dec 2023 20:11:02 +0900 Subject: [PATCH] =?UTF-8?q?=EC=B6=94=EA=B0=80=20=EC=88=98=EC=A0=95?= =?UTF-8?q?=EC=82=AC=ED=95=AD=20=EC=88=98=EC=A0=95(profile=20image,=20?= =?UTF-8?q?=EC=8B=9D=EB=B3=84=EC=9E=A5=EC=B9=98=20=EC=B6=94=EA=B0=80=20dis?= =?UTF-8?q?able,=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20form=20palnet=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../layouts/components/navbar/UserDropdown.js | 2 +- src/assets/images/portrait/small/kac_Porty02.jpg | Bin 0 -> 3337 bytes src/components/account/login/AccountLogin.js | 2 +- src/components/basis/dron/BasisIdntform.js | 11 +++++------ src/containers/basis/dron/BasisIdntfContainer.js | 2 +- 5 files changed, 8 insertions(+), 9 deletions(-) create mode 100644 src/assets/images/portrait/small/kac_Porty02.jpg 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 0000000000000000000000000000000000000000..161b7d25d035afc67fb44598d0d9db5a29fe66d9 GIT binary patch literal 3337 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 UhkTCy?CsHko|TRDHTswT0jAy^_W%F@ literal 0 HcmV?d00001 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);