mirror of https://github.com/renzynx/bliss.git
fix some minor issue
This commit is contained in:
parent
30dcc05c17
commit
97f0507555
|
@ -43,7 +43,7 @@ const MenuItem = ({ href, text, icon, right_section }: IMenuProps) => {
|
|||
);
|
||||
};
|
||||
|
||||
const UserMenu = ({ user }: { user?: SessionUser }) => {
|
||||
const UserMenu = ({ user }: { user: SessionUser }) => {
|
||||
const { signOut } = useSignOut();
|
||||
const items = useMemo(() => {
|
||||
return menu_items.map(({ href, text, icon, right_section }, idx) => {
|
||||
|
@ -79,7 +79,7 @@ const UserMenu = ({ user }: { user?: SessionUser }) => {
|
|||
<Avatar
|
||||
sx={{ cursor: 'pointer', boxShadow: '0 0 0 0.1px #FFFFFF' }}
|
||||
radius="xl"
|
||||
src={user?.image}
|
||||
src={user.image}
|
||||
alt="User Avatar"
|
||||
/>
|
||||
</Indicator>
|
||||
|
@ -107,7 +107,7 @@ const UserMenu = ({ user }: { user?: SessionUser }) => {
|
|||
],
|
||||
])}
|
||||
>
|
||||
<Menu.Label>{user?.username}</Menu.Label>
|
||||
<Menu.Label>{user.username}</Menu.Label>
|
||||
{items}
|
||||
</Menu.Dropdown>
|
||||
</Menu>
|
||||
|
|
|
@ -43,7 +43,7 @@ const Navbar: FC<{ user?: SessionUser }> = ({ user }) => {
|
|||
<Button
|
||||
variant="light"
|
||||
w={{ base: '6rem', md: '7rem', lg: '7rem', sm: '7rem' }}
|
||||
onClick={() => Router.push('/auth/signin')}
|
||||
onClick={() => Router.push(ROUTES.SIGN_IN)}
|
||||
>
|
||||
Sign in
|
||||
</Button>
|
||||
|
|
|
@ -21,7 +21,7 @@ import {
|
|||
} from '@tabler/icons';
|
||||
import { useAtom } from 'jotai';
|
||||
import { useRouter } from 'next/router';
|
||||
import { FC, useMemo } from 'react';
|
||||
import { useMemo } from 'react';
|
||||
import { sidebarStyles } from './styles';
|
||||
|
||||
export const NavbarLink = ({
|
||||
|
@ -90,12 +90,13 @@ const items: Item[] = [
|
|||
},
|
||||
];
|
||||
|
||||
const Sidebar: FC<{ admin?: boolean }> = ({ admin }) => {
|
||||
const Sidebar = () => {
|
||||
const [user] = useAtom(userAtom);
|
||||
const [opened, setOpened] = useAtom(openedAtom);
|
||||
const router = useRouter();
|
||||
const mobile_screens = useMediaQuery('(max-width: 480px)');
|
||||
const theme = useMantineTheme();
|
||||
const admin = user?.role === 'OWNER' || user?.role === 'ADMIN';
|
||||
|
||||
const links = useMemo(() => {
|
||||
return (admin ? items : items.filter((item) => !item.admin)).map(
|
||||
|
|
|
@ -11,7 +11,7 @@ const Layout: FC<{
|
|||
return (
|
||||
<>
|
||||
<Navbar user={user} />
|
||||
<Sidebar admin={user?.role === 'OWNER' || user?.role === 'ADMIN'} />
|
||||
<Sidebar />
|
||||
<Box
|
||||
w={{ base: '95%', lg: '90%', md: '90%', sm: '90%' }}
|
||||
mx="auto"
|
||||
|
|
|
@ -15,7 +15,7 @@ export const useIsAuth = ({
|
|||
['auth'],
|
||||
() =>
|
||||
axios
|
||||
.get(API_URL + API_ROUTES.ME, { withCredentials: true })
|
||||
.get<SessionUser>(API_URL + API_ROUTES.ME, { withCredentials: true })
|
||||
.then((res) => {
|
||||
if (res.status !== 200) {
|
||||
redirectTo &&
|
||||
|
@ -24,7 +24,7 @@ export const useIsAuth = ({
|
|||
);
|
||||
return null;
|
||||
} else {
|
||||
const data = res.data as SessionUser;
|
||||
const data = res.data;
|
||||
setUser(data);
|
||||
return data;
|
||||
}
|
||||
|
|
|
@ -60,7 +60,7 @@ function Auth({
|
|||
: '';
|
||||
const { data, isLoading } = useIsAuth({
|
||||
redirectTo: ROUTES.SIGN_IN,
|
||||
callbackUrl: encodeURI(currentUrl),
|
||||
callbackUrl: encodeURIComponent(currentUrl),
|
||||
});
|
||||
|
||||
if (isLoading) return <LoadingPage color="yellow" />;
|
||||
|
|
|
@ -60,8 +60,8 @@ export const getServerSideProps = async (ctx: GetServerSidePropsContext) => {
|
|||
return {
|
||||
props: {
|
||||
data: {
|
||||
files: 0,
|
||||
size: 0,
|
||||
files: 'N/A',
|
||||
size: 'N/A',
|
||||
},
|
||||
},
|
||||
};
|
||||
|
|
|
@ -13,11 +13,7 @@ const Home = (
|
|||
return (
|
||||
<>
|
||||
<Navbar user={props?.user} />
|
||||
{props.user && (
|
||||
<Sidebar
|
||||
admin={props?.user?.role === 'OWNER' || props?.user?.role === 'ADMIN'}
|
||||
/>
|
||||
)}
|
||||
{props.user && <Sidebar />}
|
||||
<Hero />
|
||||
</>
|
||||
);
|
||||
|
|
Loading…
Reference in New Issue