README.md

@@ -45,12 +45,10 @@
 ### MVP1
 
 **1. Landing**
-
 - преимущества сервиса
   - оставить заявку (редирект на Страницу оформления заказа)
 
 **2. Страница для оформления заказа**
-
 - форма
   - номер машины (mask input)
   - цвет машины
@@ -60,12 +58,10 @@
 - после заполнения редирект на страницу с деталями заказа
 
 **3. Страница с деталями заказа**
-
 - описание заказа
 - детали заказа (id, статус)
 
 **3. АРМ оператора**
-
 - список заказов (RUD)
   - id заказа
   - статус заказа (готово / не готово)
@@ -76,6 +72,7 @@
   - кнопка "Добавить"
   - кнопка "Удалить"
 
+
 ### Built With
 
 [![React][React.js]][React-url]
@@ -106,14 +103,6 @@
 
 <p align="right">(<a href="#readme-top">back to top</a>)</p>
 
-## Instructions
-### Stubs types generation
-1. generate types with json-literal-typer (should be installed globally)
-   ```sh
-   npx json-literal-typer -i <path to json> -o <path to output ts-file>
-   ```
-2. export default type from output file
-
 <!-- PARTICIPANTS -->
 
 ## Participants

__mocks__/file-mock.ts

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

babel.config.js

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

bro.config.js

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

eslint.config.mjs

@@ -1,52 +1,39 @@
-import globals from 'globals';
+import globals from "globals";
-import pluginJs from '@eslint/js';
+import pluginJs from "@eslint/js";
-import tseslint from 'typescript-eslint';
+import tseslint from "typescript-eslint";
-import pluginReact from 'eslint-plugin-react';
+import pluginReact from "eslint-plugin-react";
 import stylistic from '@stylistic/eslint-plugin';
-import pluginImport from 'eslint-plugin-import';
 
 export default [
-  { files: ['**/*.{js,mjs,cjs,ts,jsx,tsx}'] },
+  { files: ["**/*.{js,mjs,cjs,ts,jsx,tsx}"] },
-
   { languageOptions: { globals: globals.browser } },
   pluginJs.configs.recommended,
   ...tseslint.configs.recommended,
   pluginReact.configs.flat.recommended,
   {
     plugins: {
-      '@stylistic': stylistic,
+      '@stylistic': stylistic
-      import: pluginImport,
     },
-    rules: {
+    "rules": {
-      'no-unused-vars': 'off',
+      "no-unused-vars": "off",
-      '@typescript-eslint/no-unused-vars': [
+      "@typescript-eslint/no-unused-vars": [
-        'warn', // or "error"
+        "warn", // or "error"
         {
-          argsIgnorePattern: '^_',
+          "argsIgnorePattern": "^_",
-          varsIgnorePattern: '^_',
+          "varsIgnorePattern": "^_",
-          caughtErrorsIgnorePattern: '^_',
+          "caughtErrorsIgnorePattern": "^_"
-        },
+        }
       ],
-      'sort-imports': ['off'],
+      "sort-imports": ["error", {
-      'import/order': [
+        "ignoreCase": false,
-        'error',
+        "ignoreDeclarationSort": true,
-        {
+        "ignoreMemberSort": true,
-          groups: [
+        "memberSyntaxSortOrder": ["none", "all", "multiple", "single"],
-            'builtin',
+        "allowSeparatedGroups": true
-            'external',
+      }],
-            'internal',
+      semi: ["error", "always"],
-            'parent',
-            ['sibling', 'index'],
-          ],
-          'newlines-between': 'always',
-        },
-      ],
-      semi: ['error', 'always'],
       '@stylistic/indent': ['error', 2],
-      'react/prop-types': 'off',
+      'react/prop-types': 'off'
-    },
-  },
-  {
-    ignores: ['babel.config.js'],
     },
+  }
 ];

jest-preset-it/jest-preset.ts

@@ -1,17 +0,0 @@
-module.exports = {
-  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',
-  },
-  testEnvironmentOptions: {
-    customExportConditions: [''],
-  },
-  testEnvironment: 'jest-fixed-jsdom',
-};

locales/en.json

@@ -1,108 +0,0 @@
-{
-  "dry-wash.landing.benefits-section.description": "Discover the benefits of our car dry cleaning services",
-  "dry-wash.landing.benefits-section.heading": "Advantages of an eco-friendly car wash",
-  "dry-wash.landing.benefits-section.list.0": "Environmentally friendly products",
-  "dry-wash.landing.benefits-section.list.1": "Fast and efficient service",
-  "dry-wash.landing.benefits-section.list.2": "Convenient mobile access",
-  "dry-wash.landing.benefits-section.list.3": "Reliable and trustworthy",
-  "dry-wash.landing.footer.copyright": "\u00A9 {{currentYear}} DryMaster. All rights reserved",
-  "dry-wash.landing.footer.links.faq": "FAQ",
-  "dry-wash.landing.footer.links.privacy-policy": "Privacy policy",
-  "dry-wash.landing.footer.links.service-terms": "Terms of service",
-  "dry-wash.landing.hero-section.description": "Experience the ultimate convenience of a dry car wash, designed for a cleaner planet.",
-  "dry-wash.landing.hero-section.headline": "Revitalize Your Ride with Eco-Friendly Care!",
-  "dry-wash.landing.make-order-button": "Make order",
-  "dry-wash.landing.site-logo": "The logo of the \"Dry Master\" company",
-  "dry-wash.landing.social-proof-section.heading": "We are being chosen",
-  "dry-wash.order-create.title": "Order a car wash",
-  "dry-wash.order-create.form.field.validation.required": "This field is required",
-  "dry-wash.order-create.form.phone-field.label": "Phone number",
-  "dry-wash.order-create.form.phone-field.invalid": "Enter the valid phone number",
-  "dry-wash.order-create.form.car-number-field.label": "Car number",
-  "dry-wash.order-create.form.car-number-field.invalid": "Enter the valid vehicle number",
-  "dry-wash.order-create.form.car-color-field.label": "The color of the car",
-  "dry-wash.order-create.form.car-body-field.label": "Car body type",
-  "dry-wash.order-create.form.washing-datetime-field.label": "What time is the car available?",
-  "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-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",
-  "dry-wash.order-create.car-body-select.options.crossover" : "Crossover",
-  "dry-wash.order-create.car-body-select.options.suv" : "Sport utility vehicle",
-  "dry-wash.order-create.car-body-select.options.station-wagon" : "Station wagon",
-  "dry-wash.order-create.car-body-select.options.coupe" : "Coupe",
-  "dry-wash.order-create.car-body-select.options.minivan" : "Minivan",
-  "dry-wash.order-create.car-body-select.options.pickup" : "Pickup",
-  "dry-wash.order-create.car-body-select.options.liftback" : "Liftback",
-  "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.create-order-query.success.title": "The order is successfully created",
-  "dry-wash.order-create.create-order-query.error.title": "Failed to create an order",
-  "dry-wash.order-view.title": "Your order",
-  "dry-wash.order-view.get-order-query.error.title": "Failed to fetch the details of order",
-  "dry-wash.order-view.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.arm.master.add": "Add",
-  "dry-wash.arm.order.title": "Orders",
-  "dry-wash.arm.order.table.empty": "Table empty",
-  "dry-wash.arm.order.error.title": "Error loading data",
-  "dry-wash.arm.order.status.progress": "In Progress",
-  "dry-wash.arm.order.status.complete": "Completed",
-  "dry-wash.arm.order.status.pending": "Pending",
-  "dry-wash.arm.order.status.working": "Working",
-  "dry-wash.arm.order.status.canceled": "Canceled",
-  "dry-wash.arm.order.status.placeholder": "Select status",
-  "dry-wash.arm.order.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",
-  "dry-wash.arm.order.table.header.status": "Status",
-  "dry-wash.arm.order.table.header.masters": "Master",
-  "dry-wash.arm.order.table.header.telephone": "Telephone",
-  "dry-wash.arm.order.table.header.location": "Location",
-  "dry-wash.arm.master.title": "Masters",
-  "dry-wash.arm.master.table.header.name": "Name",
-  "dry-wash.arm.master.table.empty": "Table empty",
-  "dry-wash.arm.master.error.title": "Error loading data",
-  "dry-wash.arm.master.table.header.currentJob": "Current Job",
-  "dry-wash.arm.master.table.header.phone": "Phone",
-  "dry-wash.arm.master.table.header.actions": "Actions",
-  "dry-wash.arm.master.table.actionsMenu.delete": "Delete Master",
-  "dry-wash.arm.master.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",
-  "dry-wash.arm.master.drawer.inputPhone.label": "Phone Number",
-  "dry-wash.arm.master.drawer.inputPhone.placeholder": "Enter Phone Number",
-  "dry-wash.arm.master.drawer.button.save": "Save",
-  "dry-wash.arm.master.drawer.button.cancel": "Cancel",
-  "dry-wash.arm.master.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",
-  "dry-wash.notFound.title": "Page Not Found",
-  "dry-wash.notFound.description": "Unfortunately, the page you are looking for does not exist.",
-  "dry-wash.notFound.button.back": "Back to Home",
-  "dry-wash.errorBoundary.title": "Something went wrong",
-  "dry-wash.errorBoundary.description": "We are already working on fixing the issue",
-  "dry-wash.errorBoundary.button.reload": "Reload Page",
-  "dry-wash.washTime.timeSlot": "{{start}} - {{end}}"
-}

locales/ru.json

@@ -3,32 +3,22 @@
   "dry-wash.arm.order.title": "Заказы",
   "dry-wash.arm.order.status.progress": "Выполняется",
   "dry-wash.arm.order.status.complete": "Завершено",
