Merge pull request #89 from ValanSee/develop

dev to main

Author: topeanut

package.json

@@ -28,7 +28,7 @@
     "next": "15.1.11",
     "react": "^19.0.0",
     "react-chartjs-2": "^5.3.0",
-    "react-dom": "^19.0.0",
+    "react-dom": "^19.2.0",
     "react-redux": "^9.2.0",
     "sheet": "link:@/components/ui/sheet",
     "tailwind-merge": "^3.3.1"
@@ -37,8 +37,8 @@
     "@eslint/eslintrc": "^3",
     "@eslint/js": "^9.27.0",
     "@types/node": "^20",
-    "@types/react": "^19",
-    "@types/react-dom": "^19",
+    "@types/react": "^19.2.0",
+    "@types/react-dom": "^19.2.0",
     "eslint": "^9.27.0",
     "eslint-config-prettier": "^10.1.5",
     "eslint-plugin-next": "^0.0.0",
@@ -54,5 +54,6 @@
     "typescript": "^5",
     "typescript-eslint": "^8.32.1",
     "webpack": "^5.99.9"
-  }
+  },
+  "packageManager": "pnpm@10.16.1"
 }

pnpm-lock.yaml

@@ -0,0 +1,21 @@
+import { authApi } from '../../instance/authApi'
+
+export type TrendingVoteResponse = {
+  voteId: number
+  title: string
+  content: string
+  category: string
+  totalParticipants: number
+  createdBy: string
+  createdAt: string
+  options: {
+    optionId: number
+    content: string
+    vote_count: number
+  }[]
+}
+
+export async function fetchTrendingVotes() {
+  const res = await authApi.get<TrendingVoteResponse>('/votes/trending')
+  return res.data
+}

src/api/pages/valanse/trendinVoteApi.ts

@@ -24,6 +24,7 @@ export interface VoteOption {
 export interface BestVoteResponse {
   voteId: number
   title: string
+  content: string | null
   category: VoteCategory
   totalParticipants: number
   createdBy: string

src/api/votes.ts

@@ -0,0 +1,5 @@
+import Loading from '@/components/_shared/loading'
+
+export default function BalanseLoading() {
+  return <Loading />
+}

src/app/(unauth)/balanse/loading.tsx

@@ -0,0 +1,5 @@
+import Loading from '@/components/_shared/loading'
+
+export default function EntryLoading() {
+  return <Loading />
+}

src/app/(unauth)/entry/loading.tsx

@@ -0,0 +1,5 @@
+import Loading from '@/components/_shared/loading'
+
+export default function KakaoRedirectLoading() {
+  return <Loading />
+}

src/app/(unauth)/oauth/kakao/redirect/loading.tsx

@@ -0,0 +1,5 @@
+import Loading from '@/components/_shared/loading'
+
+export default function OnboardingLoading() {
+  return <Loading />
+}

src/app/(unauth)/onboarding/loading.tsx

@@ -0,0 +1,5 @@
+import Loading from '@/components/_shared/loading'
+
+export default function CreateLoading() {
+  return <Loading />
+}

src/app/create/loading.tsx

@@ -0,0 +1,5 @@
+import Loading from '@/components/_shared/loading'
+
+export default function MainLoading() {
+  return <Loading />
+}