Alpha

src/api/index.ts

@@ -50,8 +50,10 @@ axiosInstance.interceptors.response.use(
         console.log("new AccessToken", newAccessToken, refreshResponse);
 
 
+
         // 갱신된 토큰으로 원래 요청 재시도
 
+
         return axiosInstance({
           ...originalRequest,
           headers: getJWTHeader(newAccessToken),

src/api/tripDetail.ts

@@ -4,52 +4,81 @@ import { ITripDetail } from "@/model/tripDetail";
 import RequestError from "@/context/ReqeustError";
 import { UpdateTripReqData } from "@/model/trip";
 
-export async function getTripDetail(travelNumber: number, accessToken: string | null) {
+export async function getTripDetail(
+  travelNumber: number,
+  accessToken: string | null
+) {
   try {
-    const response = await axiosInstance.get(`/api/travel/detail/${travelNumber}`, {
-      ...(accessToken && { headers: getJWTHeader(accessToken) }),
-    });
+    const response = await axiosInstance.get(
+      `/api/travel/detail/${travelNumber}`,
+      {
+        ...(accessToken && { headers: getJWTHeader(accessToken) }),
+      }
+    );
     return handleApiResponse(response);
   } catch (err: any) {
     throw new RequestError(err);
   }
 }
 
 // 현재 신청한 사람 수 조회
-export async function getTripEnrollmentCount(travelNumber: number, accessToken: string | null) {
+export async function getTripEnrollmentCount(
+  travelNumber: number,
+  accessToken: string | null
+) {
   try {
-    const response = await axiosInstance.get(`/api/travel/${travelNumber}/enrollmentCount`, {
-      ...(accessToken && { headers: getJWTHeader(accessToken) }),
-    });
+    const response = await axiosInstance.get(
+      `/api/travel/${travelNumber}/enrollmentCount`,
+      {
+        ...(accessToken && { headers: getJWTHeader(accessToken) }),
+      }
+    );
     return handleApiResponse(response);
   } catch (err: any) {
     throw new RequestError(err);
   }
 }
 // 모집한 인원 목록 조회
-export async function getCompanions(travelNumber: number, accessToken: string | null) {
+export async function getCompanions(
+  travelNumber: number,
+  accessToken: string | null
+) {
   try {
-    const response = await axiosInstance.get(`/api/travel/${travelNumber}/companions`, {
-      ...(accessToken && { headers: getJWTHeader(accessToken) }),
-    });
+    const response = await axiosInstance.get(
+      `/api/travel/${travelNumber}/companions`,
+      {
+        ...(accessToken && { headers: getJWTHeader(accessToken) }),
+      }
+    );
     return handleApiResponse(response);
   } catch (err: any) {
     throw new RequestError(err);
   }
 }
-export async function updateTripDetail(travelNumber: number, data: UpdateTripReqData, accessToken: string | null) {
+export async function updateTripDetail(
+  travelNumber: number,
+  data: UpdateTripReqData,
+  accessToken: string | null
+) {
   try {
     if (!accessToken) throw new Error("로그인을 해주세요.");
-    const response = await axiosInstance.put(`/api/travel/${travelNumber}`, data, {
-      headers: getJWTHeader(accessToken),
-    });
+    const response = await axiosInstance.put(
+      `/api/travel/${travelNumber}`,
+      data,
+      {
+        headers: getJWTHeader(accessToken),
+      }
+    );
     return handleApiResponse(response);
   } catch (err: any) {
     throw new RequestError(err);
   }
 }
 
-export async function deleteTripDetail(travelNumber: number, accessToken: string | null) {
+export async function deleteTripDetail(
+  travelNumber: number,
+  accessToken: string | null
+) {
   try {
     if (!accessToken) throw new Error("로그인을 해주세요.");
     const response = await axiosInstance.delete(`/api/travel/${travelNumber}`, {

src/api/user.ts

@@ -3,6 +3,8 @@
 import { getJWTHeader } from "@/utils/user";
 import axios from "axios";
 import { axiosInstance, handleApiResponse } from ".";
+import RequestError from "@/context/ReqeustError";
+import { TravelLog } from "@/model/profile";
 
 //
 export async function getUser(userId: number, accessToken: string) {
@@ -71,7 +73,11 @@ export async function checkEmail(email: string) {
   }
 }
 
-export const getToken = async (domain: "naver" | "kakao" | "google", code: string, state: string) => {
+export const getToken = async (
+  domain: "naver" | "kakao" | "google",
+  code: string,
+  state: string
+) => {
   try {
     const url =
       domain === "kakao"
@@ -95,3 +101,21 @@ export const getToken = async (domain: "naver" | "kakao" | "google", code: strin
     console.error("토큰 요청 실패:", error);
   }
 };
+
+export async function getUserTravelLog(
+  userNumber: number,
+  accessToken: string | null
+) {
+  try {
+    const response = await axiosInstance.get(
+      `/api/users/${userNumber}/visited-countries`,
+
+      {
+        ...(accessToken && { headers: getJWTHeader(accessToken) }),
+      }
+    );
+    return handleApiResponse(response) as TravelLog;
+  } catch (err: any) {
+    throw new RequestError(err);
+  }
+}

src/api/userProfile.ts

@@ -0,0 +1,47 @@
+import { getJWTHeader } from "@/utils/user";
+import { axiosInstance, handleApiResponse } from ".";
+import RequestError from "@/context/ReqeustError";
+import { IUserProfileInfo } from "@/model/userProfile";
+
+export const getUserProfile = async (accessToken: string, userNumber: number): Promise<IUserProfileInfo | null> => {
+  try {
+    const response = await axiosInstance.get(`/api/users/${userNumber}/profile`, {
+      headers: getJWTHeader(accessToken),
+    });
+
+    return handleApiResponse(response);
+  } catch (err: any) {
+    throw new RequestError(err);
+  }
+};
+// 상대방의 만든 여행 조회
+export const getUserCreatedTravels = async (pageParam: number, accessToken: string, userNumber: number) => {
+  try {
+    const response = await axiosInstance.get(`/api/users/${userNumber}/created-travels`, {
+      headers: getJWTHeader(accessToken),
+      params: {
+        page: pageParam,
+        size: 10,
+      },
+    });
+    return handleApiResponse(response);
+  } catch (err: any) {
+    throw new RequestError(err);
+  }
+};
+// 상대방의 참가 여행 조회.
+
+export const getUserAppliedTravels = async (pageParam: number, accessToken: string, userNumber: number) => {
+  try {
+    const response = await axiosInstance.get(`/api/users/${userNumber}/applied-travels`, {
+      headers: getJWTHeader(accessToken),
+      params: {
+        page: pageParam,
+        size: 10,
+      },
+    });
+    return handleApiResponse(response);
+  } catch (err: any) {
+    throw new RequestError(err);
+  }
+};

src/app/api/users/[userNumber]/visited-countries/route.ts

@@ -0,0 +1,69 @@
+import { NextResponse } from "next/server";
+
+export async function GET(request: Request, { params }: { params: Promise<{ userNumber: string }> }) {
+  const { userNumber } = await params;
+
+  return NextResponse.json({
+    resultType: "SUCCESS",
+    success: {
+      userNumber: 3,
+      visitedCountriesCount: 8,
+      internationalLogs: {
+        ASIA: [
+          {
+            countryName: "일본",
+            visitDates: ["2025-02-22", "2025-03-22", "2025-04-09"],
+          },
+          {
+            countryName: "태국",
+            visitDates: ["2025-03-22"],
+          },
+          {
+            countryName: "베트남",
+            visitDates: ["2024-12-15"],
+          },
+        ],
+        NORTH_AMERICA: [
+          {
+            countryName: "캐나다",
+            visitDates: ["2025-03-22"],
+          },
+          {
+            countryName: "미국",
+            visitDates: ["2025-03-22"],
+          },
+        ],
+        EUROPE: [
+          {
+            countryName: "프랑스",
+            visitDates: ["2025-03-22"],
+          },
+          {
+            countryName: "영국",
+            visitDates: ["2025-03-22"],
+          },
+        ],
+        OCEANIA: [
+          {
+            countryName: "호주",
+            visitDates: ["2024-10-10"],
+          },
+        ],
+      },
+      domesticLogs: [
+        {
+          locationName: "부산",
+          visitDates: ["2025-04-09"],
+        },
+        {
+          locationName: "경주",
+          visitDates: ["2025-04-09"],
+        },
+        {
+          locationName: "서울",
+          visitDates: ["2025-03-15", "2025-04-01"],
+        },
+      ],
+    },
+  });
+}

src/app/globals.css

@@ -166,6 +166,7 @@ body {
   line-height: 1;
   font-family: "Pretendard", sans-serif;
   letter-spacing: -0.4px !important;
+  overflow-x: hidden;
 }
 ol,
 ul {

src/app/layout.tsx

@@ -2,6 +2,8 @@ import Layout from "@/components/Layout";
 import Providers from "./providers";
 import "./globals.css";
 import { MSWComponent } from "@/context/MSWComponent";
+import UserProfileOverlay from "@/components/userProfile/UserProfileOverlay";
+
 import { GoogleAnalytics } from "@next/third-parties/google";
 export default function RootLayout({
   children,
@@ -13,7 +15,9 @@ export default function RootLayout({
       <body>
         <Providers>
           <MSWComponent />
+          <UserProfileOverlay />
           <GoogleAnalytics gaId={process.env.GOOGLE_ANALYTICS || ""} />
+
           <Layout>{children}</Layout>
           <div id="checking-modal" />
           <div id="trip-toast" />

src/app/userProfile/[userNumber]/log/page.tsx

@@ -0,0 +1,5 @@
+import TravelLog from "@/page/TravelLog/TravelLog";
+
+export default function TravelLogPage() {
+  return <TravelLog />;
+}

src/app/userProfileBadge/[userId]/page.tsx

@@ -0,0 +1,8 @@
+import { UserProfileBadge } from "@/page/UserProfileBadge/UserProfileBadge";
+import React from "react";
+
+const UserProfileBadgePage = () => {
+  return <UserProfileBadge />;
+};
+
+export default UserProfileBadgePage;