diff --git a/src/api/types/auth.ts b/src/api/types/auth.ts index d911d4b..ffcf9d5 100644 --- a/src/api/types/auth.ts +++ b/src/api/types/auth.ts @@ -34,6 +34,8 @@ export interface IUserInfo { memberNickName: string; memberSmsAgree: string; imageUrl?: string; + memberPhone: string; + companyName: string; } export interface IWithdraw { diff --git a/src/hook/useLogin.ts b/src/hook/useLogin.ts index 17fa0c3..53c50c2 100644 --- a/src/hook/useLogin.ts +++ b/src/hook/useLogin.ts @@ -10,7 +10,7 @@ const useLogin = () => { const [error, setError] = useState(''); const onSuccess = (data: UserLoginType) => { const { accessToken } = data.data; - const cookieOptions = { path: '/', maxAge: 60 * 15 }; + const cookieOptions = { path: '/', maxAge: 600000 * 15 }; setCookie('token', accessToken, cookieOptions); diff --git a/src/pages/mypage/changepassword/index.tsx b/src/pages/mypage/changepassword/index.tsx index 17008e5..6b51357 100644 --- a/src/pages/mypage/changepassword/index.tsx +++ b/src/pages/mypage/changepassword/index.tsx @@ -55,9 +55,10 @@ export default function PasswordChange() { const isNextButtonEnabled = currentPasswordVerified && newPassword && newPassword === newPasswordConfirm; return ( -
-
- {/* +
+
+
+ {/* Back */} - -

새로 사용할

-

비밀번호를 설정해주세요.

+ +

새로 사용할

+

비밀번호를 설정해주세요.

-
- {/* Current Password Field */} -
- + + {/* Current Password Field */} +
+
+
+ - {/* New Password Field */} -
- -
- + +
-

- Warning - 영문, 숫자, 특수문자 중 2가지 이상 조합 8-16자리 -

-
+ {/* New Password Field */} +
+ +
+ +
- {/* Confirm New Password Field */} -
- -
- - value === watch('newPassword') || '*일치하지 않습니다.' - })} - disabled={!currentPasswordVerified} - /> +

+ Warning + 영문, 숫자, 특수문자 중 2가지 이상 조합 8-16자리 +

-
- - {/* Next Button */} - - + + {/* Next Button */} + + + +
); diff --git a/src/pages/mypage/changeprofile/index.tsx b/src/pages/mypage/changeprofile/index.tsx index 0c00280..a282b47 100644 --- a/src/pages/mypage/changeprofile/index.tsx +++ b/src/pages/mypage/changeprofile/index.tsx @@ -10,7 +10,7 @@ export default function Profile() { //api나오면 zustand 로직으로 수정 const [fileUrl, setFileUrl] = useState(null); - const [contact] = useState('010-1234-5678'); + // const [contact] = useState('010-1234-5678'); const member = useMember(); const job = getTitleFromDescription(jobPosition, member.memberJob); @@ -136,7 +136,7 @@ export default function Profile() { 연락처
- {contact} + {member.memberPhone}
diff --git a/src/pages/mypage/index.tsx b/src/pages/mypage/index.tsx index 72d80f5..4e39e8e 100644 --- a/src/pages/mypage/index.tsx +++ b/src/pages/mypage/index.tsx @@ -25,126 +25,133 @@ const MyPage = () => { }; return ( -
-
-
- -
-
-
-
- {member.memberNickName} +
+
+
+
+ +
+
+
+
+ {member.memberNickName} +
+
+ {job} +
-
- {job} +
+ {member.memberEmail}
-
- {member.memberEmail} -
-
- -
-
-
- 프로필 수정 + +
+
+
+ 프로필 수정 +
-
- + -
- -
-
-
-
- +
+ +
+
+
+
+ +
+
+
+
+ 이용가이드 +
-
-
- 이용가이드 +
+ + + +
+
+
+
+ +
+
+
+
+ 공지사항 +
-
- - - + + + +
- +
- 공지사항 + 1:1문의
- - - - -
-
-
-
- -
-
-
-
- 1:1문의 -
-
-
-
-
+
-
-
- 설정 +
+
+ 설정 +
-
-
-
-
-
- 알림 설정 +
+
+
+
+ 알림 설정 +
+
-
+
-
-
-
+
-
-
setModalVisible(true)} - className="text-center text-neutral-800 text-sm font-semibold font-['Pretendard'] leading-[21px]"> - 로그아웃 -
-
- {isModalVisible && } - {successModal && } -
-
- 회원탈퇴 +
setModalVisible(true)} + className=" cursor-pointer text-center text-neutral-800 text-sm font-bold font-['Pretendard'] leading-[21px]"> + 로그아웃
- + {isModalVisible && ( + + )} + {successModal && } + +
+
+ 회원탈퇴 +
+
+ +
); }; diff --git a/src/pages/mypage/notice/index.tsx b/src/pages/mypage/notice/index.tsx index 5fe535c..8dfd810 100644 --- a/src/pages/mypage/notice/index.tsx +++ b/src/pages/mypage/notice/index.tsx @@ -19,14 +19,14 @@ const NoticePage = () => {
toggleNotice('notice')}>
[안내] 5/13 (월) 02~03 커뮤니티 서비스 점검
{
{openNotice === 'notice' && ( -
+
안녕하세요.
Offispace 커뮤니티 서비스팀입니다. @@ -67,14 +67,14 @@ const NoticePage = () => { )}
toggleNotice('update1')}>
[업데이트 내역] 1.0.2 업데이트
{
{openNotice === 'update1' && ( -
+
안녕하세요.
Offispace 서비스팀입니다. @@ -118,7 +118,7 @@ const NoticePage = () => { [업데이트 내역] 1.0.3 업데이트
{
{openNotice === 'update2' && ( -
+
안녕하세요.
Offispace 서비스팀입니다. diff --git a/src/stores/user.ts b/src/stores/user.ts index 3f17c2a..ec60b2e 100644 --- a/src/stores/user.ts +++ b/src/stores/user.ts @@ -17,7 +17,9 @@ export const useMemberStore = create( memberName: '', memberNickName: '', memberJob: '', - memberSmsAgree: '' + memberSmsAgree: '', + memberPhone: '', + companyName: '' }, setmember: (payload: IUserInfo | undefined) => set((state) => ({ diff --git a/tailwind.config.ts b/tailwind.config.ts index 21c9527..b81b9c2 100644 --- a/tailwind.config.ts +++ b/tailwind.config.ts @@ -44,7 +44,9 @@ const config: Config = { 'gray-600': '#696969', 'gray-700': '#565656', 'gray-800': '#373737', - 'gray-900': '#212121' + 'gray-900': '#212121', + + 'text-neutral-800': '#212121' }, inset: { '1/2': '50%',