From 413d8d82dfb8282562a40595bba60c92bef8a47d Mon Sep 17 00:00:00 2001 From: reya Date: Tue, 16 Apr 2024 15:28:38 +0700 Subject: [PATCH] feat: finish settings screen --- apps/desktop2/src/routes/__root.tsx | 3 +- apps/desktop2/src/routes/auth/settings.tsx | 2 +- apps/desktop2/src/routes/settings.tsx | 4 +- apps/desktop2/src/routes/settings/backup.tsx | 50 ++--- .../src/routes/settings/general.lazy.tsx | 5 - apps/desktop2/src/routes/settings/general.tsx | 159 +++++++++++++++ .../src/routes/settings/user.lazy.tsx | 5 - apps/desktop2/src/routes/settings/user.tsx | 186 ++++++++++++++++++ .../desktop2/src/routes/settings/zap.lazy.tsx | 18 +- packages/ark/src/ark.ts | 9 + src-tauri/src/main.rs | 1 + src-tauri/src/nostr/metadata.rs | 29 +++ src-tauri/src/tray.rs | 51 +++-- 13 files changed, 461 insertions(+), 61 deletions(-) delete mode 100644 apps/desktop2/src/routes/settings/general.lazy.tsx create mode 100644 apps/desktop2/src/routes/settings/general.tsx delete mode 100644 apps/desktop2/src/routes/settings/user.lazy.tsx create mode 100644 apps/desktop2/src/routes/settings/user.tsx diff --git a/apps/desktop2/src/routes/__root.tsx b/apps/desktop2/src/routes/__root.tsx index a4111c79..0ce9c48e 100644 --- a/apps/desktop2/src/routes/__root.tsx +++ b/apps/desktop2/src/routes/__root.tsx @@ -2,7 +2,7 @@ import { Outlet, createRootRouteWithContext } from "@tanstack/react-router"; import { type Ark } from "@lume/ark"; import { type QueryClient } from "@tanstack/react-query"; import { type Platform } from "@tauri-apps/plugin-os"; -import type { Account, Interests, Settings } from "@lume/types"; +import type { Account, Interests, Metadata, Settings } from "@lume/types"; import { Spinner } from "@lume/ui"; import { type Descendant } from "slate"; @@ -21,6 +21,7 @@ interface RouterContext { interests?: Interests; accounts?: Account[]; initialValue?: EditorElement[]; + profile?: Metadata; } export const Route = createRootRouteWithContext()({ diff --git a/apps/desktop2/src/routes/auth/settings.tsx b/apps/desktop2/src/routes/auth/settings.tsx index 3eccb622..16d7fa6c 100644 --- a/apps/desktop2/src/routes/auth/settings.tsx +++ b/apps/desktop2/src/routes/auth/settings.tsx @@ -82,7 +82,7 @@ function Screen() { setLoading(true); // publish settings - const eventId = await ark.set_settings(settings); + const eventId = await ark.set_settings(newSettings); if (eventId) { console.log("event_id: ", eventId); diff --git a/apps/desktop2/src/routes/settings.tsx b/apps/desktop2/src/routes/settings.tsx index 394e3c23..7351b963 100644 --- a/apps/desktop2/src/routes/settings.tsx +++ b/apps/desktop2/src/routes/settings.tsx @@ -97,9 +97,7 @@ function Screen() {
-
- -
+
); diff --git a/apps/desktop2/src/routes/settings/backup.tsx b/apps/desktop2/src/routes/settings/backup.tsx index 1b3e8832..bd0b2b89 100644 --- a/apps/desktop2/src/routes/settings/backup.tsx +++ b/apps/desktop2/src/routes/settings/backup.tsx @@ -30,15 +30,12 @@ function Screen() { const accounts = Route.useLoaderData(); return ( -
- {accounts.map((account, index) => ( -
-
- Account {index} -
+
+
+ {accounts.map((account) => ( -
- ))} + ))} +
); } @@ -66,7 +63,7 @@ function Account({ account }: { account: Account }) { }; return ( -
+
@@ -77,20 +74,29 @@ function Account({ account }: { account: Account }) {
-
- - + Private Key + +
+ + +