-  "dry-wash.arm.order.status.pending": "В ожидании",
+  "dry-wash.arm.order.status.pending": "в ожидании",
   "dry-wash.arm.order.status.working": "В работе",
   "dry-wash.arm.order.status.canceled": "Отменено",
   "dry-wash.arm.order.status.placeholder": "Выберите статус",
-  "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": "Дата заказа",
   "dry-wash.arm.order.table.header.status": "Статус",
-  "dry-wash.arm.order.table.header.masters": "Мастер",
   "dry-wash.arm.order.table.header.telephone": "Телефон",
   "dry-wash.arm.order.table.header.location": "Расположение",
-  "dry-wash.arm.order.table.empty": "Список пуст",
-  "dry-wash.arm.order.error.title": "Ошибка при загрузке данных",
   "dry-wash.arm.master.title": "Мастера",
-  "dry-wash.arm.master.table.empty": "Список пуст",
-  "dry-wash.arm.master.error.title": "Ошибка при загрузке данных",
   "dry-wash.arm.master.table.header.name": "Имя",
   "dry-wash.arm.master.table.header.currentJob": "Актуальная занятость",
   "dry-wash.arm.master.table.header.phone": "Телефон",
   "dry-wash.arm.master.table.header.actions": "Действия",
   "dry-wash.arm.master.table.actionsMenu.delete": "Удалить мастера",
-  "dry-wash.arm.master.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.drawer.title": "Добавить нового мастера",
   "dry-wash.arm.master.drawer.inputName.label": "ФИО",
   "dry-wash.arm.master.drawer.inputName.placeholder": "Введите ФИО",
@@ -36,73 +26,13 @@
   "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.sideBar.title": " Сухой мастер",
-  "dry-wash.arm.master.drawer.toast.error.empty-fields": "Поля не могут быть пустыми",
+  "dry-wash.arm.master.sideBar.title.master": "Мастера",
-  "dry-wash.arm.master.drawer.toast.error.base": "Ошибка",
+  "dry-wash.arm.master.sideBar.title.orders": "Заказы",
-  "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": "Сухой мастер",
-  "dry-wash.landing.benefits-section.description": "Откройте для себя преимущества наших услуг по химчистке автомобилей",
-  "dry-wash.landing.benefits-section.heading": "Преимущества экологичной автомойки",
-  "dry-wash.landing.benefits-section.list.0": "Экологически безопасные продукты",
-  "dry-wash.landing.benefits-section.list.1": "Быстрое и эффективное обслуживание",
-  "dry-wash.landing.benefits-section.list.2": "Удобный мобильный доступ",
-  "dry-wash.landing.benefits-section.list.3": "Надежный и заслуживающий доверия",
-  "dry-wash.landing.footer.copyright": "\u00A9 {{currentYear}} DryMaster. Все права защищены",
-  "dry-wash.landing.footer.links.faq": "FAQ",
-  "dry-wash.landing.footer.links.privacy-policy": "Политика конфиденциальности",
-  "dry-wash.landing.footer.links.service-terms": "Условия обслуживания",
-  "dry-wash.landing.hero-section.description": "Ощутите максимальное удобство сухой мойки автомобилей, созданной для того, чтобы планета стала чище",
-  "dry-wash.landing.hero-section.headline": "Оживите свою поездку с помощью экологически чистого ухода!",
-  "dry-wash.landing.make-order-button": "Сделать заказ",
-  "dry-wash.landing.site-logo": "Логотип компании \u00ABDry Master\u00BB",
-  "dry-wash.landing.social-proof-section.heading": "Нас выбирают",
-  "dry-wash.order-create.title": "Заказать мойку",
-  "dry-wash.order-create.form.field.validation.required": "Это поле обязательно для заполнения",
-  "dry-wash.order-create.form.phone-field.label": "Номер телефона",
-  "dry-wash.order-create.form.phone-field.invalid": "Введите корректный номер телефона",
-  "dry-wash.order-create.form.car-number-field.label": "Номер автомобиля",
-  "dry-wash.order-create.form.car-number-field.invalid": "Введите корректный номер автомобиля",
-  "dry-wash.order-create.form.car-color-field.label": "Цвет автомобиля",
-  "dry-wash.order-create.form.car-body-field.label": "Тип кузова автомобиля",
-  "dry-wash.order-create.form.washing-datetime-field.label": "В какое время автомобиль доступен?",
-  "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-body-select.placeholder": "Не указан",
-  "dry-wash.order-create.car-body-select.options.sedan": "Седан",
-  "dry-wash.order-create.car-body-select.options.hatchback": "Хэтчбек",
-  "dry-wash.order-create.car-body-select.options.crossover": "Кроссовер",
-  "dry-wash.order-create.car-body-select.options.suv": "Внедорожник",
-  "dry-wash.order-create.car-body-select.options.station-wagon": "Универсал",
-  "dry-wash.order-create.car-body-select.options.coupe": "Купе",
-  "dry-wash.order-create.car-body-select.options.minivan": "Минивэн",
-  "dry-wash.order-create.car-body-select.options.pickup": "Пикап",
-  "dry-wash.order-create.car-body-select.options.liftback": "Лифтбек",
-  "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.create-order-query.success.title": "Заказ успешно создан",
-  "dry-wash.order-create.create-order-query.error.title": "Не удалось создать заказ",
-  "dry-wash.order-view.title": "Ваш заказ",
-  "dry-wash.order-view.get-order-query.error.title": "Не удалось загрузить детали заказа",
-  "dry-wash.order-view.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.notFound.title": "Страница не найдена",
   "dry-wash.notFound.description": "К сожалению, запрашиваемая вами страница не существует.",
-  "dry-wash.notFound.button.back": "Вернуться на главную",
+  "dry-wash.notFound.button.back": " Вернуться на главную",
-  "dry-wash.errorBoundary.title": "Что-то пошло не так",
+  "dry-wash.errorBoundary.title":"Что-то пошло не так",
-  "dry-wash.errorBoundary.description": "Мы уже работаем над исправлением проблемы",
+  "dry-wash.errorBoundary.description": " Мы уже работаем над исправлением проблемы",
-  "dry-wash.errorBoundary.button.reload": "Перезагрузить страницу",
+  "dry-wash.errorBoundary.button.reload": "Перезагрузить страницу"
-  "dry-wash.washTime.timeSlot": "{{start}} - {{end}}"
 }

package.json

@@ -1,10 +1,10 @@
 {
     "name": "dry-wash",
-    "version": "0.5.0",
+    "version": "0.0.0",
     "description": "<a id=\"readme-top\"></a>",
     "main": "./src/index.tsx",
     "scripts": {
-        "test": "jest -u",
+        "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",
@@ -17,56 +17,30 @@
     "author": "",
     "license": "ISC",
     "dependencies": {
-        "@brojs/cli": "^1.8.4",
+        "@brojs/cli": "^1.6.1",
-        "@babel/core": "^7.26.7",
-        "@babel/preset-env": "^7.26.7",
-        "@babel/preset-react": "^7.26.3",
-        "@babel/preset-typescript": "^7.26.0",
         "@chakra-ui/icons": "^2.2.4",
-        "@chakra-ui/react": "^2.10.5",
+        "@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",
-        "@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-router-dom": "^6.27.0"
-        "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",
         "@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": "^5.7.3",
         "typescript-eslint": "^8.12.2"
-    },
-    "jest": {
-        "preset": "./jest-preset-it/jest-preset.ts"
     }
 }

src/__data__/features.ts

@@ -1,15 +0,0 @@
-import { getFeatures } from "@brojs/cli";
-
-const features = getFeatures('dry-wash-pl');
-
-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;
-      }
-    }
-  }
-};

src/__data__/service/api.ts

@@ -1,27 +0,0 @@
-import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query/react';
-import { getConfigValue } from '@brojs/cli';
-
-import { Master } from '../../models/api/master';
-
-import { extractBodyFromResponse } from './utils';
-
-export const api = createApi({
-  reducerPath: 'api',
-  baseQuery: fetchBaseQuery({ baseUrl: getConfigValue('dry-wash.api') }),
-  tagTypes: ['Masters'],
-  endpoints: (builder) => ({
-    getMasters: builder.query<Master[], void>({
-      query: () => ({ url: '/arm/masters' }),
-      transformResponse: extractBodyFromResponse<Master[]>,
-      providesTags: ['Masters'],
-    }),
-    addMaster: builder.mutation<void, Pick<Master, 'name' | 'phone'>>({
-      query: (master) => ({
-        url: '/arm/masters',
-        method: 'POST',
-        body: master,
-      }),
-      invalidatesTags: ['Masters'],
-    }),
-  }),
-});

src/__data__/service/landing.api.ts

@@ -1,14 +0,0 @@
-import { GetOrder } from "../../models/api";
-
-import { api } from "./api";
-import { extractBodyFromResponse, extractErrorMessageFromResponse } from "./utils";
-
-export const landingApi = api.injectEndpoints({
-  endpoints: ({ query }) => ({
-    getOrder: query<GetOrder.Response, GetOrder.Params>({
-      query: ({ orderId }) => `/order/${orderId}`,
-      transformResponse: extractBodyFromResponse<GetOrder.Response>,
-      transformErrorResponse: extractErrorMessageFromResponse,
-    })
-  })
-});

src/__data__/service/utils.ts

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

src/__data__/store.ts

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

src/__data__/urls.ts

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

src/api/arm.ts

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

src/api/index.ts

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

src/api/landing.tsx

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

src/api/types.ts

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

src/app.tsx

@@ -1,15 +1,11 @@
 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 { ChakraProvider, theme as chakraTheme } from '@chakra-ui/react';
 import ErrorBoundary from './components/ErrorBoundary';
