diff --git a/src/lib/stores/nostr.ts b/src/lib/stores/nostr.ts index bdad3de..887c2c3 100644 --- a/src/lib/stores/nostr.ts +++ b/src/lib/stores/nostr.ts @@ -1,11 +1,12 @@ import { writable } from 'svelte/store'; //import NDKSvelte from '@nostr-dev-kit/ndk-svelte'; import NDK from '@nostr-dev-kit/ndk'; +import { browser } from '$app/environment'; let relays; try { - relays = localStorage.getItem('relays'); + if (browser) relays = localStorage.getItem('relays'); } catch (e) { console.error(e); } diff --git a/src/lib/stores/sesson.ts b/src/lib/stores/sesson.ts index 46a6669..2d749b4 100644 --- a/src/lib/stores/sesson.ts +++ b/src/lib/stores/sesson.ts @@ -1,4 +1,4 @@ -import { get, writable } from 'svelte/store'; +import { writable } from 'svelte/store'; // import { ndk } from "$lib/stores/nostr"; // import type { NDKUser } from "@nostr-dev-kit/ndk"; diff --git a/src/lib/utils/login.ts b/src/lib/utils/login.ts index 0c6d223..f7dbb2a 100644 --- a/src/lib/utils/login.ts +++ b/src/lib/utils/login.ts @@ -11,14 +11,18 @@ import { bunkerNDK, ndk } from '$lib/stores/nostr'; import { currentUser } from '$lib/store'; import { loginState } from '$lib/stores/sesson'; import { get } from 'svelte/store'; +import { browser } from '$app/environment'; export type LoginMethod = 'none' | 'pk' | 'nip07' | 'nip46'; -let $ndk = get(ndk); -const $bunkerNDK = get(bunkerNDK); + +let $ndk: NDK; +const $bunkerNDK: NDK = get(bunkerNDK); + export async function login(method: LoginMethod, userPubkey?: string): Promise { console.debug(`logging in with ${method}`); let u: NDKUser | null | undefined; + $ndk = get(ndk); switch (method) { case 'none': @@ -67,7 +71,7 @@ async function pkSignin(key: string): Promise { } async function nip07Login(ndk: NDK): Promise { - const storedNpub = localStorage.getItem('pubkey'); + const storedNpub = browser ? localStorage.getItem('pubkey') : ''; let user: NDKUser | null = null; if (storedNpub) { @@ -80,8 +84,9 @@ async function nip07Login(ndk: NDK): Promise { try { ndk.signer = new NDKNip07Signer(); user = await ndk.signer?.blockUntilReady(); + user.ndk = ndk; + user.fetchProfile(); ndk.activeUser = user; - ndk.activeUser.fetchProfile(); user.ndk = ndk; console.debug('Nip07 Login user:', user); console.debug('NDK: ', ndk); diff --git a/src/routes/[id]/(profile)/+layout.svelte b/src/routes/[id]/(profile)/+layout.svelte new file mode 100644 index 0000000..d0a72f3 --- /dev/null +++ b/src/routes/[id]/(profile)/+layout.svelte @@ -0,0 +1,22 @@ + \ No newline at end of file diff --git a/src/routes/[id]/(profile)/+page.svelte b/src/routes/[id]/(profile)/+page.svelte new file mode 100644 index 0000000..d0a72f3 --- /dev/null +++ b/src/routes/[id]/(profile)/+page.svelte @@ -0,0 +1,22 @@ + \ No newline at end of file diff --git a/src/routes/[id]/+layout.svelte b/src/routes/[id]/+layout.svelte new file mode 100644 index 0000000..01af03b --- /dev/null +++ b/src/routes/[id]/+layout.svelte @@ -0,0 +1,4 @@ + \ No newline at end of file diff --git a/src/routes/browser-setup.ts b/src/routes/browser-setup.ts index eaf799e..37bf900 100644 --- a/src/routes/browser-setup.ts +++ b/src/routes/browser-setup.ts @@ -4,12 +4,12 @@ import { ndk } from '$lib/stores/nostr'; import { get } from 'svelte/store'; import { currentUser } from '$lib/store'; import { NDKNip07Signer, NDKUser } from '@nostr-dev-kit/ndk'; +import { browser } from '$app/environment'; const _ndk = get(ndk); export async function browserSetup() { - const pubkey = localStorage.getItem('pubkey'); - console.debug(pubkey); + const pubkey = browser ? localStorage.getItem('pubkey') : ''; if (pubkey) { const u = _ndk.getUser({ pubkey });