diff --git a/src/App.tsx b/src/App.tsx index 6716417..43bbbbb 100644 --- a/src/App.tsx +++ b/src/App.tsx @@ -65,4 +65,4 @@ function App() { ); } -export default App; +export default App; \ No newline at end of file diff --git a/src/assets/icon.ts b/src/assets/icon.ts index f4653f2..b63ac67 100644 --- a/src/assets/icon.ts +++ b/src/assets/icon.ts @@ -12,6 +12,7 @@ export { ReactComponent as InputProfile } from './icon/add_group/InputProfile.sv export { ReactComponent as PlusCircle } from './icon/add_group/plusCircle.svg'; export { ReactComponent as NowInportName } from './icon/add_group/nowinportname.svg'; export { ReactComponent as xCircle } from './icon/add_group/xCircle.svg'; +export { ReactComponent as SelectType } from './icon/add_group/SelectType.svg'; // common export { ReactComponent as Cloud } from './icon/common/cloud.svg'; export { ReactComponent as Fly } from './icon/common/fly.svg'; diff --git a/src/assets/icon/add_group/SelectType.svg b/src/assets/icon/add_group/SelectType.svg new file mode 100644 index 0000000..16130b4 --- /dev/null +++ b/src/assets/icon/add_group/SelectType.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/components/AddGroup/AddGroupMembername/AddGroupMembername.tsx b/src/components/AddGroup/AddGroupMembername/AddGroupMembername.tsx index 05697c9..ca4c043 100644 --- a/src/components/AddGroup/AddGroupMembername/AddGroupMembername.tsx +++ b/src/components/AddGroup/AddGroupMembername/AddGroupMembername.tsx @@ -2,7 +2,7 @@ import React from 'react'; import * as S from './Styles'; import { useNavigate } from 'react-router-dom'; import { useRecoilValue } from 'recoil'; -import { namesState } from '../state'; +import { namesState } from '../../../recoil/states/addgroupState'; import MembernameList from './membernameList/membernameList'; function MemberNameHead() { diff --git a/src/components/AddGroup/AddGroupMembername/membernameList/membernameList.tsx b/src/components/AddGroup/AddGroupMembername/membernameList/membernameList.tsx index 4d3c0e0..6342ed4 100644 --- a/src/components/AddGroup/AddGroupMembername/membernameList/membernameList.tsx +++ b/src/components/AddGroup/AddGroupMembername/membernameList/membernameList.tsx @@ -1,7 +1,7 @@ import React, { useState } from 'react'; import * as S from './Styles'; import { useRecoilState } from 'recoil'; -import { namesState } from '../../state'; // Recoil 상태가 정의된 파일을 import +import { namesState } from '../../../../recoil/states/addgroupState'; // Recoil 상태가 정의된 파일을 import interface MembernameCreateProps { addName: (name: string) => void; diff --git a/src/components/AddGroup/AddGroupShare/AddGroupshare.tsx b/src/components/AddGroup/AddGroupShare/AddGroupshare.tsx index 566ed7f..fc9ed52 100644 --- a/src/components/AddGroup/AddGroupShare/AddGroupshare.tsx +++ b/src/components/AddGroup/AddGroupShare/AddGroupshare.tsx @@ -1,7 +1,7 @@ import React from 'react'; import * as S from './Styles'; import { useRecoilValue } from 'recoil'; -import { placeState } from '../state'; +import { placeState } from '../../../recoil/states/addgroupState'; const AddGroupshare = () => { const place = useRecoilValue(placeState); diff --git a/src/components/AddGroup/AddGroupSpace/Space.tsx b/src/components/AddGroup/AddGroupSpace/Space.tsx index 2a79a23..953c9f8 100644 --- a/src/components/AddGroup/AddGroupSpace/Space.tsx +++ b/src/components/AddGroup/AddGroupSpace/Space.tsx @@ -2,7 +2,12 @@ import React, { useState } from 'react'; import { useNavigate } from 'react-router-dom'; import * as S from './Styles'; import { useRecoilState, useRecoilValue } from 'recoil'; -import { namesState, newtypeState, placeState, typeState } from '../state'; +import { + namesState, + newtypeState, + placeState, + typeState, +} from '../../../recoil/states/addgroupState'; const Space = () => { const navigate = useNavigate(); diff --git a/src/components/AddGroup/AddGroupType/GroupType.tsx b/src/components/AddGroup/AddGroupType/GroupType.tsx index f439478..5b7fb04 100644 --- a/src/components/AddGroup/AddGroupType/GroupType.tsx +++ b/src/components/AddGroup/AddGroupType/GroupType.tsx @@ -3,7 +3,11 @@ import * as S from './Styles'; import { useNavigate } from 'react-router-dom'; import MemberTypeList from './MemberTypeList/MemberTypeList'; import { useRecoilValue } from 'recoil'; -import { namesState, newtypeState, typeState } from '../state'; +import { + namesState, + newtypeState, + typeState, +} from '../../../recoil/states/addgroupState'; function MemberTypeHead() { return ( diff --git a/src/components/AddGroup/AddGroupType/MemberTypeList/MemberTypeList.tsx b/src/components/AddGroup/AddGroupType/MemberTypeList/MemberTypeList.tsx index 5527171..be0aaa6 100644 --- a/src/components/AddGroup/AddGroupType/MemberTypeList/MemberTypeList.tsx +++ b/src/components/AddGroup/AddGroupType/MemberTypeList/MemberTypeList.tsx @@ -2,7 +2,10 @@ import React from 'react'; import * as S from './Styles'; import { useRecoilState } from 'recoil'; -import { newtypeState, typeState } from '../../state'; +import { + newtypeState, + typeState, +} from '../../../../recoil/states/addgroupState'; const MemberTypeCreate = () => { const [newType, setNewType] = useRecoilState(newtypeState); // Recoil 상태를 사용하여 newType을 관리합니다. @@ -49,12 +52,12 @@ const MemberTypeList: React.FC = () => { {initialTypes.map((Type, index) => ( handleTypeClick(Type)}> - - + {selectedTypes.includes(Type) ? ( + + ) : ( + + )} + {Type} diff --git a/src/components/AddGroup/AddGroupType/MemberTypeList/Styles.ts b/src/components/AddGroup/AddGroupType/MemberTypeList/Styles.ts index 229558a..2297ebc 100644 --- a/src/components/AddGroup/AddGroupType/MemberTypeList/Styles.ts +++ b/src/components/AddGroup/AddGroupType/MemberTypeList/Styles.ts @@ -66,6 +66,13 @@ export const NowImportType = styled(I.GroupBtn)` align-items: center; `; +export const SelectType = styled(I.SelectType)` + position: absolute; + width: 71px; + z-index: 0; + align-items: center; +`; + export const Type = styled.p` overflow: hidden; white-space: nowrap; diff --git a/src/components/AddGroup/state.tsx b/src/recoil/states/addgroupState.tsx similarity index 100% rename from src/components/AddGroup/state.tsx rename to src/recoil/states/addgroupState.tsx