feat: polish

2024-01-16 14:49:00 +07:00
parent 939dfd9cc1
commit 6581ffb92b
24 changed files with 944 additions and 397 deletions
--- a/packages/ui/src/account/active.tsx
+++ b/packages/ui/src/account/active.tsx
@@ -1,45 +1,73 @@
 import { useArk, useProfile } from "@lume/ark";
-import { useNetworkStatus } from "@lume/utils";
+import { SettingsIcon } from "@lume/icons";
+import { cn, useNetworkStatus } from "@lume/utils";
 import * as Avatar from "@radix-ui/react-avatar";
+import * as DropdownMenu from "@radix-ui/react-dropdown-menu";
 import { minidenticon } from "minidenticons";
+import { useMemo } from "react";
 import { Link } from "react-router-dom";
-import { twMerge } from "tailwind-merge";
+import { Logout } from "./logout";

 export function ActiveAccount() {
 	const ark = useArk();
 	const isOnline = useNetworkStatus();
+	const svgURI = useMemo(
+		() =>
+			`data:image/svg+xml;utf8,${encodeURIComponent(
+				minidenticon(ark.account.pubkey, 90, 50),
+			)}`,
+		[],
+	);

 	const { user } = useProfile(ark.account.pubkey);

-	const svgURI = `data:image/svg+xml;utf8,${encodeURIComponent(
-		minidenticon(ark.account.pubkey, 90, 50),
-	)}`;
-
 	return (
-		<Link to="/settings/" className="relative inline-block">
-			<Avatar.Root>
-				<Avatar.Image
-					src={user?.picture || user?.image}
-					alt={ark.account.pubkey}
-					loading="lazy"
-					decoding="async"
-					style={{ contentVisibility: "auto" }}
-					className="aspect-square h-auto w-full rounded-xl object-cover"
-				/>
-				<Avatar.Fallback delayMs={150}>
-					<img
-						src={svgURI}
-						alt={ark.account.pubkey}
-						className="aspect-square h-auto w-full rounded-xl bg-black dark:bg-white"
+		<DropdownMenu.Root>
+			<DropdownMenu.Trigger asChild>
+				<div>
+					<Avatar.Root>
+						<Avatar.Image
+							src={user?.picture || user?.image}
+							alt={ark.account.pubkey}
+							loading="lazy"
+							decoding="async"
+							style={{ contentVisibility: "auto" }}
+							className="aspect-square h-auto w-full rounded-xl object-cover"
+						/>
+						<Avatar.Fallback delayMs={150}>
+							<img
+								src={svgURI}
+								alt={ark.account.pubkey}
+								className="aspect-square h-auto w-full rounded-xl bg-black dark:bg-white"
+							/>
+						</Avatar.Fallback>
+					</Avatar.Root>
+					<span
+						className={cn(
+							"absolute bottom-0 right-0 block h-2 w-2 rounded-full ring-2 ring-neutral-100 dark:ring-neutral-900",
+							isOnline ? "bg-teal-500" : "bg-red-500",
+						)}
 					/>
-				</Avatar.Fallback>
-			</Avatar.Root>
-			<span
-				className={twMerge(
-					"absolute bottom-0 right-0 block h-2 w-2 rounded-full ring-2 ring-neutral-100 dark:ring-neutral-900",
-					isOnline ? "bg-teal-500" : "bg-red-500",
-				)}
-			/>
-		</Link>
+				</div>
+			</DropdownMenu.Trigger>
+			<DropdownMenu.Portal>
+				<DropdownMenu.Content
+					side="right"
+					sideOffset={5}
+					className="flex w-[200px] p-2 flex-col overflow-hidden rounded-2xl bg-black/70 dark:bg-white/20 backdrop-blur-lg focus:outline-none"
+				>
+					<DropdownMenu.Item asChild>
+						<Link
+							to="/settings/"
+							className="inline-flex items-center gap-2 px-3 text-sm font-medium rounded-lg h-9 text-white/50 hover:bg-black/10 hover:text-white focus:outline-none dark:text-white/50 dark:hover:bg-white/10 dark:hover:text-white"
+						>
+							<SettingsIcon className="size-5" />
+							Settings
+						</Link>
+					</DropdownMenu.Item>
+					<Logout />
+				</DropdownMenu.Content>
+			</DropdownMenu.Portal>
+		</DropdownMenu.Root>
 	);
 }
--- a/packages/ui/src/account/logout.tsx
+++ b/packages/ui/src/account/logout.tsx
@@ -1,3 +1,4 @@
+import { LogoutIcon } from "@lume/icons";
 import { useStorage } from "@lume/storage";
 import * as AlertDialog from "@radix-ui/react-alert-dialog";
 import { useQueryClient } from "@tanstack/react-query";
