Compare commits
95 Commits
feature/i1
...
main
Author | SHA1 | Date | |
---|---|---|---|
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 | |||
|
6705e74ece | ||
52bb3790c7 | |||
|
2cf60c7b16 | ||
|
d30202108c | ||
|
012de3c670 | ||
|
409c339b3c | ||
|
8611405edd | ||
|
407da721af | ||
|
409473413a | ||
|
823e192c51 | ||
|
d4965b7aba | ||
|
16b4627166 | ||
7025c1a31b | |||
2d55f26de5 | |||
da244adee0 | |||
5d1a679c68 | |||
a9738c7d8a | |||
6442f1f407 | |||
2130532dfd | |||
3b4f5a8486 | |||
b5f3838536 | |||
dee3a04310 | |||
acd39b1e32 | |||
c2fad8a3ff | |||
9eb0080d13 | |||
920f4440e9 | |||
e374cbfdd3 | |||
0b30ce6571 | |||
3b47e1dcdf | |||
4e8bc2fca5 | |||
0c9663fcef | |||
|
181198c0cb | ||
|
5ca3fd2613 | ||
|
0cd7ec8b22 | ||
|
66c1323f00 | ||
a63304b5e4 | |||
|
effd9dae2d | ||
|
1787e94f8e | ||
|
855ec2f138 | ||
|
d15d761f1a | ||
05303092e2 | |||
|
98181ff354 | ||
|
5822f5f7b0 | ||
|
e72736e692 | ||
|
3cdb9a997e | ||
|
425a47b33c | ||
|
862f2ef5f5 | ||
|
7e18d765bc | ||
edc329c154 | |||
5d208b1fc5 | |||
1839136c9f | |||
a6ec94785a | |||
18ca96bfe9 | |||
db918ba7c7 | |||
|
c92c879b31 | ||
|
752fe72786 | ||
|
36200382a8 | ||
|
8328ee8028 | ||
d1d92c63e8 | |||
|
95d26e58a3 | ||
|
bc629eabdf | ||
dedc7e1608 | |||
1c8348dee5 | |||
04e4d011ff | |||
|
cba5beda72 | ||
|
3ade6f83cc | ||
|
897602c471 | ||
|
d2b74a1467 | ||
e4969938c3 | |||
116e883e91 |
13
README.md
13
README.md
@ -45,10 +45,12 @@
|
||||
### MVP1
|
||||
|
||||
**1. Landing**
|
||||
|
||||
- преимущества сервиса
|
||||
- оставить заявку (редирект на Страницу оформления заказа)
|
||||
|
||||
**2. Страница для оформления заказа**
|
||||
|
||||
- форма
|
||||
- номер машины (mask input)
|
||||
- цвет машины
|
||||
@ -58,10 +60,12 @@
|
||||
- после заполнения редирект на страницу с деталями заказа
|
||||
|
||||
**3. Страница с деталями заказа**
|
||||
|
||||
- описание заказа
|
||||
- детали заказа (id, статус)
|
||||
|
||||
**3. АРМ оператора**
|
||||
|
||||
- список заказов (RUD)
|
||||
- id заказа
|
||||
- статус заказа (готово / не готово)
|
||||
@ -72,7 +76,6 @@
|
||||
- кнопка "Добавить"
|
||||
- кнопка "Удалить"
|
||||
|
||||
|
||||
### Built With
|
||||
|
||||
[![React][React.js]][React-url]
|
||||
@ -103,6 +106,14 @@
|
||||
|
||||
<p align="right">(<a href="#readme-top">back to top</a>)</p>
|
||||
|
||||
## Instructions
|
||||
### Stubs types generation
|
||||
1. generate types with json-literal-typer (should be installed globally)
|
||||
```sh
|
||||
npx json-literal-typer -i <path to json> -o <path to output ts-file>
|
||||
```
|
||||
2. export default type from output file
|
||||
|
||||
<!-- PARTICIPANTS -->
|
||||
|
||||
## Participants
|
||||
|
@ -1,9 +1,9 @@
|
||||
/* eslint-disable no-undef */
|
||||
/* eslint-disable @typescript-eslint/no-require-imports */
|
||||
const pkg = require("./package");
|
||||
const pkg = require('./package');
|
||||
|
||||
module.exports = {
|
||||
apiPath: "stubs/api",
|
||||
apiPath: 'stubs/api',
|
||||
webpackConfig: {
|
||||
output: {
|
||||
publicPath: `/static/${pkg.name}/${process.env.VERSION || pkg.version}/`,
|
||||
@ -11,17 +11,19 @@ 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.arm": "/arm",
|
||||
'dry-wash.main': '/dry-wash',
|
||||
'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/*',
|
||||
},
|
||||
features: {
|
||||
"dry-wash-pl": {
|
||||
'dry-wash-pl': {
|
||||
// add your features here in the format [featureName]: { value: string }
|
||||
},
|
||||
},
|
||||
config: {
|
||||
"dry-wash-pl.api": "/api",
|
||||
'dry-wash.api': '/api',
|
||||
},
|
||||
};
|
||||
|
@ -3,6 +3,7 @@ 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}"] },
|
||||
@ -12,7 +13,8 @@ export default [
|
||||
pluginReact.configs.flat.recommended,
|
||||
{
|
||||
plugins: {
|
||||
'@stylistic': stylistic
|
||||
'@stylistic': stylistic,
|
||||
'import': pluginImport,
|
||||
},
|
||||
"rules": {
|
||||
"no-unused-vars": "off",
|
||||
@ -24,13 +26,20 @@ export default [
|
||||
"caughtErrorsIgnorePattern": "^_"
|
||||
}
|
||||
],
|
||||
"sort-imports": ["error", {
|
||||
"ignoreCase": false,
|
||||
"ignoreDeclarationSort": true,
|
||||
"ignoreMemberSort": true,
|
||||
"memberSyntaxSortOrder": ["none", "all", "multiple", "single"],
|
||||
"allowSeparatedGroups": true
|
||||
}],
|
||||
"sort-imports": ["off"],
|
||||
"import/order": [
|
||||
"error",
|
||||
{
|
||||
"groups": [
|
||||
"builtin",
|
||||
"external",
|
||||
"internal",
|
||||
"parent",
|
||||
["sibling", "index"]
|
||||
],
|
||||
"newlines-between": "always",
|
||||
}
|
||||
],
|
||||
semi: ["error", "always"],
|
||||
'@stylistic/indent': ['error', 2],
|
||||
'react/prop-types': 'off'
|
||||
|
92
locales/en.json
Normal file
92
locales/en.json
Normal file
@ -0,0 +1,92 @@
|
||||
{
|
||||
"dry-wash.landing.benefits-section.description": "Discover the benefits of our car dry cleaning services",
|
||||
"dry-wash.landing.benefits-section.heading": "Advantages of an eco-friendly car wash",
|
||||
"dry-wash.landing.benefits-section.list.0": "Environmentally friendly products",
|
||||
"dry-wash.landing.benefits-section.list.1": "Fast and efficient service",
|
||||
"dry-wash.landing.benefits-section.list.2": "Convenient mobile access",
|
||||
"dry-wash.landing.benefits-section.list.3": "Reliable and trustworthy",
|
||||
"dry-wash.landing.footer.copyright": "\u00A9 {{currentYear}} DryMaster. All rights reserved",
|
||||
"dry-wash.landing.footer.links.faq": "FAQ",
|
||||
"dry-wash.landing.footer.links.privacy-policy": "Privacy policy",
|
||||
"dry-wash.landing.footer.links.service-terms": "Terms of service",
|
||||
"dry-wash.landing.hero-section.description": "Experience the ultimate convenience of a dry car wash, designed for a cleaner planet.",
|
||||
"dry-wash.landing.hero-section.headline": "Revitalize Your Ride with Eco-Friendly Care!",
|
||||
"dry-wash.landing.make-order-button": "Make order",
|
||||
"dry-wash.landing.site-logo": "The logo of the \"Dry Master\" company",
|
||||
"dry-wash.landing.social-proof-section.heading": "We are being chosen",
|
||||
"dry-wash.order-create.title": "Order a car wash",
|
||||
"dry-wash.order-create.form.field.validation.required": "This field is required",
|
||||
"dry-wash.order-create.form.phone-field.label": "Phone number",
|
||||
"dry-wash.order-create.form.phone-field.invalid": "Enter the valid phone number",
|
||||
"dry-wash.order-create.form.car-number-field.label": "Car number",
|
||||
"dry-wash.order-create.form.car-number-field.invalid": "Enter the valid vehicle number",
|
||||
"dry-wash.order-create.form.car-color-field.label": "The color of the car",
|
||||
"dry-wash.order-create.form.car-body-field.label": "Car body type",
|
||||
"dry-wash.order-create.form.washing-datetime-field.label": "What time is the car available?",
|
||||
"dry-wash.order-create.form.washing-location-field.label": "Where is the car located?",
|
||||
"dry-wash.order-create.form.washing-location-field.placeholder": "Enter the address or select on the map",
|
||||
"dry-wash.order-create.form.washing-location-field.help": "For example, 55.754364, 48.743295 Universitetskaya Street, 1, Innopolis, Verkhneuslonsky district, Republic of Tatarstan (Tatarstan), 420500",
|
||||
"dry-wash.order-create.car-body-select.placeholder": "Not specified",
|
||||
"dry-wash.order-create.car-body-select.options.sedan": "Sedan",
|
||||
"dry-wash.order-create.car-body-select.options.hatchback" : "Hatchback",
|
||||
"dry-wash.order-create.car-body-select.options.crossover" : "Crossover",
|
||||
"dry-wash.order-create.car-body-select.options.suv" : "Sport utility vehicle",
|
||||
"dry-wash.order-create.car-body-select.options.station-wagon" : "Station wagon",
|
||||
"dry-wash.order-create.car-body-select.options.coupe" : "Coupe",
|
||||
"dry-wash.order-create.car-body-select.options.minivan" : "Minivan",
|
||||
"dry-wash.order-create.car-body-select.options.pickup" : "Pickup",
|
||||
"dry-wash.order-create.car-body-select.options.liftback" : "Liftback",
|
||||
"dry-wash.order-create.car-body-select.options.sports-car" : "Sports-car",
|
||||
"dry-wash.order-create.car-body-select.options.other": "Other",
|
||||
"dry-wash.order-create.form.submit-button.label": "Submit",
|
||||
"dry-wash.order-view.title": "Your order",
|
||||
"dry-wash.order-view.error.title": "Error",
|
||||
"dry-wash.order-view.fetch.error": "Failed to fetch the details of order #{{number}}",
|
||||
"dry-wash.order-view.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.table.header.carNumber": "Car Number",
|
||||
"dry-wash.arm.order.table.header.washingTime": "Washing Time",
|
||||
"dry-wash.arm.order.table.header.orderDate": "Order Date",
|
||||
"dry-wash.arm.order.table.header.status": "Status",
|
||||
"dry-wash.arm.order.table.header.telephone": "Telephone",
|
||||
"dry-wash.arm.order.table.header.location": "Location",
|
||||
"dry-wash.arm.master.title": "Masters",
|
||||
"dry-wash.arm.master.table.header.name": "Name",
|
||||
"dry-wash.arm.master.table.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.drawer.title": "Add New Master",
|
||||
"dry-wash.arm.master.drawer.inputName.label": "Full Name",
|
||||
"dry-wash.arm.master.drawer.inputName.placeholder": "Enter Full Name",
|
||||
"dry-wash.arm.master.drawer.inputPhone.label": "Phone Number",
|
||||
"dry-wash.arm.master.drawer.inputPhone.placeholder": "Enter Phone Number",
|
||||
"dry-wash.arm.master.drawer.button.save": "Save",
|
||||
"dry-wash.arm.master.drawer.button.cancel": "Cancel",
|
||||
"dry-wash.arm.master.sideBar.orders": "Orders",
|
||||
"dry-wash.arm.master.sideBar.master": "Masters",
|
||||
"dry-wash.arm.master.sideBar.title": "Dry Master",
|
||||
"dry-wash.notFound.title": "Page Not Found",
|
||||
"dry-wash.notFound.description": "Unfortunately, the page you are looking for does not exist.",
|
||||
"dry-wash.notFound.button.back": "Back to Home",
|
||||
"dry-wash.errorBoundary.title": "Something went wrong",
|
||||
"dry-wash.errorBoundary.description": "We are already working on fixing the issue",
|
||||
"dry-wash.errorBoundary.button.reload": "Reload Page",
|
||||
"dry-wash.washTime.timeSlot": "{{start}} - {{end}}"
|
||||
}
|
@ -3,7 +3,7 @@
|
||||
"dry-wash.arm.order.title": "Заказы",
|
||||
"dry-wash.arm.order.status.progress": "Выполняется",
|
||||
"dry-wash.arm.order.status.complete": "Завершено",
|
||||
"dry-wash.arm.order.status.pending": "в ожидании",
|
||||
"dry-wash.arm.order.status.pending": "В ожидании",
|
||||
"dry-wash.arm.order.status.working": "В работе",
|
||||
"dry-wash.arm.order.status.canceled": "Отменено",
|
||||
"dry-wash.arm.order.status.placeholder": "Выберите статус",
|
||||
@ -13,7 +13,11 @@
|
||||
"dry-wash.arm.order.table.header.status": "Статус",
|
||||
"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": "Телефон",
|
||||
@ -26,8 +30,63 @@
|
||||
"dry-wash.arm.master.drawer.inputPhone.placeholder": "Введите номер телефона",
|
||||
"dry-wash.arm.master.drawer.button.save": "Сохранить",
|
||||
"dry-wash.arm.master.drawer.button.cancel": "Отменить",
|
||||
"dry-wash.arm.master.sideBar.title": " Сухой мастер",
|
||||
"dry-wash.arm.master.sideBar.title.master": "Мастера",
|
||||
"dry-wash.arm.master.sideBar.title.orders": "Заказы"
|
||||
|
||||
}
|
||||
"dry-wash.arm.master.sideBar.orders": "Заказы",
|
||||
"dry-wash.arm.master.sideBar.master": "Мастера",
|
||||
"dry-wash.arm.master.sideBar.title": "Сухой мастер",
|
||||
"dry-wash.landing.benefits-section.description": "Откройте для себя преимущества наших услуг по химчистке автомобилей",
|
||||
"dry-wash.landing.benefits-section.heading": "Преимущества экологичной автомойки",
|
||||
"dry-wash.landing.benefits-section.list.0": "Экологически безопасные продукты",
|
||||
"dry-wash.landing.benefits-section.list.1": "Быстрое и эффективное обслуживание",
|
||||
"dry-wash.landing.benefits-section.list.2": "Удобный мобильный доступ",
|
||||
"dry-wash.landing.benefits-section.list.3": "Надежный и заслуживающий доверия",
|
||||
"dry-wash.landing.footer.copyright": "\u00A9 {{currentYear}} DryMaster. Все права защищены",
|
||||
"dry-wash.landing.footer.links.faq": "FAQ",
|
||||
"dry-wash.landing.footer.links.privacy-policy": "Политика конфиденциальности",
|
||||
"dry-wash.landing.footer.links.service-terms": "Условия обслуживания",
|
||||
"dry-wash.landing.hero-section.description": "Ощутите максимальное удобство сухой мойки автомобилей, созданной для того, чтобы планета стала чище",
|
||||
"dry-wash.landing.hero-section.headline": "Оживите свою поездку с помощью экологически чистого ухода!",
|
||||
"dry-wash.landing.make-order-button": "Сделать заказ",
|
||||
"dry-wash.landing.site-logo": "Логотип компании \u00ABDry Master\u00BB",
|
||||
"dry-wash.landing.social-proof-section.heading": "Нас выбирают",
|
||||
"dry-wash.order-create.title": "Заказать мойку",
|
||||
"dry-wash.order-create.form.field.validation.required": "Это поле обязательно для заполнения",
|
||||
"dry-wash.order-create.form.phone-field.label": "Номер телефона",
|
||||
"dry-wash.order-create.form.phone-field.invalid": "Введите корректный номер телефона",
|
||||
"dry-wash.order-create.form.car-number-field.label": "Номер автомобиля",
|
||||
"dry-wash.order-create.form.car-number-field.invalid": "Введите корректный номер автомобиля",
|
||||
"dry-wash.order-create.form.car-color-field.label": "Цвет автомобиля",
|
||||
"dry-wash.order-create.form.car-body-field.label": "Тип кузова автомобиля",
|
||||
"dry-wash.order-create.form.washing-datetime-field.label": "В какое время автомобиль доступен?",
|
||||
"dry-wash.order-create.form.washing-location-field.label": "Где находится автомобиль?",
|
||||
"dry-wash.order-create.form.washing-location-field.placeholder": "Введите адрес или выберите на карте",
|
||||
"dry-wash.order-create.form.washing-location-field.help": "Например, 55.754364, 48.743295 Университетская улица, 1, Иннополис, Верхнеуслонский район, Республика Татарстан (Татарстан), 420500",
|
||||
"dry-wash.order-create.car-body-select.placeholder": "Не указан",
|
||||
"dry-wash.order-create.car-body-select.options.sedan": "Седан",
|
||||
"dry-wash.order-create.car-body-select.options.hatchback": "Хэтчбек",
|
||||
"dry-wash.order-create.car-body-select.options.crossover": "Кроссовер",
|
||||
"dry-wash.order-create.car-body-select.options.suv": "Внедорожник",
|
||||
"dry-wash.order-create.car-body-select.options.station-wagon": "Универсал",
|
||||
"dry-wash.order-create.car-body-select.options.coupe": "Купе",
|
||||
"dry-wash.order-create.car-body-select.options.minivan": "Минивэн",
|
||||
"dry-wash.order-create.car-body-select.options.pickup": "Пикап",
|
||||
"dry-wash.order-create.car-body-select.options.liftback": "Лифтбек",
|
||||
"dry-wash.order-create.car-body-select.options.sports-car": "Спорткар",
|
||||
"dry-wash.order-create.car-body-select.options.other": "Другой",
|
||||
"dry-wash.order-create.form.submit-button.label": "Отправить",
|
||||
"dry-wash.order-view.title": "Ваш заказ",
|
||||
"dry-wash.order-view.error.title": "Ошибка",
|
||||
"dry-wash.order-view.fetch.error": "Не удалось загрузить детали заказа №{{number}}",
|
||||
"dry-wash.order-view.details.title": "Заказ №{{number}}",
|
||||
"dry-wash.order-view.details.owner": "Владелец",
|
||||
"dry-wash.order-view.details.car": "Автомобиль",
|
||||
"dry-wash.order-view.details.location": "Где",
|
||||
"dry-wash.order-view.details.datetime-range": "Когда",
|
||||
"dry-wash.order-view.details.alert": "С вами свяжется оператор насчет оплаты по указанному номеру телефона",
|
||||
"dry-wash.notFound.title": "Страница не найдена",
|
||||
"dry-wash.notFound.description": "К сожалению, запрашиваемая вами страница не существует.",
|
||||
"dry-wash.notFound.button.back": "Вернуться на главную",
|
||||
"dry-wash.errorBoundary.title": "Что-то пошло не так",
|
||||
"dry-wash.errorBoundary.description": "Мы уже работаем над исправлением проблемы",
|
||||
"dry-wash.errorBoundary.button.reload": "Перезагрузить страницу",
|
||||
"dry-wash.washTime.timeSlot": "{{start}} - {{end}}"
|
||||
}
|
1087
package-lock.json
generated
1087
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
12
package.json
12
package.json
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "dry-wash",
|
||||
"version": "0.0.0",
|
||||
"version": "0.3.0",
|
||||
"description": "<a id=\"readme-top\"></a>",
|
||||
"main": "./src/index.tsx",
|
||||
"scripts": {
|
||||
@ -17,19 +17,26 @@
|
||||
"author": "",
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"@brojs/cli": "^1.6.1",
|
||||
"@brojs/cli": "^1.6.3",
|
||||
"@chakra-ui/icons": "^2.2.4",
|
||||
"@chakra-ui/react": "^2.4.2",
|
||||
"@emotion/react": "^11.4.1",
|
||||
"@emotion/styled": "^11.3.0",
|
||||
"@fontsource/open-sans": "^5.1.0",
|
||||
"@lottiefiles/react-lottie-player": "^3.5.4",
|
||||
"@pbe/react-yandex-maps": "^1.2.5",
|
||||
"@types/react": "^18.3.12",
|
||||
"dayjs": "^1.11.13",
|
||||
"express": "^4.21.1",
|
||||
"framer-motion": "^6.2.8",
|
||||
"i18next": "^23.16.4",
|
||||
"keycloak-js": "^23.0.7",
|
||||
"react": "^18.3.1",
|
||||
"react-dom": "^18.3.1",
|
||||
"react-hook-form": "^7.53.2",
|
||||
"react-i18next": "^15.1.1",
|
||||
"react-icons": "^5.3.0",
|
||||
"react-phone-number-input": "^3.4.9",
|
||||
"react-router-dom": "^6.27.0"
|
||||
},
|
||||
"devDependencies": {
|
||||
@ -37,6 +44,7 @@
|
||||
"@stylistic/eslint-plugin": "^2.10.1",
|
||||
"@types/react-dom": "^18.3.1",
|
||||
"eslint": "^9.14.0",
|
||||
"eslint-plugin-import": "^2.31.0",
|
||||
"eslint-plugin-react": "^7.37.2",
|
||||
"globals": "^15.11.0",
|
||||
"prettier": "3.3.3",
|
||||
|
40
src/__data__/urls.ts
Normal file
40
src/__data__/urls.ts
Normal file
@ -0,0 +1,40 @@
|
||||
import { generatePath } from 'react-router-dom';
|
||||
import { getNavigationValue } from '@brojs/cli';
|
||||
|
||||
import { Order } from '../models/landing';
|
||||
|
||||
const getFullUrls = (url: string) =>
|
||||
`${getNavigationValue('dry-wash.main')}${url}`;
|
||||
|
||||
export const URLs = {
|
||||
landing: {
|
||||
url: getNavigationValue('dry-wash.main'),
|
||||
getUrl() {
|
||||
return this.url;
|
||||
},
|
||||
},
|
||||
orderCreate: {
|
||||
url: getFullUrls(getNavigationValue('dry-wash.order.create')),
|
||||
getUrl() {
|
||||
return this.url;
|
||||
},
|
||||
},
|
||||
orderView: {
|
||||
url: getFullUrls(getNavigationValue('dry-wash.order.view')),
|
||||
getUrl(orderId: Order.Id) {
|
||||
return generatePath(this.url, { orderId });
|
||||
},
|
||||
},
|
||||
armMaster: {
|
||||
url: getNavigationValue('dry-wash.arm.master'),
|
||||
isOn: Boolean(getNavigationValue('dry-wash.arm.master')),
|
||||
},
|
||||
armOrder: {
|
||||
url: getNavigationValue('dry-wash.arm.order'),
|
||||
isOn: Boolean(getNavigationValue('dry-wash.arm.order')),
|
||||
},
|
||||
armBase: {
|
||||
url: getFullUrls(getNavigationValue('dry-wash.arm')),
|
||||
isOn: Boolean(getNavigationValue('dry-wash.arm')),
|
||||
},
|
||||
};
|
40
src/api/arm.ts
Normal file
40
src/api/arm.ts
Normal file
@ -0,0 +1,40 @@
|
||||
import { getConfigValue } from '@brojs/cli';
|
||||
|
||||
enum ArmEndpoints {
|
||||
ORDERS = '/arm/orders',
|
||||
MASTERS = '/arm/masters',
|
||||
}
|
||||
|
||||
const armService = () => {
|
||||
const endpoint = getConfigValue('dry-wash.api');
|
||||
|
||||
const fetchOrders = async ({ date }: { date: Date }) => {
|
||||
const response = await fetch(`${endpoint}${ArmEndpoints.ORDERS}`, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
body: JSON.stringify({ date }),
|
||||
});
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Error(`Failed to fetch orders: ${response.status}`);
|
||||
}
|
||||
|
||||
return await response.json();
|
||||
};
|
||||
|
||||
const fetchMasters = async () => {
|
||||
const response = await fetch(`${endpoint}${ArmEndpoints.MASTERS}`);
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Error(`Failed to fetch masters: ${response.status}`);
|
||||
}
|
||||
|
||||
return await response.json();
|
||||
};
|
||||
|
||||
return { fetchOrders, fetchMasters };
|
||||
};
|
||||
|
||||
export { armService, ArmEndpoints };
|
25
src/api/landing.ts
Normal file
25
src/api/landing.ts
Normal file
@ -0,0 +1,25 @@
|
||||
import { getConfigValue } from '@brojs/cli';
|
||||
|
||||
import { Order } from '../models/landing';
|
||||
|
||||
enum LandingEndpoints {
|
||||
ORDER_VIEW = '/order'
|
||||
}
|
||||
|
||||
const LandingService = () => {
|
||||
const endpoint = getConfigValue('dry-wash.api');
|
||||
|
||||
const fetchOrder = async (orderId: Order.Id) => {
|
||||
const response = await fetch(`${endpoint}${LandingEndpoints.ORDER_VIEW}/${orderId}`);
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Error(`Failed to fetch order: ${response.status}`);
|
||||
}
|
||||
|
||||
return await response.json();
|
||||
};
|
||||
|
||||
return { fetchOrder };
|
||||
};
|
||||
|
||||
export { LandingService, LandingEndpoints };
|
12
src/app.tsx
12
src/app.tsx
@ -1,14 +1,18 @@
|
||||
import React from 'react';
|
||||
import { BrowserRouter } from 'react-router-dom';
|
||||
import Routers from './routes';
|
||||
import { ChakraProvider, theme as chakraTheme } from '@chakra-ui/react';
|
||||
|
||||
import Routers from './routes';
|
||||
import ErrorBoundary from './components/ErrorBoundary';
|
||||
|
||||
const App = () => {
|
||||
return (
|
||||
<ChakraProvider theme={chakraTheme}>
|
||||
<BrowserRouter>
|
||||
<Routers></Routers>
|
||||
</BrowserRouter>
|
||||
<ErrorBoundary>
|
||||
<BrowserRouter>
|
||||
<Routers />
|
||||
</BrowserRouter>
|
||||
</ErrorBoundary>
|
||||
</ChakraProvider>
|
||||
);
|
||||
};
|
||||
|
1
src/assets/animation/notFound.json
Normal file
1
src/assets/animation/notFound.json
Normal file
File diff suppressed because one or more lines are too long
31
src/components/DateNavigator/DateNavigator.tsx
Normal file
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
1
src/components/DateNavigator/index.ts
Normal file
@ -0,0 +1 @@
|
||||
export { default } from './DateNavigator';
|
65
src/components/ErrorBoundary/ErrorBoundary.tsx
Normal file
65
src/components/ErrorBoundary/ErrorBoundary.tsx
Normal file
@ -0,0 +1,65 @@
|
||||
import React, { Component, ErrorInfo, ReactNode } from 'react';
|
||||
import { Heading, Text, Button, Center, VStack } from '@chakra-ui/react';
|
||||
import i18next from 'i18next';
|
||||
|
||||
interface ErrorBoundaryState {
|
||||
hasError: boolean;
|
||||
error: Error | null;
|
||||
errorInfo: ErrorInfo | null;
|
||||
}
|
||||
|
||||
interface ErrorBoundaryProps {
|
||||
children: ReactNode;
|
||||
}
|
||||
|
||||
class ErrorBoundary extends Component<ErrorBoundaryProps, ErrorBoundaryState> {
|
||||
constructor(props: ErrorBoundaryProps) {
|
||||
super(props);
|
||||
this.state = {
|
||||
hasError: false,
|
||||
error: null,
|
||||
errorInfo: null,
|
||||
};
|
||||
}
|
||||
|
||||
static getDerivedStateFromError(): Partial<ErrorBoundaryState> {
|
||||
return { hasError: true };
|
||||
}
|
||||
|
||||
componentDidCatch(error: Error, errorInfo: ErrorInfo): void {
|
||||
console.error('Error caught by ErrorBoundary:', error, errorInfo);
|
||||
this.setState({ error, errorInfo });
|
||||
}
|
||||
|
||||
render() {
|
||||
const { hasError } = this.state;
|
||||
//TODO: добавить анимацию после залива 404 страницы
|
||||
//TODO: может сделать обертку для хука, чтоб язык менялся без перезагрузки
|
||||
if (hasError) {
|
||||
return (
|
||||
<Center minH='100vh'>
|
||||
<VStack spacing={4} textAlign='center'>
|
||||
<Heading as='h1' size='2xl'>
|
||||
{i18next.t('~:dry-wash.errorBoundary.title')}
|
||||
</Heading>
|
||||
<Text fontSize='lg'>
|
||||
{i18next.t('~:dry-wash.errorBoundary.description')}
|
||||
</Text>
|
||||
<Button
|
||||
colorScheme='teal'
|
||||
size='lg'
|
||||
variant='outline'
|
||||
onClick={() => window.location.reload()}
|
||||
>
|
||||
{i18next.t('~:dry-wash.errorBoundary.button.reload')}
|
||||
</Button>
|
||||
</VStack>
|
||||
</Center>
|
||||
);
|
||||
}
|
||||
|
||||
return this.props.children;
|
||||
}
|
||||
}
|
||||
|
||||
export default ErrorBoundary;
|
1
src/components/ErrorBoundary/index.ts
Normal file
1
src/components/ErrorBoundary/index.ts
Normal file
@ -0,0 +1 @@
|
||||
export { default } from './ErrorBoundary';
|
@ -1,17 +1,37 @@
|
||||
import { Box, Flex } from '@chakra-ui/react';
|
||||
import React from 'react';
|
||||
import { Navigate, Route, Routes } from 'react-router-dom';
|
||||
|
||||
import Sidebar from '../Sidebar';
|
||||
import Orders from '../Orders';
|
||||
import Masters from '../Masters';
|
||||
import React from 'react';
|
||||
import { URLs } from '../../__data__/urls';
|
||||
|
||||
const LayoutArm = ({ currentPage, onSelectPage }) => (
|
||||
<Flex h='100vh'>
|
||||
<Sidebar onSelectPage={onSelectPage} />
|
||||
<Box flex='1' bg='gray.50'>
|
||||
{currentPage === 'orders' && <Orders />}
|
||||
{currentPage === 'masters' && <Masters />}
|
||||
</Box>
|
||||
</Flex>
|
||||
);
|
||||
const LayoutArm = () => {
|
||||
let defaultRedirect = null;
|
||||
|
||||
if (URLs.armOrder.isOn) {
|
||||
defaultRedirect = URLs.armOrder.url;
|
||||
} else if (URLs.armMaster.isOn) {
|
||||
defaultRedirect = URLs.armMaster.url;
|
||||
}
|
||||
|
||||
return (
|
||||
<Flex h='100vh'>
|
||||
<Sidebar />
|
||||
<Box flex='1' bg='gray.50'>
|
||||
<Routes>
|
||||
<Route index element={<Navigate to={defaultRedirect} replace />} />
|
||||
{URLs.armOrder.isOn && (
|
||||
<Route path={URLs.armOrder.url} element={<Orders />} />
|
||||
)}
|
||||
{URLs.armMaster.isOn && (
|
||||
<Route path={URLs.armMaster.url} element={<Masters />} />
|
||||
)}
|
||||
</Routes>
|
||||
</Box>
|
||||
</Flex>
|
||||
);
|
||||
};
|
||||
|
||||
export default LayoutArm;
|
||||
|
@ -7,16 +7,18 @@ import {
|
||||
IconButton,
|
||||
} from '@chakra-ui/react';
|
||||
import { EditIcon } from '@chakra-ui/icons';
|
||||
import i18next from 'i18next';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
|
||||
const MasterActionsMenu = () => {
|
||||
const { t } = useTranslation('~', {
|
||||
keyPrefix: 'dry-wash.arm.master.table.actionsMenu',
|
||||
});
|
||||
|
||||
return (
|
||||
<Menu>
|
||||
<MenuButton icon={<EditIcon />} as={IconButton} variant='outline' />
|
||||
<MenuList>
|
||||
<MenuItem>
|
||||
{i18next.t('dry-wash.arm.master.table.actionsMenu.delete')}
|
||||
</MenuItem>
|
||||
<MenuItem>{t('delete')}</MenuItem>
|
||||
</MenuList>
|
||||
</Menu>
|
||||
);
|
||||
|
@ -12,7 +12,7 @@ import {
|
||||
DrawerHeader,
|
||||
DrawerOverlay,
|
||||
} from '@chakra-ui/react';
|
||||
import i18next from 'i18next';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
|
||||
const MasterDrawer = ({ isOpen, onClose }) => {
|
||||
const [newMaster, setNewMaster] = useState({ name: '', phone: '' });
|
||||
@ -22,51 +22,44 @@ const MasterDrawer = ({ isOpen, onClose }) => {
|
||||
onClose();
|
||||
};
|
||||
|
||||
const { t } = useTranslation('~', {
|
||||
keyPrefix: 'dry-wash.arm.master.drawer',
|
||||
});
|
||||
|
||||
return (
|
||||
<Drawer isOpen={isOpen} onClose={onClose} size='md'>
|
||||
<DrawerOverlay />
|
||||
<DrawerContent>
|
||||
<DrawerCloseButton />
|
||||
<DrawerHeader>
|
||||
{i18next.t('dry-wash.arm.master.drawer.title')}
|
||||
</DrawerHeader>
|
||||
<DrawerHeader>{t('title')}</DrawerHeader>
|
||||
<DrawerBody>
|
||||
<FormControl mb='4'>
|
||||
<FormLabel>
|
||||
{i18next.t('dry-wash.arm.master.drawer.inputName.label')}
|
||||
</FormLabel>
|
||||
<FormLabel>{t('inputName.label')}</FormLabel>
|
||||
<Input
|
||||
value={newMaster.name}
|
||||
onChange={(e) =>
|
||||
setNewMaster({ ...newMaster, name: e.target.value })
|
||||
}
|
||||
placeholder={i18next.t(
|
||||
'dry-wash.arm.master.drawer.inputName.placeholder',
|
||||
)}
|
||||
placeholder={t('inputName.placeholder')}
|
||||
/>
|
||||
</FormControl>
|
||||
<FormControl>
|
||||
<FormLabel>
|
||||
{' '}
|
||||
{i18next.t('dry-wash.arm.master.drawer.inputPhone.label')}
|
||||
</FormLabel>
|
||||
<FormLabel> {t('inputPhone.label')}</FormLabel>
|
||||
<Input
|
||||
value={newMaster.phone}
|
||||
onChange={(e) =>
|
||||
setNewMaster({ ...newMaster, phone: e.target.value })
|
||||
}
|
||||
placeholder={i18next.t(
|
||||
'dry-wash.arm.master.drawer.inputPhone.placeholder',
|
||||
)}
|
||||
placeholder={t('inputPhone.placeholder')}
|
||||
/>
|
||||
</FormControl>
|
||||
</DrawerBody>
|
||||
<DrawerFooter>
|
||||
<Button colorScheme='teal' mr={3} onClick={handleSave}>
|
||||
{i18next.t('dry-wash.arm.master.drawer.button.save')}
|
||||
{t('button.save')}
|
||||
</Button>
|
||||
<Button variant='ghost' onClick={onClose}>
|
||||
{i18next.t('dry-wash.arm.master.drawer.button.cancel')}
|
||||
{t('button.cancel')}
|
||||
</Button>
|
||||
</DrawerFooter>
|
||||
</DrawerContent>
|
||||
|
@ -1,6 +1,21 @@
|
||||
import React from 'react';
|
||||
import { Badge, Link, Stack, Td, Tr } from '@chakra-ui/react';
|
||||
|
||||
import MasterActionsMenu from '../MasterActionsMenu';
|
||||
import { getTimeSlot } from '../../lib/date-helpers';
|
||||
|
||||
export interface Schedule {
|
||||
id: string;
|
||||
startWashTime: string;
|
||||
endWashTime: string;
|
||||
}
|
||||
|
||||
export type MasterProps = {
|
||||
id: string;
|
||||
name: string;
|
||||
schedule: Schedule[];
|
||||
phone: string;
|
||||
};
|
||||
|
||||
const MasterItem = ({ name, schedule, phone }) => {
|
||||
return (
|
||||
@ -8,9 +23,9 @@ const MasterItem = ({ name, schedule, phone }) => {
|
||||
<Td>{name}</Td>
|
||||
<Td>
|
||||
<Stack direction='row'>
|
||||
{schedule.map((time, index) => (
|
||||
{schedule.map(({ startWashTime, endWashTime }, index) => (
|
||||
<Badge colorScheme={'green'} key={index}>
|
||||
{time}
|
||||
{getTimeSlot(startWashTime, endWashTime)}
|
||||
</Badge>
|
||||
))}
|
||||
</Stack>
|
||||
|
@ -1,4 +1,4 @@
|
||||
import React from 'react';
|
||||
import React, { useEffect, useState } from 'react';
|
||||
import {
|
||||
Box,
|
||||
Heading,
|
||||
@ -10,39 +10,98 @@ import {
|
||||
Button,
|
||||
useDisclosure,
|
||||
Flex,
|
||||
useToast,
|
||||
Td,
|
||||
Text,
|
||||
Spinner,
|
||||
} from '@chakra-ui/react';
|
||||
import { mastersData } from '../../mocks';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
|
||||
import MasterItem from '../MasterItem';
|
||||
import MasterDrawer from '../MasterDrawer';
|
||||
import i18next from 'i18next';
|
||||
import { armService } from '../../api/arm';
|
||||
import { MasterProps } from '../MasterItem/MasterItem';
|
||||
|
||||
const TABLE_HEADERS = ['name', 'currentJob', 'phone', 'actions'];
|
||||
const TABLE_HEADERS = [
|
||||
'name' as const,
|
||||
'currentJob' as const,
|
||||
'phone' as const,
|
||||
'actions' as const,
|
||||
];
|
||||
|
||||
const Masters = () => {
|
||||
const { isOpen, onOpen, onClose } = useDisclosure();
|
||||
const toast = useToast();
|
||||
const { t } = useTranslation('~', {
|
||||
keyPrefix: 'dry-wash.arm.master',
|
||||
});
|
||||
|
||||
const [masters, setMasters] = useState<MasterProps[]>([]);
|
||||
const [loading, setLoading] = useState(false);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
|
||||
const { fetchMasters } = armService();
|
||||
|
||||
useEffect(() => {
|
||||
const loadMasters = async () => {
|
||||
setLoading(true);
|
||||
|
||||
try {
|
||||
const data = await fetchMasters();
|
||||
setMasters(data.body);
|
||||
} catch (err) {
|
||||
setError(err.message);
|
||||
toast({
|
||||
title: t('error.title'),
|
||||
status: 'error',
|
||||
duration: 5000,
|
||||
isClosable: true,
|
||||
position: 'bottom-right',
|
||||
});
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
};
|
||||
|
||||
loadMasters();
|
||||
}, [toast, t]);
|
||||
|
||||
return (
|
||||
<Box p='8'>
|
||||
<Flex justifyContent='space-between' alignItems='center' mb='5'>
|
||||
<Heading size='lg'> {i18next.t('dry-wash.arm.master.title')}</Heading>
|
||||
<Heading size='lg'> {t('title')}</Heading>
|
||||
<Button colorScheme='green' onClick={onOpen}>
|
||||
+ {i18next.t('dry-wash.arm.master.add')}
|
||||
+ {t('add')}
|
||||
</Button>
|
||||
</Flex>
|
||||
<Table variant='simple' colorScheme='blackAlpha'>
|
||||
<Thead>
|
||||
<Tr>
|
||||
{TABLE_HEADERS.map((name) => (
|
||||
<Th key={name}>
|
||||
{i18next.t(`dry-wash.arm.master.table.header.${name}`)}
|
||||
</Th>
|
||||
<Th key={name}>{t(`table.header.${name}`)}</Th>
|
||||
))}
|
||||
</Tr>
|
||||
</Thead>
|
||||
<Tbody>
|
||||
{mastersData.map((master, index) => (
|
||||
<MasterItem key={index} {...master} />
|
||||
))}
|
||||
{loading && (
|
||||
<Tr>
|
||||
<Td colSpan={TABLE_HEADERS.length} textAlign='center' py='8'>
|
||||
<Spinner size='lg' />
|
||||
</Td>
|
||||
</Tr>
|
||||
)}
|
||||
{!loading && masters.length === 0 && !error && (
|
||||
<Tr>
|
||||
<Td colSpan={TABLE_HEADERS.length}>
|
||||
<Text>{t('table.empty')}</Text>
|
||||
</Td>
|
||||
</Tr>
|
||||
)}
|
||||
{!loading &&
|
||||
!error &&
|
||||
masters.map((master, index) => (
|
||||
<MasterItem key={index} {...master} />
|
||||
))}
|
||||
</Tbody>
|
||||
</Table>
|
||||
<MasterDrawer isOpen={isOpen} onClose={onClose} />
|
||||
|
@ -1,33 +1,60 @@
|
||||
import React, { useState } from 'react';
|
||||
import { Td, Tr, Link, Select } from '@chakra-ui/react';
|
||||
import i18next from 'i18next';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import dayjs from 'dayjs';
|
||||
|
||||
const statuses = ['pending', 'progress', 'working', 'canceled', 'complete'];
|
||||
import { getTimeSlot } from '../../lib/date-helpers';
|
||||
|
||||
const statuses = [
|
||||
'pending' as const,
|
||||
'progress' as const,
|
||||
'working' as const,
|
||||
'canceled' as const,
|
||||
'complete' as const,
|
||||
];
|
||||
|
||||
type GetArrItemType<ArrType> =
|
||||
ArrType extends Array<infer ItemType> ? ItemType : never;
|
||||
|
||||
export type OrderProps = {
|
||||
carNumber?: string;
|
||||
startWashTime?: string;
|
||||
endWashTime?: string;
|
||||
orderDate?: string;
|
||||
status?: GetArrItemType<typeof statuses>;
|
||||
phone?: string;
|
||||
location?: string;
|
||||
};
|
||||
|
||||
const OrderItem = ({
|
||||
carNumber,
|
||||
washTime,
|
||||
startWashTime,
|
||||
endWashTime,
|
||||
orderDate,
|
||||
status,
|
||||
phone,
|
||||
location,
|
||||
}) => {
|
||||
}: OrderProps) => {
|
||||
const { t } = useTranslation('~', {
|
||||
keyPrefix: 'dry-wash.arm.order',
|
||||
});
|
||||
|
||||
const [statusSelect, setStatus] = useState(status);
|
||||
|
||||
return (
|
||||
<Tr>
|
||||
<Td>{carNumber}</Td>
|
||||
<Td>{washTime}</Td>
|
||||
<Td>{orderDate}</Td>
|
||||
<Td>{getTimeSlot(startWashTime, endWashTime)}</Td>
|
||||
<Td>{dayjs(orderDate).format('DD.MM.YYYY')}</Td>
|
||||
<Td>
|
||||
<Select
|
||||
value={statusSelect}
|
||||
onChange={(e) => setStatus(e.target.value)}
|
||||
placeholder={i18next.t(`dry-wash.arm.order.status.placeholder`)}
|
||||
onChange={(e) => setStatus(e.target.value as OrderProps['status'])}
|
||||
placeholder={t(`status.placeholder`)}
|
||||
>
|
||||
{statuses.map((status) => (
|
||||
<option key={status} value={status}>
|
||||
{i18next.t(`dry-wash.arm.order.status.${status}`)}
|
||||
{t(`status.${status}`)}
|
||||
</option>
|
||||
))}
|
||||
</Select>
|
||||
|
@ -1,36 +1,122 @@
|
||||
import { Box, Heading, Table, Thead, Tbody, Tr, Th } from '@chakra-ui/react';
|
||||
import React from 'react';
|
||||
import { ordersData } from '../../mocks';
|
||||
import React, { useEffect, useState } from 'react';
|
||||
import {
|
||||
Box,
|
||||
Heading,
|
||||
Table,
|
||||
Thead,
|
||||
Tbody,
|
||||
Tr,
|
||||
Th,
|
||||
Spinner,
|
||||
Text,
|
||||
Td,
|
||||
useToast,
|
||||
} from '@chakra-ui/react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import dayjs from 'dayjs';
|
||||
|
||||
import OrderItem from '../OrderItem';
|
||||
import i18next from 'i18next';
|
||||
import { OrderProps } from '../OrderItem/OrderItem';
|
||||
import { armService } from '../../api/arm';
|
||||
import DateNavigator from '../DateNavigator';
|
||||
|
||||
const TABLE_HEADERS = [
|
||||
'carNumber' as const,
|
||||
'washingTime' as const,
|
||||
'orderDate' as const,
|
||||
'status' as const,
|
||||
'telephone' as const,
|
||||
'location' as const,
|
||||
];
|
||||
|
||||
const Orders = () => {
|
||||
const TABLE_HEADERS = [
|
||||
'carNumber',
|
||||
'washingTime',
|
||||
'orderDate',
|
||||
'status',
|
||||
'telephone',
|
||||
'location',
|
||||
];
|
||||
const { t } = useTranslation('~', {
|
||||
keyPrefix: 'dry-wash.arm.order',
|
||||
});
|
||||
|
||||
const { fetchOrders } = armService();
|
||||
|
||||
const toast = useToast();
|
||||
|
||||
const [orders, setOrders] = useState<OrderProps[]>([]);
|
||||
const [loading, setLoading] = useState(false);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
const [currentDate, setCurrentDate] = useState(new Date());
|
||||
|
||||
useEffect(() => {
|
||||
const loadOrders = async () => {
|
||||
setLoading(true);
|
||||
|
||||
try {
|
||||
const data = await fetchOrders({ date: currentDate });
|
||||
setOrders(data.body);
|
||||
} catch (err) {
|
||||
setError(err.message);
|
||||
toast({
|
||||
title: t('error.title'),
|
||||
status: 'error',
|
||||
duration: 5000,
|
||||
isClosable: true,
|
||||
position: 'bottom-right',
|
||||
});
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
};
|
||||
|
||||
loadOrders();
|
||||
}, [toast, t, currentDate]);
|
||||
|
||||
return (
|
||||
<Box p='8'>
|
||||
<Heading size='lg' mb='5'>
|
||||
{i18next.t('dry-wash.arm.order.title')}
|
||||
{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>
|
||||
{TABLE_HEADERS.map((name, key) => (
|
||||
<Th key={key}>
|
||||
{i18next.t(`dry-wash.arm.order.table.header.${name}`)}
|
||||
</Th>
|
||||
<Th key={key}>{t(`table.header.${name}`)}</Th>
|
||||
))}
|
||||
</Tr>
|
||||
</Thead>
|
||||
<Tbody>
|
||||
{ordersData.map((order, index) => (
|
||||
<OrderItem key={index} {...order} />
|
||||
))}
|
||||
{loading && (
|
||||
<Tr>
|
||||
<Td colSpan={TABLE_HEADERS.length} textAlign='center' py='8'>
|
||||
<Spinner size='lg' />
|
||||
</Td>
|
||||
</Tr>
|
||||
)}
|
||||
{!loading && orders.length === 0 && !error && (
|
||||
<Tr>
|
||||
<Td colSpan={TABLE_HEADERS.length}>
|
||||
<Text>{t('table.empty')}</Text>
|
||||
</Td>
|
||||
</Tr>
|
||||
)}
|
||||
{!loading &&
|
||||
!error &&
|
||||
orders.map((order, index) => (
|
||||
<OrderItem
|
||||
key={index}
|
||||
{...order}
|
||||
status={order.status as OrderProps['status']}
|
||||
/>
|
||||
))}
|
||||
</Tbody>
|
||||
</Table>
|
||||
</Box>
|
||||
|
@ -1,42 +1,60 @@
|
||||
import { Box, Button, Heading, VStack } from '@chakra-ui/react';
|
||||
import { Box, Button, Heading, VStack, Divider } from '@chakra-ui/react';
|
||||
import React from 'react';
|
||||
import { Divider } from '@chakra-ui/react';
|
||||
import i18next from 'i18next';
|
||||
const Sidebar = ({ onSelectPage }) => (
|
||||
<Box
|
||||
borderRight='1px solid black'
|
||||
bg='gray.50'
|
||||
color='white'
|
||||
w='250px'
|
||||
p='5'
|
||||
pt='8'
|
||||
>
|
||||
<Heading color='green' size='lg' mb='5'>
|
||||
{i18next.t(`dry-wash.arm.master.sideBar.title`)}
|
||||
</Heading>
|
||||
import { useLocation, Link } from 'react-router-dom';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
|
||||
<VStack align='start' spacing='4'>
|
||||
<Divider />
|
||||
<Button
|
||||
onClick={() => onSelectPage('orders')}
|
||||
w='100%'
|
||||
colorScheme='green'
|
||||
variant='ghost'
|
||||
>
|
||||
{i18next.t(`dry-wash.arm.master.sideBar.title.orders`)}
|
||||
</Button>
|
||||
<Divider />
|
||||
<Button
|
||||
onClick={() => onSelectPage('masters')}
|
||||
w='100%'
|
||||
colorScheme='green'
|
||||
variant='ghost'
|
||||
>
|
||||
{i18next.t(`dry-wash.arm.master.sideBar.title.master`)}
|
||||
</Button>
|
||||
<Divider />
|
||||
</VStack>
|
||||
</Box>
|
||||
);
|
||||
import { URLs } from '../../__data__/urls';
|
||||
|
||||
const Sidebar = () => {
|
||||
const location = useLocation();
|
||||
const isActive = (keyword: string) => location.pathname.includes(keyword);
|
||||
|
||||
const { t } = useTranslation('~', {
|
||||
keyPrefix: 'dry-wash.arm.master.sideBar',
|
||||
});
|
||||
|
||||
return (
|
||||
<Box
|
||||
borderRight='1px solid black'
|
||||
bg='gray.50'
|
||||
color='white'
|
||||
w='250px'
|
||||
p='5'
|
||||
pt='8'
|
||||
>
|
||||
<Heading color='green' size='lg' mb='5'>
|
||||
{t('title')}
|
||||
</Heading>
|
||||
|
||||
<VStack align='start' spacing='4'>
|
||||
<Divider />
|
||||
{URLs.armOrder.isOn && (
|
||||
<Button
|
||||
as={Link}
|
||||
to={URLs.armOrder.url}
|
||||
w='100%'
|
||||
colorScheme={isActive(URLs.armOrder.url) ? 'green' : 'blue'}
|
||||
variant={isActive(URLs.armOrder.url) ? 'solid' : 'ghost'}
|
||||
>
|
||||
{t('orders')}
|
||||
</Button>
|
||||
)}
|
||||
<Divider />
|
||||
{URLs.armMaster.isOn && (
|
||||
<Button
|
||||
as={Link}
|
||||
to={URLs.armMaster.url}
|
||||
w='100%'
|
||||
colorScheme={isActive(URLs.armMaster.url) ? 'green' : 'blue'}
|
||||
variant={isActive(URLs.armMaster.url) ? 'solid' : 'ghost'}
|
||||
>
|
||||
{t('master')}
|
||||
</Button>
|
||||
)}
|
||||
<Divider />
|
||||
</VStack>
|
||||
</Box>
|
||||
);
|
||||
};
|
||||
|
||||
export default Sidebar;
|
||||
|
@ -1,43 +1,29 @@
|
||||
import React, { FC } from 'react';
|
||||
import {
|
||||
MdEco,
|
||||
MdMiscellaneousServices,
|
||||
MdPlace,
|
||||
MdHandshake,
|
||||
} from 'react-icons/md';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { Heading, HStack, List, Text, VStack } from '@chakra-ui/react';
|
||||
import { CtaButton, PageSection } from '../';
|
||||
import { ListItem } from './ListItem';
|
||||
|
||||
export const BenefitsSection: FC = () => {
|
||||
import { CtaButton, PageSection } from '../';
|
||||
|
||||
import { ListItem } from './ListItem';
|
||||
import { BenefitsSectionProps } from './types';
|
||||
import { iconsMap } from './helper';
|
||||
|
||||
export const BenefitsSection: FC<BenefitsSectionProps> = ({
|
||||
data: { heading, description, list } = {},
|
||||
}) => {
|
||||
const { t } = useTranslation('~', { keyPrefix: 'dry-wash.landing' });
|
||||
|
||||
return (
|
||||
<PageSection>
|
||||
<VStack w='full' spacing={2}>
|
||||
<Heading as='h2'>Преимущества экологичной автомойки</Heading>
|
||||
<Text>
|
||||
Откройте для себя преимущества наших услуг по химчистке автомобилей
|
||||
</Text>
|
||||
<Heading as='h2'>{t(heading)}</Heading>
|
||||
<Text>{t(description)}</Text>
|
||||
</VStack>
|
||||
<List display='flex' flexDirection='column' spacing={3}>
|
||||
{[
|
||||
{
|
||||
Icon: MdEco,
|
||||
children: 'Экологически безопасные продукты',
|
||||
},
|
||||
{
|
||||
Icon: MdMiscellaneousServices,
|
||||
children: 'Быстрое и эффективное обслуживание',
|
||||
},
|
||||
{
|
||||
Icon: MdPlace,
|
||||
children: 'Удобный мобильный доступ',
|
||||
},
|
||||
{
|
||||
Icon: MdHandshake,
|
||||
children: 'Надежный и заслуживающий доверия',
|
||||
},
|
||||
].map((props, i) => (
|
||||
<ListItem key={i} {...props} />
|
||||
{list.map((itemKey, i) => (
|
||||
<ListItem key={i} Icon={iconsMap[itemKey]}>
|
||||
{t(itemKey)}
|
||||
</ListItem>
|
||||
))}
|
||||
</List>
|
||||
<HStack w='full' justify='flex-end'>
|
||||
|
@ -2,7 +2,7 @@ import React, { FC, PropsWithChildren } from 'react';
|
||||
import { ListIcon, ListItem as ChakraListItem } from '@chakra-ui/react';
|
||||
import { IconType } from 'react-icons';
|
||||
|
||||
type ListItemProps = PropsWithChildren & {
|
||||
export type ListItemProps = PropsWithChildren & {
|
||||
Icon: IconType;
|
||||
};
|
||||
|
||||
|
@ -1 +1 @@
|
||||
export { ListItem } from './ListItem';
|
||||
export { type ListItemProps, ListItem } from './ListItem';
|
13
src/components/landing/BenefitsSection/helper.ts
Normal file
13
src/components/landing/BenefitsSection/helper.ts
Normal file
@ -0,0 +1,13 @@
|
||||
import { IconType } from "react-icons";
|
||||
import { MdEco, MdMiscellaneousServices, MdPlace, MdHandshake } from "react-icons/md";
|
||||
|
||||
import { ArrElement } from "../../../lib";
|
||||
|
||||
import { BenefitsList } from "./types";
|
||||
|
||||
export const iconsMap: Record<ArrElement<BenefitsList>, IconType> = {
|
||||
"benefits-section.list.0": MdEco,
|
||||
"benefits-section.list.1": MdMiscellaneousServices,
|
||||
"benefits-section.list.2": MdPlace,
|
||||
"benefits-section.list.3": MdHandshake,
|
||||
};
|
@ -1 +1,2 @@
|
||||
export type { BenefitsSectionProps } from './types';
|
||||
export { BenefitsSection } from './BenefitsSection';
|
14
src/components/landing/BenefitsSection/types.ts
Normal file
14
src/components/landing/BenefitsSection/types.ts
Normal file
@ -0,0 +1,14 @@
|
||||
export type BenefitsList = [
|
||||
'benefits-section.list.0',
|
||||
'benefits-section.list.1',
|
||||
'benefits-section.list.2',
|
||||
'benefits-section.list.3',
|
||||
];
|
||||
|
||||
export type BenefitsSectionProps = {
|
||||
data: {
|
||||
heading: 'benefits-section.heading';
|
||||
description: 'benefits-section.description';
|
||||
list: BenefitsList;
|
||||
};
|
||||
};
|
@ -1,11 +1,21 @@
|
||||
import React, { FC } from 'react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { Link as RouterLink } from 'react-router-dom';
|
||||
import { ButtonProps, Button } from '@chakra-ui/react';
|
||||
|
||||
import { URLs } from '../../../__data__/urls';
|
||||
|
||||
export const CtaButton: FC<ButtonProps> = (props) => {
|
||||
const { t } = useTranslation('~', { keyPrefix: 'dry-wash.landing' });
|
||||
|
||||
return (
|
||||
<Button as={RouterLink} to='/dry-wash/order-form' colorScheme='primary' {...props}>
|
||||
Сделать заказ
|
||||
<Button
|
||||
as={RouterLink}
|
||||
to={URLs.orderCreate.getUrl()}
|
||||
colorScheme='primary'
|
||||
{...props}
|
||||
>
|
||||
{t('make-order-button')}
|
||||
</Button>
|
||||
);
|
||||
};
|
||||
|
@ -1,8 +1,11 @@
|
||||
import React, { FC } from 'react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { Text } from '@chakra-ui/react';
|
||||
|
||||
const currentYear = new Date().getFullYear();
|
||||
|
||||
export const Copyright: FC = () => {
|
||||
return <Text color='whiteAlpha.500'>© {currentYear} DryMaster. Все права защищены</Text>;
|
||||
const { t } = useTranslation();
|
||||
|
||||
return <Text color='whiteAlpha.500'>{t('dry-wash.landing.footer.copyright', { currentYear })}</Text>;
|
||||
};
|
||||
|
@ -1,20 +1,29 @@
|
||||
import React, { FC } from 'react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { Link, List, ListItem } from '@chakra-ui/react';
|
||||
import { Link as RouterLink } from 'react-router-dom';
|
||||
|
||||
import { SiteLogo, PageSection } from '../';
|
||||
|
||||
import { Copyright } from './Copyright';
|
||||
|
||||
export const Footer: FC = () => {
|
||||
const { t } = useTranslation('~', {
|
||||
keyPrefix: 'dry-wash.landing.footer.links',
|
||||
});
|
||||
|
||||
const listData = [
|
||||
{ to: '#', label: t('privacy-policy') },
|
||||
{ to: '#', label: t('service-terms') },
|
||||
{ to: '#', label: t('faq') },
|
||||
];
|
||||
|
||||
return (
|
||||
<PageSection as='footer' py={5} bg='gray.700' color='white'>
|
||||
<SiteLogo />
|
||||
<Copyright />
|
||||
<List spacing={2}>
|
||||
{[
|
||||
{ to: '#', label: 'Политика конфиденциальности' },
|
||||
{ to: '#', label: 'Условия обслуживания' },
|
||||
{ to: '#', label: 'FAQ' },
|
||||
].map(({ to, label }, i) => (
|
||||
{listData.map(({ to, label }, i) => (
|
||||
<ListItem key={i}>
|
||||
<Link as={RouterLink} to={to}>
|
||||
{label}
|
||||
|
@ -1,16 +1,23 @@
|
||||
import React, { FC } from 'react';
|
||||
import { Box, Heading, Text, Center, VStack, BoxProps } from '@chakra-ui/react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { Box, Heading, Text, Center, VStack } from '@chakra-ui/react';
|
||||
|
||||
import { DemoVideoPosterImg } from '../../../assets/images';
|
||||
import { CtaButton, SiteLogo, PageSection } from '../';
|
||||
|
||||
type HeroSectionProps = Pick<BoxProps, 'flexShrink'>;
|
||||
import { HeroSectionProps } from './types';
|
||||
|
||||
export const HeroSection: FC<HeroSectionProps> = ({
|
||||
data: { headline, description, video } = {},
|
||||
flexShrink,
|
||||
}) => {
|
||||
const { t } = useTranslation('~', { keyPrefix: 'dry-wash.landing' });
|
||||
|
||||
export const HeroSection: FC<HeroSectionProps> = ({ flexShrink }) => {
|
||||
return (
|
||||
<Box flexShrink={flexShrink} as='header' pos='relative' zIndex={0}>
|
||||
<Box
|
||||
as='video'
|
||||
src={`${__webpack_public_path__}/remote-assets/demo.mp4`}
|
||||
src={`${__webpack_public_path__}/remote-assets/${video}`}
|
||||
poster={DemoVideoPosterImg}
|
||||
autoPlay
|
||||
loop
|
||||
@ -41,19 +48,18 @@ export const HeroSection: FC<HeroSectionProps> = ({ flexShrink }) => {
|
||||
color='white'
|
||||
__css={{ textWrap: 'balance' }}
|
||||
>
|
||||
Оживите свою поездку с помощью экологически чистого ухода!
|
||||
{t(headline)}
|
||||
</Heading>
|
||||
<Text
|
||||
textAlign='center'
|
||||
__css={{ textWrap: 'balance' }}
|
||||
color='white'
|
||||
>
|
||||
Ощутите максимальное удобство сухой мойки автомобилей, созданной для
|
||||
того, чтобы планета стала чище
|
||||
{t(description)}
|
||||
</Text>
|
||||
</VStack>
|
||||
<CtaButton size='lg' />
|
||||
</PageSection>
|
||||
</Box>
|
||||
);
|
||||
};
|
||||
};
|
||||
|
9
src/components/landing/HeroSection/types.ts
Normal file
9
src/components/landing/HeroSection/types.ts
Normal file
@ -0,0 +1,9 @@
|
||||
import { BoxProps } from "@chakra-ui/react";
|
||||
|
||||
export type HeroSectionProps = {
|
||||
data: {
|
||||
headline: 'hero-section.headline';
|
||||
description: 'hero-section.description';
|
||||
video: string;
|
||||
};
|
||||
} & Pick<BoxProps, 'flexShrink'>;
|
@ -1,10 +1,13 @@
|
||||
import React, { FC } from 'react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { Image } from '@chakra-ui/react';
|
||||
|
||||
import { LogoSvg } from '../../../assets/icons';
|
||||
|
||||
export const SiteLogo: FC = () => {
|
||||
return <Image src={LogoSvg} alt='Логотип компании "Сухой мастер"' w={40} />;
|
||||
const { t } = useTranslation();
|
||||
|
||||
return <Image src={LogoSvg} alt={t('~:dry-wash.landing.site-logo')} w={40} />;
|
||||
};
|
||||
|
||||
// todo: add i18n for alt
|
||||
// todo: replace Image by SVG React component
|
||||
// todo: replace Image by SVG React component
|
||||
|
@ -1,4 +1,5 @@
|
||||
import React, { FC, useEffect, useState } from 'react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import {
|
||||
Tab,
|
||||
TabList,
|
||||
@ -7,13 +8,19 @@ import {
|
||||
Tabs,
|
||||
Text,
|
||||
} from '@chakra-ui/react';
|
||||
import { mockReviews } from '../../../../mocks/landing';
|
||||
|
||||
import { mockReview } from '../../../../mocks/landing';
|
||||
import { Review } from '../../../../models';
|
||||
|
||||
import { ReviewCard } from './ReviewCard';
|
||||
|
||||
const reviewsCount = mockReviews.length;
|
||||
const SLIDE_CHANGE_INTERVAL = 5000;
|
||||
|
||||
export const ReviewsSlider: FC = () => {
|
||||
const { i18n } = useTranslation();
|
||||
const mockReviews: Review.View[] = mockReview.getReviewsByLocale(i18n.language);
|
||||
const reviewsCount = mockReviews.length;
|
||||
|
||||
const [activeTab, setActiveTab] = useState(0);
|
||||
const [isSlideShowStopped, setIsSlideShowStopped] = useState(false);
|
||||
|
||||
|
@ -1,15 +1,20 @@
|
||||
import React, { FC } from 'react';
|
||||
import {
|
||||
Heading,
|
||||
HStack,
|
||||
} from '@chakra-ui/react';
|
||||
import { CtaButton, PageSection } from '../';
|
||||
import { ReviewsSlider } from './ReviewsSlider';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { Heading, HStack } from '@chakra-ui/react';
|
||||
|
||||
import { CtaButton, PageSection } from '../';
|
||||
|
||||
import { ReviewsSlider } from './ReviewsSlider';
|
||||
import { SocialProofSectionProps } from './types';
|
||||
|
||||
export const SocialProofSection: FC<SocialProofSectionProps> = ({
|
||||
data: { heading } = {},
|
||||
}) => {
|
||||
const { t } = useTranslation('~', { keyPrefix: 'dry-wash.landing' });
|
||||
|
||||
export const SocialProofSection: FC = () => {
|
||||
return (
|
||||
<PageSection>
|
||||
<Heading as='h2'>Нас выбирают</Heading>
|
||||
<Heading as='h2'>{t(heading)}</Heading>
|
||||
<ReviewsSlider />
|
||||
<HStack w='full' justify='flex-end'>
|
||||
<CtaButton />
|
||||
|
@ -1 +1,2 @@
|
||||
export type { SocialProofSectionProps } from './types';
|
||||
export { SocialProofSection } from './SocialProofSection';
|
5
src/components/landing/SocialProofSection/types.ts
Normal file
5
src/components/landing/SocialProofSection/types.ts
Normal file
@ -0,0 +1,5 @@
|
||||
export type SocialProofSectionProps = {
|
||||
data: {
|
||||
heading: 'social-proof-section.heading';
|
||||
};
|
||||
};
|
23
src/components/order-form/form/car-body/car-body-select.tsx
Normal file
23
src/components/order-form/form/car-body/car-body-select.tsx
Normal file
@ -0,0 +1,23 @@
|
||||
import React, { forwardRef } from 'react';
|
||||
import { Select, SelectProps } from '@chakra-ui/react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
|
||||
import { carBodySelectOptions } from './helper';
|
||||
|
||||
export const CarBodySelect = forwardRef<HTMLSelectElement, SelectProps>(
|
||||
function CarBodySelect(props, ref) {
|
||||
const { t } = useTranslation('~', {
|
||||
keyPrefix: 'dry-wash.order-create.car-body-select',
|
||||
});
|
||||
|
||||
return (
|
||||
<Select ref={ref} placeholder={t('placeholder')} {...props}>
|
||||
{carBodySelectOptions.map(({ value, labelTKey }, i) => (
|
||||
<option key={i} value={value}>
|
||||
{t(`options.${labelTKey}`)}
|
||||
</option>
|
||||
))}
|
||||
</Select>
|
||||
);
|
||||
},
|
||||
);
|
50
src/components/order-form/form/car-body/helper.ts
Normal file
50
src/components/order-form/form/car-body/helper.ts
Normal file
@ -0,0 +1,50 @@
|
||||
import { Car } from "../../../../models/landing";
|
||||
|
||||
import { CarBodySelectOption } from "./types";
|
||||
|
||||
export const carBodySelectOptions: CarBodySelectOption[] = [
|
||||
{
|
||||
value: Car.BodyStyle.SEDAN,
|
||||
labelTKey: 'sedan'
|
||||
},
|
||||
{
|
||||
value: Car.BodyStyle.HATCHBACK,
|
||||
labelTKey: 'hatchback'
|
||||
},
|
||||
{
|
||||
value: Car.BodyStyle.CROSSOVER,
|
||||
labelTKey: 'crossover'
|
||||
},
|
||||
{
|
||||
value: Car.BodyStyle.SUV,
|
||||
labelTKey: 'suv'
|
||||
},
|
||||
{
|
||||
value: Car.BodyStyle.STATION_WAGON,
|
||||
labelTKey: 'station-wagon'
|
||||
},
|
||||
{
|
||||
value: Car.BodyStyle.COUPE,
|
||||
labelTKey: 'coupe'
|
||||
},
|
||||
{
|
||||
value: Car.BodyStyle.MINIVAN,
|
||||
labelTKey: 'minivan'
|
||||
},
|
||||
{
|
||||
value: Car.BodyStyle.PICKUP,
|
||||
labelTKey: 'pickup'
|
||||
},
|
||||
{
|
||||
value: Car.BodyStyle.LIFTBACK,
|
||||
labelTKey: 'liftback'
|
||||
},
|
||||
{
|
||||
value: Car.BodyStyle.SPORTS_CAR,
|
||||
labelTKey: 'sports-car'
|
||||
},
|
||||
{
|
||||
value: Car.BodyStyle.OTHER,
|
||||
labelTKey: 'other'
|
||||
},
|
||||
];
|
1
src/components/order-form/form/car-body/index.ts
Normal file
1
src/components/order-form/form/car-body/index.ts
Normal file
@ -0,0 +1 @@
|
||||
export { CarBodySelect } from './car-body-select';
|
17
src/components/order-form/form/car-body/types.ts
Normal file
17
src/components/order-form/form/car-body/types.ts
Normal file
@ -0,0 +1,17 @@
|
||||
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';
|
||||
};
|
23
src/components/order-form/form/car-color/car-color-input.tsx
Normal file
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
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
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={8}
|
||||
/>
|
||||
);
|
||||
},
|
||||
);
|
33
src/components/order-form/form/car-number/helper.ts
Normal file
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}|$)$`, 'gi');
|
||||
const isValidInput = (cleanedValue: string) => validCarNumberInputRe.test(cleanedValue);
|
||||
|
||||
const formatAsCarNumber = (cleanedValue: string) => {
|
||||
return cleanedValue.replace(validCarNumberInputRe, (_, p1, p2, p3) => [p1, p2, p3].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}$`, '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
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
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
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
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
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
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;
|
||||
};
|
67
src/components/order-form/form/helper.ts
Normal file
67
src/components/order-form/form/helper.ts
Normal file
@ -0,0 +1,67 @@
|
||||
import { useTranslation } from "react-i18next";
|
||||
import { InputProps, SelectProps } from "@chakra-ui/react";
|
||||
|
||||
import { Order } from "../../../models/landing";
|
||||
|
||||
import { FormFieldProps } from "./field";
|
||||
import { OrderFormValues } from "./types";
|
||||
import { isValidCarNumber } from "./car-number";
|
||||
import { isValidPhoneNumber } from "./phone";
|
||||
|
||||
export const defaultValues: Partial<OrderFormValues> = {
|
||||
phone: '',
|
||||
carNumber: '',
|
||||
carColor: '',
|
||||
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']>;
|
||||
};
|
||||
|
||||
const removeAllSpaces = (str: string) => str.replace(/\s+/g, '');
|
||||
|
||||
const getValidCarBodyStyle = (fieldValue: string) => {
|
||||
const carBodyAsNumber = Number(fieldValue);
|
||||
return Number.isNaN(carBodyAsNumber) ? undefined : carBodyAsNumber;
|
||||
};
|
||||
|
||||
export const formatFormValues = ({ phone, carNumber, carBody, carColor, carLocation, availableDatetimeBegin, availableDatetimeEnd }: OrderFormValues): Order.Create => {
|
||||
return {
|
||||
customer: {
|
||||
phone
|
||||
},
|
||||
car: {
|
||||
number: removeAllSpaces(carNumber),
|
||||
body: getValidCarBodyStyle(carBody),
|
||||
color: carColor
|
||||
},
|
||||
washing: {
|
||||
location: carLocation,
|
||||
begin: availableDatetimeBegin,
|
||||
end: availableDatetimeEnd,
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
export const onSubmit = (values: OrderFormValues) => {
|
||||
return new Promise((resolve) => {
|
||||
console.log(formatFormValues(values));
|
||||
resolve(formatFormValues(values));
|
||||
});
|
||||
};
|
||||
|
||||
export const inputCommonStyles: Partial<InputProps & SelectProps> = {
|
||||
};
|
1
src/components/order-form/form/index.ts
Normal file
1
src/components/order-form/form/index.ts
Normal file
@ -0,0 +1 @@
|
||||
export { OrderForm } from './order-form';
|
15
src/components/order-form/form/location/helper.ts
Normal file
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
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,144 @@
|
||||
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;
|
||||
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}
|
||||
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
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
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
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
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
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>
|
||||
);
|
||||
};
|
133
src/components/order-form/form/order-form.tsx
Normal file
133
src/components/order-form/form/order-form.tsx
Normal file
@ -0,0 +1,133 @@
|
||||
import React, { FC } from 'react';
|
||||
import { useForm } from 'react-hook-form';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { Box, Flex, FormControl, FormLabel, VStack } from '@chakra-ui/react';
|
||||
|
||||
import { CarBodySelect } from './car-body';
|
||||
import { CarColorInput } from './car-color';
|
||||
import { CarNumberInput } from './car-number';
|
||||
import { FormInputField, FormControllerField } from './field';
|
||||
import { OrderFormValues } from './types';
|
||||
import { PhoneInput } from './phone';
|
||||
import { SubmitButton } from './submit';
|
||||
import { defaultValues, onSubmit, useGetValidationRules } from './helper';
|
||||
import { DateTimeInput } from './date-time';
|
||||
import { LocationInput, MapComponent, StringLocation, YMapsProvider } from './location';
|
||||
|
||||
export const OrderForm: FC = () => {
|
||||
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} 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
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
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
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
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
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
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>
|
||||
);
|
||||
};
|
9
src/components/order-form/form/types.ts
Normal file
9
src/components/order-form/form/types.ts
Normal file
@ -0,0 +1,9 @@
|
||||
export type OrderFormValues = {
|
||||
phone: string;
|
||||
carNumber: string;
|
||||
carColor: string;
|
||||
carBody: string;
|
||||
carLocation: string;
|
||||
availableDatetimeBegin: string;
|
||||
availableDatetimeEnd: string;
|
||||
};
|
1
src/components/order-form/index.ts
Normal file
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
1
src/components/order-view/details/index.ts
Normal file
@ -0,0 +1 @@
|
||||
export { OrderDetails } from './order-details';
|
99
src/components/order-view/details/order-details.tsx
Normal file
99
src/components/order-view/details/order-details.tsx
Normal file
@ -0,0 +1,99 @@
|
||||
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 = Order.View;
|
||||
|
||||
export const OrderDetails: FC<OrderDetailsProps> = ({
|
||||
id,
|
||||
status,
|
||||
phone,
|
||||
carNumber,
|
||||
carBody,
|
||||
carColor,
|
||||
location,
|
||||
datetimeBegin,
|
||||
datetimeEnd,
|
||||
}) => {
|
||||
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: id })}
|
||||
</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(datetimeBegin),
|
||||
formatDatetime(datetimeEnd),
|
||||
].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
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
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 'progress':
|
||||
return {
|
||||
colorScheme: 'yellow',
|
||||
children: t('progress'),
|
||||
};
|
||||
case 'pending':
|
||||
return {
|
||||
colorScheme: 'yellow',
|
||||
children: t('pending'),
|
||||
};
|
||||
case 'working':
|
||||
return {
|
||||
colorScheme: 'yellow',
|
||||
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
1
src/components/order-view/index.ts
Normal file
@ -0,0 +1 @@
|
||||
export * from './details';
|
@ -1,5 +1,6 @@
|
||||
import React, { FC, PropsWithChildren } from 'react';
|
||||
import { ChakraProvider } from '@chakra-ui/react';
|
||||
|
||||
import { default as landingTheme } from './theme-config';
|
||||
import Fonts from './Fonts';
|
||||
|
||||
|
@ -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);
|
@ -2,9 +2,10 @@
|
||||
import React from 'react';
|
||||
import ReactDOM from 'react-dom/client';
|
||||
import { i18nextReactInitConfig } from '@brojs/cli';
|
||||
import App from './app';
|
||||
import i18next from 'i18next';
|
||||
|
||||
import App from './app';
|
||||
|
||||
i18next.t = i18next.t.bind(i18next);
|
||||
const i18nextPromise = i18nextReactInitConfig(i18next);
|
||||
export default () => <App />;
|
||||
|
34
src/keycloak.ts
Normal file
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;
|
16
src/lib/date-helpers.ts
Normal file
16
src/lib/date-helpers.ts
Normal file
@ -0,0 +1,16 @@
|
||||
import dayjs from 'dayjs';
|
||||
import i18next from 'i18next';
|
||||
|
||||
export const getTimeSlot = (start: string, end: string) => {
|
||||
const startDay = dayjs(start).format('HH:mm');
|
||||
const endDay = dayjs(end).format('HH:mm');
|
||||
|
||||
return i18next.t('~:dry-wash.washTime.timeSlot', {
|
||||
start: startDay,
|
||||
end: endDay,
|
||||
});
|
||||
};
|
||||
|
||||
export const formatDatetime = (datetime: string) => {
|
||||
return dayjs(datetime).format('HH:mm DD.MM.YYYY');
|
||||
};
|
2
src/lib/index.ts
Normal file
2
src/lib/index.ts
Normal file
@ -0,0 +1,2 @@
|
||||
export * from './date-helpers';
|
||||
export * from './types';
|
41
src/lib/types.ts
Normal file
41
src/lib/types.ts
Normal file
@ -0,0 +1,41 @@
|
||||
/**
|
||||
* @example type Output = ArrElement<['a', 'b', 'c']>;
|
||||
* // "a" | "b" | "c"
|
||||
*/
|
||||
export type ArrElement<ArrType> = ArrType extends readonly (infer ElementType)[]
|
||||
? ElementType
|
||||
: never;
|
||||
|
||||
/**
|
||||
* @example type Output = Split<'a.b1' | 'a.b2', '.'>;
|
||||
* // ["a", "b1"] | ["a", "b2"]
|
||||
*/
|
||||
type Split<S extends string, D extends string> =
|
||||
S extends `${infer A}${D}${infer B}` ? [A, ...Split<B, D>] : [S];
|
||||
|
||||
/**
|
||||
* @example type Output = NestedObject<["a", "b1"] | ["a", "b2"]>;
|
||||
* // { a: { b1: string; }; } | { a: { b2: string; }; }
|
||||
*/
|
||||
type NestedObject<T extends string[]> =
|
||||
T extends [infer Head, ...infer Tail] ?
|
||||
Head extends string ?
|
||||
{ [key in Head]: NestedObject<Tail extends string[] ? Tail : []> } : never :
|
||||
string;
|
||||
|
||||
/**
|
||||
* @example type Output = UnionToIntersection<{ a: { b1: string; }; } | { a: { b2: string; }; }>;
|
||||
* // { a: { b1: string; }; } & { a: { b2: string; }; }
|
||||
*/
|
||||
type UnionToIntersection<U> =
|
||||
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||
(U extends any ? (k: U) => void : never) extends (k: infer I) => void ? I : never;
|
||||
|
||||
/**
|
||||
* @example type Output = CreateTree<'a.b1' | 'a.b2', '.'>;
|
||||
* // { a: { b1: string; }; } & { a: { b2: string; }; }
|
||||
*/
|
||||
export type CreateTree<T> =
|
||||
UnionToIntersection<T extends infer U ?
|
||||
U extends string ?
|
||||
NestedObject<Split<U, '.'>> : never : never>;
|
@ -1,35 +0,0 @@
|
||||
export const mastersData = [
|
||||
{
|
||||
id: 'masters1',
|
||||
name: 'Иван Иванов',
|
||||
schedule: ['15:00 - 16:30', '17:00 - 18:00'],
|
||||
phone: '+7 900 123 45 67',
|
||||
},
|
||||
{
|
||||
id: 'masters2',
|
||||
name: 'Сергей Петров',
|
||||
schedule: ['10:00 - 12:30', '14:00 - 15:30', '16:00 - 17:00'],
|
||||
phone: '+7 900 234 56 78',
|
||||
},
|
||||
];
|
||||
|
||||
export const ordersData = [
|
||||
{
|
||||
id: 'order1',
|
||||
carNumber: 'A123BC',
|
||||
washTime: '10:30',
|
||||
orderDate: '2024-10-31',
|
||||
status: 'progress',
|
||||
phone: '79001234567',
|
||||
location: 'Казань, ул. Баумана, 1',
|
||||
},
|
||||
{
|
||||
id: 'order2',
|
||||
carNumber: 'B456CD',
|
||||
washTime: '11:00',
|
||||
orderDate: '2024-10-31',
|
||||
status: 'complete',
|
||||
phone: '79002345678',
|
||||
location: 'Казань, ул. Кремлёвская, 3',
|
||||
},
|
||||
];
|
@ -1,34 +1 @@
|
||||
type ReviewItem = {
|
||||
id: string;
|
||||
firstname: string;
|
||||
lastname: string;
|
||||
picture: string;
|
||||
text: string;
|
||||
};
|
||||
|
||||
export const mockReviews: ReviewItem[] = [
|
||||
{
|
||||
firstname: 'Анна',
|
||||
lastname: 'Смирнова',
|
||||
picture: 'https://img.freepik.com/free-photo/indoor-portrait-beautiful-freckled-woman-with-dark-curly-hair-wears-fashionable-striped-shirt-rejoices-day-off-isolated-white-wall-curly-satisfied-woman-stands-indoor-alone_273609-15765.jpg',
|
||||
text: "Недавно воспользовалась услугами сухой мойки автомобилей и осталась крайне удовлетворена. Процесс был проведён профессионально: сотрудники использовали качественные средства, которые не повредили лакокрасочное покрытие. Особенно впечатлила возможность мыть машину без воды, что не только экономит ресурсы, но и бережет окружающую среду. Рекомендую всем, кто заботится о своём автомобиле и экологии!"
|
||||
},
|
||||
{
|
||||
firstname: 'Дмитрий',
|
||||
lastname: 'Петров',
|
||||
picture: 'https://img.freepik.com/free-photo/calm-handsome-curly-haired-boy-posing-isolated-light-grey-standing-still-looks-peaceful-wearing-casual-manner-youth-style-concept_176532-8831.jpg',
|
||||
text: "Как же я рад, что нашел эту сухую мойку! Моя машина сияет, как новенькая! 🌟 Сначала был скептически настроен, думал, как же без воды можно отмыть всё это? Но результат превзошёл все ожидания! Ветеринар мойки профессионально подошёл к делу, и она теперь выглядит потрясающе. Если вы хотите, чтобы ваш автомобиль всегда выглядел на 100%, обязательно попробуйте!"
|
||||
},
|
||||
{
|
||||
firstname: 'Алексей',
|
||||
lastname: 'Сидоров',
|
||||
picture: 'https://img.freepik.com/free-photo/waist-up-portrait-handsome-serious-unshaven-male-keeps-hands-together-dressed-dark-blue-shirt-has-talk-with-interlocutor-stands-against-white-wall-self-confident-man-freelancer_273609-16320.jpg',
|
||||
text: "Сухая мойка автомобилей - интересное решение, которое я опробовал недавно. В целом остался доволен качеством работы. Однако, не все загрязнения удалось удалить с первого раза, но сотрудник предложил дополнительные услуги, что меня устроило. Плюс, большое внимание уделили защите поверхности, что тоже немаловажно. Думаю, в следующий раз снова воспользуюсь этой услугой."
|
||||
},
|
||||
{
|
||||
firstname: 'Екатерина',
|
||||
lastname: 'Иванова',
|
||||
picture: 'https://img.freepik.com/free-photo/portrait-young-blonde-woman-with-plait-polka-dot-blouse_273609-10490.jpg',
|
||||
text: "К сожалению, мой опыт с сухой мойкой автомобилей оказался неудачным. Ожидала увидеть чистую машину после процедуры, но многие участки остались незаделанными. Кроме того, процедура заняла больше времени, чем мне обещали. Возможно, в этом конкретном центре что-то пошло не так, но я бы не стала повторно обращаться за этой услугой."
|
||||
},
|
||||
].map((data, i) => ({ id: `review${i}`, ...data }));
|
||||
export * as mockReview from './review';
|
64
src/mocks/landing/review.ts
Normal file
64
src/mocks/landing/review.ts
Normal file
@ -0,0 +1,64 @@
|
||||
import { LANGUAGES, Review } from "../../models";
|
||||
|
||||
const addId = (items) => items.map((data, i) => ({ id: `review${i}`, ...data }));
|
||||
|
||||
const enReviews: Review.View[] = addId([
|
||||
{
|
||||
firstname: 'Anna',
|
||||
lastname: 'Smirnova',
|
||||
picture: 'https://img.freepik.com/free-photo/indoor-portrait-beautiful-freckled-woman-with-dark-curly-hair-wears-fashionable-striped-shirt-rejoices-day-off-isolated-white-wall-curly-satisfied-woman-stands-indoor-alone_273609-15765.jpg',
|
||||
text: "I recently used the services of a dry car wash and was extremely satisfied. The process was carried out professionally: the staff used high-quality products that did not damage the paintwork. I was especially impressed by the ability to wash the car without water, which not only saves resources, but also protects the environment. I recommend it to everyone who cares about their car and the environment!"
|
||||
},
|
||||
{
|
||||
firstname: 'Dmitry',
|
||||
lastname: 'Petrov',
|
||||
picture: 'https://img.freepik.com/free-photo/calm-handsome-curly-haired-boy-posing-isolated-light-grey-standing-still-looks-peaceful-wearing-casual-manner-youth-style-concept_176532-8831.jpg',
|
||||
text: "I'm so glad I found this dry sink! My car is shining like new! 🌟 At first I was skeptical, I thought, how can you wash all this without water? But the result exceeded all expectations! Moika's veterinarian took a professional approach to the case, and she now looks amazing. If you want your car to always look 100%, be sure to try it!"
|
||||
},
|
||||
{
|
||||
firstname: 'Alexey',
|
||||
lastname: 'Sidorov',
|
||||
picture: 'https://img.freepik.com/free-photo/waist-up-portrait-handsome-serious-unshaven-male-keeps-hands-together-dressed-dark-blue-shirt-has-talk-with-interlocutor-stands-against-white-wall-self-confident-man-freelancer_273609-16320.jpg',
|
||||
text: "Dry car washing is an interesting solution that I tried out recently. Overall, I was satisfied with the quality of the work. However, not all the impurities were removed the first time, but the employee offered additional services, which suited me. Plus, a lot of attention was paid to surface protection, which is also important. I think I'll use this service again next time."
|
||||
},
|
||||
{
|
||||
firstname: 'Ekaterina',
|
||||
lastname: 'Ivanova',
|
||||
picture: 'https://img.freepik.com/free-photo/portrait-young-blonde-woman-with-plait-polka-dot-blouse_273609-10490.jpg',
|
||||
text: "Unfortunately, my experience with dry car washing turned out to be unsuccessful. I expected to see a clean car after the procedure, but many areas remained undone. Besides, the procedure took longer than I was promised. Perhaps something went wrong in this particular center, but I would not apply for this service again."
|
||||
},
|
||||
]);
|
||||
|
||||
const ruReviews: Review.View[] = addId([
|
||||
{
|
||||
firstname: 'Анна',
|
||||
lastname: 'Смирнова',
|
||||
picture: 'https://img.freepik.com/free-photo/indoor-portrait-beautiful-freckled-woman-with-dark-curly-hair-wears-fashionable-striped-shirt-rejoices-day-off-isolated-white-wall-curly-satisfied-woman-stands-indoor-alone_273609-15765.jpg',
|
||||
text: "Недавно воспользовалась услугами сухой мойки автомобилей и осталась крайне удовлетворена. Процесс был проведён профессионально: сотрудники использовали качественные средства, которые не повредили лакокрасочное покрытие. Особенно впечатлила возможность мыть машину без воды, что не только экономит ресурсы, но и бережет окружающую среду. Рекомендую всем, кто заботится о своём автомобиле и экологии!"
|
||||
},
|
||||
{
|
||||
firstname: 'Дмитрий',
|
||||
lastname: 'Петров',
|
||||
picture: 'https://img.freepik.com/free-photo/calm-handsome-curly-haired-boy-posing-isolated-light-grey-standing-still-looks-peaceful-wearing-casual-manner-youth-style-concept_176532-8831.jpg',
|
||||
text: "Как же я рад, что нашел эту сухую мойку! Моя машина сияет, как новенькая! 🌟 Сначала был скептически настроен, думал, как же без воды можно отмыть всё это? Но результат превзошёл все ожидания! Ветеринар мойки профессионально подошёл к делу, и она теперь выглядит потрясающе. Если вы хотите, чтобы ваш автомобиль всегда выглядел на 100%, обязательно попробуйте!"
|
||||
},
|
||||
{
|
||||
firstname: 'Алексей',
|
||||
lastname: 'Сидоров',
|
||||
picture: 'https://img.freepik.com/free-photo/waist-up-portrait-handsome-serious-unshaven-male-keeps-hands-together-dressed-dark-blue-shirt-has-talk-with-interlocutor-stands-against-white-wall-self-confident-man-freelancer_273609-16320.jpg',
|
||||
text: "Сухая мойка автомобилей - интересное решение, которое я опробовал недавно. В целом остался доволен качеством работы. Однако, не все загрязнения удалось удалить с первого раза, но сотрудник предложил дополнительные услуги, что меня устроило. Плюс, большое внимание уделили защите поверхности, что тоже немаловажно. Думаю, в следующий раз снова воспользуюсь этой услугой."
|
||||
},
|
||||
{
|
||||
firstname: 'Екатерина',
|
||||
lastname: 'Иванова',
|
||||
picture: 'https://img.freepik.com/free-photo/portrait-young-blonde-woman-with-plait-polka-dot-blouse_273609-10490.jpg',
|
||||
text: "К сожалению, мой опыт с сухой мойкой автомобилей оказался неудачным. Ожидала увидеть чистую машину после процедуры, но многие участки остались незаделанными. Кроме того, процедура заняла больше времени, чем мне обещали. Возможно, в этом конкретном центре что-то пошло не так, но я бы не стала повторно обращаться за этой услугой."
|
||||
},
|
||||
]);
|
||||
|
||||
const reviewsMapByLocale: Record<LANGUAGES, Review.View[]> = {
|
||||
[LANGUAGES.en]: enReviews,
|
||||
[LANGUAGES.ru]: ruReviews
|
||||
};
|
||||
|
||||
export const getReviewsByLocale = (locale: string) => reviewsMapByLocale[locale];
|
1
src/models/api/index.ts
Normal file
1
src/models/api/index.ts
Normal file
@ -0,0 +1 @@
|
||||
export * from './order-view';
|
14
src/models/api/order-view.ts
Normal file
14
src/models/api/order-view.ts
Normal file
@ -0,0 +1,14 @@
|
||||
import { Order } from "../landing";
|
||||
|
||||
export type FetchOrderQueryResponse = {
|
||||
id: string;
|
||||
orderDate: string;
|
||||
carNumber: string;
|
||||
carBody: number;
|
||||
carColor?: string;
|
||||
startWashTime: string;
|
||||
endWashTime: string;
|
||||
status: Order.Status;
|
||||
phone: string;
|
||||
location: string;
|
||||
};
|
4
src/models/i18n.ts
Normal file
4
src/models/i18n.ts
Normal file
@ -0,0 +1,4 @@
|
||||
export const enum LANGUAGES {
|
||||
en = 'en',
|
||||
ru = 'ru'
|
||||
}
|
12
src/models/i18next.d.ts
vendored
Normal file
12
src/models/i18next.d.ts
vendored
Normal file
@ -0,0 +1,12 @@
|
||||
import defaultLocale from '../../locales/ru.json';
|
||||
import { CreateTree } from '../lib';
|
||||
|
||||
type LanguageResource = CreateTree<keyof typeof defaultLocale>;
|
||||
|
||||
declare module "i18next" {
|
||||
interface CustomTypeOptions {
|
||||
resources: {
|
||||
'~': LanguageResource
|
||||
}
|
||||
}
|
||||
}
|
1
src/models/index.ts
Normal file
1
src/models/index.ts
Normal file
@ -0,0 +1 @@
|
||||
export * from './i18n';
|
18
src/models/landing/car.ts
Normal file
18
src/models/landing/car.ts
Normal file
@ -0,0 +1,18 @@
|
||||
export type RegistrationNumber = string; // А012ВЕ
|
||||
|
||||
export type Color = string; // #000000
|
||||
|
||||
export const enum BodyStyle {
|
||||
UNKNOWN = 0,
|
||||
SEDAN = 1,
|
||||
HATCHBACK = 2,
|
||||
CROSSOVER = 3,
|
||||
SUV = 4,
|
||||
STATION_WAGON = 5,
|
||||
COUPE = 6,
|
||||
MINIVAN = 7,
|
||||
PICKUP = 8,
|
||||
LIFTBACK = 9,
|
||||
SPORTS_CAR = 10,
|
||||
OTHER = 99
|
||||
}
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user