.gitignore

@@ -130,10 +130,4 @@ dist
 .yarn/install-state.gz
 .pnp.*
 
-.idea
+.idea
-
-# Playwright
-/test-results/
-/playwright-report/
-/blob-report/
-/playwright/.cache/

.vscode/settings.json

@@ -1,5 +0,0 @@
-{
-    "i18n-ally.localesPaths": [
-        "locales"
-    ]
-}

Jenkinsfile

@@ -1,7 +1,7 @@
 pipeline {
     agent {
         docker {
-            image 'node:22'
+            image 'node:20'
         }
     }
 
@@ -30,21 +30,19 @@ pipeline {
             }
         }
 
-        stage('eslint') {
+        stage('checks') {
-            steps {
+            parallel {
-                sh 'npm run eslint'
+                stage('eslint') {
-            }
+                    steps {
-        }
+                        sh 'npm run eslint'
+                    }
+                }
 
-        stage('test') {
+                stage('build') {
-            steps {
+                    steps {
-                sh 'npm run test'
+                        sh 'npm run build'
-            }
+                    }
-        }
+                }
-
-        stage('build') {
-            steps {
-                sh 'npm run build'
             }
         }
 

__mocks__/app-context-mock.tsx

@@ -1,18 +0,0 @@
-import React, { PropsWithChildren } from 'react';
-import { jest } from '@jest/globals';
-import { BrowserRouter } from 'react-router-dom';
-import { ChakraProvider, theme as chakraTheme } from '@chakra-ui/react';
-import { Provider } from 'react-redux';
-
-import ErrorBoundary from '../src/components/ErrorBoundary';
-import { store } from '../src/__data__/store';
-
-export const AppContext = jest.fn(({ children }: PropsWithChildren) => (
-  <Provider store={store}>
-    <ChakraProvider theme={chakraTheme}>
-      <ErrorBoundary>
-        <BrowserRouter>{children}</BrowserRouter>
-      </ErrorBoundary>
-    </ChakraProvider>
-  </Provider>
-));

__mocks__/brojs-cli-mock.ts

@@ -1,20 +0,0 @@
-import { jest } from '@jest/globals';
-
-jest.mock('@brojs/cli', () => ({
-  getConfigValue: jest.fn(() => '/api'),
-  getFeatures: jest.fn(() => ({
-    ['order-view-status-polling']: { value: '3000' },
-    ['car-img-upload']: { value: 'true' },
-    ['order-cost']: { value: '1000' },
-  })),
-  getNavigationValue: jest.fn((navKey: string) => {
-    switch (navKey) {
-      case 'dry-wash.main':
-        return '/dry-wash';
-      case 'dry-wash.order.create':
-        return '/order';
-      case 'dry-wash.order.view':
-        return '/order/:orderId';
-    }
-  }),
-}));

__mocks__/file-mock.ts

@@ -1 +0,0 @@
-module.exports = 'file';

__mocks__/lottiefiles-mock.tsx

@@ -1,6 +0,0 @@
-import { jest } from '@jest/globals';
-import React from 'react';
-
-jest.mock('@lottiefiles/react-lottie-player', () => ({
-  Player: jest.fn(() => <></>),
-}));

__mocks__/react-i18next.ts

@@ -1,13 +0,0 @@
-import localeRu from '../locales/ru.json';
-
-module.exports = {
-  useTranslation: (_, options) => {
-    const { keyPrefix } = options ?? {};
-    return {
-      t: keyPrefix ? (key: string) => localeRu[`${keyPrefix}.${key}`] : undefined,
-      i18n: {
-        language: 'ru'
-      }
-    };
-  }
-};

__mocks__/react-yandex-maps-mock.tsx

@@ -1,11 +0,0 @@
-import { jest } from '@jest/globals';
-import React from 'react';
-
-jest.mock('@pbe/react-yandex-maps', () => ({
-  YMaps: jest.fn(() => <></>),
-  Map: jest.fn(() => <></>),
-  Placemark: jest.fn(() => <></>),
-  GeolocationControl: jest.fn(() => <></>),
-  ZoomControl: jest.fn(() => <></>),
-  withYMaps: jest.fn(() => <></>),
-}));

__mocks__/server/handlers.ts

@@ -1,20 +0,0 @@
-import { http, delay, HttpResponse } from 'msw';
-
-import OrderPendingMock from '../../stubs/json/landing-order-view/id1-success-pending.json';
-import OrderErrorMock from '../../stubs/json/landing-order-view/id1-error.json';
-
-export const handlers = [
-  http.get('/api/order/:id', async ({ params }) => {
-    await delay();
-
-    const { id } = params;
-    if (id === 'id1') {
-      return HttpResponse.json(OrderPendingMock);
-    }
-
-    return new HttpResponse(null, {
-      status: 500,
-      statusText: OrderErrorMock.message
-    });
-  })
-];

__mocks__/server/server.ts

@@ -1,5 +0,0 @@
-import { setupServer } from 'msw/node';
-
-import { handlers } from './handlers';
- 
-export const server = setupServer(...handlers);

__mocks__/style-mock.ts

@@ -1 +0,0 @@
-module.exports = {};

babel.config.js

@@ -1,7 +0,0 @@
-module.exports = {
-  presets: [
-    '@babel/preset-env',
-    '@babel/preset-typescript',
-    ['@babel/preset-react', { runtime: 'automatic' }],
-  ],
-};

bro.config.js

@@ -16,27 +16,11 @@ module.exports = {
     'dry-wash.order.view': '/order/:orderId',
     'dry-wash.arm.master': 'master',
     'dry-wash.arm.order': 'order',
-    'dry-wash.arm.map': 'map',
     'dry-wash.arm': '/arm/*',
   },
   features: {
-    'dry-wash': {
+    'dry-wash-pl': {
       // add your features here in the format [featureName]: { value: string }
-      'order-view-status-polling': {
-        on: true,
-        value: '3000',
-        key: 'order-view-status-polling',
-      },
-      'car-img-upload': {
-        on: true,
-        value: 'true',
-        key: 'car-img-upload',
-      },
-      'order-cost': {
-        on: true,
-        value: '1000',
-        key: 'order-cost',
-      },
     },
   },
   config: {

e2e/example.spec.ts

@@ -1,26 +0,0 @@
-import { test, expect } from '@playwright/test';
-
-test.beforeEach('check server is up', async ({ page }) => {
-  try {
-    await page.goto('http://localhost:8099/dry-wash');
-    const makeOrderText = page.getByText('Сделать заказ', { exact: true });
-    await expect(makeOrderText).toBeVisible();
-  } catch (error) {
-    console.error('server not up', error);
-    test.skip();
-  }
-});
-
-test('login', async ({ page }) => {
-  await page.goto('http://localhost:8099/dry-wash/arm');
-  await page.getByRole('textbox', { name: 'Username or email' }).click();
-  await page
-    .getByRole('textbox', { name: 'Username or email' })
-    .fill('237x237');
-  await page.getByRole('textbox', { name: 'Password' }).click();
-  await page.getByRole('textbox', { name: 'Password' }).fill('');
-  await page.getByRole('button', { name: 'Sign In' }).click();
-  await page.getByRole('heading', { name: 'Заказы' }).click();
-  await page.getByRole('link', { name: 'Мастера' }).click();
-  await page.getByRole('link', { name: 'Заказы' }).click();
-});

eslint.config.mjs

@@ -1,13 +1,12 @@
-import globals from 'globals';
+import globals from "globals";
-import pluginJs from '@eslint/js';
+import pluginJs from "@eslint/js";
-import tseslint from 'typescript-eslint';
+import tseslint from "typescript-eslint";
-import pluginReact from 'eslint-plugin-react';
+import pluginReact from "eslint-plugin-react";
 import stylistic from '@stylistic/eslint-plugin';
 import pluginImport from 'eslint-plugin-import';
 
 export default [
-  { files: ['**/*.{js,mjs,cjs,ts,jsx,tsx}'] },
+  { files: ["**/*.{js,mjs,cjs,ts,jsx,tsx}"] },
-
   { languageOptions: { globals: globals.browser } },
   pluginJs.configs.recommended,
   ...tseslint.configs.recommended,
@@ -15,38 +14,35 @@ export default [
   {
     plugins: {
       '@stylistic': stylistic,
-      import: pluginImport,
+      'import': pluginImport,
     },
-    rules: {
+    "rules": {
-      'no-unused-vars': 'off',
+      "no-unused-vars": "off",
-      '@typescript-eslint/no-unused-vars': [
+      "@typescript-eslint/no-unused-vars": [
-        'warn', // or "error"
+        "warn", // or "error"
         {
-          argsIgnorePattern: '^_',
+          "argsIgnorePattern": "^_",
-          varsIgnorePattern: '^_',
+          "varsIgnorePattern": "^_",
-          caughtErrorsIgnorePattern: '^_',
+          "caughtErrorsIgnorePattern": "^_"
-        },
+        }
       ],
-      'sort-imports': ['off'],
+      "sort-imports": ["off"],
-      'import/order': [
+      "import/order": [
-        'error',
+        "error",
         {
-          groups: [
+          "groups": [
-            'builtin',
+            "builtin",
-            'external',
+            "external",
-            'internal',
+            "internal",
-            'parent',
+            "parent",
-            ['sibling', 'index'],
+            ["sibling", "index"]
           ],
-          'newlines-between': 'always',
+          "newlines-between": "always",
-        },
+        }
       ],
-      semi: ['error', 'always'],
+      semi: ["error", "always"],
       '@stylistic/indent': ['error', 2],
-      'react/prop-types': 'off',
+      'react/prop-types': 'off'
     },
-  },
+  }
-  {
-    ignores: ['babel.config.js'],
-  },
 ];

jest-preset-it/jest-preset.ts

@@ -1,22 +0,0 @@
-module.exports = {
-  preset: 'ts-jest',
-  transform: {
-    '^.+\\.tsx?$': 'babel-jest',
-  },
-  coverageProvider: 'v8',
-  coverageDirectory: 'coverage',
-  collectCoverageFrom: ['**/src/**/*.{ts,tsx}', '!**/src/app.tsx', '!**/src/**/types.ts', '!**/src/**/*.d.ts', '!**/src/models/**/*'],
-  collectCoverage: true,
-  clearMocks: true,
-  moduleNameMapper: {
-    '\\.(svg|webp)$': '<rootDir>/__mocks__/file-mock',
-    '\\.(css|scss)$': '<rootDir>/__mocks__/style-mock',
-    'react-i18next': '<rootDir>/__mocks__/react-i18next',
-  },
-  testEnvironmentOptions: {
-    customExportConditions: [''],
-  },
-  testEnvironment: 'jest-fixed-jsdom',
-  testPathIgnorePatterns: ['/node_modules/', '<rootDir>/e2e'],
-  setupFilesAfterEnv: ['<rootDir>/jest-preset-it/jest.setup.js', '<rootDir>/__mocks__/brojs-cli-mock.ts', '<rootDir>/__mocks__/lottiefiles-mock.tsx'],
-};

jest-preset-it/jest.setup.js

@@ -1,5 +0,0 @@
-// eslint-disable-next-line @typescript-eslint/no-require-imports, no-undef
-require('@testing-library/jest-dom');
-
-// eslint-disable-next-line no-undef
-global.__webpack_public_path__ = '';

locales/en.json

@@ -26,17 +26,6 @@
   "dry-wash.order-create.form.washing-location-field.label": "Where is the car located?",
   "dry-wash.order-create.form.washing-location-field.placeholder": "Enter the address or select on the map",
   "dry-wash.order-create.form.washing-location-field.help": "For example, 55.754364, 48.743295 Universitetskaya Street, 1, Innopolis, Verkhneuslonsky district, Republic of Tatarstan (Tatarstan), 420500",
-  "dry-wash.order-create.car-color-select.placeholder": "Input color",
-  "dry-wash.order-create.car-color-select.custom": "Custom",
-  "dry-wash.order-create.car-color-select.custom-label": "Custom:",
-  "dry-wash.order-create.car-color-select.colors.white": "White",
-  "dry-wash.order-create.car-color-select.colors.black": "Black",
-  "dry-wash.order-create.car-color-select.colors.silver": "Silver",
-  "dry-wash.order-create.car-color-select.colors.gray": "Gray",
-  "dry-wash.order-create.car-color-select.colors.beige-brown": "Beige Brown",
-  "dry-wash.order-create.car-color-select.colors.red": "Red",
-  "dry-wash.order-create.car-color-select.colors.blue": "Blue",
-  "dry-wash.order-create.car-color-select.colors.green": "Green",
   "dry-wash.order-create.car-body-select.placeholder": "Not specified",
   "dry-wash.order-create.car-body-select.options.sedan": "Sedan",
   "dry-wash.order-create.car-body-select.options.hatchback" : "Hatchback",
@@ -50,26 +39,16 @@
   "dry-wash.order-create.car-body-select.options.sports-car" : "Sports-car",
   "dry-wash.order-create.car-body-select.options.other": "Other",
   "dry-wash.order-create.form.submit-button.label": "Submit",
-  "dry-wash.order-create.order-creation-title": "Creating order ...",
   "dry-wash.order-create.create-order-query.success.title": "The order is successfully created",
   "dry-wash.order-create.create-order-query.error.title": "Failed to create an order",
   "dry-wash.order-view.title": "Your order",
-  "dry-wash.order-view.get-order-query.error.title": "Failed to fetch the details of order",
+  "dry-wash.order-view.get-order-query.error.title": "Failed to fetch the details of order #{{number}}",
   "dry-wash.order-view.details.title": "Order #{{number}}",
   "dry-wash.order-view.details.owner": "Owner",
   "dry-wash.order-view.details.car": "Car",
   "dry-wash.order-view.details.location": "Where",
   "dry-wash.order-view.details.datetime-range": "When",
   "dry-wash.order-view.details.alert": "The operator will contact you about the payment at the specified phone number",
-  "dry-wash.order-view.upload-car-image.field.label": "Upload a photo of your car, and our service will quickly calculate the pre-order price!",
-  "dry-wash.order-view.upload-car-image.field.help": "Allowed formats: .jpg, .png. Maximum size: 14MB",
-  "dry-wash.order-view.upload-car-image.file-input.placeholder": "Upload a file",
-  "dry-wash.order-view.upload-car-image.file-input.button": "Upload",
-  "dry-wash.order-view.upload-car-image-query.success.title": "The car image is successfully uploaded",
-  "dry-wash.order-view.upload-car-image-query.error.title": "Failed to upload the car image",
-  "dry-wash.order-view.price-car.title": "The level of car contamination:",
-  "dry-wash.order-view.price-car.description": "The cost of washing:",
-  "dry-wash.order-view.price-car.error": "Failed to determine the level of car contamination",
   "dry-wash.arm.master.add": "Add",
   "dry-wash.arm.order.title": "Orders",
   "dry-wash.arm.order.table.empty": "Table empty",
@@ -78,7 +57,7 @@
   "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.cancelled": "Canceled",
+  "dry-wash.arm.order.status.canceled": "Canceled",
   "dry-wash.arm.order.status.placeholder": "Select status",
   "dry-wash.arm.order.master.placeholder": "Select master",
   "dry-wash.arm.order.table.header.carNumber": "Car Number",
@@ -107,15 +86,6 @@
   "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.drawer.toast.create-master": "Master created",
-  "dry-wash.arm.master.drawer.toast.error.empty-fields": "Fields cannot be empty",
-  "dry-wash.arm.master.drawer.toast.error.base": "Error",
-  "dry-wash.arm.master.drawer.toast.error.create-master": "Error creating master",
-  "dry-wash.arm.master.drawer.toast.error.create-master-details": "Failed to add master. Please try again",
-  "dry-wash.arm.master.drawer.form.name.required": "Master name is required",
-  "dry-wash.arm.master.drawer.form.phone.required": "Phone number is required",
-  "dry-wash.arm.master.drawer.form.phone.pattern": "Invalid phone number",
-  "dry-wash.arm.master.drawer.form.name.minLength": "Name must contain at least 2 characters",
   "dry-wash.arm.master.sideBar.orders": "Orders",
   "dry-wash.arm.master.sideBar.master": "Masters",
   "dry-wash.arm.master.sideBar.title": "Dry Master",
@@ -125,8 +95,5 @@
   "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",
-  "dry-wash.washTime.timeSlot": "{{start}} - {{end}}",
+  "dry-wash.washTime.timeSlot": "{{start}} - {{end}}"
-  "dry-wash.arm.map.title": "Map of orders",
-  "dry-wash.arm.map.carNumber": "Car Number",
-  "dry-wash.arm.map.status": "Status"
 }

locales/ru.json

@@ -5,7 +5,7 @@
   "dry-wash.arm.order.status.complete": "Завершено",
   "dry-wash.arm.order.status.pending": "В ожидании",
   "dry-wash.arm.order.status.working": "В работе",
-  "dry-wash.arm.order.status.cancelled": "Отменено",
+  "dry-wash.arm.order.status.canceled": "Отменено",
   "dry-wash.arm.order.status.placeholder": "Выберите статус",
   "dry-wash.arm.order.master.placeholder": "Выберите мастера",
   "dry-wash.arm.order.table.header.carNumber": "Номер машины",
@@ -25,16 +25,10 @@
   "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.table.actionsMenu.toast.success": "Мастер удалён",
-  "dry-wash.arm.master.table.actionsMenu.toast.error.title": "Ошибка!",
-  "dry-wash.arm.master.table.actionsMenu.toast.error.description": "Не удалось удалить мастера. Попробуйте ещё раз.",
   "dry-wash.arm.master.schedule.empty": "Свободен",
   "dry-wash.arm.master.editable.aria.cancel": "Отменить изменения",
   "dry-wash.arm.master.editable.aria.save": "Сохранить изменения",
   "dry-wash.arm.master.editable.aria.edit": "Редактировать",
-  "dry-wash.arm.master.editable.toast.success": "Успешно!",
-  "dry-wash.arm.master.editable.toast.error.description": "Не удалось обновить данные",
-  "dry-wash.arm.master.editable.toast.error.title": "Ошибка!",
   "dry-wash.arm.master.drawer.title": "Добавить нового мастера",
   "dry-wash.arm.master.drawer.inputName.label": "ФИО",
   "dry-wash.arm.master.drawer.inputName.placeholder": "Введите ФИО",
@@ -42,15 +36,6 @@
   "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.drawer.toast.create-master": "Мастер создан",
-  "dry-wash.arm.master.drawer.toast.error.empty-fields": "Поля не могут быть пустыми",
-  "dry-wash.arm.master.drawer.toast.error.base": "Ошибка",
-  "dry-wash.arm.master.drawer.toast.error.create-master": "Ошибка при создании мастера",
-  "dry-wash.arm.master.drawer.toast.error.create-master-details": "Не удалось добавить мастера. Попробуйте еще раз",
-  "dry-wash.arm.master.drawer.form.name.required": "Имя мастера обязательно",
-  "dry-wash.arm.master.drawer.form.phone.required": "Телефон обязателен",
-  "dry-wash.arm.master.drawer.form.phone.pattern": "Некорректный номер телефона",
-  "dry-wash.arm.master.drawer.form.name.minLength": "Имя должно содержать минимум 2 символа",
   "dry-wash.arm.master.sideBar.orders": "Заказы",
   "dry-wash.arm.master.sideBar.master": "Мастера",
   "dry-wash.arm.master.sideBar.title": "Сухой мастер",
@@ -81,17 +66,6 @@
   "dry-wash.order-create.form.washing-location-field.label": "Где находится автомобиль?",
   "dry-wash.order-create.form.washing-location-field.placeholder": "Введите адрес или выберите на карте",
   "dry-wash.order-create.form.washing-location-field.help": "Например, 55.754364, 48.743295 Университетская улица, 1, Иннополис, Верхнеуслонский район, Республика Татарстан (Татарстан), 420500",
-  "dry-wash.order-create.car-color-select.placeholder": "Введите цвет",
-  "dry-wash.order-create.car-color-select.custom": "Другой",
-  "dry-wash.order-create.car-color-select.custom-label": "Другой:",
-  "dry-wash.order-create.car-color-select.colors.white": "Белый",
-  "dry-wash.order-create.car-color-select.colors.black": "Черный",
-  "dry-wash.order-create.car-color-select.colors.silver": "Серебристый",
-  "dry-wash.order-create.car-color-select.colors.gray": "Серый",
-  "dry-wash.order-create.car-color-select.colors.beige-brown": "Бежево-коричневый",
-  "dry-wash.order-create.car-color-select.colors.red": "Красный",
-  "dry-wash.order-create.car-color-select.colors.blue": "Синий",
-  "dry-wash.order-create.car-color-select.colors.green": "Зеленый",
   "dry-wash.order-create.car-body-select.placeholder": "Не указан",
   "dry-wash.order-create.car-body-select.options.sedan": "Седан",
   "dry-wash.order-create.car-body-select.options.hatchback": "Хэтчбек",
@@ -105,34 +79,21 @@
   "dry-wash.order-create.car-body-select.options.sports-car": "Спорткар",
   "dry-wash.order-create.car-body-select.options.other": "Другой",
   "dry-wash.order-create.form.submit-button.label": "Отправить",
-  "dry-wash.order-create.order-creation-title": "Создаем заказ ...",
   "dry-wash.order-create.create-order-query.success.title": "Заказ успешно создан",
   "dry-wash.order-create.create-order-query.error.title": "Не удалось создать заказ",
   "dry-wash.order-view.title": "Ваш заказ",
-  "dry-wash.order-view.get-order-query.error.title": "Не удалось загрузить детали заказа",
+  "dry-wash.order-view.get-order-query.error.title": "Не удалось загрузить детали заказа №{{number}}",
   "dry-wash.order-view.details.title": "Заказ №{{number}}",
   "dry-wash.order-view.details.owner": "Владелец",
   "dry-wash.order-view.details.car": "Автомобиль",
   "dry-wash.order-view.details.location": "Где",
   "dry-wash.order-view.details.datetime-range": "Когда",
   "dry-wash.order-view.details.alert": "С вами свяжется оператор насчет оплаты по указанному номеру телефона",
-  "dry-wash.order-view.upload-car-image.field.label": "Загрузите фото вашего автомобиля, и наш сервис быстро рассчитает предварительную стоимость заказа!",
-  "dry-wash.order-view.upload-car-image.field.help": "Допустимые форматы: .jpg, .png. Максимальный размер: 14МБ",
-  "dry-wash.order-view.upload-car-image.file-input.placeholder": "Загрузите файл",
-  "dry-wash.order-view.upload-car-image.file-input.button": "Загрузить",
-  "dry-wash.order-view.upload-car-image-query.success.title": "Изображение автомобиля успешно загружено",
-  "dry-wash.order-view.upload-car-image-query.error.title": "Не удалось загрузить изображение автомобиля",
-  "dry-wash.order-view.price-car.title": "Уровень загрязнения машины:",
-  "dry-wash.order-view.price-car.description": "Стоимость мойки:",
-  "dry-wash.order-view.price-car.error": "Не удалось определить уровень загрязнения машины",
   "dry-wash.notFound.title": "Страница не найдена",
   "dry-wash.notFound.description": "К сожалению, запрашиваемая вами страница не существует.",
   "dry-wash.notFound.button.back": "Вернуться на главную",
   "dry-wash.errorBoundary.title": "Что-то пошло не так",
   "dry-wash.errorBoundary.description": "Мы уже работаем над исправлением проблемы",
   "dry-wash.errorBoundary.button.reload": "Перезагрузить страницу",
-  "dry-wash.washTime.timeSlot": "{{start}} - {{end}}",
+  "dry-wash.washTime.timeSlot": "{{start}} - {{end}}"
-  "dry-wash.arm.map.title": " Карта заказов",
-  "dry-wash.arm.map.carNumber": " Номер автомобиля",
-  "dry-wash.arm.map.status": "Статус"
 }

package.json

@@ -1,77 +1,53 @@
 {
-  "name": "dry-wash",
+    "name": "dry-wash",
-  "version": "0.12.0",
+    "version": "0.5.0",
-  "description": "<a id=\"readme-top\"></a>",
+    "description": "<a id=\"readme-top\"></a>",
-  "main": "./src/index.tsx",
+    "main": "./src/index.tsx",
-  "scripts": {
+    "scripts": {
-    "test": "jest -u",
+        "test": "echo \"Error: no test specified\" && exit 1",
-    "start": "brojs server --port=8099 --with-open-browser",
+        "start": "brojs server --port=8099 --with-open-browser",
-    "build": "npm run clean && brojs build --dev",
+        "build": "npm run clean && brojs build --dev",
-    "build:prod": "npm run clean && brojs build",
+        "build:prod": "npm run clean && brojs build",
-    "clean": "rimraf dist",
+        "clean": "rimraf dist",
-    "eslint": "npx eslint src",
+        "eslint": "npx eslint .",
-    "eslint:fix": "npx eslint src --fix",
+        "eslint:fix": "npx eslint . --fix",
-    "preversion": "npm run eslint"
+        "preversion": "npm run eslint"
-  },
+    },
-  "keywords": [],
+    "keywords": [],
-  "author": "",
+    "author": "",
-  "license": "ISC",
+    "license": "ISC",
-  "dependencies": {
+    "dependencies": {
-    "@babel/core": "^7.26.7",
+        "@brojs/cli": "^1.6.3",
-    "@babel/preset-env": "^7.26.7",
+        "@chakra-ui/icons": "^2.2.4",
-    "@babel/preset-react": "^7.26.3",
+        "@chakra-ui/react": "^2.10.5",
-    "@babel/preset-typescript": "^7.26.0",
+        "@emotion/react": "^11.4.1",
-    "@brojs/cli": "^1.8.4",
+        "@emotion/styled": "^11.3.0",
-    "@chakra-ui/icons": "^2.2.4",
+        "@fontsource/open-sans": "^5.1.0",
-    "@chakra-ui/react": "^2.10.5",
+        "@lottiefiles/react-lottie-player": "^3.5.4",
-    "@emotion/react": "^11.4.1",
+        "@pbe/react-yandex-maps": "^1.2.5",
-    "@emotion/styled": "^11.3.0",
+        "@types/react": "^18.3.12",
-    "@fontsource/open-sans": "^5.1.0",
+        "dayjs": "^1.11.13",
-    "@lottiefiles/react-lottie-player": "^3.5.4",
+        "express": "^4.21.1",
-    "@pbe/react-yandex-maps": "^1.2.5",
+        "framer-motion": "^6.2.8",
-    "@reduxjs/toolkit": "^2.5.0",
+        "i18next": "^23.16.4",
-    "@testing-library/dom": "^10.4.0",
+        "keycloak-js": "^23.0.7",
-    "@testing-library/react": "^16.2.0",
+        "react": "^18.3.1",
-    "@types/react": "^18.3.12",
+        "react-dom": "^18.3.1",
-    "babel-jest": "^29.7.0",
+        "react-hook-form": "^7.53.2",
-    "dayjs": "^1.11.13",
+        "react-i18next": "^15.1.1",
-    "express": "^4.21.1",
+        "react-icons": "^5.3.0",
-    "framer-motion": "^6.2.8",
+        "react-phone-number-input": "^3.4.9",
-    "i18next": "^23.16.4",
+        "react-router-dom": "^6.27.0"
-    "jest": "^29.7.0",
+    },
-    "jest-environment-jsdom": "^29.7.0",
+    "devDependencies": {
-    "jest-fixed-jsdom": "^0.0.9",
+        "@eslint/js": "^9.14.0",
-    "keycloak-js": "^23.0.7",
+        "@stylistic/eslint-plugin": "^2.10.1",
-    "msw": "^2.7.0",
+        "@types/react-dom": "^18.3.1",
-    "react": "^18.3.1",
+        "eslint": "^9.14.0",
-    "react-dom": "^18.3.1",
+        "eslint-plugin-import": "^2.31.0",
-    "react-hook-form": "^7.53.2",
+        "eslint-plugin-react": "^7.37.2",
-    "react-i18next": "^15.1.1",
+        "globals": "^15.11.0",
-    "react-icons": "^5.3.0",
+        "prettier": "3.3.3",
-    "react-phone-number-input": "^3.4.9",
+        "typescript-eslint": "^8.12.2"
-    "react-redux": "^9.2.0",
+    }
-    "react-router-dom": "^6.27.0",
-    "ts-jest": "^29.2.5",
-    "ts-node": "^10.9.2"
-  },
-  "devDependencies": {
-    "@eslint/js": "^9.14.0",
-    "@playwright/test": "^1.50.1",
-    "@stylistic/eslint-plugin": "^2.10.1",
-    "@testing-library/jest-dom": "^6.6.3",
-    "@types/jest": "^29.5.14",
-    "@types/node": "^22.13.1",
-    "@types/react-dom": "^18.3.1",
-    "@types/testing-library__jest-dom": "^5.14.9",
-    "eslint": "^9.14.0",
-    "eslint-plugin-import": "^2.31.0",
-    "eslint-plugin-react": "^7.37.2",
-    "globals": "^15.11.0",
-    "prettier": "3.3.3",
-    "typescript": "^5.7.3",
-    "typescript-eslint": "^8.12.2"
-  },
-  "jest": {
-    "preset": "./jest-preset-it/jest-preset.ts"
-  }
 }

playwright.config.ts

@@ -1,79 +0,0 @@
-import { defineConfig, devices } from '@playwright/test';
-
-/**
- * Read environment variables from file.
- * https://github.com/motdotla/dotenv
- */
-// import dotenv from 'dotenv';
-// import path from 'path';
-// dotenv.config({ path: path.resolve(__dirname, '.env') });
-
-/**
- * See https://playwright.dev/docs/test-configuration.
- */
-export default defineConfig({
-  testDir: './tests',
-  /* Run tests in files in parallel */
-  fullyParallel: true,
-  /* Fail the build on CI if you accidentally left test.only in the source code. */
-  forbidOnly: !!process.env.CI,
-  /* Retry on CI only */
-  retries: process.env.CI ? 2 : 0,
-  /* Opt out of parallel tests on CI. */
-  workers: process.env.CI ? 1 : undefined,
-  /* Reporter to use. See https://playwright.dev/docs/test-reporters */
-  reporter: 'html',
-  /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
-  use: {
-    /* Base URL to use in actions like `await page.goto('/')`. */
-    // baseURL: 'http://127.0.0.1:3000',
-
-    /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
-    trace: 'on-first-retry',
-  },
-
-  /* Configure projects for major browsers */
-  projects: [
-    {
-      name: 'chromium',
-      use: { ...devices['Desktop Chrome'] },
-    },
-
-    {
-      name: 'firefox',
-      use: { ...devices['Desktop Firefox'] },
-    },
-
-    {
-      name: 'webkit',
-      use: { ...devices['Desktop Safari'] },
-    },
-
-    /* Test against mobile viewports. */
-    // {
-    //   name: 'Mobile Chrome',
-    //   use: { ...devices['Pixel 5'] },
-    // },
-    // {
-    //   name: 'Mobile Safari',
-    //   use: { ...devices['iPhone 12'] },
-    // },
-
-    /* Test against branded browsers. */
-    // {
-    //   name: 'Microsoft Edge',
-    //   use: { ...devices['Desktop Edge'], channel: 'msedge' },
-    // },
-    // {
-    //   name: 'Google Chrome',
-    //   use: { ...devices['Desktop Chrome'], channel: 'chrome' },
-    // },
-  ],
-
-  /* Run your local dev server before starting the tests */
-  // webServer: {
-  //   command: 'npm run start',
-  //   url: 'http://127.0.0.1:3000',
-  //   reuseExistingServer: !process.env.CI,
-  // },
-});

src/__data__/features.ts

@@ -1,18 +0,0 @@
-import { getFeatures } from "@brojs/cli";
-
-const features = getFeatures('dry-wash');
-
-export const FEATURE = {
-  orderViewStatusPolling: {
-    isOn: Boolean(features?.['order-view-status-polling']),
-    getValue: () => {
-      const interval = parseInt(features?.['order-view-status-polling']?.value);
-      if (!Number.isNaN(interval)) {
-        return interval;
-      }
-    }
-  },
-  carImageUpload: {
-    isOn: Boolean(features?.['car-img-upload'])
-  }
-};

src/__data__/service/api.ts

@@ -1,92 +0,0 @@
-import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query/react';
-import { getConfigValue } from '@brojs/cli';
-import dayjs from 'dayjs';
-
-import { Master, OrderArm } from '../../models/api';
-
-import { extractBodyFromResponse } from './utils';
-
-export type UpdateMasterPayload = Required<Pick<Master, 'id'>> &
-  Partial<Omit<Master, 'id'>>;
-
-type UpdateOrderProps = Required<Pick<OrderArm, 'id'>> &
-  Partial<Pick<OrderArm, 'status' | 'notes'>> & {
-    master?: string;
-  };
-
-export const api = createApi({
-  reducerPath: 'api',
-  baseQuery: fetchBaseQuery({
-    baseUrl: new URL(getConfigValue('dry-wash.api'), location.origin).href,
-  }),
-  tagTypes: ['Masters', 'Orders'],
-  endpoints: (builder) => ({
-    getMasters: builder.query<Master[], { date: Date }>({
-      query: ({ date }) => {
-        const startDate = dayjs(date).startOf('day').toISOString();
-        const endDate = dayjs(date).endOf('day').toISOString();
-        return {
-          url: '/arm/masters/list',
-          method: 'POST',
-          body: { startDate, endDate },
-        };
-      },
-      transformResponse: extractBodyFromResponse<Master[]>,
-      providesTags: ['Masters'],
-    }),
-    updateOrders: builder.mutation<void, UpdateOrderProps>({
-      query: ({ id, status, notes, master }) => ({
-        url: `/order/${id}`,
-        method: 'PATCH',
-        body: { status, notes, master },
-      }),
-      invalidatesTags: ['Orders', 'Masters'],
-    }),
-    getOrders: builder.query<OrderArm[], { date: Date }>({
-      query: ({ date }) => {
-        const startDate = dayjs(date).startOf('day').toISOString();
-        const endDate = dayjs(date).endOf('day').toISOString();
-        return {
-          url: '/arm/orders',
-          method: 'POST',
-          body: { startDate, endDate },
-        };
-      },
-      transformResponse: extractBodyFromResponse<OrderArm[]>,
-      providesTags: ['Orders'],
-    }),
-
-    addMaster: builder.mutation<void, Pick<Master, 'name' | 'phone'>>({
-      query: (master) => ({
-        url: '/arm/masters',
-        method: 'POST',
-        body: master,
-      }),
-      invalidatesTags: ['Masters', 'Orders'],
-    }),
-    deleteMaster: builder.mutation<void, { id: string }>({
-      query: ({ id }) => ({
-        url: `/arm/masters/${id}`,
-        method: 'DELETE',
-      }),
-      invalidatesTags: ['Masters', 'Orders'],
-    }),
-    updateMaster: builder.mutation<void, UpdateMasterPayload>({
-      query: ({ id, name, phone }) => ({
-        url: `/arm/masters/${id}`,
-        method: 'PATCH',
-        body: { name, phone },
-      }),
-      invalidatesTags: ['Masters', 'Orders'],
-    }),
-  }),
-});
-
-export const {
-  useGetMastersQuery,
-  useAddMasterMutation,
-  useDeleteMasterMutation,
-  useUpdateMasterMutation,
-  useGetOrdersQuery,
-  useUpdateOrdersMutation,
-} = api;

src/__data__/service/landing.api.ts

@@ -1,31 +0,0 @@
-import { GetOrder, CreateOrder, UploadCarImage } from "../../models/api";
-
-import { api } from "./api";
-import { extractBodyFromResponse, extractErrorMessageFromResponse } from "./utils";
-
-export const landingApi = api.injectEndpoints({
-  endpoints: ({ mutation, query }) => ({
-    getOrder: query<GetOrder.Response, GetOrder.Params>({
-      query: ({ orderId }) => `/order/${orderId}`,
-      transformResponse: extractBodyFromResponse<GetOrder.Response>,
-      transformErrorResponse: extractErrorMessageFromResponse,
-    }),
-    createOrder: mutation<CreateOrder.Response, CreateOrder.Params>({
-      query: ({ body }) => ({
-        url: `/order/create`,
-        body,
-        method: 'POST'
-      }),
-      transformResponse: extractBodyFromResponse<CreateOrder.Response>,
-      transformErrorResponse: extractErrorMessageFromResponse,
-    }),
-    uploadCarImage: mutation<UploadCarImage.Response, UploadCarImage.Params>({
-      query: ({ orderId, body }) => ({
-        url: `/order/${orderId}/upload-car-img`,
-        body,
-        method: 'POST'
-      }),
-      transformErrorResponse: extractErrorMessageFromResponse,
-    }),
-  })
-});

src/__data__/service/utils.ts

@@ -1,22 +0,0 @@
-import { FetchBaseQueryError } from '@reduxjs/toolkit/query';
-
-import { BaseResponse } from '../../models/api';
-
-export const extractBodyFromResponse = <Body>(response: BaseResponse<Body>) => {
-  if (response.success) {
-    return response.body;
-  }
-};
-
-export const extractErrorMessageFromResponse = ({
-  data,
-}: FetchBaseQueryError) => {
-  if (
-    typeof data === 'object' &&
-    data !== null &&
-    'error' in data &&
-    typeof data.error === 'string'
-  ) {
-    return data.error;
-  }
-};

src/__data__/store.ts

@@ -1,16 +0,0 @@
-import { configureStore } from '@reduxjs/toolkit';
-
-import { api } from './service/api';
-
-export const store = configureStore({
-  reducer: {
-    [api.reducerPath]: api.reducer,
-  },
-  middleware: (getDefaultMiddleware) =>
-    getDefaultMiddleware({
-      serializableCheck: false
-    }).concat(api.middleware),
-});
-
-export type RootState = ReturnType<typeof store.getState>;
-export type AppDispatch = typeof store.dispatch;

src/__data__/urls.ts

@@ -33,18 +33,6 @@ export const URLs = {
     url: getNavigationValue('dry-wash.arm.order'),
     isOn: Boolean(getNavigationValue('dry-wash.arm.order')),
   },
-  armMap: {
-    url: getNavigationValue('dry-wash.arm.map'),
-    isOn: Boolean(getNavigationValue('dry-wash.arm.map')),
-    getUrl({ lat, lon, currentDate }) {
-      return (
-        getFullUrls('/arm') +
-        '/' +
-        getNavigationValue('dry-wash.arm.map') +
-        `?lat=${lat}&lon=${lon}&currentDate=${currentDate}`
-      );
-    },
-  },
   armBase: {
     url: getFullUrls(getNavigationValue('dry-wash.arm')),
     isOn: Boolean(getNavigationValue('dry-wash.arm')),

src/api/arm.ts

@@ -0,0 +1,139 @@
+import { getConfigValue } from '@brojs/cli';
+import dayjs from 'dayjs';
+
+enum ArmEndpoints {
+  ORDERS = '/arm/orders',
+  MASTERS = '/arm/masters',
+}
+
+const armService = () => {
+  const endpoint = getConfigValue('dry-wash.api');
+
+  const fetchOrders = async ({ date }: { date: Date }) => {
+    const startDate = dayjs(date).startOf('day').toISOString();
+    const endDate = dayjs(date).endOf('day').toISOString();
+
+    const response = await fetch(`${endpoint}${ArmEndpoints.ORDERS}`, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify({ startDate, endDate }),
+    });
+
+    if (!response.ok) {
+      throw new Error(`Failed to fetch orders: ${response.status}`);
+    }
+
+    return await response.json();
+  };
+
+  const fetchMasters = async () => {
+    const response = await fetch(`${endpoint}${ArmEndpoints.MASTERS}`);
+
+    if (!response.ok) {
+      throw new Error(`Failed to fetch masters: ${response.status}`);
+    }
+
+    return await response.json();
+  };
+
+  const addMaster = async ({
+    name,
+    phone,
+  }: {
+    name: string;
+    phone: string;
+  }) => {
+    const response = await fetch(`${endpoint}${ArmEndpoints.MASTERS}`, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      body: JSON.stringify({ name, phone }),
+    });
+
+    if (!response.ok) {
+      throw new Error(`Failed to fetch masters: ${response.status}`);
+    }
+
+    return await response.json();
+  };
+
+  const deleteMaster = async ({ id }: { id: string }) => {
+    const response = await fetch(`${endpoint}${ArmEndpoints.MASTERS}/${id}`, {
+      method: 'DELETE',
+    });
+
+    if (!response.ok) {
+      throw new Error(`Failed to fetch masters: ${response.status}`);
+    }
+
+    return await response.json();
+  };
+
+  const updateOrders = async ({
+    id,
+    status,
+    notes,
+    masterId,
+  }: {
+    id: string;
+    status?: string;
+    notes?: string;
+    masterId?: string;
+  }) => {
+    const body = JSON.stringify({ status, notes, masterId });
+
+    const response = await fetch(`${endpoint}${ArmEndpoints.MASTERS}/${id}`, {
+      method: 'PATCH',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      body,
+    });
+
+    if (!response.ok) {
+      throw new Error(`Failed to fetch update masters: ${response.status}`);
+    }
+
+    return await response.json();
+  };
+
+  const updateMaster = async ({
+    id,
+    name,
+    phone,
+  }: {
+    id: string;
+    name?: string;
+    phone?: string;
+  }) => {
+    const body = JSON.stringify({ name, phone });
+
+    const response = await fetch(`${endpoint}${ArmEndpoints.MASTERS}/${id}`, {
+      method: 'PATCH',
+      headers: {
+        'Content-Type': 'application/json',
+      },
+      body,
+    });
+
+    if (!response.ok) {
+      throw new Error(`Failed to fetch update masters: ${response.status}`);
+    }
+
+    return await response.json();
+  };
+
+  return {
+    fetchOrders,
+    fetchMasters,
+    addMaster,
+    deleteMaster,
+    updateMaster,
+    updateOrders,
+  };
+};
+
+export { armService, ArmEndpoints };

src/api/index.ts

@@ -0,0 +1 @@
+export * from './landing';

src/api/landing.tsx

@@ -0,0 +1,107 @@
+import { getConfigValue } from '@brojs/cli';
+import { useEffect, useState } from 'react';
+
+import { CreateOrder, GetOrder } from '../models/api';
+
+import { QueryState, Trigger } from './types';
+
+enum LandingEndpoints {
+  ORDER = '/order',
+  ORDER_CREATE = '/order/create',
+}
+
+const endpoint = getConfigValue('dry-wash.api');
+
+const useCreateOrderMutation = <D extends CreateOrder.Response>(): [
+  Trigger<CreateOrder.Params, QueryState<D>['data']>,
+  QueryState<D>,
+] => {
+  const [isLoading, setIsLoading] = useState<QueryState<D>['isLoading']>(false);
+  const [isSuccess, setIsSuccess] = useState<QueryState<D>['isSuccess']>();
+  const [data, setData] = useState<QueryState<D>['data']>();
+  const [isError, setIsError] = useState<QueryState<D>['isError']>();
+  const [error, setError] = useState<QueryState<D>['error']>();
+
+  const createOrder = async ({ body }: CreateOrder.Params) => {
+    setIsLoading(true);
+
+    try {
+      const response = await fetch(
+        `${endpoint}${LandingEndpoints.ORDER_CREATE}`,
+        {
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json',
+          },
+          body: JSON.stringify(body),
+        },
+      );
+
+      if (!response.ok) {
+        const errorResponseObject =
+          (await response.json()) as QueryState<D>['error'];
+        setIsError(true);
+        setError(errorResponseObject);
+        throw errorResponseObject;
+      }
+
+      const dataResponseObject =
+        (await response.json()) as QueryState<D>['data'];
+      setIsSuccess(true);
+      setData(dataResponseObject);
+
+      return dataResponseObject;
+    } catch (error) {
+      setIsError(true);
+      setError(error);
+      throw error;
+    } finally {
+      setIsLoading(false);
+    }
+  };
+
+  return [createOrder, { isLoading, isSuccess, data, isError, error }];
+};
+
+const useGetOrderQuery = <D extends GetOrder.Response>({
+  orderId,
+}: GetOrder.Params): QueryState<D> => {
+  const [isLoading, setIsLoading] = useState<QueryState<D>['isLoading']>(true);
+  const [isSuccess, setIsSuccess] = useState<QueryState<D>['isSuccess']>();
+  const [data, setData] = useState<QueryState<D>['data']>();
+  const [isError, setIsError] = useState<QueryState<D>['isError']>();
+  const [error, setError] = useState<QueryState<D>['error']>();
+  
+  useEffect(() => {
+    (async () => {
+      try {
+        const response = await fetch(
+          `${endpoint}${LandingEndpoints.ORDER}/${orderId}`,
+        );
+
+        if (!response.ok) {
+          const errorResponseObject =
+            (await response.json()) as QueryState<D>['error'];
+          setIsError(true);
+          setError(errorResponseObject);
+          throw errorResponseObject;
+        }
+
+        const dataResponseObject =
+          (await response.json()) as QueryState<D>['data'];
+        setIsSuccess(true);
+        setData(dataResponseObject);
+      } catch (error) {
+        setIsError(true);
+        setError(error);
+        throw error;
+      } finally {
+        setIsLoading(false);
+      }
+    })();
+  }, []);
+
+  return { isLoading, isSuccess, data, isError, error };
+};
+
+export { useCreateOrderMutation, useGetOrderQuery };

src/api/types.ts

@@ -0,0 +1,22 @@
+export type QueryData<D> = {
+  success: true;
+  body: D;
+};
+
+export type QueryErrorData = {
+  success: false;
+  error: string;
+};
+
+export type QueryState<D> = {
+  isLoading: boolean;
+  isSuccess: boolean;
+  data: QueryData<D>;
+  isError: boolean;
+  error: {
+    status: number;
+    data: QueryErrorData;
+  };
+};
+
+export type Trigger<P, D> = (params: P) => Promise<D>;

src/app.tsx

@@ -1,23 +1,19 @@
 import React from 'react';
 import { BrowserRouter } from 'react-router-dom';
 import { ChakraProvider, theme as chakraTheme } from '@chakra-ui/react';
-import { Provider } from 'react-redux';
 
 import Routers from './routes';
 import ErrorBoundary from './components/ErrorBoundary';
-import { store } from './__data__/store';
 
 const App = () => {
   return (
-    <Provider store={store}>
+    <ChakraProvider theme={chakraTheme}>
-      <ChakraProvider theme={chakraTheme}>
+      <ErrorBoundary>
-        <ErrorBoundary>
+        <BrowserRouter>
-          <BrowserRouter>
+          <Routers />
-            <Routers />
+        </BrowserRouter>
-          </BrowserRouter>
+      </ErrorBoundary>
-        </ErrorBoundary>
+    </ChakraProvider>
-      </ChakraProvider>
-    </Provider>
   );
 };
 

src/assets/animation/index.ts

@@ -1 +0,0 @@
-export { default as OrderCreationAnimation } from './order-creation.json';

src/assets/images/car-body-type/index.ts

@@ -3,7 +3,6 @@ export { default as CrossoverImg } from './crossover.webp';
 export { default as HatchbackImg } from './hatchback.webp';
 export { default as LiftbackImg } from './liftback.webp';
 export { default as MinivanImg } from './minivan.webp';
-export { default as OtherImg } from './other.webp';
 export { default as PickupImg } from './pickup.webp';
 export { default as SedanImg } from './sedan.webp';
 export { default as SportsCarImg } from './sports-car.webp';

src/components/DateNavigator/DateNavigator.tsx

@@ -1,7 +1,6 @@
 import React from 'react';
 import { Box, Button, Text } from '@chakra-ui/react';
 import { ArrowBackIcon, ArrowForwardIcon } from '@chakra-ui/icons';
-import dayjs from 'dayjs';
 
 interface DateNavigatorProps {
   currentDate: Date;
@@ -20,7 +19,7 @@ const DateNavigator = ({
         <ArrowBackIcon />
       </Button>
       <Text mx='4' fontSize='lg' fontWeight='bold'>
-        {dayjs(currentDate).format('DD.MM.YYYY')}
+        {currentDate.toLocaleDateString()}
       </Text>
       <Button onClick={onNextDate}>
         <ArrowForwardIcon />

src/components/Editable/Editable.tsx

@@ -1,4 +1,4 @@
-import React, { useEffect, useState } from 'react';
+import React, { useState } from 'react';
 import {
   Editable,
   EditableInput,
@@ -9,51 +9,63 @@ import {
   useEditableControls,
   ButtonGroup,
   Stack,
+  useToast,
 } from '@chakra-ui/react';
 import { CheckIcon, CloseIcon, EditIcon } from '@chakra-ui/icons';
 import { useTranslation } from 'react-i18next';
 
-import { useUpdateMasterMutation } from '../../__data__/service/api';
-import useShowToast from '../../hooks/useShowToast';
-
 interface EditableWrapperProps {
   value: string;
-  fieldName: 'phone' | 'name';
+  onSubmit: ({
+    id,
+    name,
+    phone,
+  }: {
+    id: string;
+    name?: string;
+    phone?: string;
+  }) => Promise<unknown>;
+  as: 'phone' | 'name';
   id: string;
 }
 
-const EditableWrapper = ({ value, fieldName, id }: EditableWrapperProps) => {
+const EditableWrapper = ({ value, onSubmit, as, id }: EditableWrapperProps) => {
-  const [updateMaster, { isError, isSuccess, error }] =
-    useUpdateMasterMutation();
-
   const { t } = useTranslation('~', {
     keyPrefix: 'dry-wash.arm.master.editable',
   });
 
-  const showToast = useShowToast();
+  const toast = useToast();
   const [currentValue, setCurrentValue] = useState<string>(value);
 
   const handleSubmit = async (newValue: string) => {
     if (currentValue === newValue) return;
 
-    await updateMaster({ id, [fieldName]: newValue });
+    try {
+      await onSubmit({ id, [as]: newValue });
 
-    setCurrentValue(newValue);
+      setCurrentValue(newValue);
+
+      toast({
+        title: 'Успешно!',
+        description: 'Данные обновлены.',
+        status: 'success',
+        duration: 2000,
+        isClosable: true,
+        position: 'top-right',
+      });
+    } catch (error) {
+      toast({
+        title: 'Ошибка!',
+        description: 'Не удалось обновить данные.',
+        status: 'error',
+        duration: 2000,
+        isClosable: true,
+        position: 'top-right',
+      });
+      console.error('Ошибка при обновлении данных:', error);
+    }
   };
 
-  useEffect(() => {
-    if (isSuccess) {
-      showToast(t('toast.success'), 'success');
-    }
-  }, [isSuccess]);
-
-  useEffect(() => {
-    if (isError) {
-      showToast(t('toast.error.title'), 'error', t('toast.error.description'));
-      console.error(t('toast.error.description'), error);
-    }
-  }, [isError, error]);
-
   function EditableControls() {
     const {
       isEditing,

src/components/ErrorBoundary/ErrorBoundary.tsx

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

src/components/ErrorBoundary/__tests__/ErrorBoundary.test.tsx

@@ -1,51 +0,0 @@
-import * as React from 'react';
-import { describe, expect, it, jest } from '@jest/globals';
-import { render, screen, waitFor } from '@testing-library/react';
-import { BrowserRouter } from 'react-router-dom';
-import { Provider } from 'react-redux';
-import { useEffect } from 'react';
-
-import ErrorBoundary from '../ErrorBoundary';
-import { store } from '../../../__data__/store';
-
-const ProblematicComponent = () => {
-  useEffect(() => {
-    throw new Error('Test Error');
-  }, []);
-
-  return <div>Этот текст не должен появиться</div>;
-};
-jest.mock('@brojs/cli', () => {
-  return {
-    getNavigationValue: () => '/auth/login',
-    getConfigValue: () => '/api',
-  };
-});
-
-describe('ErrorBoundary', () => {
-  it('должен отобразить запасной UI при ошибке', async () => {
-    // Подавляем вывод ошибки в консоль во время теста
-    const consoleSpy = jest.spyOn(console, 'error');
-    consoleSpy.mockImplementation(() => {});
-
-    const { container } = render(
-      <Provider store={store}>
-        <ErrorBoundary>
-          <BrowserRouter>
-            <ProblematicComponent />
-          </BrowserRouter>
-        </ErrorBoundary>
-      </Provider>,
-    );
-
-    const button = await waitFor(() =>
-      screen.getByTestId('error-reload-button'),
-    );
-
-    expect(button).not.toBeNull();
-    expect(container).toMatchSnapshot();
-
-    // Восстанавливаем console.error после теста
-    consoleSpy.mockRestore();
-  });
-});

src/components/ErrorBoundary/__tests__/__snapshots__/ErrorBoundary.test.tsx.snap

@@ -1,28 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`ErrorBoundary должен отобразить запасной UI при ошибке 1`] = `
-<div>
-  <div
-    class="css-1o0ed15"
-    data-testid="error-boundary"
-  >
-    <div
-      class="chakra-stack css-zefqyp"
-    >
-      <h1
-        class="chakra-heading css-0"
-        data-testid="error-title"
-      />
-      <p
-        class="chakra-text css-1ezsviu"
-        data-testid="error-description"
-      />
-      <button
-        class="chakra-button css-4xx2wk"
-        data-testid="error-reload-button"
-        type="button"
-      />
-    </div>
-  </div>
-</div>
-`;

src/components/Header/Header.tsx

@@ -1,61 +0,0 @@
-import { Box, Button, Heading, HStack, Flex } from '@chakra-ui/react';
-import React from 'react';
-import { useLocation, Link } from 'react-router-dom';
-import { useTranslation } from 'react-i18next';
-
-import { URLs } from '../../__data__/urls';
-
-const Header = () => {
-  const location = useLocation();
-  const isActive = (keyword: string) => location.pathname.includes(keyword);
-
-  const { t } = useTranslation('~', {
-    keyPrefix: 'dry-wash.arm.master.sideBar',
-  });
-
-  return (
-    <Box as='header' bg='gray.50' boxShadow='md' px={6} py={4} w='100%'>
-      <Flex gap={50} align='center'>
-        <Heading color='green' size='lg'>
-          {t('title')}
-        </Heading>
-        <HStack spacing={4}>
-          {URLs.armOrder.isOn && (
-            <Button
-              as={Link}
-              to={URLs.armOrder.url}
-              colorScheme={isActive(URLs.armOrder.url) ? 'green' : 'blue'}
-              variant={isActive(URLs.armOrder.url) ? 'outline' : 'ghost'}
-            >
-              {t('orders')}
-            </Button>
-          )}
-          {URLs.armMaster.isOn && (
-            <Button
-              as={Link}
-              to={URLs.armMaster.url}
-              colorScheme={isActive(URLs.armMaster.url) ? 'green' : 'blue'}
-              variant={isActive(URLs.armMaster.url) ? 'outline' : 'ghost'}
-              data-testid='master-button'
-            >
-              {t('master')}
-            </Button>
-          )}
-
-          {URLs.armMap.isOn && (
-            <Button
-              as={Link}
-              to={URLs.armMap.url}
-              colorScheme={isActive(URLs.armMap.url) ? 'green' : 'blue'}
-              variant={isActive(URLs.armMap.url) ? 'outline' : 'ghost'}
-            >
-              Карта заказов
-            </Button>
-          )}
-        </HStack>
-      </Flex>
-    </Box>
-  );
-};
-
-export default Header;

src/components/Header/index.ts

@@ -1 +0,0 @@
-export { default } from './Header';

src/components/LayoutArm/LayoutArm.tsx

@@ -2,11 +2,10 @@ import { Box, Flex } from '@chakra-ui/react';
 import React from 'react';
 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';
-import Header from '../Header';
-import OrdersMap from '../Map';
 
 const LayoutArm = () => {
   let defaultRedirect = null;
@@ -18,8 +17,8 @@ const LayoutArm = () => {
   }
 
   return (
-    <Flex flexDirection='column' h='100vh'>
+    <Flex h='100vh'>
-      <Header />
+      <Sidebar />
       <Box flex='1' bg='gray.50'>
         <Routes>
           <Route index element={<Navigate to={defaultRedirect} replace />} />
@@ -29,9 +28,6 @@ const LayoutArm = () => {
           {URLs.armMaster.isOn && (
             <Route path={URLs.armMaster.url} element={<Masters />} />
           )}
-          {URLs.armMap.isOn && (
-            <Route path={URLs.armMap.url} element={<OrdersMap />} />
-          )}
         </Routes>
       </Box>
     </Flex>

src/components/Map/Map.tsx

@@ -1,95 +0,0 @@
-import React, { useState } from 'react';
-import { Box, Flex, Heading, Spinner } from '@chakra-ui/react';
-import { useTranslation } from 'react-i18next';
-import { YMaps, Map, Placemark } from '@pbe/react-yandex-maps';
-import { useLocation } from 'react-router-dom';
-import dayjs from 'dayjs';
-
-import { useGetOrdersQuery } from '../../__data__/service/api';
-import getCoordinates from '../../utils/getCoordinates';
-import DateNavigator from '../DateNavigator';
-
-const OrdersMap = () => {
-  const { t } = useTranslation('~', {
-    keyPrefix: 'dry-wash.arm.map',
-  });
-
-  const location = useLocation();
-  const params = new URLSearchParams(location.search);
-  const latFromUrl = parseFloat(params.get('lat') || '55.78');
-  const lonFromUrl = parseFloat(params.get('lon') || '49.12');
-
-  const [currentDate, setCurrentDate] = useState(
-    params.get('currentDate')
-      ? new Date(params.get('currentDate'))
-      : new Date(),
-  );
-
-  const {
-    data: ordersData,
-    isLoading,
-    isSuccess,
-  } = useGetOrdersQuery({ date: currentDate });
-
-  // Получаем координаты из location
-  const orders = ordersData
-    ?.map((order) => {
-      const coords = getCoordinates(order.location);
-      return coords ? { ...order, ...coords } : null;
-    })
-    .filter(Boolean);
-
-  return (
-    <Box p='8'>
-      <Heading size='lg' mb='5'>
-        {t('title')}
-      </Heading>
-
-      <DateNavigator
-        currentDate={currentDate}
-        onPreviousDate={() =>
-          setCurrentDate((prevDate) =>
-            dayjs(prevDate).subtract(1, 'day').toDate(),
-          )
-        }
-        onNextDate={() =>
-          setCurrentDate((prevDate) => dayjs(prevDate).add(1, 'day').toDate())
-        }
-      />
-
-      {isLoading && (
-        <Flex justifyContent='center' alignItems='center'>
-          <Spinner size='lg' />
-        </Flex>
-      )}
-
-      {isSuccess && (
-        <YMaps>
-          <Map
-            defaultState={{ center: [latFromUrl, lonFromUrl], zoom: 12 }}
-            width='100%'
-            height='70vh'
-            modules={['geoObject.addon.balloon']}
-          >
-            {orders.map(({ id, lat, lon, carNumber, status }) => (
-              <Placemark
-                key={id}
-                geometry={[lat, lon]}
-                options={{
-                  preset: 'islands#blueAutoIcon',
-                  iconColor: 'blue',
-                  balloonPanelMaxMapArea: 0,
-                }}
-                properties={{
-                  balloonContent: `<strong>${t('carNumber')}</strong> ${carNumber}<br/><strong>${t('status')}</strong> ${status}`,
-                }}
-              />
-            ))}
-          </Map>
-        </YMaps>
-      )}
-    </Box>
-  );
-};
-
-export default OrdersMap;

src/components/Map/index.ts

@@ -1 +0,0 @@
-export { default } from './Map';

src/components/MasterActionsMenu/MasterActionsMenu.tsx

@@ -1,16 +1,16 @@
-import React, { useEffect } from 'react';
+import React from 'react';
 import {
   Menu,
   MenuButton,
   MenuList,
   MenuItem,
   IconButton,
+  useToast,
 } from '@chakra-ui/react';
 import { EditIcon } from '@chakra-ui/icons';
 import { useTranslation } from 'react-i18next';
 
-import { useDeleteMasterMutation } from '../../__data__/service/api';
+import { armService } from '../../api/arm';
-import useShowToast from '../../hooks/useShowToast';
 
 interface MasterActionsMenu {
   id: string;
@@ -21,35 +21,38 @@ const MasterActionsMenu = ({ id }: MasterActionsMenu) => {
     keyPrefix: 'dry-wash.arm.master.table.actionsMenu',
   });
 
-  const [deleteMaster, { isSuccess, isError, error, isLoading }] =
+  const { deleteMaster } = armService();
-    useDeleteMasterMutation();
+  const toast = useToast();
-
-  const showToast = useShowToast();
 
   const handleClickDelete = async () => {
-    await deleteMaster({ id });
+    try {
-  };
+      await deleteMaster({ id });
-
+      toast({
-  useEffect(() => {
+        title: 'Мастер удалён.',
-    if (isSuccess) {
+        description: `Мастер с ID "${id}" успешно удалён.`,
-      showToast(t('toast.success'), 'success');
+        status: 'success',
-    }
+        duration: 5000,
-  }, [isSuccess]);
+        isClosable: true,
-
+        position: 'top-right',
-  useEffect(() => {
+      });
-    if (isError) {
+    } catch (error) {
-      showToast(t('toast.error.title'), 'error', t('toast.error.description'));
+      toast({
+        title: 'Ошибка удаления мастера.',
+        description: 'Не удалось удалить мастера. Попробуйте ещё раз.',
+        status: 'error',
+        duration: 5000,
+        isClosable: true,
+        position: 'top-right',
+      });
       console.error(error);
     }
-  }, [isError]);
+  };
 
   return (
     <Menu>
       <MenuButton icon={<EditIcon />} as={IconButton} variant='outline' />
       <MenuList>
-        <MenuItem onClick={handleClickDelete} isDisabled={isLoading}>
+        <MenuItem onClick={handleClickDelete}>{t('delete')}</MenuItem>
-          {t('delete')}
-        </MenuItem>
       </MenuList>
     </Menu>
   );

src/components/MasterDrawer/MasterDrawer.tsx

@@ -1,5 +1,4 @@
-import React, { useEffect } from 'react';
+import React, { useState } from 'react';
-import { useForm, SubmitHandler } from 'react-hook-form';
 import {
   Button,
   FormControl,
@@ -12,128 +11,98 @@ import {
   DrawerFooter,
   DrawerHeader,
   DrawerOverlay,
+  useToast,
   InputGroup,
   InputLeftElement,
-  FormErrorMessage,
 } from '@chakra-ui/react';
 import { useTranslation } from 'react-i18next';
 import { PhoneIcon } from '@chakra-ui/icons';
 
-import { useAddMasterMutation } from '../../__data__/service/api';
+import { armService } from '../../api/arm';
-import { DrawerInputs } from '../../models/arm/form';
-import useShowToast from '../../hooks/useShowToast';
 
-interface MasterDrawerProps {
+const MasterDrawer = ({ isOpen, onClose }) => {
-  isOpen: boolean;
+  const { addMaster } = armService();
-  onClose: () => void;
+  const toast = useToast();
-}
 
-const MasterDrawer = ({ isOpen, onClose }: MasterDrawerProps) => {
+  const [newMaster, setNewMaster] = useState({ name: '', phone: '' });
-  const {
+
-    register,
+  const handleSave = async () => {
-    handleSubmit,
+    if (newMaster.name.trim() === '' || newMaster.phone.trim() === '') {
-    reset,
+      return;
-    formState: { errors },
+    }
-  } = useForm<DrawerInputs>();
+
+    try {
+      await addMaster(newMaster);
+      toast({
+        title: 'Мастер создан.',
+        description: `Мастер "${newMaster.name}" успешно добавлен.`,
+        status: 'success',
+        duration: 5000,
+        isClosable: true,
+        position: 'top-right',
+      });
+      onClose();
+    } catch (error) {
+      toast({
+        title: 'Ошибка при создании мастера.',
+        description: 'Не удалось добавить мастера. Попробуйте еще раз.',
+        status: 'error',
+        duration: 5000,
+        isClosable: true,
+        position: 'top-right',
+      });
+      console.error(error);
+    }
+  };
 
   const { t } = useTranslation('~', {
     keyPrefix: 'dry-wash.arm.master.drawer',
   });
 
-  const onSubmit: SubmitHandler<DrawerInputs> = async (data) => {
-    const trimMaster = {
-      name: data.name.trim(),
-      phone: data.phone.trim(),
-    };
-
-    const isEmptyFields = trimMaster.name === '' || trimMaster.phone === '';
-
-    if (isEmptyFields) {
-      showToast(t('toast.error.base'), 'error', t('toast.error.empty-fields'));
-      return;
-    }
-
-    await addMaster(trimMaster);
-  };
-
-  const [addMaster, { error, isSuccess }] = useAddMasterMutation();
-  const showToast = useShowToast();
-
-  useEffect(() => {
-    if (isSuccess) {
-      showToast(t('toast.create-master'), 'success');
-      reset();
-      onClose();
-    }
-  }, [isSuccess]);
-
-  useEffect(() => {
-    if (error) {
-      showToast(
-        t('toast.error.create-master'),
-        'error',
-        t('toast.error.create-master-details'),
-      );
-      console.error(error);
-    }
-  }, [error]);
-
   return (
     <Drawer isOpen={isOpen} onClose={onClose} size='md'>
       <DrawerOverlay />
       <DrawerContent>
-        <form onSubmit={handleSubmit(onSubmit)}>
+        <DrawerCloseButton />
-          <DrawerCloseButton />
+        <DrawerHeader>{t('title')}</DrawerHeader>
-          <DrawerHeader>{t('title')}</DrawerHeader>
+        <DrawerBody>
-          <DrawerBody>
+          <FormControl mb='4'>
-            <FormControl mb='4' isInvalid={!!errors.name}>
+            <FormLabel>{t('inputName.label')}</FormLabel>
-              <FormLabel>{t('inputName.label')}</FormLabel>
+            <Input
+              // isInvalid
+              value={newMaster.name}
+              onChange={(e) =>
+                setNewMaster({ ...newMaster, name: e.target.value })
+              }
+              placeholder={t('inputName.placeholder')}
+            />
+          </FormControl>
+          <FormControl>
+            <FormLabel>{t('inputPhone.label')}</FormLabel>
+
+            <InputGroup>
+              <InputLeftElement pointerEvents='none'>
+                <PhoneIcon color='gray.300' />
+              </InputLeftElement>
               <Input
-                {...register('name', {
+                // isInvalid
-                  required: t('form.name.required'),
+                value={newMaster.phone}
-                  minLength: {
+                onChange={(e) =>
-                    value: 2,
+                  setNewMaster({ ...newMaster, phone: e.target.value })
-                    message: t('form.name.minLength'),
+                }
-                  },
+                placeholder={t('inputPhone.placeholder')}
-                })}
-                placeholder={t('inputName.placeholder')}
               />
-              <FormErrorMessage>
+            </InputGroup>
-                {errors.name && errors.name.message}
+          </FormControl>
-              </FormErrorMessage>
+        </DrawerBody>
-            </FormControl>
+        <DrawerFooter>
-            <FormControl isInvalid={!!errors.phone}>
+          <Button colorScheme='teal' mr={3} onClick={handleSave}>
-              <FormLabel>{t('inputPhone.label')}</FormLabel>
+            {t('button.save')}
-              <InputGroup>
+          </Button>
-                <InputLeftElement pointerEvents='none'>
+          <Button variant='ghost' onClick={onClose}>
-                  <PhoneIcon color='gray.300' />
+            {t('button.cancel')}
-                </InputLeftElement>
+          </Button>
-                <Input
+        </DrawerFooter>
-                  {...register('phone', {
-                    required: t('form.phone.required'),
-                    pattern: {
-                      value: /^(\+7|8)\d{10}$/,
-                      message: t('form.phone.pattern'),
-                    },
-                    setValueAs: (value) => value.replace(/[^\d+]/g, ''),
-                  })}
-                  placeholder={t('inputPhone.placeholder')}
-                />
-              </InputGroup>
-              <FormErrorMessage>
-                {errors.phone && errors.phone.message}
-              </FormErrorMessage>
-            </FormControl>
-          </DrawerBody>
-          <DrawerFooter>
-            <Button colorScheme='teal' mr={3} type='submit'>
-              {t('button.save')}
-            </Button>
-            <Button variant='ghost' onClick={onClose}>
-              {t('button.cancel')}
-            </Button>
-          </DrawerFooter>
-        </form>
       </DrawerContent>
     </Drawer>
   );

src/components/MasterItem/MasterItem.tsx

@@ -5,8 +5,23 @@ import { useTranslation } from 'react-i18next';
 import MasterActionsMenu from '../MasterActionsMenu';
 import { getTimeSlot } from '../../lib';
 import EditableWrapper from '../Editable/Editable';
+import { armService } from '../../api/arm';
+
+export interface Schedule {
+  id: string;
+  startWashTime: string;
+  endWashTime: string;
+}
+
+export type MasterProps = {
+  id: string;
+  name: string;
+  phone: string;
+  schedule: Schedule[];
+};
 
 const MasterItem = ({ name, phone, id, schedule }) => {
+  const { updateMaster } = armService();
   const { t } = useTranslation('~', {
     keyPrefix: 'dry-wash.arm.master',
   });
@@ -14,7 +29,12 @@ const MasterItem = ({ name, phone, id, schedule }) => {
   return (
     <Tr>
       <Td>
-        <EditableWrapper id={id} fieldName={'name'} value={name} />
+        <EditableWrapper
+          id={id}
+          as={'name'}
+          value={name}
+          onSubmit={updateMaster}
+        />
       </Td>
       <Td>
         {schedule?.length > 0 ? (
@@ -30,7 +50,12 @@ const MasterItem = ({ name, phone, id, schedule }) => {
         )}
       </Td>
       <Td>
-        <EditableWrapper id={id} fieldName={'phone'} value={phone} />
+        <EditableWrapper
+          id={id}
+          as={'phone'}
+          value={phone}
+          onSubmit={updateMaster}
+        />
       </Td>
       <Td>
         <MasterActionsMenu id={id} />

src/components/Masters/Masters.tsx

@@ -10,18 +10,17 @@ import {
   Button,
   useDisclosure,
   Flex,
+  useToast,
   Td,
   Text,
   Spinner,
 } from '@chakra-ui/react';
 import { useTranslation } from 'react-i18next';
-import dayjs from 'dayjs';
 
 import MasterItem from '../MasterItem';
 import MasterDrawer from '../MasterDrawer';
-import { useGetMastersQuery } from '../../__data__/service/api';
+import { armService } from '../../api/arm';
-import useShowToast from '../../hooks/useShowToast';
+import { MasterProps } from '../MasterItem/MasterItem';
-import DateNavigator from '../DateNavigator';
 
 const TABLE_HEADERS = [
   'name' as const,
@@ -32,46 +31,49 @@ const TABLE_HEADERS = [
 
 const Masters = () => {
   const { isOpen, onOpen, onClose } = useDisclosure();
-  const showToast = useShowToast();
+  const toast = useToast();
-  const [currentDate, setCurrentDate] = useState(new Date());
-
   const { t } = useTranslation('~', {
     keyPrefix: 'dry-wash.arm.master',
   });
 
-  const {
+  const [masters, setMasters] = useState<MasterProps[]>([]);
-    data: masters,
+  const [loading, setLoading] = useState(false);
-    error,
+  const [error, setError] = useState<string | null>(null);
-    isLoading,
+
-    isSuccess,
+  const { fetchMasters } = armService();
-  } = useGetMastersQuery({ date: currentDate });
 
   useEffect(() => {
-    if (error) {
+    const loadMasters = async () => {
-      showToast(t('error.title'), 'error');
+      setLoading(true);
-    }
+
-  }, [error]);
+      try {
+        const data = await fetchMasters();
+        setMasters(data.body);
+      } catch (err) {
+        setError(err.message);
+        toast({
+          title: t('error.title'),
+          status: 'error',
+          duration: 5000,
+          isClosable: true,
+          position: 'bottom-right',
+        });
+      } finally {
+        setLoading(false);
+      }
+    };
+
+    loadMasters();
+  }, [toast, t]);
 
   return (
     <Box p='8'>
-      <Flex justifyContent='space-between' alignItems='baseline' mb='5'>
+      <Flex justifyContent='space-between' alignItems='center' mb='5'>
         <Heading size='lg'> {t('title')}</Heading>
-
         <Button colorScheme='green' onClick={onOpen}>
           + {t('add')}
         </Button>
       </Flex>
-      <DateNavigator
-        currentDate={currentDate}
-        onPreviousDate={() =>
-          setCurrentDate((prevDate) =>
-            dayjs(prevDate).subtract(1, 'day').toDate(),
-          )
-        }
-        onNextDate={() =>
-          setCurrentDate((prevDate) => dayjs(prevDate).add(1, 'day').toDate())
-        }
-      />
       <Table variant='simple' colorScheme='blackAlpha'>
         <Thead>
           <Tr>
@@ -81,21 +83,22 @@ const Masters = () => {
           </Tr>
         </Thead>
         <Tbody>
-          {isLoading && (
+          {loading && (
             <Tr>
               <Td colSpan={TABLE_HEADERS.length} textAlign='center' py='8'>
                 <Spinner size='lg' />
               </Td>
             </Tr>
           )}
-          {isSuccess && masters.length === 0 && (
+          {!loading && masters.length === 0 && !error && (
             <Tr>
               <Td colSpan={TABLE_HEADERS.length}>
                 <Text>{t('table.empty')}</Text>
               </Td>
             </Tr>
           )}
-          {isSuccess &&
+          {!loading &&
+            !error &&
             masters.map((master, index) => (
               <MasterItem key={index} {...master} />
             ))}

src/components/OrderItem/OrderItem.tsx

@@ -1,20 +1,44 @@
 import React, { ChangeEvent, useState } from 'react';
-import { Td, Tr, Link, Select, Button } from '@chakra-ui/react';
+import { Td, Tr, Link, Select } from '@chakra-ui/react';
 import { useTranslation } from 'react-i18next';
 import dayjs from 'dayjs';
-import { ViewIcon } from '@chakra-ui/icons';
-import { Link as LinkRouter } from 'react-router-dom';
 
+import { MasterProps } from '../MasterItem/MasterItem';
 import { getTimeSlot } from '../../lib';
-import { useUpdateOrdersMutation } from '../../__data__/service/api';
+import { armService } from '../../api/arm';
-import { OrderArm, Status, statuses } from '../../models/api';
+
-import getCoordinates from '../../utils/getCoordinates';
+const statuses = [
-import { URLs } from '../../__data__/urls';
+  '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;
+  master: MasterProps;
+  notes: '';
+  allMasters: MasterProps[];
+  id: string;
+};
+
+type Status = (typeof statuses)[number];
 
 const statusColors: Record<Status, string> = {
   pending: 'yellow.100',
   progress: 'blue.100',
-  cancelled: 'red.100',
+  working: 'orange.100',
+  canceled: 'red.100',
   complete: 'green.100',
 };
 
@@ -29,16 +53,16 @@ const OrderItem = ({
   master,
   allMasters,
   id,
-  currentDate,
+}: OrderProps) => {
-}: OrderArm) => {
+  const { updateOrders } = armService();
-  const [updateOrders] = useUpdateOrdersMutation();
+
   const { t } = useTranslation('~', {
     keyPrefix: 'dry-wash.arm.order',
   });
 
   const [statusSelect, setStatus] = useState(status);
   const bgColor = statusColors[statusSelect];
-  const [masterSelectId, setMasterSelectId] = useState(master);
+  const [masterSelect, setMaster] = useState(master?.name);
 
   const handelChangeMasters = (e: ChangeEvent<HTMLSelectElement>) => {
     const masterName = e.target.value;
@@ -47,25 +71,19 @@ const OrderItem = ({
     );
 
     if (selectedMaster) {
-      setMasterSelectId(selectedMaster.id);
+      setMaster(masterName);
-      updateOrders({ id, master: selectedMaster.id });
+      updateOrders({ id, masterId: selectedMaster.id });
     } else {
       console.error('Master not found');
     }
   };
 
   const handeChangeStatus = (e: ChangeEvent<HTMLSelectElement>) => {
-    const status = e.target.value as OrderArm['status'];
+    const status = e.target.value;
     updateOrders({ id, status });
-    setStatus(status);
+    setStatus(e.target.value as OrderProps['status']);
   };
 
-  const masterSelectChange = allMasters.find(
-    (master) => master.id === masterSelectId,
-  );
-
-  const { lat = 55.78, lon = 49.12 } = getCoordinates(location);
-
   return (
     <Tr>
       <Td>{carNumber}</Td>
@@ -89,7 +107,7 @@ const OrderItem = ({
       </Td>
       <Td>
         <Select
-          value={masterSelectChange?.name}
+          value={masterSelect}
           onChange={handelChangeMasters}
           placeholder={t(`master.placeholder`)}
         >
@@ -103,14 +121,7 @@ const OrderItem = ({
       <Td>
         <Link href='tel:'>{phone}</Link>
       </Td>
-      <Td>
+      <Td>{location}</Td>
-        <Button
-          as={LinkRouter}
-          to={URLs.armMap.getUrl({ lat, lon, currentDate })}
-        >
-          <ViewIcon />
-        </Button>
-      </Td>
     </Tr>
   );
 };

src/components/Orders/Orders.tsx

@@ -10,18 +10,16 @@ import {
   Spinner,
   Text,
   Td,
+  useToast,
 } from '@chakra-ui/react';
 import { useTranslation } from 'react-i18next';
 import dayjs from 'dayjs';
 
 import OrderItem from '../OrderItem';
+import { OrderProps } from '../OrderItem/OrderItem';
+import { armService } from '../../api/arm';
 import DateNavigator from '../DateNavigator';
-import {
+import { MasterProps } from '../MasterItem/MasterItem';
-  useGetMastersQuery,
-  useGetOrdersQuery,
-} from '../../__data__/service/api';
-import useShowToast from '../../hooks/useShowToast';
-import { OrderArm } from '../../models/api';
 
 const TABLE_HEADERS = [
   'carNumber' as const,
@@ -36,40 +34,54 @@ const Orders = () => {
   const { t } = useTranslation('~', {
     keyPrefix: 'dry-wash.arm.order',
   });
-  const showToast = useShowToast();
 
+  const { fetchOrders } = armService();
+  const { fetchMasters } = armService();
+
+  const toast = useToast();
+
+  const [orders, setOrders] = useState<OrderProps[]>([]);
+  const [allMasters, setAllMasters] = useState<MasterProps[]>([]);
+  const [loading, setLoading] = useState(false);
+  const [error, setError] = useState<string | null>(null);
   const [currentDate, setCurrentDate] = useState(new Date());
-  const {
-    data: orders,
-    isLoading: isOrdersLoading,
-    isSuccess: isOrdersSuccess,
-    isError: isOrdersError,
-    error: ordersError,
-  } = useGetOrdersQuery({ date: currentDate });
-
-  const {
-    data: masters,
-    isLoading: isMastersLoading,
-    isSuccess: isMastersSuccess,
-    isError: isMastersError,
-    error: mastersError,
-  } = useGetMastersQuery({ date: currentDate });
-
-  const isLoading = isOrdersLoading || isMastersLoading;
-  const isSuccess = isOrdersSuccess && isMastersSuccess;
-  const isError = isOrdersError || isMastersError;
 
   useEffect(() => {
-    if (isError) {
+    const loadData = async () => {
-      showToast(t('error.title'), 'error');
+      setLoading(true);
-    }
+      setError(null);
-  }, [isError, ordersError, mastersError, t]);
+
+      try {
+        const [ordersData, mastersData] = await Promise.all([
+          fetchOrders({ date: currentDate }),
+          fetchMasters(),
+        ]);
+
+        setOrders(ordersData.body);
+        setAllMasters(mastersData.body);
+      } catch (err) {
+        setError(err.message);
+        toast({
+          title: t('error.title'),
+          status: 'error',
+          duration: 5000,
+          isClosable: true,
+          position: 'bottom-right',
+        });
+      } finally {
+        setLoading(false);
+      }
+    };
+
+    loadData();
+  }, [currentDate, toast, t]);
 
   return (
     <Box p='8'>
       <Heading size='lg' mb='5'>
         {t('title')}
       </Heading>
+
       <DateNavigator
         currentDate={currentDate}
         onPreviousDate={() =>
@@ -91,28 +103,28 @@ const Orders = () => {
           </Tr>
         </Thead>
         <Tbody>
-          {isLoading && (
+          {loading && (
             <Tr>
               <Td colSpan={TABLE_HEADERS.length} textAlign='center' py='8'>
                 <Spinner size='lg' />
               </Td>
             </Tr>
           )}
-          {isSuccess && orders.length === 0 && (
+          {!loading && orders.length === 0 && !error && (
             <Tr>
               <Td colSpan={TABLE_HEADERS.length}>
                 <Text>{t('table.empty')}</Text>
               </Td>
             </Tr>
           )}
-          {isSuccess &&
+          {!loading &&
+            !error &&
             orders.map((order, index) => (
               <OrderItem
-                allMasters={masters}
+                allMasters={allMasters}
                 key={index}
                 {...order}
-                status={order.status as OrderArm['status']}
+                status={order.status as OrderProps['status']}
-                currentDate={currentDate}
               />
             ))}
         </Tbody>

src/components/PageSpinner/PageSpinner.tsx

@@ -5,7 +5,6 @@ export const PageSpinner: FC = () => {
   return (
     <Flex w='full' h='100vh' justifyContent='center' alignItems='center'>
       <Spinner
-        data-testid='spinner'
         thickness='5px'
         speed='0.65s'
         emptyColor='gray.200'

src/components/PopoverTemplate/PopoverTemplate.tsx

@@ -1,35 +0,0 @@
-import React from 'react';
-import {
-  Button,
-  Popover,
-  PopoverArrow,
-  PopoverBody,
-  PopoverCloseButton,
-  PopoverContent,
-  PopoverHeader,
-  PopoverTrigger,
-} from '@chakra-ui/react';
-
-interface Props {
-  title?: string;
-  description: string;
-  trigger?: React.ReactNode;
-}
-
-const PopoverTemplate = ({ title, description, trigger }: Props) => {
-  return (
-    <Popover>
-      <PopoverTrigger>
-        <Button>{trigger}</Button>
-      </PopoverTrigger>
-      <PopoverContent>
-        <PopoverArrow />
-        <PopoverCloseButton />
-        {title && <PopoverHeader>{title}!</PopoverHeader>}
-        <PopoverBody mr={5}>{description}</PopoverBody>
-      </PopoverContent>
-    </Popover>
-  );
-};
-
-export default PopoverTemplate;

src/components/PopoverTemplate/index.ts

@@ -1 +0,0 @@
-export { default } from './PopoverTemplate';

src/components/PriceCar/PriceCar.tsx

@@ -1,75 +0,0 @@
-import { Box, Image, Progress, Text, VStack } from '@chakra-ui/react';
-import React from 'react';
-import { getFeatures } from '@brojs/cli';
-import { useTranslation } from 'react-i18next';
-
-import { formatPrice, getProgressColor } from './helper';
-
-const PRICE_INCREASE_PERCENT_PER_RATING = 10;
-
-export const PriceCar = ({ image, rating, description }) => {
-  const BASE_WASH_PRICE: number = Number(
-    getFeatures('dry-wash')['order-cost']?.value || 1000,
-  );
-
-  const calculateWashPrice = (rating: number) => {
-    const priceIncrease =
-      (BASE_WASH_PRICE * PRICE_INCREASE_PERCENT_PER_RATING * rating) / 100;
-    return BASE_WASH_PRICE + priceIncrease;
-  };
-
-  const { i18n, t } = useTranslation('~', {
-    keyPrefix: 'dry-wash.order-view.price-car',
-  });
-  const washPrice = calculateWashPrice(rating);
-  const formattedPrice = formatPrice(washPrice, i18n.language);
-
-  const progressValue = (rating / 10) * 100;
-
-  return (
-    <Box
-      gap={5}
-      width='100%'
-      display='flex'
-      justifyContent='center'
-      alignItems='flex-start'
-      flexWrap='wrap'
-    >
-      <Image
-        maxWidth='600px'
-        width='100%'
-        objectFit='contain'
-        borderRadius='md'
-        src={image}
-        alt=''
-      />
-      <Box flex='1 1 40%'>
-        {!Number.isNaN(progressValue) ? (
-          <VStack alignItems='stretch'>
-            <Box>
-              <Text>{t('title')}</Text>
-              <Progress
-                value={progressValue}
-                size='sm'
-                sx={{
-                  '& > div': {
-                    backgroundColor: getProgressColor(progressValue),
-                  },
-                }}
-                mt={2}
-              />
-              <Text mt={2}>
-                {t('description')} <b>{formattedPrice}</b>
-              </Text>
-            </Box>
-            <Text fontStyle='italic'>{description}</Text>
-          </VStack>
-        ) : (
-          <Text>{t('error')}</Text>
-        )}
-      </Box>
-    </Box>
-  );
-};
-
-export default PriceCar;

src/components/PriceCar/helper.ts

@@ -1,15 +0,0 @@
-export const formatPrice = (price: number, locale = 'ru-RU', currency = 'RUB') => {
-  return new Intl.NumberFormat(locale, {
-    style: 'currency',
-    currency: currency,
-    minimumFractionDigits: 2,
-    maximumFractionDigits: 2,
-  }).format(price);
-};
-
-export const getProgressColor = (value: number) => {
-  const normalizedValue = value / 100;
-  const hue = 120 - normalizedValue * 120;
-
-  return `hsl(${hue}, 100%, 50%)`;
-};

src/components/PriceCar/index.ts

@@ -1 +0,0 @@
-export { default } from './PriceCar';

src/components/Sidebar/Sidebar.tsx

@@ -0,0 +1,60 @@
+import { Box, Button, Heading, VStack, Divider } from '@chakra-ui/react';
+import React from 'react';
+import { useLocation, Link } from 'react-router-dom';
+import { useTranslation } from 'react-i18next';
+
+import { URLs } from '../../__data__/urls';
+
+const Sidebar = () => {
+  const location = useLocation();
+  const isActive = (keyword: string) => location.pathname.includes(keyword);
+
+  const { t } = useTranslation('~', {
+    keyPrefix: 'dry-wash.arm.master.sideBar',
+  });
+
+  return (
+    <Box
+      borderRight='1px solid black'
+      bg='gray.50'
+      color='white'
+      w='250px'
+      p='5'
+      pt='8'
+    >
+      <Heading color='green' size='lg' mb='5'>
+        {t('title')}
+      </Heading>
+
+      <VStack align='start' spacing='4'>
+        <Divider />
+        {URLs.armOrder.isOn && (
+          <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/Sidebar/index.ts

@@ -0,0 +1 @@
+export { default } from './Sidebar';

src/components/landing/BenefitsSection/BenefitsSection.tsx

@@ -9,12 +9,12 @@ import { BenefitsSectionProps } from './types';
 import { iconsMap } from './helper';
 
 export const BenefitsSection: FC<BenefitsSectionProps> = ({
-  data: { heading, description, list } = {}, ...props
+  data: { heading, description, list } = {},
 }) => {
   const { t } = useTranslation('~', { keyPrefix: 'dry-wash.landing' });
 
   return (
-    <PageSection {...props}>
+    <PageSection>
       <VStack w='full' spacing={2}>
         <Heading as='h2'>{t(heading)}</Heading>
         <Text>{t(description)}</Text>

src/components/landing/Footer/Copyright/Copyright.tsx

@@ -5,9 +5,7 @@ import { Text } from '@chakra-ui/react';
 const currentYear = new Date().getFullYear();
 
 export const Copyright: FC = () => {
-  const { t } = useTranslation('~', {
+  const { t } = useTranslation();
-    keyPrefix: 'dry-wash.landing.footer'
-  });
 
-  return <Text color='whiteAlpha.500'>{t('copyright', { currentYear })}</Text>;
+  return <Text color='whiteAlpha.500'>{t('dry-wash.landing.footer.copyright', { currentYear })}</Text>;
 };

src/components/landing/Footer/Footer.tsx

@@ -7,7 +7,7 @@ import { SiteLogo, PageSection } from '../';
 
 import { Copyright } from './Copyright';
 
-export const Footer: FC = (props) => {
+export const Footer: FC = () => {
   const { t } = useTranslation('~', {
     keyPrefix: 'dry-wash.landing.footer.links',
   });
@@ -15,17 +15,11 @@ export const Footer: FC = (props) => {
   const listData = [
     { to: '#', label: t('privacy-policy') },
     { to: '#', label: t('service-terms') },
-    { to: '#', label: t('faq') },
+    { to: '#', label: t('faq')  },
   ];
 
   return (
-    <PageSection
+    <PageSection as='footer' py={5} bg='gray.700' color='white'>
-      as='footer'
-      py={5}
-      bg='gray.700'
-      color='white'
-      {...props}
-    >
       <SiteLogo />
       <Copyright />
       <List spacing={2}>

src/components/landing/HeroSection/HeroSection.tsx

@@ -10,18 +10,11 @@ import { HeroSectionProps } from './types';
 export const HeroSection: FC<HeroSectionProps> = ({
   data: { headline, description, video } = {},
   flexShrink,
-  ...props
 }) => {
   const { t } = useTranslation('~', { keyPrefix: 'dry-wash.landing' });
 
   return (
-    <Box
+    <Box flexShrink={flexShrink} as='header' pos='relative' zIndex={0}>
-      flexShrink={flexShrink}
-      as='header'
-      pos='relative'
-      zIndex={0}
-      {...props}
-    >
       <Box
         as='video'
         src={`${__webpack_public_path__}/remote-assets/${video}`}

src/components/landing/SiteLogo/SiteLogo.tsx

@@ -5,9 +5,9 @@ import { Image } from '@chakra-ui/react';
 import { LogoSvg } from '../../../assets/icons';
 
 export const SiteLogo: FC = () => {
-  const { t } = useTranslation('~', { keyPrefix: 'dry-wash.landing' });
+  const { t } = useTranslation();
 
-  return <Image src={LogoSvg} alt={t('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/components/landing/SocialProofSection/SocialProofSection.tsx

@@ -9,12 +9,11 @@ import { SocialProofSectionProps } from './types';
 
 export const SocialProofSection: FC<SocialProofSectionProps> = ({
   data: { heading } = {},
-  ...props
 }) => {
   const { t } = useTranslation('~', { keyPrefix: 'dry-wash.landing' });
 
   return (
-    <PageSection {...props}>
+    <PageSection>
       <Heading as='h2'>{t(heading)}</Heading>
       <ReviewsSlider />
       <HStack w='full' justify='flex-end'>

src/components/order-form/form/car-body/car-body-select.tsx

@@ -1,81 +1,90 @@
-import React, { forwardRef } from 'react';
+import React, { forwardRef, useState } from 'react';
 import {
   Input,
+  Image,
+  InputProps,
   Box,
   Popover,
   PopoverAnchor,
   PopoverContent,
   PopoverBody,
-  useRadioGroup,
+  List,
-  Grid,
+  ListItem,
-  GridItem,
-  UseRadioGroupProps,
-  useDisclosure,
 } from '@chakra-ui/react';
 import { useTranslation } from 'react-i18next';
 
-import { carBodySelectOptions, getInputValue } from './helper';
+import { carBodySelectOptions } from './helper';
-import { CarBodyOption } from './option';
+import { CarBodySelectOption } from './types';
-import { CarBodySelectProps } from './types';
 
-export const CarBodySelect = forwardRef<HTMLInputElement, CarBodySelectProps>(
+export const CarBodySelect = forwardRef<HTMLInputElement, InputProps>(
   function CarBodySelect(props, ref) {
-    const handleOptionClick: UseRadioGroupProps['onChange'] = (value) => {
+    const initialOption = carBodySelectOptions.find(({ value }) => value === Number(props.value));
-      props.onChange({
+    const [selected, setSelected] = useState<Partial<CarBodySelectOption>>(initialOption);
-        target: { value },
+
-      } as React.ChangeEvent<HTMLInputElement>);
+    const handleOptionClick = (option: CarBodySelectOption) => {
-      onClose();
+      setSelected(option);
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore
+      props.onChange(option.value);
     };
 
-    const { value, getRadioProps, getRootProps } = useRadioGroup({
+    const [isDropdownOpen, setIsDropdownOpen] = useState<boolean>(false);
-      defaultValue: props.value,
-      value: props.value,
-      onChange: handleOptionClick,
-    });
-
-    const { isOpen, onOpen, onClose } = useDisclosure();
 
     const { t } = useTranslation('~', {
       keyPrefix: 'dry-wash.order-create.car-body-select',
     });
 
     return (
-      <Box width='100%' pos='relative'>
+      <Box width='100%'>
         <Popover
-          isOpen={isOpen}
+          isOpen={isDropdownOpen}
           autoFocus={false}
           placement='bottom-start'
           matchWidth
-          gutter={2}
-          strategy="fixed"
         >
           <PopoverAnchor>
             <Input
               {...props}
               ref={ref}
-              value={getInputValue(Number(value), t) ?? props.value}
+              value={
+                selected?.labelTKey
+                  ? t(`options.${selected.labelTKey}`)
+                  : undefined
+              }
               readOnly
-              onClick={onOpen}
+              onClick={() => setIsDropdownOpen(true)}
-              onBlur={onClose}
+              onBlur={() => setIsDropdownOpen(false)}
               placeholder={t('placeholder')}
             />
           </PopoverAnchor>
           <PopoverContent width='100%' maxWidth='100%'>
             <PopoverBody border='1px' borderColor='gray.300' p={0}>
-              <Grid
+              <List
-                templateColumns='repeat(auto-fit, minmax(150px, 1fr))'
+                display='grid'
-                {...getRootProps()}
+                gridTemplateColumns='repeat(auto-fit, minmax(150px, 1fr))'
               >
-                {carBodySelectOptions.map(({ value, img, labelTKey }) => (
+                {carBodySelectOptions.map((option) => (
-                  <GridItem key={value}>
+                  <ListItem
-                    <CarBodyOption
+                    key={option.value}
-                      image={img}
+                    display='flex'
-                      label={t(`options.${labelTKey}`)}
+                    flexDirection='column'
-                      {...getRadioProps({ value: String(value) })}
+                    justifyContent='flex-end'
-                    />
+                    alignItems='center'
-                  </GridItem>
+                    p={2}
+                    cursor='pointer'
+                    _hover={{
+                      bgColor: 'primary.50',
+                    }}
+                    _active={{
+                      bgColor: 'primary.100',
+                    }}
+                    onClick={() => handleOptionClick(option)}
+                  >
+                    <Image src={option.img} />
+                    {t(`options.${option.labelTKey}`)}
+                  </ListItem>
                 ))}
-              </Grid>
+              </List>
             </PopoverBody>
           </PopoverContent>
         </Popover>

src/components/order-form/form/car-body/helper.ts

@@ -1,6 +1,3 @@
-import { TFunction } from "i18next";
-import { InputProps } from "@chakra-ui/react";
-
 import {
   CoupeImg,
   CrossoverImg,
@@ -11,8 +8,7 @@ import {
   SedanImg,
   SportsCarImg,
   StationWagonImg,
-  SuvImg,
+  SuvImg
-  OtherImg
 } from "../../../../assets/images";
 import { Car } from "../../../../models/landing";
 
@@ -71,17 +67,6 @@ export const carBodySelectOptions: CarBodySelectOption[] = [
   },
   {
     value: Car.BodyStyle.OTHER,
-    labelTKey: 'other',
+    labelTKey: 'other'
-    img: OtherImg
   },
-];
+];
-
-export const getInputValue = (value: Car.BodyStyle, t: TFunction<"~", "dry-wash.order-create.car-body-select">): InputProps['value'] => {
-  const { labelTKey } = carBodySelectOptions.find((option) => value === option.value) ?? {};
-
-  if (labelTKey) {
-    return t(`options.${labelTKey}`);
-  }
-
-  return;
-};

src/components/order-form/form/car-body/index.ts

@@ -1,2 +1 @@
-export { CarBodySelect } from './car-body-select';
+export { CarBodySelect } from './car-body-select';
-export { carBodySelectOptions } from './helper';

src/components/order-form/form/car-body/option/car-body-option.tsx

@@ -1,39 +0,0 @@
-import React from 'react';
-import {
-  ImageProps,
-  StackProps,
-  Image,
-  useRadio,
-  chakra,
-  Box,
-  UseRadioProps,
-  Flex,
-} from '@chakra-ui/react';
-
-import { getPropsByState } from './helper';
-
-type CarBodyOptionProps = {
-  image: ImageProps['src'];
-  label: StackProps['children'];
-} & UseRadioProps;
-
-export const CarBodyOption = ({
-  image,
-  label,
-  ...radioProps
-}: CarBodyOptionProps) => {
-  const { state, getInputProps, getRadioProps, htmlProps, getLabelProps } =
-    useRadio(radioProps);
-
-  return (
-    <chakra.label {...htmlProps} cursor='pointer'>
-      <input {...getInputProps({})} hidden />
-      <Box {...getRadioProps()} p={2} {...getPropsByState(state)}>
-        <Flex direction='column' alignItems='center' {...getLabelProps()}>
-          <Image src={image} rounded={4} />
-          {label}
-        </Flex>
-      </Box>
-    </chakra.label>
-  );
-};

src/components/order-form/form/car-body/option/helper.ts

@@ -1,19 +0,0 @@
-import {
-  BoxProps,
-} from '@chakra-ui/react';
-import { RadioState } from '@chakra-ui/react/dist/types/radio/use-radio';
-
-export const getPropsByState = ({ isChecked }: RadioState): BoxProps => {
-  if (isChecked) {
-    return {
-      bgColor: 'primary.200',
-      _hover: { bgColor: 'primary.100' },
-      _active: { bgColor: 'primary.300' },
-    };
-  }
-
-  return {
-    _hover: { bgColor: 'primary.50' },
-    _active: { bgColor: 'primary.100' },
-  };
-};

src/components/order-form/form/car-body/option/index.ts

@@ -1 +0,0 @@
-export { CarBodyOption } from './car-body-option';

src/components/order-form/form/car-body/types.ts

@@ -1,5 +1,3 @@
-import { InputProps } from "@chakra-ui/react";
-
 import { Car } from "../../../../models/landing";
 
 export type CarBodySelectOption = {
@@ -18,7 +16,3 @@ export type CarBodySelectOption = {
   'other';
   img?: string;
 };
-
-export type CarBodySelectProps = {
-  value?: string;
-} & Pick<InputProps, 'onChange'>;

src/components/order-form/form/car-color/car-color-input.tsx

@@ -0,0 +1,23 @@
+import React, { forwardRef, useId } from 'react';
+import { Input, InputProps } from '@chakra-ui/react';
+
+import { CAR_COLORS } from './helper';
+
+export const CarColorInput = forwardRef<HTMLInputElement, InputProps>(
+  function CarColorInput(props, ref) {
+    const listId = useId();
+
+    return (
+      <>
+        <Input ref={ref} list={listId} {...props} />
+        <datalist id={listId}>
+          {CAR_COLORS.map(({ code, name }) => (
+            <option key={code} label={name} value={code}>{name}</option>
+          ))}
+        </datalist>
+      </>
+    );
+  },
+);
+
+// todo: add option color visual indication

src/components/order-form/form/car-color/car-color-select.test.tsx

@@ -1,75 +0,0 @@
-import React from 'react';
-import { render, screen, fireEvent } from '@testing-library/react';
-import '@testing-library/jest-dom';
-
-import { CarColorSelect } from './car-color-select';
-
-// Mock the translation hook
-jest.mock('react-i18next', () => ({
-  useTranslation: () => ({
-    t: (key: string) => {
-      // Return the last part of the key as that's what component is using
-      const keyParts = key.split('.');
-      return keyParts[keyParts.length - 1];
-    },
-  }),
-}));
-
-describe('CarColorSelect', () => {
-  it('renders color options correctly', () => {
-    const onChange = jest.fn();
-    render(<CarColorSelect onChange={onChange} />);
-    
-    // Check if color buttons are rendered
-    const colorButtons = screen.getAllByRole('button');
-    expect(colorButtons.length).toBeGreaterThan(0);
-  });
-
-  it('handles color selection', () => {
-    const onChange = jest.fn();
-    render(<CarColorSelect onChange={onChange} />);
-    
-    // Click the first color button
-    const colorButtons = screen.getAllByRole('button');
-    fireEvent.click(colorButtons[0]);
-    
-    expect(onChange).toHaveBeenCalled();
-  });
-
-  it('handles custom color selection', () => {
-    const onChange = jest.fn();
-    render(<CarColorSelect onChange={onChange} />);
-    
-    // Find and click the custom color button
-    const customButton = screen.getByText('custom');
-    fireEvent.click(customButton);
-    
-    // Check if custom color input appears
-    const customInput = screen.getByPlaceholderText('placeholder');
-    expect(customInput).toBeInTheDocument();
-    
-    // Test custom color input
-    fireEvent.change(customInput, { target: { value: '#FF0000' } });
-    expect(onChange).toHaveBeenCalledWith(expect.objectContaining({
-      target: { value: '#FF0000' },
-    }));
-  });
-
-  it('shows selected color label when color is selected', () => {
-    const onChange = jest.fn();
-    render(<CarColorSelect value="black" onChange={onChange} />);
-    
-    // Since the color label might not be immediately visible,
-    // we'll verify the component renders without crashing
-    const buttons = screen.getAllByRole('button');
-    expect(buttons.length).toBeGreaterThan(0);
-  });
-
-  it('handles invalid state', () => {
-    render(<CarColorSelect isInvalid={true} />);
-    
-    // Since the component doesn't show explicit invalid state UI,
-    // we'll verify that the component renders without crashing
-    expect(screen.getAllByRole('button').length).toBeGreaterThan(0);
-  });
-}); 

src/components/order-form/form/car-color/car-color-select.tsx

@@ -1,177 +0,0 @@
-import React, { forwardRef, useState } from 'react';
-import { Input, Box, Stack, Text, Flex } from '@chakra-ui/react';
-import { useTranslation } from 'react-i18next';
-
-import { Car } from '../../../../models';
-
-import { carColorSelectOptions } from './helper';
-
-interface CarColorSelectProps {
-  value?: string;
-  onChange?: (event: React.ChangeEvent<HTMLInputElement>) => void;
-  name?: string;
-  isInvalid?: boolean;
-}
-
-export const CarColorSelect = forwardRef<HTMLInputElement, CarColorSelectProps>(
-  function CarColorSelect(props, ref) {
-    const [customColor, setCustomColor] = useState('');
-    const [isCustom, setIsCustom] = useState(false);
-
-    const handleColorChange = (value: Car.Color | string) => {
-      if (value === 'custom') {
-        setIsCustom(true);
-        return;
-      }
-      setIsCustom(false);
-      props.onChange?.({
-        target: { value },
-      } as React.ChangeEvent<HTMLInputElement>);
-    };
-
-    const handleCustomColorChange = (
-      e: React.ChangeEvent<HTMLInputElement>,
-    ) => {
-      const value = e.target.value;
-      setCustomColor(value);
-      props.onChange?.({
-        target: { value },
-      } as React.ChangeEvent<HTMLInputElement>);
-    };
-
-    const { t } = useTranslation('~', {
-      keyPrefix: 'dry-wash.order-create.car-color-select',
-    });
-
-    const currentValue = isCustom ? 'custom' : props.value;
-
-    return (
-      <Stack spacing={4} width='100%' ref={ref}>
-        <Flex gap={2} wrap='wrap' pb={2}>
-          {carColorSelectOptions.map(({ value, labelTKey, code }) => (
-            <Box
-              key={value}
-              flexShrink={0}
-              as='button'
-              type='button'
-              onClick={() => handleColorChange(value)}
-            >
-              <Flex
-                align='center'
-                gap={2}
-                p={1}
-                borderRadius='full'
-                borderWidth='2px'
-                borderColor='gray.200'
-                bg='white'
-                _hover={{
-                  borderColor: 'primary.500',
-                  bg: 'gray.50',
-                }}
-                justify='center'
-                transition='all 0.2s'
-                {...(currentValue === value && {
-                  borderColor: 'primary.500',
-                  bg: 'primary.50',
-                  paddingInlineEnd: 3,
-                  _hover: {
-                    bg: 'primary.50',
-                  },
-                })}
-              >
-                <Flex align='center' gap={2}>
-                  <Box
-                    w='32px'
-                    h='32px'
-                    borderRadius='full'
-                    bg={code}
-                    border='1px'
-                    borderColor='gray.200'
-                    transition='all 0.2s'
-                    boxShadow='none'
-                    {...(currentValue === value && {
-                      borderColor: 'primary.500',
-                      boxShadow: 'sm',
-                    })}
-                  />
-                  {currentValue === value && (
-                    <Text fontSize='xs' color='primary.700' fontWeight='medium'>
-                      {t(`colors.${labelTKey}`)}
-                    </Text>
-                  )}
-                </Flex>
-              </Flex>
-            </Box>
-          ))}
-          <Box
-            flexShrink={0}
-            as='button'
-            type='button'
-            onClick={() => handleColorChange('custom')}
-          >
-            <Flex
-              align='center'
-              gap={2}
-              p={1}
-              paddingInlineEnd={3}
-              borderRadius='full'
-              borderWidth='2px'
-              borderColor='gray.200'
-              bg='white'
-              _hover={{
-                borderColor: 'primary.500',
-                bg: 'gray.50',
-              }}
-              justify='center'
-              transition='all 0.2s'
-              {...(isCustom && {
-                borderColor: 'primary.500',
-                paddingInlineStart: 3,
-                bg: 'primary.50',
-                _hover: {
-                  bg: 'primary.50',
-                },
-              })}
-            >
-              {isCustom ? (
-                <Flex gap={2} align='center'>
-                  <Text fontSize='xs' color='primary.700' fontWeight='medium'>
-                    {t('custom-label')}
-                  </Text>
-                  <Input
-                    size='sm'
-                    width='120px'
-                    value={customColor}
-                    onChange={handleCustomColorChange}
-                    placeholder={t('placeholder')}
-                    onClick={(e) => e.stopPropagation()}
-                    borderColor='primary.200'
-                    _focus={{
-                      borderColor: 'primary.500',
-                      boxShadow: '0 0 0 1px var(--chakra-colors-primary-500)',
-                    }}
-                  />
-                </Flex>
-              ) : (
-                <Flex align='center' gap={2}>
-                  <Box
-                    w='32px'
-                    h='32px'
-                    borderRadius='full'
-                    bg='gray.100'
-                    border='1px'
-                    borderColor='gray.200'
-                    transition='all 0.2s'
-                  />
-                  <Text fontSize='xs' color='gray.500'>
-                    {t('custom')}
-                  </Text>
-                </Flex>
-              )}
-            </Flex>
-          </Box>
-        </Flex>
-      </Stack>
-    );
-  },
-);

src/components/order-form/form/car-color/helper.ts

@@ -1,44 +1,34 @@
-import { Car } from "../../../../models";
+export const CAR_COLORS: Record<'name' | 'code', string>[] = [
-
-export const carColorSelectOptions: { value: Car.Color | string; labelTKey: 'white' | 'black' | 'silver' | 'gray' | 'beige-brown' | 'red' | 'blue' | 'green'; code: string }[] = [
   {
-    value: Car.Color.WHITE,
+    name: 'white',
-    labelTKey: 'white',
     code: '#ffffff'
   },
   {
-    value: Car.Color.BLACK,
+    name: 'black',
-    labelTKey: 'black',
     code: '#000000'
   },
   {
-    value: Car.Color.SILVER,
+    name: 'silver',
-    labelTKey: 'silver',
     code: '#c0c0c0'
   },
   {
-    value: Car.Color.GRAY,
+    name: 'gray',
-    labelTKey: 'gray',
     code: '#808080'
   },
   {
-    value: Car.Color.BEIGE_BROWN,
+    name: 'beige-brown',
-    labelTKey: 'beige-brown',
     code: '#796745'
   },
   {
-    value: Car.Color.RED,
+    name: 'red',
-    labelTKey: 'red',
     code: '#b90000'
   },
   {
-    value: Car.Color.BLUE,
+    name: 'blue',
-    labelTKey: 'blue',
     code: '#003B62'
   },
   {
-    value: Car.Color.GREEN,
+    name: 'green',
-    labelTKey: 'green',
     code: '#078d51'
   },
 ];

src/components/order-form/form/car-color/index.ts

@@ -1,2 +1 @@
-export { CarColorSelect } from './car-color-select';
+export { CarColorInput } from './car-color-input';
-export { carColorSelectOptions } from './helper';

src/components/order-form/form/date-time/helper.ts

@@ -1,26 +0,0 @@
-import dayjs from 'dayjs';
-import customParseFormat from 'dayjs/plugin/customParseFormat';
-
-dayjs.extend(customParseFormat);
-
-export const getMinDatetime = (dateTimeString: string, minDateTimeString: string) => {
-  const time = dayjs(dateTimeString);
-
-  const minDate = dayjs(minDateTimeString).format('YYYY-MM-DD');
-  const minTime = dayjs(minDateTimeString);
-
-  const newTime = (time && time.isAfter(minTime)) ? time : minTime;
-
-  return [minDate, newTime.format('HH:mm')].join('T');
-};
-
-export const getMaxDatetime = (dateTimeString: string, maxDateTimeString: string) => {
-  const time = dayjs(dateTimeString);
-
-  const maxDate = dayjs(maxDateTimeString).format('YYYY-MM-DD');
-  const maxTime = dayjs(maxDateTimeString);
-
-  const newTime = (time && time.isBefore(maxTime)) ? time : maxTime;
-
-  return [maxDate, newTime.format('HH:mm')].join('T');
-};

src/components/order-form/form/date-time/index.ts

@@ -1,2 +1 @@
-export { type DateTimeInputProps, DateTimeInput } from './date-time';
+export { type DateTimeInputProps, DateTimeInput } from './date-time';
-export { getMinDatetime, getMaxDatetime } from './helper';

src/components/order-form/form/helper.ts

@@ -9,7 +9,6 @@ export const defaultValues: Partial<OrderFormValues> = {
   phone: '',
   carNumber: '',
   carColor: '',
-  carBody: '',
   availableDatetimeBegin: '',
   availableDatetimeEnd: '',
 };

src/components/order-form/form/index.ts

@@ -1,4 +1,2 @@
 export type { OrderFormValues, OrderFormProps } from './types';
-export { OrderForm } from './order-form';
+export { OrderForm } from './order-form';
-export { carBodySelectOptions } from './car-body';
-export { carColorSelectOptions } from './car-color';

src/components/order-form/form/location/location-input/location-input.tsx

@@ -1,4 +1,4 @@
-import React, { ForwardedRef, forwardRef, memo, useEffect, useState } from 'react';
+import React, { forwardRef, memo, useEffect, useState } from 'react';
 import {
   Input,
   Box,
@@ -24,27 +24,24 @@ import {
 } from './helper';
 import { LocationInputProps } from './types';
 
-export const BaseLocationInput = withYMaps(
+export const LocationInput = memo(
-  ({ ymaps, value = '', onChange, inputRef, ...props }: LocationInputProps & { inputRef: ForwardedRef<HTMLInputElement> }) => {
+  withYMaps(
-    const [inputValue, setInputValue] = useState<string>('');
+    forwardRef<HTMLInputElement, LocationInputProps>(function LocationInput(
+      { ymaps, value, onChange, ...props },
+      ref,
+    ) {
+      const [inputValue, setInputValue] = useState<string>('');
 
-    useEffect(() => {
+      useEffect(() => {
-      setInputValue(value);
+        setInputValue(value);
-    }, [value]);
+      }, [value]);
 
-    const [suggestions, setSuggestions] = useState<Suggestion[]>([]);
+      const [suggestions, setSuggestions] = useState<Suggestion[]>([]);
-    const [isSuggestionsPanelOpen, setIsSuggestionsPanelOpen] =
+      const [isSuggestionsPanelOpen, setIsSuggestionsPanelOpen] =
-      useState<boolean>(false);
+        useState<boolean>(false);
 
-    const onInputChange: InputProps['onChange'] = async (e) => {
+      const onInputChange: InputProps['onChange'] = async (e) => {
-      const newInputValue = e.target.value;
+        const newInputValue = e.target.value;
-
-      if (
-        isValidLocation(newInputValue) &&
-        (await isRealLocation(ymaps, newInputValue))
-      ) {
-        onChange(newInputValue);
-      } else {
         setInputValue(newInputValue);
 
         if (newInputValue.trim().length > 3) {
@@ -60,94 +57,88 @@ export const BaseLocationInput = withYMaps(
         }
 
         setIsSuggestionsPanelOpen(suggestions.length > 1);
-      }
+      };
-    };
 
-    const onFocus: InputProps['onFocus'] = () => {
+      const onFocus: InputProps['onFocus'] = () => {
-      setIsSuggestionsPanelOpen(suggestions.length > 1);
+        setIsSuggestionsPanelOpen(suggestions.length > 1);
-    };
+      };
 
-    const onBlur: InputProps['onBlur'] = async (e) => {
+      const onBlur: InputProps['onBlur'] = async (e) => {
-      const inputValue = e.target.value;
+        const inputValue = e.target.value;
-      if (
+        if (
-        isValidLocation(inputValue) &&
+          isValidLocation(inputValue) &&
-        (await isRealLocation(ymaps, inputValue))
+          (await isRealLocation(ymaps, inputValue))
-      ) {
+        ) {
-        onChange(inputValue);
+          onChange(inputValue);
-      } else {
+        } else {
-        setInputValue(value);
+          setInputValue(value);
-      }
+        }
-      setIsSuggestionsPanelOpen(false);
+        setIsSuggestionsPanelOpen(false);
-    };
+      };
 
-    const handleSuggestionClick = async ({ value: address }: Suggestion) => {
+      const handleSuggestionClick = async ({ value: address }: Suggestion) => {
-      try {
+        try {
-        const location = await getLocationByAddress(ymaps, address);
+          const location = await getLocationByAddress(ymaps, address);
-        const newValue = formatLocation(location);
+          const newValue = formatLocation(location);
-        setInputValue(newValue);
+          setInputValue(newValue);
-        onChange(newValue);
+          onChange(newValue);
-      } catch (error) {
+        } catch (error) {
-        console.error(error);
+          console.error(error);          
-      }
+        }
-    };
+      };
 
-    const { t } = useTranslation('~', {
+      const { t } = useTranslation('~', {
-      keyPrefix: 'dry-wash.order-create.form.washing-location-field',
+        keyPrefix: 'dry-wash.order-create.form.washing-location-field',
-    });
+      });
 
-    return (
+      return (
-      <Box width='100%'>
+        <Box width='100%'>
-        <Popover
+          <Popover
-          isOpen={isSuggestionsPanelOpen}
+            isOpen={isSuggestionsPanelOpen}
-          autoFocus={false}
+            autoFocus={false}
-          placement='bottom-start'
+            placement='bottom-start'
-        >
+          >
-          <PopoverAnchor>
+            <PopoverAnchor>
-            <Input
+              <Input
-              {...props}
+                {...props}
-              ref={inputRef}
+                ref={ref}
-              onBlur={onBlur}
+                onBlur={onBlur}
-              value={inputValue || value}
+                value={inputValue}
-              onChange={onInputChange}
+                onChange={onInputChange}
-              onFocus={onFocus}
+                onFocus={onFocus}
-              placeholder={t('placeholder')}
+                placeholder={t('placeholder')}
-            />
+              />
-          </PopoverAnchor>
+            </PopoverAnchor>
-          <PopoverContent width='100%' maxWidth='100%'>
+            <PopoverContent width='100%' maxWidth='100%'>
-            <PopoverBody border='1px' borderColor='gray.300' p={0}>
+              <PopoverBody border='1px' borderColor='gray.300' p={0}>
-              <List>
+                <List>
-                {suggestions.map((suggestion, index) => (
+                  {suggestions.map((suggestion, index) => (
-                  <ListItem
+                    <ListItem
-                    key={index}
+                      key={index}
-                    p={2}
+                      p={2}
-                    cursor='pointer'
+                      cursor='pointer'
-                    _hover={{
+                      _hover={{
-                      bgColor: 'primary.50',
+                        bgColor: 'primary.50',
-                    }}
+                      }}
-                    _active={{
+                      _active={{
-                      bgColor: 'primary.100',
+                        bgColor: 'primary.100',
-                    }}
+                      }}
-                    onClick={() => handleSuggestionClick(suggestion)}
+                      onClick={() => handleSuggestionClick(suggestion)}
-                  >
+                    >
-                    {suggestion.displayName}
+                      {suggestion.displayName}
-                  </ListItem>
+                    </ListItem>
-                ))}
+                  ))}
-              </List>
+                </List>
-            </PopoverBody>
+              </PopoverBody>
-          </PopoverContent>
+            </PopoverContent>
-        </Popover>
+          </Popover>
-      </Box>
+        </Box>
-    );
+      );
-  },
+    }),
-  true,
+    true,
-  ['suggest', 'geocode'],
+    ['suggest', 'geocode'],
+  ),
 );
 
-export const LocationInput = memo(forwardRef<HTMLInputElement, LocationInputProps>(
-  function LocationInput(props, ref) {
-    return <BaseLocationInput {...props} inputRef={ref} />;
-  },
-));
-
 // todo: i18n
 // todo: replace console.error with toast

src/components/order-form/form/location/map/map.tsx

@@ -31,22 +31,8 @@ export const MapComponent: FC<{
         }
       }, [selectedLocation]);
 
-      const [windowWidth, setWindowWidth] = useState(window.innerWidth);
-      useEffect(() => {
-        const handleResize = () => {
-          setWindowWidth(window.innerWidth);
-        };
-    
-        window.addEventListener('resize', handleResize);
-    
-        return () => {
-          window.removeEventListener('resize', handleResize);
-        };
-      }, []);
-
       return (
         <Map
-          key={windowWidth}
           state={{
             center: mapCenter,
             zoom:

src/components/order-form/form/order-form.tsx

@@ -1,25 +1,25 @@
-import React, { useEffect } from 'react';
+import React from 'react';
 import { useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { Box, Flex, FormControl, FormLabel, VStack } from '@chakra-ui/react';
 
 import { CarBodySelect } from './car-body';
+import { CarColorInput } from './car-color';
 import { CarNumberInput } from './car-number';
 import { FormInputField, FormControllerField } from './field';
 import { OrderFormProps, OrderFormValues } from './types';
 import { PhoneInput } from './phone';
 import { SubmitButton } from './submit';
 import { defaultValues, useGetValidationRules } from './helper';
-import { DateTimeInput, getMinDatetime, getMaxDatetime } from './date-time';
+import { DateTimeInput } from './date-time';
 import {
   LocationInput,
   MapComponent,
   StringLocation,
   YMapsProvider,
 } from './location';
-import { CarColorSelect } from './car-color';
 
-export const OrderForm = ({ onSubmit, loading, ...props }: OrderFormProps) => {
+export const OrderForm = ({ onSubmit, loading }: OrderFormProps) => {
   const {
     handleSubmit,
     control,
@@ -40,21 +40,8 @@ export const OrderForm = ({ onSubmit, loading, ...props }: OrderFormProps) => {
     'carLocation',
   ]);
 
-  useEffect(() => {
-    if (!availableDatetimeBegin) {
-      return;
-    }
-    setValue('availableDatetimeEnd', getMinDatetime(availableDatetimeEnd, availableDatetimeBegin));
-  }, [availableDatetimeBegin]);
-  useEffect(() => {
-    if (!availableDatetimeEnd) {
-      return;
-    }
-    setValue('availableDatetimeBegin', getMaxDatetime(availableDatetimeBegin, availableDatetimeEnd));
-  }, [availableDatetimeEnd]);
-
   return (
-    <Box p={4} marginInline='auto' {...props}>
+    <Box p={4} marginInline='auto'>
       <VStack
         as='form'
         noValidate
@@ -85,7 +72,7 @@ export const OrderForm = ({ onSubmit, loading, ...props }: OrderFormProps) => {
           name='carColor'
           label={t('car-color-field.label')}
           errors={errors}
-          Input={CarColorSelect}
+          Input={CarColorInput}
         />
         <FormInputField
           control={control}

src/components/order-view/car-img/car-img-form.tsx

@@ -1,102 +0,0 @@
-import React, { FC, memo, useRef } from 'react';
-import { Controller, useForm } from 'react-hook-form';
-import {
-  Button,
-  FormControl,
-  FormErrorMessage,
-  FormHelperText,
-  FormLabel,
-  HStack,
-  Input,
-} from '@chakra-ui/react';
-import { useTranslation } from 'react-i18next';
-
-import { landingApi } from '../../../__data__/service/landing.api';
-import { UploadCarImage } from '../../../models/api';
-
-import { useHandleUploadCarImageResponse } from './helper';
-
-type FormValues = {
-  carImg: File & {
-    fileName: string;
-  };
-};
-
-type CarImageFormProps = {
-  orderId: UploadCarImage.Params['orderId'];
-};
-
-export const CarImageForm: FC<CarImageFormProps> = memo(function CarImageForm({
-  orderId,
-}) {
-  const {
-    handleSubmit,
-    control,
-    formState: { errors, isSubmitting },
-  } = useForm<FormValues>({ shouldFocusError: true });
-
-  const [uploadCarImage, uploadCarImageMutation] =
-    landingApi.useUploadCarImageMutation();
-  useHandleUploadCarImageResponse(uploadCarImageMutation);
-
-  const onSubmit = (formData: FormValues) => {
-    const body = new FormData();
-    body.append('file', formData.carImg);
-    uploadCarImage({ orderId, body });
-  };
-
-  const fileInputRef = useRef(null);
-
-  const { t } = useTranslation('~', {
-    keyPrefix: 'dry-wash.order-view.upload-car-image',
-  });
-
-  return (
-    <form>
-      <FormControl>
-        <FormLabel htmlFor='carImg'>{t('field.label')}</FormLabel>
-        <Controller
-          control={control}
-          name='carImg'
-          render={({ field: { value, onChange, ...field } }) => {
-            return (
-              <HStack gap={0}>
-                <Input
-                  {...field}
-                  ref={fileInputRef}
-                  accept='image/png,image/jpeg'
-                  value={value?.fileName}
-                  onChange={(event) => {
-                    onChange(event.target.files[0]);
-                    handleSubmit(onSubmit)();
-                  }}
-                  type='file'
-                  hidden
-                />
-                <Input
-                  placeholder={t('file-input.placeholder')}
-                  value={value?.name || ''}
-                  readOnly
-                  borderRightRadius={0}
-                />
-                <Button
-                  onClick={() => {
-                    fileInputRef.current.click();
-                  }}
-                  isLoading={isSubmitting || uploadCarImageMutation.isLoading}
-                  colorScheme='primary'
-                  paddingInline={8}
-                  borderLeftRadius={0}
-                >
-                  {t('file-input.button')}
-                </Button>
-              </HStack>
-            );
-          }}
-        />
-        <FormErrorMessage>{errors.carImg?.message}</FormErrorMessage>
-        <FormHelperText>{t('field.help')}</FormHelperText>
-      </FormControl>
-    </form>
-  );
-});

src/components/order-view/car-img/helper.ts

@@ -1,35 +0,0 @@
-import { useEffect } from "react";
-import { useToast } from "@chakra-ui/react";
-import { useTranslation } from "react-i18next";
-
-import { isErrorMessage } from "../../../models/api";
-
-export const useHandleUploadCarImageResponse = (query: {
-  isSuccess: boolean;
-  isError: boolean;
-  error?: unknown;
-}) => {
-  const toast = useToast();
-  const { t } = useTranslation('~', {
-    keyPrefix: 'dry-wash.order-view.upload-car-image-query',
-  });
-
-  useEffect(() => {
-    if (query.isError) {
-      toast({
-        status: 'error',
-        title: t('error.title'),
-        description: isErrorMessage(query.error) ? query.error : undefined,
-      });
-    }
-  }, [query.isError]);
-
-  useEffect(() => {
-    if (query.isSuccess) {
-      toast({
-        status: 'success',
-        title: t('success.title'),
-      });
-    }
-  }, [query.isSuccess]);
-};

src/components/order-view/car-img/index.ts

@@ -1 +0,0 @@
-export { CarImageForm } from './car-img-form';

src/components/order-view/details/car/car-details.tsx

@@ -1,29 +0,0 @@
-import React from 'react';
-import { FC } from 'react';
-import { Flex, Image } from '@chakra-ui/react';
-
-import { Order } from '../../../../models';
-import {
-  carBodySelectOptions,
-  carColorSelectOptions,
-} from '../../../order-form';
-
-import { LicensePlate } from './license-plate';
-
-type Props = Pick<Order.View, 'carNumber' | 'carBody' | 'carColor'>;
-
-export const CarDetails: FC<Props> = ({ carNumber, carBody, carColor }) => {
-  const image = carBodySelectOptions.find(({ value }) => value === carBody).img;
-  const color =
-    carColorSelectOptions.find(({ value }) => value === carColor)?.code ??
-    'black';
-
-  return (
-    <Flex direction='column' alignItems='center' p={2}>
-      <div style={{ backgroundColor: color, width: 'fit-content' }}>
-        <Image src={image} style={{ mixBlendMode: 'lighten' }} />
-      </div>
-      <LicensePlate carNumber={carNumber} />
-    </Flex>
-  );
-};

src/components/order-view/details/car/index.ts

@@ -1 +0,0 @@
-export { CarDetails } from './car-details';

src/components/order-view/details/car/license-plate/index.ts

@@ -1 +0,0 @@
-export { LicensePlate } from './license-plate';

src/components/order-view/details/car/license-plate/license-plate.tsx

@@ -1,52 +0,0 @@
-import React, { FC } from 'react';
-import { Flex, HStack, Text } from '@chakra-ui/react';
-
-import { Order } from '../../../../../models';
-
-export const LicensePlate: FC<Pick<Order.View, 'carNumber'>> = ({
-  carNumber,
-}) => {
-  const firstLetter = carNumber.substring(0, 1);
-  const digits = carNumber.substring(1, 4);
-  const lastLetters = carNumber.substring(4, 6);
-  const region = carNumber.substring(6);
-
-  return (
-    <Flex
-      align='center'
-      bg='black'
-      borderRadius='md'
-      width='fit-content'
-      boxShadow='md'
-      fontFamily='mono'
-      fontWeight='bold'
-      fontSize='24px'
-      textTransform='uppercase'
-      color='black'
-      alignItems='stretch'
-    >
-      <HStack
-        bg='white'
-        border='2px solid black'
-        borderRadius='md'
-        px={2}
-        gap={0}
-        alignItems='baseline'
-      >
-        <Text>{firstLetter}</Text>
-        <Text fontSize='28px' lineHeight={0}>{digits}</Text>
-        <Text>{lastLetters}</Text>
-      </HStack>
-      <Flex
-        bg='white'
-        border='2px solid black'
-        borderInlineStart='none'
-        borderRadius='md'
-        px={2}
-        alignItems='center'
-      >
-        {region}
-      </Flex>
-    </Flex>
-  );
-};

src/components/order-view/details/order-details.tsx

@@ -5,27 +5,21 @@ import {
   Heading,
   HStack,
   UnorderedList,
+  VStack,
   ListItem,
   Text,
-  Flex,
 } from '@chakra-ui/react';
 import { useTranslation } from 'react-i18next';
-import dayjs from 'dayjs';
-import localizedFormat from 'dayjs/plugin/localizedFormat';
-dayjs.extend(localizedFormat);
-import 'dayjs/locale/ru';
-import 'dayjs/locale/en';
 
 import { Order } from '../../../models/landing';
 import { formatDatetime } from '../../../lib';
-import { carBodySelectOptions, carColorSelectOptions } from '../../order-form';
+import { carBodySelectOptions } from '../../order-form/form/car-body/helper';
 
 import { OrderStatus } from './status';
-import { CarDetails } from './car';
 
 type OrderDetailsProps = Pick<
   Order.View,
-  | 'orderNumber'
+  | 'id'
   | 'status'
   | 'phone'
   | 'carNumber'
@@ -38,7 +32,7 @@ type OrderDetailsProps = Pick<
 >;
 
 export const OrderDetails: FC<OrderDetailsProps> = ({
-  orderNumber,
+  id,
   status,
   phone,
   carNumber,
@@ -47,78 +41,70 @@ export const OrderDetails: FC<OrderDetailsProps> = ({
   location,
   startWashTime,
   endWashTime,
-  created,
 }) => {
-  const { t, i18n } = useTranslation('~', {
+  const { t } = useTranslation('~', {
     keyPrefix: 'dry-wash.order-view.details',
   });
-  dayjs.locale(i18n.language);
   const { t: tCarBody } = useTranslation('~', {
     keyPrefix: 'dry-wash.order-create.car-body-select.options',
   });
-  const { t: tCarColor } = useTranslation('~', {
-    keyPrefix: 'dry-wash.order-create.car-color-select.colors',
-  });
-  const carColorTKey = carColorSelectOptions.find(
-    ({ value }) => value === carColor,
-  )?.labelTKey;
 
   return (
-    <>
+    <VStack p={4} alignItems='flex-start' gap={4}>
-      <Heading as='h2' size='lg' marginInline='auto'>
-        {t('title', { number: orderNumber })}
-      </Heading>
       <HStack
         width='full'
         flexWrap='wrap'
         justifyContent='space-between'
         gap={2}
       >
-        <Text>{dayjs(created).format('LLL')}</Text>
+        <Heading as='h2' size='lg'>
+          {t('title', { number: id })}
+        </Heading>
         <OrderStatus value={status} />
       </HStack>
-      <Flex direction={{ base: 'column', md: 'row-reverse' }} gap={4}>
+      <UnorderedList styleType='none'>
-        <CarDetails
+        {[
-          carNumber={carNumber}
+          {
-          carBody={carBody}
+            label: t('owner'),
-          carColor={carColor}
+            value: phone,
-        />
+          },
-        <UnorderedList styleType='none'>
+          {
-          {[
+            label: t('car'),
-            {
+            value: [
-              label: t('car'),
+              carNumber,
-              value: `${tCarBody(carBodySelectOptions.find(({ value }) => value === carBody)?.labelTKey)} (${carColorTKey ? tCarColor(carColorTKey) : carColor})`,
+              tCarBody(
-            },
+                `${carBodySelectOptions.find(({ value }) => value === carBody)?.labelTKey}`,
-            {
+              ),
-              label: t('owner'),
+              carColor,
-              value: phone,
+            ]
-            },
+              .filter((v) => v)
-            {
+              .join(', '),
-              label: t('location'),
+          },
-              value: location,
+          {
-            },
+            label: t('location'),
-            {
+            value: location,
-              label: t('datetime-range'),
+          },
-              value: [
+          {
-                formatDatetime(startWashTime),
+            label: t('datetime-range'),
-                formatDatetime(endWashTime),
+            value: [
-              ].join(' - '),
+              formatDatetime(startWashTime),
-            },
+              formatDatetime(endWashTime),
-          ].map(({ label, value }, i) => (
+            ].join(' - '),
-            <ListItem key={i}>
+          },
-              <Text as='span' color='primary.400'>
+        ].map(({ label, value }, i) => (
-                {label}:
+          <ListItem key={i}>
-              </Text>{' '}
+            {label}:{' '}
-              <Text as='span'>{value}</Text>
+            <Text as='span' color='primary.500' fontWeight='bold'>
-            </ListItem>
+              {value}
-          ))}
+            </Text>
-        </UnorderedList>
+          </ListItem>
-      </Flex>
+        ))}
+      </UnorderedList>
       <Alert status='info' alignItems='flex-start'>
         <AlertIcon />
         {t('alert')}
       </Alert>
-    </>
+    </VStack>
   );
 };
 

src/components/order-view/details/status/order-status.tsx

@@ -15,19 +15,19 @@ const getPropsByStatus = (
         colorScheme: 'red',
         children: t('canceled'),
       };
+    case 'progress':
+      return {
+        colorScheme: 'yellow',
+        children: t('progress'),
+      };
     case 'pending':
       return {
         colorScheme: 'yellow',
         children: t('pending'),
       };
-    case 'progress':
-      return {
-        colorScheme: 'orange',
-        children: t('progress'),
-      };
     case 'working':
       return {
-        colorScheme: 'orange',
+        colorScheme: 'yellow',
         children: t('working'),
       };
     case 'complete':

src/hooks/useShowToast.ts

@@ -1,28 +0,0 @@
-import { useToast } from '@chakra-ui/react';
-import { useCallback } from 'react';
-
-const useShowToast = () => {
-  const toast = useToast();
-
-  const showToast = useCallback(
-    (
-      title: string,
-      status: 'info' | 'warning' | 'success' | 'error',
-      description?: string,
-    ) => {
-      toast({
-        title,
-        description,
-        status,
-        duration: 5000,
-        isClosable: true,
-        position: 'top-right',
-      });
-    },
-    [toast],
-  );
-
-  return showToast;
-};
-
-export default useShowToast;

src/models/api/common.ts

@@ -1,15 +0,0 @@
-type SuccessResponse<Body> = {
-  success: true;
-  body: Body;
-};
-
-export type ErrorMessage = string;
-
-export const isErrorMessage = (error: unknown): error is ErrorMessage => typeof error === 'string';
-
-type ErrorResponse = {
-  success: false;
-  error: ErrorMessage;
-};
-
-export type BaseResponse<Body> = SuccessResponse<Body> | ErrorResponse;

src/models/api/index.ts

@@ -1,3 +1 @@
-export * from './common';
+export * from './order';
-export * from './order';
-export * from './master';

src/models/api/master.ts

@@ -1,12 +0,0 @@
-export interface Schedule {
-  id: string;
-  startWashTime: string;
-  endWashTime: string;
-}
-
-export type Master = {
-  id: string;
-  name: string;
-  phone: string;
-  schedule: Schedule[];
-};