diff --git a/src/components/LayoutArm/LayoutArm.tsx b/src/components/LayoutArm/LayoutArm.tsx index db48c23..da99da0 100644 --- a/src/components/LayoutArm/LayoutArm.tsx +++ b/src/components/LayoutArm/LayoutArm.tsx @@ -3,13 +3,19 @@ import Sidebar from '../Sidebar'; import Orders from '../Orders'; import Masters from '../Masters'; import React from 'react'; +import { Navigate, Route, Routes } from 'react-router-dom'; -const LayoutArm = ({ currentPage, onSelectPage }) => ( +const LayoutArm = () => ( - + - {currentPage === 'orders' && } - {currentPage === 'masters' && } + + + } /> + } /> + } /> + + ); diff --git a/src/components/Sidebar/Sidebar.tsx b/src/components/Sidebar/Sidebar.tsx index a88e350..38d9b38 100644 --- a/src/components/Sidebar/Sidebar.tsx +++ b/src/components/Sidebar/Sidebar.tsx @@ -1,8 +1,8 @@ import { Box, Button, Heading, VStack } from '@chakra-ui/react'; import React from 'react'; import { Divider } from '@chakra-ui/react'; - -const Sidebar = ({ onSelectPage }) => ( +import { Link } from 'react-router-dom'; +const Sidebar = () => ( ( - + + + - + + + diff --git a/src/pages/arm/index.tsx b/src/pages/arm/index.tsx index fda55d0..02d21c4 100644 --- a/src/pages/arm/index.tsx +++ b/src/pages/arm/index.tsx @@ -2,9 +2,7 @@ import React, { useState } from 'react'; import LayoutArm from '../../components/LayoutArm'; const Page = () => { - const [currentPage, setCurrentPage] = useState('orders'); - - return ; + return ; }; export default Page; diff --git a/src/routes.tsx b/src/routes.tsx index 6728eb6..f9ff75c 100644 --- a/src/routes.tsx +++ b/src/routes.tsx @@ -9,7 +9,7 @@ const Routers = () => { }> }> - }> + }> ); };