);
}
-
-Page.getLayout = function getLayout(
- page:
- | string
- | number
- | boolean
- | ReactElement>
- | ReactFragment
- | ReactPortal
-) {
- return (
-
- {page}
-
- );
-};
diff --git a/src/app/channels/layout.tsx b/src/app/channels/layout.tsx
new file mode 100644
index 00000000..da513f42
--- /dev/null
+++ b/src/app/channels/layout.tsx
@@ -0,0 +1,39 @@
+import AppHeader from '@components/appHeader';
+import MultiAccounts from '@components/multiAccounts';
+import Navigation from '@components/navigation';
+
+export default function ChannelsLayout({ children }: { children: React.ReactNode }) {
+ return (
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{children}
+
+
+
+
+ This feature hasn't implemented yet, so resize Lume to the initial size for a better experience.
+ I'm sorry for this inconvenience, and I swear I will add it soon 😁
+
+
+
+
+
+
+
+ );
+}
diff --git a/src/pages/channels/index.tsx b/src/app/channels/page.tsx
similarity index 55%
rename from src/pages/channels/index.tsx
rename to src/app/channels/page.tsx
index b5f8c36d..be4ff78b 100644
--- a/src/pages/channels/index.tsx
+++ b/src/app/channels/page.tsx
@@ -1,9 +1,8 @@
-import BaseLayout from '@layouts/base';
-import WithSidebarLayout from '@layouts/withSidebar';
+'use client';
import { BrowseChannelItem } from '@components/channels/browseChannelItem';
-import { JSXElementConstructor, ReactElement, ReactFragment, ReactPortal, useEffect, useState } from 'react';
+import { useEffect, useState } from 'react';
export default function Page() {
const [list, setList] = useState([]);
@@ -27,19 +26,3 @@ export default function Page() {
);
}
-
-Page.getLayout = function getLayout(
- page:
- | string
- | number
- | boolean
- | ReactElement>
- | ReactFragment
- | ReactPortal
-) {
- return (
-
- {page}
-
- );
-};
diff --git a/src/pages/chats/[pubkey].tsx b/src/app/chats/[pubkey]/page.tsx
similarity index 53%
rename from src/pages/chats/[pubkey].tsx
rename to src/app/chats/[pubkey]/page.tsx
index 5bf8c048..b1bc4600 100644
--- a/src/pages/chats/[pubkey].tsx
+++ b/src/app/chats/[pubkey]/page.tsx
@@ -1,28 +1,15 @@
-import BaseLayout from '@layouts/base';
-import WithSidebarLayout from '@layouts/withSidebar';
+'use client';
import { MessageList } from '@components/chats/messageList';
import FormChat from '@components/form/chat';
import { RelayContext } from '@components/relaysProvider';
import useLocalStorage from '@rehooks/local-storage';
-import { useRouter } from 'next/router';
-import {
- JSXElementConstructor,
- ReactElement,
- ReactFragment,
- ReactPortal,
- useContext,
- useEffect,
- useState,
-} from 'react';
+import { useContext, useEffect, useState } from 'react';
-export default function Page() {
+export default function Page({ params }: { params: { pubkey: string } }) {
const [pool, relays]: any = useContext(RelayContext);
- const router = useRouter();
- const pubkey: any = router.query.pubkey || null;
-
const [activeAccount]: any = useLocalStorage('activeAccount', {});
const [messages, setMessages] = useState([]);
@@ -31,13 +18,13 @@ export default function Page() {
[
{
kinds: [4],
- authors: [pubkey],
+ authors: [params.pubkey],
'#p': [activeAccount.pubkey],
},
{
kinds: [4],
authors: [activeAccount.pubkey],
- '#p': [pubkey],
+ '#p': [params.pubkey],
},
],
relays,
@@ -47,32 +34,16 @@ export default function Page() {
);
return () => {
- unsubscribe;
+ unsubscribe();
};
- }, [pool, relays, pubkey, activeAccount.pubkey]);
+ }, [pool, relays, params.pubkey, activeAccount.pubkey]);
return (
a.created_at - b.created_at)} />
-
+
);
}
-
-Page.getLayout = function getLayout(
- page:
- | string
- | number
- | boolean
- | ReactElement>
- | ReactFragment
- | ReactPortal
-) {
- return (
-
- {page}
-
- );
-};
diff --git a/src/app/chats/layout.tsx b/src/app/chats/layout.tsx
new file mode 100644
index 00000000..d4c9f183
--- /dev/null
+++ b/src/app/chats/layout.tsx
@@ -0,0 +1,39 @@
+import AppHeader from '@components/appHeader';
+import MultiAccounts from '@components/multiAccounts';
+import Navigation from '@components/navigation';
+
+export default function ChatsLayout({ children }: { children: React.ReactNode }) {
+ return (
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{children}
+
+
+
+
+ This feature hasn't implemented yet, so resize Lume to the initial size for a better experience.
+ I'm sorry for this inconvenience, and I swear I will add it soon 😁
+
;
+}
diff --git a/src/app/newsfeed/circle/page.tsx b/src/app/newsfeed/circle/page.tsx
new file mode 100644
index 00000000..a51233ce
--- /dev/null
+++ b/src/app/newsfeed/circle/page.tsx
@@ -0,0 +1,7 @@
+export default function Page() {
+ return (
+
+
Sorry, this feature under development, it will come in the next version
+
+ );
+}
diff --git a/src/pages/newsfeed/following.tsx b/src/app/newsfeed/following/page.tsx
similarity index 85%
rename from src/pages/newsfeed/following.tsx
rename to src/app/newsfeed/following/page.tsx
index 33ac6e98..82050d23 100644
--- a/src/pages/newsfeed/following.tsx
+++ b/src/app/newsfeed/following/page.tsx
@@ -1,5 +1,4 @@
-import BaseLayout from '@layouts/base';
-import WithSidebarLayout from '@layouts/withSidebar';
+'use client';
import FormBase from '@components/form/base';
import { NoteBase } from '@components/note/base';
@@ -12,16 +11,7 @@ import { filterDuplicateParentID } from '@utils/transform';
import { ArrowUp } from 'iconoir-react';
import { useAtom } from 'jotai';
-import {
- JSXElementConstructor,
- ReactElement,
- ReactFragment,
- ReactPortal,
- useCallback,
- useEffect,
- useRef,
- useState,
-} from 'react';
+import { useCallback, useEffect, useRef, useState } from 'react';
import { Virtuoso } from 'react-virtuoso';
export default function Page() {
@@ -121,19 +111,3 @@ const COMPONENTS = {
EmptyPlaceholder: () => ,
ScrollSeekPlaceholder: () => ,
};
-
-Page.getLayout = function getLayout(
- page:
- | string
- | number
- | boolean
- | ReactElement>
- | ReactFragment
- | ReactPortal
-) {
- return (
-
- {page}
-
- );
-};
diff --git a/src/app/newsfeed/layout.tsx b/src/app/newsfeed/layout.tsx
new file mode 100644
index 00000000..1aa8e3ea
--- /dev/null
+++ b/src/app/newsfeed/layout.tsx
@@ -0,0 +1,39 @@
+import AppHeader from '@components/appHeader';
+import MultiAccounts from '@components/multiAccounts';
+import Navigation from '@components/navigation';
+
+export default function Layout({ children }: { children: React.ReactNode }) {
+ return (
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{children}
+
+
+
+
+ This feature hasn't implemented yet, so resize Lume to the initial size for a better experience.
+ I'm sorry for this inconvenience, and I swear I will add it soon 😁
+
+ );
+}
diff --git a/src/pages/onboarding/login/step-2.tsx b/src/app/onboarding/login/[...slug]/page.tsx
similarity index 88%
rename from src/pages/onboarding/login/step-2.tsx
rename to src/app/onboarding/login/[...slug]/page.tsx
index f46bf381..8819c614 100644
--- a/src/pages/onboarding/login/step-2.tsx
+++ b/src/app/onboarding/login/[...slug]/page.tsx
@@ -1,4 +1,4 @@
-import BaseLayout from '@layouts/base';
+'use client';
import { RelayContext } from '@components/relaysProvider';
@@ -8,26 +8,15 @@ import { fetchMetadata } from '@utils/metadata';
import { truncate } from '@utils/truncate';
import Image from 'next/image';
-import { useRouter } from 'next/router';
+import { useRouter } from 'next/navigation';
import { getPublicKey } from 'nostr-tools';
-import {
- JSXElementConstructor,
- ReactElement,
- ReactFragment,
- ReactPortal,
- useCallback,
- useContext,
- useEffect,
- useRef,
- useState,
-} from 'react';
+import { useCallback, useContext, useEffect, useMemo, useState } from 'react';
-export default function Page() {
+export default function Page({ params }: { params: { privkey: string } }) {
+ const router = useRouter();
const [pool, relays]: any = useContext(RelayContext);
- const router = useRouter();
- const privkey: any = router.query.privkey || null;
- const pubkey = privkey ? getPublicKey(privkey) : null;
+ const pubkey = useMemo(() => (params.privkey ? getPublicKey(params.privkey) : null), [params.privkey]);
const [profile, setProfile] = useState({ id: null, metadata: null });
const [done, setDone] = useState(false);
@@ -75,7 +64,7 @@ export default function Page() {
relays,
(event: any) => {
if (event.kind === 0) {
- insertAccountToStorage(pubkey, privkey, event.content);
+ insertAccountToStorage(pubkey, params.privkey, event.content);
} else {
if (event.tags.length > 0) {
insertFollowsToStorage(event.tags);
@@ -91,7 +80,7 @@ export default function Page() {
return () => {
unsubscribe;
};
- }, [insertAccountToStorage, insertFollowsToStorage, pool, relays, privkey, pubkey]);
+ }, [insertAccountToStorage, insertFollowsToStorage, pool, relays, pubkey, params.privkey]);
// submit then redirect to home
const submit = () => {
@@ -168,15 +157,3 @@ export default function Page() {
);
}
-
-Page.getLayout = function getLayout(
- page:
- | string
- | number
- | boolean
- | ReactElement>
- | ReactFragment
- | ReactPortal
-) {
- return {page};
-};
diff --git a/src/pages/onboarding/login/index.tsx b/src/app/onboarding/login/page.tsx
similarity index 90%
rename from src/pages/onboarding/login/index.tsx
rename to src/app/onboarding/login/page.tsx
index 4dc0f259..f7a3b98a 100644
--- a/src/pages/onboarding/login/index.tsx
+++ b/src/app/onboarding/login/page.tsx
@@ -1,9 +1,8 @@
-import BaseLayout from '@layouts/base';
+'use client';
import { ArrowLeft, CableTag } from 'iconoir-react';
-import { useRouter } from 'next/router';
+import { useRouter } from 'next/navigation';
import { nip19 } from 'nostr-tools';
-import { JSXElementConstructor, ReactElement, ReactFragment, ReactPortal } from 'react';
import { Resolver, useForm } from 'react-hook-form';
type FormValues = {
@@ -45,10 +44,7 @@ export default function Page() {
}
try {
- router.push({
- pathname: '/onboarding/login/step-2',
- query: { privkey: privkey },
- });
+ router.push(`/onboarding/login/${privkey}`);
} catch (error) {
setError('key', {
type: 'custom',
@@ -134,15 +130,3 @@ export default function Page() {
);
}
-
-Page.getLayout = function getLayout(
- page:
- | string
- | number
- | boolean
- | ReactElement>
- | ReactFragment
- | ReactPortal
-) {
- return {page};
-};
diff --git a/src/pages/onboarding/index.tsx b/src/app/onboarding/page.tsx
similarity index 94%
rename from src/pages/onboarding/index.tsx
rename to src/app/onboarding/page.tsx
index b0c19b31..8eaa7636 100644
--- a/src/pages/onboarding/index.tsx
+++ b/src/app/onboarding/page.tsx
@@ -1,9 +1,6 @@
-import BaseLayout from '@layouts/base';
-
import { ArrowRight } from 'iconoir-react';
import Image from 'next/image';
import Link from 'next/link';
-import { JSXElementConstructor, ReactElement, ReactFragment, ReactPortal } from 'react';
const PLEBS = [
'https://133332.xyz/p.jpg',
@@ -128,15 +125,3 @@ export default function Page() {
);
}
-
-Page.getLayout = function getLayout(
- page:
- | string
- | number
- | boolean
- | ReactElement>
- | ReactFragment
- | ReactPortal
-) {
- return {page};
-};
diff --git a/src/pages/index.tsx b/src/app/page.tsx
similarity index 71%
rename from src/pages/index.tsx
rename to src/app/page.tsx
index 783c36b9..bd38bd54 100644
--- a/src/pages/index.tsx
+++ b/src/app/page.tsx
@@ -1,4 +1,4 @@
-import BaseLayout from '@layouts/base';
+'use client';
import { RelayContext } from '@components/relaysProvider';
@@ -8,17 +8,8 @@ import { getParentID, pubkeyArray } from '@utils/transform';
import LumeSymbol from '@assets/icons/Lume';
import useLocalStorage, { writeStorage } from '@rehooks/local-storage';
-import { useRouter } from 'next/router';
-import {
- JSXElementConstructor,
- ReactElement,
- ReactFragment,
- ReactPortal,
- useCallback,
- useContext,
- useEffect,
- useRef,
-} from 'react';
+import { useRouter } from 'next/navigation';
+import { useCallback, useContext, useEffect, useRef } from 'react';
export default function Page() {
const [pool, relays]: any = useContext(RelayContext);
@@ -174,50 +165,40 @@ export default function Page() {
}, [fetchActiveAccount, fetchPlebsByAccount, totalNotes, fetchData, router]);
return (
-
- {/* dragging area */}
-
- {/* end dragging area */}
-
-
-
-
-
- Here's an interesting fact:
-
-
- Bitcoin and Nostr can be used by anyone, and no one can stop you!
-
+
+
+ {/* dragging area */}
+
+ {/* end dragging area */}
+
+
+
+
+
+ Here's an interesting fact:
+
+
+ Bitcoin and Nostr can be used by anyone, and no one can stop you!
+
+
+
+
+
-
-
-
);
}
-
-Page.getLayout = function getLayout(
- page:
- | string
- | number
- | boolean
- | ReactElement>
- | ReactFragment
- | ReactPortal
-) {
- return {page};
-};
diff --git a/src/app/providers.tsx b/src/app/providers.tsx
new file mode 100644
index 00000000..ac981e06
--- /dev/null
+++ b/src/app/providers.tsx
@@ -0,0 +1,7 @@
+'use client';
+
+import RelayProvider from '@components/relaysProvider';
+
+export function Providers({ children }: { children: React.ReactNode }) {
+ return {children};
+}
diff --git a/src/pages/users/[id].tsx b/src/app/users/[id]/page.tsx
similarity index 72%
rename from src/pages/users/[id].tsx
rename to src/app/users/[id]/page.tsx
index 0092a862..227fc741 100644
--- a/src/pages/users/[id].tsx
+++ b/src/app/users/[id]/page.tsx
@@ -1,5 +1,4 @@
-import BaseLayout from '@layouts/base';
-import WithSidebarLayout from '@layouts/withSidebar';
+'use client';
import ProfileFollowers from '@components/profile/followers';
import ProfileFollows from '@components/profile/follows';
@@ -7,16 +6,11 @@ import ProfileMetadata from '@components/profile/metadata';
import ProfileNotes from '@components/profile/notes';
import * as Tabs from '@radix-ui/react-tabs';
-import { useRouter } from 'next/router';
-import { JSXElementConstructor, ReactElement, ReactFragment, ReactPortal } from 'react';
-
-export default function Page() {
- const router = useRouter();
- const id: any = router.query.id || '';
+export default function Page({ params }: { params: { id: string } }) {
return (
-
+
-
+
-
+
-
+
);
}
-
-Page.getLayout = function getLayout(
- page:
- | string
- | number
- | boolean
- | ReactElement>
- | ReactFragment
- | ReactPortal
-) {
- return (
-
- {page}
-
- );
-};
diff --git a/src/app/users/layout.tsx b/src/app/users/layout.tsx
new file mode 100644
index 00000000..7b83fff6
--- /dev/null
+++ b/src/app/users/layout.tsx
@@ -0,0 +1,39 @@
+import AppHeader from '@components/appHeader';
+import MultiAccounts from '@components/multiAccounts';
+import Navigation from '@components/navigation';
+
+export default function UsersLayout({ children }: { children: React.ReactNode }) {
+ return (
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
{children}
+
+
+
+
+ This feature hasn't implemented yet, so resize Lume to the initial size for a better experience.
+ I'm sorry for this inconvenience, and I swear I will add it soon 😁
+
+
+
+
+
+
+
+ );
+}
diff --git a/src/App.css b/src/assets/global.css
similarity index 100%
rename from src/App.css
rename to src/assets/global.css
diff --git a/src/components/activeLink.tsx b/src/components/activeLink.tsx
deleted file mode 100644
index 07f2d015..00000000
--- a/src/components/activeLink.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-import Link, { LinkProps } from 'next/link';
-import { useRouter } from 'next/router';
-import { PropsWithChildren, memo, useEffect, useState } from 'react';
-
-type ActiveLinkProps = LinkProps & {
- className?: string;
- activeClassName: string;
-};
-
-const ActiveLink = ({ children, activeClassName, className, ...props }: PropsWithChildren) => {
- const { asPath, isReady } = useRouter();
- const [computedClassName, setComputedClassName] = useState(className);
-
- useEffect(() => {
- // Check if the router fields are updated client-side
- if (isReady) {
- // Dynamic route will be matched via props.as
- // Static route will be matched via props.href
- const linkPathname = new URL((props.as || props.href) as string, location.href).pathname;
-
- // Using URL().pathname to get rid of query and hash
- const activePathname = new URL(asPath, location.href).pathname;
-
- const newClassName = linkPathname === activePathname ? `${className} ${activeClassName}`.trim() : className;
-
- if (newClassName !== computedClassName) {
- setComputedClassName(newClassName);
- }
- }
- }, [asPath, isReady, props.as, props.href, activeClassName, className, computedClassName]);
-
- return (
-
- {children}
-
- );
-};
-
-export default memo(ActiveLink);
diff --git a/src/components/appHeader/actions.tsx b/src/components/appHeader/actions.tsx
index aba61ff4..b8c13ada 100644
--- a/src/components/appHeader/actions.tsx
+++ b/src/components/appHeader/actions.tsx
@@ -1,6 +1,8 @@
+'use client';
+
import { platform } from '@tauri-apps/api/os';
import { ArrowLeft, ArrowRight, Refresh } from 'iconoir-react';
-import { useRouter } from 'next/router';
+import { useRouter } from 'next/navigation';
import { useLayoutEffect, useState } from 'react';
export default function AppActions() {
@@ -12,11 +14,11 @@ export default function AppActions() {
};
const goForward = () => {
- window.history.forward();
+ router.forward();
};
const reload = () => {
- router.reload();
+ router.refresh();
};
useLayoutEffect(() => {
diff --git a/src/components/channels/browseChannelItem.tsx b/src/components/channels/browseChannelItem.tsx
index e12e39a8..0bf33991 100644
--- a/src/components/channels/browseChannelItem.tsx
+++ b/src/components/channels/browseChannelItem.tsx
@@ -2,7 +2,7 @@ import { ImageWithFallback } from '@components/imageWithFallback';
import { DEFAULT_AVATAR } from '@stores/constants';
-import { useRouter } from 'next/router';
+import { useRouter } from 'next/navigation';
import { useCallback } from 'react';
export const BrowseChannelItem = ({ data }: { data: any }) => {
@@ -11,10 +11,7 @@ export const BrowseChannelItem = ({ data }: { data: any }) => {
const openChannel = useCallback(
(id: string) => {
- router.push({
- pathname: '/channels/[id]',
- query: { id: id },
- });
+ router.push(`/channels/${id}`);
},
[router]
);
diff --git a/src/components/channels/channelListItem.tsx b/src/components/channels/channelListItem.tsx
index 230728a9..75170737 100644
--- a/src/components/channels/channelListItem.tsx
+++ b/src/components/channels/channelListItem.tsx
@@ -2,17 +2,14 @@ import { ImageWithFallback } from '@components/imageWithFallback';
import { DEFAULT_AVATAR } from '@stores/constants';
-import { useRouter } from 'next/router';
+import { useRouter } from 'next/navigation';
export const ChannelListItem = ({ data }: { data: any }) => {
const router = useRouter();
const channel = JSON.parse(data.content);
const openChannel = (id: string) => {
- router.push({
- pathname: '/channels/[id]',
- query: { id: id },
- });
+ router.push(`/channels/${id}`);
};
return (
diff --git a/src/components/chats/chatList.tsx b/src/components/chats/chatList.tsx
index a64e9427..6a467fe6 100644
--- a/src/components/chats/chatList.tsx
+++ b/src/components/chats/chatList.tsx
@@ -5,7 +5,7 @@ import { ImageWithFallback } from '@components/imageWithFallback';
import { DEFAULT_AVATAR } from '@stores/constants';
import useLocalStorage from '@rehooks/local-storage';
-import { useRouter } from 'next/router';
+import { useRouter } from 'next/navigation';
import { useEffect, useState } from 'react';
export default function ChatList() {
@@ -16,10 +16,7 @@ export default function ChatList() {
const profile = activeAccount.metadata ? JSON.parse(activeAccount.metadata) : null;
const openSelfChat = () => {
- router.push({
- pathname: '/chats/[pubkey]',
- query: { pubkey: activeAccount.pubkey },
- });
+ router.push(`/chats/${activeAccount.pubkey}`);
};
useEffect(() => {
diff --git a/src/components/chats/chatListItem.tsx b/src/components/chats/chatListItem.tsx
index f9f2c6c0..29ff0365 100644
--- a/src/components/chats/chatListItem.tsx
+++ b/src/components/chats/chatListItem.tsx
@@ -5,17 +5,14 @@ import { DEFAULT_AVATAR } from '@stores/constants';
import { useMetadata } from '@utils/metadata';
import { truncate } from '@utils/truncate';
-import { useRouter } from 'next/router';
+import { useRouter } from 'next/navigation';
export const ChatListItem = ({ pubkey }: { pubkey: string }) => {
const router = useRouter();
const profile = useMetadata(pubkey);
const openChat = () => {
- router.push({
- pathname: '/chats/[pubkey]',
- query: { pubkey: pubkey },
- });
+ router.push(`/chats/${pubkey}`);
};
return (
diff --git a/src/components/chats/chatModalUser.tsx b/src/components/chats/chatModalUser.tsx
index d673dfd1..bd504232 100644
--- a/src/components/chats/chatModalUser.tsx
+++ b/src/components/chats/chatModalUser.tsx
@@ -4,17 +4,14 @@ import { DEFAULT_AVATAR } from '@stores/constants';
import { truncate } from '@utils/truncate';
-import { useRouter } from 'next/router';
+import { useRouter } from 'next/navigation';
export const ChatModalUser = ({ data }: { data: any }) => {
const router = useRouter();
const profile = JSON.parse(data.metadata);
const openNewChat = () => {
- router.push({
- pathname: '/chats/[pubkey]',
- query: { pubkey: data.pubkey },
- });
+ router.push(`/chats/${data.pubkey}`);
};
return (
diff --git a/src/components/eventCollector.tsx b/src/components/eventCollector.tsx
index c9c33623..2befeed7 100644
--- a/src/components/eventCollector.tsx
+++ b/src/components/eventCollector.tsx
@@ -1,3 +1,5 @@
+'use client';
+
import { NetworkStatusIndicator } from '@components/networkStatusIndicator';
import { RelayContext } from '@components/relaysProvider';
diff --git a/src/components/multiAccounts/activeAccount.tsx b/src/components/multiAccounts/activeAccount.tsx
index a27cf54a..c15dc9b7 100644
--- a/src/components/multiAccounts/activeAccount.tsx
+++ b/src/components/multiAccounts/activeAccount.tsx
@@ -1,10 +1,12 @@
+'use client';
+
import { DEFAULT_AVATAR } from '@stores/constants';
import * as DropdownMenu from '@radix-ui/react-dropdown-menu';
import { writeText } from '@tauri-apps/api/clipboard';
import { LogOut, ProfileCircle, Settings } from 'iconoir-react';
import Image from 'next/image';
-import { useRouter } from 'next/router';
+import { useRouter } from 'next/navigation';
import { nip19 } from 'nostr-tools';
export const ActiveAccount = ({ user }: { user: any }) => {
diff --git a/src/components/multiAccounts/index.tsx b/src/components/multiAccounts/index.tsx
index aedc288d..37bdabc1 100644
--- a/src/components/multiAccounts/index.tsx
+++ b/src/components/multiAccounts/index.tsx
@@ -1,3 +1,5 @@
+'use client';
+
import { ActiveAccount } from '@components/multiAccounts/activeAccount';
import { InactiveAccount } from '@components/multiAccounts/inactiveAccount';
diff --git a/src/components/navigation/channels.tsx b/src/components/navigation/channels.tsx
index 952c0cb5..e005c856 100644
--- a/src/components/navigation/channels.tsx
+++ b/src/components/navigation/channels.tsx
@@ -1,3 +1,5 @@
+'use client';
+
import ChannelList from '@components/channels/channelList';
import * as Collapsible from '@radix-ui/react-collapsible';
diff --git a/src/components/navigation/chats.tsx b/src/components/navigation/chats.tsx
index ae882c87..db5f8c56 100644
--- a/src/components/navigation/chats.tsx
+++ b/src/components/navigation/chats.tsx
@@ -1,3 +1,5 @@
+'use client';
+
import ChatList from '@components/chats/chatList';
import * as Collapsible from '@radix-ui/react-collapsible';
diff --git a/src/components/navigation/newsfeed.tsx b/src/components/navigation/newsfeed.tsx
index 15d0bfea..03d6e7a4 100644
--- a/src/components/navigation/newsfeed.tsx
+++ b/src/components/navigation/newsfeed.tsx
@@ -1,7 +1,8 @@
-import ActiveLink from '@components/activeLink';
+'use client';
import * as Collapsible from '@radix-ui/react-collapsible';
import { NavArrowUp } from 'iconoir-react';
+import Link from 'next/link';
import { useState } from 'react';
export default function Newsfeed() {
@@ -21,20 +22,20 @@ export default function Newsfeed() {
Newsfeed
- Following
-
-
+
Circle
-
+
diff --git a/src/components/note/base.tsx b/src/components/note/base.tsx
index 17e7d90f..2d120447 100644
--- a/src/components/note/base.tsx
+++ b/src/components/note/base.tsx
@@ -7,7 +7,7 @@ import { UserExtend } from '@components/user/extend';
import { UserMention } from '@components/user/mention';
import destr from 'destr';
-import { useRouter } from 'next/router';
+import { useRouter } from 'next/navigation';
import { memo, useMemo } from 'react';
import reactStringReplace from 'react-string-replace';
diff --git a/src/components/note/meta/comment.tsx b/src/components/note/meta/comment.tsx
index 4b28ce31..c7d02511 100644
--- a/src/components/note/meta/comment.tsx
+++ b/src/components/note/meta/comment.tsx
@@ -7,7 +7,7 @@ import { dateToUnix } from '@utils/getDate';
import * as Dialog from '@radix-ui/react-dialog';
import useLocalStorage from '@rehooks/local-storage';
import { MultiBubble, OpenNewWindow } from 'iconoir-react';
-import { useRouter } from 'next/router';
+import { useRouter } from 'next/navigation';
import { getEventHash, signEvent } from 'nostr-tools';
import { memo, useContext, useState } from 'react';
diff --git a/src/components/profile/followers.tsx b/src/components/profile/followers.tsx
index 5645b764..ef03f58f 100644
--- a/src/components/profile/followers.tsx
+++ b/src/components/profile/followers.tsx
@@ -1,3 +1,5 @@
+'use client';
+
import { RelayContext } from '@components/relaysProvider';
import { UserFollow } from '@components/user/follow';
diff --git a/src/components/profile/follows.tsx b/src/components/profile/follows.tsx
index 14cda816..7b807a03 100644
--- a/src/components/profile/follows.tsx
+++ b/src/components/profile/follows.tsx
@@ -1,3 +1,5 @@
+'use client';
+
import { RelayContext } from '@components/relaysProvider';
import { UserFollow } from '@components/user/follow';
diff --git a/src/components/profile/metadata.tsx b/src/components/profile/metadata.tsx
index 75bad040..98aba6e8 100644
--- a/src/components/profile/metadata.tsx
+++ b/src/components/profile/metadata.tsx
@@ -1,3 +1,5 @@
+'use client';
+
import { ImageWithFallback } from '@components/imageWithFallback';
import { RelayContext } from '@components/relaysProvider';
diff --git a/src/components/profile/notes.tsx b/src/components/profile/notes.tsx
index d1a315c2..11ab6d06 100644
--- a/src/components/profile/notes.tsx
+++ b/src/components/profile/notes.tsx
@@ -1,3 +1,5 @@
+'use client';
+
import { NoteBase } from '@components/note/base';
import { RelayContext } from '@components/relaysProvider';
diff --git a/src/components/relaysProvider.tsx b/src/components/relaysProvider.tsx
index 777030cf..b7189423 100644
--- a/src/components/relaysProvider.tsx
+++ b/src/components/relaysProvider.tsx
@@ -1,3 +1,5 @@
+'use client';
+
import { RelayPool } from 'nostr-relaypool';
import { createContext, useMemo } from 'react';
diff --git a/src/layouts/base.tsx b/src/layouts/base.tsx
deleted file mode 100644
index a5dd511d..00000000
--- a/src/layouts/base.tsx
+++ /dev/null
@@ -1,3 +0,0 @@
-export default function BaseLayout({ children }: { children: React.ReactNode }) {
- return
{children}
;
-}
diff --git a/src/layouts/withSidebar.tsx b/src/layouts/withSidebar.tsx
deleted file mode 100644
index 39a3f711..00000000
--- a/src/layouts/withSidebar.tsx
+++ /dev/null
@@ -1,37 +0,0 @@
-import AppHeader from '@components/appHeader';
-import MultiAccounts from '@components/multiAccounts';
-import Navigation from '@components/navigation';
-
-export default function WithSidebarLayout({ children }: { children: React.ReactNode }) {
- return (
-
-
-
-
-
-
-
-
-
-
-
-
-
-
{children}
-
-
-
-
- This feature hasn't implemented yet, so resize Lume to the initial size for a better experience.
- I'm sorry for this inconvenience, and I swear I will add it soon 😁
-
-
-
-
-
-
- );
-}
diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx
deleted file mode 100644
index c036df5f..00000000
--- a/src/pages/_app.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-import RelayProvider from '@components/relaysProvider';
-
-import type { NextPage } from 'next';
-import type { AppProps } from 'next/app';
-import { useRouter } from 'next/router';
-import { ReactElement, ReactNode } from 'react';
-
-import '../App.css';
-
-// eslint-disable-next-line @typescript-eslint/ban-types
-export type NextPageWithLayout
= NextPage & {
- getLayout?: (page: ReactElement) => ReactNode;
-};
-
-type AppPropsWithLayout = AppProps & {
- Component: NextPageWithLayout;
-};
-
-export default function MyApp({ Component, pageProps }: AppPropsWithLayout) {
- const router = useRouter();
- // Use the layout defined at the page level, if available
- const getLayout = Component.getLayout ?? ((page) => page);
-
- return {getLayout()};
-}
diff --git a/src/pages/_document.tsx b/src/pages/_document.tsx
deleted file mode 100644
index 1e9c0e95..00000000
--- a/src/pages/_document.tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import { Head, Html, Main, NextScript } from 'next/document';
-
-export default function Document() {
- return (
-
-
-