bro.config.js

@@ -1,9 +1,9 @@
 /* eslint-disable no-undef */
 /* eslint-disable @typescript-eslint/no-require-imports */
-const pkg = require('./package');
+const pkg = require("./package");
 
 module.exports = {
-  apiPath: 'stubs/api',
+  apiPath: "stubs/api",
   webpackConfig: {
     output: {
       publicPath: `/static/${pkg.name}/${process.env.VERSION || pkg.version}/`,
@@ -11,19 +11,17 @@ module.exports = {
   },
   /* use https://admin.bro-js.ru/ to create config, navigations and features */
   navigations: {
-    'dry-wash.main': '/dry-wash',
+    "dry-wash.main": "/dry-wash",
-    'dry-wash.create': '/order',
+    "dry-wash.create": "/order",
-    'dry-wash.view.order': '/order/:orderId',
+    "dry-wash.view.order": "/order/:orderId",
-    'dry-wash.arm.master': 'master',
+    "dry-wash.arm": "/arm",
-    'dry-wash.arm.order': 'order',
-    'dry-wash.arm': '/arm/*',
   },
   features: {
-    'dry-wash-pl': {
+    "dry-wash-pl": {
       // add your features here in the format [featureName]: { value: string }
     },
   },
   config: {
-    'dry-wash-pl.api': '/api',
+    "dry-wash-pl.api": "/api",
   },
 };

locales/en.json

@@ -13,41 +13,5 @@
   "dry-wash.landing.hero-section.headline": "Revitalize Your Ride with Eco-Friendly Care!",
   "dry-wash.landing.make-order-button": "Make order",
   "dry-wash.landing.site-logo": "The logo of the \"Dry Master\" company",
-  "dry-wash.landing.social-proof-section.heading": "We are being chosen",
+  "dry-wash.landing.social-proof-section.heading": "We are being chosen"
-  "dry-wash.arm.master.add": "Add",
-  "dry-wash.arm.order.title": "Orders",
-  "dry-wash.arm.order.status.progress": "In Progress",
-  "dry-wash.arm.order.status.complete": "Completed",
-  "dry-wash.arm.order.status.pending": "Pending",
-  "dry-wash.arm.order.status.working": "Working",
-  "dry-wash.arm.order.status.canceled": "Canceled",
-  "dry-wash.arm.order.status.placeholder": "Select Status",
-  "dry-wash.arm.order.table.header.carNumber": "Car Number",
-  "dry-wash.arm.order.table.header.washingTime": "Washing Time",
-  "dry-wash.arm.order.table.header.orderDate": "Order Date",
-  "dry-wash.arm.order.table.header.status": "Status",
-  "dry-wash.arm.order.table.header.telephone": "Telephone",
-  "dry-wash.arm.order.table.header.location": "Location",
-  "dry-wash.arm.master.title": "Masters",
-  "dry-wash.arm.master.table.header.name": "Name",
-  "dry-wash.arm.master.table.header.currentJob": "Current Job",
-  "dry-wash.arm.master.table.header.phone": "Phone",
-  "dry-wash.arm.master.table.header.actions": "Actions",
-  "dry-wash.arm.master.table.actionsMenu.delete": "Delete Master",
-  "dry-wash.arm.master.drawer.title": "Add New Master",
-  "dry-wash.arm.master.drawer.inputName.label": "Full Name",
-  "dry-wash.arm.master.drawer.inputName.placeholder": "Enter Full Name",
-  "dry-wash.arm.master.drawer.inputPhone.label": "Phone Number",
-  "dry-wash.arm.master.drawer.inputPhone.placeholder": "Enter Phone Number",
-  "dry-wash.arm.master.drawer.button.save": "Save",
-  "dry-wash.arm.master.drawer.button.cancel": "Cancel",
-  "dry-wash.arm.master.sideBar.orders": "Orders",
-  "dry-wash.arm.master.sideBar.master": "Masters",
-  "dry-wash.arm.master.sideBar.title": "Dry Master",
-  "dry-wash.notFound.title": "Page Not Found",
-  "dry-wash.notFound.description": "Unfortunately, the page you are looking for does not exist.",
-  "dry-wash.notFound.button.back": "Back to Home",
-  "dry-wash.errorBoundary.title": "Something went wrong",
-  "dry-wash.errorBoundary.description": "We are already working on fixing the issue",
-  "dry-wash.errorBoundary.button.reload": "Reload Page"
 }

locales/ru.json

@@ -3,7 +3,7 @@
   "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.pending": "в ожидании",
   "dry-wash.arm.order.status.working": "В работе",
   "dry-wash.arm.order.status.canceled": "Отменено",
   "dry-wash.arm.order.status.placeholder": "Выберите статус",
@@ -26,9 +26,9 @@
   "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.orders": "Заказы",
+  "dry-wash.arm.master.sideBar.title": " Сухой мастер",
-  "dry-wash.arm.master.sideBar.master": "Мастера",
+  "dry-wash.arm.master.sideBar.title.master": "Мастера",
-  "dry-wash.arm.master.sideBar.title": "Сухой мастер",
+  "dry-wash.arm.master.sideBar.title.orders": "Заказы",
   "dry-wash.landing.benefits-section.description": "Откройте для себя преимущества наших услуг по химчистке автомобилей",
   "dry-wash.landing.benefits-section.heading": "Преимущества экологичной автомойки",
   "dry-wash.landing.benefits-section.list.0": "Экологически безопасные продукты",
@@ -46,9 +46,8 @@
   "dry-wash.landing.social-proof-section.heading": "Нас выбирают",
   "dry-wash.notFound.title": "Страница не найдена",
   "dry-wash.notFound.description": "К сожалению, запрашиваемая вами страница не существует.",
-  "dry-wash.notFound.button.back": "Вернуться на главную",
+  "dry-wash.notFound.button.back": " Вернуться на главную",
   "dry-wash.errorBoundary.title":"Что-то пошло не так",
-  "dry-wash.errorBoundary.description": "Мы уже работаем над исправлением проблемы",
+  "dry-wash.errorBoundary.description": " Мы уже работаем над исправлением проблемы",
-  "dry-wash.errorBoundary.button.reload": "Перезагрузить страницу",
+  "dry-wash.errorBoundary.button.reload": "Перезагрузить страницу"
-  "dry-wash.washTime.timeSlot": "{{start}} - {{end}}"
 }

package-lock.json

@@ -17,7 +17,6 @@
                 "@fontsource/open-sans": "^5.1.0",
                 "@lottiefiles/react-lottie-player": "^3.5.4",
                 "@types/react": "^18.3.12",
-                "dayjs": "^1.11.13",
                 "express": "^4.21.1",
                 "framer-motion": "^6.2.8",
                 "i18next": "^23.16.4",
@@ -5305,11 +5304,6 @@
                 "url": "https://github.com/sponsors/ljharb"
             }
         },
