highperfocused/lume
1
0
Fork 0
mirror of https://github.com/lumehq/lume.git synced 2025-03-26 01:31:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: redirect to index after add account

Browse Source
This commit is contained in:
reya 2024-05-29 14:41:33 +07:00
parent 41b66b18f5
commit 70c5143445
6 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/desktop2/src/routes/auth/new/$account.backup.tsx → apps/desktop2/src/routes/auth/$account.backup.tsx
View File

@ -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",
});
}

2
apps/desktop2/src/routes/auth/new/profile.tsx
View File

@ -45,7 +45,7 @@ function Screen() {
if (eventId) {
navigate({
to: "/auth/new/$account/backup",
to: "/auth/$account/backup",
params: { account: account.npub },
replace: true,
});

3
apps/desktop2/src/routes/auth/privkey.lazy.tsx
View File

@ -28,8 +28,7 @@ function Screen() {
if (npub) {
navigate({
to: "/auth/$account/settings",
params: { account: npub },
to: "/auth/settings",
replace: true,
});
}

3
apps/desktop2/src/routes/auth/remote.lazy.tsx
View File

@ -27,8 +27,7 @@ function Screen() {
if (npub) {
navigate({
to: "/auth/$account/settings",
params: { account: npub },
to: "/auth/settings",
replace: true,
});
}

9
apps/desktop2/src/routes/auth/$account.settings.tsx → apps/desktop2/src/routes/auth/settings.tsx
View File

@ -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,
});
}

17
packages/system/src/query.ts
View File

@ -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;