Commit 3ca99732 by Arjun Jhukal

took out the user based route from private

parent 912dc31e
import Private from '@/routes/Private'
import React from 'react'
export default function AdminLayout({ children }: { children: React.ReactNode }) {
return (
<Private>
{children}
</Private>
)
}
import DashboardLayout from '@/components/layouts/DashboardLayout' import DashboardLayout from '@/components/layouts/DashboardLayout'
import Private from '@/routes/Private'
import React from 'react' import React from 'react'
export default function DashboardRootLayout({ children }: { children: React.ReactNode }) { export default function DashboardRootLayout({ children }: { children: React.ReactNode }) {
return ( return (
<Private> <DashboardLayout>
<DashboardLayout> {children}
{children} </DashboardLayout>
</DashboardLayout>
</Private>
) )
} }
...@@ -6,15 +6,18 @@ import CoinCard from '@/components/molecules/CoinCard' ...@@ -6,15 +6,18 @@ import CoinCard from '@/components/molecules/CoinCard'
import GoldCoinIcon from '@/icons/GoldCoinIcon' import GoldCoinIcon from '@/icons/GoldCoinIcon'
import SilverCoinIcon from '@/icons/SilverCoinIcon' import SilverCoinIcon from '@/icons/SilverCoinIcon'
import UserCoinCard from './UserCoinCard' import UserCoinCard from './UserCoinCard'
import Private from '@/routes/Private'
export default function UserHeader() { export default function UserHeader() {
return ( return (
<Box className='flex items-center gap-4 justify-between w-full'> <Box className='flex items-center gap-4 justify-between w-full'>
<AdminSearchBar /> <AdminSearchBar />
<div className="right flex items-center gap-4"> <Private>
<UserCoinCard /> <div className="right flex items-center gap-4">
<Profile /> <UserCoinCard />
</div> <Profile />
</div>
</Private>
</Box> </Box>
) )
} }
import SupportIcon from '@/app/customIcons/SupportIcon'; import SupportIcon from '@/app/customIcons/SupportIcon';
import { PATH } from '@/routes/PATH'; import { PATH } from '@/routes/PATH';
import Private from '@/routes/Private';
import { Box, Button, List, ListItem, ListItemButton, ListItemIcon, ListItemText, Typography } from '@mui/material' import { Box, Button, List, ListItem, ListItemButton, ListItemIcon, ListItemText, Typography } from '@mui/material'
import { Home, MessageQuestion, ReceiptEdit, RecordCircle, StatusUp, UserEdit } from '@wandersonalwes/iconsax-react'; import { Home, MessageQuestion, ReceiptEdit, RecordCircle, StatusUp, UserEdit } from '@wandersonalwes/iconsax-react';
import { usePathname, useRouter } from 'next/navigation'; import { usePathname, useRouter } from 'next/navigation';
...@@ -10,10 +11,12 @@ export default function UserMenu({ open }: { open: boolean }) { ...@@ -10,10 +11,12 @@ export default function UserMenu({ open }: { open: boolean }) {
const router = useRouter(); const router = useRouter();
return ( return (
<Box> <Box>
{open ? <div className="flex justify-between items-center gap-1 mb-6"> {open ? <Private>
<Button variant='contained' color='primary'>Buy Coins</Button> <div className="flex justify-between items-center gap-1 mb-6">
<Button variant='contained' color='secondary'>Withdraw</Button> <Button variant='contained' color='primary'>Buy Coins</Button>
</div> : null} <Button variant='contained' color='secondary'>Withdraw</Button>
</div>
</Private> : null}
<div className="flex flex-col gap-16 lg:gap-28"> <div className="flex flex-col gap-16 lg:gap-28">
<List> <List>
......
...@@ -31,7 +31,7 @@ export default function Private({ children }: { children: React.ReactNode }) { ...@@ -31,7 +31,7 @@ export default function Private({ children }: { children: React.ReactNode }) {
if (!accessToken || isTokenExpired(accessToken)) { if (!accessToken || isTokenExpired(accessToken)) {
dispatch(clearTokens()); dispatch(clearTokens());
router.replace("/login"); // router.replace("/login");
return; return;
} }
...@@ -40,9 +40,9 @@ export default function Private({ children }: { children: React.ReactNode }) { ...@@ -40,9 +40,9 @@ export default function Private({ children }: { children: React.ReactNode }) {
dispatch(setTokens({ access_token: accessToken, user: user || null })); dispatch(setTokens({ access_token: accessToken, user: user || null }));
} }
if (!user) { // if (!user) {
router.replace("/login"); // router.replace("/login");
} // }
}, [token, user, dispatch, router]); }, [token, user, dispatch, router]);
if (!user) return null; if (!user) return null;
......
...@@ -22,7 +22,7 @@ export default function ThemeCustomization({ children }: { children: React.React ...@@ -22,7 +22,7 @@ export default function ThemeCustomization({ children }: { children: React.React
React.useEffect(() => { React.useEffect(() => {
if (!user || !user.role) { if (!user || !user.role) {
setTheme(ThemeMode.DARK); setTheme(ThemeMode.DARK);
setPalette(AdminPalette(ThemeMode.DARK)); setPalette(Palette(ThemeMode.DARK));
} else if (user.role.toUpperCase() === "USER") { } else if (user.role.toUpperCase() === "USER") {
setTheme(ThemeMode.DARK); setTheme(ThemeMode.DARK);
setPalette(Palette(ThemeMode.DARK)); setPalette(Palette(ThemeMode.DARK));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment