feat: add a date filter for master and maps

Reviewed-on: #94

.gitignore

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

.vscode/settings.json

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

Jenkinsfile

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

__mocks__/app-context-mock.tsx

@@ -0,0 +1,18 @@
+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

@@ -0,0 +1,18 @@
+import { jest } from '@jest/globals';
+
+jest.mock('@brojs/cli', () => ({
+  getConfigValue: jest.fn(() => '/api'),
+  getFeatures: jest.fn(() => ({
+    ['order-view-status-polling']: { value: '3000' }
+  })),
+  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

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

__mocks__/lottiefiles-mock.tsx

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

__mocks__/react-i18next.ts

@@ -0,0 +1,13 @@
+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

@@ -0,0 +1,11 @@
+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

@@ -0,0 +1,20 @@
+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

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

__mocks__/style-mock.ts

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

babel.config.js

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

bro.config.js

@@ -16,11 +16,27 @@ 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-pl': {
+    'dry-wash': {
       // 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

@@ -0,0 +1,26 @@
+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,12 +1,13 @@
-import globals from "globals";
-import pluginJs from "@eslint/js";
-import tseslint from "typescript-eslint";
-import pluginReact from "eslint-plugin-react";
+import globals from 'globals';
+import pluginJs from '@eslint/js';
+import tseslint from 'typescript-eslint';
+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,
@@ -14,35 +15,38 @@ export default [
   {
     plugins: {
       '@stylistic': stylistic,
-      'import': pluginImport,
+      import: pluginImport,
     },
-    "rules": {
-      "no-unused-vars": "off",
-      "@typescript-eslint/no-unused-vars": [
-        "warn", // or "error"
+    rules: {
+      'no-unused-vars': 'off',
+      '@typescript-eslint/no-unused-vars': [
+        'warn', // or "error"
         {
-          "argsIgnorePattern": "^_",
-          "varsIgnorePattern": "^_",
-          "caughtErrorsIgnorePattern": "^_"
-        }
+          argsIgnorePattern: '^_',
+          varsIgnorePattern: '^_',
+          caughtErrorsIgnorePattern: '^_',
+        },
       ],
-      "sort-imports": ["off"],
-      "import/order": [
-        "error",
+      'sort-imports': ['off'],
+      'import/order': [
+        'error',
         {
-          "groups": [
-            "builtin",
-            "external",
-            "internal",
-            "parent",
-            ["sibling", "index"]
+          groups: [
+            'builtin',
+            'external',
+            'internal',
+            'parent',
+            ['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

@@ -0,0 +1,22 @@
+module.exports = {
+  preset: 'ts-jest',
+  transform: {
+    '^.+\\.tsx?$': 'babel-jest',
+  },
+  coverageProvider: 'v8',
+  coverageDirectory: 'coverage',
+  collectCoverageFrom: ['**/src/**/*.{ts,tsx}', '!**/src/app.tsx'],
+  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

@@ -0,0 +1,5 @@
+// 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,6 +26,17 @@
   "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",
@@ -39,15 +50,23 @@
   "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.error.title": "Error",
-  "dry-wash.order-view.fetch.error": "Failed to fetch the details of order #{{number}}",
+  "dry-wash.order-view.get-order-query.error.title": "Failed to fetch the details of order",
   "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.arm.master.add": "Add",
   "dry-wash.arm.order.title": "Orders",
   "dry-wash.arm.order.table.empty": "Table empty",
@@ -56,8 +75,9 @@
   "dry-wash.arm.order.status.complete": "Completed",
   "dry-wash.arm.order.status.pending": "Pending",
   "dry-wash.arm.order.status.working": "Working",
-  "dry-wash.arm.order.status.canceled": "Canceled",
-  "dry-wash.arm.order.status.placeholder": "Select Status",
+  "dry-wash.arm.order.status.cancelled": "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",
   "dry-wash.arm.order.table.header.washingTime": "Washing Time",
   "dry-wash.arm.order.table.header.orderDate": "Order Date",
@@ -73,6 +93,10 @@
   "dry-wash.arm.master.table.header.phone": "Phone",
   "dry-wash.arm.master.table.header.actions": "Actions",
   "dry-wash.arm.master.table.actionsMenu.delete": "Delete Master",
+  "dry-wash.arm.master.schedule.empty": "free",
+  "dry-wash.arm.master.editable.aria.cancel": "Undo changes",
+  "dry-wash.arm.master.editable.aria.save": "Save changes ",
+  "dry-wash.arm.master.editable.aria.edit": "Edit",
   "dry-wash.arm.master.drawer.title": "Add New Master",
   "dry-wash.arm.master.drawer.inputName.label": "Full Name",
   "dry-wash.arm.master.drawer.inputName.placeholder": "Enter Full Name",
@@ -80,6 +104,15 @@
   "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",
@@ -89,5 +122,8 @@
   "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,8 +5,9 @@
   "dry-wash.arm.order.status.complete": "Завершено",
   "dry-wash.arm.order.status.pending": "В ожидании",
   "dry-wash.arm.order.status.working": "В работе",
-  "dry-wash.arm.order.status.canceled": "Отменено",
+  "dry-wash.arm.order.status.cancelled": "Отменено",
   "dry-wash.arm.order.status.placeholder": "Выберите статус",
+  "dry-wash.arm.order.master.placeholder": "Выберите мастера",
   "dry-wash.arm.order.table.header.carNumber": "Номер машины",
   "dry-wash.arm.order.table.header.washingTime": "Время мойки",
   "dry-wash.arm.order.table.header.orderDate": "Дата заказа",
@@ -24,6 +25,16 @@
   "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": "Введите ФИО",
@@ -31,6 +42,15 @@
   "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": "Сухой мастер",
@@ -61,6 +81,17 @@
   "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": "Хэтчбек",
@@ -74,20 +105,31 @@
   "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.error.title": "Ошибка",
-  "dry-wash.order-view.fetch.error": "Не удалось загрузить детали заказа №{{number}}",
+  "dry-wash.order-view.get-order-query.error.title": "Не удалось загрузить детали заказа",
   "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.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,53 +1,77 @@
 {
-    "name": "dry-wash",
-    "version": "0.3.0",
-    "description": "<a id=\"readme-top\"></a>",
-    "main": "./src/index.tsx",
-    "scripts": {
-        "test": "echo \"Error: no test specified\" && exit 1",
-        "start": "brojs server --port=8099 --with-open-browser",
-        "build": "npm run clean && brojs build --dev",
-        "build:prod": "npm run clean && brojs build",
-        "clean": "rimraf dist",
-        "eslint": "npx eslint .",
-        "eslint:fix": "npx eslint . --fix",
-        "preversion": "npm run eslint"
-    },
-    "keywords": [],
-    "author": "",
-    "license": "ISC",
-    "dependencies": {
-        "@brojs/cli": "^1.6.3",
-        "@chakra-ui/icons": "^2.2.4",
-        "@chakra-ui/react": "^2.4.2",
-        "@emotion/react": "^11.4.1",
-        "@emotion/styled": "^11.3.0",
-        "@fontsource/open-sans": "^5.1.0",
-        "@lottiefiles/react-lottie-player": "^3.5.4",
-        "@pbe/react-yandex-maps": "^1.2.5",
-        "@types/react": "^18.3.12",
-        "dayjs": "^1.11.13",
-        "express": "^4.21.1",
-        "framer-motion": "^6.2.8",
-        "i18next": "^23.16.4",
-        "keycloak-js": "^23.0.7",
-        "react": "^18.3.1",
-        "react-dom": "^18.3.1",
-        "react-hook-form": "^7.53.2",
-        "react-i18next": "^15.1.1",
-        "react-icons": "^5.3.0",
-        "react-phone-number-input": "^3.4.9",
-        "react-router-dom": "^6.27.0"
-    },
-    "devDependencies": {
-        "@eslint/js": "^9.14.0",
-        "@stylistic/eslint-plugin": "^2.10.1",
-        "@types/react-dom": "^18.3.1",
-        "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-eslint": "^8.12.2"
-    }
+  "name": "dry-wash",
+  "version": "0.9.2",
+  "description": "<a id=\"readme-top\"></a>",
+  "main": "./src/index.tsx",
+  "scripts": {
+    "test": "jest -u",
+    "start": "brojs server --port=8099 --with-open-browser",
+    "build": "npm run clean && brojs build --dev",
+    "build:prod": "npm run clean && brojs build",
+    "clean": "rimraf dist",
+    "eslint": "npx eslint src",
+    "eslint:fix": "npx eslint src --fix",
+    "preversion": "npm run eslint"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC",
+  "dependencies": {
+    "@babel/core": "^7.26.7",
+    "@babel/preset-env": "^7.26.7",
+    "@babel/preset-react": "^7.26.3",
+    "@babel/preset-typescript": "^7.26.0",
+    "@brojs/cli": "^1.8.4",
+    "@chakra-ui/icons": "^2.2.4",
+    "@chakra-ui/react": "^2.10.5",
+    "@emotion/react": "^11.4.1",
+    "@emotion/styled": "^11.3.0",
+    "@fontsource/open-sans": "^5.1.0",
+    "@lottiefiles/react-lottie-player": "^3.5.4",
+    "@pbe/react-yandex-maps": "^1.2.5",
+    "@reduxjs/toolkit": "^2.5.0",
+    "@testing-library/dom": "^10.4.0",
+    "@testing-library/react": "^16.2.0",
+    "@types/react": "^18.3.12",
+    "babel-jest": "^29.7.0",
+    "dayjs": "^1.11.13",
+    "express": "^4.21.1",
+    "framer-motion": "^6.2.8",
+    "i18next": "^23.16.4",
+    "jest": "^29.7.0",
+    "jest-environment-jsdom": "^29.7.0",
+    "jest-fixed-jsdom": "^0.0.9",
+    "keycloak-js": "^23.0.7",
+    "msw": "^2.7.0",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
+    "react-hook-form": "^7.53.2",
+    "react-i18next": "^15.1.1",
+    "react-icons": "^5.3.0",
+    "react-phone-number-input": "^3.4.9",
+    "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

@@ -0,0 +1,79 @@
+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

@@ -0,0 +1,18 @@
+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

@@ -0,0 +1,92 @@
+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

@@ -0,0 +1,31 @@
+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

@@ -0,0 +1,22 @@
+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

@@ -0,0 +1,16 @@
+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,6 +33,18 @@ 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

@@ -1,74 +0,0 @@
-import { getConfigValue } from '@brojs/cli';
-
-enum ArmEndpoints {
-  ORDERS = '/arm/orders',
-  MASTERS = '/arm/masters',
-}
-
-const armService = () => {
-  const endpoint = getConfigValue('dry-wash.api');
-
-  const fetchOrders = async ({ date }: { date: Date }) => {
-    const response = await fetch(`${endpoint}${ArmEndpoints.ORDERS}`, {
-      method: 'POST',
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      body: JSON.stringify({ date }),
-    });
-
-    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();
-  };
-
-  return { fetchOrders, fetchMasters, addMaster, deleteMaster };
-};
-
-export { armService, ArmEndpoints };

src/api/landing.ts

@@ -1,25 +0,0 @@
-import { getConfigValue } from '@brojs/cli';
-
-import { Order } from '../models/landing';
-
-enum LandingEndpoints {
-  ORDER_VIEW = '/order'
-}
-
-const LandingService = () => {
-  const endpoint = getConfigValue('dry-wash.api');
-
-  const fetchOrder = async (orderId: Order.Id) => {
-    const response = await fetch(`${endpoint}${LandingEndpoints.ORDER_VIEW}/${orderId}`);
-
-    if (!response.ok) {
-      throw new Error(`Failed to fetch order: ${response.status}`);
-    }
-
-    return await response.json();
-  };
-
-  return { fetchOrder };
-};
-
-export { LandingService, LandingEndpoints };

src/app.tsx

@@ -1,19 +1,23 @@
 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 (
-    <ChakraProvider theme={chakraTheme}>
-      <ErrorBoundary>
-        <BrowserRouter>
-          <Routers />
-        </BrowserRouter>
-      </ErrorBoundary>
-    </ChakraProvider>
+    <Provider store={store}>
+      <ChakraProvider theme={chakraTheme}>
+        <ErrorBoundary>
+          <BrowserRouter>
+            <Routers />
+          </BrowserRouter>
+        </ErrorBoundary>
+      </ChakraProvider>
+    </Provider>
   );
 };
 

src/assets/animation/index.ts

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

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

@@ -0,0 +1,11 @@
+export { default as CoupeImg } from './coupe.webp';
+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';
+export { default as StationWagonImg } from './station-wagon.webp';
+export { default as SuvImg } from './suv.webp';

src/assets/images/index.ts

@@ -1 +1,2 @@
+export * from './car-body-type';
 export { default as DemoVideoPosterImg } from './demo-video-poster.webp';

src/components/DateNavigator/DateNavigator.tsx

@@ -1,6 +1,7 @@
 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;
@@ -19,7 +20,7 @@ const DateNavigator = ({
         <ArrowBackIcon />
       </Button>
       <Text mx='4' fontSize='lg' fontWeight='bold'>
-        {currentDate.toLocaleDateString()}
+        {dayjs(currentDate).format('DD.MM.YYYY')}
       </Text>
       <Button onClick={onNextDate}>
         <ArrowForwardIcon />

src/components/Editable/Editable.tsx

@@ -0,0 +1,107 @@
+import React, { useEffect, useState } from 'react';
+import {
+  Editable,
+  EditableInput,
+  EditablePreview,
+  Flex,
+  IconButton,
+  Input,
+  useEditableControls,
+  ButtonGroup,
+  Stack,
+} 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';
+  id: string;
+}
+
+const EditableWrapper = ({ value, fieldName, id }: EditableWrapperProps) => {
+  const [updateMaster, { isError, isSuccess, error }] =
+    useUpdateMasterMutation();
+
+  const { t } = useTranslation('~', {
+    keyPrefix: 'dry-wash.arm.master.editable',
+  });
+
+  const showToast = useShowToast();
+  const [currentValue, setCurrentValue] = useState<string>(value);
+
+  const handleSubmit = async (newValue: string) => {
+    if (currentValue === newValue) return;
+
+    await updateMaster({ id, [fieldName]: newValue });
+
+    setCurrentValue(newValue);
+  };
+
+  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,
+      getSubmitButtonProps,
+      getCancelButtonProps,
+      getEditButtonProps,
+    } = useEditableControls();
+
+    return isEditing ? (
+      <ButtonGroup justifyContent='center' size='sm'>
+        <IconButton
+          aria-label={t('aria.save')}
+          icon={<CheckIcon />}
+          {...getSubmitButtonProps()}
+        />
+        <IconButton
+          aria-label={t('aria.cancel')}
+          icon={<CloseIcon />}
+          {...getCancelButtonProps()}
+        />
+      </ButtonGroup>
+    ) : (
+      <Flex justifyContent='center'>
+        <IconButton
+          aria-label={t('aria.edit')}
+          size='sm'
+          icon={<EditIcon />}
+          {...getEditButtonProps()}
+        />
+      </Flex>
+    );
+  }
+
+  return (
+    <Editable
+      textAlign='center'
+      defaultValue={currentValue}
+      fontSize='2xl'
+      isPreviewFocusable={false}
+      onSubmit={handleSubmit}
+    >
+      <Stack direction={['column', 'row']} spacing='15px'>
+        <EditablePreview />
+        <Input as={EditableInput} />
+        <EditableControls />
+      </Stack>
+    </Editable>
+  );
+};
+
+export default EditableWrapper;

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'>
+        <Center minH='100vh' data-testid='error-boundary'>
           <VStack spacing={4} textAlign='center'>
-            <Heading as='h1' size='2xl'>
+            <Heading as='h1' size='2xl' data-testid='error-title'>
               {i18next.t('~:dry-wash.errorBoundary.title')}
             </Heading>
-            <Text fontSize='lg'>
+            <Text fontSize='lg' data-testid='error-description'>
               {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

@@ -0,0 +1,51 @@
+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

@@ -0,0 +1,28 @@
+// 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

@@ -0,0 +1,61 @@
+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

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

src/components/LayoutArm/LayoutArm.tsx

@@ -2,10 +2,11 @@ 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;
@@ -17,8 +18,8 @@ const LayoutArm = () => {
   }
 
   return (
-    <Flex h='100vh'>
-      <Sidebar />
+    <Flex flexDirection='column' h='100vh'>
+      <Header />
       <Box flex='1' bg='gray.50'>
         <Routes>
           <Route index element={<Navigate to={defaultRedirect} replace />} />
@@ -28,6 +29,9 @@ 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

@@ -0,0 +1,95 @@
+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

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

src/components/MasterActionsMenu/MasterActionsMenu.tsx

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

src/components/MasterDrawer/MasterDrawer.tsx

@@ -1,4 +1,5 @@
-import React, { useState } from 'react';
+import React, { useEffect } from 'react';
+import { useForm, SubmitHandler } from 'react-hook-form';
 import {
   Button,
   FormControl,
@@ -11,98 +12,128 @@ import {
   DrawerFooter,
   DrawerHeader,
   DrawerOverlay,
-  useToast,
   InputGroup,
   InputLeftElement,
+  FormErrorMessage,
 } from '@chakra-ui/react';
 import { useTranslation } from 'react-i18next';
 import { PhoneIcon } from '@chakra-ui/icons';
 
-import { armService } from '../../api/arm';
+import { useAddMasterMutation } from '../../__data__/service/api';
+import { DrawerInputs } from '../../models/arm/form';
+import useShowToast from '../../hooks/useShowToast';
 
-const MasterDrawer = ({ isOpen, onClose }) => {
-  const { addMaster } = armService();
-  const toast = useToast();
+interface MasterDrawerProps {
+  isOpen: boolean;
+  onClose: () => void;
+}
 
-  const [newMaster, setNewMaster] = useState({ name: '', phone: '' });
-
-  const handleSave = async () => {
-    if (newMaster.name.trim() === '' || newMaster.phone.trim() === '') {
-      return;
-    }
-
-    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 MasterDrawer = ({ isOpen, onClose }: MasterDrawerProps) => {
+  const {
+    register,
+    handleSubmit,
+    reset,
+    formState: { errors },
+  } = useForm<DrawerInputs>();
 
   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>
-        <DrawerCloseButton />
-        <DrawerHeader>{t('title')}</DrawerHeader>
-        <DrawerBody>
-          <FormControl mb='4'>
-            <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>
+        <form onSubmit={handleSubmit(onSubmit)}>
+          <DrawerCloseButton />
+          <DrawerHeader>{t('title')}</DrawerHeader>
+          <DrawerBody>
+            <FormControl mb='4' isInvalid={!!errors.name}>
+              <FormLabel>{t('inputName.label')}</FormLabel>
               <Input
-                // isInvalid
-                value={newMaster.phone}
-                onChange={(e) =>
-                  setNewMaster({ ...newMaster, phone: e.target.value })
-                }
-                placeholder={t('inputPhone.placeholder')}
+                {...register('name', {
+                  required: t('form.name.required'),
+                  minLength: {
+                    value: 2,
+                    message: t('form.name.minLength'),
+                  },
+                })}
+                placeholder={t('inputName.placeholder')}
               />
-            </InputGroup>
-          </FormControl>
-        </DrawerBody>
-        <DrawerFooter>
-          <Button colorScheme='teal' mr={3} onClick={handleSave}>
-            {t('button.save')}
-          </Button>
-          <Button variant='ghost' onClick={onClose}>
-            {t('button.cancel')}
-          </Button>
-        </DrawerFooter>
+              <FormErrorMessage>
+                {errors.name && errors.name.message}
+              </FormErrorMessage>
+            </FormControl>
+            <FormControl isInvalid={!!errors.phone}>
+              <FormLabel>{t('inputPhone.label')}</FormLabel>
+              <InputGroup>
+                <InputLeftElement pointerEvents='none'>
+                  <PhoneIcon color='gray.300' />
+                </InputLeftElement>
+                <Input
+                  {...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

@@ -1,37 +1,36 @@
 import React from 'react';
-import { Badge, Link, Stack, Td, Tr } from '@chakra-ui/react';
+import { Badge, Stack, Td, Tr, Text } from '@chakra-ui/react';
+import { useTranslation } from 'react-i18next';
 
 import MasterActionsMenu from '../MasterActionsMenu';
 import { getTimeSlot } from '../../lib';
-
-export interface Schedule {
-  id: string;
-  startWashTime: string;
-  endWashTime: string;
-}
-
-export type MasterProps = {
-  id: string;
-  name: string;
-  phone: string;
-  schedule: Schedule[];
-};
+import EditableWrapper from '../Editable/Editable';
 
 const MasterItem = ({ name, phone, id, schedule }) => {
+  const { t } = useTranslation('~', {
+    keyPrefix: 'dry-wash.arm.master',
+  });
+
   return (
     <Tr>
-      <Td>{name}</Td>
       <Td>
-        <Stack direction='row'>
-          {schedule.map(({ startWashTime, endWashTime }, index) => (
-            <Badge colorScheme={'green'} key={index}>
-              {getTimeSlot(startWashTime, endWashTime)}
-            </Badge>
-          ))}
-        </Stack>
+        <EditableWrapper id={id} fieldName={'name'} value={name} />
       </Td>
       <Td>
-        <Link href='tel:'>{phone}</Link>
+        {schedule?.length > 0 ? (
+          <Stack direction='row'>
+            {schedule?.map(({ startWashTime, endWashTime }, index: number) => (
+              <Badge colorScheme={'green'} key={index}>
+                {getTimeSlot(startWashTime, endWashTime)}
+              </Badge>
+            ))}
+          </Stack>
+        ) : (
+          <Text color='gray.500'>{t('schedule.empty')}</Text>
+        )}
+      </Td>
+      <Td>
+        <EditableWrapper id={id} fieldName={'phone'} value={phone} />
       </Td>
       <Td>
         <MasterActionsMenu id={id} />

src/components/Masters/Masters.tsx

@@ -10,17 +10,18 @@ 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 { armService } from '../../api/arm';
-import { MasterProps } from '../MasterItem/MasterItem';
+import { useGetMastersQuery } from '../../__data__/service/api';
+import useShowToast from '../../hooks/useShowToast';
+import DateNavigator from '../DateNavigator';
 
 const TABLE_HEADERS = [
   'name' as const,
@@ -31,49 +32,46 @@ const TABLE_HEADERS = [
 
 const Masters = () => {
   const { isOpen, onOpen, onClose } = useDisclosure();
-  const toast = useToast();
+  const showToast = useShowToast();
+  const [currentDate, setCurrentDate] = useState(new Date());
+
   const { t } = useTranslation('~', {
     keyPrefix: 'dry-wash.arm.master',
   });
 
-  const [masters, setMasters] = useState<MasterProps[]>([]);
-  const [loading, setLoading] = useState(false);
-  const [error, setError] = useState<string | null>(null);
-
-  const { fetchMasters } = armService();
+  const {
+    data: masters,
+    error,
+    isLoading,
+    isSuccess,
+  } = useGetMastersQuery({ date: currentDate });
 
   useEffect(() => {
-    const loadMasters = async () => {
-      setLoading(true);
-
-      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]);
+    if (error) {
+      showToast(t('error.title'), 'error');
+    }
+  }, [error]);
 
   return (
     <Box p='8'>
-      <Flex justifyContent='space-between' alignItems='center' mb='5'>
+      <Flex justifyContent='space-between' alignItems='baseline' 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>
@@ -83,22 +81,21 @@ const Masters = () => {
           </Tr>
         </Thead>
         <Tbody>
-          {loading && (
+          {isLoading && (
             <Tr>
               <Td colSpan={TABLE_HEADERS.length} textAlign='center' py='8'>
                 <Spinner size='lg' />
               </Td>
             </Tr>
           )}
-          {!loading && masters.length === 0 && !error && (
+          {isSuccess && masters.length === 0 && (
             <Tr>
               <Td colSpan={TABLE_HEADERS.length}>
                 <Text>{t('table.empty')}</Text>
               </Td>
             </Tr>
           )}
-          {!loading &&
-            !error &&
+          {isSuccess &&
             masters.map((master, index) => (
               <MasterItem key={index} {...master} />
             ))}

src/components/OrderItem/OrderItem.tsx

@@ -1,42 +1,20 @@
-import React, { useState } from 'react';
-import { Td, Tr, Link, Select } from '@chakra-ui/react';
+import React, { ChangeEvent, useState } from 'react';
+import { Td, Tr, Link, Select, Button } 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';
-
-const statuses = [
-  'pending' as const,
-  'progress' as const,
-  'working' as const,
-  'canceled' as const,
-  'complete' as const,
-];
-
-type GetArrItemType<ArrType> =
-  ArrType extends Array<infer ItemType> ? ItemType : never;
-
-export type OrderProps = {
-  carNumber?: string;
-  startWashTime?: string;
-  endWashTime?: string;
-  orderDate?: string;
-  status?: GetArrItemType<typeof statuses>;
-  phone?: string;
-  location?: string;
-  master: MasterProps;
-  notes: '';
-  allMasters: MasterProps[];
-};
-
-type Status = (typeof statuses)[number];
+import { useUpdateOrdersMutation } from '../../__data__/service/api';
+import { OrderArm, Status, statuses } from '../../models/api';
+import getCoordinates from '../../utils/getCoordinates';
+import { URLs } from '../../__data__/urls';
 
 const statusColors: Record<Status, string> = {
   pending: 'yellow.100',
   progress: 'blue.100',
-  working: 'orange.100',
-  canceled: 'red.100',
+  cancelled: 'red.100',
   complete: 'green.100',
 };
 
@@ -50,24 +28,55 @@ const OrderItem = ({
   location,
   master,
   allMasters,
-}: OrderProps) => {
+  id,
+  currentDate,
+}: OrderArm) => {
+  const [updateOrders] = useUpdateOrdersMutation();
   const { t } = useTranslation('~', {
     keyPrefix: 'dry-wash.arm.order',
   });
 
   const [statusSelect, setStatus] = useState(status);
   const bgColor = statusColors[statusSelect];
-  const [masterSelect, setMaster] = useState(master?.name);
+  const [masterSelectId, setMasterSelectId] = useState(master);
+
+  const handelChangeMasters = (e: ChangeEvent<HTMLSelectElement>) => {
+    const masterName = e.target.value;
+    const selectedMaster = allMasters.find(
+      (master) => master.name === masterName,
+    );
+
+    if (selectedMaster) {
+      setMasterSelectId(selectedMaster.id);
+      updateOrders({ id, master: selectedMaster.id });
+    } else {
+      console.error('Master not found');
+    }
+  };
+
+  const handeChangeStatus = (e: ChangeEvent<HTMLSelectElement>) => {
+    const status = e.target.value as OrderArm['status'];
+    updateOrders({ id, status });
+    setStatus(status);
+  };
+
+  const masterSelectChange = allMasters.find(
+    (master) => master.id === masterSelectId,
+  );
+
+  const { lat = 55.78, lon = 49.12 } = getCoordinates(location);
 
   return (
     <Tr>
       <Td>{carNumber}</Td>
-      <Td>{getTimeSlot(startWashTime, endWashTime)}</Td>
-      <Td>{dayjs(orderDate).format('DD.MM.YYYY')}</Td>
+      <Td>
+        {dayjs(orderDate).format('DD.MM.YYYY')} <br />
+        {getTimeSlot(startWashTime, endWashTime)}
+      </Td>
       <Td>
         <Select
           value={statusSelect}
-          onChange={(e) => setStatus(e.target.value as OrderProps['status'])}
+          onChange={handeChangeStatus}
           placeholder={t(`status.placeholder`)}
           bg={bgColor}
         >
@@ -80,9 +89,9 @@ const OrderItem = ({
       </Td>
       <Td>
         <Select
-          value={masterSelect}
-          onChange={(e) => setMaster(e.target.value as OrderProps['status'])}
-          placeholder={t(`status.placeholder`)}
+          value={masterSelectChange?.name}
+          onChange={handelChangeMasters}
+          placeholder={t(`master.placeholder`)}
         >
           {allMasters.map((item) => (
             <option key={item.id} value={item.name}>
@@ -94,7 +103,14 @@ const OrderItem = ({
       <Td>
         <Link href='tel:'>{phone}</Link>
       </Td>
-      <Td>{location}</Td>
+      <Td>
+        <Button
+          as={LinkRouter}
+          to={URLs.armMap.getUrl({ lat, lon, currentDate })}
+        >
+          <ViewIcon />
+        </Button>
+      </Td>
     </Tr>
   );
 };

src/components/Orders/Orders.tsx

@@ -10,20 +10,21 @@ 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 { MasterProps } from '../MasterItem/MasterItem';
+import {
+  useGetMastersQuery,
+  useGetOrdersQuery,
+} from '../../__data__/service/api';
+import useShowToast from '../../hooks/useShowToast';
+import { OrderArm } from '../../models/api';
 
 const TABLE_HEADERS = [
   'carNumber' as const,
-  'washingTime' as const,
   'orderDate' as const,
   'status' as const,
   'masters' as const,
@@ -35,54 +36,40 @@ 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(() => {
-    const loadData = async () => {
-      setLoading(true);
-      setError(null);
-
-      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]);
+    if (isError) {
+      showToast(t('error.title'), 'error');
+    }
+  }, [isError, ordersError, mastersError, t]);
 
   return (
     <Box p='8'>
       <Heading size='lg' mb='5'>
         {t('title')}
       </Heading>
-
       <DateNavigator
         currentDate={currentDate}
         onPreviousDate={() =>
@@ -104,28 +91,28 @@ const Orders = () => {
           </Tr>
         </Thead>
         <Tbody>
-          {loading && (
+          {isLoading && (
             <Tr>
               <Td colSpan={TABLE_HEADERS.length} textAlign='center' py='8'>
                 <Spinner size='lg' />
               </Td>
             </Tr>
           )}
-          {!loading && orders.length === 0 && !error && (
+          {isSuccess && orders.length === 0 && (
             <Tr>
               <Td colSpan={TABLE_HEADERS.length}>
                 <Text>{t('table.empty')}</Text>
               </Td>
             </Tr>
           )}
-          {!loading &&
-            !error &&
+          {isSuccess &&
             orders.map((order, index) => (
               <OrderItem
-                allMasters={allMasters}
+                allMasters={masters}
                 key={index}
                 {...order}
-                status={order.status as OrderProps['status']}
+                status={order.status as OrderArm['status']}
+                currentDate={currentDate}
               />
             ))}
         </Tbody>

src/components/PageSpinner/PageSpinner.tsx

@@ -5,6 +5,7 @@ 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

@@ -0,0 +1,35 @@
+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

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

src/components/PriceCar/PriceCar.tsx

@@ -0,0 +1,49 @@
+import { Box, Image, Progress, Text } from '@chakra-ui/react';
+import React from 'react';
+import { getFeatures } from '@brojs/cli';
+
+const PRICE_INCREASE_PERCENT_PER_RATING = 10; // 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 washPrice = calculateWashPrice(rating);
+  const progressValue = (rating / 10) * 100;
+  return (
+    <Box
+      alignItems='center'
+      gap={5}
+      width='100%'
+      display='flex'
+      flexDirection='column'
+    >
+      <Image
+        maxWidth='600px'
+        objectFit='contain'
+        borderRadius='md'
+        src={image}
+        alt='Car Image'
+      />
+      {rating ? (
+        <Box width='100%' maxW='600px'>
+          <Text>Рейтинг загрязнения машины:</Text>
+          <Progress value={progressValue} size='sm' colorScheme='red' mt={2} />
+          <Text mt={2}>Стоимость мойки: {washPrice.toFixed(2)} руб.</Text>
+        </Box>
+      ) : (
+        <Text>Не удалость определить уровень загрязнения машины</Text>
+      )}
+      <Text>{description}</Text>
+    </Box>
+  );
+};
+
+export default PriceCar;

src/components/PriceCar/index.ts

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

src/components/Sidebar/Sidebar.tsx

@@ -1,60 +0,0 @@
-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

@@ -1 +0,0 @@
-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 } = {},
+  data: { heading, description, list } = {}, ...props
 }) => {
   const { t } = useTranslation('~', { keyPrefix: 'dry-wash.landing' });
 
   return (
-    <PageSection>
+    <PageSection {...props}>
       <VStack w='full' spacing={2}>
         <Heading as='h2'>{t(heading)}</Heading>
         <Text>{t(description)}</Text>

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

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

src/components/landing/HeroSection/HeroSection.tsx

@@ -10,11 +10,18 @@ import { HeroSectionProps } from './types';
 export const HeroSection: FC<HeroSectionProps> = ({
   data: { headline, description, video } = {},
   flexShrink,
+  ...props
 }) => {
   const { t } = useTranslation('~', { keyPrefix: 'dry-wash.landing' });
 
   return (
-    <Box flexShrink={flexShrink} as='header' pos='relative' zIndex={0}>
+    <Box
+      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();
+  const { t } = useTranslation('~', { keyPrefix: 'dry-wash.landing' });
 
-  return <Image src={LogoSvg} alt={t('~:dry-wash.landing.site-logo')} w={40} />;
+  return <Image src={LogoSvg} alt={t('site-logo')} w={40} />;
 };
 
 // todo: replace Image by SVG React component

src/components/landing/SocialProofSection/SocialProofSection.tsx

@@ -9,11 +9,12 @@ import { SocialProofSectionProps } from './types';
 
 export const SocialProofSection: FC<SocialProofSectionProps> = ({
   data: { heading } = {},
+  ...props
 }) => {
   const { t } = useTranslation('~', { keyPrefix: 'dry-wash.landing' });
 
   return (
-    <PageSection>
+    <PageSection {...props}>
       <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,23 +1,83 @@
 import React, { forwardRef } from 'react';
-import { Select, SelectProps } from '@chakra-ui/react';
+import {
+  Input,
+  Box,
+  Popover,
+  PopoverAnchor,
+  PopoverContent,
+  PopoverBody,
+  useRadioGroup,
+  Grid,
+  GridItem,
+  UseRadioGroupProps,
+  useDisclosure,
+} from '@chakra-ui/react';
 import { useTranslation } from 'react-i18next';
 
-import { carBodySelectOptions } from './helper';
+import { carBodySelectOptions, getInputValue } from './helper';
+import { CarBodyOption } from './option';
+import { CarBodySelectProps } from './types';
 
-export const CarBodySelect = forwardRef<HTMLSelectElement, SelectProps>(
+export const CarBodySelect = forwardRef<HTMLInputElement, CarBodySelectProps>(
   function CarBodySelect(props, ref) {
+    const handleOptionClick: UseRadioGroupProps['onChange'] = (value) => {
+      props.onChange({
+        target: { value },
+      } as React.ChangeEvent<HTMLInputElement>);
+      onClose();
+    };
+
+    const { value, getRadioProps, getRootProps } = useRadioGroup({
+      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 (
-      <Select ref={ref} placeholder={t('placeholder')} {...props}>
-        {carBodySelectOptions.map(({ value, labelTKey }, i) => (
-          <option key={i} value={value}>
-            {t(`options.${labelTKey}`)}
-          </option>
-        ))}
-      </Select>
+      <Box width='100%'>
+        <Popover
+          isOpen={isOpen}
+          autoFocus={false}
+          placement='bottom-start'
+          matchWidth
+        >
+          <PopoverAnchor>
+            <Input
+              {...props}
+              ref={ref}
+              value={getInputValue(Number(value), t) ?? props.value}
+              readOnly
+              onClick={onOpen}
+              onBlur={onClose}
+              placeholder={t('placeholder')}
+            />
+          </PopoverAnchor>
+          <PopoverContent width='100%' maxWidth='100%'>
+            <PopoverBody border='1px' borderColor='gray.300' p={0}>
+              <Grid
+                templateColumns='repeat(auto-fit, minmax(150px, 1fr))'
+                {...getRootProps()}
+              >
+                {carBodySelectOptions.map(({ value, img, labelTKey }) => (
+                  <GridItem key={value}>
+                    <CarBodyOption
+                      image={img}
+                      label={t(`options.${labelTKey}`)}
+                      {...getRadioProps({ value: String(value) })}
+                    />
+                  </GridItem>
+                ))}
+              </Grid>
+            </PopoverBody>
+          </PopoverContent>
+        </Popover>
+      </Box>
     );
   },
 );

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

@@ -1,3 +1,19 @@
+import { TFunction } from "i18next";
+import { InputProps } from "@chakra-ui/react";
+
+import {
+  CoupeImg,
+  CrossoverImg,
+  HatchbackImg,
+  LiftbackImg,
+  MinivanImg,
+  PickupImg,
+  SedanImg,
+  SportsCarImg,
+  StationWagonImg,
+  SuvImg,
+  OtherImg
+} from "../../../../assets/images";
 import { Car } from "../../../../models/landing";
 
 import { CarBodySelectOption } from "./types";
@@ -5,46 +21,67 @@ import { CarBodySelectOption } from "./types";
 export const carBodySelectOptions: CarBodySelectOption[] = [
   {
     value: Car.BodyStyle.SEDAN,
-    labelTKey: 'sedan'
+    labelTKey: 'sedan',
+    img: SedanImg
   },
   {
     value: Car.BodyStyle.HATCHBACK,
-    labelTKey: 'hatchback'
+    labelTKey: 'hatchback',
+    img: HatchbackImg
   },
   {
     value: Car.BodyStyle.CROSSOVER,
-    labelTKey: 'crossover'
+    labelTKey: 'crossover',
+    img: CrossoverImg
   },
   {
     value: Car.BodyStyle.SUV,
-    labelTKey: 'suv'
+    labelTKey: 'suv',
+    img: SuvImg
   },
   {
     value: Car.BodyStyle.STATION_WAGON,
-    labelTKey: 'station-wagon'
+    labelTKey: 'station-wagon',
+    img: StationWagonImg
   },
   {
     value: Car.BodyStyle.COUPE,
-    labelTKey: 'coupe'
+    labelTKey: 'coupe',
+    img: CoupeImg
   },
   {
     value: Car.BodyStyle.MINIVAN,
-    labelTKey: 'minivan'
+    labelTKey: 'minivan',
+    img: MinivanImg
   },
   {
     value: Car.BodyStyle.PICKUP,
-    labelTKey: 'pickup'
+    labelTKey: 'pickup',
+    img: PickupImg
   },
   {
     value: Car.BodyStyle.LIFTBACK,
-    labelTKey: 'liftback'
+    labelTKey: 'liftback',
+    img: LiftbackImg
   },
   {
     value: Car.BodyStyle.SPORTS_CAR,
-    labelTKey: 'sports-car'
+    labelTKey: 'sports-car',
+    img: SportsCarImg
   },
   {
     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/option/car-body-option.tsx

@@ -0,0 +1,39 @@
+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

@@ -0,0 +1,19 @@
+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

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

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

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

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

@@ -1,23 +0,0 @@
-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.tsx

@@ -0,0 +1,162 @@
+import React, { forwardRef, useState } from 'react';
+import {
+  Input,
+  Box,
+  Stack,
+  Text,
+  Flex,
+} from '@chakra-ui/react';
+import { useTranslation } from 'react-i18next';
+
+import { CAR_COLORS } 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) {
+    const [customColor, setCustomColor] = useState('');
+    const [isCustom, setIsCustom] = useState(false);
+
+    const handleColorChange = (value: 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%">
+        <Flex gap={3} wrap="nowrap" overflowX="auto" pb={2}>
+          {CAR_COLORS.map(({ name, code }) => (
+            <Box 
+              key={name}
+              flexShrink={0}
+              as="button"
+              type="button"
+              onClick={() => handleColorChange(name)}
+            >
+              <Flex 
+                align="center" 
+                gap={2} 
+                p={2}
+                borderRadius="full"
+                borderWidth="2px"
+                borderColor={currentValue === name ? 'primary.500' : 'gray.200'}
+                bg={currentValue === name ? 'primary.50' : 'white'}
+                _hover={{ 
+                  borderColor: 'primary.500',
+                  bg: currentValue === name ? 'primary.50' : 'gray.50'
+                }}
+                minW={currentValue === name ? '120px' : 'auto'}
+                h="48px"
+                justify="center"
+                transition="all 0.2s"
+              >
+                <Flex align="center" gap={2}>
+                  <Box
+                    w="32px"
+                    h="32px"
+                    borderRadius="full"
+                    bg={code}
+                    border="1px"
+                    borderColor={currentValue === name ? 'primary.500' : 'gray.200'}
+                    transition="all 0.2s"
+                    boxShadow={currentValue === name ? 'sm' : 'none'}
+                  />
+                  {currentValue === name && (
+                    <Text fontSize="xs" color="primary.700" fontWeight="medium">
+                      {t(`colors.${name}`)}
+                    </Text>
+                  )}
+                </Flex>
+              </Flex>
+            </Box>
+          ))}
+          <Box 
+            flexShrink={0}
+            as="button"
+            type="button"
+            onClick={() => handleColorChange('custom')}
+          >
+            <Flex 
+              align="center" 
+              gap={2}
+              p={2}
+              borderRadius="full"
+              borderWidth="2px"
+              borderColor={isCustom ? 'primary.500' : 'gray.200'}
+              bg={isCustom ? 'primary.50' : 'white'}
+              _hover={{ 
+                borderColor: 'primary.500',
+                bg: isCustom ? 'primary.50' : 'gray.50'
+              }}
+              minW={isCustom ? '200px' : 'auto'}
+              h="48px"
+              justify="center"
+              transition="all 0.2s"
+            >
+              {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,4 +1,4 @@
-export const CAR_COLORS: Record<'name' | 'code', string>[] = [
+export const CAR_COLORS = [
   {
     name: 'white',
     code: '#ffffff'
@@ -31,4 +31,4 @@ export const CAR_COLORS: Record<'name' | 'code', string>[] = [
     name: 'green',
     code: '#078d51'
   },
-];
+] as const satisfies { name: string; code: string }[];

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

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

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

@@ -15,7 +15,7 @@ export const CarNumberInput = forwardRef<HTMLInputElement, InputProps>(
           // @ts-ignore
           onChange?.(formattedValue);
         }}
-        maxLength={8}
+        maxLength={12}
       />
     );
   },

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

@@ -3,11 +3,11 @@ const VALID_LETTER = 'а|в|е|к|м|н|о|р|с|т|у|х';
 const invalidCharsRe = new RegExp(`[^(${VALID_LETTER})0-9]`, 'gi');
 const cleanValue = (value: string) => value.replace(invalidCharsRe, '');
 
-const validCarNumberInputRe = new RegExp(`^([${VALID_LETTER}]{1}|$)((?:[0-9]|$)(?:[0-9]|$)(?:[0-9]|$))([${VALID_LETTER}]{1,2}|$)$`, 'gi');
+const validCarNumberInputRe = new RegExp(`^([${VALID_LETTER}]{1}|$)((?:[0-9]|$)(?:[0-9]|$)(?:[0-9]|$))([${VALID_LETTER}]{1,2}|$)((?:[0-9]|$)(?:[0-9]|$)(?:[0-9]|$))$`, 'gi');
 const isValidInput = (cleanedValue: string) => validCarNumberInputRe.test(cleanedValue);
 
 const formatAsCarNumber = (cleanedValue: string) => {
-  return cleanedValue.replace(validCarNumberInputRe, (_, p1, p2, p3) => [p1, p2, p3].join(' ')).toUpperCase();
+  return cleanedValue.replace(validCarNumberInputRe, (_, p1, p2, p3, p4) => [p1, p2, p3, p4].join(' ')).toUpperCase();
 };
 const getWithoutLastChar = (value: string) => value.substring(0, value.length - 1);
 
@@ -25,7 +25,7 @@ export const handleInputChange = (value: string | undefined | null) => {
   return getWithoutLastChar(value).trim();
 };
 
-const validCarNumberRe = new RegExp(`^[${VALID_LETTER}][0-9]{3}[${VALID_LETTER}]{2}$`, 'i');
+const validCarNumberRe = new RegExp(`^[${VALID_LETTER}][0-9]{3}[${VALID_LETTER}]{2}[0-9]{2,3}$`, 'i');
 
 export const isValidCarNumber = (value: string) => {
   const cleanedValue = cleanValue(value);

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

@@ -1,7 +1,4 @@
 import { useTranslation } from "react-i18next";
-import { InputProps, SelectProps } from "@chakra-ui/react";
-
-import { Order } from "../../../models/landing";
 
 import { FormFieldProps } from "./field";
 import { OrderFormValues } from "./types";
@@ -12,6 +9,7 @@ export const defaultValues: Partial<OrderFormValues> = {
   phone: '',
   carNumber: '',
   carColor: '',
+  carBody: '',
   availableDatetimeBegin: '',
   availableDatetimeEnd: '',
 };
@@ -29,39 +27,4 @@ export const useGetValidationRules = () => {
       validate: (value: string) => isValidCarNumber(value) || t('car-number-field.invalid')
     },
   } satisfies Record<string, FormFieldProps['rules']>;
-};
-
-const removeAllSpaces = (str: string) => str.replace(/\s+/g, '');
-
-const getValidCarBodyStyle = (fieldValue: string) => {
-  const carBodyAsNumber = Number(fieldValue);
-  return Number.isNaN(carBodyAsNumber) ? undefined : carBodyAsNumber;
-};
-
-export const formatFormValues = ({ phone, carNumber, carBody, carColor, carLocation, availableDatetimeBegin, availableDatetimeEnd }: OrderFormValues): Order.Create => {
-  return {
-    customer: {
-      phone
-    },
-    car: {
-      number: removeAllSpaces(carNumber),
-      body: getValidCarBodyStyle(carBody),
-      color: carColor
-    },
-    washing: {
-      location: carLocation,
-      begin: availableDatetimeBegin,
-      end: availableDatetimeEnd,
-    }
-  };
-};
-
-export const onSubmit = (values: OrderFormValues) => {
-  return new Promise((resolve) => {
-    console.log(formatFormValues(values));
-    resolve(formatFormValues(values));
-  });
-};
-
-export const inputCommonStyles: Partial<InputProps & SelectProps> = {
 };

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

@@ -1 +1,2 @@
+export type { OrderFormValues, OrderFormProps } from './types';
 export { OrderForm } from './order-form';

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

@@ -42,21 +42,29 @@ export const LocationInput = memo(
 
       const onInputChange: InputProps['onChange'] = async (e) => {
         const newInputValue = e.target.value;
-        setInputValue(newInputValue);
 
-        if (newInputValue.trim().length > 3) {
-          try {
-            const address = extractAddress(newInputValue);
-            const results = await ymaps.suggest(address);
-            setSuggestions(results);
-          } catch (error) {
-            console.error(error);
-          }
+        if (
+          isValidLocation(newInputValue) &&
+          (await isRealLocation(ymaps, newInputValue))
+        ) {
+          onChange(newInputValue);
         } else {
-          setSuggestions([]);
+          setInputValue(newInputValue);
+  
+          if (newInputValue.trim().length > 3) {
+            try {
+              const address = extractAddress(newInputValue);
+              const results = await ymaps.suggest(address);
+              setSuggestions(results);
+            } catch (error) {
+              console.error(error);
+            }
+          } else {
+            setSuggestions([]);
+          }
+  
+          setIsSuggestionsPanelOpen(suggestions.length > 1);
         }
-
-        setIsSuggestionsPanelOpen(suggestions.length > 1);
       };
 
       const onFocus: InputProps['onFocus'] = () => {
@@ -103,7 +111,7 @@ export const LocationInput = memo(
                 {...props}
                 ref={ref}
                 onBlur={onBlur}
-                value={inputValue}
+                value={inputValue ?? value}
                 onChange={onInputChange}
                 onFocus={onFocus}
                 placeholder={t('placeholder')}

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

@@ -1,20 +1,25 @@
-import React, { FC } 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 { OrderFormValues } from './types';
+import { OrderFormProps, OrderFormValues } from './types';
 import { PhoneInput } from './phone';
 import { SubmitButton } from './submit';
-import { defaultValues, onSubmit, useGetValidationRules } from './helper';
+import { defaultValues, useGetValidationRules } from './helper';
 import { DateTimeInput } from './date-time';
-import { LocationInput, MapComponent, StringLocation, YMapsProvider } from './location';
+import {
+  LocationInput,
+  MapComponent,
+  StringLocation,
+  YMapsProvider,
+} from './location';
+import { CarColorSelect } from './car-color';
 
-export const OrderForm: FC = () => {
+export const OrderForm = ({ onSubmit, loading, ...props }: OrderFormProps) => {
   const {
     handleSubmit,
     control,
@@ -36,7 +41,7 @@ export const OrderForm: FC = () => {
   ]);
 
   return (
-    <Box p={4} marginInline='auto'>
+    <Box p={4} marginInline='auto' {...props}>
       <VStack
         as='form'
         noValidate
@@ -67,7 +72,7 @@ export const OrderForm: FC = () => {
           name='carColor'
           label={t('car-color-field.label')}
           errors={errors}
-          Input={CarColorInput}
+          Input={CarColorSelect}
         />
         <FormInputField
           control={control}
@@ -123,7 +128,7 @@ export const OrderForm: FC = () => {
             }}
           />
         </YMapsProvider>
-        <SubmitButton isLoading={isSubmitting} mt={4} />
+        <SubmitButton isLoading={isSubmitting || loading} mt={4} />
       </VStack>
     </Box>
   );

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

@@ -1,3 +1,5 @@
+import { SubmitHandler } from "react-hook-form";
+
 export type OrderFormValues = {
   phone: string;
   carNumber: string;
@@ -6,4 +8,9 @@ export type OrderFormValues = {
   carLocation: string;
   availableDatetimeBegin: string;
   availableDatetimeEnd: string;
+};
+
+export type OrderFormProps = {
+  onSubmit: SubmitHandler<OrderFormValues>;
+  loading: boolean;
 };

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

@@ -0,0 +1,102 @@
+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

@@ -0,0 +1,35 @@
+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

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

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

@@ -5,11 +5,13 @@ import {
   Heading,
   HStack,
   UnorderedList,
-  VStack,
   ListItem,
   Text,
 } from '@chakra-ui/react';
 import { useTranslation } from 'react-i18next';
+import dayjs from 'dayjs';
+import localizedFormat from "dayjs/plugin/localizedFormat";
+dayjs.extend(localizedFormat);
 
 import { Order } from '../../../models/landing';
 import { formatDatetime } from '../../../lib';
@@ -17,18 +19,31 @@ import { carBodySelectOptions } from '../../order-form/form/car-body/helper';
 
 import { OrderStatus } from './status';
 
-type OrderDetailsProps = Order.View;
+type OrderDetailsProps = Pick<
+  Order.View,
+  | 'orderNumber'
+  | 'status'
+  | 'phone'
+  | 'carNumber'
+  | 'carBody'
+  | 'carColor'
+  | 'location'
+  | 'startWashTime'
+  | 'endWashTime'
+  | 'created'
+>;
 
 export const OrderDetails: FC<OrderDetailsProps> = ({
-  id,
+  orderNumber,
   status,
   phone,
   carNumber,
   carBody,
   carColor,
   location,
-  datetimeBegin,
-  datetimeEnd,
+  startWashTime,
+  endWashTime,
+  created
 }) => {
   const { t } = useTranslation('~', {
     keyPrefix: 'dry-wash.order-view.details',
@@ -38,7 +53,7 @@ export const OrderDetails: FC<OrderDetailsProps> = ({
   });
 
   return (
-    <VStack p={4} alignItems='flex-start' gap={4}>
+    <>
       <HStack
         width='full'
         flexWrap='wrap'
@@ -46,7 +61,7 @@ export const OrderDetails: FC<OrderDetailsProps> = ({
         gap={2}
       >
         <Heading as='h2' size='lg'>
-          {t('title', { number: id })}
+          {t('title', { number: orderNumber })} ({dayjs(created).format('LLLL')})
         </Heading>
         <OrderStatus value={status} />
       </HStack>
@@ -75,8 +90,8 @@ export const OrderDetails: FC<OrderDetailsProps> = ({
           {
             label: t('datetime-range'),
             value: [
-              formatDatetime(datetimeBegin),
-              formatDatetime(datetimeEnd),
+              formatDatetime(startWashTime),
+              formatDatetime(endWashTime),
             ].join(' - '),
           },
         ].map(({ label, value }, i) => (
@@ -92,7 +107,7 @@ export const OrderDetails: FC<OrderDetailsProps> = ({
         <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: 'yellow',
+        colorScheme: 'orange',
         children: t('working'),
       };
     case 'complete':

src/containers/LandingThemeProvider/LandingThemeProvider.tsx

@@ -1,14 +1,31 @@
-import React, { FC, PropsWithChildren } from 'react';
+import React, { ComponentType, FC, PropsWithChildren } from 'react';
 import { ChakraProvider } from '@chakra-ui/react';
 
 import { default as landingTheme } from './theme-config';
 import Fonts from './Fonts';
+import { toastOptions } from './toast-options';
 
 export const LandingThemeProvider: FC<PropsWithChildren> = ({ children }) => {
   return (
-    <ChakraProvider theme={landingTheme}>
+    <ChakraProvider theme={landingTheme} toastOptions={toastOptions}>
       <Fonts />
       {children}
     </ChakraProvider>
   );
 };
+
+export function withLandingThemeProvider<T extends JSX.IntrinsicAttributes>(WrappedComponent: ComponentType<T>) {
+  const displayName = WrappedComponent.displayName || WrappedComponent.name || 'Component';
+
+  const ComponentWithLandingThemeProvider = (props: T) => {
+    return (
+      <LandingThemeProvider>
+        <WrappedComponent {...props} />
+      </LandingThemeProvider>
+    );
+  };
+
+  ComponentWithLandingThemeProvider.displayName = `withLandingThemeProvider(${displayName})`;
+
+  return ComponentWithLandingThemeProvider;
+}

src/containers/LandingThemeProvider/index.ts

@@ -1 +1 @@
-export { LandingThemeProvider } from './LandingThemeProvider';
+export { LandingThemeProvider, withLandingThemeProvider } from './LandingThemeProvider';