From d5c12d20e8667514239cf30e0164e9a293cbf809 Mon Sep 17 00:00:00 2001 From: baegyeong Date: Thu, 5 Dec 2024 13:28:16 +0900 Subject: [PATCH 1/8] =?UTF-8?q?=F0=9F=90=9B=20fix:=20=EC=95=8C=EB=A6=BC=20?= =?UTF-8?q?=EA=B1=B0=EB=9E=98=EA=B0=80,=20=EB=AA=A9=ED=91=9C=EA=B0=80=20?= =?UTF-8?q?=ED=83=80=EC=9E=85=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/frontend/src/components/ui/alarm/Alarm.tsx | 2 +- .../frontend/src/pages/stock-detail/NotificationPanel.tsx | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/frontend/src/components/ui/alarm/Alarm.tsx b/packages/frontend/src/components/ui/alarm/Alarm.tsx index 339c009e..090c4d9e 100644 --- a/packages/frontend/src/components/ui/alarm/Alarm.tsx +++ b/packages/frontend/src/components/ui/alarm/Alarm.tsx @@ -3,7 +3,7 @@ import Flag from '@/assets/flag.svg?react'; export interface AlarmProps { option: string; - goalPrice: number | string; + goalPrice: number; alarmDate: string | null; } diff --git a/packages/frontend/src/pages/stock-detail/NotificationPanel.tsx b/packages/frontend/src/pages/stock-detail/NotificationPanel.tsx index 4a374142..841116fc 100644 --- a/packages/frontend/src/pages/stock-detail/NotificationPanel.tsx +++ b/packages/frontend/src/pages/stock-detail/NotificationPanel.tsx @@ -36,6 +36,10 @@ const NotificationContents = () => { } if (!data) { + return

알림 정보를 불러오는 데 실패했어요.

; + } + + if (data.length === 0) { return

현재 설정된 알림이 없어요.

; } @@ -43,7 +47,7 @@ const NotificationContents = () => { )); From f457af1bfb383c7eae746311966256c10d12f5cc Mon Sep 17 00:00:00 2001 From: baegyeong Date: Thu, 5 Dec 2024 14:17:03 +0900 Subject: [PATCH 2/8] =?UTF-8?q?=F0=9F=90=9B=20fix:=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=ED=96=88=EC=9D=84=20?= =?UTF-8?q?=EB=95=8C=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EC=83=81=ED=83=9C=20?= =?UTF-8?q?=EC=BF=BC=EB=A6=AC=20=EB=AC=B4=ED=9A=A8=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/frontend/src/pages/login/Login.tsx | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/packages/frontend/src/pages/login/Login.tsx b/packages/frontend/src/pages/login/Login.tsx index a2e515ea..61ca861f 100644 --- a/packages/frontend/src/pages/login/Login.tsx +++ b/packages/frontend/src/pages/login/Login.tsx @@ -1,10 +1,12 @@ +import { useQueryClient } from '@tanstack/react-query'; import { Link } from 'react-router-dom'; import { useGetTestLogin } from '@/apis/queries/auth/useGetTestLogin'; import Google from '@/assets/google.svg?react'; import { Button } from '@/components/ui/button'; +const GOOGLE_LOGIN = '/api/auth/google/login'; export const Login = () => { - const googleLoginUrl = '/api/auth/google/login'; + const queryClient = useQueryClient(); const { refetch } = useGetTestLogin({ password: 'test', username: 'test' }); return ( @@ -16,7 +18,7 @@ export const Login = () => {

주춤주춤과 함께해요!

- +