fix onboarding pages

This commit is contained in:
Ren Amamiya
2023-05-15 08:02:55 +07:00
parent becf24cbb5
commit 2b4d11182a
9 changed files with 30 additions and 11 deletions

View File

@@ -15,6 +15,7 @@
"dependencies": { "dependencies": {
"@floating-ui/react": "^0.23.1", "@floating-ui/react": "^0.23.1",
"@headlessui/react": "^1.7.14", "@headlessui/react": "^1.7.14",
"@nostr-connect/connect": "^0.4.0",
"@tanstack/react-query": "^4.29.5", "@tanstack/react-query": "^4.29.5",
"@tanstack/react-virtual": "3.0.0-beta.54", "@tanstack/react-virtual": "3.0.0-beta.54",
"@tauri-apps/api": "^1.3.0", "@tauri-apps/api": "^1.3.0",

19
pnpm-lock.yaml generated
View File

@@ -7,6 +7,9 @@ dependencies:
'@headlessui/react': '@headlessui/react':
specifier: ^1.7.14 specifier: ^1.7.14
version: 1.7.14(react-dom@18.2.0)(react@18.2.0) version: 1.7.14(react-dom@18.2.0)(react@18.2.0)
'@nostr-connect/connect':
specifier: ^0.4.0
version: 0.4.0(react@18.2.0)
'@tanstack/react-query': '@tanstack/react-query':
specifier: ^4.29.5 specifier: ^4.29.5
version: 4.29.5(react-dom@18.2.0)(react@18.2.0) version: 4.29.5(react-dom@18.2.0)(react@18.2.0)
@@ -494,6 +497,17 @@ packages:
fastq: 1.15.0 fastq: 1.15.0
dev: true dev: true
/@nostr-connect/connect@0.4.0(react@18.2.0):
resolution: {integrity: sha512-N8ubuLQb85veXK35XGlt+vI9JljhODKj3NRMfUTFuA3kNDpzW8ZRtGzIAPifrL9uZ8VNjAaU5fa7lMOHpMca0w==}
engines: {node: '>=10'}
peerDependencies:
react: '>=16'
dependencies:
events: 3.3.0
nostr-tools: 1.10.1
react: 18.2.0
dev: false
/@polka/url@1.0.0-next.21: /@polka/url@1.0.0-next.21:
resolution: {integrity: sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==} resolution: {integrity: sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g==}
dev: true dev: true
@@ -1306,6 +1320,11 @@ packages:
engines: {node: '>=12'} engines: {node: '>=12'}
dev: false dev: false
/events@3.3.0:
resolution: {integrity: sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==}
engines: {node: '>=0.8.x'}
dev: false
/execa@7.1.1: /execa@7.1.1:
resolution: {integrity: sha512-wH0eMf/UXckdUYnO21+HDztteVv05rq2GXksxT4fCGeHkBhw1DROXh40wcjMcRqDOWE7iPJ4n3M7e2+YFP+76Q==} resolution: {integrity: sha512-wH0eMf/UXckdUYnO21+HDztteVv05rq2GXksxT4fCGeHkBhw1DROXh40wcjMcRqDOWE7iPJ4n3M7e2+YFP+76Q==}
engines: {node: ^14.18.0 || ^16.14.0 || >=18.0.0} engines: {node: ^14.18.0 || ^16.14.0 || >=18.0.0}

View File

@@ -24,7 +24,7 @@ export function LayoutOnboarding({ children }: { children: React.ReactNode }) {
<div className="flex h-screen w-full flex-col"> <div className="flex h-screen w-full flex-col">
<div <div
data-tauri-drag-region data-tauri-drag-region
className="relative h-11 shrink-0 border border-zinc-100 bg-white dark:border-zinc-900 dark:bg-black" className="relative h-9 shrink-0 border border-zinc-100 bg-white dark:border-zinc-900 dark:bg-black"
> >
<div <div
data-tauri-drag-region data-tauri-drag-region

View File

@@ -28,7 +28,7 @@ export function Page() {
const submit = () => { const submit = () => {
setOnboarding((prev) => ({ ...prev, pubkey: pubkey, privkey: privkey })); setOnboarding((prev) => ({ ...prev, pubkey: pubkey, privkey: privkey }));
navigate("/auth/create/step-2"); navigate("/app/auth/create/step-2");
}; };
return ( return (

View File

@@ -32,7 +32,7 @@ export function Page() {
const onSubmit = (data: any) => { const onSubmit = (data: any) => {
setLoading(true); setLoading(true);
setOnboarding((prev) => ({ ...prev, metadata: data })); setOnboarding((prev) => ({ ...prev, metadata: data }));
navigate("/auth/create/step-3"); navigate("/app/auth/create/step-3");
}; };
useEffect(() => { useEffect(() => {

View File

@@ -43,7 +43,7 @@ export function Page() {
if (typeof getPublicKey(privkey) === "string") { if (typeof getPublicKey(privkey) === "string") {
setOnboardingPrivkey((prev) => ({ ...prev, privkey: privkey })); setOnboardingPrivkey((prev) => ({ ...prev, privkey: privkey }));
navigate("/auth/import/step-2"); navigate("/app/auth/import/step-2");
} }
} catch (error) { } catch (error) {
setError("key", { setError("key", {
@@ -63,10 +63,9 @@ export function Page() {
</div> </div>
<div className="flex flex-col gap-4"> <div className="flex flex-col gap-4">
<div> <div>
{/* #TODO: add function */}
<button <button
type="button" type="button"
className="inline-flex w-full transform items-center justify-center gap-1.5 rounded-lg bg-zinc-900 px-3.5 py-2.5 font-medium text-zinc-400 active:translate-y-1" className="inline-flex w-full transform items-center justify-center gap-1.5 rounded-lg bg-zinc-900 ring-1 ring-zinc-800 px-3.5 py-2.5 font-medium text-zinc-400 active:translate-y-1"
> >
<div className="inline-flex items-center rounded-md bg-zinc-400/10 px-2 py-0.5 text-xs font-medium ring-1 ring-inset ring-zinc-400/20"> <div className="inline-flex items-center rounded-md bg-zinc-400/10 px-2 py-0.5 text-xs font-medium ring-1 ring-inset ring-zinc-400/20">
<span className="bg-gradient-to-r from-fuchsia-300 via-orange-100 to-amber-300 bg-clip-text text-transparent"> <span className="bg-gradient-to-r from-fuchsia-300 via-orange-100 to-amber-300 bg-clip-text text-transparent">

View File

@@ -67,7 +67,7 @@ export function Page() {
.then((res) => { .then((res) => {
if (res) { if (res) {
for (const tag of onboarding.follows) { for (const tag of onboarding.follows) {
fetch(`https://us.rbr.bio/${tag[1]}/metadata.json`) fetch(`https://rbr.bio/${tag[1]}/metadata.json`)
.then((data) => data.json()) .then((data) => data.json())
.then((data) => createPleb(tag[1], data ?? "")); .then((data) => createPleb(tag[1], data ?? ""));
} }

View File

@@ -112,14 +112,14 @@ export function Page() {
</h1> </h1>
<div className="mt-4 flex flex-col items-center gap-1.5"> <div className="mt-4 flex flex-col items-center gap-1.5">
<a <a
href="/auth/create" href="/app/auth/create"
className="relative inline-flex h-14 w-64 items-center justify-center gap-2 rounded-full bg-zinc-900 px-6 text-lg font-medium ring-1 ring-zinc-800 hover:bg-zinc-800" className="relative inline-flex h-14 w-64 items-center justify-center gap-2 rounded-full bg-zinc-900 px-6 text-lg font-medium ring-1 ring-zinc-800 hover:bg-zinc-800"
> >
Create new key Create new key
<ArrowRightIcon width={20} height={20} /> <ArrowRightIcon width={20} height={20} />
</a> </a>
<a <a
href="/auth/import" href="/app/auth/import"
className="inline-flex h-14 w-64 items-center justify-center gap-2 rounded-full px-6 text-base font-medium text-zinc-300 hover:bg-zinc-800" className="inline-flex h-14 w-64 items-center justify-center gap-2 rounded-full px-6 text-base font-medium text-zinc-300 hover:bg-zinc-800"
> >
Login with private key Login with private key

View File

@@ -13,7 +13,7 @@ export function Page() {
}); });
if (!isLoading && !data) { if (!isLoading && !data) {
navigate("/auth", { overwriteLastHistoryEntry: true }); navigate("/app/auth", { overwriteLastHistoryEntry: true });
} }
if (!isLoading && data) { if (!isLoading && data) {
@@ -21,6 +21,6 @@ export function Page() {
} }
return ( return (
<div className="h-screen w-screen bg-zinc-50 text-zinc-900 dark:bg-black dark:text-white" /> <div className="h-screen w-screen bg-zinc-50 text-zinc-900 dark:bg-black dark:text-zinc-100" />
); );
} }