develop -> main

.claude/launch.json

@@ -0,0 +1,11 @@
+{
+  "version": "0.0.1",
+  "configurations": [
+    {
+      "name": "cockple-dev",
+      "runtimeExecutable": "npm",
+      "runtimeArgs": ["run", "dev", "--", "--port", "5174", "--strictPort"],
+      "port": 5174
+    }
+  ]
+}

.github/workflows/deploy.yml

@@ -2,7 +2,7 @@ name: git push into another repo to deploy to vercel
 
 on:
   push:
-    branches: [main]
+    branches: [main, develop]
 
 jobs:
   build:
@@ -25,6 +25,6 @@ jobs:
           destination-repository-name: Cockple_FE
           user-email: ${{ secrets.EMAIL }}
           commit-message: ${{ github.event.commits[0].message }}
-          target-branch: main
+          target-branch: ${{ github.ref_name }}
       - name: Test get variable exported by push-to-another-repository
         run: echo $DESTINATION_CLONED_DIRECTORY

package.json

@@ -12,6 +12,7 @@
     "build-storybook": "storybook build"
   },
   "dependencies": {
+    "@dnd-kit/core": "^6.3.1",
     "@headlessui/react": "^2.2.4",
     "@tailwindcss/vite": "^4.1.11",
     "@tanstack/react-query": "^5.84.1",

src/App.tsx

@@ -12,6 +12,7 @@ import {
   MemberDefault,
   ExerciseDetailApply,
   MyExerciseDetail,
+  GameManagerPage,
   ViceLeaderDefault,
   EditGroupInfoDefault,
 } from "./pages/group";
@@ -32,6 +33,7 @@ import { CreateExercise } from "./pages/group/CreateExercise";
 import KakaoLogin from "./pages/login/KakaoLogin";
 import OnboardingLayout from "./pages/onboarding/onBoardingLayout";
 import { useRawWsConnect } from "./hooks/useRawWsConnect";
+import { useSeedChatUnread } from "./hooks/useSeedChatUnread";
 import { resolveMemberId } from "./utils/auth";
 import { NoNavbarLayout } from "./layout/NoPtLayout";
 
@@ -222,6 +224,14 @@ const router = createBrowserRouter([
         path: "/group/Mygroup/MyExerciseDetail/:exerciseId",
         element: <MyExerciseDetail />,
       },
+      {
+        path: "/Group/MyGroup/Detail/Exercise_Detail/EndGame/:exerciseId",
+        element: <MyExerciseDetail />,
+      },
+      {
+        path: "/Group/MyGroup/Detail/Exercise_Detail/ChangeHost/:exerciseId",
+        element: <GameManagerPage />,
+      },
       {
         path: "/group/Mygroup/ExerciseDetailApplye",
         element: <ExerciseDetailApply />,
@@ -280,6 +290,8 @@ function App() {
 
   const memberId = resolveMemberId() ?? 0;
   useRawWsConnect({ memberId, origin: import.meta.env.VITE_WS_ORIGIN });
+  // [임시] 채팅 탭 진입 전에도 안읽음 뱃지가 뜨도록 앱 진입 시 1회 seed
+  useSeedChatUnread();
   useEffect(() => {
     // 스플래시 화면이 한 번도 표시되지 않은 경우에만 실행
     if (!hasShownSplash) {