-        "node_modules/dayjs": {
-            "version": "1.11.13",
-            "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz",
-            "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg=="
-        },
         "node_modules/debug": {
             "version": "4.3.7",
             "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",

package.json

@@ -25,7 +25,6 @@
         "@fontsource/open-sans": "^5.1.0",
         "@lottiefiles/react-lottie-player": "^3.5.4",
         "@types/react": "^18.3.12",
-        "dayjs": "^1.11.13",
         "express": "^4.21.1",
         "framer-motion": "^6.2.8",
         "i18next": "^23.16.4",

src/__data__/urls.ts

@@ -1,40 +1,25 @@
-import { generatePath } from 'react-router-dom';
+import { generatePath } from "react-router-dom";
-import { getNavigationValue } from '@brojs/cli';
+import { getNavigationValue } from "@brojs/cli";
 
-import { Order } from '../models';
+import { Order } from "../models";
-
-const getFullUrls = (url: string) =>
-  `${getNavigationValue('dry-wash.main')}${url}`;
 
 export const URLs = {
   landing: {
-    url: getNavigationValue('dry-wash.main'),
+    url: getNavigationValue("dry-wash.main"),
     getUrl() {
       return this.url;
-    },
+    }
   },
   orderForm: {
-    url: getNavigationValue('dry-wash.create'),
+    url: getNavigationValue("dry-wash.create"),
     getUrl() {
       return this.url;
-    },
+    }
   },
   orderView: {
-    url: getNavigationValue('dry-wash.view.order'),
+    url: getNavigationValue("dry-wash.view.order"),
     getUrl(orderId: Order.Id) {
       return generatePath(this.url, { orderId });
-    },
+    }
-  },
+  }
-  armMaster: {
+};
-    url: getNavigationValue('dry-wash.arm.master'),
-    isOn: Boolean(getNavigationValue('dry-wash.arm.master')),
-  },
-  armOrder: {
-    url: getNavigationValue('dry-wash.arm.order'),
-    isOn: Boolean(getNavigationValue('dry-wash.arm.order')),
-  },
-  armBase: {
-    url: getFullUrls(getNavigationValue('dry-wash.arm')),
-    isOn: Boolean(getNavigationValue('dry-wash.arm')),
-  },
-};

