Merge branch 'develop' into refactor/change-onboarding

Author: semnil5202

next.config.mjs

@@ -2,7 +2,7 @@
 const nextConfig = {
   images: {
     // TODO: 추후 제거
-    domains: ['i.namu.wiki'],
+    domains: ['i.namu.wiki', 'opengraph.githubassets.com'],
   },
 };
 

package.json

@@ -16,6 +16,7 @@
   "dependencies": {
     "@hookform/resolvers": "^4.1.3",
     "@radix-ui/react-avatar": "^1.1.3",
+    "@radix-ui/react-dialog": "^1.1.6",
     "@radix-ui/react-dropdown-menu": "^2.1.6",
     "@radix-ui/react-label": "^2.1.2",
     "@radix-ui/react-progress": "^1.1.2",
@@ -33,12 +34,13 @@
     "next-themes": "^0.4.4",
     "react": "^18",
     "react-dom": "^18",
-    "react-intersection-observer": "^9.16.0",
     "react-hook-form": "^7.54.2",
+    "react-intersection-observer": "^9.16.0",
     "react-select": "^5.10.1",
     "sonner": "^2.0.1",
     "swiper": "^11.2.4",
     "tailwind-merge": "^3.0.1",
+    "tailwind-scrollbar-hide": "^2.0.0",
     "tailwindcss-animate": "^1.0.7",
     "ts-pattern": "^5.6.2",
     "zod": "^3.24.2",

pnpm-lock.yaml

@@ -5,6 +5,6 @@ function Page() {
     <>
       <CardCreateView />
     </>
-  )
+  );
 }
-export default Page;
+export default Page;

public/icons/delete.svg

@@ -3,8 +3,8 @@ import CardTabs from '@/features/card-detail/ui/cardTabs';
 
 function Page() {
   return (
-    <div className="flex h-dvh w-full">
-      <div className="mx-auto flex w-full max-w-[600px] flex-col items-center bg-gray-black">
+    <div className="flex h-full min-h-dvh w-full">
+      <div className="relative mx-auto flex w-full max-w-[600px] flex-col items-center bg-gray-black">
         <CardDetailHeader />
         <CardTabs />
       </div>

public/icons/downArrow.svg

@@ -0,0 +1,21 @@
+'use client';
+
+import React from 'react';
+
+import ReceivedCardView from '@/features/received/ui';
+import Appbar from '@/shared/ui/appbar';
+import { Navbar } from '@/shared/ui/Navigation';
+
+function Page() {
+  return (
+    <div className="flex h-dvh w-full justify-center">
+      <div className="flex w-full max-w-[600px] flex-col bg-gray-black">
+        <Appbar page="received" />
+        <ReceivedCardView />
+        <Navbar />
+      </div>
+    </div>
+  );
+}
+
+export default Page;

public/icons/edit.svg

@@ -19,15 +19,15 @@ export default function SocialAuthCallbackPage({ params }: { params: { provider:
       try {
         const result = await handleSocialAuth(provider, code as string);
         if (result.success) {
-          router.push('/');
+          router.replace('/');
         }
       } catch (err) {
         console.error('인증 처리 중 오류:', err);
       }
     };
 
     processAuth();
-  }, []);
+  }, [params.provider, searchParams, router]);
 
-  return <div>로그인 진행중..</div>;
+  return null;
 }

public/icons/folderIcon.svg

@@ -64,6 +64,7 @@
     /* radius */
     --radius-sm: 8px;
     --radius-md: 12px;
