{status === 'loading' ? (
<>
@@ -26,9 +26,9 @@ export function LumeBar() {
)}
-
+
diff --git a/src/shared/navigation.tsx b/src/shared/navigation.tsx
index f5e37a62..247fa442 100644
--- a/src/shared/navigation.tsx
+++ b/src/shared/navigation.tsx
@@ -1,62 +1,123 @@
-import { Disclosure } from '@headlessui/react';
-import { NavLink } from 'react-router-dom';
+import * as Collapsible from '@radix-ui/react-collapsible';
+import { useState } from 'react';
+import { NavLink, useNavigate } from 'react-router-dom';
import { twMerge } from 'tailwind-merge';
import { ChatsList } from '@app/chats/components/list';
-import { AppHeader } from '@shared/appHeader';
import { ComposerModal } from '@shared/composer/modal';
-import { NavArrowDownIcon, SpaceIcon, TrendingIcon } from '@shared/icons';
+import {
+ ArrowLeftIcon,
+ ArrowRightIcon,
+ NavArrowDownIcon,
+ SpaceIcon,
+ TrendingIcon,
+} from '@shared/icons';
import { LumeBar } from '@shared/lumeBar';
export function Navigation() {
+ const navigate = useNavigate();
+
+ const [feeds, setFeeds] = useState(true);
+ const [chats, setChats] = useState(true);
+
return (
-
-
+
-
+
-
- {/* Newsfeed */}
-
-
-
- Feeds
-
-
-
-
- twMerge(
- 'flex h-9 items-center gap-2.5 rounded-md px-2.5 text-zinc-200',
- isActive ? 'bg-zinc-900/50' : ''
- )
- }
+
+
+
+
+
+
+
+
+
+
+
+ twMerge(
+ 'flex h-9 items-center gap-2.5 rounded-md px-2',
+ isActive ? 'bg-white/10 text-white' : 'text-white/80'
+ )
+ }
+ >
+
+
+
+ Spaces
+
+
+ twMerge(
+ 'flex h-9 items-center gap-2.5 rounded-md px-2 ',
+ isActive ? 'bg-white/10 text-white' : 'text-white/80'
+ )
+ }
+ >
+
+
+
+ Trending
+
+
+
+
+
+
+
+
+
+
+
+
+
{/* Channels
{({ open }) => (
@@ -84,28 +145,6 @@ export function Navigation() {
)}
*/}
- {/* Chats */}
-
- {({ open }) => (
-
-
-
-
-
-
- Chats
-
-
-
-
-
-
diff --git a/src/shared/notification/modal.tsx b/src/shared/notification/modal.tsx
index 79044ce2..229c9b07 100644
--- a/src/shared/notification/modal.tsx
+++ b/src/shared/notification/modal.tsx
@@ -51,9 +51,9 @@ export function NotificationModal({ pubkey }: { pubkey: string }) {
diff --git a/src/shared/settingsLayout.tsx b/src/shared/settingsLayout.tsx
index ba3e61ab..90949243 100644
--- a/src/shared/settingsLayout.tsx
+++ b/src/shared/settingsLayout.tsx
@@ -1,7 +1,6 @@
import { NavLink, Outlet, ScrollRestoration } from 'react-router-dom';
import { twMerge } from 'tailwind-merge';
-import { AppHeader } from '@shared/appHeader';
import { LumeBar } from '@shared/lumeBar';
export function SettingsLayout() {
@@ -9,7 +8,6 @@ export function SettingsLayout() {