feat: redirect to index after add account

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

View File

@ -9,7 +9,7 @@ import { useState } from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { toast } from "sonner"; import { toast } from "sonner";
export const Route = createFileRoute("/auth/new/$account/backup")({ export const Route = createFileRoute("/auth/$account/backup")({
component: Screen, component: Screen,
}); });
@ -33,8 +33,7 @@ function Screen() {
} }
return navigate({ return navigate({
to: "/auth/$account/settings", to: "/auth/settings",
params: { account },
}); });
} }

View File

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

View File

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

View File

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

View File

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

View File

@ -236,31 +236,28 @@ export class NostrQuery {
} }
static async getColumns() { 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); const query = await commands.getNstore(NSTORE_KEYS.columns);
if (query.status === "ok") { if (query.status === "ok") {
const columns: LumeColumn[] = query.data ? JSON.parse(query.data) : []; const columns: LumeColumn[] = query.data ? JSON.parse(query.data) : [];
if (columns.length < 1) { 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 systemColumns;
} }
return columns; return columns;
} else { } else {
return []; return systemColumns;
} }
} }
static async setColumns(columns: LumeColumn[]) { static async setColumns(columns: LumeColumn[]) {
const query = await commands.setNstore( const content = JSON.stringify(columns);
NSTORE_KEYS.columns, const query = await commands.setNstore(NSTORE_KEYS.columns, content);
JSON.stringify(columns),
);
if (query.status === "ok") { if (query.status === "ok") {
return query.data; return query.data;