-import { store } from './__data__/store';
 
 const App = () => {
   return (
-    <Provider store={store}>
     <ChakraProvider theme={chakraTheme}>
       <ErrorBoundary>
         <BrowserRouter>
@@ -17,7 +13,6 @@ const App = () => {
         </BrowserRouter>
       </ErrorBoundary>
     </ChakraProvider>
-    </Provider>
   );
 };
 

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

@@ -1,11 +0,0 @@
-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,2 +1 @@
-export * from './car-body-type';
 export { default as DemoVideoPosterImg } from './demo-video-poster.webp';

src/components/DateNavigator/DateNavigator.tsx

@@ -1,31 +0,0 @@
-import React from 'react';
-import { Box, Button, Text } from '@chakra-ui/react';
-import { ArrowBackIcon, ArrowForwardIcon } from '@chakra-ui/icons';
-
-interface DateNavigatorProps {
-  currentDate: Date;
-  onPreviousDate: () => void;
-  onNextDate: () => void;
-}
-
-const DateNavigator = ({
-  currentDate,
-  onPreviousDate,
-  onNextDate,
-}: DateNavigatorProps) => {
-  return (
-    <Box display='flex' alignItems='center' justifyContent='flex-start' mb='5'>
-      <Button onClick={onPreviousDate}>
-        <ArrowBackIcon />
-      </Button>
-      <Text mx='4' fontSize='lg' fontWeight='bold'>
-        {currentDate.toLocaleDateString()}
-      </Text>
-      <Button onClick={onNextDate}>
-        <ArrowForwardIcon />
-      </Button>
-    </Box>
-  );
-};
-
-export default DateNavigator;

src/components/DateNavigator/index.ts

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

src/components/Editable/Editable.tsx

@@ -1,119 +0,0 @@
-import React, { useState } from 'react';
-import {
-  Editable,
-  EditableInput,
-  EditablePreview,
-  Flex,
-  IconButton,
-  Input,
-  useEditableControls,
-  ButtonGroup,
-  Stack,
-  useToast,
-} from '@chakra-ui/react';
-import { CheckIcon, CloseIcon, EditIcon } from '@chakra-ui/icons';
-import { useTranslation } from 'react-i18next';
-
-interface EditableWrapperProps {
-  value: string;
-  onSubmit: ({
-    id,
-    name,
-    phone,
-  }: {
-    id: string;
-    name?: string;
-    phone?: string;
-  }) => Promise<unknown>;
-  as: 'phone' | 'name';
-  id: string;
-}
-
-const EditableWrapper = ({ value, onSubmit, as, id }: EditableWrapperProps) => {
-  const { t } = useTranslation('~', {
-    keyPrefix: 'dry-wash.arm.master.editable',
-  });
-
-  const toast = useToast();
-  const [currentValue, setCurrentValue] = useState<string>(value);
-
-  const handleSubmit = async (newValue: string) => {
-    if (currentValue === newValue) return;
-
-    try {
-      await onSubmit({ id, [as]: newValue });
-
-      setCurrentValue(newValue);
-
-      toast({
-        title: 'Успешно!',
-        description: 'Данные обновлены.',
-        status: 'success',
-        duration: 2000,
-        isClosable: true,
-        position: 'top-right',
-      });
-    } catch (error) {
-      toast({
-        title: 'Ошибка!',
-        description: 'Не удалось обновить данные.',
-        status: 'error',
-        duration: 2000,
-        isClosable: true,
-        position: 'top-right',
-      });
-      console.error('Ошибка при обновлении данных:', error);
-    }
-  };
-
-  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

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

src/components/LayoutArm/LayoutArm.tsx

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

src/components/MasterActionsMenu/MasterActionsMenu.tsx

@@ -5,54 +5,18 @@ import {
   MenuList,
   MenuItem,
   IconButton,
-  useToast,
 } from '@chakra-ui/react';
 import { EditIcon } from '@chakra-ui/icons';
-import { useTranslation } from 'react-i18next';
+import i18next from 'i18next';
-
-import { armService } from '../../api/arm';
-
-interface MasterActionsMenu {
-  id: string;
-}
-
-const MasterActionsMenu = ({ id }: MasterActionsMenu) => {
-  const { t } = useTranslation('~', {
-    keyPrefix: 'dry-wash.arm.master.table.actionsMenu',
-  });
-
-  const { deleteMaster } = armService();
-  const toast = useToast();
-
-  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',
-      });
-      console.error(error);
-    }
-  };
 
