Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 = (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 });
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 = () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -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";

Expand Down
12 changes: 6 additions & 6 deletions apps/timo-web/app/[locale]/policy/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -46,20 +46,20 @@ export default async function PolicyPage({ searchParams }: PolicyPageProps) {
const parsedType = termsTypeSchema.safeParse(type);

return (
<div className="flex min-h-screen w-full flex-col items-center gap-12.5 bg-white">
<div className="flex w-full items-center justify-between px-37 py-6.75">
<main className="flex min-h-screen w-full flex-col items-center gap-12.5 bg-white">
<header className="flex w-full items-center justify-between px-37 py-6.75">
<Link href={ROUTES.LOGIN} aria-label="Timo">
<LogoTimoIcon width={92} height={35} />
</Link>
</div>
</header>

<div className="flex w-full justify-center px-8 pb-20">
<article className="flex w-full justify-center px-8 pb-20">
<AsyncBoundary>
<PolicyContainer
type={parsedType.success ? parsedType.data : "SERVICE"}
/>
</AsyncBoundary>
</div>
</div>
</article>
</main>
);
}
14 changes: 7 additions & 7 deletions apps/timo-web/components/layout/sidebar/time/TimerPanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@

import { useEffect, useRef, useState } from "react";

import {
useChangeStatus,
useCompleteTimer,
useExtendTimer,
useStopTimer,
} from "@/api/generated/endpoints/timer/timer";
import { useChangeTodoStatus } from "@/api/generated/endpoints/todo/todo";
import { Timer } from "@/components/timer/Timer";
import {
TimerSessionControls,
type TimerSessionControlsHandle,
} from "@/components/timer/TimerSessionControls";
import {
useChangeStatus,
useCompleteTimer,
useExtendTimer,
useStopTimer,
} from "@/generated/endpoints/timer/timer";
import { useChangeTodoStatus } 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";
Expand Down
2 changes: 1 addition & 1 deletion apps/timo-web/components/policy/PolicyDocument.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export interface PolicyDocumentProps {

export const PolicyDocument = ({ title, content }: PolicyDocumentProps) => {
return (
<div className="flex w-full max-w-[1147px] flex-col gap-7.5">
<div className="flex w-full max-w-286.75 flex-col gap-7.5">
<div className="flex flex-col gap-5">
<h1 className="typo-headline-b-16 text-timo-gray-900 w-full">
{title}
Expand Down
2 changes: 1 addition & 1 deletion apps/timo-web/components/timer/TimerExtendModalPanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { Modal, ModalButton } from "@repo/timo-design-system/ui";
import { cn } from "@repo/timo-design-system/utils";
import { useTranslations } from "next-intl";

import { extendTimerBodyExtendMinutesMax } from "@/api/generated/endpoints/timer/timer.zod";
import { extendTimerBodyExtendMinutesMax } from "@/generated/endpoints/timer/timer.zod";

export type ExtendTimePreset = 10 | 30 | 60 | "custom";

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import type {
TodoDetailResponse,
TodoDetailResponseTimerStatus,
TodoUpdateRequest,
} from "@/api/generated/models";
} from "@/generated/models";
import type { UpdateTodoSubmitHandlers } from "@/hooks/todo-modal/detail/use-update-todo-submit";

import { TagLimitToastContainer } from "@/app/[locale]/(main)/(with-time-sidebar)/home/_containers/toast/TagLimitToastContainer";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {
} from "@repo/timo-design-system/icons";
import { Checkbox, PlayButton } from "@repo/timo-design-system/ui";

import type { TodoDetailResponseTimerStatus } from "@/api/generated/models";
import type { TodoDetailResponseTimerStatus } from "@/generated/models";
import type { KeyboardEvent, MouseEvent, PointerEvent } from "react";

const resizeTextarea = (element: HTMLTextAreaElement | null) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ import { useTranslations } from "next-intl";
import { overlay } from "overlay-kit";
import { useCallback, useEffect, useRef, useState } from "react";

import type { ErrorType } from "@/api/client/custom-instance";
import type { ErrorDto, TodoUpdateRequest } from "@/api/generated/models";
import type { ErrorDto, TodoUpdateRequest } from "@/generated/models";
import type { UpdateTodoSubmitHandlers } from "@/hooks/todo-modal/detail/use-update-todo-submit";
import type { ErrorType } from "@/http/custom-instance";
import type { ReactNode } from "react";

import { useGetTodoDetail } from "@/api/generated/endpoints/todo/todo";
import { AnimatedToast } from "@/components/toast/AnimatedToast";
import { DetailTodoModalContent } from "@/components/todo-modal/detail/DetailTodoModalContent";
import { useGetTodoDetail } from "@/generated/endpoints/todo/todo";
import { useActiveTimer } from "@/hooks/timer/use-active-timer";
import { useDeleteTodoSubmit } from "@/hooks/todo-modal/detail/use-delete-todo-submit";
import { useToggleSubtaskSubmit } from "@/hooks/todo-modal/detail/use-toggle-subtask-submit";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
*/
import { useMutation } from "@tanstack/react-query";

import { customInstance } from "../../../client/custom-instance";
import { customInstance } from "../../../http/custom-instance";

import type { ErrorType, BodyType } from "../../../client/custom-instance";
import type { ErrorType, BodyType } from "../../../http/custom-instance";
import type {
BaseResponseRecommendDurationResponse,
ErrorDto,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
*/
import { useMutation } from "@tanstack/react-query";

import { customInstance } from "../../../client/custom-instance";
import { customInstance } from "../../../http/custom-instance";

import type { ErrorType, BodyType } from "../../../client/custom-instance";
import type { ErrorType, BodyType } from "../../../http/custom-instance";
import type {
AuthTokenRequest,
BaseResponseAuthReissueResponse,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
*/
import { useMutation, useQuery } from "@tanstack/react-query";

import { customInstance } from "../../../client/custom-instance";
import { customInstance } from "../../../http/custom-instance";

import type { ErrorType, BodyType } from "../../../client/custom-instance";
import type { ErrorType, BodyType } from "../../../http/custom-instance";
import type {
BaseResponseCalendarAuthorizeResponse,
BaseResponseCalendarConnectResponse,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
*/
import { useQuery } from "@tanstack/react-query";

import { customInstance } from "../../../client/custom-instance";
import { customInstance } from "../../../http/custom-instance";

import type { ErrorType } from "../../../client/custom-instance";
import type { ErrorType } from "../../../http/custom-instance";
import type { BaseResponseFocusTodoResponse, ErrorDto } from "../../models";
import type {
DataTag,
Expand Down
Loading
Loading