Compare commits
74 Commits
v0.1.1
...
feature/rt
| Author | SHA1 | Date | |
|---|---|---|---|
| 658e23d4e3 | |||
| ed8ae95436 | |||
| a00aaff29d | |||
| ad1f948641 | |||
| bd66f00b81 | |||
| 9a20c9f098 | |||
| d48f8011c1 | |||
| f2319542e7 | |||
| 3fb01392f0 | |||
| 1dd14caed2 | |||
| 12982cdf9e | |||
|
|
31b440656c | ||
|
|
45c4ca16c8 | ||
| e3d316c418 | |||
|
|
4c26928d23 | ||
| 1471bf94dd | |||
|
|
d3ffaa97f8 | ||
| acd09d427c | |||
| 34bf557a6f | |||
| 5e0ac9f7a5 | |||
| 9a2ef18925 | |||
| d15bd6f7d2 | |||
| adce5392a1 | |||
| 1b01c0ba4f | |||
| 54ced18ea2 | |||
| 0ddcaa5d52 | |||
| 85d96b930c | |||
|
|
adb812280d | ||
|
|
3382ae3ada | ||
|
|
5ed023866e | ||
|
|
e73773f359 | ||
|
|
a9a9b3cadd | ||
| 06abc15c9a | |||
| 6ca7de9467 | |||
| 939f107d1c | |||
| 4f92125e6d | |||
| 3ea501161c | |||
| e8634c396f | |||
| edddf6d857 | |||
| 1276b13fec | |||
| 2aa361e3db | |||
|
|
4cda998bd7 | ||
| 9b0bda3cda | |||
| cad31605d9 | |||
| 1dee68b65d | |||
| 6096cfc15c | |||
| fc699e7890 | |||
|
|
3e0e570ff6 | ||
| 7b24804498 | |||
| 5498122109 | |||
| ef90173b80 | |||
| c7162d0045 | |||
| 885ad16782 | |||
|
|
5e24537919 | ||
| 707a77d7ad | |||
|
|
8a0dff682b | ||
|
|
b8606ac05f | ||
| 6218b6f5d8 | |||
| 8cc8391a09 | |||
| e2c65fd39c | |||
| 9f530204fa | |||
| fb3ca156fb | |||
| 48d076a829 | |||
| e4b9aefe57 | |||
|
|
77ea7d301e | ||
|
|
93adc1fb7d | ||
|
|
0457bf7ffc | ||
|
|
11fe40b86d | ||
|
|
ab40b587ba | ||
|
|
b79c957779 | ||
|
|
440e87ef76 | ||
| 0b2dae79ac | |||
|
|
7c157574c8 | ||
| 5ef0d5953d |
1
__mocks__/file-mock.ts
Normal file
@@ -0,0 +1 @@
|
||||
module.exports = 'file';
|
||||
7
babel.config.js
Normal file
@@ -0,0 +1,7 @@
|
||||
module.exports = {
|
||||
presets: [
|
||||
'@babel/preset-env',
|
||||
'@babel/preset-typescript',
|
||||
['@babel/preset-react', { runtime: 'automatic' }],
|
||||
],
|
||||
};
|
||||
@@ -12,8 +12,8 @@ module.exports = {
|
||||
/* use https://admin.bro-js.ru/ to create config, navigations and features */
|
||||
navigations: {
|
||||
'dry-wash.main': '/dry-wash',
|
||||
'dry-wash.create': '/order',
|
||||
'dry-wash.view.order': '/order/:orderId',
|
||||
'dry-wash.order.create': '/order',
|
||||
'dry-wash.order.view': '/order/:orderId',
|
||||
'dry-wash.arm.master': 'master',
|
||||
'dry-wash.arm.order': 'order',
|
||||
'dry-wash.arm': '/arm/*',
|
||||
@@ -21,9 +21,10 @@ module.exports = {
|
||||
features: {
|
||||
'dry-wash-pl': {
|
||||
// add your features here in the format [featureName]: { value: string }
|
||||
'order-view-status-polling': { value: '3000' }
|
||||
},
|
||||
},
|
||||
config: {
|
||||
'dry-wash-pl.api': '/api',
|
||||
'dry-wash.api': '/api',
|
||||
},
|
||||
};
|
||||
|
||||
@@ -1,12 +1,13 @@
|
||||
import globals from "globals";
|
||||
import pluginJs from "@eslint/js";
|
||||
import tseslint from "typescript-eslint";
|
||||
import pluginReact from "eslint-plugin-react";
|
||||
import globals from 'globals';
|
||||
import pluginJs from '@eslint/js';
|
||||
import tseslint from 'typescript-eslint';
|
||||
import pluginReact from 'eslint-plugin-react';
|
||||
import stylistic from '@stylistic/eslint-plugin';
|
||||
import pluginImport from 'eslint-plugin-import';
|
||||
|
||||
export default [
|
||||
{ files: ["**/*.{js,mjs,cjs,ts,jsx,tsx}"] },
|
||||
{ files: ['**/*.{js,mjs,cjs,ts,jsx,tsx}'] },
|
||||
|
||||
{ languageOptions: { globals: globals.browser } },
|
||||
pluginJs.configs.recommended,
|
||||
...tseslint.configs.recommended,
|
||||
@@ -14,35 +15,38 @@ export default [
|
||||
{
|
||||
plugins: {
|
||||
'@stylistic': stylistic,
|
||||
'import': pluginImport,
|
||||
import: pluginImport,
|
||||
},
|
||||
"rules": {
|
||||
"no-unused-vars": "off",
|
||||
"@typescript-eslint/no-unused-vars": [
|
||||
"warn", // or "error"
|
||||
rules: {
|
||||
'no-unused-vars': 'off',
|
||||
'@typescript-eslint/no-unused-vars': [
|
||||
'warn', // or "error"
|
||||
{
|
||||
"argsIgnorePattern": "^_",
|
||||
"varsIgnorePattern": "^_",
|
||||
"caughtErrorsIgnorePattern": "^_"
|
||||
}
|
||||
argsIgnorePattern: '^_',
|
||||
varsIgnorePattern: '^_',
|
||||
caughtErrorsIgnorePattern: '^_',
|
||||
},
|
||||
],
|
||||
"sort-imports": ["off"],
|
||||
"import/order": [
|
||||
"error",
|
||||
'sort-imports': ['off'],
|
||||
'import/order': [
|
||||
'error',
|
||||
{
|
||||
"groups": [
|
||||
"builtin",
|
||||
"external",
|
||||
"internal",
|
||||
"parent",
|
||||
["sibling", "index"]
|
||||
groups: [
|
||||
'builtin',
|
||||
'external',
|
||||
'internal',
|
||||
'parent',
|
||||
['sibling', 'index'],
|
||||
],
|
||||
"newlines-between": "always",
|
||||
}
|
||||
'newlines-between': 'always',
|
||||
},
|
||||
],
|
||||
semi: ["error", "always"],
|
||||
semi: ['error', 'always'],
|
||||
'@stylistic/indent': ['error', 2],
|
||||
'react/prop-types': 'off'
|
||||
'react/prop-types': 'off',
|
||||
},
|
||||
}
|
||||
},
|
||||
{
|
||||
ignores: ['babel.config.js'],
|
||||
},
|
||||
];
|
||||
|
||||
17
jest-preset-it/jest-preset.ts
Normal file
@@ -0,0 +1,17 @@
|
||||
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',
|
||||
};
|
||||
@@ -14,26 +14,71 @@
|
||||
"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.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",
|
||||
@@ -41,6 +86,15 @@
|
||||
"dry-wash.arm.master.drawer.inputPhone.placeholder": "Enter Phone Number",
|
||||
"dry-wash.arm.master.drawer.button.save": "Save",
|
||||
"dry-wash.arm.master.drawer.button.cancel": "Cancel",
|
||||
"dry-wash.arm.master.drawer.toast.create-master": "Master created",
|
||||
"dry-wash.arm.master.drawer.toast.error.empty-fields": "Fields cannot be empty",
|
||||
"dry-wash.arm.master.drawer.toast.error.base": "Error",
|
||||
"dry-wash.arm.master.drawer.toast.error.create-master": "Error creating master",
|
||||
"dry-wash.arm.master.drawer.toast.error.create-master-details": "Failed to add master. Please try again",
|
||||
"dry-wash.arm.master.drawer.form.name.required": "Master name is required",
|
||||
"dry-wash.arm.master.drawer.form.phone.required": "Phone number is required",
|
||||
"dry-wash.arm.master.drawer.form.phone.pattern": "Invalid phone number",
|
||||
"dry-wash.arm.master.drawer.form.name.minLength": "Name must contain at least 2 characters",
|
||||
"dry-wash.arm.master.sideBar.orders": "Orders",
|
||||
"dry-wash.arm.master.sideBar.master": "Masters",
|
||||
"dry-wash.arm.master.sideBar.title": "Dry Master",
|
||||
@@ -49,5 +103,6 @@
|
||||
"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.errorBoundary.button.reload": "Reload Page",
|
||||
"dry-wash.washTime.timeSlot": "{{start}} - {{end}}"
|
||||
}
|
||||
|
||||
@@ -7,18 +7,34 @@
|
||||
"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.table.actionsMenu.toast.success": "Мастер удалён",
|
||||
"dry-wash.arm.master.table.actionsMenu.toast.error.title": "Ошибка!",
|
||||
"dry-wash.arm.master.table.actionsMenu.toast.error.description": "Не удалось удалить мастера. Попробуйте ещё раз.",
|
||||
"dry-wash.arm.master.schedule.empty": "Свободен",
|
||||
"dry-wash.arm.master.editable.aria.cancel": "Отменить изменения",
|
||||
"dry-wash.arm.master.editable.aria.save": "Сохранить изменения",
|
||||
"dry-wash.arm.master.editable.aria.edit": "Редактировать",
|
||||
"dry-wash.arm.master.editable.toast.success": "Успешно!",
|
||||
"dry-wash.arm.master.editable.toast.error.description": "Не удалось обновить данные",
|
||||
"dry-wash.arm.master.editable.toast.error.title": "Ошибка!",
|
||||
"dry-wash.arm.master.drawer.title": "Добавить нового мастера",
|
||||
"dry-wash.arm.master.drawer.inputName.label": "ФИО",
|
||||
"dry-wash.arm.master.drawer.inputName.placeholder": "Введите ФИО",
|
||||
@@ -26,6 +42,15 @@
|
||||
"dry-wash.arm.master.drawer.inputPhone.placeholder": "Введите номер телефона",
|
||||
"dry-wash.arm.master.drawer.button.save": "Сохранить",
|
||||
"dry-wash.arm.master.drawer.button.cancel": "Отменить",
|
||||
"dry-wash.arm.master.drawer.toast.create-master": "Мастер создан",
|
||||
"dry-wash.arm.master.drawer.toast.error.empty-fields": "Поля не могут быть пустыми",
|
||||
"dry-wash.arm.master.drawer.toast.error.base": "Ошибка",
|
||||
"dry-wash.arm.master.drawer.toast.error.create-master": "Ошибка при создании мастера",
|
||||
"dry-wash.arm.master.drawer.toast.error.create-master-details": "Не удалось добавить мастера. Попробуйте еще раз",
|
||||
"dry-wash.arm.master.drawer.form.name.required": "Имя мастера обязательно",
|
||||
"dry-wash.arm.master.drawer.form.phone.required": "Телефон обязателен",
|
||||
"dry-wash.arm.master.drawer.form.phone.pattern": "Некорректный номер телефона",
|
||||
"dry-wash.arm.master.drawer.form.name.minLength": "Имя должно содержать минимум 2 символа",
|
||||
"dry-wash.arm.master.sideBar.orders": "Заказы",
|
||||
"dry-wash.arm.master.sideBar.master": "Мастера",
|
||||
"dry-wash.arm.master.sideBar.title": "Сухой мастер",
|
||||
@@ -44,10 +69,45 @@
|
||||
"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.errorBoundary.title":"Что-то пошло не так",
|
||||
"dry-wash.errorBoundary.title": "Что-то пошло не так",
|
||||
"dry-wash.errorBoundary.description": "Мы уже работаем над исправлением проблемы",
|
||||
"dry-wash.errorBoundary.button.reload": "Перезагрузить страницу",
|
||||
"dry-wash.washTime.timeSlot": "{{start}} - {{end}}"
|
||||
|
||||
7037
package-lock.json
generated
33
package.json
@@ -1,10 +1,10 @@
|
||||
{
|
||||
"name": "dry-wash",
|
||||
"version": "0.1.1",
|
||||
"version": "0.5.0",
|
||||
"description": "<a id=\"readme-top\"></a>",
|
||||
"main": "./src/index.tsx",
|
||||
"scripts": {
|
||||
"test": "echo \"Error: no test specified\" && exit 1",
|
||||
"test": "jest -u",
|
||||
"start": "brojs server --port=8099 --with-open-browser",
|
||||
"build": "npm run clean && brojs build --dev",
|
||||
"build:prod": "npm run clean && brojs build",
|
||||
@@ -17,23 +17,42 @@
|
||||
"author": "",
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"@brojs/cli": "^1.6.3",
|
||||
"@brojs/cli": "^1.8.4",
|
||||
"@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.4.2",
|
||||
"@chakra-ui/react": "^2.10.5",
|
||||
"@emotion/react": "^11.4.1",
|
||||
"@emotion/styled": "^11.3.0",
|
||||
"@fontsource/open-sans": "^5.1.0",
|
||||
"@lottiefiles/react-lottie-player": "^3.5.4",
|
||||
"@pbe/react-yandex-maps": "^1.2.5",
|
||||
"@reduxjs/toolkit": "^2.5.0",
|
||||
"@testing-library/dom": "^10.4.0",
|
||||
"@testing-library/react": "^16.2.0",
|
||||
"@types/react": "^18.3.12",
|
||||
"babel-jest": "^29.7.0",
|
||||
"dayjs": "^1.11.13",
|
||||
"express": "^4.21.1",
|
||||
"framer-motion": "^6.2.8",
|
||||
"i18next": "^23.16.4",
|
||||
"jest": "^29.7.0",
|
||||
"jest-environment-jsdom": "^29.7.0",
|
||||
"jest-fixed-jsdom": "^0.0.9",
|
||||
"keycloak-js": "^23.0.7",
|
||||
"msw": "^2.7.0",
|
||||
"react": "^18.3.1",
|
||||
"react-dom": "^18.3.1",
|
||||
"react-hook-form": "^7.53.2",
|
||||
"react-i18next": "^15.1.1",
|
||||
"react-icons": "^5.3.0",
|
||||
"react-router-dom": "^6.27.0"
|
||||
"react-phone-number-input": "^3.4.9",
|
||||
"react-redux": "^9.2.0",
|
||||
"react-router-dom": "^6.27.0",
|
||||
"ts-jest": "^29.2.5",
|
||||
"ts-node": "^10.9.2"
|
||||
},
|
||||
"devDependencies": {
|
||||
"@eslint/js": "^9.14.0",
|
||||
@@ -44,6 +63,10 @@
|
||||
"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"
|
||||
}
|
||||
}
|
||||
|
||||
15
src/__data__/features.ts
Normal file
@@ -0,0 +1,15 @@
|
||||
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;
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
82
src/__data__/service/api.ts
Normal file
@@ -0,0 +1,82 @@
|
||||
import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query/react';
|
||||
import { getConfigValue } from '@brojs/cli';
|
||||
import dayjs from 'dayjs';
|
||||
|
||||
import { Master, OrderArm } from '../../models/api';
|
||||
|
||||
import { extractBodyFromResponse } from './utils';
|
||||
|
||||
export type UpdateMasterPayload = Required<Pick<Master, 'id'>> &
|
||||
Partial<Omit<Master, 'id'>>;
|
||||
|
||||
type UpdateOrderProps = Required<Pick<OrderArm, 'id'>> &
|
||||
Partial<Pick<OrderArm, 'status' | 'notes'>> & {
|
||||
master?: string;
|
||||
};
|
||||
|
||||
export const api = createApi({
|
||||
reducerPath: 'api',
|
||||
baseQuery: fetchBaseQuery({ baseUrl: getConfigValue('dry-wash.api') }),
|
||||
tagTypes: ['Masters', 'Orders'],
|
||||
endpoints: (builder) => ({
|
||||
getMasters: builder.query<Master[], void>({
|
||||
query: () => ({ url: '/arm/masters' }),
|
||||
transformResponse: extractBodyFromResponse<Master[]>,
|
||||
providesTags: ['Masters'],
|
||||
}),
|
||||
updateOrders: builder.mutation<void, UpdateOrderProps>({
|
||||
query: ({ id, status, notes, master }) => ({
|
||||
url: `/order/${id}`,
|
||||
method: 'PATCH',
|
||||
body: { status, notes, master },
|
||||
}),
|
||||
invalidatesTags: ['Orders'],
|
||||
}),
|
||||
getOrders: builder.query<OrderArm[], { date: Date }>({
|
||||
query: ({ date }) => {
|
||||
const startDate = dayjs(date).startOf('day').toISOString();
|
||||
const endDate = dayjs(date).endOf('day').toISOString();
|
||||
return {
|
||||
url: '/arm/orders',
|
||||
method: 'POST',
|
||||
body: { startDate, endDate },
|
||||
};
|
||||
},
|
||||
transformResponse: extractBodyFromResponse<OrderArm[]>,
|
||||
providesTags: ['Orders'],
|
||||
}),
|
||||
|
||||
addMaster: builder.mutation<void, Pick<Master, 'name' | 'phone'>>({
|
||||
query: (master) => ({
|
||||
url: '/arm/masters',
|
||||
method: 'POST',
|
||||
body: master,
|
||||
}),
|
||||
invalidatesTags: ['Masters'],
|
||||
}),
|
||||
deleteMaster: builder.mutation<void, { id: string }>({
|
||||
query: ({ id }) => ({
|
||||
url: `/arm/masters/${id}`,
|
||||
method: 'DELETE',
|
||||
}),
|
||||
invalidatesTags: ['Masters'],
|
||||
}),
|
||||
updateMaster: builder.mutation<void, UpdateMasterPayload>({
|
||||
query: ({ id, name, phone }) => ({
|
||||
url: `/arm/masters/${id}`,
|
||||
method: 'PATCH',
|
||||
body: { name, phone },
|
||||
}),
|
||||
invalidatesTags: ['Masters'],
|
||||
}),
|
||||
}),
|
||||
});
|
||||
|
||||
export const {
|
||||
useGetMastersQuery,
|
||||
useAddMasterMutation,
|
||||
useDeleteMasterMutation,
|
||||
useUpdateMasterMutation,
|
||||
useGetOrdersQuery,
|
||||
useUpdateOrdersMutation,
|
||||
} = api;
|
||||
14
src/__data__/service/landing.api.ts
Normal file
@@ -0,0 +1,14 @@
|
||||
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,
|
||||
})
|
||||
})
|
||||
});
|
||||
15
src/__data__/service/utils.ts
Normal file
@@ -0,0 +1,15 @@
|
||||
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;
|
||||
}
|
||||
};
|
||||
14
src/__data__/store.ts
Normal file
@@ -0,0 +1,14 @@
|
||||
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;
|
||||
@@ -1,7 +1,7 @@
|
||||
import { generatePath } from 'react-router-dom';
|
||||
import { getNavigationValue } from '@brojs/cli';
|
||||
|
||||
import { Order } from '../models';
|
||||
import { Order } from '../models/landing';
|
||||
|
||||
const getFullUrls = (url: string) =>
|
||||
`${getNavigationValue('dry-wash.main')}${url}`;
|
||||
@@ -13,14 +13,14 @@ export const URLs = {
|
||||
return this.url;
|
||||
},
|
||||
},
|
||||
orderForm: {
|
||||
url: getNavigationValue('dry-wash.create'),
|
||||
orderCreate: {
|
||||
url: getFullUrls(getNavigationValue('dry-wash.order.create')),
|
||||
getUrl() {
|
||||
return this.url;
|
||||
},
|
||||
},
|
||||
orderView: {
|
||||
url: getNavigationValue('dry-wash.view.order'),
|
||||
url: getFullUrls(getNavigationValue('dry-wash.order.view')),
|
||||
getUrl(orderId: Order.Id) {
|
||||
return generatePath(this.url, { orderId });
|
||||
},
|
||||
|
||||
1
src/api/index.ts
Normal file
@@ -0,0 +1 @@
|
||||
export * from './landing';
|
||||
65
src/api/landing.tsx
Normal file
@@ -0,0 +1,65 @@
|
||||
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 };
|
||||
22
src/api/types.ts
Normal file
@@ -0,0 +1,22 @@
|
||||
export type QueryData<D> = {
|
||||
success: true;
|
||||
body: D;
|
||||
};
|
||||
|
||||
export type QueryErrorData = {
|
||||
success: false;
|
||||
error: string;
|
||||
};
|
||||
|
||||
export type QueryState<D> = {
|
||||
isLoading: boolean;
|
||||
isSuccess: boolean;
|
||||
data: QueryData<D>;
|
||||
isError: boolean;
|
||||
error: {
|
||||
status: number;
|
||||
data: QueryErrorData;
|
||||
};
|
||||
};
|
||||
|
||||
export type Trigger<P, D> = (params: P) => Promise<D>;
|
||||
18
src/app.tsx
@@ -1,19 +1,23 @@
|
||||
import React from 'react';
|
||||
import { BrowserRouter } from 'react-router-dom';
|
||||
import { ChakraProvider, theme as chakraTheme } from '@chakra-ui/react';
|
||||
import { Provider } from 'react-redux';
|
||||
|
||||
import Routers from './routes';
|
||||
import ErrorBoundary from './components/ErrorBoundary';
|
||||
import { store } from './__data__/store';
|
||||
|
||||
const App = () => {
|
||||
return (
|
||||
<ChakraProvider theme={chakraTheme}>
|
||||
<ErrorBoundary>
|
||||
<BrowserRouter>
|
||||
<Routers />
|
||||
</BrowserRouter>
|
||||
</ErrorBoundary>
|
||||
</ChakraProvider>
|
||||
<Provider store={store}>
|
||||
<ChakraProvider theme={chakraTheme}>
|
||||
<ErrorBoundary>
|
||||
<BrowserRouter>
|
||||
<Routers />
|
||||
</BrowserRouter>
|
||||
</ErrorBoundary>
|
||||
</ChakraProvider>
|
||||
</Provider>
|
||||
);
|
||||
};
|
||||
|
||||
|
||||
BIN
src/assets/images/car-body-type/coupe.webp
Normal file
|
After Width: | Height: | Size: 1.9 KiB |
BIN
src/assets/images/car-body-type/crossover.webp
Normal file
|
After Width: | Height: | Size: 2.2 KiB |
BIN
src/assets/images/car-body-type/hatchback.webp
Normal file
|
After Width: | Height: | Size: 1.9 KiB |
11
src/assets/images/car-body-type/index.ts
Normal file
@@ -0,0 +1,11 @@
|
||||
export { default as CoupeImg } from './coupe.webp';
|
||||
export { default as CrossoverImg } from './crossover.webp';
|
||||
export { default as HatchbackImg } from './hatchback.webp';
|
||||
export { default as LiftbackImg } from './liftback.webp';
|
||||
export { default as MinivanImg } from './minivan.webp';
|
||||
export { default as OtherImg } from './other.webp';
|
||||
export { default as PickupImg } from './pickup.webp';
|
||||
export { default as SedanImg } from './sedan.webp';
|
||||
export { default as SportsCarImg } from './sports-car.webp';
|
||||
export { default as StationWagonImg } from './station-wagon.webp';
|
||||
export { default as SuvImg } from './suv.webp';
|
||||
BIN
src/assets/images/car-body-type/liftback.webp
Normal file
|
After Width: | Height: | Size: 1.7 KiB |
BIN
src/assets/images/car-body-type/minivan.webp
Normal file
|
After Width: | Height: | Size: 1.9 KiB |
BIN
src/assets/images/car-body-type/other.webp
Normal file
|
After Width: | Height: | Size: 1.2 KiB |
BIN
src/assets/images/car-body-type/pickup.webp
Normal file
|
After Width: | Height: | Size: 2.0 KiB |
BIN
src/assets/images/car-body-type/sedan.webp
Normal file
|
After Width: | Height: | Size: 1.8 KiB |
BIN
src/assets/images/car-body-type/sports-car.webp
Normal file
|
After Width: | Height: | Size: 1.9 KiB |
BIN
src/assets/images/car-body-type/station-wagon.webp
Normal file
|
After Width: | Height: | Size: 1.9 KiB |
BIN
src/assets/images/car-body-type/suv.webp
Normal file
|
After Width: | Height: | Size: 2.0 KiB |
@@ -1 +1,2 @@
|
||||
export * from './car-body-type';
|
||||
export { default as DemoVideoPosterImg } from './demo-video-poster.webp';
|
||||
31
src/components/DateNavigator/DateNavigator.tsx
Normal file
@@ -0,0 +1,31 @@
|
||||
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;
|
||||
1
src/components/DateNavigator/index.ts
Normal file
@@ -0,0 +1 @@
|
||||
export { default } from './DateNavigator';
|
||||
107
src/components/Editable/Editable.tsx
Normal file
@@ -0,0 +1,107 @@
|
||||
import React, { useEffect, useState } from 'react';
|
||||
import {
|
||||
Editable,
|
||||
EditableInput,
|
||||
EditablePreview,
|
||||
Flex,
|
||||
IconButton,
|
||||
Input,
|
||||
useEditableControls,
|
||||
ButtonGroup,
|
||||
Stack,
|
||||
} from '@chakra-ui/react';
|
||||
import { CheckIcon, CloseIcon, EditIcon } from '@chakra-ui/icons';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
|
||||
import { useUpdateMasterMutation } from '../../__data__/service/api';
|
||||
import useShowToast from '../../hooks/useShowToast';
|
||||
|
||||
interface EditableWrapperProps {
|
||||
value: string;
|
||||
fieldName: 'phone' | 'name';
|
||||
id: string;
|
||||
}
|
||||
|
||||
const EditableWrapper = ({ value, fieldName, id }: EditableWrapperProps) => {
|
||||
const [updateMaster, { isError, isSuccess, error }] =
|
||||
useUpdateMasterMutation();
|
||||
|
||||
const { t } = useTranslation('~', {
|
||||
keyPrefix: 'dry-wash.arm.master.editable',
|
||||
});
|
||||
|
||||
const showToast = useShowToast();
|
||||
const [currentValue, setCurrentValue] = useState<string>(value);
|
||||
|
||||
const handleSubmit = async (newValue: string) => {
|
||||
if (currentValue === newValue) return;
|
||||
|
||||
await updateMaster({ id, [fieldName]: newValue });
|
||||
|
||||
setCurrentValue(newValue);
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
if (isSuccess) {
|
||||
showToast(t('toast.success'), 'success');
|
||||
}
|
||||
}, [isSuccess]);
|
||||
|
||||
useEffect(() => {
|
||||
if (isError) {
|
||||
showToast(t('toast.error.title'), 'error', t('toast.error.description'));
|
||||
console.error(t('toast.error.description'), error);
|
||||
}
|
||||
}, [isError, error]);
|
||||
|
||||
function EditableControls() {
|
||||
const {
|
||||
isEditing,
|
||||
getSubmitButtonProps,
|
||||
getCancelButtonProps,
|
||||
getEditButtonProps,
|
||||
} = useEditableControls();
|
||||
|
||||
return isEditing ? (
|
||||
<ButtonGroup justifyContent='center' size='sm'>
|
||||
<IconButton
|
||||
aria-label={t('aria.save')}
|
||||
icon={<CheckIcon />}
|
||||
{...getSubmitButtonProps()}
|
||||
/>
|
||||
<IconButton
|
||||
aria-label={t('aria.cancel')}
|
||||
icon={<CloseIcon />}
|
||||
{...getCancelButtonProps()}
|
||||
/>
|
||||
</ButtonGroup>
|
||||
) : (
|
||||
<Flex justifyContent='center'>
|
||||
<IconButton
|
||||
aria-label={t('aria.edit')}
|
||||
size='sm'
|
||||
icon={<EditIcon />}
|
||||
{...getEditButtonProps()}
|
||||
/>
|
||||
</Flex>
|
||||
);
|
||||
}
|
||||
|
||||
return (
|
||||
<Editable
|
||||
textAlign='center'
|
||||
defaultValue={currentValue}
|
||||
fontSize='2xl'
|
||||
isPreviewFocusable={false}
|
||||
onSubmit={handleSubmit}
|
||||
>
|
||||
<Stack direction={['column', 'row']} spacing='15px'>
|
||||
<EditablePreview />
|
||||
<Input as={EditableInput} />
|
||||
<EditableControls />
|
||||
</Stack>
|
||||
</Editable>
|
||||
);
|
||||
};
|
||||
|
||||
export default EditableWrapper;
|
||||
@@ -1,4 +1,4 @@
|
||||
import React from 'react';
|
||||
import React, { useEffect } from 'react';
|
||||
import {
|
||||
Menu,
|
||||
MenuButton,
|
||||
@@ -9,16 +9,47 @@ import {
|
||||
import { EditIcon } from '@chakra-ui/icons';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
|
||||
const MasterActionsMenu = () => {
|
||||
import { useDeleteMasterMutation } from '../../__data__/service/api';
|
||||
import useShowToast from '../../hooks/useShowToast';
|
||||
|
||||
interface MasterActionsMenu {
|
||||
id: string;
|
||||
}
|
||||
|
||||
const MasterActionsMenu = ({ id }: MasterActionsMenu) => {
|
||||
const { t } = useTranslation('~', {
|
||||
keyPrefix: 'dry-wash.arm.master.table.actionsMenu',
|
||||
});
|
||||
|
||||
const [deleteMaster, { isSuccess, isError, error, isLoading }] =
|
||||
useDeleteMasterMutation();
|
||||
|
||||
const showToast = useShowToast();
|
||||
|
||||
const handleClickDelete = async () => {
|
||||
await deleteMaster({ id });
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
if (isSuccess) {
|
||||
showToast(t('toast.success'), 'success');
|
||||
}
|
||||
}, [isSuccess]);
|
||||
|
||||
useEffect(() => {
|
||||
if (isError) {
|
||||
showToast(t('toast.error.title'), 'error', t('toast.error.description'));
|
||||
console.error(error);
|
||||
}
|
||||
}, [isError]);
|
||||
|
||||
return (
|
||||
<Menu>
|
||||
<MenuButton icon={<EditIcon />} as={IconButton} variant='outline' />
|
||||
<MenuList>
|
||||
<MenuItem>{t('delete')}</MenuItem>
|
||||
<MenuItem onClick={handleClickDelete} isDisabled={isLoading}>
|
||||
{t('delete')}
|
||||
</MenuItem>
|
||||
</MenuList>
|
||||
</Menu>
|
||||
);
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
import React, { useState } from 'react';
|
||||
import React, { useEffect } from 'react';
|
||||
import { useForm, SubmitHandler } from 'react-hook-form';
|
||||
import {
|
||||
Button,
|
||||
FormControl,
|
||||
@@ -11,57 +12,128 @@ import {
|
||||
DrawerFooter,
|
||||
DrawerHeader,
|
||||
DrawerOverlay,
|
||||
InputGroup,
|
||||
InputLeftElement,
|
||||
FormErrorMessage,
|
||||
} from '@chakra-ui/react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { PhoneIcon } from '@chakra-ui/icons';
|
||||
|
||||
const MasterDrawer = ({ isOpen, onClose }) => {
|
||||
const [newMaster, setNewMaster] = useState({ name: '', phone: '' });
|
||||
import { useAddMasterMutation } from '../../__data__/service/api';
|
||||
import { DrawerInputs } from '../../models/arm/form';
|
||||
import useShowToast from '../../hooks/useShowToast';
|
||||
|
||||
const handleSave = () => {
|
||||
console.log(`Сохранение мастера: ${newMaster}`);
|
||||
onClose();
|
||||
};
|
||||
interface MasterDrawerProps {
|
||||
isOpen: boolean;
|
||||
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(t('toast.error.base'), 'error', t('toast.error.empty-fields'));
|
||||
return;
|
||||
}
|
||||
|
||||
await addMaster(trimMaster);
|
||||
};
|
||||
|
||||
const [addMaster, { error, isSuccess }] = useAddMasterMutation();
|
||||
const showToast = useShowToast();
|
||||
|
||||
useEffect(() => {
|
||||
if (isSuccess) {
|
||||
showToast(t('toast.create-master'), 'success');
|
||||
reset();
|
||||
onClose();
|
||||
}
|
||||
}, [isSuccess]);
|
||||
|
||||
useEffect(() => {
|
||||
if (error) {
|
||||
showToast(
|
||||
t('toast.error.create-master'),
|
||||
'error',
|
||||
t('toast.error.create-master-details'),
|
||||
);
|
||||
console.error(error);
|
||||
}
|
||||
}, [error]);
|
||||
|
||||
return (
|
||||
<Drawer isOpen={isOpen} onClose={onClose} size='md'>
|
||||
<DrawerOverlay />
|
||||
<DrawerContent>
|
||||
<DrawerCloseButton />
|
||||
<DrawerHeader>{t('title')}</DrawerHeader>
|
||||
<DrawerBody>
|
||||
<FormControl mb='4'>
|
||||
<FormLabel>{t('inputName.label')}</FormLabel>
|
||||
<Input
|
||||
value={newMaster.name}
|
||||
onChange={(e) =>
|
||||
setNewMaster({ ...newMaster, name: e.target.value })
|
||||
}
|
||||
placeholder={t('inputName.placeholder')}
|
||||
/>
|
||||
</FormControl>
|
||||
<FormControl>
|
||||
<FormLabel> {t('inputPhone.label')}</FormLabel>
|
||||
<Input
|
||||
value={newMaster.phone}
|
||||
onChange={(e) =>
|
||||
setNewMaster({ ...newMaster, phone: e.target.value })
|
||||
}
|
||||
placeholder={t('inputPhone.placeholder')}
|
||||
/>
|
||||
</FormControl>
|
||||
</DrawerBody>
|
||||
<DrawerFooter>
|
||||
<Button colorScheme='teal' mr={3} onClick={handleSave}>
|
||||
{t('button.save')}
|
||||
</Button>
|
||||
<Button variant='ghost' onClick={onClose}>
|
||||
{t('button.cancel')}
|
||||
</Button>
|
||||
</DrawerFooter>
|
||||
<form onSubmit={handleSubmit(onSubmit)}>
|
||||
<DrawerCloseButton />
|
||||
<DrawerHeader>{t('title')}</DrawerHeader>
|
||||
<DrawerBody>
|
||||
<FormControl mb='4' isInvalid={!!errors.name}>
|
||||
<FormLabel>{t('inputName.label')}</FormLabel>
|
||||
<Input
|
||||
{...register('name', {
|
||||
required: t('form.name.required'),
|
||||
minLength: {
|
||||
value: 2,
|
||||
message: t('form.name.minLength'),
|
||||
},
|
||||
})}
|
||||
placeholder={t('inputName.placeholder')}
|
||||
/>
|
||||
<FormErrorMessage>
|
||||
{errors.name && errors.name.message}
|
||||
</FormErrorMessage>
|
||||
</FormControl>
|
||||
<FormControl isInvalid={!!errors.phone}>
|
||||
<FormLabel>{t('inputPhone.label')}</FormLabel>
|
||||
<InputGroup>
|
||||
<InputLeftElement pointerEvents='none'>
|
||||
<PhoneIcon color='gray.300' />
|
||||
</InputLeftElement>
|
||||
<Input
|
||||
{...register('phone', {
|
||||
required: t('form.phone.required'),
|
||||
pattern: {
|
||||
value: /^(\+7|8)\d{10}$/,
|
||||
message: t('form.phone.pattern'),
|
||||
},
|
||||
setValueAs: (value) => value.replace(/[^\d+]/g, ''),
|
||||
})}
|
||||
placeholder={t('inputPhone.placeholder')}
|
||||
/>
|
||||
</InputGroup>
|
||||
<FormErrorMessage>
|
||||
{errors.phone && errors.phone.message}
|
||||
</FormErrorMessage>
|
||||
</FormControl>
|
||||
</DrawerBody>
|
||||
<DrawerFooter>
|
||||
<Button colorScheme='teal' mr={3} type='submit'>
|
||||
{t('button.save')}
|
||||
</Button>
|
||||
<Button variant='ghost' onClick={onClose}>
|
||||
{t('button.cancel')}
|
||||
</Button>
|
||||
</DrawerFooter>
|
||||
</form>
|
||||
</DrawerContent>
|
||||
</Drawer>
|
||||
);
|
||||
|
||||
@@ -1,27 +1,39 @@
|
||||
import React from 'react';
|
||||
import { Badge, Link, Stack, Td, Tr } from '@chakra-ui/react';
|
||||
import { Badge, Stack, Td, Tr, Text } from '@chakra-ui/react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
|
||||
import MasterActionsMenu from '../MasterActionsMenu';
|
||||
import { getTimeSlot } from '../../lib/date-helpers';
|
||||
import { getTimeSlot } from '../../lib';
|
||||
import EditableWrapper from '../Editable/Editable';
|
||||
|
||||
const MasterItem = ({ name, phone, id, schedule }) => {
|
||||
const { t } = useTranslation('~', {
|
||||
keyPrefix: 'dry-wash.arm.master',
|
||||
});
|
||||
|
||||
const MasterItem = ({ name, schedule, phone }) => {
|
||||
return (
|
||||
<Tr>
|
||||
<Td>{name}</Td>
|
||||
<Td>
|
||||
<Stack direction='row'>
|
||||
{schedule.map(({ startWashTime, endWashTime }, index) => (
|
||||
<Badge colorScheme={'green'} key={index}>
|
||||
{getTimeSlot(startWashTime, endWashTime)}
|
||||
</Badge>
|
||||
))}
|
||||
</Stack>
|
||||
<EditableWrapper id={id} fieldName={'name'} value={name} />
|
||||
</Td>
|
||||
<Td>
|
||||
<Link href='tel:'>{phone}</Link>
|
||||
{schedule?.length > 0 ? (
|
||||
<Stack direction='row'>
|
||||
{schedule?.map(({ startWashTime, endWashTime }, index: number) => (
|
||||
<Badge colorScheme={'green'} key={index}>
|
||||
{getTimeSlot(startWashTime, endWashTime)}
|
||||
</Badge>
|
||||
))}
|
||||
</Stack>
|
||||
) : (
|
||||
<Text color='gray.500'>{t('schedule.empty')}</Text>
|
||||
)}
|
||||
</Td>
|
||||
<Td>
|
||||
<MasterActionsMenu />
|
||||
<EditableWrapper id={id} fieldName={'phone'} value={phone} />
|
||||
</Td>
|
||||
<Td>
|
||||
<MasterActionsMenu id={id} />
|
||||
</Td>
|
||||
</Tr>
|
||||
);
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import React from 'react';
|
||||
import React, { useEffect } from 'react';
|
||||
import {
|
||||
Box,
|
||||
Heading,
|
||||
@@ -10,12 +10,16 @@ import {
|
||||
Button,
|
||||
useDisclosure,
|
||||
Flex,
|
||||
Td,
|
||||
Text,
|
||||
Spinner,
|
||||
} from '@chakra-ui/react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
|
||||
import MasterItem from '../MasterItem';
|
||||
import MasterDrawer from '../MasterDrawer';
|
||||
import data from '../../../stubs/json/arm-masters/success.json';
|
||||
import { useGetMastersQuery } from '../../__data__/service/api';
|
||||
import useShowToast from '../../hooks/useShowToast';
|
||||
|
||||
const TABLE_HEADERS = [
|
||||
'name' as const,
|
||||
@@ -26,11 +30,20 @@ const TABLE_HEADERS = [
|
||||
|
||||
const Masters = () => {
|
||||
const { isOpen, onOpen, onClose } = useDisclosure();
|
||||
const showToast = useShowToast();
|
||||
|
||||
const { t } = useTranslation('~', {
|
||||
keyPrefix: 'dry-wash.arm.master',
|
||||
});
|
||||
|
||||
const { data: masters, error, isLoading, isSuccess } = useGetMastersQuery();
|
||||
|
||||
useEffect(() => {
|
||||
if (error) {
|
||||
showToast(t('error.title'), 'error');
|
||||
}
|
||||
}, [error]);
|
||||
|
||||
return (
|
||||
<Box p='8'>
|
||||
<Flex justifyContent='space-between' alignItems='center' mb='5'>
|
||||
@@ -48,9 +61,24 @@ const Masters = () => {
|
||||
</Tr>
|
||||
</Thead>
|
||||
<Tbody>
|
||||
{data.body.map((master, index) => (
|
||||
<MasterItem key={index} {...master} />
|
||||
))}
|
||||
{isLoading && (
|
||||
<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>
|
||||
</Table>
|
||||
<MasterDrawer isOpen={isOpen} onClose={onClose} />
|
||||
|
||||
@@ -1,29 +1,18 @@
|
||||
import React, { useState } from 'react';
|
||||
import React, { ChangeEvent, useState } from 'react';
|
||||
import { Td, Tr, Link, Select } from '@chakra-ui/react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import dayjs from 'dayjs';
|
||||
|
||||
import { getTimeSlot } from '../../lib/date-helpers';
|
||||
import { getTimeSlot } from '../../lib';
|
||||
import { useUpdateOrdersMutation } from '../../__data__/service/api';
|
||||
import { OrderArm, Status, statuses } from '../../models/api';
|
||||
|
||||
const statuses = [
|
||||
'pending' as const,
|
||||
'progress' as const,
|
||||
'working' as const,
|
||||
'canceled' as const,
|
||||
'complete' as const,
|
||||
];
|
||||
|
||||
type GetArrItemType<ArrType> =
|
||||
ArrType extends Array<infer ItemType> ? ItemType : never;
|
||||
|
||||
export type OrderProps = {
|
||||
carNumber?: string;
|
||||
startWashTime?: string;
|
||||
endWashTime?: string;
|
||||
orderDate?: string;
|
||||
status?: GetArrItemType<typeof statuses>;
|
||||
phone?: string;
|
||||
location?: string;
|
||||
const statusColors: Record<Status, string> = {
|
||||
pending: 'yellow.100',
|
||||
progress: 'blue.100',
|
||||
working: 'orange.100',
|
||||
canceled: 'red.100',
|
||||
complete: 'green.100',
|
||||
};
|
||||
|
||||
const OrderItem = ({
|
||||
@@ -34,23 +23,52 @@ const OrderItem = ({
|
||||
status,
|
||||
phone,
|
||||
location,
|
||||
}: OrderProps) => {
|
||||
master,
|
||||
allMasters,
|
||||
id,
|
||||
}: OrderArm) => {
|
||||
const [updateOrders] = useUpdateOrdersMutation();
|
||||
const { t } = useTranslation('~', {
|
||||
keyPrefix: 'dry-wash.arm.order',
|
||||
});
|
||||
|
||||
const [statusSelect, setStatus] = useState(status);
|
||||
const bgColor = statusColors[statusSelect];
|
||||
const [masterSelect, setMaster] = useState(master?.name);
|
||||
|
||||
const handelChangeMasters = (e: ChangeEvent<HTMLSelectElement>) => {
|
||||
const masterName = e.target.value;
|
||||
const selectedMaster = allMasters.find(
|
||||
(master) => master.name === masterName,
|
||||
);
|
||||
|
||||
if (selectedMaster) {
|
||||
setMaster(masterName);
|
||||
updateOrders({ id, master: selectedMaster.id });
|
||||
} else {
|
||||
console.error('Master not found');
|
||||
}
|
||||
};
|
||||
|
||||
const handeChangeStatus = (e: ChangeEvent<HTMLSelectElement>) => {
|
||||
const status = e.target.value as OrderArm['status'];
|
||||
updateOrders({ id, status });
|
||||
setStatus(status);
|
||||
};
|
||||
|
||||
return (
|
||||
<Tr>
|
||||
<Td>{carNumber}</Td>
|
||||
<Td>{getTimeSlot(startWashTime, endWashTime)}</Td>
|
||||
<Td>{dayjs(orderDate).format('DD.MM.YYYY')}</Td>
|
||||
<Td>
|
||||
{dayjs(orderDate).format('DD.MM.YYYY')} <br />
|
||||
{getTimeSlot(startWashTime, endWashTime)}
|
||||
</Td>
|
||||
<Td>
|
||||
<Select
|
||||
value={statusSelect}
|
||||
onChange={(e) => setStatus(e.target.value as OrderProps['status'])}
|
||||
onChange={handeChangeStatus}
|
||||
placeholder={t(`status.placeholder`)}
|
||||
bg={bgColor}
|
||||
>
|
||||
{statuses.map((status) => (
|
||||
<option key={status} value={status}>
|
||||
@@ -59,6 +77,19 @@ const OrderItem = ({
|
||||
))}
|
||||
</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>
|
||||
</Td>
|
||||
<Td>
|
||||
<Link href='tel:'>{phone}</Link>
|
||||
</Td>
|
||||
|
||||
@@ -1,30 +1,88 @@
|
||||
import React from 'react';
|
||||
import { Box, Heading, Table, Thead, Tbody, Tr, Th } from '@chakra-ui/react';
|
||||
import React, { useEffect, useState } from 'react';
|
||||
import {
|
||||
Box,
|
||||
Heading,
|
||||
Table,
|
||||
Thead,
|
||||
Tbody,
|
||||
Tr,
|
||||
Th,
|
||||
Spinner,
|
||||
Text,
|
||||
Td,
|
||||
} from '@chakra-ui/react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import dayjs from 'dayjs';
|
||||
|
||||
import OrderItem from '../OrderItem';
|
||||
import { OrderProps } from '../OrderItem/OrderItem';
|
||||
import data from '../../../stubs/json/arm-orders/success.json';
|
||||
import DateNavigator from '../DateNavigator';
|
||||
import {
|
||||
useGetMastersQuery,
|
||||
useGetOrdersQuery,
|
||||
} from '../../__data__/service/api';
|
||||
import useShowToast from '../../hooks/useShowToast';
|
||||
|
||||
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('~', {
|
||||
keyPrefix: 'dry-wash.arm.order',
|
||||
});
|
||||
const showToast = useShowToast();
|
||||
|
||||
const TABLE_HEADERS = [
|
||||
'carNumber' as const,
|
||||
'washingTime' as const,
|
||||
'orderDate' as const,
|
||||
'status' as const,
|
||||
'telephone' as const,
|
||||
'location' as const,
|
||||
];
|
||||
const [currentDate, setCurrentDate] = useState(new Date());
|
||||
const {
|
||||
data: orders,
|
||||
isLoading: isOrdersLoading,
|
||||
isSuccess: isOrdersSuccess,
|
||||
isError: isOrdersError,
|
||||
error: ordersError,
|
||||
} = useGetOrdersQuery({ date: currentDate });
|
||||
|
||||
const {
|
||||
data: masters,
|
||||
isLoading: isMastersLoading,
|
||||
isSuccess: isMastersSuccess,
|
||||
isError: isMastersError,
|
||||
error: mastersError,
|
||||
} = useGetMastersQuery();
|
||||
|
||||
const isLoading = isOrdersLoading || isMastersLoading;
|
||||
const isSuccess = isOrdersSuccess && isMastersSuccess;
|
||||
const isError = isOrdersError || isMastersError;
|
||||
|
||||
useEffect(() => {
|
||||
if (isError) {
|
||||
showToast(t('error.title'), 'error');
|
||||
}
|
||||
}, [isError, ordersError, mastersError, t]);
|
||||
|
||||
return (
|
||||
<Box p='8'>
|
||||
<Heading size='lg' mb='5'>
|
||||
{t('title')}
|
||||
</Heading>
|
||||
|
||||
<DateNavigator
|
||||
currentDate={currentDate}
|
||||
onPreviousDate={() =>
|
||||
setCurrentDate((prevDate) =>
|
||||
dayjs(prevDate).subtract(1, 'day').toDate(),
|
||||
)
|
||||
}
|
||||
onNextDate={() =>
|
||||
setCurrentDate((prevDate) => dayjs(prevDate).add(1, 'day').toDate())
|
||||
}
|
||||
/>
|
||||
|
||||
<Table variant='simple' colorScheme='blackAlpha'>
|
||||
<Thead>
|
||||
<Tr>
|
||||
@@ -34,13 +92,29 @@ const Orders = () => {
|
||||
</Tr>
|
||||
</Thead>
|
||||
<Tbody>
|
||||
{data.body.map((order, index) => (
|
||||
<OrderItem
|
||||
key={index}
|
||||
{...order}
|
||||
status={order.status as OrderProps['status']}
|
||||
/>
|
||||
))}
|
||||
{isLoading && (
|
||||
<Tr>
|
||||
<Td colSpan={TABLE_HEADERS.length} textAlign='center' py='8'>
|
||||
<Spinner size='lg' />
|
||||
</Td>
|
||||
</Tr>
|
||||
)}
|
||||
{isSuccess && orders.length === 0 && (
|
||||
<Tr>
|
||||
<Td colSpan={TABLE_HEADERS.length}>
|
||||
<Text>{t('table.empty')}</Text>
|
||||
</Td>
|
||||
</Tr>
|
||||
)}
|
||||
{isSuccess &&
|
||||
orders.map((order, index) => (
|
||||
<OrderItem
|
||||
allMasters={masters}
|
||||
key={index}
|
||||
{...order}
|
||||
status={order.status as OrderProps['status']}
|
||||
/>
|
||||
))}
|
||||
</Tbody>
|
||||
</Table>
|
||||
</Box>
|
||||
|
||||
@@ -11,7 +11,7 @@ export const CtaButton: FC<ButtonProps> = (props) => {
|
||||
return (
|
||||
<Button
|
||||
as={RouterLink}
|
||||
to={URLs.orderForm.getUrl()}
|
||||
to={URLs.orderCreate.getUrl()}
|
||||
colorScheme='primary'
|
||||
{...props}
|
||||
>
|
||||
|
||||
82
src/components/order-form/form/car-body/car-body-select.tsx
Normal file
@@ -0,0 +1,82 @@
|
||||
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>
|
||||
);
|
||||
},
|
||||
);
|
||||
87
src/components/order-form/form/car-body/helper.ts
Normal file
@@ -0,0 +1,87 @@
|
||||
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;
|
||||
};
|
||||
1
src/components/order-form/form/car-body/index.ts
Normal file
@@ -0,0 +1 @@
|
||||
export { CarBodySelect } from './car-body-select';
|
||||
@@ -0,0 +1,39 @@
|
||||
import React from 'react';
|
||||
import {
|
||||
ImageProps,
|
||||
StackProps,
|
||||
Image,
|
||||
useRadio,
|
||||
chakra,
|
||||
Box,
|
||||
UseRadioProps,
|
||||
Flex,
|
||||
} from '@chakra-ui/react';
|
||||
|
||||
import { getPropsByState } from './helper';
|
||||
|
||||
type CarBodyOptionProps = {
|
||||
image: ImageProps['src'];
|
||||
label: StackProps['children'];
|
||||
} & UseRadioProps;
|
||||
|
||||
export const CarBodyOption = ({
|
||||
image,
|
||||
label,
|
||||
...radioProps
|
||||
}: CarBodyOptionProps) => {
|
||||
const { state, getInputProps, getRadioProps, htmlProps, getLabelProps } =
|
||||
useRadio(radioProps);
|
||||
|
||||
return (
|
||||
<chakra.label {...htmlProps} cursor='pointer'>
|
||||
<input {...getInputProps({})} hidden />
|
||||
<Box {...getRadioProps()} p={2} {...getPropsByState(state)}>
|
||||
<Flex direction='column' alignItems='center' {...getLabelProps()}>
|
||||
<Image src={image} rounded={4} />
|
||||
{label}
|
||||
</Flex>
|
||||
</Box>
|
||||
</chakra.label>
|
||||
);
|
||||
};
|
||||
19
src/components/order-form/form/car-body/option/helper.ts
Normal file
@@ -0,0 +1,19 @@
|
||||
import {
|
||||
BoxProps,
|
||||
} from '@chakra-ui/react';
|
||||
import { RadioState } from '@chakra-ui/react/dist/types/radio/use-radio';
|
||||
|
||||
export const getPropsByState = ({ isChecked }: RadioState): BoxProps => {
|
||||
if (isChecked) {
|
||||
return {
|
||||
bgColor: 'primary.200',
|
||||
_hover: { bgColor: 'primary.100' },
|
||||
_active: { bgColor: 'primary.300' },
|
||||
};
|
||||
}
|
||||
|
||||
return {
|
||||
_hover: { bgColor: 'primary.50' },
|
||||
_active: { bgColor: 'primary.100' },
|
||||
};
|
||||
};
|
||||
1
src/components/order-form/form/car-body/option/index.ts
Normal file
@@ -0,0 +1 @@
|
||||
export { CarBodyOption } from './car-body-option';
|
||||
24
src/components/order-form/form/car-body/types.ts
Normal file
@@ -0,0 +1,24 @@
|
||||
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'>;
|
||||
23
src/components/order-form/form/car-color/car-color-input.tsx
Normal file
@@ -0,0 +1,23 @@
|
||||
import React, { forwardRef, useId } from 'react';
|
||||
import { Input, InputProps } from '@chakra-ui/react';
|
||||
|
||||
import { CAR_COLORS } from './helper';
|
||||
|
||||
export const CarColorInput = forwardRef<HTMLInputElement, InputProps>(
|
||||
function CarColorInput(props, ref) {
|
||||
const listId = useId();
|
||||
|
||||
return (
|
||||
<>
|
||||
<Input ref={ref} list={listId} {...props} />
|
||||
<datalist id={listId}>
|
||||
{CAR_COLORS.map(({ code, name }) => (
|
||||
<option key={code} label={name} value={code}>{name}</option>
|
||||
))}
|
||||
</datalist>
|
||||
</>
|
||||
);
|
||||
},
|
||||
);
|
||||
|
||||
// todo: add option color visual indication
|
||||
34
src/components/order-form/form/car-color/helper.ts
Normal file
@@ -0,0 +1,34 @@
|
||||
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'
|
||||
},
|
||||
];
|
||||
1
src/components/order-form/form/car-color/index.ts
Normal file
@@ -0,0 +1 @@
|
||||
export { CarColorInput } from './car-color-input';
|
||||
@@ -0,0 +1,22 @@
|
||||
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}
|
||||
/>
|
||||
);
|
||||
},
|
||||
);
|
||||
33
src/components/order-form/form/car-number/helper.ts
Normal file
@@ -0,0 +1,33 @@
|
||||
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);
|
||||
};
|
||||
2
src/components/order-form/form/car-number/index.ts
Normal file
@@ -0,0 +1,2 @@
|
||||
export { CarNumberInput } from './car-number-input';
|
||||
export { isValidCarNumber } from './helper';
|
||||
12
src/components/order-form/form/date-time/date-time.tsx
Normal file
@@ -0,0 +1,12 @@
|
||||
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
|
||||
1
src/components/order-form/form/date-time/index.ts
Normal file
@@ -0,0 +1 @@
|
||||
export { type DateTimeInputProps, DateTimeInput } from './date-time';
|
||||
@@ -0,0 +1,35 @@
|
||||
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>
|
||||
);
|
||||
};
|
||||
47
src/components/order-form/form/field/form-input-field.tsx
Normal file
@@ -0,0 +1,47 @@
|
||||
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>
|
||||
);
|
||||
};
|
||||
3
src/components/order-form/form/field/index.ts
Normal file
@@ -0,0 +1,3 @@
|
||||
export type { FormFieldProps } from './types';
|
||||
export { FormInputField } from './form-input-field';
|
||||
export { FormControllerField } from './form-controller-field';
|
||||
26
src/components/order-form/form/field/types.ts
Normal file
@@ -0,0 +1,26 @@
|
||||
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;
|
||||
};
|
||||
30
src/components/order-form/form/helper.ts
Normal file
@@ -0,0 +1,30 @@
|
||||
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']>;
|
||||
};
|
||||
2
src/components/order-form/form/index.ts
Normal file
@@ -0,0 +1,2 @@
|
||||
export type { OrderFormValues, OrderFormProps } from './types';
|
||||
export { OrderForm } from './order-form';
|
||||
15
src/components/order-form/form/location/helper.ts
Normal file
@@ -0,0 +1,15 @@
|
||||
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);
|
||||
4
src/components/order-form/form/location/index.ts
Normal file
@@ -0,0 +1,4 @@
|
||||
export type { StringLocation } from './types';
|
||||
export * from './location-input';
|
||||
export * from './map';
|
||||
export * from './ymaps';
|
||||
@@ -0,0 +1,40 @@
|
||||
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);
|
||||
}
|
||||
};
|
||||
@@ -0,0 +1 @@
|
||||
export { LocationInput } from './location-input';
|
||||
@@ -0,0 +1,152 @@
|
||||
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
|
||||
@@ -0,0 +1,8 @@
|
||||
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;
|
||||
};
|
||||
10
src/components/order-form/form/location/map/helper.ts
Normal file
@@ -0,0 +1,10 @@
|
||||
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 };
|
||||
};
|
||||
1
src/components/order-form/form/location/map/index.ts
Normal file
@@ -0,0 +1 @@
|
||||
export { MapComponent } from './map';
|
||||
70
src/components/order-form/form/location/map/map.tsx
Normal file
@@ -0,0 +1,70 @@
|
||||
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'],
|
||||
),
|
||||
);
|
||||
17
src/components/order-form/form/location/types.ts
Normal file
@@ -0,0 +1,17 @@
|
||||
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}`;
|
||||
1
src/components/order-form/form/location/ymaps/index.ts
Normal file
@@ -0,0 +1 @@
|
||||
export { YMapsProvider } from './ymaps-provider';
|
||||
@@ -0,0 +1,16 @@
|
||||
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>
|
||||
);
|
||||
};
|
||||
138
src/components/order-form/form/order-form.tsx
Normal file
@@ -0,0 +1,138 @@
|
||||
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
|
||||
1
src/components/order-form/form/phone/helper.ts
Normal file
@@ -0,0 +1 @@
|
||||
export { isValidPhoneNumber } from "react-phone-number-input";
|
||||
2
src/components/order-form/form/phone/index.ts
Normal file
@@ -0,0 +1,2 @@
|
||||
export { PhoneInput } from './phone-input';
|
||||
export { isValidPhoneNumber } from './helper';
|
||||
18
src/components/order-form/form/phone/phone-input.tsx
Normal file
@@ -0,0 +1,18 @@
|
||||
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}
|
||||
/>
|
||||
);
|
||||
};
|
||||
7
src/components/order-form/form/phone/types.ts
Normal file
@@ -0,0 +1,7 @@
|
||||
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;
|
||||
1
src/components/order-form/form/submit/index.ts
Normal file
@@ -0,0 +1 @@
|
||||
export { SubmitButton } from './submit-button';
|
||||
15
src/components/order-form/form/submit/submit-button.tsx
Normal file
@@ -0,0 +1,15 @@
|
||||
import React, { FC } from 'react';
|
||||
import { Button, ButtonProps } from '@chakra-ui/react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
|
||||
export const SubmitButton: FC<ButtonProps> = (props) => {
|
||||
const { t } = useTranslation('~', {
|
||||
keyPrefix: 'dry-wash.order-create.form.submit-button',
|
||||
});
|
||||
|
||||
return (
|
||||
<Button type='submit' colorScheme='primary' borderRadius={50} paddingInline={8} {...props}>
|
||||
{t('label')}
|
||||
</Button>
|
||||
);
|
||||
};
|
||||
16
src/components/order-form/form/types.ts
Normal file
@@ -0,0 +1,16 @@
|
||||
import { SubmitHandler } from "react-hook-form";
|
||||
|
||||
export type OrderFormValues = {
|
||||
phone: string;
|
||||
carNumber: string;
|
||||
carColor: string;
|
||||
carBody: string;
|
||||
carLocation: string;
|
||||
availableDatetimeBegin: string;
|
||||
availableDatetimeEnd: string;
|
||||
};
|
||||
|
||||
export type OrderFormProps = {
|
||||
onSubmit: SubmitHandler<OrderFormValues>;
|
||||
loading: boolean;
|
||||
};
|
||||
1
src/components/order-form/index.ts
Normal file
@@ -0,0 +1 @@
|
||||
export * from './form';
|
||||
1
src/components/order-view/details/index.ts
Normal file
@@ -0,0 +1 @@
|
||||
export { OrderDetails } from './order-details';
|
||||
111
src/components/order-view/details/order-details.tsx
Normal file
@@ -0,0 +1,111 @@
|
||||
import React, { FC } from 'react';
|
||||
import {
|
||||
Alert,
|
||||
AlertIcon,
|
||||
Heading,
|
||||
HStack,
|
||||
UnorderedList,
|
||||
VStack,
|
||||
ListItem,
|
||||
Text,
|
||||
} from '@chakra-ui/react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
|
||||
import { Order } from '../../../models/landing';
|
||||
import { formatDatetime } from '../../../lib';
|
||||
import { carBodySelectOptions } from '../../order-form/form/car-body/helper';
|
||||
|
||||
import { OrderStatus } from './status';
|
||||
|
||||
type OrderDetailsProps = Pick<
|
||||
Order.View,
|
||||
| 'orderNumber'
|
||||
| 'status'
|
||||
| 'phone'
|
||||
| 'carNumber'
|
||||
| 'carBody'
|
||||
| 'carColor'
|
||||
| 'location'
|
||||
| 'startWashTime'
|
||||
| 'endWashTime'
|
||||
| 'created'
|
||||
>;
|
||||
|
||||
export const OrderDetails: FC<OrderDetailsProps> = ({
|
||||
orderNumber,
|
||||
status,
|
||||
phone,
|
||||
carNumber,
|
||||
carBody,
|
||||
carColor,
|
||||
location,
|
||||
startWashTime,
|
||||
endWashTime,
|
||||
}) => {
|
||||
const { t } = useTranslation('~', {
|
||||
keyPrefix: 'dry-wash.order-view.details',
|
||||
});
|
||||
const { t: tCarBody } = useTranslation('~', {
|
||||
keyPrefix: 'dry-wash.order-create.car-body-select.options',
|
||||
});
|
||||
|
||||
return (
|
||||
<VStack p={4} alignItems='flex-start' gap={4}>
|
||||
<HStack
|
||||
width='full'
|
||||
flexWrap='wrap'
|
||||
justifyContent='space-between'
|
||||
gap={2}
|
||||
>
|
||||
<Heading as='h2' size='lg'>
|
||||
{t('title', { number: orderNumber })}
|
||||
</Heading>
|
||||
<OrderStatus value={status} />
|
||||
</HStack>
|
||||
<UnorderedList styleType='none'>
|
||||
{[
|
||||
{
|
||||
label: t('owner'),
|
||||
value: phone,
|
||||
},
|
||||
{
|
||||
label: t('car'),
|
||||
value: [
|
||||
carNumber,
|
||||
tCarBody(
|
||||
`${carBodySelectOptions.find(({ value }) => value === carBody)?.labelTKey}`,
|
||||
),
|
||||
carColor,
|
||||
]
|
||||
.filter((v) => v)
|
||||
.join(', '),
|
||||
},
|
||||
{
|
||||
label: t('location'),
|
||||
value: location,
|
||||
},
|
||||
{
|
||||
label: t('datetime-range'),
|
||||
value: [
|
||||
formatDatetime(startWashTime),
|
||||
formatDatetime(endWashTime),
|
||||
].join(' - '),
|
||||
},
|
||||
].map(({ label, value }, i) => (
|
||||
<ListItem key={i}>
|
||||
{label}:{' '}
|
||||
<Text as='span' color='primary.500' fontWeight='bold'>
|
||||
{value}
|
||||
</Text>
|
||||
</ListItem>
|
||||
))}
|
||||
</UnorderedList>
|
||||
<Alert status='info' alignItems='flex-start'>
|
||||
<AlertIcon />
|
||||
{t('alert')}
|
||||
</Alert>
|
||||
</VStack>
|
||||
);
|
||||
};
|
||||
|
||||
// todo: add i18n for date & time
|
||||
1
src/components/order-view/details/status/index.ts
Normal file
@@ -0,0 +1 @@
|
||||
export { OrderStatus } from './order-status';
|
||||
49
src/components/order-view/details/status/order-status.tsx
Normal file
@@ -0,0 +1,49 @@
|
||||
import { Tag, TagProps } from '@chakra-ui/react';
|
||||
import React, { FC } from 'react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { TFunction } from 'i18next';
|
||||
|
||||
import { Order } from '../../../../models/landing';
|
||||
|
||||
const getPropsByStatus = (
|
||||
status: Order.Status,
|
||||
t: TFunction<'~', 'dry-wash.arm.order.status'>,
|
||||
): TagProps => {
|
||||
switch (status) {
|
||||
case 'canceled':
|
||||
return {
|
||||
colorScheme: 'red',
|
||||
children: t('canceled'),
|
||||
};
|
||||
case 'pending':
|
||||
return {
|
||||
colorScheme: 'yellow',
|
||||
children: t('pending'),
|
||||
};
|
||||
case 'progress':
|
||||
return {
|
||||
colorScheme: 'orange',
|
||||
children: t('progress'),
|
||||
};
|
||||
case 'working':
|
||||
return {
|
||||
colorScheme: 'orange',
|
||||
children: t('working'),
|
||||
};
|
||||
case 'complete':
|
||||
return {
|
||||
colorScheme: 'green',
|
||||
children: t('complete'),
|
||||
};
|
||||
}
|
||||
};
|
||||
|
||||
export const OrderStatus: FC<{ value: Order.Status }> = ({ value }) => {
|
||||
const { t } = useTranslation('~', {
|
||||
keyPrefix: 'dry-wash.arm.order.status',
|
||||
});
|
||||
|
||||
const props = getPropsByStatus(value, t);
|
||||
|
||||
return <Tag variant='solid' {...props} />;
|
||||
};
|
||||
1
src/components/order-view/index.ts
Normal file
@@ -0,0 +1 @@
|
||||
export * from './details';
|
||||
@@ -1,14 +1,31 @@
|
||||
import React, { FC, PropsWithChildren } from 'react';
|
||||
import React, { ComponentType, FC, PropsWithChildren } from 'react';
|
||||
import { ChakraProvider } from '@chakra-ui/react';
|
||||
|
||||
import { default as landingTheme } from './theme-config';
|
||||
import Fonts from './Fonts';
|
||||
import { toastOptions } from './toast-options';
|
||||
|
||||
export const LandingThemeProvider: FC<PropsWithChildren> = ({ children }) => {
|
||||
return (
|
||||
<ChakraProvider theme={landingTheme}>
|
||||
<ChakraProvider theme={landingTheme} toastOptions={toastOptions}>
|
||||
<Fonts />
|
||||
{children}
|
||||
</ChakraProvider>
|
||||
);
|
||||
};
|
||||
|
||||
export function withLandingThemeProvider<T extends JSX.IntrinsicAttributes>(WrappedComponent: ComponentType<T>) {
|
||||
const displayName = WrappedComponent.displayName || WrappedComponent.name || 'Component';
|
||||
|
||||
const ComponentWithLandingThemeProvider = (props: T) => {
|
||||
return (
|
||||
<LandingThemeProvider>
|
||||
<WrappedComponent {...props} />
|
||||
</LandingThemeProvider>
|
||||
);
|
||||
};
|
||||
|
||||
ComponentWithLandingThemeProvider.displayName = `withLandingThemeProvider(${displayName})`;
|
||||
|
||||
return ComponentWithLandingThemeProvider;
|
||||
}
|
||||
|
||||
@@ -1 +1 @@
|
||||
export { LandingThemeProvider } from './LandingThemeProvider';
|
||||
export { LandingThemeProvider, withLandingThemeProvider } from './LandingThemeProvider';
|
||||
@@ -37,6 +37,44 @@ const overrides = {
|
||||
}
|
||||
},
|
||||
},
|
||||
components: {
|
||||
Input: {
|
||||
variants: {
|
||||
filled: {
|
||||
field: {
|
||||
borderRadius: 12,
|
||||
bgColor: 'primary.50',
|
||||
color: 'primary.600',
|
||||
_hover: {
|
||||
borderColor: 'primary.100',
|
||||
bgColor: 'primary.50',
|
||||
},
|
||||
_focus: {
|
||||
borderColor: 'primary.200',
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
Select: {
|
||||
variants: {
|
||||
filled: {
|
||||
field: {
|
||||
borderRadius: 12,
|
||||
bgColor: 'primary.50',
|
||||
color: 'primary.600',
|
||||
_hover: {
|
||||
borderColor: 'primary.100',
|
||||
bgColor: 'primary.50',
|
||||
},
|
||||
_focus: {
|
||||
borderColor: 'primary.200',
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
export default extendTheme(overrides);
|
||||
8
src/containers/LandingThemeProvider/toast-options.ts
Normal file
@@ -0,0 +1,8 @@
|
||||
import { ToastProviderProps } from "@chakra-ui/react";
|
||||
|
||||
export const toastOptions: ToastProviderProps = {
|
||||
defaultOptions: {
|
||||
position: 'top-right',
|
||||
isClosable: true,
|
||||
}
|
||||
};
|
||||
28
src/hooks/useShowToast.ts
Normal file
@@ -0,0 +1,28 @@
|
||||
import { useToast } from '@chakra-ui/react';
|
||||
import { useCallback } from 'react';
|
||||
|
||||
const useShowToast = () => {
|
||||
const toast = useToast();
|
||||
|
||||
const showToast = useCallback(
|
||||
(
|
||||
title: string,
|
||||
status: 'info' | 'warning' | 'success' | 'error',
|
||||
description?: string,
|
||||
) => {
|
||||
toast({
|
||||
title,
|
||||
description,
|
||||
status,
|
||||
duration: 5000,
|
||||
isClosable: true,
|
||||
position: 'top-right',
|
||||
});
|
||||
},
|
||||
[toast],
|
||||
);
|
||||
|
||||
return showToast;
|
||||
};
|
||||
|
||||
export default useShowToast;
|
||||
34
src/keycloak.ts
Normal file
@@ -0,0 +1,34 @@
|
||||
import Keycloak from 'keycloak-js';
|
||||
|
||||
const keycloak = new Keycloak({
|
||||
url: 'https://kc.bro-js.ru',
|
||||
realm: 'open',
|
||||
clientId: 'dry-wash',
|
||||
});
|
||||
|
||||
const authLogin = async ({ redirect }) => {
|
||||
let user = null;
|
||||
|
||||
try {
|
||||
const authenticated = await keycloak.init({ onLoad: 'login-required' });
|
||||
if (authenticated) {
|
||||
user = { ...(await keycloak.loadUserInfo()), ...keycloak.tokenParsed };
|
||||
|
||||
const isOperator =
|
||||
user?.resource_access?.['dry-wash']?.roles.includes('operator');
|
||||
|
||||
if (!isOperator) {
|
||||
redirect();
|
||||
}
|
||||
|
||||
return user;
|
||||
} else {
|
||||
console.log('User is not authenticated');
|
||||
}
|
||||
} catch (error) {
|
||||
keycloak.login();
|
||||
console.error('Failed to initialize adapter:', error);
|
||||
}
|
||||
};
|
||||
|
||||
export default authLogin;
|
||||
@@ -10,3 +10,7 @@ export const getTimeSlot = (start: string, end: string) => {
|
||||
end: endDay,
|
||||
});
|
||||
};
|
||||
|
||||
export const formatDatetime = (datetime: string) => {
|
||||
return dayjs(datetime).format('HH:mm DD.MM.YYYY');
|
||||
};
|
||||
@@ -1 +1,2 @@
|
||||
export * from './date-helpers';
|
||||
export * from './types';
|
||||
@@ -1,2 +1 @@
|
||||
export * as mockOrder from './order';
|
||||
export * as mockReview from './review';
|
||||
@@ -1,7 +0,0 @@
|
||||
import { Order } from "../../models";
|
||||
|
||||
export const orders: Order.View[] = [
|
||||
{ id: 'id1' },
|
||||
{ id: 'id2' },
|
||||
{ id: 'id3' },
|
||||
];
|
||||
13
src/models/api/common.ts
Normal file
@@ -0,0 +1,13 @@
|
||||
type SuccessResponse<Body> = {
|
||||
success: true;
|
||||
body: Body;
|
||||
};
|
||||
|
||||
export type ErrorMessage = string;
|
||||
|
||||
type ErrorResponse = {
|
||||
success: false;
|
||||
message: ErrorMessage;
|
||||
};
|
||||
|
||||
export type BaseResponse<Body> = SuccessResponse<Body> | ErrorResponse;
|
||||