diff --git a/src/pages/messages/[pub].tsx b/src/pages/messages/[pub].tsx
deleted file mode 100644
index 2e4d3000..00000000
--- a/src/pages/messages/[pub].tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-import BaseLayout from '@layouts/baseLayout';
-import UserLayout from '@layouts/userLayout';
-
-import { JSXElementConstructor, ReactElement, ReactFragment, ReactPortal } from 'react';
-
-export default function Page() {
- return <>>;
-}
-
-Page.getLayout = function getLayout(
- page:
- | string
- | number
- | boolean
- | ReactElement>
- | ReactFragment
- | ReactPortal
-) {
- return (
-
- {page}
-
- );
-};
diff --git a/src/pages/onboarding/fetch-follows.tsx b/src/pages/onboarding/follows/[pubkey].tsx
similarity index 90%
rename from src/pages/onboarding/fetch-follows.tsx
rename to src/pages/onboarding/follows/[pubkey].tsx
index 9ff02b60..c3048219 100644
--- a/src/pages/onboarding/fetch-follows.tsx
+++ b/src/pages/onboarding/follows/[pubkey].tsx
@@ -3,6 +3,7 @@ import BaseLayout from '@layouts/baseLayout';
import OnboardingLayout from '@layouts/onboardingLayout';
import { motion } from 'framer-motion';
+import { GetStaticPaths } from 'next';
import { useRouter } from 'next/router';
import { useNostrEvents } from 'nostr-react';
import {
@@ -15,12 +16,11 @@ import {
} from 'react';
import Database from 'tauri-plugin-sql-api';
-export default function Page() {
+export default function Page({ pubkey }: { pubkey: string }) {
const [follows, setFollows] = useState([null]);
const [loading, setLoading] = useState(false);
const router = useRouter();
- const { pubkey }: any = router.query;
const { onEvent } = useNostrEvents({
filter: {
@@ -108,6 +108,20 @@ export default function Page() {
);
}
+export const getStaticPaths: GetStaticPaths = async () => {
+ return {
+ paths: [],
+ fallback: 'blocking',
+ };
+};
+
+export async function getStaticProps(context) {
+ const pubkey = context.params.pubkey;
+ return {
+ props: { pubkey },
+ };
+}
+
Page.getLayout = function getLayout(
page:
| string
diff --git a/src/pages/onboarding/import.tsx b/src/pages/onboarding/import.tsx
index cf5e3a10..dd036f07 100644
--- a/src/pages/onboarding/import.tsx
+++ b/src/pages/onboarding/import.tsx
@@ -46,10 +46,7 @@ export default function Page() {
const pubKey = getPublicKey(privKey);
if (pubKey) {
- router.push({
- pathname: '/onboarding/fetch-profile',
- query: { privkey: privKey },
- });
+ router.push(`/onboarding/profile/${privKey}`);
}
} catch (error) {
setError('key', {
diff --git a/src/pages/onboarding/fetch-profile.tsx b/src/pages/onboarding/profile/[privkey].tsx
similarity index 89%
rename from src/pages/onboarding/fetch-profile.tsx
rename to src/pages/onboarding/profile/[privkey].tsx
index befbeecc..8e11f2a8 100644
--- a/src/pages/onboarding/fetch-profile.tsx
+++ b/src/pages/onboarding/profile/[privkey].tsx
@@ -3,6 +3,7 @@ import BaseLayout from '@layouts/baseLayout';
import OnboardingLayout from '@layouts/onboardingLayout';
import { motion } from 'framer-motion';
+import { GetStaticPaths } from 'next';
import { useRouter } from 'next/router';
import { useNostrEvents } from 'nostr-react';
import { getPublicKey, nip19 } from 'nostr-tools';
@@ -16,12 +17,11 @@ import {
} from 'react';
import Database from 'tauri-plugin-sql-api';
-export default function Page() {
+export default function Page({ privkey }: { privkey: string }) {
const [account, setAccount] = useState(null);
const [loading, setLoading] = useState(false);
const router = useRouter();
- const { privkey }: any = router.query;
const pubkey = getPublicKey(privkey);
const npub = nip19.npubEncode(pubkey);
@@ -61,10 +61,7 @@ export default function Page() {
.then(() => {
setTimeout(() => {
setLoading(false);
- router.push({
- pathname: '/onboarding/fetch-follows',
- query: { pubkey: pubkey },
- });
+ router.push(`/onboarding/follows/${pubkey}`);
}, 1500);
})
.catch(console.error);
@@ -116,6 +113,20 @@ export default function Page() {
);
}
+export const getStaticPaths: GetStaticPaths = async () => {
+ return {
+ paths: [],
+ fallback: 'blocking',
+ };
+};
+
+export async function getStaticProps(context) {
+ const privkey = context.params.privkey;
+ return {
+ props: { privkey },
+ };
+}
+
Page.getLayout = function getLayout(
page:
| string