@@ -30,8 +31,9 @@ export function Logout() {
 			<AlertDialog.Trigger asChild>
 				<button
 					type="button"
-					className="inline-flex h-10 items-center rounded-lg px-2 text-sm font-medium text-white hover:bg-blue-600 focus:outline-none"
+					className="inline-flex items-center gap-2 px-3 text-sm font-medium rounded-lg h-9 text-white/50 hover:bg-black/10 hover:text-white focus:outline-none dark:text-white/50 dark:hover:bg-white/10 dark:hover:text-white"
 				>
+					<LogoutIcon className="size-5" />
 					Logout
 				</button>
 			</AlertDialog.Trigger>
--- a/packages/ui/src/layouts/settings.tsx
+++ b/packages/ui/src/layouts/settings.tsx
@@ -1,42 +1,27 @@
 import {
 	AdvancedSettingsIcon,
 	InfoIcon,
-	NwcFilledIcon,
 	NwcIcon,
 	SecureIcon,
 	SettingsIcon,
 	UserIcon,
 } from "@lume/icons";
+import { cn } from "@lume/utils";
 import { NavLink, Outlet } from "react-router-dom";
-import { twMerge } from "tailwind-merge";

 export function SettingsLayout() {
 	return (
-		<div className="flex h-full min-h-0 w-full flex-col gap-8 overflow-y-auto">
-			<div className="flex h-24 w-full items-center justify-center border-b border-neutral-200 px-2 dark:border-neutral-900">
+		<div className="flex h-full min-h-0 w-full flex-col rounded-xl overflow-y-auto">
+			<div className="flex h-24 shrink-0 w-full items-center justify-center px-2 bg-white/50 backdrop-blur-xl dark:bg-black/50">
 				<div className="flex items-center gap-0.5">
 					<NavLink
-						to="/settings/"
 						end
+						to="/settings/"
 						className={({ isActive }) =>
-							twMerge(
-								"flex w-20 shrink-0 flex-col items-center justify-center rounded-lg px-2 py-2 text-neutral-700 hover:bg-neutral-100 dark:text-neutral-300 dark:hover:bg-neutral-900",
+							cn(
+								"flex w-20 shrink-0 flex-col gap-1 items-center justify-center rounded-lg px-2 py-2 text-neutral-700 hover:bg-neutral-100 dark:text-neutral-300 dark:hover:bg-neutral-900",
 								isActive
-									? "bg-neutral-100 text-blue-500 hover:bg-neutral-100 dark:bg-neutral-950 dark:hover:bg-neutral-900"
-									: "",
-							)
-						}
-					>
-						<UserIcon className="size-6" />
-						<p className="text-sm font-medium">User</p>
-					</NavLink>
-					<NavLink
-						to="/settings/general"
-						className={({ isActive }) =>
-							twMerge(
-								"flex w-20 shrink-0 flex-col items-center justify-center rounded-lg px-2 py-2 text-neutral-700 hover:bg-neutral-100 dark:text-neutral-300 dark:hover:bg-neutral-900",
-								isActive
-									? "bg-neutral-100 text-blue-500 hover:bg-neutral-100 dark:bg-neutral-950 dark:hover:bg-neutral-900"
+									? "bg-black/10 dark:bg-white/10 text-blue-500 hover:bg-black/20 dark:hover:bg-white/20"
 									: "",
 							)
 						}
@@ -44,13 +29,28 @@ export function SettingsLayout() {
 						<SettingsIcon className="size-6" />
 						<p className="text-sm font-medium">General</p>
 					</NavLink>
+					<NavLink
+						to="/settings/profile"
+						end
+						className={({ isActive }) =>
+							cn(
+								"flex w-20 shrink-0 flex-col gap-1 items-center justify-center rounded-lg px-2 py-2 text-neutral-700 hover:bg-black/10 dark:text-neutral-300 dark:hover:bg-white/10",
+								isActive
+									? "bg-black/10 dark:bg-white/10 text-blue-500 hover:bg-black/20 dark:hover:bg-white/20"
+									: "",
+							)
+						}
+					>
+						<UserIcon className="size-6" />
+						<p className="text-sm font-medium">User</p>
+					</NavLink>
 					<NavLink
 						to="/settings/nwc"
 						className={({ isActive }) =>
-							twMerge(
-								"flex w-20 shrink-0 flex-col items-center justify-center rounded-lg px-2 py-2 text-neutral-700 hover:bg-neutral-100 dark:text-neutral-300 dark:hover:bg-neutral-900",
+							cn(
+								"flex w-20 shrink-0 flex-col gap-1 items-center justify-center rounded-lg px-2 py-2 text-neutral-700 hover:bg-black/10 dark:text-neutral-300 dark:hover:bg-white/10",
 								isActive
-									? "bg-neutral-100 text-blue-500 hover:bg-neutral-100 dark:bg-neutral-950 dark:hover:bg-neutral-900"
+									? "bg-black/10 dark:bg-white/10 text-blue-500 hover:bg-black/20 dark:hover:bg-white/20"
 									: "",
 							)
 						}
@@ -61,10 +61,10 @@ export function SettingsLayout() {
 					<NavLink
 						to="/settings/backup"
 						className={({ isActive }) =>
-							twMerge(
-								"flex w-20 shrink-0 flex-col items-center justify-center rounded-lg px-2 py-2 text-neutral-700 hover:bg-neutral-100 dark:text-neutral-300 dark:hover:bg-neutral-900",
+							cn(
+								"flex w-20 shrink-0 flex-col gap-1 items-center justify-center rounded-lg px-2 py-2 text-neutral-700 hover:bg-black/10 dark:text-neutral-300 dark:hover:bg-white/10",
 								isActive
-									? "bg-neutral-100 text-blue-500 hover:bg-neutral-100 dark:bg-neutral-950 dark:hover:bg-neutral-900"
+									? "bg-black/10 dark:bg-white/10 text-blue-500 hover:bg-black/20 dark:hover:bg-white/20"
 									: "",
 							)
 						}
@@ -75,10 +75,10 @@ export function SettingsLayout() {
 					<NavLink
 						to="/settings/advanced"
 						className={({ isActive }) =>
-							twMerge(
-								"flex w-20 shrink-0 flex-col items-center justify-center rounded-lg px-2 py-2 text-neutral-700 hover:bg-neutral-100 dark:text-neutral-300 dark:hover:bg-neutral-900",
+							cn(
+								"flex w-20 shrink-0 flex-col gap-1 items-center justify-center rounded-lg px-2 py-2 text-neutral-700 hover:bg-black/10 dark:text-neutral-300 dark:hover:bg-white/10",
 								isActive
-									? "bg-neutral-100 text-blue-500 hover:bg-neutral-100 dark:bg-neutral-950 dark:hover:bg-neutral-900"
+									? "bg-black/10 dark:bg-white/10 text-blue-500 hover:bg-black/20 dark:hover:bg-white/20"
 									: "",
 							)
 						}
@@ -89,10 +89,10 @@ export function SettingsLayout() {
 					<NavLink
 						to="/settings/about"
 						className={({ isActive }) =>
-							twMerge(
-								"flex w-20 shrink-0 flex-col items-center justify-center rounded-lg px-2 py-2 text-neutral-700 hover:bg-neutral-100 dark:text-neutral-300 dark:hover:bg-neutral-900",
+							cn(
+								"flex w-20 shrink-0 flex-col gap-1 items-center justify-center rounded-lg px-2 py-2 text-neutral-700 hover:bg-black/10 dark:text-neutral-300 dark:hover:bg-white/10",
 								isActive
-									? "bg-neutral-100 text-blue-500 hover:bg-neutral-100 dark:bg-neutral-950 dark:hover:bg-neutral-900"
+									? "bg-black/10 dark:bg-white/10 text-blue-500 hover:bg-black/20 dark:hover:bg-white/20"
 									: "",
 							)
 						}
@@ -102,7 +102,9 @@ export function SettingsLayout() {
 					</NavLink>
 				</div>
 			</div>
-			<Outlet />
+			<div className="flex-1 py-6 min-h-0 overflow-y-auto bg-white shadow-[rgba(50,_50,_105,_0.15)_0px_2px_5px_0px,_rgba(0,_0,_0,_0.05)_0px_1px_1px_0px] dark:bg-black dark:shadow-none dark:ring-1 dark:ring-white/10">
+				<Outlet />
+			</div>
 		</div>
 	);
 }
--- a/packages/ui/src/navigation.tsx
+++ b/packages/ui/src/navigation.tsx
@@ -31,7 +31,7 @@ export function Navigation() {
 						className={cn(
 							"flex items-center justify-center h-auto w-full text-black aspect-square rounded-xl hover:text-white dark:text-white",
 							isEditorOpen
-								? "bg-blue-500"
+								? "bg-blue-500 text-white"
 								: "bg-black/5 hover:bg-blue-500 dark:bg-white/5 dark:hover:bg-blue-500",
 						)}
 					>
@@ -114,7 +114,7 @@ export function Navigation() {
 			</div>
 			<div className="flex flex-col">
 				<NavLink
-					to="/settings"
+					to="/settings/"
 					preventScrollReset={true}
 					className="inline-flex flex-col items-center justify-center"
 				>