+    --radius-ml: 20px;
     --radius-lg: 80px;
 
     .home-swiper .swiper-pagination-bullet {

public/icons/searchIcon.svg

@@ -0,0 +1,5 @@
+import { AlramView } from '@/features/setting';
+
+export default function Page() {
+  return <AlramView />;
+}

public/icons/toast-icon/checkIcon.svg

@@ -0,0 +1,19 @@
+import { HeaderContainer } from '@/features/home/containers/HeaderContainer';
+import { SettingView } from '@/features/setting';
+import { cn } from '@/shared/lib/utils';
+import { spacingStyles } from '@/shared/spacing';
+import { Navbar } from '@/shared/ui/Navigation';
+
+export default function SettingPage() {
+  return (
+    <div className="relative mx-auto h-dvh w-full max-w-[600px] justify-center">
+      <HeaderContainer />
+      <section className={cn(spacingStyles({ paddingY: 'md', paddingX: 'ml' }))}>
+        <SettingView />
+      </section>
+      <footer>
+        <Navbar />
+      </footer>
+    </div>
+  );
+}

public/icons/sonnerIcon.svg public/icons/toast-icon/sonnerIcon.svg

@@ -0,0 +1,5 @@
+import { UserQuitView } from '@/features/setting';
+
+export default function UserQuitPage() {
+  return <UserQuitView />;
+}

src/app/(create)/card-create/page.tsx

@@ -1,7 +1,7 @@
 // config/authConfig.ts
 
 import { SocialProvider } from '../types/auth';
-import { required, optional } from '../utils/envVaild';
+import { optional, required } from '../utils/envVaild';
 
 /**
  * 인증 관련 기본 URL 설정
@@ -34,10 +34,10 @@ export const providerEnvConfig = {
   },
   // 현재 카카오로 임시 설정
   APPLE: {
-    restApiKey: required('NEXT_PUBLIC_KAKAO_REST_API_KEY', process.env.NEXT_PUBLIC_KAKAO_REST_API_KEY),
+    restApiKey: required('NEXT_PUBLIC_APPLE', process.env.NEXT_PUBLIC_APPLE_CLIENT_ID),
     redirectUrl: isProd
-      ? required('NEXT_PUBLIC_KAKAO_REDIRECT_URI', process.env.NEXT_PUBLIC_KAKAO_REDIRECT_URI)
-      : required('NEXT_PUBLIC_KAKAO_REDIRECT_URI_LOCAL', process.env.NEXT_PUBLIC_KAKAO_REDIRECT_URI_LOCAL),
+      ? required('NEXT_PUBLIC_APPLE_REDIRECT_URI', process.env.NEXT_PUBLIC_APPLE_REDIRECT_URI)
+      : required('NEXT_PUBLIC_APPLE_REDIRECT_URI_LOCAL', process.env.NEXT_PUBLIC_APPLE_REDIRECT_URI_LOCAL),
     scope: optional(''),
   },
 };
@@ -53,7 +53,7 @@ export const getRedirectUrl = (provider: SocialProvider): string => {
       return providerEnvConfig.GOOGLE.redirectUrl;
     // 현재 카카오로 임시 설정
     case 'APPLE':
-      return providerEnvConfig.KAKAO.redirectUrl;
+      return providerEnvConfig.APPLE.redirectUrl;
     default:
       return '';
   }
@@ -81,10 +81,9 @@ export const getAuthUrl = {
 
   // 현재 카카오로 임시 설정
   APPLE: () => {
-    const { restApiKey } = providerEnvConfig.KAKAO;
-    const redirectUrl = getRedirectUrl('KAKAO');
-    const scope = providerEnvConfig.KAKAO.scope;
+    const { restApiKey } = providerEnvConfig.APPLE;
+    const redirectUrl = getRedirectUrl('APPLE');
 
-    return `${AUTH_BASE_URLS.KAKAO}?client_id=${restApiKey}&redirect_uri=${redirectUrl}&response_type=code&scope=${scope}`;
+    return `${AUTH_BASE_URLS.APPLE}?client_id=${restApiKey}&redirect_uri=${redirectUrl}&response_type=code&scope=name+email&response_mode=form_post`;
   },
 };

src/app/(detail)/card-detail/[cardId]/page.tsx

@@ -1,10 +1,11 @@
 // api/cardQueries.ts
 import { useQuery } from '@tanstack/react-query';
 
+import { MyCardDto } from '@/features/home/types';
 import { client } from '@/shared/apis/client';
 import { CLIENT_SIDE_URL } from '@/shared/constants';
 
-import { mockCardDetailData } from '../../mocks/sample';
+import { mockCardDetailData } from '../../mocks/myCardDetail';
 import { CardDetailDto } from '../../types/cardDetail';
 
 // API 호출 함수
@@ -13,6 +14,12 @@ const getCardDetail = async (cardId: number): Promise<CardDetailDto> => {
   return data;
 };
 
+// 내 명함 목록 조회
+const getMyCard = async (): Promise<MyCardDto> => {
+  const data = await client.get<MyCardDto>(`${CLIENT_SIDE_URL}/api/card/my`);
+  return data;
+};
+
 // 카드 상세 정보를 가져오는 쿼리 훅
 export const useCardDetailQuery = (cardId: number) => {
   const { data: _ } = useQuery({
@@ -22,3 +29,13 @@ export const useCardDetailQuery = (cardId: number) => {
 
   return { data: mockCardDetailData };
 };
+
+// 내 명함 목록 조회
+export const useMyCardQuery = () => {
+  const data = useQuery({
+    queryKey: ['myCard'],
+    queryFn: () => getMyCard(),
+  });
+
+  return data;
+};

src/app/(received)/received/page.tsx

@@ -0,0 +1,19 @@
+'use client';
+
+import { useState } from 'react';
+
+export const useBottomModal = () => {
+  const [isModalOpen, setIsModalOpen] = useState(false);
+
+  // 헤더 메뉴 클릭시 함수
+  const headerRightHandler = () => {
+    setIsModalOpen(true);
+  };
+
+  // 모달 닫기 함수
+  const closeModal = () => {
+    setIsModalOpen(false);
+  };
+
+  return { isModalOpen, setIsModalOpen, headerRightHandler, closeModal };
+};

src/app/api/auth/callback/[provider]/page.tsx

@@ -8,11 +8,13 @@ export const mockCardDetailData: CardDetailDto = {
   timestamp: '2025-03-10T08:03:28.800Z',
   data: {
     nickname: '이재인',
-    job: 'DEVELOPER',
+    job: 'DESIGNER',
     detailJob: 'Frontend Developer',
     organization: '디프만',
     summary: '사용자 경험을 중요시하는 프론트엔드 개발자입니다. ',
     region: '게더',
+    group: ['디프만', '엘리스랩'],
+    introduce: '디프만 web 16기 윤장원입니다!',
     interestDomain: ['웹 개발', 'UI/UX', '프론트엔드', 'React'],
     sns: [
       {

src/app/globals.css

@@ -36,6 +36,8 @@ export type CardDetailResponse = {
   organization: string;
   summary: string;
   region: string;
+  group?: string[];
+  introduce?: string;
   interestDomain?: string[] | undefined;
   sns?: SnsDto[] | undefined;
   news?: string | undefined;

src/app/setting/alram/page.tsx

@@ -0,0 +1,64 @@
+// API 응답 기본 구조
+export type ApiResponse<T> = {
+  status: string;
+  message: string;
+  timestamp: string;
+  data: T;
+};
+
+// SNS 타입
+export type SnsDto = {
+  type: string;
+  link: string;
+};
+
+// 콘텐츠 아이템 (블로그 포스트 등) 타입
+export type ContentItemDto = {
+  title: string;
+  link: string;
+  imageUrl: string;
+  description: string;
+};
+
+// 프로젝트 타입
+export type ProjectDto = {
+  title: string;
+  link: string;
+  imageUrl: string;
+  description: string;
+};
+
+// 미리보기 정보 타입
+export type PreviewInfoType = 'PROJECT' | 'CONTENT' | 'HOBBY' | 'SNS' | 'NEWS' | 'REGION';
+
+// 미리보기 정보 구조
+export type PreviewInfo = {
+  project?: ProjectDto;
+  content?: ContentItemDto;
+  hobby?: string;
+  sns?: SnsDto;
+  news?: string;
+  region?: string;
+};
+
+// 카드 기본 정보 타입
+export type CardInfo = {
+  id: number;
+  nickname: string;
+  organization: string;
+  job: string;
+  detailJob: string;
+  summary: string;
+  interestDomain?: string[];
+  previewInfoType: PreviewInfoType;
+  previewInfo: PreviewInfo;
+  imagePath: string;
+};
+
+// 내 카드 응답 타입
+export type MyCardResponse = {
+  cards: CardInfo[];
+};
+
+// 내 카드 DTO 타입
+export type MyCardDto = ApiResponse<MyCardResponse>;