-
diff --git a/src/app/auth/pages/create/step-3/index.page.tsx b/src/app/auth/pages/create/step-3/index.page.tsx
index 43957980..77b9bf08 100644
--- a/src/app/auth/pages/create/step-3/index.page.tsx
+++ b/src/app/auth/pages/create/step-3/index.page.tsx
@@ -1,160 +1,62 @@
-import { User } from "@app/auth/components/user";
import { NDKEvent, NDKPrivateKeySigner } from "@nostr-dev-kit/ndk";
-import { CheckCircleIcon } from "@shared/icons";
+import { Button } from "@shared/button";
+import { LoaderIcon } from "@shared/icons";
import { RelayContext } from "@shared/relayProvider";
import { useActiveAccount } from "@stores/accounts";
-import { arrayToNIP02 } from "@utils/transform";
+import { Body, fetch } from "@tauri-apps/api/http";
import { useContext, useState } from "react";
import { navigate } from "vite-plugin-ssr/client/router";
-const initialList = [
- {
- pubkey: "82341f882b6eabcd2ba7f1ef90aad961cf074af15b9ef44a09f9d2a8fbfbe6a2",
- },
- {
- pubkey: "a341f45ff9758f570a21b000c17d4e53a3a497c8397f26c0e6d61e5acffc7a98",
- },
- {
- pubkey: "04c915daefee38317fa734444acee390a8269fe5810b2241e5e6dd343dfbecc9",
- },
- {
- pubkey: "c4eabae1be3cf657bc1855ee05e69de9f059cb7a059227168b80b89761cbc4e0",
- },
- {
- pubkey: "6e468422dfb74a5738702a8823b9b28168abab8655faacb6853cd0ee15deee93",
- },
- {
- pubkey: "e88a691e98d9987c964521dff60025f60700378a4879180dcbbb4a5027850411",
- },
- {
- pubkey: "3bf0c63fcb93463407af97a5e5ee64fa883d107ef9e558472c4eb9aaaefa459d",
- },
- {
- pubkey: "c49d52a573366792b9a6e4851587c28042fb24fa5625c6d67b8c95c8751aca15",
- },
- {
- pubkey: "e33fe65f1fde44c6dc17eeb38fdad0fceaf1cae8722084332ed1e32496291d42",
- },
- {
- pubkey: "84dee6e676e5bb67b4ad4e042cf70cbd8681155db535942fcc6a0533858a7240",
- },
- {
- pubkey: "703e26b4f8bc0fa57f99d815dbb75b086012acc24fc557befa310f5aa08d1898",
- },
- {
- pubkey: "bf2376e17ba4ec269d10fcc996a4746b451152be9031fa48e74553dde5526bce",
- },
- {
- pubkey: "4523be58d395b1b196a9b8c82b038b6895cb02b683d0c253a955068dba1facd0",
- },
- {
- pubkey: "c9b19ffcd43e6a5f23b3d27106ce19e4ad2df89ba1031dd4617f1b591e108965",
- },
- {
- pubkey: "c7dccba4fe4426a7b1ea239a5637ba40fab9862c8c86b3330fe65e9f667435f6",
- },
- {
- pubkey: "6e1534f56fc9e937e06237c8ba4b5662bcacc4e1a3cfab9c16d89390bec4fca3",
- },
- {
- pubkey: "50d94fc2d8580c682b071a542f8b1e31a200b0508bab95a33bef0855df281d63",
- },
- {
- pubkey: "3d2e51508699f98f0f2bdbe7a45b673c687fe6420f466dc296d90b908d51d594",
- },
- {
- pubkey: "6e3f51664e19e082df5217fd4492bb96907405a0b27028671dd7f297b688608c",
- },
- {
- pubkey: "2edbcea694d164629854a52583458fd6d965b161e3c48b57d3aff01940558884",
- },
- {
- pubkey: "3f770d65d3a764a9c5cb503ae123e62ec7598ad035d836e2a810f3877a745b24",
- },
- {
- pubkey: "eab0e756d32b80bcd464f3d844b8040303075a13eabc3599a762c9ac7ab91f4f",
- },
- {
- pubkey: "be1d89794bf92de5dd64c1e60f6a2c70c140abac9932418fee30c5c637fe9479",
- },
- {
- pubkey: "a5e93aef8e820cbc7ab7b6205f854b87aed4b48c5f6b30fbbeba5c99e40dcf3f",
- },
- {
- pubkey: "1989034e56b8f606c724f45a12ce84a11841621aaf7182a1f6564380b9c4276b",
- },
- {
- pubkey: "c48b5cced5ada74db078df6b00fa53fc1139d73bf0ed16de325d52220211dbd5",
- },
- {
- pubkey: "460c25e682fda7832b52d1f22d3d22b3176d972f60dcdc3212ed8c92ef85065c",
- },
- {
- pubkey: "7f3b464b9ff3623630485060cbda3a7790131c5339a7803bde8feb79a5e1b06a",
- },
- {
- pubkey: "b99dbca0184a32ce55904cb267b22e434823c97f418f36daf5d2dff0dd7b5c27",
- },
- {
- pubkey: "e9e4276490374a0daf7759fd5f475deff6ffb9b0fc5fa98c902b5f4b2fe3bba2",
- },
- {
- pubkey: "ea2e3c814d08a378f8a5b8faecb2884d05855975c5ca4b5c25e2d6f936286f14",
- },
- {
- pubkey: "ff04a0e6cd80c141b0b55825fed127d4532a6eecdb7e743a38a3c28bf9f44609",
- },
-];
-
export function Page() {
const ndk = useContext(RelayContext);
-
- const [account, updateFollows] = useActiveAccount((state: any) => [
+ const [account, tempProfile] = useActiveAccount((state: any) => [
state.account,
- state.updateFollows,
+ state.tempProfile,
]);
+
+ const [username, setUsername] = useState("");
const [loading, setLoading] = useState(false);
- const [follows, setFollows] = useState([]);
-
- // toggle follow state
- const toggleFollow = (pubkey: string) => {
- const arr = follows.includes(pubkey)
- ? follows.filter((i) => i !== pubkey)
- : [...follows, pubkey];
- setFollows(arr);
- };
-
- // save follows to database then broadcast
- const submit = async () => {
- setLoading(true);
+ const createNIP05 = async () => {
try {
- const tags = arrayToNIP02(follows);
- const signer = new NDKPrivateKeySigner(account.privkey);
- ndk.signer = signer;
+ setLoading(true);
- const event = new NDKEvent(ndk);
- // build event
- event.content = "";
- event.kind = 3;
- event.pubkey = account.pubkey;
- event.tags = tags;
- // publish event
- event.publish();
+ const response = await fetch("https://lume.nu/api/user-create", {
+ method: "POST",
+ timeout: 30,
+ headers: {
+ "Content-Type": "application/json; charset=utf-8",
+ },
+ body: Body.json({
+ username: username,
+ pubkey: account.pubkey,
+ lightningAddress: "",
+ }),
+ });
- // update account follows
- updateFollows(follows);
+ if (response.ok) {
+ const profile = { ...tempProfile, nip05: `${username}@lume.nu` };
- // redirect to step 3
- setTimeout(
- () =>
- navigate("/", {
- overwriteLastHistoryEntry: true,
- }),
- 2000,
- );
- } catch {
- console.log("error");
+ const signer = new NDKPrivateKeySigner(account.privkey);
+ ndk.signer = signer;
+
+ const event = new NDKEvent(ndk);
+ // build event
+ event.content = JSON.stringify(profile);
+ event.kind = 0;
+ event.pubkey = account.pubkey;
+ event.tags = [];
+ // publish event
+ event.publish();
+
+ // redirect to step 4
+ navigate("/app/auth/create/step-4", {
+ overwriteLastHistoryEntry: true,
+ });
+ }
+ } catch (error) {
+ setLoading(false);
+ console.error("Error:", error);
}
};
@@ -163,73 +65,36 @@ export function Page() {
- Personalized your newsfeed
+ Create your Lume ID
-
-
-
- Follow at least
-
- {follows.length}/10
- {" "}
- plebs
-
-
- {initialList.map((item: { pubkey: string }, index: number) => (
-
- ))}
-
+
+
+ setUsername(e.target.value)}
+ autoCapitalize="false"
+ autoCorrect="none"
+ spellCheck="false"
+ placeholder="satoshi"
+ className="relative w-full py-3 pl-3.5 !outline-none placeholder:text-zinc-500 bg-transparent text-zinc-100"
+ />
+
+ @lume.nu
+
- {follows.length >= 10 && (
-
- )}
+
diff --git a/src/app/auth/pages/create/step-4/index.page.tsx b/src/app/auth/pages/create/step-4/index.page.tsx
new file mode 100644
index 00000000..70741295
--- /dev/null
+++ b/src/app/auth/pages/create/step-4/index.page.tsx
@@ -0,0 +1,217 @@
+import { User } from "@app/auth/components/user";
+import { NDKEvent, NDKPrivateKeySigner } from "@nostr-dev-kit/ndk";
+import { CheckCircleIcon, LoaderIcon } from "@shared/icons";
+import { RelayContext } from "@shared/relayProvider";
+import { useActiveAccount } from "@stores/accounts";
+import { arrayToNIP02 } from "@utils/transform";
+import { useContext, useState } from "react";
+import { navigate } from "vite-plugin-ssr/client/router";
+
+const initialList = [
+ {
+ pubkey: "82341f882b6eabcd2ba7f1ef90aad961cf074af15b9ef44a09f9d2a8fbfbe6a2",
+ },
+ {
+ pubkey: "a341f45ff9758f570a21b000c17d4e53a3a497c8397f26c0e6d61e5acffc7a98",
+ },
+ {
+ pubkey: "04c915daefee38317fa734444acee390a8269fe5810b2241e5e6dd343dfbecc9",
+ },
+ {
+ pubkey: "c4eabae1be3cf657bc1855ee05e69de9f059cb7a059227168b80b89761cbc4e0",
+ },
+ {
+ pubkey: "6e468422dfb74a5738702a8823b9b28168abab8655faacb6853cd0ee15deee93",
+ },
+ {
+ pubkey: "e88a691e98d9987c964521dff60025f60700378a4879180dcbbb4a5027850411",
+ },
+ {
+ pubkey: "3bf0c63fcb93463407af97a5e5ee64fa883d107ef9e558472c4eb9aaaefa459d",
+ },
+ {
+ pubkey: "c49d52a573366792b9a6e4851587c28042fb24fa5625c6d67b8c95c8751aca15",
+ },
+ {
+ pubkey: "e33fe65f1fde44c6dc17eeb38fdad0fceaf1cae8722084332ed1e32496291d42",
+ },
+ {
+ pubkey: "84dee6e676e5bb67b4ad4e042cf70cbd8681155db535942fcc6a0533858a7240",
+ },
+ {
+ pubkey: "703e26b4f8bc0fa57f99d815dbb75b086012acc24fc557befa310f5aa08d1898",
+ },
+ {
+ pubkey: "bf2376e17ba4ec269d10fcc996a4746b451152be9031fa48e74553dde5526bce",
+ },
+ {
+ pubkey: "4523be58d395b1b196a9b8c82b038b6895cb02b683d0c253a955068dba1facd0",
+ },
+ {
+ pubkey: "c9b19ffcd43e6a5f23b3d27106ce19e4ad2df89ba1031dd4617f1b591e108965",
+ },
+ {
+ pubkey: "c7dccba4fe4426a7b1ea239a5637ba40fab9862c8c86b3330fe65e9f667435f6",
+ },
+ {
+ pubkey: "6e1534f56fc9e937e06237c8ba4b5662bcacc4e1a3cfab9c16d89390bec4fca3",
+ },
+ {
+ pubkey: "50d94fc2d8580c682b071a542f8b1e31a200b0508bab95a33bef0855df281d63",
+ },
+ {
+ pubkey: "3d2e51508699f98f0f2bdbe7a45b673c687fe6420f466dc296d90b908d51d594",
+ },
+ {
+ pubkey: "6e3f51664e19e082df5217fd4492bb96907405a0b27028671dd7f297b688608c",
+ },
+ {
+ pubkey: "2edbcea694d164629854a52583458fd6d965b161e3c48b57d3aff01940558884",
+ },
+ {
+ pubkey: "3f770d65d3a764a9c5cb503ae123e62ec7598ad035d836e2a810f3877a745b24",
+ },
+ {
+ pubkey: "eab0e756d32b80bcd464f3d844b8040303075a13eabc3599a762c9ac7ab91f4f",
+ },
+ {
+ pubkey: "be1d89794bf92de5dd64c1e60f6a2c70c140abac9932418fee30c5c637fe9479",
+ },
+ {
+ pubkey: "a5e93aef8e820cbc7ab7b6205f854b87aed4b48c5f6b30fbbeba5c99e40dcf3f",
+ },
+ {
+ pubkey: "1989034e56b8f606c724f45a12ce84a11841621aaf7182a1f6564380b9c4276b",
+ },
+ {
+ pubkey: "c48b5cced5ada74db078df6b00fa53fc1139d73bf0ed16de325d52220211dbd5",
+ },
+ {
+ pubkey: "460c25e682fda7832b52d1f22d3d22b3176d972f60dcdc3212ed8c92ef85065c",
+ },
+ {
+ pubkey: "7f3b464b9ff3623630485060cbda3a7790131c5339a7803bde8feb79a5e1b06a",
+ },
+ {
+ pubkey: "b99dbca0184a32ce55904cb267b22e434823c97f418f36daf5d2dff0dd7b5c27",
+ },
+ {
+ pubkey: "e9e4276490374a0daf7759fd5f475deff6ffb9b0fc5fa98c902b5f4b2fe3bba2",
+ },
+ {
+ pubkey: "ea2e3c814d08a378f8a5b8faecb2884d05855975c5ca4b5c25e2d6f936286f14",
+ },
+ {
+ pubkey: "ff04a0e6cd80c141b0b55825fed127d4532a6eecdb7e743a38a3c28bf9f44609",
+ },
+];
+
+export function Page() {
+ const ndk = useContext(RelayContext);
+
+ const [loading, setLoading] = useState(false);
+ const [follows, setFollows] = useState([]);
+ const [account, updateFollows] = useActiveAccount((state: any) => [
+ state.account,
+ state.updateFollows,
+ ]);
+
+ // toggle follow state
+ const toggleFollow = (pubkey: string) => {
+ const arr = follows.includes(pubkey)
+ ? follows.filter((i) => i !== pubkey)
+ : [...follows, pubkey];
+ setFollows(arr);
+ };
+
+ // save follows to database then broadcast
+ const submit = async () => {
+ try {
+ setLoading(true);
+
+ const tags = arrayToNIP02(follows);
+ const signer = new NDKPrivateKeySigner(account.privkey);
+ ndk.signer = signer;
+
+ const event = new NDKEvent(ndk);
+ // build event
+ event.content = "";
+ event.kind = 3;
+ event.pubkey = account.pubkey;
+ event.tags = tags;
+ // publish event
+ event.publish();
+
+ // update account follows
+ updateFollows(follows);
+
+ // redirect to onboarding
+ setTimeout(
+ () =>
+ navigate("/app/onboarding", {
+ overwriteLastHistoryEntry: true,
+ }),
+ 2000,
+ );
+ } catch {
+ console.log("error");
+ }
+ };
+
+ return (
+
+
+
+
+ Personalized your newsfeed
+
+
+
+
+
+ Follow at least
+
+ {follows.length}/10
+ {" "}
+ plebs
+
+
+ {initialList.map((item: { pubkey: string }, index: number) => (
+
+ ))}
+
+
+ {follows.length >= 10 && (
+
+ )}
+
+
+
+ );
+}
diff --git a/src/app/auth/pages/import/index.page.tsx b/src/app/auth/pages/import/index.page.tsx
index 152a28c9..41dfb050 100644
--- a/src/app/auth/pages/import/index.page.tsx
+++ b/src/app/auth/pages/import/index.page.tsx
@@ -1,3 +1,4 @@
+import { LoaderIcon } from "@shared/icons";
import { useActiveAccount } from "@stores/accounts";
import { getPublicKey, nip19 } from "nostr-tools";
import { Resolver, useForm } from "react-hook-form";
@@ -67,50 +68,28 @@ export function Page() {
className="flex flex-col gap-3"
>
-
- {isSubmitting ? (
-
- ) : (
-
- )}
+
+
diff --git a/src/app/auth/pages/import/step-2/index.page.tsx b/src/app/auth/pages/import/step-2/index.page.tsx
index fcf1a350..0f3fc071 100644
--- a/src/app/auth/pages/import/step-2/index.page.tsx
+++ b/src/app/auth/pages/import/step-2/index.page.tsx
@@ -1,4 +1,5 @@
import { User } from "@app/auth/components/user";
+import { LoaderIcon } from "@shared/icons";
import { RelayContext } from "@shared/relayProvider";
import { useActiveAccount } from "@stores/accounts";
import { setToArray } from "@utils/transform";
@@ -28,9 +29,9 @@ export function Page() {
// update account follows in store
updateFollows(followsList);
- // redirect to home
+ // redirect to onboarding
setTimeout(
- () => navigate("/", { overwriteLastHistoryEntry: true }),
+ () => navigate("/app/onboarding", { overwriteLastHistoryEntry: true }),
2000,
);
} catch {
@@ -63,31 +64,12 @@ export function Page() {
diff --git a/src/app/auth/pages/index.page.tsx b/src/app/auth/pages/index.page.tsx
index 4a867302..3823b4c2 100644
--- a/src/app/auth/pages/index.page.tsx
+++ b/src/app/auth/pages/index.page.tsx
@@ -1,26 +1,52 @@
+import { ArrowRightCircleIcon } from "@shared/icons/arrowRightCircle";
+
export function Page() {
return (
-
-
-
- Preserve your freedom
-
-
+
+
+
+
+ Preserve your freedom
+
+
+ Protect your future
+
+
+ Stack bitcoin
+
+
+ Use nostr
+
+
+
-
+
+
);
}
diff --git a/src/app/index/pages/index.page.tsx b/src/app/index/pages/index.page.tsx
index 904a1180..1cd7fddc 100644
--- a/src/app/index/pages/index.page.tsx
+++ b/src/app/index/pages/index.page.tsx
@@ -9,19 +9,18 @@ export function Page() {
const lastLogin = useActiveAccount((state: any) => state.lastLogin);
useEffect(() => {
- if (!account) {
- navigate("/app/auth", { overwriteLastHistoryEntry: true });
- }
-
- if (account) {
- navigate("/app/prefetch", { overwriteLastHistoryEntry: true });
- }
if (account === null) {
fetchAccount();
}
if (lastLogin === null) {
fetchLastLogin();
}
+ if (!account) {
+ navigate("/app/auth", { overwriteLastHistoryEntry: true });
+ }
+ if (account) {
+ navigate("/app/prefetch", { overwriteLastHistoryEntry: true });
+ }
}, [fetchAccount, fetchLastLogin, account, lastLogin]);
return (
diff --git a/src/app/onboarding/_default.page.tsx b/src/app/onboarding/_default.page.tsx
new file mode 100644
index 00000000..bbc30709
--- /dev/null
+++ b/src/app/onboarding/_default.page.tsx
@@ -0,0 +1 @@
+export { LayoutOnboarding as Layout } from "./layout";
diff --git a/src/app/onboarding/layout.tsx b/src/app/onboarding/layout.tsx
new file mode 100644
index 00000000..3299484c
--- /dev/null
+++ b/src/app/onboarding/layout.tsx
@@ -0,0 +1,65 @@
+import { ArrowLeftIcon, ArrowRightIcon } from "@shared/icons";
+import useSWR from "swr";
+
+const fetcher = async () => {
+ const { platform } = await import("@tauri-apps/api/os");
+ return await platform();
+};
+
+export function LayoutOnboarding({ children }: { children: React.ReactNode }) {
+ const { data: platform } = useSWR("platform", fetcher);
+
+ const goBack = () => {
+ window.history.back();
+ };
+
+ const goForward = () => {
+ window.history.forward();
+ };
+
+ return (
+
+
+
+
+
+
+
+
+
+
+
{children}
+
+
+ );
+}
diff --git a/src/app/onboarding/pages/index.page.tsx b/src/app/onboarding/pages/index.page.tsx
new file mode 100644
index 00000000..dc7c0b41
--- /dev/null
+++ b/src/app/onboarding/pages/index.page.tsx
@@ -0,0 +1,106 @@
+import { NDKEvent, NDKPrivateKeySigner } from "@nostr-dev-kit/ndk";
+import { ArrowRightCircleIcon } from "@shared/icons/arrowRightCircle";
+import { RelayContext } from "@shared/relayProvider";
+import { User } from "@shared/user";
+import { useActiveAccount } from "@stores/accounts";
+import { dateToUnix } from "@utils/date";
+import { useContext, useEffect } from "react";
+import { navigate } from "vite-plugin-ssr/client/router";
+
+export function Page() {
+ const ndk = useContext(RelayContext);
+
+ const [account, fetchAccount] = useActiveAccount((state: any) => [
+ state.account,
+ state.fetch,
+ ]);
+
+ useEffect(() => {
+ if (account === null) {
+ fetchAccount();
+ }
+ }, [fetchAccount]);
+
+ const publish = async () => {
+ try {
+ const event = new NDKEvent(ndk);
+ const signer = new NDKPrivateKeySigner(account.privkey);
+ ndk.signer = signer;
+
+ event.content =
+ "Running Lume, fighting for better future, join us here: https://lume.nu";
+ event.created_at = dateToUnix();
+ event.pubkey = account.pubkey;
+ event.kind = 1;
+ event.tags = [];
+
+ // publish event
+ event.publish();
+
+ // redirect to home
+ setTimeout(
+ () => navigate("/", { overwriteLastHistoryEntry: true }),
+ 2000,
+ );
+ } catch (error) {
+ console.log(error);
+ }
+ };
+
+ return (
+
+
+
+
+ 👋 Hello, welcome you to Lume
+
+
+ You're a part of better future that we're fighting
+
+
+ If Lume gets your attention, please help us spread via button below
+
+
+
+
+
+
+ Skip for now
+
+
+
+
+ );
+}
diff --git a/src/app/onboarding/pages/step-1/index.page.tsx b/src/app/onboarding/pages/step-1/index.page.tsx
new file mode 100644
index 00000000..dc0e7654
--- /dev/null
+++ b/src/app/onboarding/pages/step-1/index.page.tsx
@@ -0,0 +1,11 @@
+export function Page() {
+ return (
+
+ );
+}
diff --git a/src/app/user/pages/index.page.tsx b/src/app/user/pages/index.page.tsx
index 5138d834..d7e70ed1 100644
--- a/src/app/user/pages/index.page.tsx
+++ b/src/app/user/pages/index.page.tsx
@@ -17,7 +17,7 @@ export function Page() {
const ndk = useContext(RelayContext);
const pageContext = usePageContext();
const searchParams: any = pageContext.urlParsed.search;
- const pubkey = searchParams.pubkey;
+ const pubkey = searchParams.pubkey || "";
const { user } = useProfile(pubkey);
const { data: userStats, error } = useSWR(
diff --git a/src/shared/avatarUploader.tsx b/src/shared/avatarUploader.tsx
index 02049407..8a92379b 100644
--- a/src/shared/avatarUploader.tsx
+++ b/src/shared/avatarUploader.tsx
@@ -1,5 +1,6 @@
import { createBlobFromFile } from "@utils/createBlobFromFile";
+import { LoaderIcon } from "./icons";
import { open } from "@tauri-apps/api/dialog";
import { Body, fetch } from "@tauri-apps/api/http";
import { useState } from "react";
@@ -54,30 +55,10 @@ export function AvatarUploader({ valueState }: { valueState: any }) {