src/components/ErrorBoundary/ErrorBoundary.tsx

@@ -34,16 +34,15 @@ class ErrorBoundary extends Component<ErrorBoundaryProps, ErrorBoundaryState> {
   render() {
     const { hasError } = this.state;
     //TODO: добавить анимацию после залива 404 страницы
-    //TODO: может сделать обертку для хука, чтоб язык менялся без перезагрузки
     if (hasError) {
       return (
         <Center minH='100vh'>
           <VStack spacing={4} textAlign='center'>
             <Heading as='h1' size='2xl'>
-              {i18next.t('~:dry-wash.errorBoundary.title')}
+              {i18next.t('dry-wash.errorBoundary.title')}
             </Heading>
             <Text fontSize='lg'>
-              {i18next.t('~:dry-wash.errorBoundary.description')}
+              {i18next.t('dry-wash.errorBoundary.description')}
             </Text>
             <Button
               colorScheme='teal'
@@ -51,7 +50,7 @@ class ErrorBoundary extends Component<ErrorBoundaryProps, ErrorBoundaryState> {
               variant='outline'
               onClick={() => window.location.reload()}
             >
-              {i18next.t('~:dry-wash.errorBoundary.button.reload')}
+              {i18next.t('dry-wash.errorBoundary.button.reload')}
             </Button>
           </VStack>
         </Center>

src/components/LayoutArm/LayoutArm.tsx

@@ -5,33 +5,20 @@ import { Navigate, Route, Routes } from 'react-router-dom';
 import Sidebar from '../Sidebar';
 import Orders from '../Orders';
 import Masters from '../Masters';
-import { URLs } from '../../__data__/urls';
 
-const LayoutArm = () => {
+const LayoutArm = () => (
-  let defaultRedirect = null;
+  <Flex h='100vh'>
-
+    <Sidebar />
-  if (URLs.armOrder.isOn) {
+    <Box flex='1' bg='gray.50'>
-    defaultRedirect = URLs.armOrder.url;
+      <Routes>
-  } else if (URLs.armMaster.isOn) {
+        <Route>
-    defaultRedirect = URLs.armMaster.url;
+          <Route index element={<Navigate to='orders' replace />} />
-  }
+          <Route path='orders' element={<Orders />} />
-
+          <Route path='masters' element={<Masters />} />
-  return (
+        </Route>
-    <Flex h='100vh'>
+      </Routes>
-      <Sidebar />
+    </Box>
-      <Box flex='1' bg='gray.50'>
+  </Flex>
-        <Routes>
+);
-          <Route index element={<Navigate to={defaultRedirect} replace />} />
-          {URLs.armOrder.isOn && (
-            <Route path={URLs.armOrder.url} element={<Orders />} />
-          )}
-          {URLs.armMaster.isOn && (
-            <Route path={URLs.armMaster.url} element={<Masters />} />
-          )}
-        </Routes>
-      </Box>
-    </Flex>
-  );
-};
 
 export default LayoutArm;

src/components/MasterActionsMenu/MasterActionsMenu.tsx

@@ -7,18 +7,16 @@ import {
   IconButton,
 } from '@chakra-ui/react';
 import { EditIcon } from '@chakra-ui/icons';
-import { useTranslation } from 'react-i18next';
+import i18next from 'i18next';
 
 const MasterActionsMenu = () => {
-  const { t } = useTranslation('~', {
-    keyPrefix: 'dry-wash.arm.master.table.actionsMenu',
-  });
-
   return (
     <Menu>
       <MenuButton icon={<EditIcon />} as={IconButton} variant='outline' />
       <MenuList>
-        <MenuItem>{t('delete')}</MenuItem>
+        <MenuItem>
+          {i18next.t('dry-wash.arm.master.table.actionsMenu.delete')}
+        </MenuItem>
       </MenuList>
     </Menu>
   );

src/components/MasterDrawer/MasterDrawer.tsx

@@ -12,7 +12,7 @@ import {
   DrawerHeader,
   DrawerOverlay,
 } from '@chakra-ui/react';
-import { useTranslation } from 'react-i18next';
+import i18next from 'i18next';
 
 const MasterDrawer = ({ isOpen, onClose }) => {
   const [newMaster, setNewMaster] = useState({ name: '', phone: '' });
@@ -22,44 +22,51 @@ const MasterDrawer = ({ isOpen, onClose }) => {
     onClose();
   };
 
-  const { t } = useTranslation('~', {
-    keyPrefix: 'dry-wash.arm.master.drawer',
-  });
-
   return (
     <Drawer isOpen={isOpen} onClose={onClose} size='md'>
       <DrawerOverlay />
       <DrawerContent>
         <DrawerCloseButton />
-        <DrawerHeader>{t('title')}</DrawerHeader>
+        <DrawerHeader>
+          {i18next.t('dry-wash.arm.master.drawer.title')}
+        </DrawerHeader>
         <DrawerBody>
           <FormControl mb='4'>
-            <FormLabel>{t('inputName.label')}</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={t('inputName.placeholder')}
+              placeholder={i18next.t(
+                'dry-wash.arm.master.drawer.inputName.placeholder',
+              )}
             />
           </FormControl>
           <FormControl>
-            <FormLabel> {t('inputPhone.label')}</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={t('inputPhone.placeholder')}
+              placeholder={i18next.t(
+                'dry-wash.arm.master.drawer.inputPhone.placeholder',
+              )}
             />
           </FormControl>
         </DrawerBody>
         <DrawerFooter>
           <Button colorScheme='teal' mr={3} onClick={handleSave}>
-            {t('button.save')}
+            {i18next.t('dry-wash.arm.master.drawer.button.save')}
           </Button>
           <Button variant='ghost' onClick={onClose}>
-            {t('button.cancel')}
+            {i18next.t('dry-wash.arm.master.drawer.button.cancel')}
           </Button>
         </DrawerFooter>
       </DrawerContent>

src/components/MasterItem/MasterItem.tsx

@@ -2,7 +2,6 @@ import React from 'react';
 import { Badge, Link, Stack, Td, Tr } from '@chakra-ui/react';
 
 import MasterActionsMenu from '../MasterActionsMenu';
-import { getTimeSlot } from '../../lib/date-helpers';
 
 const MasterItem = ({ name, schedule, phone }) => {
   return (
@@ -10,9 +9,9 @@ const MasterItem = ({ name, schedule, phone }) => {
       <Td>{name}</Td>
       <Td>
         <Stack direction='row'>
-          {schedule.map(({ startWashTime, endWashTime }, index) => (
+          {schedule.map((time, index) => (
             <Badge colorScheme={'green'} key={index}>
-              {getTimeSlot(startWashTime, endWashTime)}
+              {time}
             </Badge>
           ))}
         </Stack>

src/components/Masters/Masters.tsx

@@ -11,44 +11,37 @@ import {
   useDisclosure,
   Flex,
 } from '@chakra-ui/react';
-import { useTranslation } from 'react-i18next';
+import i18next from 'i18next';
 
+import { mastersData } from '../../mocks';
 import MasterItem from '../MasterItem';
 import MasterDrawer from '../MasterDrawer';
-import data from '../../../stubs/json/arm-masters/success.json';
 
-const TABLE_HEADERS = [
+const TABLE_HEADERS = ['name', 'currentJob', 'phone', 'actions'];
-  'name' as const,
-  'currentJob' as const,
-  'phone' as const,
-  'actions' as const,
-];
 
 const Masters = () => {
   const { isOpen, onOpen, onClose } = useDisclosure();
 
-  const { t } = useTranslation('~', {
-    keyPrefix: 'dry-wash.arm.master',
-  });
-
   return (
     <Box p='8'>
       <Flex justifyContent='space-between' alignItems='center' mb='5'>
-        <Heading size='lg'> {t('title')}</Heading>
+        <Heading size='lg'> {i18next.t('dry-wash.arm.master.title')}</Heading>
         <Button colorScheme='green' onClick={onOpen}>
-          + {t('add')}
+          + {i18next.t('dry-wash.arm.master.add')}
         </Button>
       </Flex>
       <Table variant='simple' colorScheme='blackAlpha'>
         <Thead>
           <Tr>
             {TABLE_HEADERS.map((name) => (
-              <Th key={name}>{t(`table.header.${name}`)}</Th>
+              <Th key={name}>
+                {i18next.t(`dry-wash.arm.master.table.header.${name}`)}
+              </Th>
             ))}
           </Tr>
         </Thead>
         <Tbody>
-          {data.body.map((master, index) => (
+          {mastersData.map((master, index) => (
             <MasterItem key={index} {...master} />
           ))}
         </Tbody>

src/components/OrderItem/OrderItem.tsx

@@ -1,60 +1,33 @@
 import React, { useState } from 'react';
 import { Td, Tr, Link, Select } from '@chakra-ui/react';
-import { useTranslation } from 'react-i18next';
+import i18next from 'i18next';
-import dayjs from 'dayjs';
 
-import { getTimeSlot } from '../../lib/date-helpers';
+const statuses = ['pending', 'progress', 'working', 'canceled', 'complete'];
-
-const statuses = [
-  'pending' as const,
-  'progress' as const,
-  'working' as const,
-  'canceled' as const,
-  'complete' as const,
-];
-
-type GetArrItemType<ArrType> =
-  ArrType extends Array<infer ItemType> ? ItemType : never;
-
-export type OrderProps = {
-  carNumber?: string;
-  startWashTime?: string;
-  endWashTime?: string;
-  orderDate?: string;
-  status?: GetArrItemType<typeof statuses>;
-  phone?: string;
-  location?: string;
-};
 
 const OrderItem = ({
   carNumber,
-  startWashTime,
+  washTime,
-  endWashTime,
   orderDate,
   status,
   phone,
   location,
-}: OrderProps) => {
+}) => {
-  const { t } = useTranslation('~', {
-    keyPrefix: 'dry-wash.arm.order',
-  });
-
   const [statusSelect, setStatus] = useState(status);
 
   return (
     <Tr>
       <Td>{carNumber}</Td>
-      <Td>{getTimeSlot(startWashTime, endWashTime)}</Td>
+      <Td>{washTime}</Td>
-      <Td>{dayjs(orderDate).format('DD.MM.YYYY')}</Td>
+      <Td>{orderDate}</Td>
       <Td>
         <Select
           value={statusSelect}
-          onChange={(e) => setStatus(e.target.value as OrderProps['status'])}
+          onChange={(e) => setStatus(e.target.value)}
-          placeholder={t(`status.placeholder`)}
+          placeholder={i18next.t(`dry-wash.arm.order.status.placeholder`)}
         >
           {statuses.map((status) => (
             <option key={status} value={status}>
-              {t(`status.${status}`)}
+              {i18next.t(`dry-wash.arm.order.status.${status}`)}
             </option>
           ))}
         </Select>

src/components/Orders/Orders.tsx

@@ -1,45 +1,36 @@
-import React from 'react';
 import { Box, Heading, Table, Thead, Tbody, Tr, Th } from '@chakra-ui/react';
-import { useTranslation } from 'react-i18next';
+import React from 'react';
+import i18next from 'i18next';
 
+import { ordersData } from '../../mocks';
 import OrderItem from '../OrderItem';
-import { OrderProps } from '../OrderItem/OrderItem';
-import data from '../../../stubs/json/arm-orders/success.json';
-
 const Orders = () => {
-  const { t } = useTranslation('~', {
-    keyPrefix: 'dry-wash.arm.order',
-  });
-
   const TABLE_HEADERS = [
-    'carNumber' as const,
+    'carNumber',
-    'washingTime' as const,
+    'washingTime',
-    'orderDate' as const,
+    'orderDate',
-    'status' as const,
+    'status',
-    'telephone' as const,
+    'telephone',
-    'location' as const,
+    'location',
   ];
-
   return (
     <Box p='8'>
       <Heading size='lg' mb='5'>
-        {t('title')}
+        {i18next.t('dry-wash.arm.order.title')}
       </Heading>
       <Table variant='simple' colorScheme='blackAlpha'>
         <Thead>
           <Tr>
             {TABLE_HEADERS.map((name, key) => (
-              <Th key={key}>{t(`table.header.${name}`)}</Th>
+              <Th key={key}>
+                {i18next.t(`dry-wash.arm.order.table.header.${name}`)}
+              </Th>
             ))}
           </Tr>
         </Thead>
         <Tbody>
-          {data.body.map((order, index) => (
+          {ordersData.map((order, index) => (
-            <OrderItem
+            <OrderItem key={index} {...order} />
-              key={index}
-              {...order}
-              status={order.status as OrderProps['status']}
-            />
           ))}
         </Tbody>
       </Table>

src/components/Sidebar/Sidebar.tsx

@@ -1,60 +1,46 @@
-import { Box, Button, Heading, VStack, Divider } from '@chakra-ui/react';
+import { Box, Button, Heading, VStack } from '@chakra-ui/react';
 import React from 'react';
-import { useLocation, Link } from 'react-router-dom';
+import { Divider } from '@chakra-ui/react';
-import { useTranslation } from 'react-i18next';
+import i18next from 'i18next';
+import { Link } from 'react-router-dom';
 
-import { URLs } from '../../__data__/urls';
+const Sidebar = () => (
+  <Box
+    borderRight='1px solid black'
+    bg='gray.50'
+    color='white'
+    w='250px'
+    p='5'
+    pt='8'
+  >
+    <Heading color='green' size='lg' mb='5'>
+      {i18next.t(`dry-wash.arm.master.sideBar.title`)}
+    </Heading>
 
-const Sidebar = () => {
+    <VStack align='start' spacing='4'>
-  const location = useLocation();
+      <Divider />
-  const isActive = (keyword: string) => location.pathname.includes(keyword);
+      <Button
-
+        as={Link}
-  const { t } = useTranslation('~', {
+        to='orders'
-    keyPrefix: 'dry-wash.arm.master.sideBar',
+        w='100%'
-  });
+        colorScheme='green'
-
+        variant='ghost'
-  return (
+      >
-    <Box
+        {i18next.t(`dry-wash.arm.master.sideBar.title.orders`)}
-      borderRight='1px solid black'
+      </Button>
-      bg='gray.50'
+      <Divider />
-      color='white'
+      <Button
-      w='250px'
+        as={Link}
-      p='5'
+        to='masters'
-      pt='8'
+        w='100%'
-    >
+        colorScheme='green'
-      <Heading color='green' size='lg' mb='5'>
+        variant='ghost'
-        {t('title')}
+      >
-      </Heading>
+        {i18next.t(`dry-wash.arm.master.sideBar.title.master`)}
-
+      </Button>
-      <VStack align='start' spacing='4'>
+      <Divider />
-        <Divider />
+    </VStack>
-        {URLs.armOrder.isOn && (
+  </Box>
-          <Button
+);
-            as={Link}
-            to={URLs.armOrder.url}
-            w='100%'
-            colorScheme={isActive(URLs.armOrder.url) ? 'green' : 'blue'}
-            variant={isActive(URLs.armOrder.url) ? 'solid' : 'ghost'}
-          >
-            {t('orders')}
-          </Button>
-        )}
-        <Divider />
-        {URLs.armMaster.isOn && (
-          <Button
-            as={Link}
-            to={URLs.armMaster.url}
-            w='100%'
-            colorScheme={isActive(URLs.armMaster.url) ? 'green' : 'blue'}
-            variant={isActive(URLs.armMaster.url) ? 'solid' : 'ghost'}
-          >
-            {t('master')}
-          </Button>
-        )}
-        <Divider />
-      </VStack>
-    </Box>
-  );
-};
 
 export default Sidebar;

src/components/landing/SiteLogo/SiteLogo.tsx

@@ -7,7 +7,7 @@ import { LogoSvg } from '../../../assets/icons';
 export const SiteLogo: FC = () => {
   const { t } = useTranslation();
 
-  return <Image src={LogoSvg} alt={t('~:dry-wash.landing.site-logo')} w={40} />;
+  return <Image src={LogoSvg} alt={t('dry-wash.landing.site-logo')} w={40} />;
 };
 
 // todo: replace Image by SVG React component

src/lib/date-helpers.ts

@@ -1,12 +0,0 @@
-import dayjs from 'dayjs';
-import i18next from 'i18next';
-
-export const getTimeSlot = (start: string, end: string) => {
-  const startDay = dayjs(start).format('HH:mm');
-  const endDay = dayjs(end).format('HH:mm');
-
-  return i18next.t('~:dry-wash.washTime.timeSlot', {
-    start: startDay,
-    end: endDay,
-  });
-};

src/mocks/index.ts

@@ -0,0 +1,35 @@
+export const mastersData = [
+  {
+    id: 'masters1',
+    name: 'Иван Иванов',
+    schedule: ['15:00 - 16:30', '17:00 - 18:00'],
+    phone: '+7 900 123 45 67',
+  },
+  {
+    id: 'masters2',
+    name: 'Сергей Петров',
+    schedule: ['10:00 - 12:30', '14:00 - 15:30', '16:00 - 17:00'],
+    phone: '+7 900 234 56 78',
+  },
+];
+
+export const ordersData = [
+  {
+    id: 'order1',
+    carNumber: 'A123BC',
+    washTime: '10:30',
+    orderDate: '2024-10-31',
+    status: 'progress',
+    phone: '79001234567',
+    location: 'Казань, ул. Баумана, 1',
+  },
+  {
+    id: 'order2',
+    carNumber: 'B456CD',
+    washTime: '11:00',
+    orderDate: '2024-10-31',
+    status: 'complete',
+    phone: '79002345678',
+    location: 'Казань, ул. Кремлёвская, 3',
+  },
+];

src/pages/arm/index.tsx

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useState } from 'react';
 
 import LayoutArm from '../../components/LayoutArm';
 

src/routes.tsx

@@ -17,9 +17,7 @@ const Routers = () => {
         <Route path={URLs.landing.url} element={<Landing />} />
         <Route path={URLs.orderForm.url} element={<OrderForm />} />
         <Route path={URLs.orderView.url} element={<OrderView />} />
-        {URLs.armBase.isOn && (
+        <Route path='/dry-wash/arm/*' element={<Arm />}></Route>
-          <Route path={URLs.armBase.url} element={<Arm />}></Route>
-        )}
         <Route path='*' element={<NotFound />} />
       </Routes>
     </Suspense>

stubs/json/arm-masters/success.json

@@ -1,35 +0,0 @@
-{
-  "success": true,
-  "body": [
-    {
-      "id": "masters1",
-      "name": "Иван Иванов",
-      "schedule": [ {
-        "id": "order1",
-        "startWashTime": "2024-11-24T10:30:00.000Z",
-        "endWashTime": "2024-11-24T16:30:00.000Z"
-      },
-        {
-          "id": "order2",
-          "startWashTime": "2024-11-24T11:30:00.000Z",
-          "endWashTime": "2024-11-24T17:30:00.000Z"
-        }],
-      "phone": "+7 900 123 45 67"
-    },
-    {
-      "id": "masters12",
-      "name": "Иван Иванов",
-      "schedule": [ {
-        "id": "order1",
-        "startWashTime": "2024-11-24T10:30:00.000Z",
-        "endWashTime": "2024-11-24T16:30:00.000Z"
-      },
-        {
-          "id": "order2",
-          "startWashTime": "2024-11-24T11:30:00.000Z",
-          "endWashTime": "2024-11-24T17:30:00.000Z"
-        }],
-      "phone": "+7 900 123 45 67"
-    }
-  ]
-}

stubs/json/arm-orders/success.json

@@ -1,25 +0,0 @@
-{
-  "success": true,
-  "body": [
-    {
-      "id": "order1",
-      "carNumber": "A123BC",
-      "startWashTime": "2024-11-24T10:30:00.000Z",
-      "endWashTime": "2024-11-24T16:30:00.000Z",
-      "orderDate": "2024-11-24T08:41:46.366Z",
-      "status": "progress",
-      "phone": "79001234563",
-      "location": "Казань, ул. Баумана, 1"
-    },
-    {
-      "id": "order2",
-      "carNumber": "A245BC",
-      "startWashTime": "2024-11-24T11:30:00.000Z",
-      "endWashTime": "2024-11-24T17:30:00.000Z",
-      "orderDate": "2024-11-24T07:40:46.366Z",
-      "status": "progress",
-      "phone": "79001234567",
-      "location": "Казань, ул. Баумана, 43"
-    }
-  ]
-}