Merge pull request #254 from code-zero-to-one/feat/QNRR-648/signup-flow-N-me-certify

[Feat] QNRR-648 (그로스) 유저의 회원가입시 전화번호 수집 및 프로필 개선

Author: seong-jin-jo

src/app/(admin)/admin/detail/[id]/profile/page.tsx

@@ -103,9 +103,11 @@ export default async function ProfilePage({
           title="선호하는 스터디 주제"
           content={profile.memberInfo.preferredStudySubject?.name}
         />
+
+        {/* TODO : 상단으로 이동 필요 */}
         <ProfileInfoCard
           title="기술 스택"
-          content={profile.memberInfo.techStacks
+          content={profile.memberProfile.techStacks
             .map((t) => t.techStackName)
             .join(', ')}
         />

src/app/(service)/layout.tsx

@@ -1,5 +1,6 @@
 import '../global.css';
 
+import React from 'react';
 import Clarity from '@microsoft/clarity';
 import { GoogleTagManager } from '@next/third-parties/google';
 import { clsx } from 'clsx';

src/app/global.css

@@ -4,6 +4,40 @@
 /*
 ---break--- */
 @plugin 'tailwindcss-animate';
+
+@layer base {
+  *, ::before, ::after {
+    box-sizing: border-box;
+    border-width: 0;
+    border-style: solid;
+    border-color: #e5e7eb;
+  }
+  input, button, select, textarea {
+    font-family: inherit;
+    font-feature-settings: inherit;
+    font-variation-settings: inherit;
+    font-size: 100%;
+    font-weight: inherit;
+    line-height: inherit;
+    color: inherit;
+    margin: 0;
+    padding: 0;
+  }
+  button, input, optgroup, select, textarea {
+    font-family: inherit;
+    font-size: 100%;
+    line-height: 1.15;
+    margin: 0;
+  }
+  button, select {
+    text-transform: none;
+  }
+  button, [type='button'], [type='reset'], [type='submit'] {
+    -webkit-appearance: button;
+    background-color: transparent;
+    background-image: none;
+  }
+}
 /*
 ---break--- */
 @custom-variant dark (&:is(.dark *));

src/components/ui/modal/index.tsx

@@ -1,5 +1,6 @@
 'use client';
 
+import React from 'react';
 import * as DialogPrimitive from '@radix-ui/react-dialog';
 
 import { cn } from '@/components/ui/(shadcn)/lib/utils';

src/components/ui/toggle/group.tsx

@@ -1,4 +1,4 @@
-import type { ComponentType, ReactNode } from 'react';
+import React, { type ComponentType, type ReactNode } from 'react';
 import ToggleButton from './button';
 
 type Value = string | number;

src/entities/user/api/types.ts

@@ -1,11 +1,3 @@
-export interface TechStack {
-  techStackId: number;
-  code: string;
-  techStackName: string;
-  parentId: number | undefined;
-  level: number;
-}
-
 export interface AvailableStudyTime {
   id: number;
   fromTime: string | undefined;
@@ -19,12 +11,44 @@ export interface PreferredStudySubject {
   name: string;
 }
 
-export interface MemberInfo {
+export interface Job {
+  job?: string; // Enum 값 (예: "IT_PRACTITIONER_GAME_DEV")
+  description?: string; // 설명 (예: "게임 개발자")
+}
+
+export interface Career {
+  career: string; // Enum 값 (예: "JUNIOR")
+  description: string; // 설명 (예: "주니어")
+}
+
+export interface StudyFormatType {
+  studyFormatType: string; // Enum 값 (예: "MENTORING")
+  description: string; // 설명 (예: "멘토링")
+}
+
+// 내 스터디 정보 (SPRINT2 프로필개선)
+export interface MemberInfo { 
   selfIntroduction: string;
   studyPlan: string;
   preferredStudySubject: PreferredStudySubject;
   availableStudyTimes: AvailableStudyTime[];
-  techStacks: TechStack[];
+  // techStacks: TechStack[]; 기본정보로 이동 (SPRINT2 프로필개선) => memberProfile에 추가
+  // 기본정보에 추가되는 정보들 (SPRINT2 프로필개선)
+  jobs: Job[] | null;
+  career: Career | null;
+  studyFormatTypes: StudyFormatType[] | null;
+  goal: string;
+}
+
+/** 
+ * 기본정보 (SPRINT2 프로필개선)
+ **/
+export interface TechStack {
+  techStackId: number;
+  code: string;
+  techStackName: string;
+  parentId: number | undefined;
+  level: number;
 }
 
 export interface SocialLink {
@@ -59,8 +83,11 @@ export interface Hobby {
   name: string;
 }
 
+// 기본정보 (SPRINT2 프로필개선)
 export interface MemberProfile {
-  memberName: string;
+  memberName: string; // 본인, 관리자만 조회 (+스터디 참여시 SPRINT2 프로필개선)
+  tel?: string; // 본인, 관리자만 조회 (+스터디 참여시 SPRINT2 프로필개선) - 스터디 참가자끼리는 볼 수 있음
+  nickname: string;
   profileImage: ProfileImage;
   simpleIntroduction: string;
   mbti: string;
@@ -69,7 +96,7 @@ export interface MemberProfile {
   birthDate: string;
   githubLink: SocialLink | undefined;
   blogOrSnsLink: SocialLink | undefined;
-  tel: string;
+  techStacks: TechStack[]; // 기본정보로 이동 (SPRINT2 프로필개선) => memberInfo에서 삭제
 }
 
 export interface SincerityTemp {

src/entities/user/ui/my-profile-card.tsx

@@ -9,6 +9,7 @@ import { getSincerityPresetByLevelName } from '@/config/sincerity-temp-presets';
 import { useReviewReminder } from '@/entities/review/lib/use-reminder-review';
 import StudyReviewModal from '@/entities/review/ui/study-review-modal';
 import { usePatchAutoMatchingMutation } from '@/entities/user/model/use-user-profile-query';
+import StartStudyModal from '@/features/study/participation/ui/start-study-modal'; // 추가
 import AccessTimeIcon from 'public/icons/access_time.svg';
 import AssignmentIcon from 'public/icons/assignment.svg';
 import CodeIcon from 'public/icons/code.svg';
@@ -41,13 +42,20 @@ export default function MyProfileCard({
   const { showReviewReminder, setShowReviewReminder } = useReviewReminder();
 
   const [enabled, setEnabled] = useState(matching);
+  const [isStartStudyModalOpen, setIsStartStudyModalOpen] = useState(false); // 모달 상태 추가
   const temperPreset = getSincerityPresetByLevelName(sincerityTemp.levelName);
 
   const { mutate: patchAutoMatching, isPending } =
     usePatchAutoMatchingMutation();
 
   const handleToggleChange = (checked: boolean) => {
-    if (!studyApplied) return;
+    // 스터디 신청 안 했을 때 -> 신청 모달 열기 (여기서 본인인증 체크도 자동으로 됨)
+    if (!studyApplied) {
+      setIsStartStudyModalOpen(true);
+      // 토글 상태는 바꾸지 않음 (신청 완료 후 바뀌도록 유도하거나 사용자가 다시 켜야 함)
+
+      return;
+    }
 
     setEnabled(checked);
 
@@ -67,6 +75,13 @@ export default function MyProfileCard({
         open={showReviewReminder}
         onOpenChange={setShowReviewReminder}
       />
+      {/* 스터디 신청 모달 (토글 클릭 시 실행됨) */}
+      <StartStudyModal
+        memberId={memberId}
+        open={isStartStudyModalOpen}
+        onOpenChange={setIsStartStudyModalOpen}
+      />
+      
       <section className="rounded-200 border-border-subtle bg-text-inverse flex flex-col items-start gap-200 border p-200">
         <div className="flex flex-row items-center gap-200">
           <div className="relative h-[64px] w-[64px] shrink-0">
@@ -101,7 +116,7 @@ export default function MyProfileCard({
                 size="md"
                 checked={enabled}
                 onCheckedChange={handleToggleChange}
-                disabled={isPending || !studyApplied}
+                disabled={isPending} // !studyApplied 제거
               />
             </div>
           </div>