Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
9a51620
feat: 마이페이지 UI 추가
GukHyekyung Jun 23, 2022
881f54f
Merge pull request #114 from DHKH-null29/feat/#113/mypageUI
GukHyekyung Jun 23, 2022
35c6739
fix: 비밀번호 수정 인풋 추가 및 이메일 폼 위치 변경
GukHyekyung Jun 23, 2022
e0770b4
feat: HeaderBar에 마이페이지 추가
GounKim Jun 25, 2022
5bffb62
feat: 이메일 변경을 변경 불가능하게 수정
GounKim Jun 25, 2022
30f1e8a
feat: 비밀번호 변경을 변경 버튼으로 수정
GounKim Jun 25, 2022
1d86abd
feat: 회원 탈퇴 버튼 위치 변경
GounKim Jun 25, 2022
5f815d0
feat: 닉네임 변경 수정
GounKim Jun 25, 2022
93f798b
feat: 캘린더 아이콘 추가
GukHyekyung Jun 25, 2022
5bb07e5
feat: HeaderBar에 마이페이지 추가
GounKim Jun 25, 2022
831a8f4
fix: 이메일 변경을 변경 불가능하게 수정
GounKim Jun 25, 2022
7cc529e
fix 비밀번호 변경을 변경 버튼으로 수정
GounKim Jun 25, 2022
981f3a0
fix: 회원 탈퇴 버튼 위치 변경
GounKim Jun 25, 2022
a8a93b4
fix: 닉네임 변경 수정
GounKim Jun 25, 2022
775b0b5
feat: 캘린더 아이콘 추가
GounKim Jun 25, 2022
a853925
feat: 회원가입 일자 출력 추가
GounKim Jun 25, 2022
1ce566b
feat: 가입날짜 라벨 추가
GounKim Jun 25, 2022
351db7b
feat: 모바일 버전 사이드바에 마이페이지 추가
GounKim Jun 25, 2022
2acaec2
fix: 버튼 타입 변경
GounKim Jun 25, 2022
126a9d2
Merge commit '2acaec28fade7824ef043e30ddf7a3ac9bfe2168' into bridge/m…
GounKim Jun 25, 2022
cf67a6c
style: 스타일 변경
GounKim Jun 25, 2022
d23626b
feat: 마이페이지 조회 기능 추가
GounKim Jun 26, 2022
bb74252
feat: 닉네임 수정 api변경
GounKim Jun 26, 2022
949f4a2
feat: 닉네임 수정 기능 추가
GounKim Jun 27, 2022
4bc20df
feat: 닉네임 변경 시 화면 이동 수정
GounKim Jun 27, 2022
1b5bef0
feat: 회원 탈퇴 기능 추가 / 미완
GounKim Jun 27, 2022
ffb6f84
feat: 회원탈퇴 서비스 불가능 임시 메시지 추가
pds0309 Jun 28, 2022
980c757
Merge pull request #141 from DHKH-null29/feat/#115/mypage_api
pds0309 Jun 28, 2022
ab9f3ae
Merge branch 'develop' into bridge/mypage
pds0309 Jun 28, 2022
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
16 changes: 14 additions & 2 deletions src/api/memberApi.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,20 @@ export const onJoin = joinForm => {
return requestForAll.post(memberApi, joinForm);
};

export const onCheckNicknameDuplication = nickname => {
return requestForAll.get(memberApi + '/nickname', { params: { nickname } });
export const onCheckNicknameDuplication = async nickname => {
return await requestForAll.get(memberApi + '/nickname', { params: { nickname } });
};

export const onNicknameChange = updateNicknameRequest => {
return requestForAuth.put(memberApi + '/page/me', updateNicknameRequest);
};

export const onMyPage = async () => {
return await requestForAuth.get(memberApi + '/page/me');
};

export const onMembershipWithdrawal = async () => {
return await requestForAuth.delete(memberApi);
};

export const onChangePasswordWithVerifiedEmailByNoAuthUser = (email, password) => {
Expand Down
9 changes: 9 additions & 0 deletions src/components/header/HamburgerSideBar.js
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,15 @@ const HamburgerSideBar = ({ onCancle, onLogout, visible }) => {
</>
) : (
<>
<Buttons
onClick={() => {
handlePageButtonClick('/mypage');
onCancle();
}}
>
마이페이지
</Buttons>
<DevideLine space="micro" color="none" />
<Buttons
colortype={'sub'}
onClick={() => {
Expand Down
7 changes: 7 additions & 0 deletions src/components/header/HeaderBar.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,13 @@ const HeaderBar = () => {
</Navbar.Container>
) : (
<Navbar.Container align="right">
<StyledLink
className="is-hidden-tablet-only is-hidden-mobile navbar-item"
to={'/mypage'}
onClick={handleLinkClick}
>
마이페이지
</StyledLink>
<StyledA
className="is-hidden-tablet-only is-hidden-mobile navbar-item"
onClick={handleLogoutClick}
Expand Down
2 changes: 2 additions & 0 deletions src/components/icons/AnimatedIcon.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import ArrowDown from './animated/ArrowDown';
import Bookmark from './animated/Bookmark';
import Calendar from './animated/Calendar';
import CheckMark from './animated/CheckMark';
import CommonInput from './animated/CommonInput';
import Email from './animated/Email';
Expand Down Expand Up @@ -29,6 +30,7 @@ const AnimatedIcon = {
SkipForward,
Bookmark,
ThumbUp,
Calendar,
Heart,
Trash,
};
Expand Down
24 changes: 24 additions & 0 deletions src/components/icons/animated/Calendar.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
import { Colors, IconSize } from '../../../styles';

import UseAnimations from 'react-useanimations';
import calendar from 'react-useanimations/lib/calendar';

const Calendar = ({ lineColor, fillColor, size, ...props }) => {
return (
<UseAnimations
animation={calendar}
size={IconSize[size]}
strokeColor={lineColor}
fillColor={fillColor}
{...props}
/>
);
};

Calendar.defaultProps = {
size: IconSize.normal,
lineColor: Colors.formIconFirst,
fillColor: '',
};

export default Calendar;
Loading