feat: add router config, layout, header, and toolbar
This commit is contained in:
1399
package-lock.json
generated
1399
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@@ -15,7 +15,8 @@
|
|||||||
"@emotion/styled": "^11.14.1",
|
"@emotion/styled": "^11.14.1",
|
||||||
"@mui/material": "^7.2.0",
|
"@mui/material": "^7.2.0",
|
||||||
"@mui/stylis-plugin-rtl": "^7.2.0",
|
"@mui/stylis-plugin-rtl": "^7.2.0",
|
||||||
"@rkheftan/harmony-ui": "^0.1.5",
|
"@rkheftan/harmony-ui": "^0.1.6",
|
||||||
|
"@types/stylis": "^4.2.7",
|
||||||
"i18next": "^25.3.0",
|
"i18next": "^25.3.0",
|
||||||
"i18next-browser-languagedetector": "^8.2.0",
|
"i18next-browser-languagedetector": "^8.2.0",
|
||||||
"i18next-http-backend": "^3.0.2",
|
"i18next-http-backend": "^3.0.2",
|
||||||
|
|||||||
@@ -2,6 +2,13 @@
|
|||||||
"side": {
|
"side": {
|
||||||
"account": "حساب کاربری",
|
"account": "حساب کاربری",
|
||||||
"personalInfo": "اطلاعات شخصی",
|
"personalInfo": "اطلاعات شخصی",
|
||||||
"contactInfo": "شماره تماس"
|
"contactInfo": "شماره تماس",
|
||||||
|
"email": "ایمیل",
|
||||||
|
"security": "امنیت",
|
||||||
|
"password": "رمز عبور",
|
||||||
|
"confirmedIps": "آدرس های تایید شده",
|
||||||
|
"recentSessions": "ورود های اخیر",
|
||||||
|
"activeSessions": "نشست های فعال",
|
||||||
|
"setting": "تنظیمات"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
35
src/components/Layout/Header.tsx
Normal file
35
src/components/Layout/Header.tsx
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
import { Box, IconButton, Typography } from '@mui/material';
|
||||||
|
import { Icon } from '@rkheftan/harmony-ui';
|
||||||
|
import { More } from 'iconsax-react';
|
||||||
|
import type { User } from './type';
|
||||||
|
|
||||||
|
interface HeaderProps {
|
||||||
|
user: User;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const Header: React.FC<HeaderProps> = ({ user }) => {
|
||||||
|
return (
|
||||||
|
<Box
|
||||||
|
sx={{
|
||||||
|
p: 2,
|
||||||
|
display: 'flex',
|
||||||
|
alignItems: 'center',
|
||||||
|
justifyContent: 'space-between',
|
||||||
|
height: (t) => t.spacing(10.5),
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<Box>
|
||||||
|
<Typography variant="body1">
|
||||||
|
{user.firstName + ' ' + user.lastName}
|
||||||
|
</Typography>
|
||||||
|
<Typography variant="body2" color="textSecondary">
|
||||||
|
{user.phoneNumber}
|
||||||
|
</Typography>
|
||||||
|
</Box>
|
||||||
|
|
||||||
|
<IconButton>
|
||||||
|
<Icon Component={More} />
|
||||||
|
</IconButton>
|
||||||
|
</Box>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -1,13 +1,24 @@
|
|||||||
import { SideNav } from '@rkheftan/harmony-ui';
|
import { SideNav } from '@rkheftan/harmony-ui';
|
||||||
import { buildNavItems } from './navItems';
|
import { buildNavItems } from './buildNavItems';
|
||||||
import { appRoutes } from '@/routes/config';
|
import { appRoutes } from '@/routes/config';
|
||||||
import { Outlet, useLocation } from 'react-router-dom';
|
import { Outlet, useLocation } from 'react-router-dom';
|
||||||
import { Box } from '@mui/material';
|
import { Box, useMediaQuery, useTheme } from '@mui/material';
|
||||||
import { grey } from '@mui/material/colors';
|
import { Header } from './Header';
|
||||||
|
import { useState } from 'react';
|
||||||
|
import { Toolbar } from './Toolbar';
|
||||||
|
import type { User } from './type';
|
||||||
|
|
||||||
export const Layout = () => {
|
export const Layout = () => {
|
||||||
const navItemConfigs = buildNavItems(appRoutes);
|
const navItemConfigs = buildNavItems(appRoutes);
|
||||||
const location = useLocation();
|
const location = useLocation();
|
||||||
|
const theme = useTheme();
|
||||||
|
const isMobile = useMediaQuery(theme.breakpoints.down('md'));
|
||||||
|
const [sideNavOpen, setSideNavOpen] = useState(false);
|
||||||
|
const [user] = useState<User>({
|
||||||
|
firstName: 'محمد حسین',
|
||||||
|
lastName: 'برزه گر',
|
||||||
|
phoneNumber: '09123456789',
|
||||||
|
});
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Box
|
<Box
|
||||||
@@ -20,25 +31,37 @@ export const Layout = () => {
|
|||||||
>
|
>
|
||||||
<Box
|
<Box
|
||||||
sx={{
|
sx={{
|
||||||
width: 1070,
|
// TODO: Check for better approach
|
||||||
height: '80%',
|
width: isMobile ? '100%' : 1070,
|
||||||
|
height: isMobile ? '100vh' : '80%',
|
||||||
display: 'flex',
|
display: 'flex',
|
||||||
flexDirection: 'row-reverse',
|
flexDirection: 'row-reverse',
|
||||||
borderRadius: 4,
|
borderRadius: isMobile ? 0 : 4,
|
||||||
backgroundColor: 'background.paper',
|
backgroundColor: 'background.paper',
|
||||||
overflow: 'hidden',
|
overflow: 'hidden',
|
||||||
padding: 1,
|
|
||||||
}}
|
}}
|
||||||
>
|
>
|
||||||
<Box sx={{ flex: 1 }}>
|
<Box sx={{ flex: 1 }}>
|
||||||
|
<Toolbar
|
||||||
|
isMobile={isMobile}
|
||||||
|
sideNavOpen={sideNavOpen}
|
||||||
|
setSideNavOpen={setSideNavOpen}
|
||||||
|
user={user}
|
||||||
|
/>
|
||||||
<Outlet />
|
<Outlet />
|
||||||
</Box>
|
</Box>
|
||||||
|
|
||||||
<SideNav
|
<SideNav
|
||||||
|
open={sideNavOpen}
|
||||||
|
onClose={() => setSideNavOpen(false)}
|
||||||
|
header={isMobile ? undefined : <Header user={user} />}
|
||||||
|
footer={isMobile ? <Header user={user} /> : undefined}
|
||||||
navConfig={navItemConfigs}
|
navConfig={navItemConfigs}
|
||||||
activePath={location.pathname + location.hash}
|
activePath={location.pathname + location.hash}
|
||||||
selectedVariant="textOnly"
|
selectedVariant="textOnly"
|
||||||
positioning="absolute"
|
positioning="absolute"
|
||||||
|
sideNavVariant={isMobile ? 'temporary' : 'full'}
|
||||||
|
top={8.125}
|
||||||
/>
|
/>
|
||||||
</Box>
|
</Box>
|
||||||
</Box>
|
</Box>
|
||||||
|
|||||||
75
src/components/Layout/Toolbar.tsx
Normal file
75
src/components/Layout/Toolbar.tsx
Normal file
@@ -0,0 +1,75 @@
|
|||||||
|
import {
|
||||||
|
Avatar,
|
||||||
|
Box,
|
||||||
|
IconButton,
|
||||||
|
Toolbar as MuiToolbar,
|
||||||
|
Typography,
|
||||||
|
} from '@mui/material';
|
||||||
|
import { Icon } from '@rkheftan/harmony-ui';
|
||||||
|
import { HambergerMenu, Menu } from 'iconsax-react';
|
||||||
|
import type { Dispatch, SetStateAction } from 'react';
|
||||||
|
import type { User } from './type';
|
||||||
|
|
||||||
|
interface ToolbarProps {
|
||||||
|
sideNavOpen: boolean;
|
||||||
|
setSideNavOpen: Dispatch<SetStateAction<boolean>>;
|
||||||
|
isMobile: boolean;
|
||||||
|
user: User;
|
||||||
|
}
|
||||||
|
|
||||||
|
export const Toolbar: React.FC<ToolbarProps> = ({
|
||||||
|
sideNavOpen,
|
||||||
|
setSideNavOpen,
|
||||||
|
isMobile,
|
||||||
|
user,
|
||||||
|
}) => {
|
||||||
|
return (
|
||||||
|
<MuiToolbar
|
||||||
|
sx={{
|
||||||
|
height: (t) => t.spacing(isMobile ? 8 : 10.5),
|
||||||
|
px: isMobile ? 3 : 2,
|
||||||
|
borderBottom: (t) => `1px solid ${t.palette.divider}`,
|
||||||
|
boxSizing: 'content-box',
|
||||||
|
display: 'flex',
|
||||||
|
alignItems: 'center',
|
||||||
|
justifyContent: 'space-between',
|
||||||
|
}}
|
||||||
|
>
|
||||||
|
<Box
|
||||||
|
sx={{ display: 'flex', height: '100%', alignItems: 'center', gap: 2 }}
|
||||||
|
>
|
||||||
|
{isMobile && (
|
||||||
|
<IconButton
|
||||||
|
sx={{
|
||||||
|
backgroundColor: sideNavOpen ? 'primary.light' : undefined,
|
||||||
|
color: sideNavOpen ? 'primary.main' : undefined,
|
||||||
|
'&:hover': {
|
||||||
|
backgroundColor: sideNavOpen ? 'primary.light' : undefined,
|
||||||
|
},
|
||||||
|
}}
|
||||||
|
onClick={() => setSideNavOpen(!sideNavOpen)}
|
||||||
|
>
|
||||||
|
<Icon Component={HambergerMenu} />
|
||||||
|
</IconButton>
|
||||||
|
)}
|
||||||
|
{/* <Logo /> */}
|
||||||
|
<Typography variant="h6">LOGO placeholder</Typography>
|
||||||
|
</Box>
|
||||||
|
<Box
|
||||||
|
sx={{ display: 'flex', height: '100%', alignItems: 'center', gap: 1 }}
|
||||||
|
>
|
||||||
|
{isMobile && (
|
||||||
|
<Avatar
|
||||||
|
sx={{ width: 32, height: 32, fontSize: '14px' }}
|
||||||
|
src={user.profileUrl}
|
||||||
|
>
|
||||||
|
{user.firstName.charAt(0) + ' ' + user.lastName.charAt(0)}
|
||||||
|
</Avatar>
|
||||||
|
)}
|
||||||
|
<IconButton>
|
||||||
|
<Icon Component={Menu} variant="Bold" />
|
||||||
|
</IconButton>
|
||||||
|
</Box>
|
||||||
|
</MuiToolbar>
|
||||||
|
);
|
||||||
|
};
|
||||||
34
src/components/Layout/buildNavItems.tsx
Normal file
34
src/components/Layout/buildNavItems.tsx
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
// src/components/SideNav.tsx (Conceptual Example)
|
||||||
|
|
||||||
|
import { useTranslation } from 'react-i18next';
|
||||||
|
import { type RouteConfig } from '@/routes/config';
|
||||||
|
import { Icon, type NavItemConfig } from '@rkheftan/harmony-ui';
|
||||||
|
import type { Icon as Iconsax } from 'iconsax-react';
|
||||||
|
|
||||||
|
const getIcon = (icon?: Iconsax) => (isSelected: boolean) =>
|
||||||
|
icon ? (
|
||||||
|
<Icon Component={icon} variant={isSelected ? 'Bold' : 'Broken'} />
|
||||||
|
) : undefined;
|
||||||
|
|
||||||
|
export function buildNavItems(routes: RouteConfig[]): NavItemConfig[] {
|
||||||
|
const { t } = useTranslation();
|
||||||
|
|
||||||
|
return routes.flatMap((route) => {
|
||||||
|
// Check if route itself does not have a navItem but its child has
|
||||||
|
if (!route.navConfig && route.children) {
|
||||||
|
return buildNavItems(route.children);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Check if route.navConfig is defined before destructuring
|
||||||
|
if (!route.navConfig) {
|
||||||
|
return []; // Return an empty array to be flattened
|
||||||
|
}
|
||||||
|
const { title, icon } = route.navConfig;
|
||||||
|
return {
|
||||||
|
text: t(title),
|
||||||
|
getIcon: getIcon(icon),
|
||||||
|
path: route.path,
|
||||||
|
children: route.children ? buildNavItems(route.children) : undefined,
|
||||||
|
};
|
||||||
|
});
|
||||||
|
}
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
// src/components/SideNav.tsx (Conceptual Example)
|
|
||||||
|
|
||||||
import { useTranslation } from 'react-i18next';
|
|
||||||
import { type RouteConfig } from '@/routes/config';
|
|
||||||
import { Icon, type NavItemConfig } from '@rkheftan/harmony-ui';
|
|
||||||
import type { Icon as Iconsax } from 'iconsax-react';
|
|
||||||
|
|
||||||
const getIcon = (icon?: Iconsax) => (isSelected: boolean) =>
|
|
||||||
icon ? (
|
|
||||||
<Icon Component={icon} variant={isSelected ? 'Bold' : 'Broken'} />
|
|
||||||
) : undefined;
|
|
||||||
|
|
||||||
export function buildNavItems(routes: RouteConfig[]): NavItemConfig[] {
|
|
||||||
const { t } = useTranslation();
|
|
||||||
|
|
||||||
return routes
|
|
||||||
.filter((route) => route.navConfig)
|
|
||||||
.map((route) => {
|
|
||||||
const { title, icon } = route.navConfig!;
|
|
||||||
return {
|
|
||||||
text: t(title),
|
|
||||||
getIcon: getIcon(icon),
|
|
||||||
path: route.path,
|
|
||||||
children: route.children ? buildNavItems(route.children) : undefined,
|
|
||||||
};
|
|
||||||
});
|
|
||||||
}
|
|
||||||
8
src/components/Layout/type.ts
Normal file
8
src/components/Layout/type.ts
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
// TODO: this type file is temporary and should replace it with the actual use type and value when api is ready
|
||||||
|
|
||||||
|
export interface User {
|
||||||
|
firstName: string;
|
||||||
|
lastName: string;
|
||||||
|
phoneNumber: string;
|
||||||
|
profileUrl?: string;
|
||||||
|
}
|
||||||
@@ -3,6 +3,7 @@ import { useTranslation } from 'react-i18next';
|
|||||||
import { CacheProvider } from '@emotion/react';
|
import { CacheProvider } from '@emotion/react';
|
||||||
import createCache from '@emotion/cache';
|
import createCache from '@emotion/cache';
|
||||||
import rtlPlugin from 'stylis-plugin-rtl';
|
import rtlPlugin from 'stylis-plugin-rtl';
|
||||||
|
import { prefixer } from 'stylis';
|
||||||
|
|
||||||
// This provider configures Emotion's cache to support RTL.
|
// This provider configures Emotion's cache to support RTL.
|
||||||
export const RtlProvider: React.FC<{ children: React.ReactNode }> = ({
|
export const RtlProvider: React.FC<{ children: React.ReactNode }> = ({
|
||||||
@@ -15,8 +16,8 @@ export const RtlProvider: React.FC<{ children: React.ReactNode }> = ({
|
|||||||
const newDir = i18n.dir(i18n.language);
|
const newDir = i18n.dir(i18n.language);
|
||||||
|
|
||||||
const newCache = createCache({
|
const newCache = createCache({
|
||||||
key: 'css',
|
key: 'mui',
|
||||||
stylisPlugins: newDir === 'rtl' ? [rtlPlugin] : [],
|
stylisPlugins: newDir === 'rtl' ? [prefixer, rtlPlugin] : [],
|
||||||
});
|
});
|
||||||
setCache(newCache);
|
setCache(newCache);
|
||||||
}, [i18n, i18n.language]);
|
}, [i18n, i18n.language]);
|
||||||
|
|||||||
@@ -1,5 +1,17 @@
|
|||||||
import { Layout } from '@/components/Layout/Layout';
|
import { Layout } from '@/components/Layout/Layout';
|
||||||
import { Mobile, Personalcard, ProfileCircle, type Icon } from 'iconsax-react';
|
import {
|
||||||
|
Calendar,
|
||||||
|
Devices,
|
||||||
|
LocationTick,
|
||||||
|
Mobile,
|
||||||
|
PasswordCheck,
|
||||||
|
Personalcard,
|
||||||
|
ProfileCircle,
|
||||||
|
Setting,
|
||||||
|
Shield,
|
||||||
|
Sms,
|
||||||
|
type Icon,
|
||||||
|
} from 'iconsax-react';
|
||||||
import { type ReactNode } from 'react';
|
import { type ReactNode } from 'react';
|
||||||
import { Navigate } from 'react-router-dom';
|
import { Navigate } from 'react-router-dom';
|
||||||
|
|
||||||
@@ -13,34 +25,93 @@ export interface RouteConfig {
|
|||||||
children?: RouteConfig[];
|
children?: RouteConfig[];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// can lazy load component if needed (ex. lazy(() => import('@/features/home/routes/HomePage'));)
|
||||||
export const appRoutes: RouteConfig[] = [
|
export const appRoutes: RouteConfig[] = [
|
||||||
{
|
{
|
||||||
path: '/',
|
path: '/',
|
||||||
element: <Navigate to="/profile" replace />,
|
element: <Navigate to="/setting/profile" replace />,
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: '/profile',
|
path: '/setting',
|
||||||
// can lazy load component if needed (ex. lazy(() => import('@/features/home/routes/HomePage'));)
|
|
||||||
element: <Layout />,
|
element: <Layout />,
|
||||||
navConfig: {
|
|
||||||
title: 'side.account',
|
|
||||||
icon: ProfileCircle,
|
|
||||||
},
|
|
||||||
children: [
|
children: [
|
||||||
|
// TODO: add route component to each route
|
||||||
{
|
{
|
||||||
path: '/profile/info',
|
path: '/setting/profile',
|
||||||
element: <div>Personal Info Section</div>,
|
|
||||||
navConfig: {
|
navConfig: {
|
||||||
title: 'side.personalInfo',
|
// Profile component
|
||||||
icon: Personalcard,
|
title: 'side.account',
|
||||||
|
icon: ProfileCircle,
|
||||||
|
},
|
||||||
|
children: [
|
||||||
|
{
|
||||||
|
path: '/setting/profile#info',
|
||||||
|
navConfig: {
|
||||||
|
title: 'side.personalInfo',
|
||||||
|
icon: Personalcard,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
path: '/setting/profile#contact-info',
|
||||||
|
navConfig: {
|
||||||
|
title: 'side.contactInfo',
|
||||||
|
icon: Mobile,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
path: '/setting/profile#email',
|
||||||
|
navConfig: {
|
||||||
|
title: 'side.email',
|
||||||
|
icon: Sms,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
path: '/setting/security',
|
||||||
|
// security component
|
||||||
|
navConfig: {
|
||||||
|
title: 'side.security',
|
||||||
|
icon: Shield,
|
||||||
|
},
|
||||||
|
children: [
|
||||||
|
{
|
||||||
|
path: '/setting/security#password',
|
||||||
|
navConfig: {
|
||||||
|
title: 'side.password',
|
||||||
|
icon: PasswordCheck,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
path: '/setting/security#confirmed-ips',
|
||||||
|
navConfig: {
|
||||||
|
title: 'side.confirmedIps',
|
||||||
|
icon: LocationTick,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
{
|
||||||
|
path: '/setting/security#recent-sessions',
|
||||||
|
navConfig: {
|
||||||
|
title: 'side.recentSessions',
|
||||||
|
icon: Devices,
|
||||||
|
},
|
||||||
|
},
|
||||||
|
],
|
||||||
|
},
|
||||||
|
{
|
||||||
|
path: '/setting/active-sessions',
|
||||||
|
// active session component
|
||||||
|
navConfig: {
|
||||||
|
title: 'side.activeSessions',
|
||||||
|
icon: Calendar,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
path: '/profile/contact-info',
|
path: '/setting/preferences',
|
||||||
element: <div>Personal Info Section</div>,
|
// setting component
|
||||||
navConfig: {
|
navConfig: {
|
||||||
title: 'side.contactInfo',
|
title: 'side.setting',
|
||||||
icon: Mobile,
|
icon: Setting,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
|
|||||||
Reference in New Issue
Block a user