reya/lume
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: routes

Browse Source
This commit is contained in:
reya
2024-06-19 14:22:45 +07:00
parent d14e609579
commit e1424b851c
4 changed files with 14 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
apps/desktop2/src/routes/auth/$account.backup.tsx
View File

@@ -32,10 +32,7 @@ function Screen() {
return toast.warning("You need to confirm before continue"); return toast.warning("You need to confirm before continue");
} }
return navigate({ navigate({ to: "/", replace: true });
to: "/auth/$account/settings",
params: { account },
});
} }
// start loading // start loading
@@ -65,7 +62,7 @@ function Screen() {
}; };
return ( return (
<div className="mx-auto flex h-full w-full flex-col items-center justify-center gap-6 px-5 xl:max-w-xl"> <div className="flex flex-col items-center justify-center w-full h-full gap-6 px-5 mx-auto xl:max-w-xl">
<div className="flex flex-col text-center"> <div className="flex flex-col text-center">
<h3 className="text-xl font-semibold">Backup your sign in keys</h3> <h3 className="text-xl font-semibold">Backup your sign in keys</h3>
<p className="text-neutral-700 dark:text-neutral-300"> <p className="text-neutral-700 dark:text-neutral-300">
@@ -73,7 +70,7 @@ function Screen() {
access to your account if you lose this key. access to your account if you lose this key.
</p> </p>
</div> </div>
<div className="flex w-full flex-col gap-5"> <div className="flex flex-col w-full gap-5">
<div className="flex flex-col gap-2"> <div className="flex flex-col gap-2">
<label htmlFor="passphase" className="font-medium"> <label htmlFor="passphase" className="font-medium">
Set a passphase to secure your key Set a passphase to secure your key
@@ -84,7 +81,7 @@ function Screen() {
type="password" type="password"
value={passphase} value={passphase}
onChange={(e) => setPassphase(e.target.value)} onChange={(e) => setPassphase(e.target.value)}
className="w-full h-11 rounded-lg border-transparent bg-neutral-100 px-3 placeholder:text-neutral-600 focus:border-blue-500 focus:ring-0 dark:bg-white/10 dark:placeholder:text-neutral-400" className="w-full px-3 border-transparent rounded-lg h-11 bg-neutral-100 placeholder:text-neutral-600 focus:border-blue-500 focus:ring-0 dark:bg-white/10 dark:placeholder:text-neutral-400"
/> />
</div> </div>
</div> </div>
@@ -100,12 +97,12 @@ function Screen() {
type="text" type="text"
value={displayNsec(key, 36)} value={displayNsec(key, 36)}
readOnly readOnly
className="w-full h-11 rounded-lg border-transparent bg-neutral-100 px-3 placeholder:text-neutral-600 focus:border-blue-500 focus:ring-0 dark:bg-white/10 dark:placeholder:text-neutral-400" className="w-full px-3 border-transparent rounded-lg h-11 bg-neutral-100 placeholder:text-neutral-600 focus:border-blue-500 focus:ring-0 dark:bg-white/10 dark:placeholder:text-neutral-400"
/> />
<button <button
type="button" type="button"
onClick={() => copyKey()} onClick={() => copyKey()}
className="inline-flex h-11 w-24 items-center justify-center rounded-lg bg-neutral-200 hover:bg-neutral-300 dark:bg-white/20 dark:hover:bg-white/30" className="inline-flex items-center justify-center w-24 rounded-lg h-11 bg-neutral-200 hover:bg-neutral-300 dark:bg-white/20 dark:hover:bg-white/30"
> >
{copied ? "Copied" : "Copy"} {copied ? "Copied" : "Copy"}
</button> </button>
@@ -120,7 +117,7 @@ function Screen() {
onCheckedChange={() => onCheckedChange={() =>
setConfirm((state) => ({ ...state, c1: !state.c1 })) setConfirm((state) => ({ ...state, c1: !state.c1 }))
} }
className="flex size-6 appearance-none items-center justify-center rounded-md bg-neutral-100 outline-none dark:bg-white/10 dark:hover:bg-white/20" className="flex items-center justify-center rounded-md outline-none appearance-none size-6 bg-neutral-100 dark:bg-white/10 dark:hover:bg-white/20"
id="confirm1" id="confirm1"
> >
<Checkbox.Indicator className="text-blue-500"> <Checkbox.Indicator className="text-blue-500">
@@ -140,7 +137,7 @@ function Screen() {
onCheckedChange={() => onCheckedChange={() =>
setConfirm((state) => ({ ...state, c2: !state.c2 })) setConfirm((state) => ({ ...state, c2: !state.c2 }))
} }
className="flex size-6 appearance-none items-center justify-center rounded-md bg-neutral-100 outline-none dark:bg-white/10 dark:hover:bg-white/20" className="flex items-center justify-center rounded-md outline-none appearance-none size-6 bg-neutral-100 dark:bg-white/10 dark:hover:bg-white/20"
id="confirm2" id="confirm2"
> >
<Checkbox.Indicator className="text-blue-500"> <Checkbox.Indicator className="text-blue-500">
@@ -160,7 +157,7 @@ function Screen() {
onCheckedChange={() => onCheckedChange={() =>
setConfirm((state) => ({ ...state, c3: !state.c3 })) setConfirm((state) => ({ ...state, c3: !state.c3 }))
} }
className="flex size-6 appearance-none items-center justify-center rounded-md bg-neutral-100 outline-none dark:bg-white/10 dark:hover:bg-white/20" className="flex items-center justify-center rounded-md outline-none appearance-none size-6 bg-neutral-100 dark:bg-white/10 dark:hover:bg-white/20"
id="confirm3" id="confirm3"
> >
<Checkbox.Indicator className="text-blue-500"> <Checkbox.Indicator className="text-blue-500">
@@ -183,7 +180,7 @@ function Screen() {
type="button" type="button"
onClick={() => submit()} onClick={() => submit()}
disabled={loading} disabled={loading}
className="inline-flex h-11 w-full shrink-0 items-center justify-center rounded-lg bg-blue-500 font-semibold text-white hover:bg-blue-600 disabled:opacity-50" className="inline-flex items-center justify-center w-full font-semibold text-white bg-blue-500 rounded-lg h-11 shrink-0 hover:bg-blue-600 disabled:opacity-50"
> >
{loading ? <Spinner /> : t("global.continue")} {loading ? <Spinner /> : t("global.continue")}
</button> </button>

8
apps/desktop2/src/routes/auth/privkey.lazy.tsx → apps/desktop2/src/routes/auth/import.lazy.tsx
View File

@@ -4,7 +4,7 @@ import { createLazyFileRoute } from "@tanstack/react-router";
import { useState } from "react"; import { useState } from "react";
import { toast } from "sonner"; import { toast } from "sonner";
export const Route = createLazyFileRoute("/auth/privkey")({ export const Route = createLazyFileRoute("/auth/import")({
component: Screen, component: Screen,
}); });
@@ -27,11 +27,7 @@ function Screen() {
const npub = await NostrAccount.saveAccount(key, password); const npub = await NostrAccount.saveAccount(key, password);
if (npub) { if (npub) {
navigate({ navigate({ to: "/", replace: true });
to: "/$account/home",
params: { account: npub },
replace: true,
});
} }
} catch (e) { } catch (e) {
setLoading(false); setLoading(false);

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

@@ -26,11 +26,7 @@ function Screen() {
const remoteAccount = await NostrAccount.connectRemoteAccount(uri); const remoteAccount = await NostrAccount.connectRemoteAccount(uri);
if (remoteAccount?.length) { if (remoteAccount?.length) {
return navigate({ navigate({ to: "/", replace: true });
to: "/$account/home",
params: { account: remoteAccount },
replace: true,
});
} }
} catch (e) { } catch (e) {
setLoading(false); setLoading(false);

2
apps/desktop2/src/routes/landing.lazy.tsx
View File

@@ -37,7 +37,7 @@ function Screen() {
</div> </div>
<div className="flex flex-col gap-1 pb-2.5"> <div className="flex flex-col gap-1 pb-2.5">
<Link <Link
to="/auth/privkey" to="/auth/import"
className="inline-flex items-center w-full gap-2 px-2 rounded-lg h-11 hover:bg-neutral-100 dark:hover:bg-white/10" className="inline-flex items-center w-full gap-2 px-2 rounded-lg h-11 hover:bg-neutral-100 dark:hover:bg-white/10"
> >
<div className="inline-flex items-center justify-center size-9"> <div className="inline-flex items-center justify-center size-9">