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 @@ -19,12 +19,12 @@ import { HomeCalendarEventCard } from "@/components/calendar/HomeCalendarEventCa
import { AnimatedToast } from "@/components/toast/AnimatedToast";
import { StopCompleteModalContainer } from "@/containers/timer/StopCompleteModalContainer";
import { DetailTodoModalContainer } from "@/containers/todo-modal/detail/DetailTodoModalContainer";
import { useTagLabel } from "@/hooks/todo/use-tag-label";
import { DndSortableListProvider } from "@/providers/dnd/DndSortableListProvider";
import { useMyProfileQuery } from "@/queries/auth/use-my-profile-query";
import { useCalendarEventsQuery } from "@/queries/calendar/use-calendar-events-query";
import { formatDateKey } from "@/utils/date/date";
import { convertDurationToMinutes } from "@/utils/duration/convert-duration-to-minutes";
import { getDefaultTagLabelKey } from "@/utils/todo/tag-label";

interface PendingCompleteTodo {
token: number;
Expand All @@ -33,7 +33,7 @@ interface PendingCompleteTodo {
}

export const HomeTodoContainer = () => {
const tCommon = useTranslations("Common");
const getTagLabel = useTagLabel();
const tToast = useTranslations("Toast");
const { isWeekView, referenceDate } = useHomeViewMode();

Expand Down Expand Up @@ -167,13 +167,8 @@ export const HomeTodoContainer = () => {
const isPlayHighlighted =
!activeTimer || Boolean(isActiveTodo);

const todoTagLabelKey = todo.tag
? getDefaultTagLabelKey(todo.tag.tagId)
: undefined;
const todoTagName = todo.tag
? todoTagLabelKey
? tCommon(`tag.${todoTagLabelKey}`)
: todo.tag.name
? getTagLabel(todo.tag)
: undefined;

return (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import {
type PriorityLevel,
} from "@repo/timo-design-system/ui";
import { cn } from "@repo/timo-design-system/utils";
import { useTranslations } from "next-intl";

import type { KeyboardEvent, ReactNode } from "react";

Expand Down Expand Up @@ -78,6 +79,7 @@ export const TodayTodoCard = ({
onMouseEnter,
onMouseLeave,
}: TodayTodoCardProps) => {
const t = useTranslations("Home.createModal");
const style = CARD_STYLE[isDimmed ? "done" : "active"];

const handleCardKeyDown = (e: KeyboardEvent<HTMLDivElement>) => {
Expand Down Expand Up @@ -180,7 +182,7 @@ export const TodayTodoCard = ({
timeLabel={toolbar.time}
timeOptions={[]}
priority={toolbar.priority}
tagLabel={toolbar.tag ?? "태그"}
tagLabel={toolbar.tag ?? t("tagLabel")}
tags={[]}
selectedTag={toolbar.tag}
hasSubTask={toolbar.hasSubtask}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import { TodayCalendarEventCard } from "@/components/calendar/TodayCalendarEvent
import { AnimatedToast } from "@/components/toast/AnimatedToast";
import { StopCompleteModalContainer } from "@/containers/timer/StopCompleteModalContainer";
import { DetailTodoModalContainer } from "@/containers/todo-modal/detail/DetailTodoModalContainer";
import { useTagLabel } from "@/hooks/todo/use-tag-label";
import { useMyProfileQuery } from "@/queries/auth/use-my-profile-query";
import { useCalendarEventsQuery } from "@/queries/calendar/use-calendar-events-query";
import { formatShortDateLabel, parseDateKey } from "@/utils/date/date";
Expand All @@ -33,6 +34,7 @@ const renderTodoIcon = (icon: string | undefined) => {

export const TodayTodoListContainer = () => {
const tToast = useTranslations("Toast");
const getTagLabel = useTagLabel();
const { data } = useTodayQuery();
const { data: profile } = useMyProfileQuery();
const { data: calendarEventsData } = useCalendarEventsQuery({
Expand Down Expand Up @@ -140,7 +142,7 @@ export const TodayTodoListContainer = () => {
dateValue: parseDateKey(todo.date) ?? new Date(),
time: convertDurationToTimeText(durationSeconds),
priority: todo.priority,
tag: todo.tag?.name,
tag: todo.tag ? getTagLabel(todo.tag) : undefined,
hasSubtask: todo.hasSubtask,
hasRepeat: todo.isRepeated,
}}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,12 @@ import {
useStatisticsSummaryQuery,
} from "@/app/[locale]/(main)/statistics/_queries/use-statistics-query";
import { formatStatisticsSidePanelDate } from "@/app/[locale]/(main)/statistics/_utils/format-statistics-date";
import { useTagLabel } from "@/hooks/todo/use-tag-label";
import { formatDateKey } from "@/utils/date/date";

export const StatisticsContainer = () => {
const locale = useLocale();
const getTagLabel = useTagLabel();
const [currentMonth, setCurrentMonth] = useState(() => new Date());
const [selectedDate, setSelectedDate] = useState(() => new Date());
const [sidePanelVariant, setSidePanelVariant] =
Expand Down Expand Up @@ -47,7 +49,7 @@ export const StatisticsContainer = () => {
title: todo.title,
actualTimeMinutes: todo.actualTimeMinutes,
estimatedTimeMinutes: todo.estimatedTimeMinutes ?? 0,
tagName: todo.tag?.name ?? "",
tagName: todo.tag ? getTagLabel(todo.tag) : "",
})) ?? [],
};

Expand Down
24 changes: 24 additions & 0 deletions apps/timo-web/hooks/todo/use-tag-label.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
"use client";

import { useTranslations } from "next-intl";

import { getDefaultTagLabelKey } from "@/utils/todo/tag-label";

interface TagLabelSource {
tagId: number;
name: string;
}

/**
* 기본 태그는 tagId 기준으로 next-intl 번역을 사용하고,
* 사용자 태그는 서버 이름을 그대로 사용한다.
*/
export const useTagLabel = () => {
const tCommon = useTranslations("Common");

return (tag: TagLabelSource) => {
const labelKey = getDefaultTagLabelKey(tag.tagId);

return labelKey ? tCommon(`tag.${labelKey}`) : tag.name;
};
};
Loading