feat: redirect to index after add account

lumehq · May 29, 2024 · 70c5143 · 70c5143
1 parent 41b66b1
commit 70c5143
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 23 deletions.
diff --git a/...2/src/routes/auth/new/$account.backup.tsx → ...ktop2/src/routes/auth/$account.backup.tsx b/...2/src/routes/auth/new/$account.backup.tsx → ...ktop2/src/routes/auth/$account.backup.tsx
@@ -9,7 +9,7 @@ import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { toast } from "sonner";
 
-export const Route = createFileRoute("/auth/new/$account/backup")({
+export const Route = createFileRoute("/auth/$account/backup")({
 	component: Screen,
 });
 
@@ -33,8 +33,7 @@ function Screen() {
 				}
 
 				return navigate({
-					to: "/auth/$account/settings",
-					params: { account },
+					to: "/auth/settings",
 				});
 			}
 

diff --git a/apps/desktop2/src/routes/auth/new/profile.tsx b/apps/desktop2/src/routes/auth/new/profile.tsx
@@ -45,7 +45,7 @@ function Screen() {
 
 				if (eventId) {
 					navigate({
-						to: "/auth/new/$account/backup",
+						to: "/auth/$account/backup",
 						params: { account: account.npub },
 						replace: true,
 					});

diff --git a/apps/desktop2/src/routes/auth/privkey.lazy.tsx b/apps/desktop2/src/routes/auth/privkey.lazy.tsx
@@ -28,8 +28,7 @@ function Screen() {
 
 			if (npub) {
 				navigate({
-					to: "/auth/$account/settings",
-					params: { account: npub },
+					to: "/auth/settings",
 					replace: true,
 				});
 			}

diff --git a/apps/desktop2/src/routes/auth/remote.lazy.tsx b/apps/desktop2/src/routes/auth/remote.lazy.tsx
@@ -27,8 +27,7 @@ function Screen() {
 
 			if (npub) {
 				navigate({
-					to: "/auth/$account/settings",
-					params: { account: npub },
+					to: "/auth/settings",
 					replace: true,
 				});
 			}

diff --git a/...op2/src/routes/auth/$account.settings.tsx → apps/desktop2/src/routes/auth/settings.tsx b/...op2/src/routes/auth/$account.settings.tsx → apps/desktop2/src/routes/auth/settings.tsx
@@ -8,7 +8,7 @@ import { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { toast } from "sonner";
 
-export const Route = createFileRoute("/auth/$account/settings")({
+export const Route = createFileRoute("/auth/settings")({
 	beforeLoad: async () => {
 		const settings = await NostrQuery.getSettings();
 		return { settings };
@@ -18,14 +18,14 @@ export const Route = createFileRoute("/auth/$account/settings")({
 });
 
 function Screen() {
-	const navigate = Route.useNavigate();
-	const { account } = Route.useParams();
 	const { settings } = Route.useRouteContext();
 	const { t } = useTranslation();
 
 	const [newSettings, setNewSettings] = useState(settings);
 	const [loading, setLoading] = useState(false);
 
+	const navigate = Route.useNavigate();
+
 	const toggleNofitication = async () => {
 		await requestPermission();
 		setNewSettings((prev) => ({
@@ -72,8 +72,7 @@ function Screen() {
 
 			if (eventId) {
 				return navigate({
-					to: "/$account/home",
-					params: { account },
+					to: "/",
 					replace: true,
 				});
 			}

diff --git a/packages/system/src/query.ts b/packages/system/src/query.ts
@@ -236,31 +236,28 @@ export class NostrQuery {
 	}
 
 	static async getColumns() {
+		const systemPath = "resources/system_columns.json";
+		const resourcePath = await resolveResource(systemPath);
+		const resourceFile = await readTextFile(resourcePath);
+		const systemColumns: LumeColumn[] = JSON.parse(resourceFile);
 		const query = await commands.getNstore(NSTORE_KEYS.columns);
 
 		if (query.status === "ok") {
 			const columns: LumeColumn[] = query.data ? JSON.parse(query.data) : [];
 
 			if (columns.length < 1) {
-				const systemPath = "resources/system_columns.json";
-				const resourcePath = await resolveResource(systemPath);
-				const resourceFile = await readTextFile(resourcePath);
-				const systemColumns: LumeColumn[] = JSON.parse(resourceFile);
-
 				return systemColumns;
 			}
 
 			return columns;
 		} else {
-			return [];
+			return systemColumns;
 		}
 	}
 
 	static async setColumns(columns: LumeColumn[]) {
-		const query = await commands.setNstore(
-			NSTORE_KEYS.columns,
-			JSON.stringify(columns),
-		);
+		const content = JSON.stringify(columns);
+		const query = await commands.setNstore(NSTORE_KEYS.columns, content);
 
 		if (query.status === "ok") {
 			return query.data;