-
-
- {t("memo.filters")}
-
-
- {filters.map((filter) => (
-
memoFilterStore.removeFilter((f) => isEqual(f, filter))}
- >
-
- {getFilterDisplayText(filter)}
-
-
- ))}
-
+
+ {filters.map((filter) => (
+
memoFilterStore.removeFilter((f) => isEqual(f, filter))}
+ >
+
+ {getFilterDisplayText(filter)}
+
+
+ ))}
);
};
diff --git a/web/src/components/MobileHeader.tsx b/web/src/components/MobileHeader.tsx
index 4f77a146..055e448c 100644
--- a/web/src/components/MobileHeader.tsx
+++ b/web/src/components/MobileHeader.tsx
@@ -22,7 +22,7 @@ const MobileHeader = (props: Props) => {
return (
0 && "shadow-md",
className,
)}
diff --git a/web/src/components/StatisticsView.tsx b/web/src/components/StatisticsView.tsx
index a49bd8f9..2914651e 100644
--- a/web/src/components/StatisticsView.tsx
+++ b/web/src/components/StatisticsView.tsx
@@ -42,7 +42,7 @@ const StatisticsView = () => {
};
return (
-
+
diff --git a/web/src/components/UserBanner.tsx b/web/src/components/UserBanner.tsx
index 4520f74a..435720fa 100644
--- a/web/src/components/UserBanner.tsx
+++ b/web/src/components/UserBanner.tsx
@@ -37,7 +37,7 @@ const UserBanner = (props: Props) => {
diff --git a/web/src/layouts/RootLayout.tsx b/web/src/layouts/RootLayout.tsx
index 843bf29f..0c0e5276 100644
--- a/web/src/layouts/RootLayout.tsx
+++ b/web/src/layouts/RootLayout.tsx
@@ -1,9 +1,5 @@
-import { Tooltip } from "@mui/joy";
-import { Button } from "@usememos/mui";
-import { ChevronLeftIcon, ChevronRightIcon } from "lucide-react";
import { Suspense, useEffect, useMemo, useState } from "react";
import { Outlet, useLocation, useSearchParams } from "react-router-dom";
-import useLocalStorage from "react-use/lib/useLocalStorage";
import usePrevious from "react-use/lib/usePrevious";
import Navigation from "@/components/Navigation";
import useCurrentUser from "@/hooks/useCurrentUser";
@@ -12,16 +8,13 @@ import Loading from "@/pages/Loading";
import { Routes } from "@/router";
import { useMemoFilterStore } from "@/store/v1";
import { cn } from "@/utils";
-import { useTranslate } from "@/utils/i18n";
const RootLayout = () => {
- const t = useTranslate();
const location = useLocation();
const [searchParams] = useSearchParams();
const { sm } = useResponsiveWidth();
const currentUser = useCurrentUser();
const memoFilterStore = useMemoFilterStore();
- const [collapsed, setCollapsed] = useLocalStorage
("navigation-collapsed", false);
const [initialized, setInitialized] = useState(false);
const pathname = useMemo(() => location.pathname, [location.pathname]);
const prevPathname = usePrevious(pathname);
@@ -47,34 +40,15 @@ const RootLayout = () => {
) : (
-
+
{sm && (
-
-
-
setCollapsed(!collapsed)}
- >
- {!collapsed ? (
-
- ) : (
-
-
-
- )}
-
-
+
)}
diff --git a/web/src/pages/Explore.tsx b/web/src/pages/Explore.tsx
index d52723b7..ffb184f1 100644
--- a/web/src/pages/Explore.tsx
+++ b/web/src/pages/Explore.tsx
@@ -1,7 +1,6 @@
import dayjs from "dayjs";
import { useMemo } from "react";
import { ExploreSidebar, ExploreSidebarDrawer } from "@/components/ExploreSidebar";
-import MemoFilters from "@/components/MemoFilters";
import MemoView from "@/components/MemoView";
import MobileHeader from "@/components/MobileHeader";
import PagedMemoList from "@/components/PagedMemoList";
@@ -13,7 +12,7 @@ import { Memo } from "@/types/proto/api/v1/memo_service";
import { cn } from "@/utils";
const Explore = () => {
- const { md } = useResponsiveWidth();
+ const { md, lg } = useResponsiveWidth();
const user = useCurrentUser();
const memoFilterStore = useMemoFilterStore();
@@ -50,15 +49,25 @@ const Explore = () => {
}, [user, memoFilterStore.filters, memoFilterStore.orderByTimeAsc]);
return (
-
+
{!md && (
)}
-
-
-
+
+ {md && (
+
+
+
+ )}
+
}
@@ -76,11 +85,6 @@ const Explore = () => {
/>
- {md && (
-
-
-
- )}
);
diff --git a/web/src/pages/Home.tsx b/web/src/pages/Home.tsx
index baadaacc..7ef68802 100644
--- a/web/src/pages/Home.tsx
+++ b/web/src/pages/Home.tsx
@@ -2,7 +2,6 @@ import dayjs from "dayjs";
import { useMemo } from "react";
import { HomeSidebar, HomeSidebarDrawer } from "@/components/HomeSidebar";
import MemoEditor from "@/components/MemoEditor";
-import MemoFilters from "@/components/MemoFilters";
import MemoView from "@/components/MemoView";
import MobileHeader from "@/components/MobileHeader";
import PagedMemoList from "@/components/PagedMemoList";
@@ -14,7 +13,7 @@ import { Memo } from "@/types/proto/api/v1/memo_service";
import { cn } from "@/utils";
const Home = () => {
- const { md } = useResponsiveWidth();
+ const { md, lg } = useResponsiveWidth();
const user = useCurrentUser();
const userStore = useUserStore();
const memoFilterStore = useMemoFilterStore();
@@ -53,16 +52,26 @@ const Home = () => {
}, [user, memoFilterStore.filters, memoFilterStore.orderByTimeAsc]);
return (
-
+
{!md && (
)}
-
-
+
+ {md && (
+
+
+
+ )}
+
-
}
@@ -83,11 +92,6 @@ const Home = () => {
/>
- {md && (
-
-
-
- )}
);