-
- {list.map((item: { pubkey: string }, index: Key) => (
-
);
}
diff --git a/src/onboarding/pages/create/step-3/index.page.tsx b/src/onboarding/pages/create/step-3/index.page.tsx
new file mode 100644
index 00000000..e04aea02
--- /dev/null
+++ b/src/onboarding/pages/create/step-3/index.page.tsx
@@ -0,0 +1,177 @@
+import User from '@lume/onboarding/components/user';
+import { WRITEONLY_RELAYS } from '@lume/stores/constants';
+import { onboardingAtom } from '@lume/stores/onboarding';
+import { createAccount, createPleb } from '@lume/utils/storage';
+import { arrayToNIP02 } from '@lume/utils/transform';
+
+import { CheckCircle } from 'iconoir-react';
+import { useAtom } from 'jotai';
+import { RelayPool } from 'nostr-relaypool';
+import { getEventHash, signEvent } from 'nostr-tools';
+import { 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 [loading, setLoading] = useState(false);
+ const [follows, setFollows] = useState([]);
+ const [onboarding] = useAtom(onboardingAtom);
+
+ // toggle follow state
+ const toggleFollow = (pubkey: string) => {
+ const arr = follows.includes(pubkey) ? follows.filter((i) => i !== pubkey) : [...follows, pubkey];
+ setFollows(arr);
+ };
+
+ const broadcastAccount = () => {
+ const pool = new RelayPool(WRITEONLY_RELAYS);
+ // build event
+ const event: any = {
+ content: JSON.stringify(onboarding.metadata),
+ created_at: Math.floor(Date.now() / 1000),
+ kind: 0,
+ pubkey: onboarding.pubkey,
+ tags: [],
+ };
+ event.id = getEventHash(event);
+ event.sig = signEvent(event, onboarding.privkey);
+ // broadcast
+ pool.publish(event, WRITEONLY_RELAYS);
+ };
+
+ const broadcastContacts = () => {
+ const pool = new RelayPool(WRITEONLY_RELAYS);
+ const nip02 = arrayToNIP02(follows);
+ // build event
+ const event: any = {
+ content: '',
+ created_at: Math.floor(Date.now() / 1000),
+ kind: 3,
+ pubkey: onboarding.pubkey,
+ tags: nip02,
+ };
+ event.id = getEventHash(event);
+ event.sig = signEvent(event, onboarding.privkey);
+ // broadcast
+ pool.publish(event, WRITEONLY_RELAYS);
+ };
+
+ // save follows to database then broadcast
+ const submit = async () => {
+ setLoading(true);
+
+ // insert to database
+ createAccount(onboarding.pubkey, onboarding.privkey, onboarding.metadata, arrayToNIP02(follows), 1)
+ .then((res) => {
+ if (res) {
+ for (const tag of follows) {
+ fetch(`https://rbr.bio/${tag}/metadata.json`)
+ .then((data) => data.json())
+ .then((data) => createPleb(tag, data ?? ''));
+ }
+ broadcastAccount();
+ broadcastContacts();
+ setTimeout(() => navigate('/', { overwriteLastHistoryEntry: true }), 2000);
+ } else {
+ console.error();
+ }
+ })
+ .catch(console.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/onboarding/pages/import/step-2/index.page.tsx b/src/onboarding/pages/import/step-2/index.page.tsx
index 5848289b..f48e6d6a 100644
--- a/src/onboarding/pages/import/step-2/index.page.tsx
+++ b/src/onboarding/pages/import/step-2/index.page.tsx
@@ -1,23 +1,23 @@
import { DEFAULT_AVATAR, READONLY_RELAYS } from '@lume/stores/constants';
import { onboardingAtom } from '@lume/stores/onboarding';
import { shortenKey } from '@lume/utils/shortenKey';
+import { createAccount, createPleb } from '@lume/utils/storage';
+import { nip02ToArray } from '@lume/utils/transform';
import { useAtom } from 'jotai';
import { RelayPool } from 'nostr-relaypool';
import { getPublicKey } from 'nostr-tools';
-import { useMemo } from 'react';
+import { useMemo, useState } from 'react';
import useSWRSubscription from 'swr/subscription';
+import { navigate } from 'vite-plugin-ssr/client/router';
export function Page() {
+ const [loading, setLoading] = useState(false);
const [onboarding, setOnboarding] = useAtom(onboardingAtom);
const pubkey = useMemo(() => (onboarding.privkey ? getPublicKey(onboarding.privkey) : ''), [onboarding.privkey]);
- const submit = () => {
- console.log('click');
- };
-
const { data: user, error } = useSWRSubscription(
- pubkey
+ pubkey && !loading
? [
{
kinds: [0, 3],
@@ -37,7 +37,7 @@ export function Page() {
setOnboarding((prev) => ({ ...prev, metadata: event.content }));
break;
case 3:
- console.log(event);
+ setOnboarding((prev) => ({ ...prev, follows: nip02ToArray(event.tags) }));
break;
default:
break;
@@ -50,18 +50,47 @@ export function Page() {
}
);
+ const submit = () => {
+ // show loading indicator
+ setLoading(true);
+
+ // insert to database
+ createAccount(pubkey, onboarding.privkey, onboarding.metadata, onboarding.follows, 1)
+ .then((res) => {
+ if (res) {
+ for (const tag of onboarding.follows) {
+ fetch(`https://rbr.bio/${tag[1]}/metadata.json`)
+ .then((data) => data.json())
+ .then((data) => createPleb(tag[1], data ?? ''));
+ }
+ setTimeout(() => navigate('/', { overwriteLastHistoryEntry: true }), 2000);
+ } else {
+ console.error();
+ }
+ })
+ .catch(console.error);
+ };
+
return (
-
Continue with
+ {loading ? 'Creating...' : 'Continue with'}
{error &&
Failed to load profile
}
{!user ? (
-
+
) : (
-
+
![]()
submit()}
- className="w-full transform rounded-lg bg-fuchsia-500 px-3.5 py-2.5 font-medium text-white shadow-button hover:bg-fuchsia-600 active:translate-y-1 disabled:cursor-not-allowed disabled:opacity-70"
+ className="inline-flex h-10 w-full transform items-center justify-center rounded-lg bg-fuchsia-500 px-3.5 font-medium text-white shadow-button hover:bg-fuchsia-600 active:translate-y-1 disabled:cursor-not-allowed disabled:opacity-70"
>
-
Continue →
+ {loading ? (
+
+ ) : (
+
Continue →
+ )}
)}
diff --git a/src/shared/multiAccounts/index.tsx b/src/shared/multiAccounts/index.tsx
index 0000b916..da5eda70 100644
--- a/src/shared/multiAccounts/index.tsx
+++ b/src/shared/multiAccounts/index.tsx
@@ -1,9 +1,9 @@
import { AccountContext } from '@lume/shared/accountProvider';
+import LumeIcon from '@lume/shared/icons/lume';
import { ActiveAccount } from '@lume/shared/multiAccounts/activeAccount';
import { InactiveAccount } from '@lume/shared/multiAccounts/inactiveAccount';
import { APP_VERSION } from '@lume/stores/constants';
-import LumeSymbol from '@assets/icons/Lume';
import { Plus } from 'iconoir-react';
import { useContext } from 'react';
@@ -24,7 +24,7 @@ export default function MultiAccounts() {
href="/explore"
className="group relative flex h-11 w-11 shrink cursor-pointer items-center justify-center rounded-lg bg-zinc-900 hover:bg-zinc-800"
>
-
+
{accounts.map((account: { pubkey: string }) => {
if (account.pubkey === activeAccount.pubkey) {
diff --git a/src/utils/storage.tsx b/src/utils/storage.tsx
index 829cdc57..bbeb06f8 100644
--- a/src/utils/storage.tsx
+++ b/src/utils/storage.tsx
@@ -16,7 +16,7 @@ export async function connect(): Promise
{
export async function getActiveAccount() {
const db = await connect();
// #TODO: check is_active == true
- const result = await db.select(`SELECT * FROM accounts LIMIT 1;`);
+ const result = await db.select(`SELECT * FROM accounts WHERE is_active = 1 LIMIT 1;`);
return result[0];
}
@@ -27,13 +27,18 @@ export async function getAccounts() {
}
// create account
-export async function createAccount(pubkey: string, privkey: string, metadata: string) {
+export async function createAccount(
+ pubkey: string,
+ privkey: string,
+ metadata: string,
+ follows?: string[][],
+ is_active?: number
+) {
const db = await connect();
- return await db.execute('INSERT OR IGNORE INTO accounts (pubkey, privkey, metadata) VALUES (?, ?, ?);', [
- pubkey,
- privkey,
- metadata,
- ]);
+ return await db.execute(
+ 'INSERT OR IGNORE INTO accounts (pubkey, privkey, metadata, follows, is_active) VALUES (?, ?, ?, ?, ?);',
+ [pubkey, privkey, metadata, follows || '', is_active || 0]
+ );
}
// update account
+