diff --git a/web/src/components/ActivityCalendar.tsx b/web/src/components/ActivityCalendar.tsx index e89b4382..54f29ae5 100644 --- a/web/src/components/ActivityCalendar.tsx +++ b/web/src/components/ActivityCalendar.tsx @@ -1,11 +1,10 @@ import { Tooltip } from "@mui/joy"; -import clsx from "clsx"; import dayjs from "dayjs"; import { useWorkspaceSettingStore } from "@/store/v1"; import { WorkspaceGeneralSetting } from "@/types/proto/api/v1/workspace_setting_service"; import { WorkspaceSettingKey } from "@/types/proto/store/workspace_setting"; +import { cn } from "@/utils"; import { useTranslate } from "@/utils/i18n"; -import { cn } from "@/utils/utils"; interface Props { month: string; // Format: 2021-1 @@ -66,9 +65,9 @@ const ActivityCalendar = (props: Props) => { } return ( -
+
{weekDays.map((day, index) => ( -
+
{day}
))} diff --git a/web/src/components/Dialog/BaseDialog.tsx b/web/src/components/Dialog/BaseDialog.tsx index fea14bd5..a09d112e 100644 --- a/web/src/components/Dialog/BaseDialog.tsx +++ b/web/src/components/Dialog/BaseDialog.tsx @@ -1,5 +1,4 @@ import { CssVarsProvider } from "@mui/joy"; -import clsx from "clsx"; import { useEffect, useRef } from "react"; import { createRoot } from "react-dom/client"; import { Provider } from "react-redux"; @@ -7,6 +6,7 @@ import CommonContextProvider from "@/layouts/CommonContextProvider"; import store from "@/store"; import { useDialogStore } from "@/store/module"; import theme from "@/theme"; +import { cn } from "@/utils"; import "@/less/base-dialog.less"; interface DialogConfig { @@ -56,8 +56,8 @@ const BaseDialog: React.FC = (props: Props) => { }; return ( -
-
e.stopPropagation()}> +
+
e.stopPropagation()}> {children}
diff --git a/web/src/components/ExploreSidebar/ExploreSidebar.tsx b/web/src/components/ExploreSidebar/ExploreSidebar.tsx index 4c1af790..8c331d67 100644 --- a/web/src/components/ExploreSidebar/ExploreSidebar.tsx +++ b/web/src/components/ExploreSidebar/ExploreSidebar.tsx @@ -1,7 +1,7 @@ -import clsx from "clsx"; import useDebounce from "react-use/lib/useDebounce"; import SearchBar from "@/components/SearchBar"; import { useUserStatsStore } from "@/store/v1"; +import { cn } from "@/utils"; import TagsSection from "../HomeSidebar/TagsSection"; import StatisticsView from "../StatisticsView"; @@ -22,7 +22,7 @@ const ExploreSidebar = (props: Props) => { return (