navigate("/mentorship")}
+ onClick={() => navigate("/mentorship/suggestion")}
>
멘토링 제안하기
diff --git a/src/mentorship/pages/Suggestion.tsx b/src/mentorship/pages/Suggestion.tsx
new file mode 100644
index 0000000..24e042f
--- /dev/null
+++ b/src/mentorship/pages/Suggestion.tsx
@@ -0,0 +1,52 @@
+import { useState } from "react";
+import { useNavigate } from 'react-router-dom';
+import { ArrowLeft } from "lucide-react";
+
+import SuggestInfo from "../components/suggestion/SuggestInfo";
+import SuggestTime from "../components/suggestion/SuggestTime";
+import SuggestSubject from "../components/suggestion/SuggestSubject";
+import { GlobalButton } from "@/global/ui/GlobalButton";
+
+const Suggestion = () => {
+ const navigate = useNavigate();
+
+ return (
+
+
+ {/* 헤더 */}
+
+
navigate("/mentorship/info")}
+ />
+ 제안하기
+
+
+
+
+ {/* 설명 */}
+
+
+ {/* 희망 날짜 */}
+
+
+ {/* 이야기 나누고 싶은 주제 */}
+
+
+
+
+ {/* 제안하기 버튼 */}
+
+ navigate("/user/payment")}
+ >
+ 멘토링 제안하기
+
+
+
+ );
+};
+
+export default Suggestion;
\ No newline at end of file
diff --git a/src/user/components/ProfileEdit/EditBio.tsx b/src/user/components/ProfileEdit/EditBio.tsx
index 574c265..158a6e8 100644
--- a/src/user/components/ProfileEdit/EditBio.tsx
+++ b/src/user/components/ProfileEdit/EditBio.tsx
@@ -10,7 +10,7 @@ interface EditBioProps {
const EditBio = ({ mentorData, setMentorData, menteeData, setMenteeData }: EditBioProps) => {
- if (!mentorData && !menteeData) return null; // 데이터가 없으면 렌더링 X
+ if (!mentorData && !menteeData) return null;
return (
diff --git a/src/user/components/profileInfo/MentorInfoProfile.tsx b/src/user/components/profileInfo/MentorInfoProfile.tsx
index 99e69f5..e87bc85 100644
--- a/src/user/components/profileInfo/MentorInfoProfile.tsx
+++ b/src/user/components/profileInfo/MentorInfoProfile.tsx
@@ -3,7 +3,7 @@ interface MentorInfoProfileProps {
name: string;
role: string;
experience: number;
- count: string;
+ count: number;
image: string;
}
diff --git a/src/user/pages/ProfileEdit/MenteeInfo.tsx b/src/user/pages/ProfileEdit/MenteeInfo.tsx
index bb4d138..43c17d1 100644
--- a/src/user/pages/ProfileEdit/MenteeInfo.tsx
+++ b/src/user/pages/ProfileEdit/MenteeInfo.tsx
@@ -37,7 +37,7 @@ const MenteeInfo = () => {
{/* 헤더 */}
-
+
{
{/* 헤더 */}
-
+
{
role: "브랜드 마케팅/카피라이팅",
experience: 6,
},
- count: "716",
+ count: 716,
image: {
fileName: "",
filePath: "",
@@ -62,7 +62,7 @@ const MentorInfo = () => {
{/* 헤더 */}
-
+
{
role: "브랜드 마케팅/카피라이팅",
experience: 6,
},
- count: "716",
+ count: 716,
image: {
fileName: "",
filePath: "",
@@ -74,12 +74,12 @@ const MentorProfileEdit = () => {
{/* 헤더 */}
-
+
navigate("/mentorship/info")}
+ onClick={() => navigate("/user/mentorinfo")}
/>
프로필 수정
diff --git a/src/user/types.ts b/src/user/types.ts
index 5359186..e87bd08 100644
--- a/src/user/types.ts
+++ b/src/user/types.ts
@@ -10,7 +10,7 @@ export interface MentorData {
role: string;
experience: number;
};
- count: string;
+ count: number;
image: {
fileName: string;
filePath: string;
From c4e1dfb382f20b905ec6f1fd732b0e8e244da8f5 Mon Sep 17 00:00:00 2001
From: wnhaoo <153691178+wnhaoo@users.noreply.github.com>
Date: Fri, 7 Mar 2025 02:10:43 +0900
Subject: [PATCH 2/3] =?UTF-8?q?chore:=20=EB=AA=A8=EB=8B=AC=20=EC=88=98?=
=?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/global/ui/calendar.tsx | 8 ++++----
.../components/suggestion/DateTimeSelectModal.tsx | 2 +-
src/mentorship/pages/Suggestion.tsx | 8 ++++----
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/global/ui/calendar.tsx b/src/global/ui/calendar.tsx
index db0fc90..b3db30b 100644
--- a/src/global/ui/calendar.tsx
+++ b/src/global/ui/calendar.tsx
@@ -25,10 +25,10 @@ function Calendar({
locale={ko}
month={currentMonth}
onMonthChange={setCurrentMonth}
- className={cn("", className)}
+ className={cn("w-full", className)}
disabled={(date) => date.getMonth() !== currentMonth.getMonth()}
classNames={{
- months: "flex flex-col sm:flex-row space-y-4 sm:space-x-4 sm:space-y-0",
+ months: "w-full flex flex-col space-y-4",
month: "space-y-4",
caption: "flex justify-between py-0 relative items-center",
caption_label: "text-[16px] font-medium",
@@ -43,7 +43,7 @@ function Calendar({
head_cell: "w-10 text-[12px] text-[#878787] font-medium",
row: "flex justify-between mt-0 px-2",
cell: cn(
- "relative text-center focus-within:relative focus-within:z-20 [&:has([aria-selected])]:bg-accent [&:has([aria-selected].day-outside)]:bg-accent/50 [&:has([aria-selected].day-range-end)]:rounded-r-md",
+ "relative text-center focus-within:relative focus-within:z-20",
props.mode === "range"
? "[&:has(>.day-range-end)]:rounded-r-md [&:has(>.day-range-start)]:rounded-l-md first:[&:has([aria-selected])]:rounded-l-md last:[&:has([aria-selected])]:rounded-r-md"
: "[&:has([aria-selected])]:rounded-md"
@@ -56,7 +56,7 @@ function Calendar({
day_range_end: "day-range-end",
day_selected:
"bg-[#512DF1] text-white focus:bg-[#512DF1] focus:text-white",
- day_today: "bg-accent",
+ day_today: "",
day_outside:
"day-outside opacity-40",
day_disabled: "opacity-40 text-[#878787]",
diff --git a/src/mentorship/components/suggestion/DateTimeSelectModal.tsx b/src/mentorship/components/suggestion/DateTimeSelectModal.tsx
index c4adcdd..3040d53 100644
--- a/src/mentorship/components/suggestion/DateTimeSelectModal.tsx
+++ b/src/mentorship/components/suggestion/DateTimeSelectModal.tsx
@@ -23,7 +23,7 @@ const DateTimeSelectModal: React.FC = ({ isOpen, onClo
};
return isOpen ? (
-
+
{/* 헤더 */}
diff --git a/src/mentorship/pages/Suggestion.tsx b/src/mentorship/pages/Suggestion.tsx
index 24e042f..015711b 100644
--- a/src/mentorship/pages/Suggestion.tsx
+++ b/src/mentorship/pages/Suggestion.tsx
@@ -11,10 +11,10 @@ const Suggestion = () => {
const navigate = useNavigate();
return (
-
+
{/* 헤더 */}
-
+
-
+
{/* 설명 */}
@@ -38,7 +38,7 @@ const Suggestion = () => {
{/* 제안하기 버튼 */}
-
+
navigate("/user/payment")}
>
From 0f56cd267bbbe0d135bf9a1b5f1628c758588c7a Mon Sep 17 00:00:00 2001
From: wnhaoo <153691178+wnhaoo@users.noreply.github.com>
Date: Fri, 7 Mar 2025 02:54:02 +0900
Subject: [PATCH 3/3] =?UTF-8?q?design:=20=ED=97=A4=EB=8D=94,=20=EB=B2=84?=
=?UTF-8?q?=ED=8A=BC=20=EA=B3=A0=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/mentorship/pages/MentorInfoView.tsx | 110 +++++++++---------
src/mentorship/pages/Suggestion.tsx | 4 +-
src/user/pages/ProfileEdit/MenteeInfo.tsx | 56 ++++-----
.../pages/ProfileEdit/MenteeProfileEdit.tsx | 22 ++--
src/user/pages/ProfileEdit/MentorInfo.tsx | 109 +++++++++--------
.../pages/ProfileEdit/MentorProfileEdit.tsx | 56 ++++-----
6 files changed, 191 insertions(+), 166 deletions(-)
diff --git a/src/mentorship/pages/MentorInfoView.tsx b/src/mentorship/pages/MentorInfoView.tsx
index 355e3bd..406f01b 100644
--- a/src/mentorship/pages/MentorInfoView.tsx
+++ b/src/mentorship/pages/MentorInfoView.tsx
@@ -69,67 +69,73 @@ const MentorInfoView = () => {
};
return (
-
-
- {/* 보라색 */}
-
-
- {/* 헤더 */}
-
-
navigate("/mentorship")}
- />
-
+
+
+
+ {/* 보라색 */}
+
+
+ {/* 헤더 */}
+
+
navigate("/mentorship")}
+ />
+
+
+
+ {/* 프로필 섹션 */}
+
-
- {/* 프로필 섹션 */}
-
-
- {/* 자기소개 */}
-
+
- {/* 선호 시간대 */}
-
+ {/* 자기소개 */}
+
- {/* 멘토링 분야 & 해시태그 */}
-
+ {/* 선호 시간대 */}
+
+
+ {/* 멘토링 분야 & 해시태그 */}
+
- {/* 멘티에게 전하고 싶은 말 */}
-
+ {/* 멘티에게 전하고 싶은 말 */}
+
- {/* 포트폴리오 */}
-
+ {/* 포트폴리오 */}
+
+
+
{/* 멘토링 제안하기 버튼 */}
-
+
navigate("/mentorship/suggestion")}
>
diff --git a/src/mentorship/pages/Suggestion.tsx b/src/mentorship/pages/Suggestion.tsx
index 015711b..1dec133 100644
--- a/src/mentorship/pages/Suggestion.tsx
+++ b/src/mentorship/pages/Suggestion.tsx
@@ -14,7 +14,7 @@ const Suggestion = () => {
{/* 헤더 */}
-
+
-
+
{/* 설명 */}
diff --git a/src/user/pages/ProfileEdit/MenteeInfo.tsx b/src/user/pages/ProfileEdit/MenteeInfo.tsx
index 43c17d1..5b58432 100644
--- a/src/user/pages/ProfileEdit/MenteeInfo.tsx
+++ b/src/user/pages/ProfileEdit/MenteeInfo.tsx
@@ -31,41 +31,45 @@ const MenteeInfo = () => {
});
return (
-
+
- {/* 보라색 */}
-
+
- {/* 헤더 */}
-
-
navigate("/user")}
+ {/* 보라색 */}
+
+
+ {/* 헤더 */}
+
+
navigate("/user")}
+ />
+ 멘티 프로필
+
+
+
+ {/* 프로필 섹션 */}
+
-
멘티 프로필
-
-
- {/* 프로필 섹션 */}
-
- {/* 자기소개 */}
-
{/* 수정 버튼 */}
-
+
navigate("/user/menteeedit")}
>
diff --git a/src/user/pages/ProfileEdit/MenteeProfileEdit.tsx b/src/user/pages/ProfileEdit/MenteeProfileEdit.tsx
index 057cff5..847e7ac 100644
--- a/src/user/pages/ProfileEdit/MenteeProfileEdit.tsx
+++ b/src/user/pages/ProfileEdit/MenteeProfileEdit.tsx
@@ -33,8 +33,8 @@ const MenteeProfileEdit = () => {
// 수정된 내용을 localStorage에 저장하는 함수 (api 연결시 제거)
const handleSave = () => {
- localStorage.setItem("menteeData", JSON.stringify(menteeData)); // ✅ localStorage에 저장
- navigate("/user/menteeinfo"); // ✅ 수정 완료 후 MenteeInfo로 이동
+ localStorage.setItem("menteeData", JSON.stringify(menteeData)); // localStorage에 저장
+ navigate("/user/menteeinfo"); // 수정 완료 후 MenteeInfo로 이동
};
// 작성 완료 버튼 활성화 여부 확인
@@ -43,10 +43,10 @@ const MenteeProfileEdit = () => {
menteeData.introduction.bio.trim() !== "";
return (
-
+
{/* 헤더 */}
-
+
- {/* 프로필 섹션 */}
-
+
- {/* 자기소개 섹션 */}
-
+ {/* 프로필 섹션 */}
+
+
+ {/* 자기소개 섹션 */}
+
+
+
{/* 저장 버튼 */}
-
+
isFormComplete && navigate("/user/menteeinfo")}
onClick={handleSave}
diff --git a/src/user/pages/ProfileEdit/MentorInfo.tsx b/src/user/pages/ProfileEdit/MentorInfo.tsx
index 9e763c1..5ab31b3 100644
--- a/src/user/pages/ProfileEdit/MentorInfo.tsx
+++ b/src/user/pages/ProfileEdit/MentorInfo.tsx
@@ -56,61 +56,68 @@ const MentorInfo = () => {
});
return (
-
-
- {/* 보라색 */}
-
-
- {/* 헤더 */}
-
-
navigate("/auth")}
+
+
+
+
+ {/* 보라색 */}
+
+
+ {/* 헤더 */}
+
+
navigate("/auth")}
+ />
+ 멘토 프로필
+
+
+
+ {/* 프로필 섹션 */}
+
+
+
+
+
+ {/* 자기소개 */}
+
-
멘토 프로필
-
+
+ {/* 선호 시간대 */}
+
+
+ {/* 멘토링 분야 & 해시태그 */}
+
+
+ {/* 멘티에게 전하고 싶은 말 */}
+
+
+ {/* 포트폴리오 */}
+
+
-
- {/* 프로필 섹션 */}
-
- {/* 자기소개 */}
-
-
- {/* 선호 시간대 */}
-
-
- {/* 멘토링 분야 & 해시태그 */}
-
-
- {/* 멘티에게 전하고 싶은 말 */}
-
-
- {/* 포트폴리오 */}
-
-
- {/* 멘토링 제안하기 버튼 */}
-
+ {/* 수정하기 버튼 */}
+
navigate("/user/mentoredit")}
>
diff --git a/src/user/pages/ProfileEdit/MentorProfileEdit.tsx b/src/user/pages/ProfileEdit/MentorProfileEdit.tsx
index 83e5b54..903d4d9 100644
--- a/src/user/pages/ProfileEdit/MentorProfileEdit.tsx
+++ b/src/user/pages/ProfileEdit/MentorProfileEdit.tsx
@@ -60,8 +60,8 @@ const MentorProfileEdit = () => {
// 수정된 내용을 localStorage에 저장하는 함수 (API 연결 시 제거)
const handleSave = () => {
- localStorage.setItem("mentorData", JSON.stringify(mentorData)); // ✅ localStorage에 저장
- navigate("/user/mentorinfo"); // ✅ 수정 완료 후 MentorInfo로 이동
+ localStorage.setItem("mentorData", JSON.stringify(mentorData)); // localStorage에 저장
+ navigate("/user/mentorinfo"); // 수정 완료 후 MentorInfo로 이동
};
// 작성 완료 버튼 활성화 여부 확인
@@ -71,10 +71,10 @@ const MentorProfileEdit = () => {
mentorData.availableDays.length > 0;
return (
-
+
{/* 헤더 */}
-
+
- {/* 프로필 섹션 */}
-
-
- {/* 자기소개 섹션 */}
-
-
- {/* 선호 시간대 */}
-
-
- {/* 멘토링 분야 */}
-
-
- {/* 멘티에게 전하고 싶은 말 */}
-
-
- {/* 경험 해시태그 */}
-
-
- {/* 포트폴리오*/}
-
-
+
+
+ {/* 프로필 섹션 */}
+
+
+ {/* 자기소개 섹션 */}
+
+
+ {/* 선호 시간대 */}
+
+
+ {/* 멘토링 분야 */}
+
+
+ {/* 멘티에게 전하고 싶은 말 */}
+
+
+ {/* 경험 해시태그 */}
+
+
+ {/* 포트폴리오*/}
+
+
+
+
{/* 저장 버튼 */}
-