Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.
Go dockerfossgomarkdownmemomicroblognote-takingnotesopen-sourceown-your-datareactself-hostedsqlitetimeline
fix: BrandBanner to use NavLink (#4536)
Austin Pearcec4f094d22b35
diff --git a/web/src/components/BrandBanner.tsx b/web/src/components/BrandBanner.tsxindex 1c4746f30..443015ab1 100644--- a/web/src/components/BrandBanner.tsx+++ b/web/src/components/BrandBanner.tsx@@ -1,6 +1,3 @@-import useCurrentUser from "@/hooks/useCurrentUser";-import useNavigateTo from "@/hooks/useNavigateTo";-import { Routes } from "@/router";import { workspaceStore } from "@/store/v2";import { cn } from "@/utils";import UserAvatar from "./UserAvatar";@@ -12,18 +9,13 @@ interface Props {const BrandBanner = (props: Props) => {const { collapsed } = props;- const navigateTo = useNavigateTo();- const currentUser = useCurrentUser();const workspaceGeneralSetting = workspaceStore.state.generalSetting;const title = workspaceGeneralSetting.customProfile?.title || "Memos";const avatarUrl = workspaceGeneralSetting.customProfile?.logoUrl || "/full-logo.webp";return (<div className={cn("relative w-full h-auto shrink-0", props.className)}>- <div- className={cn("w-auto flex flex-row justify-start items-center text-gray-800 dark:text-gray-400", collapsed ? "px-1" : "px-3")}- onClick={() => navigateTo(currentUser ? Routes.ROOT : Routes.EXPLORE)}- >+ <div className={cn("w-auto flex flex-row justify-start items-center text-gray-800 dark:text-gray-400", collapsed ? "px-1" : "px-3")}><UserAvatar className="shrink-0" avatarUrl={avatarUrl} />{!collapsed && <span className="ml-2 text-lg font-medium text-slate-800 dark:text-gray-300 shrink truncate">{title}</span>}</div>diff --git a/web/src/components/Navigation.tsx b/web/src/components/Navigation.tsxindex 758a6d5a6..f760ba86c 100644--- a/web/src/components/Navigation.tsx+++ b/web/src/components/Navigation.tsx@@ -80,7 +80,9 @@ const Navigation = observer((props: Props) => {)}><div className="w-full px-1 py-1 flex flex-col justify-start items-start space-y-2 overflow-auto hide-scrollbar shrink">- <BrandBanner className="mb-2" collapsed={collapsed} />+ <NavLink className="mb-2" to={currentUser ? Routes.ROOT : Routes.EXPLORE}>+ <BrandBanner collapsed={collapsed} />+ </NavLink>{navLinks.map((navLink) => (<NavLinkclassName={({ isActive }) =>