Merge pull request #240 from Pseudo-Lab/fix/getcloser/type-error

daclouds · web-flow · commit c100b6ceab65 · 2025-12-13T00:18:31.000+09:00
fix(getcloser): modify member_id type to number
diff --git a/getcloser/frontend/eslint.config.mjs b/getcloser/frontend/eslint.config.mjs
@@ -10,6 +10,15 @@ const compat = new FlatCompat({
 });
 
 const eslintConfig = [
+  {
+    ignores: [
+      'node_modules/**',
+      '.next/**',
+      'out/**',
+      'build/**',
+      'next-env.d.ts',
+    ],
+  },
   ...compat.extends('next/core-web-vitals', 'next/typescript'),
   {
     rules: {
@@ -20,13 +29,6 @@ const eslintConfig = [
       'object-curly-spacing': ['error', 'always'],
       'key-spacing': ['error', { beforeColon: false, afterColon: true }],
     },
-    ignores: [
-      'node_modules/**',
-      '.next/**',
-      'out/**',
-      'build/**',
-      'next-env.d.ts',
-    ],
   },
 ];
 
diff --git a/getcloser/frontend/src/app/layout.tsx b/getcloser/frontend/src/app/layout.tsx
@@ -40,7 +40,8 @@ export default function RootLayout({
   return (
     <html lang="en" style={{ background: 'linear-gradient(to bottom, hsl(160 40% 10%) 0%, hsl(160 40% 15%) 40%, hsl(160 40% 20%) 100%)' }} className="min-h-screen">
       <head>
-        <link href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@20..48,100..700,0..1,-50..200" rel="stylesheet" />
+        {/* eslint-disable-next-line @next/next/no-page-custom-font */}
+        <link href="https://fonts.googleapis.com/css2?family=Material+Symbols+Outlined:opsz,wght,FILL,GRAD@20..48,100..700,0..1,-50..200&display=optional" rel="stylesheet" />
       </head>
       <body
         className={`${geistSans.variable} ${geistMono.variable} ${dongle.variable} antialiased`}
diff --git a/getcloser/frontend/src/app/page2/page.tsx b/getcloser/frontend/src/app/page2/page.tsx
@@ -25,7 +25,7 @@ const WaitingView = ({ teamMembers, myId, teamId }: { teamMembers: TeamMember[],
 
   const handleLeaveTeam = async () => {
     try {
-      await authenticatedFetch(`/api/v1/teams/${teamId}/cancel`, {
+      await authenticatedFetch(`/api/v1/teams/${String(teamId)}/cancel`, {
         method: 'POST',
       });
     } catch (error) {
@@ -35,8 +35,6 @@ const WaitingView = ({ teamMembers, myId, teamId }: { teamMembers: TeamMember[],
     router.back();
   };
 
-  const me = teamMembers.find(m => m.user_id === myId);
-
   return (
     <div className="fixed inset-0 z-50 flex items-center justify-center overflow-hidden bg-background-light dark:bg-background-dark p-4">
       <div className="fixed inset-0 bg-black/50 backdrop-blur-sm z-10"></div>
@@ -215,7 +213,7 @@ export default function Page2() {
 
     const interval = setInterval(async () => {
       try {
-        const response = await authenticatedFetch(`/api/v1/teams/${teamId}/status`);
+        const response = await authenticatedFetch(`/api/v1/teams/${String(teamId)}/status`);
         if (!response.ok) throw new Error('Failed to fetch team status');
         const memberStatuses: { user_id: number, is_ready: boolean }[] = await response.json();
         const membersWithNames = await Promise.all(memberStatuses.map(async (member) => {
diff --git a/getcloser/frontend/src/store/formStore.ts b/getcloser/frontend/src/store/formStore.ts
@@ -2,28 +2,28 @@ import { create } from 'zustand';
 
 interface FormState {
   email: string;
-  id: string;
+  id: number;
   accessToken: string;
   question: string;
   answer: string;
-  teamId: string;
-  memberIds: string[];
+  teamId: number;
+  memberIds: number[];
   setEmail: (email: string) => void;
-  setId: (id: string) => void;
+  setId: (id: number) => void;
   setAccessToken: (accessToken: string) => void;
   setQuestion: (question: string) => void;
   setAnswer: (answer: string) => void;
-  setTeamId: (teamId: string) => void;
-  setMemberIds: (memberIds: string[]) => void;
+  setTeamId: (teamId: number) => void;
+  setMemberIds: (memberIds: number[]) => void;
 }
 
 export const useFormStore = create<FormState>((set) => ({
   email: '',
-  id: '',
+  id: 0,
   accessToken: '',
   question: '',
   answer: '',
-  teamId: '',
+  teamId: 0,
   memberIds: [],
   setEmail: (email) => set({ email }),
   setId: (id) => set({ id }),
