diff --git a/src/app/tanstack-query/schedules/useCreateSchedule.ts b/src/app/tanstack-query/schedules/useCreateSchedule.ts index 5b5cbf83..1a31cd51 100644 --- a/src/app/tanstack-query/schedules/useCreateSchedule.ts +++ b/src/app/tanstack-query/schedules/useCreateSchedule.ts @@ -3,6 +3,7 @@ import { DOMAIN } from "@api/url"; import { getCookie } from "@app/utils/storage"; import { QUERY_KEY_REGULAR_ASSET, + QUERY_KEY_REPORT, QUERY_KEY_SCHEDULES, } from "@constants/queryKeys"; import { getPriceType } from "@components/ScheduleDrawer/hooks/useScheduleForm"; @@ -36,6 +37,9 @@ export const useCreateSchedule = () => { queryClient.invalidateQueries({ queryKey: [QUERY_KEY_SCHEDULES, date.format("YYYY-MM")], }); + queryClient.invalidateQueries({ + queryKey: [QUERY_KEY_REPORT, date.format("YYYY-MM")], + }); if (variables.repeat.kind_type !== "none") { queryClient.invalidateQueries({ diff --git a/src/app/utils/storage.ts b/src/app/utils/storage.ts index 2b1d1356..79014d29 100644 --- a/src/app/utils/storage.ts +++ b/src/app/utils/storage.ts @@ -26,7 +26,7 @@ export const getCookie = (name: string): string | undefined => { export const setCookie = (name: string, value?: string) => { if (value) { - document.cookie = name + "=" + value + ";max-age=600"; + document.cookie = name + "=" + value + ";max-age=600000"; } }; diff --git a/src/components/ScheduleDrawer/pages/ScheduleFormPage/components/RepeatPicker/containers/PeriodContainer/period/EndDate/Input.tsx b/src/components/ScheduleDrawer/pages/ScheduleFormPage/components/RepeatPicker/containers/PeriodContainer/period/EndDate/Input.tsx index 1ba05cf9..29110bee 100644 --- a/src/components/ScheduleDrawer/pages/ScheduleFormPage/components/RepeatPicker/containers/PeriodContainer/period/EndDate/Input.tsx +++ b/src/components/ScheduleDrawer/pages/ScheduleFormPage/components/RepeatPicker/containers/PeriodContainer/period/EndDate/Input.tsx @@ -38,6 +38,7 @@ function Input({ style: { textAlign: "center" }, min: min ?? 1, max: max, + inputMode: "numeric", }} /> diff --git a/src/components/ScheduleDrawer/pages/ScheduleFormPage/components/RepeatPicker/containers/RepeatContainer/radio/RadioLabel/labels/InputLabel.tsx b/src/components/ScheduleDrawer/pages/ScheduleFormPage/components/RepeatPicker/containers/RepeatContainer/radio/RadioLabel/labels/InputLabel.tsx index 4991684a..d33fc8c7 100644 --- a/src/components/ScheduleDrawer/pages/ScheduleFormPage/components/RepeatPicker/containers/RepeatContainer/radio/RadioLabel/labels/InputLabel.tsx +++ b/src/components/ScheduleDrawer/pages/ScheduleFormPage/components/RepeatPicker/containers/RepeatContainer/radio/RadioLabel/labels/InputLabel.tsx @@ -18,7 +18,7 @@ function InputLabel({ const handleChange = (e: React.ChangeEvent) => { const { value, max } = e.target; let newValue = value; - if (!Number(newValue)) return; + if (isNaN(Number(newValue))) return; if (Number(newValue) > Number(max)) newValue = max; handleUpdate(newValue); }; @@ -39,6 +39,7 @@ function InputLabel({ min: 1, max: max, style: { textAlign: "center" }, + inputMode: "numeric", }} sx={{ width: "30px", diff --git a/src/components/fetchPaymentHistory/PeriodInput.tsx b/src/components/fetchPaymentHistory/PeriodInput.tsx index e3abe04d..6417c49d 100644 --- a/src/components/fetchPaymentHistory/PeriodInput.tsx +++ b/src/components/fetchPaymentHistory/PeriodInput.tsx @@ -5,13 +5,13 @@ import { PickersDayProps, koKR, } from "@mui/x-date-pickers"; -import { InputAdornment, TextField, Grid } from "@mui/material"; +import { InputAdornment, TextField } from "@mui/material"; +import Grid from "@mui/material/Grid2"; import moment from "moment"; import CalendarTodayOutlinedIcon from "@mui/icons-material/CalendarTodayOutlined"; -import { AdapterMoment } from "@mui/x-date-pickers/AdapterMoment"; import InputGrid from "./InputGrid"; -import "moment/locale/zh-cn"; import { useState } from "react"; +import { AdapterMoment } from "@mui/x-date-pickers/AdapterMoment"; interface PeriodInputProps { startDate: string; @@ -74,10 +74,9 @@ function PeriodInput({ startDate, endDate, changeDate }: PeriodInputProps) { return ( - + - {children} - + const theme = createTheme( + isDarkMode ? darkThemeOptions : lightThemeOptions, + koKR ); + + return {children}; } export default CustomThemeProvider; diff --git a/src/pages/Home/components/HomeContainer/view/SearchSchedule/index.tsx b/src/pages/Home/components/HomeContainer/view/SearchSchedule/index.tsx index e4787103..63f2c341 100644 --- a/src/pages/Home/components/HomeContainer/view/SearchSchedule/index.tsx +++ b/src/pages/Home/components/HomeContainer/view/SearchSchedule/index.tsx @@ -15,7 +15,6 @@ import { useEffect, useRef, useState } from "react"; import { useAppDispatch } from "@redux/hooks.ts"; import RoundedBorderBox from "@components/common/RoundedBorderBox.tsx"; import moment from "moment"; -import "moment/locale/ko"; import { Schedule } from "@app/types/schedule.ts"; import useSchedule from "@hooks/schedule/useSchedule.ts"; import { fetchFindSchedules } from "@api/API.ts"; diff --git a/src/pages/Start/components/SocialLogin/SocialLogin.tsx b/src/pages/Start/components/SocialLogin/SocialLogin.tsx index 13e4ad05..7510d94c 100644 --- a/src/pages/Start/components/SocialLogin/SocialLogin.tsx +++ b/src/pages/Start/components/SocialLogin/SocialLogin.tsx @@ -8,11 +8,11 @@ interface SocialLoginProps { const SOCIAL_LOGIN: SocialLoginStateType = { kakao: { image: "/icons/socialLogin/kakao.svg", - path: `http://localhost:8080/login/kakao`, + path: `${import.meta.env.VITE_LOCAL_DOMAIN}/login/kakao`, }, naver: { image: "/icons/socialLogin/btnG_아이콘사각.png", - path: `http://localhost:8080/login/naver`, + path: `${import.meta.env.VITE_LOCAL_DOMAIN}/login/naver`, }, };