diff --git a/apps/timo-web/app/[locale]/(main)/(with-time-sidebar)/home/_hooks/use-home-todos-by-date.ts b/apps/timo-web/app/[locale]/(main)/(with-time-sidebar)/home/_hooks/use-home-todos-by-date.ts index a5cd937f..5172aadd 100644 --- a/apps/timo-web/app/[locale]/(main)/(with-time-sidebar)/home/_hooks/use-home-todos-by-date.ts +++ b/apps/timo-web/app/[locale]/(main)/(with-time-sidebar)/home/_hooks/use-home-todos-by-date.ts @@ -3,24 +3,24 @@ import { useQueryClient } from "@tanstack/react-query"; import { useEffect, useState } from "react"; -import type { ErrorType } from "@/api/client/custom-instance"; -import type { ApiError } from "@/api/error/api-error"; -import type { ErrorDto } from "@/api/generated/models"; import type { HomeViewDay } from "@/app/[locale]/(main)/(with-time-sidebar)/home/_types/home-view-type"; import type { Todo } from "@/app/[locale]/(main)/(with-time-sidebar)/home/_types/todo-type"; +import type { ErrorDto } from "@/generated/models"; +import type { ApiError } from "@/http/api-error"; +import type { ErrorType } from "@/http/custom-instance"; +import { reorderTodos } from "@/app/[locale]/(main)/(with-time-sidebar)/home/_utils/todo-order"; import { useChangeStatus, useStartTimer, useStopTimer, -} from "@/api/generated/endpoints/timer/timer"; +} from "@/generated/endpoints/timer/timer"; import { getGetTodoDetailQueryKey, useChangeSubtaskStatus, useChangeTodoStatus, useReorderTodo, -} from "@/api/generated/endpoints/todo/todo"; -import { reorderTodos } from "@/app/[locale]/(main)/(with-time-sidebar)/home/_utils/todo-order"; +} from "@/generated/endpoints/todo/todo"; import { useActiveTimer } from "@/hooks/timer/use-active-timer"; import { useTimerQueryInvalidation } from "@/hooks/timer/use-timer-query-invalidation"; import { useTimeSidebarStore } from "@/stores/time-sidebar/useTimeSidebarStore"; diff --git a/apps/timo-web/app/[locale]/(main)/(with-time-sidebar)/home/_queries/use-home-view-query.ts b/apps/timo-web/app/[locale]/(main)/(with-time-sidebar)/home/_queries/use-home-view-query.ts index 84cb7a82..174525b9 100644 --- a/apps/timo-web/app/[locale]/(main)/(with-time-sidebar)/home/_queries/use-home-view-query.ts +++ b/apps/timo-web/app/[locale]/(main)/(with-time-sidebar)/home/_queries/use-home-view-query.ts @@ -4,11 +4,8 @@ import { useSuspenseQuery } from "@tanstack/react-query"; import type { GetHomeViewParams } from "@/app/[locale]/(main)/(with-time-sidebar)/home/_types/home-view-type"; -import { - getGetHomeQueryKey, - getHome, -} from "@/api/generated/endpoints/home/home"; import { homeViewDataSchema } from "@/app/[locale]/(main)/(with-time-sidebar)/home/_types/home-view-type"; +import { getGetHomeQueryKey, getHome } from "@/generated/endpoints/home/home"; export const useHomeViewQuery = ({ filter, baseDate }: GetHomeViewParams) => useSuspenseQuery({ diff --git a/apps/timo-web/app/[locale]/(main)/(with-time-sidebar)/today/_hooks/todo-modal/use-create-todo-submit.ts b/apps/timo-web/app/[locale]/(main)/(with-time-sidebar)/today/_hooks/todo-modal/use-create-todo-submit.ts index c5786846..1c68d6f6 100644 --- a/apps/timo-web/app/[locale]/(main)/(with-time-sidebar)/today/_hooks/todo-modal/use-create-todo-submit.ts +++ b/apps/timo-web/app/[locale]/(main)/(with-time-sidebar)/today/_hooks/todo-modal/use-create-todo-submit.ts @@ -3,11 +3,11 @@ import { useQueryClient } from "@tanstack/react-query"; import { useState } from "react"; -import type { TodoCreateRequest } from "@/api/generated/models"; +import type { TodoCreateRequest } from "@/generated/models"; import type { CreateTodoRequest } from "@/schemas/todo/todo-schema"; -import { getGetTodayQueryKey } from "@/api/generated/endpoints/home/home"; -import { useCreateTodo } from "@/api/generated/endpoints/todo/todo"; +import { getGetTodayQueryKey } from "@/generated/endpoints/home/home"; +import { useCreateTodo } from "@/generated/endpoints/todo/todo"; import { useStatisticsQueryInvalidation } from "@/hooks/statistics/use-statistics-query-invalidation"; const buildCreateTodoRequestBody = ( diff --git a/apps/timo-web/app/[locale]/(main)/(with-time-sidebar)/today/_hooks/useTodayTodoList.ts b/apps/timo-web/app/[locale]/(main)/(with-time-sidebar)/today/_hooks/useTodayTodoList.ts index a42f0ab4..ec0cece8 100644 --- a/apps/timo-web/app/[locale]/(main)/(with-time-sidebar)/today/_hooks/useTodayTodoList.ts +++ b/apps/timo-web/app/[locale]/(main)/(with-time-sidebar)/today/_hooks/useTodayTodoList.ts @@ -3,20 +3,20 @@ import { useQueryClient } from "@tanstack/react-query"; import { useEffect, useState } from "react"; -import type { ErrorType } from "@/api/client/custom-instance"; -import type { ErrorDto } from "@/api/generated/models"; import type { TodayTodo } from "@/app/[locale]/(main)/(with-time-sidebar)/today/_types/today-type"; +import type { ErrorDto } from "@/generated/models"; +import type { ErrorType } from "@/http/custom-instance"; import { useChangeStatus, useStartTimer, useStopTimer, -} from "@/api/generated/endpoints/timer/timer"; +} from "@/generated/endpoints/timer/timer"; import { getGetTodoDetailQueryKey, useChangeSubtaskStatus, useChangeTodoStatus, -} from "@/api/generated/endpoints/todo/todo"; +} from "@/generated/endpoints/todo/todo"; import { useActiveTimer } from "@/hooks/timer/use-active-timer"; import { useTimerQueryInvalidation } from "@/hooks/timer/use-timer-query-invalidation"; import { useTimeSidebarStore } from "@/stores/time-sidebar/useTimeSidebarStore"; diff --git a/apps/timo-web/app/[locale]/(main)/(with-time-sidebar)/today/_queries/use-today-query.ts b/apps/timo-web/app/[locale]/(main)/(with-time-sidebar)/today/_queries/use-today-query.ts index 31d93cae..d53524df 100644 --- a/apps/timo-web/app/[locale]/(main)/(with-time-sidebar)/today/_queries/use-today-query.ts +++ b/apps/timo-web/app/[locale]/(main)/(with-time-sidebar)/today/_queries/use-today-query.ts @@ -2,11 +2,8 @@ import { useSuspenseQuery } from "@tanstack/react-query"; -import { - getGetTodayQueryKey, - getToday, -} from "@/api/generated/endpoints/home/home"; import { todayDataSchema } from "@/app/[locale]/(main)/(with-time-sidebar)/today/_types/today-type"; +import { getGetTodayQueryKey, getToday } from "@/generated/endpoints/home/home"; export const useTodayQuery = () => useSuspenseQuery({ diff --git a/apps/timo-web/app/[locale]/(main)/focus/_hooks/use-focus-session.ts b/apps/timo-web/app/[locale]/(main)/focus/_hooks/use-focus-session.ts index 6818c827..c99c65e4 100644 --- a/apps/timo-web/app/[locale]/(main)/focus/_hooks/use-focus-session.ts +++ b/apps/timo-web/app/[locale]/(main)/focus/_hooks/use-focus-session.ts @@ -5,20 +5,20 @@ import { useEffect, useRef } from "react"; import type { TimerSessionControlsHandle } from "@/components/timer/TimerSessionControls"; +import { useFocusTodoQuery } from "@/app/[locale]/(main)/focus/_queries/use-focus-todo-query"; +import { convertDateToBadgeText } from "@/app/[locale]/(main)/focus/_utils/date"; import { useChangeStatus, useCompleteTimer, useExtendTimer, useStartTimer, useStopTimer, -} from "@/api/generated/endpoints/timer/timer"; +} from "@/generated/endpoints/timer/timer"; import { getGetTodoDetailQueryKey, useChangeSubtaskStatus, useChangeTodoStatus, -} from "@/api/generated/endpoints/todo/todo"; -import { useFocusTodoQuery } from "@/app/[locale]/(main)/focus/_queries/use-focus-todo-query"; -import { convertDateToBadgeText } from "@/app/[locale]/(main)/focus/_utils/date"; +} from "@/generated/endpoints/todo/todo"; import { useActiveTimer } from "@/hooks/timer/use-active-timer"; import { useTimerActions } from "@/hooks/timer/use-timer-actions"; import { useTimerOvertime } from "@/hooks/timer/use-timer-overtime"; diff --git a/apps/timo-web/app/[locale]/(main)/focus/_queries/use-focus-todo-query.ts b/apps/timo-web/app/[locale]/(main)/focus/_queries/use-focus-todo-query.ts index d0329ca0..172e9838 100644 --- a/apps/timo-web/app/[locale]/(main)/focus/_queries/use-focus-todo-query.ts +++ b/apps/timo-web/app/[locale]/(main)/focus/_queries/use-focus-todo-query.ts @@ -2,11 +2,11 @@ import { useSuspenseQuery } from "@tanstack/react-query"; +import { focusViewSchema } from "@/app/[locale]/(main)/focus/_types/task-type"; import { getFocusTodo, getGetFocusTodoQueryKey, -} from "@/api/generated/endpoints/focus/focus"; -import { focusViewSchema } from "@/app/[locale]/(main)/focus/_types/task-type"; +} from "@/generated/endpoints/focus/focus"; export const useFocusTodoQuery = () => useSuspenseQuery({ diff --git a/apps/timo-web/app/[locale]/(main)/settings/_hooks/account/use-settings-profile.ts b/apps/timo-web/app/[locale]/(main)/settings/_hooks/account/use-settings-profile.ts index 43104439..0fede7f1 100644 --- a/apps/timo-web/app/[locale]/(main)/settings/_hooks/account/use-settings-profile.ts +++ b/apps/timo-web/app/[locale]/(main)/settings/_hooks/account/use-settings-profile.ts @@ -5,18 +5,18 @@ import { useTranslations } from "next-intl"; import type { SettingsLanguage } from "@/app/[locale]/(main)/settings/_types/account/profile-type"; +import { useSettingsLanguageParam } from "@/app/[locale]/(main)/settings/_hooks/account/use-settings-language-param"; +import { useLogoutMutation } from "@/app/[locale]/(main)/settings/_queries/account/use-logout-mutation"; import { authorize, useDisconnectCalendar, getGetCalendarEventsQueryKey, -} from "@/api/generated/endpoints/calendar/calendar"; +} from "@/generated/endpoints/calendar/calendar"; import { getGetMyProfileQueryKey, useUpdateLanguage, -} from "@/api/generated/endpoints/user/user"; -import { UpdateLanguageRequestLanguage } from "@/api/generated/models"; -import { useSettingsLanguageParam } from "@/app/[locale]/(main)/settings/_hooks/account/use-settings-language-param"; -import { useLogoutMutation } from "@/app/[locale]/(main)/settings/_queries/account/use-logout-mutation"; +} from "@/generated/endpoints/user/user"; +import { UpdateLanguageRequestLanguage } from "@/generated/models"; import { useMyProfileQuery } from "@/queries/auth/use-my-profile-query"; import { useCreateTagMutation } from "@/queries/tag/use-create-tag-mutation"; import { useDeleteTagMutation } from "@/queries/tag/use-delete-tag-mutation"; diff --git a/apps/timo-web/app/[locale]/(main)/settings/_queries/account/use-logout-mutation.ts b/apps/timo-web/app/[locale]/(main)/settings/_queries/account/use-logout-mutation.ts index 3c7b72dc..50c2e35e 100644 --- a/apps/timo-web/app/[locale]/(main)/settings/_queries/account/use-logout-mutation.ts +++ b/apps/timo-web/app/[locale]/(main)/settings/_queries/account/use-logout-mutation.ts @@ -2,8 +2,8 @@ import { useMutation } from "@tanstack/react-query"; -import { logout } from "@/api/generated/endpoints/auth/auth"; import { useClearSession } from "@/app/[locale]/(main)/settings/_hooks/use-clear-session"; +import { logout } from "@/generated/endpoints/auth/auth"; export const useLogoutMutation = () => { const clearSession = useClearSession(); diff --git a/apps/timo-web/app/[locale]/(main)/settings/_queries/withdrawal/use-withdraw-mutation.ts b/apps/timo-web/app/[locale]/(main)/settings/_queries/withdrawal/use-withdraw-mutation.ts index 6dddc62f..7964ef52 100644 --- a/apps/timo-web/app/[locale]/(main)/settings/_queries/withdrawal/use-withdraw-mutation.ts +++ b/apps/timo-web/app/[locale]/(main)/settings/_queries/withdrawal/use-withdraw-mutation.ts @@ -2,8 +2,8 @@ import { useMutation } from "@tanstack/react-query"; -import { withdraw } from "@/api/generated/endpoints/auth/auth"; import { useClearSession } from "@/app/[locale]/(main)/settings/_hooks/use-clear-session"; +import { withdraw } from "@/generated/endpoints/auth/auth"; export const useWithdrawMutation = () => { const clearSession = useClearSession(); diff --git a/apps/timo-web/app/[locale]/(main)/statistics/_queries/use-statistics-query.ts b/apps/timo-web/app/[locale]/(main)/statistics/_queries/use-statistics-query.ts index 0b3dfcee..1958e734 100644 --- a/apps/timo-web/app/[locale]/(main)/statistics/_queries/use-statistics-query.ts +++ b/apps/timo-web/app/[locale]/(main)/statistics/_queries/use-statistics-query.ts @@ -2,7 +2,7 @@ import { useGetCalendar, useGetDaily, useGetSummary, -} from "@/api/generated/endpoints/statistics/statistics"; +} from "@/generated/endpoints/statistics/statistics"; export const useStatisticsSummaryQuery = (yearMonth: string) => { return useGetSummary({ yearMonth }); diff --git a/apps/timo-web/app/[locale]/oauth/calendar/callback/_containers/CalendarCallbackContainer.tsx b/apps/timo-web/app/[locale]/oauth/calendar/callback/_containers/CalendarCallbackContainer.tsx index 3bcfd3c9..7df1e0ec 100644 --- a/apps/timo-web/app/[locale]/oauth/calendar/callback/_containers/CalendarCallbackContainer.tsx +++ b/apps/timo-web/app/[locale]/oauth/calendar/callback/_containers/CalendarCallbackContainer.tsx @@ -4,9 +4,9 @@ import { useQueryClient } from "@tanstack/react-query"; import { useSearchParams } from "next/navigation"; import { useEffect, useRef } from "react"; -import { useConnectCalendar } from "@/api/generated/endpoints/calendar/calendar"; -import { getGetMyProfileQueryKey } from "@/api/generated/endpoints/user/user"; import { ROUTES } from "@/constants/routes"; +import { useConnectCalendar } from "@/generated/endpoints/calendar/calendar"; +import { getGetMyProfileQueryKey } from "@/generated/endpoints/user/user"; import { useRouter } from "@/i18n/navigation"; export const CalendarCallbackContainer = () => { diff --git a/apps/timo-web/app/[locale]/oauth/callback/_containers/OauthCallbackContainer.tsx b/apps/timo-web/app/[locale]/oauth/callback/_containers/OauthCallbackContainer.tsx index c727f4b6..3e676d4b 100644 --- a/apps/timo-web/app/[locale]/oauth/callback/_containers/OauthCallbackContainer.tsx +++ b/apps/timo-web/app/[locale]/oauth/callback/_containers/OauthCallbackContainer.tsx @@ -3,9 +3,9 @@ import { useSearchParams } from "next/navigation"; import { useEffect, useRef } from "react"; -import { useToken } from "@/api/generated/endpoints/auth/auth"; -import { useUpdateTimezone } from "@/api/generated/endpoints/user/user"; import { ROUTES } from "@/constants/routes"; +import { useToken } from "@/generated/endpoints/auth/auth"; +import { useUpdateTimezone } from "@/generated/endpoints/user/user"; import { useRouter } from "@/i18n/navigation"; import { useAuthStore } from "@/stores/auth/useAuthStore"; diff --git a/apps/timo-web/app/[locale]/onboarding/_containers/CalendarConnectStepContainer.tsx b/apps/timo-web/app/[locale]/onboarding/_containers/CalendarConnectStepContainer.tsx index dbd4ed35..55e0026c 100644 --- a/apps/timo-web/app/[locale]/onboarding/_containers/CalendarConnectStepContainer.tsx +++ b/apps/timo-web/app/[locale]/onboarding/_containers/CalendarConnectStepContainer.tsx @@ -2,9 +2,9 @@ import { useTranslations } from "next-intl"; -import { authorize } from "@/api/generated/endpoints/calendar/calendar"; import { OnboardingButtonContainer } from "@/app/[locale]/onboarding/_containers/OnboardingButtonContainer"; import { OnboardingGoogleButtonContainer } from "@/app/[locale]/onboarding/_containers/OnboardingGoogleButtonContainer"; +import { authorize } from "@/generated/endpoints/calendar/calendar"; interface CalendarConnectStepContainerProps { isPending?: boolean; diff --git a/apps/timo-web/app/[locale]/onboarding/_containers/OnboardingFunnelContainer.tsx b/apps/timo-web/app/[locale]/onboarding/_containers/OnboardingFunnelContainer.tsx index bc3f21d7..91bbfb3e 100644 --- a/apps/timo-web/app/[locale]/onboarding/_containers/OnboardingFunnelContainer.tsx +++ b/apps/timo-web/app/[locale]/onboarding/_containers/OnboardingFunnelContainer.tsx @@ -4,8 +4,6 @@ import { useFunnel } from "@use-funnel/browser"; import { useTranslations } from "next-intl"; import { useState } from "react"; -import { useCompleteOnboarding } from "@/api/generated/endpoints/onboarding/onboarding"; -import { OnboardingRequestLanguage } from "@/api/generated/models"; import { OnboardingStepButton } from "@/app/[locale]/onboarding/_components/OnboardingStepButton"; import { CalendarConnectStepContainer } from "@/app/[locale]/onboarding/_containers/CalendarConnectStepContainer"; import { LanguageStepContainer } from "@/app/[locale]/onboarding/_containers/LanguageStepContainer"; @@ -15,6 +13,8 @@ import { OnboardingFunnelSteps } from "@/app/[locale]/onboarding/_types/onboardi import { LottiePlayer } from "@/components/lottie/LottiePlayer"; import { AnimatedToast } from "@/components/toast/AnimatedToast"; import { ROUTES } from "@/constants/routes"; +import { useCompleteOnboarding } from "@/generated/endpoints/onboarding/onboarding"; +import { OnboardingRequestLanguage } from "@/generated/models"; import { useRouter } from "@/i18n/navigation"; import { useAuthStore } from "@/stores/auth/useAuthStore"; diff --git a/apps/timo-web/app/[locale]/policy/page.tsx b/apps/timo-web/app/[locale]/policy/page.tsx index 3128300b..3bef9407 100644 --- a/apps/timo-web/app/[locale]/policy/page.tsx +++ b/apps/timo-web/app/[locale]/policy/page.tsx @@ -46,20 +46,20 @@ export default async function PolicyPage({ searchParams }: PolicyPageProps) { const parsedType = termsTypeSchema.safeParse(type); return ( -