Merge branch 'main' into lat-long-input

web/src/components/MemosLogo.tsx

@@ -8,7 +8,7 @@ interface Props {
   collapsed?: boolean;
 }
 
-const BrandBanner = observer((props: Props) => {
+const MemosLogo = observer((props: Props) => {
   const { collapsed } = props;
   const workspaceGeneralSetting = workspaceStore.state.generalSetting;
   const title = workspaceGeneralSetting.customProfile?.title || "Memos";
@@ -24,4 +24,4 @@ const BrandBanner = observer((props: Props) => {
   );
 });
 
-export default BrandBanner;
+export default MemosLogo;

web/src/components/Navigation.tsx

@@ -8,8 +8,8 @@ import { cn } from "@/lib/utils";
 import { Routes } from "@/router";
 import { userStore } from "@/store";
 import { useTranslate } from "@/utils/i18n";
-import BrandBanner from "./BrandBanner";
-import UserBanner from "./UserBanner";
+import MemosLogo from "./MemosLogo";
+import UserMenu from "./UserMenu";
 
 interface NavLinkItem {
   id: string;
@@ -67,7 +67,7 @@ const Navigation = observer((props: Props) => {
     <header className={cn("w-full h-full overflow-auto flex flex-col justify-between items-start gap-4 hide-scrollbar", className)}>
       <div className="w-full px-1 py-1 flex flex-col justify-start items-start space-y-2 overflow-auto overflow-x-hidden hide-scrollbar shrink">
         <NavLink className="mb-3 cursor-default" to={currentUser ? Routes.ROOT : Routes.EXPLORE}>
-          <BrandBanner collapsed={collapsed} />
+          <MemosLogo collapsed={collapsed} />
         </NavLink>
         {navLinks.map((navLink) => (
           <NavLink
@@ -105,7 +105,7 @@ const Navigation = observer((props: Props) => {
       </div>
       {currentUser && (
         <div className={cn("w-full flex flex-col justify-end", props.collapsed ? "items-center" : "items-start pl-3")}>
-          <UserBanner collapsed={collapsed} />
+          <UserMenu collapsed={collapsed} />
         </div>
       )}
     </header>

web/src/components/UserMenu.tsx

@@ -12,7 +12,7 @@ interface Props {
   collapsed?: boolean;
 }
 
-const UserBanner = (props: Props) => {
+const UserMenu = (props: Props) => {
   const { collapsed } = props;
   const t = useTranslate();
   const navigateTo = useNavigateTo();
@@ -20,6 +20,21 @@ const UserBanner = (props: Props) => {
 
   const handleSignOut = async () => {
     await authServiceClient.deleteSession({});
+
+    // Clear user-specific localStorage items (e.g., drafts)
+    // Preserve app-wide settings like theme
+    const keysToPreserve = ["memos-theme", "tag-view-as-tree", "tag-tree-auto-expand", "viewStore"];
+    const keysToRemove: string[] = [];
+
+    for (let i = 0; i < localStorage.length; i++) {
+      const key = localStorage.key(i);
+      if (key && !keysToPreserve.includes(key)) {
+        keysToRemove.push(key);
+      }
+    }
+
+    keysToRemove.forEach((key) => localStorage.removeItem(key));
+
     window.location.href = Routes.AUTH;
   };
 
@@ -65,4 +80,4 @@ const UserBanner = (props: Props) => {
   );
 };
 
-export default UserBanner;
+export default UserMenu;