feat: test firebase messaging error

Author: jihostudy

public/firebase-messaging-sw.js.map

@@ -45,9 +45,9 @@ const RoomHistory = ({}: RoomHistoryProps): ReactNode => {
 
   let room_data: RoomDataType[] = []
   if (data && data.content) {
-    console.log(data)
-
-    room_data = data.content.reserve.map((item: any) => ({
+    // console.log(data)
+    const datas: any = data.content.reserve
+    room_data = [...datas].reverse().map((item: any) => ({
       room_number: item.room_number,
       startDate: new Date(item.startDate),
       endDate: new Date(item.endDate),
@@ -60,7 +60,6 @@ const RoomHistory = ({}: RoomHistoryProps): ReactNode => {
         name: comp.name,
       })),
     }))
-    console.log(room_data)
   }
 
   return (
@@ -130,7 +129,7 @@ const HistoryCard = ({ data, prev, userStudentId, className }: HistoryCardProps)
             {
               onSuccess(data, variables, context) {
                 toast({ title: '스터디룸 예약을 취소하였습니다', variant: 'success' })
-                window.open(ROUTES.ROOM.HISTORY.url)
+                router.push(ROUTES.ROOM.HISTORY.url) // 내경로로
               },
             },
           )

src/app/room/history/page.tsx

@@ -11,7 +11,7 @@ interface LocationCheckPageProps {}
 
 // 성균관대학교 SW 라운지 좌표와 반경 정의
 const SW_LOUNGE_COORDS = { lat: 37.29595244638191, lng: 126.97582572698593 } // 예시 좌표
-const RADIUS_KM = 0.3 // 반경 300m
+const RADIUS_KM = 200000 // 반경 300m
 
 // 원형 반경 계산 함수 (하버사인 공식)
 const isWithinLocation = (lat: number, lng: number, center: { lat: number; lng: number }, radius: number): boolean => {

src/app/seat/qr/step1/page.tsx

@@ -24,7 +24,6 @@ const QRReservePage = ({}: QRReservePageProps): ReactNode => {
 
   // QR 스캔 결과 처리 함수
   const handleScanResult = (result: { data: string; cornerPoints: any[] }) => {
-    console.log('QR 코드 결과:', result)
     setScanResult(result.data) // 필요한 데이터만 상태에 저장
 
     // 스캔 결과가 유효하면 라우팅

src/app/seat/qr/step2/page.tsx

@@ -3,9 +3,10 @@ import { ReactNode, useEffect, useState } from 'react'
 
 import { ClientModalData } from '@/src/lib/constants/modal_data'
 import { ROUTES } from '@/src/lib/constants/route'
+import useAuthStore from '@/src/lib/context/authContext'
 import useModal from '@/src/lib/hooks/useModal'
 import { toast } from '@/src/lib/hooks/useToast'
-import { RegisterType } from '@/src/lib/HTTP/api/auth/api'
+import { RegisterType, VerifyPDFType } from '@/src/lib/HTTP/api/auth/api'
 import { useMutationStore } from '@/src/lib/HTTP/api/tanstack-query'
 import { NullableObject } from '@/src/lib/utils/typeUtils'
 
@@ -16,8 +17,10 @@ import { Label } from '../../ui/label'
 interface RegisterCheckProps {}
 const RegisterCheck = ({}: RegisterCheckProps): ReactNode => {
   const router = useRouter()
+  const { studentId, name } = useAuthStore()
   const { isOpen, modalData, Modal, openModal } = useModal()
 
+  const [pdfFile, setPdfFile] = useState<File>()
   // Constants
   const INIT_INFO: NullableObject<RegisterType> = { student_name: null, student_id: null, password: null, email: null }
 
@@ -33,6 +36,14 @@ const RegisterCheck = ({}: RegisterCheckProps): ReactNode => {
     }))
   }
 
+  const handleFileChange = (e: any) => {
+    setPdfFile(e.target.files[0])
+  }
+
+  useEffect(() => {
+    console.log(pdfFile)
+  }, [pdfFile])
+
   useEffect(() => {
     if (!Object.values(userInfo).includes(null)) {
       setIsDone(true)
@@ -42,6 +53,8 @@ const RegisterCheck = ({}: RegisterCheckProps): ReactNode => {
   }, [userInfo])
 
   // Mutations
+  const { mutate: VerifyPDFMutate, isPending: isVerifying } = useMutationStore<VerifyPDFType>(['verify_pdf'])
+
   const { mutate: RegisterMutate, isPending: isRegistering } = useMutationStore<RegisterType>(['register'])
 
   const registerHandler = () => {
@@ -92,6 +105,22 @@ const RegisterCheck = ({}: RegisterCheckProps): ReactNode => {
       },
     })
   }
+  const testVerifyHandle = () => {
+    if (pdfFile) {
+      VerifyPDFMutate(
+        {
+          student_id: '2019311945',
+          name: '김지호',
+          pdf: pdfFile,
+        },
+        {
+          onSuccess(data, variables, context) {
+            console.log(data)
+          },
+        },
+      )
+    }
+  }
 
   return (
     <>
@@ -152,6 +181,19 @@ const RegisterCheck = ({}: RegisterCheckProps): ReactNode => {
         />
       </div>
 
+      <div className='flex w-full items-center justify-start gap-2'>
+        <Label htmlFor='file' className='w-20 font-bold text-swBlack'>
+          재학증명서
+        </Label>
+        <Input
+          type='file'
+          id='file'
+          placeholder='재학증명서 파일을 첨부해주세요'
+          onChange={handleFileChange}
+          className='flex h-12 items-center justify-start'
+        />
+      </div>
+      <button onClick={testVerifyHandle}>테스트</button>
       <Button onClick={registerHandler} variant={isDone ? 'swBlack' : 'swBlackDisabled'} disabled={!isDone} className='w-full'>
         가입하기
       </Button>

src/components/auth/register/RegisterCheck.tsx

@@ -1,6 +1,8 @@
 import { useRouter } from 'next/navigation'
 import { ReactNode, useEffect, useState } from 'react'
 
+import { ROUTES } from '@/src/lib/constants/route'
+
 import LucideIcon from '../../provider/LucideIcon'
 import { Button } from '../../ui/button'
 import { Checkbox } from '../../ui/checkbox'
@@ -16,17 +18,17 @@ const ServicePolicyCheck = ({ stepHandler }: ServicePolicyCheckProps): ReactNode
     {
       pid: '1',
       name: '(필수) 이용약관 동의',
-      href: '미정',
+      href: ROUTES.ETC.PERSONAL_INFO_RULES,
     },
     {
       pid: '2',
       name: '(필수) 개인정보 수집 및 이용 동의',
-      href: '미정',
+      href: ROUTES.ETC.PERSONAL_INFO_RULES,
     },
     {
       pid: '3',
       name: '(필수) 위치정보 수집 및 이용 동의',
-      href: '미정',
+      href: ROUTES.ETC.PERSONAL_INFO_RULES,
     },
   ]
 

src/components/auth/register/ServicePolicyCheck.tsx

@@ -91,7 +91,7 @@ const DesktopHeader = ({ dropdownData, authData, className }: HeaderProps) => {
       <HeaderToggleMenu
         authData={authData}
         dropdownData={dropdownData}
-        className='absolute right-0 top-0 mr-3 mt-20 flex h-fit w-1/2 max-w-56 flex-col items-center justify-start self-end rounded-xl bg-swWhite'
+        className='absolute right-0 top-0 mr-3 mt-20 flex h-fit w-1/2 max-w-56 flex-col items-center justify-start self-end rounded-xl border border-solid border-swGrayLight bg-swWhite'
       />
     </div>
   )
@@ -133,7 +133,7 @@ const MobileHeader = ({ dropdownData, authData, className }: HeaderProps) => {
       <HeaderToggleMenu
         authData={authData}
         dropdownData={dropdownData}
-        className='absolute right-0 top-0 z-50 mr-3 mt-28 flex h-fit w-1/2 max-w-56 flex-col items-center justify-start self-end rounded-lg bg-swWhite'
+        className='absolute right-0 top-0 z-50 mr-3 mt-28 flex h-fit w-1/2 max-w-56 flex-col items-center justify-start self-end rounded-lg border border-solid border-swGrayLight bg-swWhite'
       />
     </div>
   )

src/components/common/Header.tsx

@@ -52,7 +52,7 @@ const AlertDialogHeader = ({ className, ...props }: React.HTMLAttributes<HTMLDiv
 AlertDialogHeader.displayName = 'AlertDialogHeader'
 
 const AlertDialogFooter = ({ className, ...props }: React.HTMLAttributes<HTMLDivElement>) => (
-  <div className={cn('flex flex-col-reverse sm:flex-row sm:justify-end sm:space-x-2', className)} {...props} />
+  <div className={cn('flex sm:justify-end sm:space-x-2', className)} {...props} />
 )
 AlertDialogFooter.displayName = 'AlertDialogFooter'
 
@@ -65,7 +65,9 @@ AlertDialogTitle.displayName = AlertDialogPrimitive.Title.displayName
 const AlertDialogDescription = React.forwardRef<
   React.ElementRef<typeof AlertDialogPrimitive.Description>,
   React.ComponentPropsWithoutRef<typeof AlertDialogPrimitive.Description>
->(({ className, ...props }, ref) => <AlertDialogPrimitive.Description ref={ref} className={cn('text-sm text-muted-foreground', className)} {...props} />)
+>(({ className, ...props }, ref) => (
+  <AlertDialogPrimitive.Description ref={ref} className={cn('text-sm text-muted-foreground', className)} {...props} />
+))
 AlertDialogDescription.displayName = AlertDialogPrimitive.Description.displayName
 
 const AlertDialogAction = React.forwardRef<

src/components/ui/alert-dialog.tsx

@@ -143,3 +143,39 @@ export const FCMToken = async ({ student_id, token }: FCMTokenType) => {
 
   return data
 }
+
+export interface VerifyPDFType {
+  student_id: string
+  name: string
+  pdf: File
+}
+
+export const VerifyPDF = async ({ student_id, name, pdf }: VerifyPDFType) => {
+  console.log('테스트 실행됨')
+
+  const ROUTE = API_ROUTES.AUTH.FCM_TOKEN
+
+  const formData = new FormData()
+  formData.append('student_number', student_id)
+  formData.append('student_name', name)
+  formData.append('pdf_file', pdf)
+
+  const res = await fetch(`http://localhost:5000${ROUTE.url}`, {
+    method: ROUTE.method,
+    headers: {
+      'Content-Type': 'multipart/form-data',
+    },
+    body: formData,
+  })
+
+  if (!res.ok) {
+    const error = new Error()
+    const data = await res.json()
+    error.message = data.message
+    throw error
+  }
+
+  const data = await res.json()
+
+  return data
+}