lavoce #2

Merged
yogiedigital merged 118 commits from lavoce into main 2025-10-20 04:06:02 +00:00
3 changed files with 22 additions and 24 deletions
Showing only changes of commit aa68c6690e - Show all commits

View File

@@ -25,7 +25,6 @@ import {
TeamOutlined, TeamOutlined,
ClockCircleOutlined, ClockCircleOutlined,
CalendarOutlined, CalendarOutlined,
UsergroupAddOutlined,
} from '@ant-design/icons'; } from '@ant-design/icons';
const { Text } = Typography; const { Text } = Typography;
@@ -50,6 +49,11 @@ const allItems = [
icon: <ProductOutlined style={{ fontSize: '19px' }} />, icon: <ProductOutlined style={{ fontSize: '19px' }} />,
label: <Link to="/master/plant-section">Plant Section</Link>, label: <Link to="/master/plant-section">Plant Section</Link>,
}, },
{
key: 'master-brand-device',
icon: <AntDesignOutlined style={{ fontSize: '19px' }} />,
label: <Link to="/master/brand-device">Brand Device</Link>,
},
{ {
key: 'master-device', key: 'master-device',
icon: <MobileOutlined style={{ fontSize: '19px' }} />, icon: <MobileOutlined style={{ fontSize: '19px' }} />,
@@ -60,11 +64,6 @@ const allItems = [
icon: <TagOutlined style={{ fontSize: '19px' }} />, icon: <TagOutlined style={{ fontSize: '19px' }} />,
label: <Link to="/master/tag">Tag</Link>, label: <Link to="/master/tag">Tag</Link>,
}, },
{
key: 'master-brand-device',
icon: <AntDesignOutlined style={{ fontSize: '19px' }} />,
label: <Link to="/master/brand-device">Brand Device</Link>,
},
{ {
key: 'master-status', key: 'master-status',
icon: <SafetyOutlined style={{ fontSize: '19px' }} />, icon: <SafetyOutlined style={{ fontSize: '19px' }} />,
@@ -139,18 +138,6 @@ const allItems = [
</Link> </Link>
), ),
}, },
{
key: 'shift-management',
icon: <ClockCircleOutlined style={{ fontSize: '19px' }} />,
label: 'Manajemen Shift',
children: [
{
key: 'shift-member',
icon: <UsergroupAddOutlined style={{ fontSize: '19px' }} />,
label: <Link to="/shift-management/member">Anggota Shift</Link>,
},
],
},
]; ];
const LayoutMenu = () => { const LayoutMenu = () => {

View File

@@ -1,4 +1,4 @@
import React from 'react' import React from 'react';
import { Layout } from 'antd'; import { Layout } from 'antd';
import LayoutLogo from './LayoutLogo'; import LayoutLogo from './LayoutLogo';
import LayoutMenu from './LayoutMenu'; import LayoutMenu from './LayoutMenu';
@@ -18,12 +18,18 @@ const LayoutSidebar = () => {
}} }}
style={{ style={{
background: 'linear-gradient(180deg, #FF8C42 0%, #FF6B35 100%)', background: 'linear-gradient(180deg, #FF8C42 0%, #FF6B35 100%)',
overflow: 'auto',
height: '100vh',
position: 'fixed',
left: 0,
top: 0,
bottom: 0,
}} }}
> >
<LayoutLogo /> <LayoutLogo />
<LayoutMenu /> <LayoutMenu />
</Sider> </Sider>
) );
} };
export default LayoutSidebar export default LayoutSidebar;

View File

@@ -1,21 +1,26 @@
import React from 'react'; import React, { useState, useEffect } from 'react';
import { Layout, theme } from 'antd'; import { Layout, theme, Grid } from 'antd';
import LayoutFooter from './LayoutFooter'; import LayoutFooter from './LayoutFooter';
import LayoutHeader from './LayoutHeader'; import LayoutHeader from './LayoutHeader';
import LayoutSidebar from './LayoutSidebar'; import LayoutSidebar from './LayoutSidebar';
const { Content } = Layout; const { Content } = Layout;
const { useBreakpoint } = Grid;
const MainLayout = ({ children }) => { const MainLayout = ({ children }) => {
const { const {
token: { colorBgContainer, borderRadiusLG }, token: { colorBgContainer, borderRadiusLG },
} = theme.useToken(); } = theme.useToken();
const screens = useBreakpoint();
const isDesktop = screens.lg;
return ( return (
<Layout style={{ height: '100vh' }}> <Layout style={{ height: '100vh' }}>
<LayoutSidebar /> <LayoutSidebar />
<Layout <Layout
style={{ style={{
marginLeft: isDesktop ? '300px' : '0',
overflow: 'auto', overflow: 'auto',
}} }}
> >