Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[HOTFIX] QA 및 디자인 수정 사항 반영 #73

Merged
merged 31 commits into from
May 23, 2024
Merged
Changes from 1 commit
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
5c72b96
feat: 마이페이지 사이드바 (#52)
mungjin01 May 19, 2024
45257ca
feat: 브랜드 뷰 임시 레이아웃
mungjin01 May 19, 2024
e8430fe
feat: 마이페이지 레이아웃 (#52)
mungjin01 May 20, 2024
f5cca07
feat: 마이페이지 전체 레이아웃 (#52)
mungjin01 May 20, 2024
05885f4
chore: 레이아웃 수정 (#53)
mungjin01 May 20, 2024
618d977
chore: 임시 모달창 구현 (#52)
mungjin01 May 21, 2024
1992e23
Merge branch 'develop' of https://github.com/KUSITMS-29th-TEAM-D/Fron…
mungjin01 May 22, 2024
145df79
feat: 마이페이지 모달창
mungjin01 May 23, 2024
1e1dc6e
feat: 마이페이지 경험 신청 체이지 api 연동 일부 (#52)
mungjin01 May 23, 2024
9584228
chore: 카드 더미데이터 추가 (#52)
mungjin01 May 23, 2024
82b3826
chore: 레이아웃 일부 수정
mungjin01 May 23, 2024
9422472
chore: api 수정 (#52)
mungjin01 May 23, 2024
3cf0b43
chore: 브랜드 관리 카드 유형 수정 (#52)
mungjin01 May 23, 2024
30da652
fix: 모달창 입력 수정(#52)
mungjin01 May 23, 2024
3537ec8
feat: 마이페이지 내 페르소나 섹션 구현 (#62)
AAminha May 23, 2024
e301b4a
Merge branch 'develop' of https://github.com/KUSITMS-29th-TEAM-D/Fron…
AAminha May 23, 2024
118206c
fix: QA 사항 수정
AAminha May 23, 2024
397e877
fix: QA 수정
AAminha May 23, 2024
2ec3e6c
fix: 라우터 수정
AAminha May 23, 2024
df6469d
fix: 링크 라우터 연결
AAminha May 23, 2024
fb98953
fix: 링크 수정
mungjin01 May 23, 2024
fd8be02
fix : 유저 등급에 따른 서비스 제한
AAminha May 23, 2024
de54233
fix: 키워드 수정
AAminha May 23, 2024
a5184a7
fix
AAminha May 23, 2024
9e98476
fix: 라우터 수정
AAminha May 23, 2024
2e5643b
Update README.md
emilywin825 May 23, 2024
f5586b9
Merge pull request #72 from KUSITMS-29th-TEAM-D/fix/banner
AAminha May 23, 2024
704926d
fix: 닉네임 없는 오류 수정
AAminha May 23, 2024
a3ebee4
Merge branch 'develop' of https://github.com/KUSITMS-29th-TEAM-D/Fron…
AAminha May 23, 2024
5e95c2f
Merge branch 'develop' of https://github.com/KUSITMS-29th-TEAM-D/Fron…
AAminha May 23, 2024
f607479
Merge pull request #70 from KUSITMS-29th-TEAM-D/feat/#62/mypage-persona
AAminha May 23, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: 모달창 입력 수정(#52)
mungjin01 committed May 23, 2024
commit 30da652ec1980b6502a43eb5c92f842411f1c305
6 changes: 3 additions & 3 deletions src/components/MyPage/MyExperienceView.tsx
Original file line number Diff line number Diff line change
@@ -44,7 +44,7 @@ export const MyExperienceView = ({
clickContentHandler={(newSelected: string) => {
setSortOrder(newSelected === '최신순' ? 'desc' : 'asc');
}}
width="312px"
width="201px"
contentMaxHeight="172px"
multiple={false}
/>
@@ -75,7 +75,7 @@ export const MyExperienceView = ({
clickContentHandler={(newSelected: string) => {
setSortOrder(newSelected === '최신순' ? 'desc' : 'asc');
}}
width="312px"
width="201px"
contentMaxHeight="172px"
multiple={false}
/>
@@ -106,7 +106,7 @@ export const MyExperienceView = ({
clickContentHandler={(newSelected: string) => {
setSortOrder(newSelected === '최신순' ? 'desc' : 'asc');
}}
width="312px"
width="201px"
contentMaxHeight="172px"
multiple={false}
/>
22 changes: 19 additions & 3 deletions src/components/common/Modal/BrandCardModal.tsx
Original file line number Diff line number Diff line change
@@ -15,6 +15,7 @@ export const BrandCardModal = ({ isOpen, onClose }: ModalProps) => {
const [startDate, setStartDate] = useState('2024.05.15');
const [endDate, setEndDate] = useState('');
const [description, setDescription] = useState('');
const [status, setStatus] = useState<'진행전' | '진행중' | '완료'>('진행전');
if (!isOpen) return null;

return (
@@ -38,13 +39,28 @@ export const BrandCardModal = ({ isOpen, onClose }: ModalProps) => {
</FrameRow>
<FrameRow>
<Label>진행상태</Label>
<PlainButton variant="disabled" height="48px" width="87px">
<PlainButton
variant={status === '진행전' ? 'disabled' : 'gray'}
height="48px"
width="87px"
onClick={() => setStatus('진행전')}
>
진행전
</PlainButton>
<PlainButton variant="gray" height="48px" width="87px">
<PlainButton
variant={status === '진행중' ? 'disabled' : 'gray'}
height="48px"
width="87px"
onClick={() => setStatus('진행중')}
>
진행중
</PlainButton>
<PlainButton variant="gray" height="48px" width="74px">
<PlainButton
variant={status === '완료' ? 'disabled' : 'gray'}
height="48px"
width="74px"
onClick={() => setStatus('완료')}
>
완료
</PlainButton>
</FrameRow>