Merge branch 'feat/landing' of ssh://85.143.175.152:222/dry_wash_inc/dry-wash-pl into feat/landing

src/components/LayoutArm/LayoutArm.tsx

@@ -3,19 +3,13 @@ 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 = () => (
+const LayoutArm = ({ currentPage, onSelectPage }) => (
   <Flex h='100vh'>
-    <Sidebar />
+    <Sidebar onSelectPage={onSelectPage} />
     <Box flex='1' bg='gray.50'>
-      <Routes>
+      {currentPage === 'orders' && <Orders />}
-        <Route>
+      {currentPage === 'masters' && <Masters />}
-          <Route index element={<Navigate to='orders' replace />} />
-          <Route path='orders' element={<Orders />} />
-          <Route path='masters' element={<Masters />} />
-        </Route>
-      </Routes>
     </Box>
   </Flex>
 );

src/components/Sidebar/Sidebar.tsx

@@ -2,9 +2,7 @@ import { Box, Button, Heading, VStack } from '@chakra-ui/react';
 import React from 'react';
 import { Divider } from '@chakra-ui/react';
 import i18next from 'i18next';
-import { Link } from 'react-router-dom';
+const Sidebar = ({ onSelectPage }) => (
-
-const Sidebar = () => (
   <Box
     borderRight='1px solid black'
     bg='gray.50'
@@ -20,8 +18,7 @@ const Sidebar = () => (
     <VStack align='start' spacing='4'>
       <Divider />
       <Button
-        as={Link}
+        onClick={() => onSelectPage('orders')}
-        to='orders'
         w='100%'
         colorScheme='green'
         variant='ghost'
@@ -30,8 +27,7 @@ const Sidebar = () => (
       </Button>
       <Divider />
       <Button
-        as={Link}
+        onClick={() => onSelectPage('masters')}
-        to='masters'
         w='100%'
         colorScheme='green'
         variant='ghost'

src/pages/arm/index.tsx

@@ -2,7 +2,9 @@ import React, { useState } from 'react';
 import LayoutArm from '../../components/LayoutArm';
 
 const Page = () => {
-  return <LayoutArm />;
+  const [currentPage, setCurrentPage] = useState('orders');
+
+  return <LayoutArm currentPage={currentPage} onSelectPage={setCurrentPage} />;
 };
 
 export default Page;

src/pages/landing/index.tsx

@@ -1,5 +1,5 @@
 import React, { FC } from 'react';
-import { Box, Container, VStack } from '@chakra-ui/react';
+import { Container, VStack } from '@chakra-ui/react';
 import {
   BenefitsSection,
   Footer,
@@ -19,14 +19,12 @@ const Page: FC = () => {
         bg='white'
         centerContent
       >
-        <VStack w='full' h='full' alignItems='stretch'>
+        <VStack w='full' h='full' alignItems='stretch' flexGrow={1}>
           <HeroSection flexShrink={0} />
-          <Box flexGrow={1}>
+          <VStack as='main' flexGrow={1}>
-            <VStack as='main'>
             <BenefitsSection />
             <SocialProofSection />
           </VStack>
-          </Box>
           <Footer />
         </VStack>
       </Container>

src/routes.tsx

@@ -16,10 +16,9 @@ const Routers = () => {
           <Route path='order-form' element={<OrderForm />} />
           <Route path='order-view' element={<OrderView />} />
         </Route>
-        <Route path='/dry-wash/arm/*' element={<Arm />}></Route>
+        <Route path='/dry-wash/arm' element={<Arm />}></Route>
       </Routes>
     </Suspense>
-
   );
 };