diff --git a/app/[locale]/(user)/layout.tsx b/app/[locale]/(user)/layout.tsx index 227de385..f6abaf33 100644 --- a/app/[locale]/(user)/layout.tsx +++ b/app/[locale]/(user)/layout.tsx @@ -1,12 +1,8 @@ 'use client'; -import React from 'react'; -import Image from 'next/image'; -import Link from 'next/link'; import { notFound, usePathname } from 'next/navigation'; -import { Icon, Text } from 'opub-ui'; +import React from 'react'; -import { Icons } from '@/components/icons'; import MainFooter from '../dashboard/components/main-footer'; import { MainNav } from '../dashboard/components/main-nav'; @@ -25,12 +21,7 @@ export default function Layout({ children }: UserLayoutProps) { return (
-
+
<>{children} diff --git a/app/[locale]/dashboard/components/main-footer.tsx b/app/[locale]/dashboard/components/main-footer.tsx index 1529952b..e2e67971 100644 --- a/app/[locale]/dashboard/components/main-footer.tsx +++ b/app/[locale]/dashboard/components/main-footer.tsx @@ -4,80 +4,64 @@ import Link from 'next/link'; import { Icon, Text } from 'opub-ui'; import { Icons } from '@/components/icons'; +import { IconBinary, IconBinaryTree } from '@tabler/icons-react'; const MainFooter = () => { return ( <> -
-
-
- -
- +
+
+
+ {' '} +
+ logo + + CivicDataSpace + +
+
+
+ {' '} - CivicDataSpace + Follow Us
- -
- - {'cdl'} - {' '} + +
+
+ +
+
+ +
+
+ +
+
+ +
+
-
- - About Us - - - Sitemap - - - Contact Us - -
-
- - Follow Us - -
-
- -
-
- -
-
- -
-
- -
+
+
+ + About Us + + + Sitemap + + + Contact Us +
+
-
-
- - - - This Platform is designed, developed and hosted by CivicDataLab for - Data Exchange - -
-
); }; diff --git a/app/[locale]/dashboard/components/main-nav.tsx b/app/[locale]/dashboard/components/main-nav.tsx index 66f175fc..cbf34df2 100644 --- a/app/[locale]/dashboard/components/main-nav.tsx +++ b/app/[locale]/dashboard/components/main-nav.tsx @@ -1,7 +1,9 @@ 'use client'; import React from 'react'; +import Image from 'next/image'; import Link from 'next/link'; +import { usePathname } from 'next/navigation'; import { useMetaKeyPress } from '@/hooks/use-meta-key-press'; import { Session } from 'next-auth'; import { signIn, signOut, useSession } from 'next-auth/react'; @@ -15,7 +17,6 @@ import { CommandItem, CommandList, Divider, - Icon, IconButton, Popover, SearchInput, @@ -34,6 +35,8 @@ const profileLinks = [ ]; export function MainNav({ hideSearch = false }) { + const pathname = usePathname(); + const [isLoggingOut, setIsLoggingOut] = React.useState(false); const searchRef = React.useRef(null); const { data: session, status } = useSession(); @@ -55,93 +58,123 @@ export function MainNav({ hideSearch = false }) { return ; } + const Navigation = [ + { + title: 'All Data', + href: '/datasets', + }, + { + title: 'Sectors', + href: '/categories', + }, + { + title: 'Use Cases', + href: '#', + }, + { + title: 'Publishers', + href: '#', + }, + { + title: 'Tools', + href: '#', + }, + ]; + return (