+const MasterActionsMenu = () => {
   return (
     <Menu>
       <MenuButton icon={<EditIcon />} as={IconButton} variant='outline' />
       <MenuList>
-        <MenuItem onClick={handleClickDelete}>{t('delete')}</MenuItem>
+        <MenuItem>
+          {i18next.t('dry-wash.arm.master.table.actionsMenu.delete')}
+        </MenuItem>
       </MenuList>
     </Menu>
   );

src/components/MasterDrawer/MasterDrawer.tsx

@@ -1,5 +1,4 @@
-import React, { useEffect } from 'react';
+import React, { useState } from 'react';
-import { useForm, SubmitHandler } from 'react-hook-form';
 import {
   Button,
   FormControl,
@@ -12,139 +11,64 @@ import {
   DrawerFooter,
   DrawerHeader,
   DrawerOverlay,
-  useToast,
-  InputGroup,
-  InputLeftElement,
-  FormErrorMessage,
 } from '@chakra-ui/react';
-import { useTranslation } from 'react-i18next';
+import i18next from 'i18next';
-import { PhoneIcon } from '@chakra-ui/icons';
 
-import { api } from '../../__data__/service/api';
+const MasterDrawer = ({ isOpen, onClose }) => {
-import showToast from '../../helpers/showToast';
+  const [newMaster, setNewMaster] = useState({ name: '', phone: '' });
-import { DrawerInputs } from '../../models/arm/form';
 
-interface MasterDrawerProps {
+  const handleSave = () => {
-  isOpen: boolean;
+    console.log(`Сохранение мастера: ${newMaster}`);
-  onClose: () => void;
-}
-
-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({
-        toast,
-        title: t('toast.error.base'),
-        description: t('toast.error.empty-fields'),
-        status: 'error',
-      });
-      return;
-    }
-
-    await addMaster(trimMaster);
-  };
-
-  const [addMaster, { error, isSuccess }] = api.useAddMasterMutation();
-  const toast = useToast();
-
-  useEffect(() => {
-    if (isSuccess) {
-      showToast({
-        toast,
-        title: t('toast.create-master'),
-        status: 'success',
-      });
-      reset();
     onClose();
-    }
+  };
-  }, [isSuccess]);
-
-  useEffect(() => {
-    if (error) {
-      showToast({
-        toast,
-        title: t('toast.error.create-master'),
-        description: t('toast.error.create-master-details'),
-        status: 'error',
-      });
-      console.error(error);
-    }
-  }, [error]);
 
   return (
     <Drawer isOpen={isOpen} onClose={onClose} size='md'>
       <DrawerOverlay />
       <DrawerContent>
-        <form onSubmit={handleSubmit(onSubmit)}>
         <DrawerCloseButton />
-          <DrawerHeader>{t('title')}</DrawerHeader>
+        <DrawerHeader>
+          {i18next.t('dry-wash.arm.master.drawer.title')}
+        </DrawerHeader>
         <DrawerBody>
-            <FormControl mb='4' isInvalid={!!errors.name}>
+          <FormControl mb='4'>
-              <FormLabel>{t('inputName.label')}</FormLabel>
+            <FormLabel>
+              {i18next.t('dry-wash.arm.master.drawer.inputName.label')}
+            </FormLabel>
             <Input
-                {...register('name', {
+              value={newMaster.name}
-                  required: t('form.name.required'),
+              onChange={(e) =>
-                  minLength: {
+                setNewMaster({ ...newMaster, name: e.target.value })
-                    value: 2,
+              }
-                    message: t('form.name.minLength'),
+              placeholder={i18next.t(
-                  },
+                'dry-wash.arm.master.drawer.inputName.placeholder',
-                })}
+              )}
-                placeholder={t('inputName.placeholder')}
             />
-              <FormErrorMessage>
-                {errors.name && errors.name.message}
-              </FormErrorMessage>
           </FormControl>
-            <FormControl isInvalid={!!errors.phone}>
+          <FormControl>
-              <FormLabel>{t('inputPhone.label')}</FormLabel>
+            <FormLabel>
-              <InputGroup>
+              {' '}
-                <InputLeftElement pointerEvents='none'>
+              {i18next.t('dry-wash.arm.master.drawer.inputPhone.label')}
-                  <PhoneIcon color='gray.300' />
+            </FormLabel>
-                </InputLeftElement>
             <Input
-                  {...register('phone', {
+              value={newMaster.phone}
-                    required: t('form.phone.required'),
+              onChange={(e) =>
-                    pattern: {
+                setNewMaster({ ...newMaster, phone: e.target.value })
-                      value: /^(\+7|8)\d{10}$/,
+              }
-                      message: t('form.phone.pattern'),
+              placeholder={i18next.t(
-                    },
+                'dry-wash.arm.master.drawer.inputPhone.placeholder',
-                    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'>
+          <Button colorScheme='teal' mr={3} onClick={handleSave}>
-              {t('button.save')}
+            {i18next.t('dry-wash.arm.master.drawer.button.save')}
           </Button>
           <Button variant='ghost' onClick={onClose}>
-              {t('button.cancel')}
+            {i18next.t('dry-wash.arm.master.drawer.button.cancel')}
           </Button>
         </DrawerFooter>
-        </form>
       </DrawerContent>
     </Drawer>
   );

src/components/MasterItem/MasterItem.tsx

@@ -1,51 +1,25 @@
 import React from 'react';
-import { Badge, Stack, Td, Tr, Text } from '@chakra-ui/react';
+import { Badge, Link, Stack, Td, Tr } from '@chakra-ui/react';
-import { useTranslation } from 'react-i18next';
-
 import MasterActionsMenu from '../MasterActionsMenu';
-import { getTimeSlot } from '../../lib';
-import EditableWrapper from '../Editable/Editable';
-import { armService } from '../../api/arm';
-
-const MasterItem = ({ name, phone, id, schedule }) => {
-  const { updateMaster } = armService();
-  const { t } = useTranslation('~', {
-    keyPrefix: 'dry-wash.arm.master',
-  });
 
+const MasterItem = ({ name, schedule, phone }) => {
   return (
     <Tr>
+      <Td>{name}</Td>
       <Td>
-        <EditableWrapper
-          id={id}
-          as={'name'}
-          value={name}
-          onSubmit={updateMaster}
-        />
-      </Td>
-      <Td>
-        {schedule?.length > 0 ? (
         <Stack direction='row'>
-            {schedule?.map(({ startWashTime, endWashTime }, index: number) => (
+          {schedule.map((time, index) => (
             <Badge colorScheme={'green'} key={index}>
-                {getTimeSlot(startWashTime, endWashTime)}
+              {time}
             </Badge>
           ))}
         </Stack>
-        ) : (
-          <Text color='gray.500'>{t('schedule.empty')}</Text>
-        )}
       </Td>
       <Td>
-        <EditableWrapper
+        <Link href='tel:'>{phone}</Link>
-          id={id}
-          as={'phone'}
-          value={phone}
-          onSubmit={updateMaster}
-        />
       </Td>
       <Td>
-        <MasterActionsMenu id={id} />
+        <MasterActionsMenu />
       </Td>
     </Tr>
   );

src/components/Masters/Masters.tsx

@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import React from 'react';
 import {
   Box,
   Heading,
@@ -10,82 +10,37 @@ import {
   Button,
   useDisclosure,
   Flex,
-  useToast,
-  Td,
-  Text,
-  Spinner,
 } from '@chakra-ui/react';
-import { useTranslation } from 'react-i18next';
+import { mastersData } from '../../mocks';
-
 import MasterItem from '../MasterItem';
 import MasterDrawer from '../MasterDrawer';
-import { api } from '../../__data__/service/api';
+import i18next from 'i18next';
 
-const TABLE_HEADERS = [
+const TABLE_HEADERS = ['name', 'currentJob', 'phone', 'actions'];
-  'name' as const,
-  'currentJob' as const,
-  'phone' as const,
-  'actions' as const,
-];
 
 const Masters = () => {
   const { isOpen, onOpen, onClose } = useDisclosure();
-  const toast = useToast();
-  const { t } = useTranslation('~', {
-    keyPrefix: 'dry-wash.arm.master',
-  });
-
-  const {
-    data: masters,
-    error,
-    isLoading,
-    isSuccess,
-  } = api.useGetMastersQuery();
-
-  useEffect(() => {
-    if (error) {
-      toast({
-        title: t('error.title'),
-        status: 'error',
-        isClosable: true,
-        position: 'bottom-right',
-      });
-    }
-  }, [error]);
 
   return (
     <Box p='8'>
       <Flex justifyContent='space-between' alignItems='center' mb='5'>
-        <Heading size='lg'> {t('title')}</Heading>
+        <Heading size='lg'> {i18next.t('dry-wash.arm.master.title')}</Heading>
         <Button colorScheme='green' onClick={onOpen}>
-          + {t('add')}
+          + {i18next.t('dry-wash.arm.master.add')}
         </Button>
       </Flex>
       <Table variant='simple' colorScheme='blackAlpha'>
         <Thead>
           <Tr>
             {TABLE_HEADERS.map((name) => (
-              <Th key={name}>{t(`table.header.${name}`)}</Th>
+              <Th key={name}>
+                {i18next.t(`dry-wash.arm.master.table.header.${name}`)}
+              </Th>
             ))}
           </Tr>
         </Thead>
         <Tbody>
-          {isLoading && (
+          {mastersData.map((master, index) => (
-            <Tr>
-              <Td colSpan={TABLE_HEADERS.length} textAlign='center' py='8'>
-                <Spinner size='lg' />
-              </Td>
-            </Tr>
-          )}
-          {isSuccess && masters.length === 0 && (
-            <Tr>
-              <Td colSpan={TABLE_HEADERS.length}>
-                <Text>{t('table.empty')}</Text>
-              </Td>
-            </Tr>
-          )}
-          {isSuccess &&
-            masters.map((master, index) => (
             <MasterItem key={index} {...master} />
           ))}
         </Tbody>

src/components/OrderItem/OrderItem.tsx

@@ -1,119 +1,33 @@
-import React, { ChangeEvent, useState } from 'react';
+import React, { useState } from 'react';
 import { Td, Tr, Link, Select } from '@chakra-ui/react';
-import { useTranslation } from 'react-i18next';
+import i18next from 'i18next';
-import dayjs from 'dayjs';
 
-import { getTimeSlot } from '../../lib';
+const statuses = ['pending', 'progress', 'working', 'canceled', 'complete'];
-import { Master } from '../../models/api/master';
-import { armService } from '../../api/arm';
-
-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: Master;
-  notes: '';
-  allMasters: Master[];
-  id: string;
-};
-
-type Status = (typeof statuses)[number];
-
-const statusColors: Record<Status, string> = {
-  pending: 'yellow.100',
-  progress: 'blue.100',
-  working: 'orange.100',
-  canceled: 'red.100',
-  complete: 'green.100',
-};
 
 const OrderItem = ({
   carNumber,
-  startWashTime,
+  washTime,
-  endWashTime,
   orderDate,
   status,
   phone,
   location,
-  master,
+}) => {
-  allMasters,
-  id,
-}: OrderProps) => {
-  const { updateOrders } = armService();
-
-  const { t } = useTranslation('~', {
-    keyPrefix: 'dry-wash.arm.order',
-  });
-
   const [statusSelect, setStatus] = useState(status);
-  const bgColor = statusColors[statusSelect];
-  const [masterSelect, setMaster] = useState(master?.name);
-
-  const handelChangeMasters = (e: ChangeEvent<HTMLSelectElement>) => {
-    const masterName = e.target.value;
-    const selectedMaster = allMasters.find(
-      (master) => master.name === masterName,
-    );
-
-    if (selectedMaster) {
-      setMaster(masterName);
-      updateOrders({ id, masterId: selectedMaster.id });
-    } else {
-      console.error('Master not found');
-    }
-  };
-
-  const handeChangeStatus = (e: ChangeEvent<HTMLSelectElement>) => {
-    const status = e.target.value;
-    updateOrders({ id, status });
-    setStatus(e.target.value as OrderProps['status']);
-  };
 
   return (
     <Tr>
       <Td>{carNumber}</Td>
-      <Td>
+      <Td>{washTime}</Td>
-        {dayjs(orderDate).format('DD.MM.YYYY')} <br />
+      <Td>{orderDate}</Td>
-        {getTimeSlot(startWashTime, endWashTime)}
-      </Td>
       <Td>
         <Select
           value={statusSelect}
-          onChange={handeChangeStatus}
+          onChange={(e) => setStatus(e.target.value)}
-          placeholder={t(`status.placeholder`)}
+          placeholder={i18next.t(`dry-wash.arm.order.status.placeholder`)}
-          bg={bgColor}
         >
           {statuses.map((status) => (
             <option key={status} value={status}>
-              {t(`status.${status}`)}
+              {i18next.t(`dry-wash.arm.order.status.${status}`)}
-            </option>
-          ))}
-        </Select>
-      </Td>
-      <Td>
-        <Select
-          value={masterSelect}
-          onChange={handelChangeMasters}
-          placeholder={t(`master.placeholder`)}
-        >
-          {allMasters.map((item) => (
-            <option key={item.id} value={item.name}>
-              {item.name}
             </option>
           ))}
         </Select>

src/components/Orders/Orders.tsx

@@ -1,131 +1,35 @@
-import React, { useEffect, useState } from 'react';
+import { Box, Heading, Table, Thead, Tbody, Tr, Th } from '@chakra-ui/react';
-import {
+import React from 'react';
-  Box,
+import { ordersData } from '../../mocks';
-  Heading,
-  Table,
-  Thead,
-  Tbody,
-  Tr,
-  Th,
-  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 i18next from 'i18next';
-import { armService } from '../../api/arm';
-import DateNavigator from '../DateNavigator';
-import { Master } from '../../models/api/master';
-
-const TABLE_HEADERS = [
-  'carNumber' as const,
-  'orderDate' as const,
-  'status' as const,
-  'masters' as const,
-  'telephone' as const,
-  'location' as const,
-];
-
 const Orders = () => {
-  const { t } = useTranslation('~', {
+  const TABLE_HEADERS = [
-    keyPrefix: 'dry-wash.arm.order',
+    'carNumber',
-  });
+    'washingTime',
-
+    'orderDate',
-  const { fetchOrders } = armService();
+    'status',
-  const { fetchMasters } = armService();
+    'telephone',
-
+    'location',
-  const toast = useToast();
+  ];
-
-  const [orders, setOrders] = useState<OrderProps[]>([]);
-  const [allMasters, setAllMasters] = useState<Master[]>([]);
-  const [loading, setLoading] = useState(false);
-  const [error, setError] = useState<string | null>(null);
-  const [currentDate, setCurrentDate] = useState(new Date());
-
-  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]);
-
   return (
     <Box p='8'>
       <Heading size='lg' mb='5'>
-        {t('title')}
+        {i18next.t('dry-wash.arm.order.title')}
       </Heading>
-
-      <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>
             {TABLE_HEADERS.map((name, key) => (
-              <Th key={key}>{t(`table.header.${name}`)}</Th>
+              <Th key={key}>
+                {i18next.t(`dry-wash.arm.order.table.header.${name}`)}
+              </Th>
             ))}
           </Tr>
         </Thead>
         <Tbody>
-          {loading && (
+          {ordersData.map((order, index) => (
-            <Tr>
+            <OrderItem key={index} {...order} />
-              <Td colSpan={TABLE_HEADERS.length} textAlign='center' py='8'>
-                <Spinner size='lg' />
-              </Td>
-            </Tr>
-          )}
-          {!loading && orders.length === 0 && !error && (
-            <Tr>
-              <Td colSpan={TABLE_HEADERS.length}>
-                <Text>{t('table.empty')}</Text>
-              </Td>
-            </Tr>
-          )}
-          {!loading &&
-            !error &&
-            orders.map((order, index) => (
-              <OrderItem
-                allMasters={allMasters}
-                key={index}
-                {...order}
-                status={order.status as OrderProps['status']}
-              />
           ))}
         </Tbody>
       </Table>

src/components/Sidebar/Sidebar.tsx

@@ -1,19 +1,10 @@
-import { Box, Button, Heading, VStack, Divider } from '@chakra-ui/react';
+import { Box, Button, Heading, VStack } from '@chakra-ui/react';
 import React from 'react';
-import { useLocation, Link } from 'react-router-dom';
+import { Divider } from '@chakra-ui/react';
-import { useTranslation } from 'react-i18next';
+import i18next from 'i18next';
+import { Link } from 'react-router-dom';
 
-import { URLs } from '../../__data__/urls';
+const Sidebar = () => (
-
-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'
@@ -23,38 +14,33 @@ const Sidebar = () => {
     pt='8'
   >
     <Heading color='green' size='lg' mb='5'>
-        {t('title')}
+      {i18next.t(`dry-wash.arm.master.sideBar.title`)}
     </Heading>
 
     <VStack align='start' spacing='4'>
       <Divider />
-        {URLs.armOrder.isOn && (
       <Button
         as={Link}
-            to={URLs.armOrder.url}
+        to='orders'
         w='100%'
-            colorScheme={isActive(URLs.armOrder.url) ? 'green' : 'blue'}
+        colorScheme='green'
-            variant={isActive(URLs.armOrder.url) ? 'solid' : 'ghost'}
+        variant='ghost'
       >
-            {t('orders')}
+        {i18next.t(`dry-wash.arm.master.sideBar.title.orders`)}
       </Button>
-        )}
       <Divider />
-        {URLs.armMaster.isOn && (
       <Button
         as={Link}
-            to={URLs.armMaster.url}
+        to='masters'
         w='100%'
-            colorScheme={isActive(URLs.armMaster.url) ? 'green' : 'blue'}
+        colorScheme='green'
-            variant={isActive(URLs.armMaster.url) ? 'solid' : 'ghost'}
+        variant='ghost'
       >
-            {t('master')}
+        {i18next.t(`dry-wash.arm.master.sideBar.title.master`)}
       </Button>
-        )}
       <Divider />
     </VStack>
   </Box>
-  );
+);
-};
 
 export default Sidebar;

src/components/landing/BenefitsSection/BenefitsSection.tsx

@@ -1,29 +1,43 @@
 import React, { FC } from 'react';
-import { useTranslation } from 'react-i18next';
+import {
+  MdEco,
+  MdMiscellaneousServices,
+  MdPlace,
+  MdHandshake,
+} from 'react-icons/md';
 import { Heading, HStack, List, Text, VStack } from '@chakra-ui/react';
-
 import { CtaButton, PageSection } from '../';
-
 import { ListItem } from './ListItem';
-import { BenefitsSectionProps } from './types';
-import { iconsMap } from './helper';
-
-export const BenefitsSection: FC<BenefitsSectionProps> = ({
-  data: { heading, description, list } = {},
-}) => {
-  const { t } = useTranslation('~', { keyPrefix: 'dry-wash.landing' });
 
+export const BenefitsSection: FC = () => {
   return (
     <PageSection>
       <VStack w='full' spacing={2}>
-        <Heading as='h2'>{t(heading)}</Heading>
+        <Heading as='h2'>Преимущества экологичной автомойки</Heading>
-        <Text>{t(description)}</Text>
+        <Text>
+          Откройте для себя преимущества наших услуг по химчистке автомобилей
+        </Text>
       </VStack>
       <List display='flex' flexDirection='column' spacing={3}>
-        {list.map((itemKey, i) => (
+        {[
-          <ListItem key={i} Icon={iconsMap[itemKey]}>
+          {
-            {t(itemKey)}
+            Icon: MdEco,
-          </ListItem>
+            children: 'Экологически безопасные продукты',
+          },
+          {
+            Icon: MdMiscellaneousServices,
+            children: 'Быстрое и эффективное обслуживание',
+          },
+          {
+            Icon: MdPlace,
+            children: 'Удобный мобильный доступ',
+          },
+          {
+            Icon: MdHandshake,
+            children: 'Надежный и заслуживающий доверия',
+          },
+        ].map((props, i) => (
+          <ListItem key={i} {...props} />
         ))}
       </List>
       <HStack w='full' justify='flex-end'>

src/components/landing/BenefitsSection/ListItem/ListItem.tsx

@@ -2,7 +2,7 @@ import React, { FC, PropsWithChildren } from 'react';
 import { ListIcon, ListItem as ChakraListItem } from '@chakra-ui/react';
 import { IconType } from 'react-icons';
 
-export type ListItemProps = PropsWithChildren & {
+type ListItemProps = PropsWithChildren & {
   Icon: IconType;
 };
 

src/components/landing/BenefitsSection/ListItem/index.ts

@@ -1 +1 @@
-export { type ListItemProps, ListItem } from './ListItem';
+export { ListItem } from './ListItem';

src/components/landing/BenefitsSection/helper.ts

@@ -1,13 +0,0 @@
-import { IconType } from "react-icons";
-import { MdEco, MdMiscellaneousServices, MdPlace, MdHandshake } from "react-icons/md";
-
-import { ArrElement } from "../../../lib";
-
-import { BenefitsList } from "./types";
-
-export const iconsMap: Record<ArrElement<BenefitsList>, IconType> = {
-  "benefits-section.list.0": MdEco,
-  "benefits-section.list.1": MdMiscellaneousServices,
-  "benefits-section.list.2": MdPlace,
-  "benefits-section.list.3": MdHandshake,
-};

src/components/landing/BenefitsSection/index.ts

@@ -1,2 +1 @@
-export type { BenefitsSectionProps } from './types';
 export { BenefitsSection } from './BenefitsSection';

src/components/landing/BenefitsSection/types.ts

@@ -1,14 +0,0 @@
-export type BenefitsList = [
-  'benefits-section.list.0',
-  'benefits-section.list.1',
-  'benefits-section.list.2',
-  'benefits-section.list.3',
-];
-
-export type BenefitsSectionProps = {
-  data: {
-    heading: 'benefits-section.heading';
-    description: 'benefits-section.description';
-    list: BenefitsList;
-  };
-};

src/components/landing/CtaButton/CtaButton.tsx

@@ -1,21 +1,11 @@
 import React, { FC } from 'react';
-import { useTranslation } from 'react-i18next';
 import { Link as RouterLink } from 'react-router-dom';
 import { ButtonProps, Button } from '@chakra-ui/react';
 
-import { URLs } from '../../../__data__/urls';
-
 export const CtaButton: FC<ButtonProps> = (props) => {
-  const { t } = useTranslation('~', { keyPrefix: 'dry-wash.landing' });
-
   return (
-    <Button
+    <Button as={RouterLink} to='/dry-wash/order-form' colorScheme='primary' {...props}>
-      as={RouterLink}
+      Сделать заказ
-      to={URLs.orderCreate.getUrl()}
-      colorScheme='primary'
-      {...props}
-    >
-      {t('make-order-button')}
     </Button>
   );
 };

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

@@ -1,11 +1,8 @@
 import React, { FC } from 'react';
-import { useTranslation } from 'react-i18next';
 import { Text } from '@chakra-ui/react';
 
 const currentYear = new Date().getFullYear();
 
 export const Copyright: FC = () => {
-  const { t } = useTranslation();
+  return <Text color='whiteAlpha.500'>&copy; {currentYear} DryMaster. Все права защищены</Text>;
-
-  return <Text color='whiteAlpha.500'>{t('dry-wash.landing.footer.copyright', { currentYear })}</Text>;
 };

src/components/landing/Footer/Footer.tsx

@@ -1,29 +1,20 @@
 import React, { FC } from 'react';
-import { useTranslation } from 'react-i18next';
 import { Link, List, ListItem } from '@chakra-ui/react';
 import { Link as RouterLink } from 'react-router-dom';
-
 import { SiteLogo, PageSection } from '../';
-
 import { Copyright } from './Copyright';
 
 export const Footer: FC = () => {
-  const { t } = useTranslation('~', {
-    keyPrefix: 'dry-wash.landing.footer.links',
-  });
-
-  const listData = [
-    { to: '#', label: t('privacy-policy') },
-    { to: '#', label: t('service-terms') },
-    { to: '#', label: t('faq')  },
-  ];
-
   return (
     <PageSection as='footer' py={5} bg='gray.700' color='white'>
       <SiteLogo />
       <Copyright />
       <List spacing={2}>
-        {listData.map(({ to, label }, i) => (
+        {[
+          { to: '#', label: 'Политика конфиденциальности' },
+          { to: '#', label: 'Условия обслуживания' },
+          { to: '#', label: 'FAQ' },
+        ].map(({ to, label }, i) => (
           <ListItem key={i}>
             <Link as={RouterLink} to={to}>
               {label}

src/components/landing/HeroSection/HeroSection.tsx

@@ -1,23 +1,16 @@
 import React, { FC } from 'react';
-import { useTranslation } from 'react-i18next';
+import { Box, Heading, Text, Center, VStack, BoxProps } from '@chakra-ui/react';
-import { Box, Heading, Text, Center, VStack } from '@chakra-ui/react';
-
 import { DemoVideoPosterImg } from '../../../assets/images';
 import { CtaButton, SiteLogo, PageSection } from '../';
 
-import { HeroSectionProps } from './types';
+type HeroSectionProps = Pick<BoxProps, 'flexShrink'>;
-
-export const HeroSection: FC<HeroSectionProps> = ({
-  data: { headline, description, video } = {},
-  flexShrink,
-}) => {
-  const { t } = useTranslation('~', { keyPrefix: 'dry-wash.landing' });
 
+export const HeroSection: FC<HeroSectionProps> = ({ flexShrink }) => {
   return (
     <Box flexShrink={flexShrink} as='header' pos='relative' zIndex={0}>
       <Box
         as='video'
-        src={`${__webpack_public_path__}/remote-assets/${video}`}
+        src={`${__webpack_public_path__}/remote-assets/demo.mp4`}
         poster={DemoVideoPosterImg}
         autoPlay
         loop
@@ -48,14 +41,15 @@ export const HeroSection: FC<HeroSectionProps> = ({
             color='white'
             __css={{ textWrap: 'balance' }}
           >
-            {t(headline)}
+            Оживите свою поездку с помощью экологически чистого ухода!
           </Heading>
           <Text
             textAlign='center'
             __css={{ textWrap: 'balance' }}
             color='white'
           >
-            {t(description)}
+            Ощутите максимальное удобство сухой мойки автомобилей, созданной для
+            того, чтобы планета стала чище
           </Text>
         </VStack>
         <CtaButton size='lg' />

src/components/landing/HeroSection/types.ts

@@ -1,9 +0,0 @@
-import { BoxProps } from "@chakra-ui/react";
-
-export type HeroSectionProps = {
-  data: {
-    headline: 'hero-section.headline';
-    description: 'hero-section.description';
-    video: string;
-  };
-} & Pick<BoxProps, 'flexShrink'>;

src/components/landing/SiteLogo/SiteLogo.tsx

@@ -1,13 +1,10 @@
 import React, { FC } from 'react';
-import { useTranslation } from 'react-i18next';
 import { Image } from '@chakra-ui/react';
-
 import { LogoSvg } from '../../../assets/icons';
 
 export const SiteLogo: FC = () => {
-  const { t } = useTranslation();
+  return <Image src={LogoSvg} alt='Логотип компании "Сухой мастер"' w={40} />;
-
-  return <Image src={LogoSvg} alt={t('~:dry-wash.landing.site-logo')} w={40} />;
 };
 
+// todo: add i18n for alt
 // todo: replace Image by SVG React component

src/components/landing/SocialProofSection/ReviewsSlider/ReviewsSlider.tsx

@@ -1,5 +1,4 @@
 import React, { FC, useEffect, useState } from 'react';
-import { useTranslation } from 'react-i18next';
 import {
   Tab,
   TabList,
@@ -8,19 +7,13 @@ import {
   Tabs,
   Text,
 } from '@chakra-ui/react';
-
+import { mockReviews } from '../../../../mocks/landing';
-import { mockReview } from '../../../../mocks/landing';
-import { Review } from '../../../../models';
-
 import { ReviewCard } from './ReviewCard';
 
+const reviewsCount = mockReviews.length;
 const SLIDE_CHANGE_INTERVAL = 5000;
 
 export const ReviewsSlider: FC = () => {
-  const { i18n } = useTranslation();
-  const mockReviews: Review.View[] = mockReview.getReviewsByLocale(i18n.language);
-  const reviewsCount = mockReviews.length;
-
   const [activeTab, setActiveTab] = useState(0);
   const [isSlideShowStopped, setIsSlideShowStopped] = useState(false);
 

src/components/landing/SocialProofSection/SocialProofSection.tsx

@@ -1,20 +1,15 @@
 import React, { FC } from 'react';
-import { useTranslation } from 'react-i18next';
+import {
-import { Heading, HStack } from '@chakra-ui/react';
+  Heading,
-
+  HStack,
+} from '@chakra-ui/react';
 import { CtaButton, PageSection } from '../';
-
 import { ReviewsSlider } from './ReviewsSlider';
-import { SocialProofSectionProps } from './types';
-
-export const SocialProofSection: FC<SocialProofSectionProps> = ({
-  data: { heading } = {},
-}) => {
-  const { t } = useTranslation('~', { keyPrefix: 'dry-wash.landing' });
 
+export const SocialProofSection: FC = () => {
   return (
     <PageSection>
-      <Heading as='h2'>{t(heading)}</Heading>
+      <Heading as='h2'>Нас выбирают</Heading>
       <ReviewsSlider />
       <HStack w='full' justify='flex-end'>
         <CtaButton />

src/components/landing/SocialProofSection/index.ts

@@ -1,2 +1 @@
-export type { SocialProofSectionProps } from './types';
 export { SocialProofSection } from './SocialProofSection';

src/components/landing/SocialProofSection/types.ts

@@ -1,5 +0,0 @@
-export type SocialProofSectionProps = {
-  data: {
-    heading: 'social-proof-section.heading';
-  };
-};

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

@@ -1,82 +0,0 @@
-import React, { forwardRef } from 'react';
-import {
-  Input,
-  Box,
-  Popover,
-  PopoverAnchor,
-  PopoverContent,
-  PopoverBody,
-  useRadioGroup,
-  Grid,
-  GridItem,
-  UseRadioGroupProps,
-  useDisclosure,
-} from '@chakra-ui/react';
-import { useTranslation } from 'react-i18next';
-
-import { carBodySelectOptions, getInputValue } from './helper';
-import { CarBodyOption } from './option';
-import { CarBodySelectProps } from './types';
-
-export const CarBodySelect = forwardRef<HTMLInputElement, CarBodySelectProps>(
-  function CarBodySelect(props, ref) {
-    const handleOptionClick: UseRadioGroupProps['onChange'] = (value) => {
-      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-      // @ts-ignore
-      props.onChange(value);
-    };
-
-    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 (
-      <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,87 +0,0 @@
-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";
-
-export const carBodySelectOptions: CarBodySelectOption[] = [
-  {
-    value: Car.BodyStyle.SEDAN,
-    labelTKey: 'sedan',
-    img: SedanImg
-  },
-  {
-    value: Car.BodyStyle.HATCHBACK,
-    labelTKey: 'hatchback',
-    img: HatchbackImg
-  },
-  {
-    value: Car.BodyStyle.CROSSOVER,
-    labelTKey: 'crossover',
-    img: CrossoverImg
-  },
-  {
-    value: Car.BodyStyle.SUV,
-    labelTKey: 'suv',
-    img: SuvImg
-  },
-  {
-    value: Car.BodyStyle.STATION_WAGON,
-    labelTKey: 'station-wagon',
-    img: StationWagonImg
-  },
-  {
-    value: Car.BodyStyle.COUPE,
-    labelTKey: 'coupe',
-    img: CoupeImg
-  },
-  {
-    value: Car.BodyStyle.MINIVAN,
-    labelTKey: 'minivan',
-    img: MinivanImg
-  },
-  {
-    value: Car.BodyStyle.PICKUP,
-    labelTKey: 'pickup',
-    img: PickupImg
-  },
-  {
-    value: Car.BodyStyle.LIFTBACK,
-    labelTKey: 'liftback',
-    img: LiftbackImg
-  },
-  {
-    value: Car.BodyStyle.SPORTS_CAR,
-    labelTKey: 'sports-car',
-    img: SportsCarImg
-  },
-  {
-    value: Car.BodyStyle.OTHER,
-    labelTKey: 'other',
-    img: OtherImg
-  },
-];
-
-export const getInputValue = (value: Car.BodyStyle, t: TFunction<"~", "dry-wash.order-create.car-body-select">): InputProps['value'] => {
-  const { labelTKey } = carBodySelectOptions.find((option) => value === option.value) ?? {};
-
-  if (labelTKey) {
-    return t(`options.${labelTKey}`);
-  }
-
-  return;
-};

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

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

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

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

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

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

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

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

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

@@ -1,24 +0,0 @@
-import { InputProps } from "@chakra-ui/react";
-
-import { Car } from "../../../../models/landing";
-
-export type CarBodySelectOption = {
-  value: Car.BodyStyle;
-  labelTKey:
-  'sedan' |
-  'hatchback' |
-  'crossover' |
-  'suv' |
-  'station-wagon' |
-  'coupe' |
-  'minivan' |
-  'pickup' |
-  '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/helper.ts

@@ -1,34 +0,0 @@
-export const CAR_COLORS: Record<'name' | 'code', string>[] = [
-  {
-    name: 'white',
-    code: '#ffffff'
-  },
-  {
-    name: 'black',
-    code: '#000000'
-  },
-  {
-    name: 'silver',
-    code: '#c0c0c0'
-  },
-  {
-    name: 'gray',
-    code: '#808080'
-  },
-  {
-    name: 'beige-brown',
-    code: '#796745'
-  },
-  {
-    name: 'red',
-    code: '#b90000'
-  },
-  {
-    name: 'blue',
-    code: '#003B62'
-  },
-  {
-    name: 'green',
-    code: '#078d51'
-  },
-];

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

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

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

@@ -1,22 +0,0 @@
-import React, { forwardRef } from 'react';
-import { Input, InputProps } from '@chakra-ui/react';
-
-import { handleInputChange } from './helper';
-
-export const CarNumberInput = forwardRef<HTMLInputElement, InputProps>(
-  function CarNumberInput({ onChange, ...props }, ref) {
-    return (
-      <Input
-        {...props}
-        ref={ref}
-        onChange={(e) => {
-          const formattedValue = handleInputChange(e.target.value);
-          // eslint-disable-next-line @typescript-eslint/ban-ts-comment
-          // @ts-ignore
-          onChange?.(formattedValue);
-        }}
-        maxLength={12}
-      />
-    );
-  },
-);

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

@@ -1,33 +0,0 @@
-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}|$)((?:[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, p4) => [p1, p2, p3, p4].join(' ')).toUpperCase();
-};
-const getWithoutLastChar = (value: string) => value.substring(0, value.length - 1);
-
-export const handleInputChange = (value: string | undefined | null) => {
-  const cleanedValue = cleanValue(value);
-
-  if (!cleanedValue) {
-    return '';
-  }
-
-  if (isValidInput(cleanedValue)) {
-    return formatAsCarNumber(cleanedValue).trim();
-  }
-
-  return getWithoutLastChar(value).trim();
-};
-
-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);
-  return validCarNumberRe.test(cleanedValue);
-};

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

@@ -1,2 +0,0 @@
-export { CarNumberInput } from './car-number-input';
-export { isValidCarNumber } from './helper';

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

@@ -1,12 +0,0 @@
-import React, { forwardRef } from 'react';
-import { Input, InputProps } from '@chakra-ui/react';
-
-export type DateTimeInputProps = InputProps;
-
-export const DateTimeInput = forwardRef<HTMLInputElement, DateTimeInputProps>(
-  function DateTimeInput(props, ref) {
-    return <Input ref={ref} {...props} type='datetime-local' />;
-  },
-);
-
-// todo: apply brand styles to popover

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

@@ -1 +0,0 @@
-export { type DateTimeInputProps, DateTimeInput } from './date-time';

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

@@ -1,35 +0,0 @@
-import React from 'react';
-import { FormControl, FormLabel, FormErrorMessage } from '@chakra-ui/react';
-import { useTranslation } from 'react-i18next';
-
-import { FormControllerFieldProps } from './types';
-
-export const FormControllerField = ({
-  control,
-  name,
-  label,
-  isRequired,
-  rules,
-  errors,
-  Controller
-}: FormControllerFieldProps) => {
-  const { t } = useTranslation('~', {
-    keyPrefix: 'dry-wash.order-create.form.field',
-  });
-  const fieldErrors = errors[name];
-
-  return (
-    <FormControl isRequired={isRequired} isInvalid={!!fieldErrors}>
-      <FormLabel htmlFor={name}>{label}</FormLabel>
-      <Controller
-        control={control}
-        name={name}
-        rules={{
-          required: isRequired && t('validation.required'),
-          ...rules,
-        }}
-      />
-      <FormErrorMessage>{fieldErrors?.message}</FormErrorMessage>
-    </FormControl>
-  );
-};

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

@@ -1,47 +0,0 @@
-import React from 'react';
-import {
-  FormControl,
-  FormLabel,
-  FormErrorMessage,
-  FormHelperText,
-} from '@chakra-ui/react';
-import { Controller } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
-
-import { FormInputFieldProps } from './types';
-
-export const FormInputField = ({
-  control,
-  name,
-  label,
-  isRequired,
-  rules,
-  errors,
-  Input,
-  inputProps,
-  help,
-}: FormInputFieldProps) => {
-  const { t } = useTranslation('~', {
-    keyPrefix: 'dry-wash.order-create.form.field',
-  });
-  const fieldErrors = errors[name];
-
-  return (
-    <FormControl isRequired={label && isRequired} isInvalid={!!fieldErrors}>
-      {label && <FormLabel htmlFor={name}>{label}</FormLabel>}
-      <Controller
-        control={control}
-        name={name}
-        rules={{
-          required: isRequired && t('validation.required'),
-          ...rules,
-        }}
-        render={({ field }) => (
-          <Input variant='filled' {...field} {...inputProps} />
-        )}
-      />
-      <FormErrorMessage>{fieldErrors?.message}</FormErrorMessage>
-      {help && <FormHelperText>{help}</FormHelperText>}
-    </FormControl>
-  );
-};

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

@@ -1,3 +0,0 @@
-export type { FormFieldProps } from './types';
-export { FormInputField } from './form-input-field';
-export { FormControllerField } from './form-controller-field';

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

@@ -1,26 +0,0 @@
-import { ReactElement, ReactNode } from 'react';
-import { ControllerProps, ControllerRenderProps, FieldErrors } from 'react-hook-form';
-import { FormLabelProps, FormControlProps, HelpTextProps, InputProps as ChakraInputProps, SelectProps as ChakraSelectProps } from '@chakra-ui/react';
-
-import { OrderFormValues } from '../types';
-
-export type FormFieldProps<FormValues = OrderFormValues> = {
-  name: ControllerProps<FormValues>['name'] & FormLabelProps['htmlFor'];
-  label?: FormLabelProps['children'];
-  errors: FieldErrors<FormValues>;
-  control: ControllerProps<FormValues>['control'];
-  isRequired?: FormControlProps['isRequired'];
-  rules?: ControllerProps<FormValues>['rules'];
-};
-
-type InputProps<FormValues = OrderFormValues> = Partial<ControllerRenderProps<FormValues> & ChakraInputProps & ChakraSelectProps>;
-
-export type FormInputFieldProps<FormValues = OrderFormValues, Input = (props: InputProps<FormValues>) => ReactNode> = FormFieldProps<FormValues> & {
-  Input: Input;
-  inputProps?: InputProps<FormValues>;
-  help?: HelpTextProps['children'];
-};
-
-export type FormControllerFieldProps<FormValues = OrderFormValues> = FormFieldProps<FormValues> & {
-  Controller: (props: Pick<ControllerProps<FormValues>, 'control' | 'name' | 'rules'>) => ReactElement;
-};

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

@@ -1,30 +0,0 @@
-import { useTranslation } from "react-i18next";
-
-import { FormFieldProps } from "./field";
-import { OrderFormValues } from "./types";
-import { isValidCarNumber } from "./car-number";
-import { isValidPhoneNumber } from "./phone";
-
-export const defaultValues: Partial<OrderFormValues> = {
-  phone: '',
-  carNumber: '',
-  carColor: '',
-  carBody: '',
-  availableDatetimeBegin: '',
-  availableDatetimeEnd: '',
-};
-
-export const useGetValidationRules = () => {
-  const { t } = useTranslation('~', {
-    keyPrefix: 'dry-wash.order-create.form',
-  });
-
-  return {
-    isValidPhoneNumber: {
-      validate: (value: string) => isValidPhoneNumber(value) || t('phone-field.invalid')
-    },
-    isValidCarNumber: {
-      validate: (value: string) => isValidCarNumber(value) || t('car-number-field.invalid')
-    },
-  } satisfies Record<string, FormFieldProps['rules']>;
-};

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

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

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

@@ -1,15 +0,0 @@
-import { Location, StringCoordinates, StringLocation } from "./types";
-
-export const splitLocation = (stringifiedLocation: StringLocation) => {
-  return stringifiedLocation.replace(' ', '~').split('~');
-};
-
-export const stringifyLocation = (location: Location): StringLocation => {
-  const { coordinates, address } = location;
-  const [latitude, longitude] = coordinates;
-  const coordinatesString = `${latitude},${longitude}` satisfies StringCoordinates;
-  return `${coordinatesString} ${address}`;
-};
-
-const locationRe = new RegExp(/^[-0-9]+.[0-9]+,[-0-9]+.[0-9]+ .*/);
-export const isValidLocation = (value: string): value is StringLocation => locationRe.test(value);

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

@@ -1,4 +0,0 @@
-export type { StringLocation } from './types';
-export * from './location-input';
-export * from './map';
-export * from './ymaps';

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

@@ -1,40 +0,0 @@
-import { YMapsApi } from "@pbe/react-yandex-maps/typings/util/typing";
-
-import { Address, Location, StringLocation } from "../types";
-import { splitLocation, stringifyLocation } from "../helper";
-
-export const formatLocation = (location: Location | undefined): StringLocation | '' => {
-  if (!location) {
-    return '';
-  }
-  return stringifyLocation(location);
-};
-
-const coordinatesRe = new RegExp(/^[-0-9]+.[0-9]+,[-0-9]+.[0-9]+/);
-export const extractAddress = (value: string) => value.replace(coordinatesRe, '').trim();
-
-export const getLocationByAddress = async (ymaps: YMapsApi, address: Address): Promise<Location> => {
-  try {
-    const result = await ymaps.geocode(address);
-    const firstGeoObject = result.geoObjects.get(
-      0,
-    ) as unknown as ymaps.IGeoObject<ymaps.IBasePointGeometry>;
-    const [latitude, longitude] = firstGeoObject.geometry.getCoordinates();
-    return { coordinates: [latitude, longitude], address };    
-  } catch (error) {
-    console.error(error);    
-  }
-};
-
-export const isRealLocation = async (ymaps: YMapsApi, stringifiedLocation: StringLocation) => {
-  const [coordinates, address] = splitLocation(stringifiedLocation);
-  try {
-    const result = await ymaps.geocode(coordinates);
-    const firstGeoObject = result.geoObjects.get(0) as ymaps.GeocodeResult;
-    const addressByCoordinates = firstGeoObject.getAddressLine();
-  
-    return address === addressByCoordinates;
-  } catch (error) {
-    console.error(error);
-  }
-};

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

@@ -1 +0,0 @@
-export { LocationInput } from './location-input';

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

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

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

@@ -1,8 +0,0 @@
-import { YMapsApi } from "@pbe/react-yandex-maps/typings/util/typing";
-import { InputProps } from "@chakra-ui/react";
-
-export type LocationInputProps = InputProps & {
-  ymaps?: YMapsApi;
-  value?: string;
-  onChange?: (value: string) => void;
-};

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

@@ -1,10 +0,0 @@
-import { splitLocation } from "../helper";
-import { Coordinate, Location, StringLocation } from "../types";
-
-export const KAZAN_CITY_CENTER: Coordinate[] = [55.797557, 49.107295];
-
-export const parseLocation = (stringifiedLocation: StringLocation): Location => {
-  const [coordinatesStr, address] = splitLocation(stringifiedLocation);
-  const [latitude, longitude] = coordinatesStr.split(',').map(Number);
-  return { coordinates: [latitude, longitude], address };
-};

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

@@ -1 +0,0 @@
-export { MapComponent } from './map';

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

@@ -1,70 +0,0 @@
-import React, { FC, memo, useEffect, useState } from 'react';
-import {
-  Map,
-  Placemark,
-  GeolocationControl,
-  ZoomControl,
-  withYMaps,
-} from '@pbe/react-yandex-maps';
-import { YMapsApi } from '@pbe/react-yandex-maps/typings/util/typing';
-
-import { Coordinate, StringLocation } from '../types';
-import { isValidLocation, stringifyLocation } from '../helper';
-
-import { KAZAN_CITY_CENTER, parseLocation } from './helper';
-
-export const MapComponent: FC<{
-  ymaps?: YMapsApi;
-  selectedLocation: StringLocation | null;
-  onMapClick: (props: StringLocation) => void;
-}> = memo(
-  withYMaps(
-    ({ ymaps, selectedLocation, onMapClick }) => {
-      const [mapCenter, setMapCenter] =
-        useState<Coordinate[]>(KAZAN_CITY_CENTER);
-
-      useEffect(() => {
-        if (isValidLocation(selectedLocation)) {
-          const location = parseLocation(selectedLocation);
-          const { coordinates } = location;
-          setMapCenter(coordinates);
-        }
-      }, [selectedLocation]);
-
-      return (
-        <Map
-          state={{
-            center: mapCenter,
-            zoom:
-              isValidLocation(selectedLocation) &&
-              parseLocation(selectedLocation)?.coordinates
-                ? 17
-                : 10,
-          }}
-          width='100%'
-          onClick={async (e: ymaps.MapEvent) => {
-            try {
-              const coordinates = e.get('coords');
-              const address = await ymaps.geocode(coordinates).then((res) => {
-                const firstGeoObject = res.geoObjects.get(
-                  0,
-                ) as ymaps.GeocodeResult;
-                return firstGeoObject.getAddressLine();
-              });
-              onMapClick(stringifyLocation({ coordinates, address }));
-              setMapCenter(coordinates);
-            } catch (error) {
-              console.error(error);
-            }
-          }}
-        >
-          <GeolocationControl options={{ float: 'left' }} />
-          <ZoomControl />
-          {selectedLocation && <Placemark geometry={mapCenter} />}
-        </Map>
-      );
-    },
-    true,
-    ['geocode'],
-  ),
-);

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

@@ -1,17 +0,0 @@
-export type Address = string;
-
-export type Suggestion = {
-  value: Address;
-  displayName: string;
-};
-
-export type Coordinate = number;
-
-export type Location = {
-  address: Address;
-  coordinates: [Coordinate, Coordinate];
-};
-
-export type StringCoordinates = `${Coordinate},${Coordinate}`;
-
-export type StringLocation = `${StringCoordinates} ${Address}`;

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

@@ -1 +0,0 @@
-export { YMapsProvider } from './ymaps-provider';

src/components/order-form/form/location/ymaps/ymaps-provider.tsx

@@ -1,16 +0,0 @@
-import { YMaps } from '@pbe/react-yandex-maps';
-import React, { PropsWithChildren } from 'react';
-
-export const YMapsProvider = ({ children }: PropsWithChildren) => {
-  return (
-    <YMaps
-      query={{
-        lang: 'ru_RU',
-        apikey: '19cbc387-db9a-4807-a620-5205215db40f',
-        suggest_apikey: '3576e65e-5e75-4ea2-b21c-7f9db112682e',
-      }}
-    >
-      {children}
-    </YMaps>
-  );
-};

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

@@ -1,138 +0,0 @@
-import React from 'react';
-import { useForm } from 'react-hook-form';
-import { useTranslation } from 'react-i18next';
-import { Box, Flex, FormControl, FormLabel, VStack } from '@chakra-ui/react';
-
-import { CarBodySelect } from './car-body';
-import { CarColorInput } from './car-color';
-import { CarNumberInput } from './car-number';
-import { FormInputField, FormControllerField } from './field';
-import { OrderFormProps, OrderFormValues } from './types';
-import { PhoneInput } from './phone';
-import { SubmitButton } from './submit';
-import { defaultValues, useGetValidationRules } from './helper';
-import { DateTimeInput } from './date-time';
-import {
-  LocationInput,
-  MapComponent,
-  StringLocation,
-  YMapsProvider,
-} from './location';
-
-export const OrderForm = ({ onSubmit, loading }: OrderFormProps) => {
-  const {
-    handleSubmit,
-    control,
-    formState: { errors, isSubmitting },
-    watch,
-    setValue,
-  } = useForm<OrderFormValues>({ defaultValues, shouldFocusError: true });
-
-  const { t } = useTranslation('~', {
-    keyPrefix: 'dry-wash.order-create.form',
-  });
-
-  const RULES = useGetValidationRules();
-
-  const [availableDatetimeBegin, availableDatetimeEnd, carLocation] = watch([
-    'availableDatetimeBegin',
-    'availableDatetimeEnd',
-    'carLocation',
-  ]);
-
-  return (
-    <Box p={4} marginInline='auto'>
-      <VStack
-        as='form'
-        noValidate
-        onSubmit={handleSubmit(onSubmit)}
-        align='flex-start'
-        gap={6}
-      >
-        <FormControllerField
-          control={control}
-          name='phone'
-          label={t('phone-field.label')}
-          isRequired
-          rules={RULES.isValidPhoneNumber}
-          errors={errors}
-          Controller={PhoneInput}
-        />
-        <FormInputField
-          control={control}
-          name='carNumber'
-          label={t('car-number-field.label')}
-          isRequired
-          rules={RULES.isValidCarNumber}
-          errors={errors}
-          Input={CarNumberInput}
-        />
-        <FormInputField
-          control={control}
-          name='carColor'
-          label={t('car-color-field.label')}
-          errors={errors}
-          Input={CarColorInput}
-        />
-        <FormInputField
-          control={control}
-          name='carBody'
-          label={t('car-body-field.label')}
-          isRequired
-          errors={errors}
-          Input={CarBodySelect}
-        />
-        <FormControl isRequired>
-          <FormLabel>{t('washing-datetime-field.label')}</FormLabel>
-          <Flex flexWrap='wrap' gap={4}>
-            <Box flex='1 0 100px'>
-              <FormInputField
-                control={control}
-                name='availableDatetimeBegin'
-                isRequired
-                errors={errors}
-                Input={DateTimeInput}
-                inputProps={{
-                  max: availableDatetimeEnd,
-                }}
-              />
-            </Box>
-            <Box flex='1 0 100px'>
-              <FormInputField
-                control={control}
-                name='availableDatetimeEnd'
-                isRequired
-                errors={errors}
-                Input={DateTimeInput}
-                inputProps={{
-                  min: availableDatetimeBegin,
-                }}
-              />
-            </Box>
-          </Flex>
-        </FormControl>
-        <YMapsProvider>
-          <FormInputField
-            control={control}
-            name='carLocation'
-            label={t('washing-location-field.label')}
-            help={t('washing-location-field.help')}
-            isRequired
-            errors={errors}
-            Input={LocationInput}
-          />
-          <MapComponent
-            selectedLocation={carLocation as StringLocation}
-            onMapClick={(location) => {
-              setValue('carLocation', location);
-            }}
-          />
-        </YMapsProvider>
-        <SubmitButton isLoading={isSubmitting || loading} mt={4} />
-      </VStack>
-    </Box>
-  );
-};
-
-// todo: remove layout shift, when a validation message is displayed
-// todo: fix time range available values

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

@@ -1 +0,0 @@
-export { isValidPhoneNumber } from "react-phone-number-input";

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

@@ -1,2 +0,0 @@
-export { PhoneInput } from './phone-input';
-export { isValidPhoneNumber } from './helper';

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

@@ -1,18 +0,0 @@
-import React from 'react';
-import ReactPhoneNumberInput from 'react-phone-number-input/react-hook-form-input';
-import { Input } from '@chakra-ui/react';
-
-import 'react-phone-number-input/style.css';
-
-import { PhoneInputType } from './types';
-
-export const PhoneInput: PhoneInputType = (props) => {
-  return (
-    <ReactPhoneNumberInput
-      defaultCountry='RU'
-      inputComponent={Input}
-      variant='filled'
-      {...props}
-    />
-  );
-};

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

@@ -1,7 +0,0 @@
-import { FieldValues } from 'react-hook-form';
-import { DefaultInputComponentProps } from 'react-phone-number-input';
-import { DefaultFormValues, Props } from 'react-phone-number-input/react-hook-form';
-
-type PhoneInputProps<FormValues, InputComponentProps = DefaultInputComponentProps> = Props<InputComponentProps, FormValues>;
-
-export type PhoneInputType = <FormValues extends FieldValues = DefaultFormValues, InputComponentProps = DefaultInputComponentProps>(props: PhoneInputProps<FormValues, InputComponentProps>) => JSX.Element;