fix: align footer to bottom (#7)

locales/ru.json

@@ -1,33 +0,0 @@
-{
-  "dry-wash.arm.master.add": "Добавить",
-  "dry-wash.arm.order.title": "Заказы",
-  "dry-wash.arm.order.status.progress": "Выполняется",
-  "dry-wash.arm.order.status.complete": "Завершено",
-  "dry-wash.arm.order.status.pending": "в ожидании",
-  "dry-wash.arm.order.status.working": "В работе",
-  "dry-wash.arm.order.status.canceled": "Отменено",
-  "dry-wash.arm.order.status.placeholder": "Выберите статус",
-  "dry-wash.arm.order.table.header.carNumber": "Номер машины",
-  "dry-wash.arm.order.table.header.washingTime": "Время мойки",
-  "dry-wash.arm.order.table.header.orderDate": "Дата заказа",
-  "dry-wash.arm.order.table.header.status": "Статус",
-  "dry-wash.arm.order.table.header.telephone": "Телефон",
-  "dry-wash.arm.order.table.header.location": "Расположение",
-  "dry-wash.arm.master.title": "Мастера",
-  "dry-wash.arm.master.table.header.name": "Имя",
-  "dry-wash.arm.master.table.header.currentJob": "Актуальная занятость",
-  "dry-wash.arm.master.table.header.phone": "Телефон",
-  "dry-wash.arm.master.table.header.actions": "Действия",
-  "dry-wash.arm.master.table.actionsMenu.delete": "Удалить мастера",
-  "dry-wash.arm.master.drawer.title": "Добавить нового мастера",
-  "dry-wash.arm.master.drawer.inputName.label": "ФИО",
-  "dry-wash.arm.master.drawer.inputName.placeholder": "Введите ФИО",
-  "dry-wash.arm.master.drawer.inputPhone.label": "Номер телефона",
-  "dry-wash.arm.master.drawer.inputPhone.placeholder": "Введите номер телефона",
-  "dry-wash.arm.master.drawer.button.save": "Сохранить",
-  "dry-wash.arm.master.drawer.button.cancel": "Отменить",
-  "dry-wash.arm.master.sideBar.title": " Сухой мастер",
-  "dry-wash.arm.master.sideBar.title.master": "Мастера",
-  "dry-wash.arm.master.sideBar.title.orders": "Заказы"
-
-}

package.json

@@ -17,7 +17,7 @@
     "author": "",
     "license": "ISC",
     "dependencies": {
-        "@brojs/cli": "^1.6.1",
+        "@brojs/cli": "^1.3.0",
         "@chakra-ui/icons": "^2.2.4",
         "@chakra-ui/react": "^2.4.2",
         "@emotion/react": "^11.4.1",
@@ -26,7 +26,6 @@
         "@types/react": "^18.3.12",
         "express": "^4.21.1",
         "framer-motion": "^6.2.8",
-        "i18next": "^23.16.4",
         "react": "^18.3.1",
         "react-dom": "^18.3.1",
         "react-icons": "^5.3.0",

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/MasterActionsMenu/MasterActionsMenu.tsx

@@ -7,16 +7,15 @@ import {
   IconButton,
 } from '@chakra-ui/react';
 import { EditIcon } from '@chakra-ui/icons';
-import i18next from 'i18next';
 
 const MasterActionsMenu = () => {
   return (
     <Menu>
       <MenuButton icon={<EditIcon />} as={IconButton} variant='outline' />
       <MenuList>
-        <MenuItem>
+        <MenuItem>Посмотреть профиль</MenuItem>
-          {i18next.t('dry-wash.arm.master.table.actionsMenu.delete')}
+        <MenuItem>Изменить расписание</MenuItem>
-        </MenuItem>
+        <MenuItem>Удалить мастера</MenuItem>
       </MenuList>
     </Menu>
   );

src/components/MasterModal/MasterDrawer.tsx

@@ -12,7 +12,6 @@ import {
   DrawerHeader,
   DrawerOverlay,
 } from '@chakra-ui/react';
-import i18next from 'i18next';
 
 const MasterDrawer = ({ isOpen, onClose }) => {
   const [newMaster, setNewMaster] = useState({ name: '', phone: '' });
@@ -27,46 +26,35 @@ const MasterDrawer = ({ isOpen, onClose }) => {
       <DrawerOverlay />
       <DrawerContent>
         <DrawerCloseButton />
-        <DrawerHeader>
+        <DrawerHeader>Добавить нового мастера</DrawerHeader>
-          {i18next.t('dry-wash.arm.master.drawer.title')}
-        </DrawerHeader>
         <DrawerBody>
           <FormControl mb='4'>
-            <FormLabel>
+            <FormLabel>ФИО</FormLabel>
-              {i18next.t('dry-wash.arm.master.drawer.inputName.label')}
-            </FormLabel>
             <Input
               value={newMaster.name}
               onChange={(e) =>
                 setNewMaster({ ...newMaster, name: e.target.value })
               }
-              placeholder={i18next.t(
+              placeholder='Введите ФИО'
-                'dry-wash.arm.master.drawer.inputName.placeholder',
-              )}
             />
           </FormControl>
           <FormControl>
-            <FormLabel>
+            <FormLabel>Номер телефона</FormLabel>
-              {' '}
-              {i18next.t('dry-wash.arm.master.drawer.inputPhone.label')}
-            </FormLabel>
             <Input
               value={newMaster.phone}
               onChange={(e) =>
                 setNewMaster({ ...newMaster, phone: e.target.value })
               }
-              placeholder={i18next.t(
+              placeholder='Введите номер телефона'
-                'dry-wash.arm.master.drawer.inputPhone.placeholder',
-              )}
             />
           </FormControl>
         </DrawerBody>
         <DrawerFooter>
           <Button colorScheme='teal' mr={3} onClick={handleSave}>
-            {i18next.t('dry-wash.arm.master.drawer.button.save')}
+            Сохранить
           </Button>
           <Button variant='ghost' onClick={onClose}>
-            {i18next.t('dry-wash.arm.master.drawer.button.cancel')}
+            Отменить
           </Button>
         </DrawerFooter>
       </DrawerContent>

src/components/Masters/Masters.tsx

@@ -13,10 +13,9 @@ import {
 } from '@chakra-ui/react';
 import { mastersData } from '../../mocks';
 import MasterItem from '../MasterItem';
-import MasterDrawer from '../MasterDrawer';
+import MasterDrawer from '../MasterModal';
-import i18next from 'i18next';
 
-const TABLE_HEADERS = ['name', 'currentJob', 'phone', 'actions'];
+const TABLE_HEADERS = ['Имя', 'Актуальная занятость', 'Телефон', 'Действия'];
 
 const Masters = () => {
   const { isOpen, onOpen, onClose } = useDisclosure();
@@ -24,18 +23,16 @@ const Masters = () => {
   return (
     <Box p='8'>
       <Flex justifyContent='space-between' alignItems='center' mb='5'>
-        <Heading size='lg'> {i18next.t('dry-wash.arm.master.title')}</Heading>
+        <Heading size='lg'>Мастера</Heading>
         <Button colorScheme='green' onClick={onOpen}>
-          + {i18next.t('dry-wash.arm.master.add')}
+          + Добавить
         </Button>
       </Flex>
       <Table variant='simple' colorScheme='blackAlpha'>
         <Thead>
           <Tr>
             {TABLE_HEADERS.map((name) => (
-              <Th key={name}>
+              <Th key={name}>{name}</Th>
-                {i18next.t(`dry-wash.arm.master.table.header.${name}`)}
-              </Th>
             ))}
           </Tr>
         </Thead>

src/components/OrderItem/OrderItem.tsx

@@ -1,8 +1,5 @@
 import React, { useState } from 'react';
 import { Td, Tr, Link, Select } from '@chakra-ui/react';
-import i18next from 'i18next';
-
-const statuses = ['pending', 'progress', 'working', 'canceled', 'complete'];
 
 const OrderItem = ({
   carNumber,
@@ -23,13 +20,13 @@ const OrderItem = ({
         <Select
           value={statusSelect}
           onChange={(e) => setStatus(e.target.value)}
-          placeholder={i18next.t(`dry-wash.arm.order.status.placeholder`)}
+          placeholder='Выберите статус'
         >
-          {statuses.map((status) => (
+          <option value='в ожидании'>в ожидании</option>
-            <option key={status} value={status}>
+          <option value='В процессе'>в процессе</option>
-              {i18next.t(`dry-wash.arm.order.status.${status}`)}
+          <option value='в работе'>в работе</option>
-            </option>
+          <option value='отменил'>отменил</option>
-          ))}
+          <option value='Завершено'>Завершено</option>
         </Select>
       </Td>
       <Td>

src/components/Orders/Orders.tsx

@@ -2,28 +2,26 @@ import { Box, Heading, Table, Thead, Tbody, Tr, Th } from '@chakra-ui/react';
 import React from 'react';
 import { ordersData } from '../../mocks';
 import OrderItem from '../OrderItem';
-import i18next from 'i18next';
+
 const Orders = () => {
   const TABLE_HEADERS = [
-    'carNumber',
+    'Номер машины',
-    'washingTime',
+    'Время мойки',
-    'orderDate',
+    'Дата заказа',
-    'status',
+    'Статус',
-    'telephone',
+    'Телефон',
-    'location',
+    'Расположение',
   ];
   return (
     <Box p='8'>
       <Heading size='lg' mb='5'>
-        {i18next.t('dry-wash.arm.order.title')}
+        Заказы
       </Heading>
       <Table variant='simple' colorScheme='blackAlpha'>
         <Thead>
           <Tr>
             {TABLE_HEADERS.map((name, key) => (
-              <Th key={key}>
+              <Th key={key}>{name}</Th>
-                {i18next.t(`dry-wash.arm.order.table.header.${name}`)}
-              </Th>
             ))}
           </Tr>
         </Thead>

src/components/Sidebar/Sidebar.tsx

@@ -1,10 +1,8 @@
 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 = () => (
+const Sidebar = ({ onSelectPage }) => (
   <Box
     borderRight='1px solid black'
     bg='gray.50'
@@ -14,29 +12,27 @@ const Sidebar = () => (
     pt='8'
   >
     <Heading color='green' size='lg' mb='5'>
-      {i18next.t(`dry-wash.arm.master.sideBar.title`)}
+      Сухой мастер
     </Heading>
 
     <VStack align='start' spacing='4'>
       <Divider />
       <Button
-        as={Link}
+        onClick={() => onSelectPage('orders')}
-        to='orders'
         w='100%'
         colorScheme='green'
         variant='ghost'
       >
-        {i18next.t(`dry-wash.arm.master.sideBar.title.orders`)}
+        Заказы
       </Button>
       <Divider />
       <Button
-        as={Link}
+        onClick={() => onSelectPage('masters')}
-        to='masters'
         w='100%'
         colorScheme='green'
         variant='ghost'
       >
-        {i18next.t(`dry-wash.arm.master.sideBar.title.master`)}
+        Мастера
       </Button>
       <Divider />
     </VStack>

src/index.tsx

@@ -1,26 +1,19 @@
+ 
 /* eslint-disable react/display-name */
 import React from 'react';
 import ReactDOM from 'react-dom/client';
-import { i18nextReactInitConfig } from '@brojs/cli';
-import App from './app';
-import i18next from 'i18next';
 
-i18next.t = i18next.t.bind(i18next);
+import App from './app';
-const i18nextPromise = i18nextReactInitConfig(i18next);
+
 export default () => <App />;
 
 let rootElement: ReactDOM.Root;
 
-export const mount = async (
+export const mount = (Component, element = document.getElementById('app')) => {
-  Component,
-  element = document.getElementById('app'),
-) => {
   const rootElement = ReactDOM.createRoot(element);
-  await i18nextPromise;
   rootElement.render(<Component />);
   if (module.hot) {
-    module.hot.accept('./app', async () => {
+    module.hot.accept('./app', () => {
-      await i18next.reloadResources();
       rootElement.render(<Component />);
     });
   }

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>
-
   );
 };