Renamed topbar to header
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
import React from 'react';
|
import React from 'react';
|
||||||
import RecoilRootWrapper from '@app/recoil-root-wrapper';
|
import RecoilRootWrapper from '@app/recoil-root-wrapper';
|
||||||
import Topbar from '@/components/Topbar';
|
import Header from '@/components/Header';
|
||||||
import { Inter } from 'next/font/google';
|
import { Inter } from 'next/font/google';
|
||||||
import { Box, MantineProvider } from '@mantine/core';
|
import { Box, MantineProvider } from '@mantine/core';
|
||||||
import { ModalsProvider } from '@mantine/modals';
|
import { ModalsProvider } from '@mantine/modals';
|
||||||
@@ -27,7 +27,7 @@ export default function RootLayout({ children }: { children: React.ReactNode })
|
|||||||
<MantineProvider>
|
<MantineProvider>
|
||||||
<Notifications />
|
<Notifications />
|
||||||
<ModalsProvider>
|
<ModalsProvider>
|
||||||
<Topbar />
|
<Header />
|
||||||
<Box p='xl' pt='sm' className='h-full'>
|
<Box p='xl' pt='sm' className='h-full'>
|
||||||
{children}
|
{children}
|
||||||
</Box>
|
</Box>
|
||||||
|
|||||||
@@ -18,14 +18,14 @@ import {
|
|||||||
import { useForm } from '@mantine/form';
|
import { useForm } from '@mantine/form';
|
||||||
import { notifications } from '@mantine/notifications';
|
import { notifications } from '@mantine/notifications';
|
||||||
|
|
||||||
interface LoginModalProps {
|
interface HeaderModalProps {
|
||||||
type?: string;
|
type?: string;
|
||||||
toggle: any;
|
toggle: any;
|
||||||
setUser: (user: User) => void;
|
setUser: (user: User) => void;
|
||||||
setRefreshId: (id: NodeJS.Timeout) => void;
|
setRefreshId: (id: NodeJS.Timeout) => void;
|
||||||
}
|
}
|
||||||
|
|
||||||
export function LoginModal({ type, toggle, setUser, setRefreshId }: LoginModalProps) {
|
export function HeaderModal({ type, toggle, setUser, setRefreshId }: HeaderModalProps) {
|
||||||
function passwordValidator(value: string) {
|
function passwordValidator(value: string) {
|
||||||
if (value.trim().length < 10) {
|
if (value.trim().length < 10) {
|
||||||
return 'Password must be at least 10 characters';
|
return 'Password must be at least 10 characters';
|
||||||
@@ -2,17 +2,17 @@
|
|||||||
|
|
||||||
import Link from 'next/link';
|
import Link from 'next/link';
|
||||||
import { usePathname } from 'next/navigation';
|
import { usePathname } from 'next/navigation';
|
||||||
import './topbar.css';
|
import './header.css';
|
||||||
import { Avatar, Button, Card, Grid, Group, Menu, Text, UnstyledButton } from '@mantine/core';
|
import { Avatar, Button, Card, Grid, Group, Menu, Text, UnstyledButton } from '@mantine/core';
|
||||||
import Cookies from 'js-cookie';
|
import Cookies from 'js-cookie';
|
||||||
import { useEffect, useState } from 'react';
|
import { useEffect, useState } from 'react';
|
||||||
import { logout, me, refreshLoggedIn } from '@/api/auth';
|
import { logout, me, refreshLoggedIn } from '@/api/auth';
|
||||||
import { User } from '@/api/auth.types';
|
import { User } from '@/api/auth.types';
|
||||||
import { useToggle } from '@mantine/hooks';
|
import { useToggle } from '@mantine/hooks';
|
||||||
import { LoginModal } from './LoginModal';
|
import { HeaderModal } from './HeaderModal';
|
||||||
import { HeaderItem, headerItems } from './headerItems';
|
import { HeaderItem, headerItems } from './headerItems';
|
||||||
|
|
||||||
export default function Topbar() {
|
export default function Header() {
|
||||||
const pathName = usePathname();
|
const pathName = usePathname();
|
||||||
const [modalType, toggle] = useToggle([undefined, 'login', 'register', 'reset']);
|
const [modalType, toggle] = useToggle([undefined, 'login', 'register', 'reset']);
|
||||||
const [headers, setHeaders] = useState<HeaderItem[]>([]);
|
const [headers, setHeaders] = useState<HeaderItem[]>([]);
|
||||||
@@ -126,7 +126,7 @@ export default function Topbar() {
|
|||||||
)}
|
)}
|
||||||
</div>
|
</div>
|
||||||
</nav>
|
</nav>
|
||||||
<LoginModal type={modalType} toggle={toggle} setUser={setUser} setRefreshId={setRefreshId} />
|
<HeaderModal type={modalType} toggle={toggle} setUser={setUser} setRefreshId={setRefreshId} />
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
Reference in New Issue
Block a user