Compare commits
No commits in common. "main" and "feature/stubsArm" have entirely different histories.
main
...
feature/st
13
README.md
13
README.md
@ -45,12 +45,10 @@
|
||||
### MVP1
|
||||
|
||||
**1. Landing**
|
||||
|
||||
- преимущества сервиса
|
||||
- оставить заявку (редирект на Страницу оформления заказа)
|
||||
|
||||
**2. Страница для оформления заказа**
|
||||
|
||||
- форма
|
||||
- номер машины (mask input)
|
||||
- цвет машины
|
||||
@ -60,12 +58,10 @@
|
||||
- после заполнения редирект на страницу с деталями заказа
|
||||
|
||||
**3. Страница с деталями заказа**
|
||||
|
||||
- описание заказа
|
||||
- детали заказа (id, статус)
|
||||
|
||||
**3. АРМ оператора**
|
||||
|
||||
- список заказов (RUD)
|
||||
- id заказа
|
||||
- статус заказа (готово / не готово)
|
||||
@ -76,6 +72,7 @@
|
||||
- кнопка "Добавить"
|
||||
- кнопка "Удалить"
|
||||
|
||||
|
||||
### Built With
|
||||
|
||||
[![React][React.js]][React-url]
|
||||
@ -106,14 +103,6 @@
|
||||
|
||||
<p align="right">(<a href="#readme-top">back to top</a>)</p>
|
||||
|
||||
## Instructions
|
||||
### Stubs types generation
|
||||
1. generate types with json-literal-typer (should be installed globally)
|
||||
```sh
|
||||
npx json-literal-typer -i <path to json> -o <path to output ts-file>
|
||||
```
|
||||
2. export default type from output file
|
||||
|
||||
<!-- PARTICIPANTS -->
|
||||
|
||||
## Participants
|
||||
|
||||
@ -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,19 +11,17 @@ module.exports = {
|
||||
},
|
||||
/* use https://admin.bro-js.ru/ to create config, navigations and features */
|
||||
navigations: {
|
||||
'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/*',
|
||||
"dry-wash.main": "/dry-wash",
|
||||
"dry-wash.create": "/order",
|
||||
"dry-wash.view.order": "/order/:orderId",
|
||||
"dry-wash.arm": "/arm",
|
||||
},
|
||||
features: {
|
||||
'dry-wash-pl': {
|
||||
"dry-wash-pl": {
|
||||
// add your features here in the format [featureName]: { value: string }
|
||||
},
|
||||
},
|
||||
config: {
|
||||
'dry-wash.api': '/api',
|
||||
"dry-wash-pl.api": "/api",
|
||||
},
|
||||
};
|
||||
|
||||
@ -14,44 +14,8 @@
|
||||
"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",
|
||||
@ -66,8 +30,6 @@
|
||||
"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",
|
||||
@ -87,6 +49,5 @@
|
||||
"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}}"
|
||||
"dry-wash.errorBoundary.button.reload": "Reload Page"
|
||||
}
|
||||
|
||||
@ -13,11 +13,7 @@
|
||||
"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": "Телефон",
|
||||
@ -48,44 +44,10 @@
|
||||
"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.title":"Что-то пошло не так",
|
||||
"dry-wash.errorBoundary.description": "Мы уже работаем над исправлением проблемы",
|
||||
"dry-wash.errorBoundary.button.reload": "Перезагрузить страницу",
|
||||
"dry-wash.washTime.timeSlot": "{{start}} - {{end}}"
|
||||
|
||||
157
package-lock.json
generated
157
package-lock.json
generated
@ -1,12 +1,12 @@
|
||||
{
|
||||
"name": "dry-wash",
|
||||
"version": "0.3.0",
|
||||
"version": "0.1.0",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"name": "dry-wash",
|
||||
"version": "0.3.0",
|
||||
"version": "0.1.0",
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"@brojs/cli": "^1.6.3",
|
||||
@ -16,19 +16,15 @@
|
||||
"@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": {
|
||||
@ -3596,21 +3592,6 @@
|
||||
"node": ">= 8"
|
||||
}
|
||||
},
|
||||
"node_modules/@pbe/react-yandex-maps": {
|
||||
"version": "1.2.5",
|
||||
"resolved": "https://registry.npmjs.org/@pbe/react-yandex-maps/-/react-yandex-maps-1.2.5.tgz",
|
||||
"integrity": "sha512-cBojin5e1fPx9XVCAqHQJsCnHGMeBNsP0TrNfpWCrPFfxb30ye+JgcGr2mn767Gbr1d+RufBLRiUcX2kaiAwjQ==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"@types/yandex-maps": "2.1.29"
|
||||
},
|
||||
"engines": {
|
||||
"node": ">=16"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"react": "^16.x || ^17.x || ^18.x"
|
||||
}
|
||||
},
|
||||
"node_modules/@pkgjs/parseargs": {
|
||||
"version": "0.11.0",
|
||||
"resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz",
|
||||
@ -3791,12 +3772,6 @@
|
||||
"@types/react": "*"
|
||||
}
|
||||
},
|
||||
"node_modules/@types/yandex-maps": {
|
||||
"version": "2.1.29",
|
||||
"resolved": "https://registry.npmjs.org/@types/yandex-maps/-/yandex-maps-2.1.29.tgz",
|
||||
"integrity": "sha512-nuibRWj3RU/9KXlCzTrRtDE+n6V9l7NbT9JakicqZ5OXIdwyb6blvV2Uwn6lB58WYm3DSUDP2I2AWlnWMc8z2w==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/@typescript-eslint/eslint-plugin": {
|
||||
"version": "8.12.2",
|
||||
"resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.12.2.tgz",
|
||||
@ -4730,25 +4705,6 @@
|
||||
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
|
||||
"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
|
||||
},
|
||||
"node_modules/base64-js": {
|
||||
"version": "1.5.1",
|
||||
"resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
|
||||
"integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==",
|
||||
"funding": [
|
||||
{
|
||||
"type": "github",
|
||||
"url": "https://github.com/sponsors/feross"
|
||||
},
|
||||
{
|
||||
"type": "patreon",
|
||||
"url": "https://www.patreon.com/feross"
|
||||
},
|
||||
{
|
||||
"type": "consulting",
|
||||
"url": "https://feross.org/support"
|
||||
}
|
||||
]
|
||||
},
|
||||
"node_modules/binary-extensions": {
|
||||
"version": "2.3.0",
|
||||
"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
|
||||
@ -4962,12 +4918,6 @@
|
||||
"node": ">=6.0"
|
||||
}
|
||||
},
|
||||
"node_modules/classnames": {
|
||||
"version": "2.5.1",
|
||||
"resolved": "https://registry.npmjs.org/classnames/-/classnames-2.5.1.tgz",
|
||||
"integrity": "sha512-saHYOzhIQs6wy2sVxTM6bUDsQO4F50V9RQ22qBpEdCW+I+/Wmke2HOl6lS6dTpdxVhb88/I6+Hs+438c3lfUow==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/clean-webpack-plugin": {
|
||||
"version": "4.0.0",
|
||||
"resolved": "https://registry.npmjs.org/clean-webpack-plugin/-/clean-webpack-plugin-4.0.0.tgz",
|
||||
@ -5208,12 +5158,6 @@
|
||||
"node": ">=8"
|
||||
}
|
||||
},
|
||||
"node_modules/country-flag-icons": {
|
||||
"version": "1.5.13",
|
||||
"resolved": "https://registry.npmjs.org/country-flag-icons/-/country-flag-icons-1.5.13.tgz",
|
||||
"integrity": "sha512-4JwHNqaKZ19doQoNcBjsoYA+I7NqCH/mC/6f5cBWvdKzcK5TMmzLpq3Z/syVHMHJuDGFwJ+rPpGizvrqJybJow==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/cross-fetch": {
|
||||
"version": "4.0.0",
|
||||
"resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-4.0.0.tgz",
|
||||
@ -7020,6 +6964,20 @@
|
||||
"integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
|
||||
"license": "ISC"
|
||||
},
|
||||
"node_modules/fsevents": {
|
||||
"version": "2.3.3",
|
||||
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
|
||||
"integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
|
||||
"hasInstallScript": true,
|
||||
"license": "MIT",
|
||||
"optional": true,
|
||||
"os": [
|
||||
"darwin"
|
||||
],
|
||||
"engines": {
|
||||
"node": "^8.16.0 || ^10.6.0 || >=11.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/function-bind": {
|
||||
"version": "1.1.2",
|
||||
"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
|
||||
@ -7595,27 +7553,6 @@
|
||||
"integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==",
|
||||
"license": "ISC"
|
||||
},
|
||||
"node_modules/input-format": {
|
||||
"version": "0.3.11",
|
||||
"resolved": "https://registry.npmjs.org/input-format/-/input-format-0.3.11.tgz",
|
||||
"integrity": "sha512-q24+iW10ZMb7KIRDlVUl3GvFcadf1ttE/QA2waINkDMdjsPXStQSOvdTyHwO8p+4Mq433ILQJZRL8YKtPjNk4g==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"prop-types": "^15.8.1"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"react": "^18.1.0",
|
||||
"react-dom": "^18.1.0"
|
||||
},
|
||||
"peerDependenciesMeta": {
|
||||
"react": {
|
||||
"optional": true
|
||||
},
|
||||
"react-dom": {
|
||||
"optional": true
|
||||
}
|
||||
}
|
||||
},
|
||||
"node_modules/internal-slot": {
|
||||
"version": "1.0.7",
|
||||
"resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.7.tgz",
|
||||
@ -8178,11 +8115,6 @@
|
||||
"node": ">= 10.13.0"
|
||||
}
|
||||
},
|
||||
"node_modules/js-sha256": {
|
||||
"version": "0.10.1",
|
||||
"resolved": "https://registry.npmjs.org/js-sha256/-/js-sha256-0.10.1.tgz",
|
||||
"integrity": "sha512-5obBtsz9301ULlsgggLg542s/jqtddfOpV5KJc4hajc9JV8GeY2gZHSVpYBn4nWqAUTJ9v+xwtbJ1mIBgIH5Vw=="
|
||||
},
|
||||
"node_modules/js-tokens": {
|
||||
"version": "4.0.0",
|
||||
"resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
|
||||
@ -8276,24 +8208,6 @@
|
||||
"node": ">=4.0"
|
||||
}
|
||||
},
|
||||
"node_modules/jwt-decode": {
|
||||
"version": "4.0.0",
|
||||
"resolved": "https://registry.npmjs.org/jwt-decode/-/jwt-decode-4.0.0.tgz",
|
||||
"integrity": "sha512-+KJGIyHgkGuIq3IEBNftfhW/LfWhXUIY6OmyVWjliu5KH1y0fw7VQ8YndE2O4qZdMSd9SqbnC8GOcZEy0Om7sA==",
|
||||
"engines": {
|
||||
"node": ">=18"
|
||||
}
|
||||
},
|
||||
"node_modules/keycloak-js": {
|
||||
"version": "23.0.7",
|
||||
"resolved": "https://registry.npmjs.org/keycloak-js/-/keycloak-js-23.0.7.tgz",
|
||||
"integrity": "sha512-OmszsKzBhhm5yP4W1q/tMd+nNnKpOAdeVYcoGhphlv8Fj1bNk4wRTYzp7pn5BkvueLz7fhvKHz7uOc33524YrA==",
|
||||
"dependencies": {
|
||||
"base64-js": "^1.5.1",
|
||||
"js-sha256": "^0.10.1",
|
||||
"jwt-decode": "^4.0.0"
|
||||
}
|
||||
},
|
||||
"node_modules/keygrip": {
|
||||
"version": "1.1.0",
|
||||
"resolved": "https://registry.npmjs.org/keygrip/-/keygrip-1.1.0.tgz",
|
||||
@ -8348,12 +8262,6 @@
|
||||
"node": ">= 0.8.0"
|
||||
}
|
||||
},
|
||||
"node_modules/libphonenumber-js": {
|
||||
"version": "1.11.15",
|
||||
"resolved": "https://registry.npmjs.org/libphonenumber-js/-/libphonenumber-js-1.11.15.tgz",
|
||||
"integrity": "sha512-M7+rtYi9l5RvMmHyjyoF3BHHUpXTYdJ0PezZGHNs0GyW1lO+K7jxlXpbdIb7a56h0nqLYdjIw+E+z0ciGaJP7g==",
|
||||
"license": "MIT"
|
||||
},
|
||||
"node_modules/lines-and-columns": {
|
||||
"version": "1.2.4",
|
||||
"resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
|
||||
@ -9648,22 +9556,6 @@
|
||||
}
|
||||
}
|
||||
},
|
||||
"node_modules/react-hook-form": {
|
||||
"version": "7.53.2",
|
||||
"resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.53.2.tgz",
|
||||
"integrity": "sha512-YVel6fW5sOeedd1524pltpHX+jgU2u3DSDtXEaBORNdqiNrsX/nUI/iGXONegttg0mJVnfrIkiV0cmTU6Oo2xw==",
|
||||
"license": "MIT",
|
||||
"engines": {
|
||||
"node": ">=18.0.0"
|
||||
},
|
||||
"funding": {
|
||||
"type": "opencollective",
|
||||
"url": "https://opencollective.com/react-hook-form"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"react": "^16.8.0 || ^17 || ^18 || ^19"
|
||||
}
|
||||
},
|
||||
"node_modules/react-i18next": {
|
||||
"version": "15.1.1",
|
||||
"resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-15.1.1.tgz",
|
||||
@ -9700,23 +9592,6 @@
|
||||
"resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
|
||||
"integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
|
||||
},
|
||||
"node_modules/react-phone-number-input": {
|
||||
"version": "3.4.9",
|
||||
"resolved": "https://registry.npmjs.org/react-phone-number-input/-/react-phone-number-input-3.4.9.tgz",
|
||||
"integrity": "sha512-RG40GTjfJwBR5whpEkQMvMMKcbqQSlXiKfiTp2mYoULkTYwxFn04iAVplRizWi3yLPL0fQiL4U+YU+9MIQGZog==",
|
||||
"license": "MIT",
|
||||
"dependencies": {
|
||||
"classnames": "^2.5.1",
|
||||
"country-flag-icons": "^1.5.11",
|
||||
"input-format": "^0.3.10",
|
||||
"libphonenumber-js": "^1.11.12",
|
||||
"prop-types": "^15.8.1"
|
||||
},
|
||||
"peerDependencies": {
|
||||
"react": ">=16.8",
|
||||
"react-dom": ">=16.8"
|
||||
}
|
||||
},
|
||||
"node_modules/react-remove-scroll": {
|
||||
"version": "2.6.0",
|
||||
"resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.6.0.tgz",
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "dry-wash",
|
||||
"version": "0.3.0",
|
||||
"version": "0.1.0",
|
||||
"description": "<a id=\"readme-top\"></a>",
|
||||
"main": "./src/index.tsx",
|
||||
"scripts": {
|
||||
@ -24,19 +24,15 @@
|
||||
"@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": {
|
||||
|
||||
@ -1,40 +1,25 @@
|
||||
import { generatePath } from 'react-router-dom';
|
||||
import { getNavigationValue } from '@brojs/cli';
|
||||
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}`;
|
||||
import { Order } from "../models";
|
||||
|
||||
export const URLs = {
|
||||
landing: {
|
||||
url: getNavigationValue('dry-wash.main'),
|
||||
url: getNavigationValue("dry-wash.main"),
|
||||
getUrl() {
|
||||
return this.url;
|
||||
},
|
||||
}
|
||||
},
|
||||
orderCreate: {
|
||||
url: getFullUrls(getNavigationValue('dry-wash.order.create')),
|
||||
orderForm: {
|
||||
url: getNavigationValue("dry-wash.create"),
|
||||
getUrl() {
|
||||
return this.url;
|
||||
},
|
||||
}
|
||||
},
|
||||
orderView: {
|
||||
url: getFullUrls(getNavigationValue('dry-wash.order.view')),
|
||||
url: getNavigationValue("dry-wash.view.order"),
|
||||
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')),
|
||||
},
|
||||
}
|
||||
}
|
||||
};
|
||||
@ -1,40 +0,0 @@
|
||||
import { getConfigValue } from '@brojs/cli';
|
||||
|
||||
enum ArmEndpoints {
|
||||
ORDERS = '/arm/orders',
|
||||
MASTERS = '/arm/masters',
|
||||
}
|
||||
|
||||
const armService = () => {
|
||||
const endpoint = getConfigValue('dry-wash.api');
|
||||
|
||||
const fetchOrders = async ({ date }: { date: Date }) => {
|
||||
const response = await fetch(`${endpoint}${ArmEndpoints.ORDERS}`, {
|
||||
method: 'POST',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
},
|
||||
body: JSON.stringify({ date }),
|
||||
});
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Error(`Failed to fetch orders: ${response.status}`);
|
||||
}
|
||||
|
||||
return await response.json();
|
||||
};
|
||||
|
||||
const fetchMasters = async () => {
|
||||
const response = await fetch(`${endpoint}${ArmEndpoints.MASTERS}`);
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Error(`Failed to fetch masters: ${response.status}`);
|
||||
}
|
||||
|
||||
return await response.json();
|
||||
};
|
||||
|
||||
return { fetchOrders, fetchMasters };
|
||||
};
|
||||
|
||||
export { armService, ArmEndpoints };
|
||||
@ -1,25 +0,0 @@
|
||||
import { getConfigValue } from '@brojs/cli';
|
||||
|
||||
import { Order } from '../models/landing';
|
||||
|
||||
enum LandingEndpoints {
|
||||
ORDER_VIEW = '/order'
|
||||
}
|
||||
|
||||
const LandingService = () => {
|
||||
const endpoint = getConfigValue('dry-wash.api');
|
||||
|
||||
const fetchOrder = async (orderId: Order.Id) => {
|
||||
const response = await fetch(`${endpoint}${LandingEndpoints.ORDER_VIEW}/${orderId}`);
|
||||
|
||||
if (!response.ok) {
|
||||
throw new Error(`Failed to fetch order: ${response.status}`);
|
||||
}
|
||||
|
||||
return await response.json();
|
||||
};
|
||||
|
||||
return { fetchOrder };
|
||||
};
|
||||
|
||||
export { LandingService, LandingEndpoints };
|
||||
@ -1,31 +0,0 @@
|
||||
import React from 'react';
|
||||
import { Box, Button, Text } from '@chakra-ui/react';
|
||||
import { ArrowBackIcon, ArrowForwardIcon } from '@chakra-ui/icons';
|
||||
|
||||
interface DateNavigatorProps {
|
||||
currentDate: Date;
|
||||
onPreviousDate: () => void;
|
||||
onNextDate: () => void;
|
||||
}
|
||||
|
||||
const DateNavigator = ({
|
||||
currentDate,
|
||||
onPreviousDate,
|
||||
onNextDate,
|
||||
}: DateNavigatorProps) => {
|
||||
return (
|
||||
<Box display='flex' alignItems='center' justifyContent='flex-start' mb='5'>
|
||||
<Button onClick={onPreviousDate}>
|
||||
<ArrowBackIcon />
|
||||
</Button>
|
||||
<Text mx='4' fontSize='lg' fontWeight='bold'>
|
||||
{currentDate.toLocaleDateString()}
|
||||
</Text>
|
||||
<Button onClick={onNextDate}>
|
||||
<ArrowForwardIcon />
|
||||
</Button>
|
||||
</Box>
|
||||
);
|
||||
};
|
||||
|
||||
export default DateNavigator;
|
||||
@ -1 +0,0 @@
|
||||
export { default } from './DateNavigator';
|
||||
@ -5,33 +5,20 @@ import { Navigate, Route, Routes } from 'react-router-dom';
|
||||
import Sidebar from '../Sidebar';
|
||||
import Orders from '../Orders';
|
||||
import Masters from '../Masters';
|
||||
import { URLs } from '../../__data__/urls';
|
||||
|
||||
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>
|
||||
);
|
||||
};
|
||||
const LayoutArm = () => (
|
||||
<Flex h='100vh'>
|
||||
<Sidebar />
|
||||
<Box flex='1' bg='gray.50'>
|
||||
<Routes>
|
||||
<Route>
|
||||
<Route index element={<Navigate to='orders' replace />} />
|
||||
<Route path='orders' element={<Orders />} />
|
||||
<Route path='masters' element={<Masters />} />
|
||||
</Route>
|
||||
</Routes>
|
||||
</Box>
|
||||
</Flex>
|
||||
);
|
||||
|
||||
export default LayoutArm;
|
||||
|
||||
@ -4,19 +4,6 @@ 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 (
|
||||
<Tr>
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
import React, { useEffect, useState } from 'react';
|
||||
import React from 'react';
|
||||
import {
|
||||
Box,
|
||||
Heading,
|
||||
@ -10,17 +10,12 @@ import {
|
||||
Button,
|
||||
useDisclosure,
|
||||
Flex,
|
||||
useToast,
|
||||
Td,
|
||||
Text,
|
||||
Spinner,
|
||||
} from '@chakra-ui/react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
|
||||
import MasterItem from '../MasterItem';
|
||||
import MasterDrawer from '../MasterDrawer';
|
||||
import { armService } from '../../api/arm';
|
||||
import { MasterProps } from '../MasterItem/MasterItem';
|
||||
import data from '../../../stubs/json/arm-masters/success.json';
|
||||
|
||||
const TABLE_HEADERS = [
|
||||
'name' as const,
|
||||
@ -31,41 +26,11 @@ const TABLE_HEADERS = [
|
||||
|
||||
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'>
|
||||
@ -83,25 +48,9 @@ const Masters = () => {
|
||||
</Tr>
|
||||
</Thead>
|
||||
<Tbody>
|
||||
{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} />
|
||||
))}
|
||||
{data.body.map((master, index) => (
|
||||
<MasterItem key={index} {...master} />
|
||||
))}
|
||||
</Tbody>
|
||||
</Table>
|
||||
<MasterDrawer isOpen={isOpen} onClose={onClose} />
|
||||
|
||||
@ -1,90 +1,30 @@
|
||||
import React, { useEffect, useState } from 'react';
|
||||
import {
|
||||
Box,
|
||||
Heading,
|
||||
Table,
|
||||
Thead,
|
||||
Tbody,
|
||||
Tr,
|
||||
Th,
|
||||
Spinner,
|
||||
Text,
|
||||
Td,
|
||||
useToast,
|
||||
} from '@chakra-ui/react';
|
||||
import React from 'react';
|
||||
import { Box, Heading, Table, Thead, Tbody, Tr, Th } from '@chakra-ui/react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import dayjs from 'dayjs';
|
||||
|
||||
import OrderItem from '../OrderItem';
|
||||
import { OrderProps } from '../OrderItem/OrderItem';
|
||||
import { armService } from '../../api/arm';
|
||||
import DateNavigator from '../DateNavigator';
|
||||
|
||||
const TABLE_HEADERS = [
|
||||
'carNumber' as const,
|
||||
'washingTime' as const,
|
||||
'orderDate' as const,
|
||||
'status' as const,
|
||||
'telephone' as const,
|
||||
'location' as const,
|
||||
];
|
||||
import data from '../../../stubs/json/arm-orders/success.json';
|
||||
|
||||
const Orders = () => {
|
||||
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]);
|
||||
const TABLE_HEADERS = [
|
||||
'carNumber' as const,
|
||||
'washingTime' as const,
|
||||
'orderDate' as const,
|
||||
'status' as const,
|
||||
'telephone' as const,
|
||||
'location' as const,
|
||||
];
|
||||
|
||||
return (
|
||||
<Box p='8'>
|
||||
<Heading size='lg' mb='5'>
|
||||
{t('title')}
|
||||
</Heading>
|
||||
|
||||
<DateNavigator
|
||||
currentDate={currentDate}
|
||||
onPreviousDate={() =>
|
||||
setCurrentDate((prevDate) =>
|
||||
dayjs(prevDate).subtract(1, 'day').toDate(),
|
||||
)
|
||||
}
|
||||
onNextDate={() =>
|
||||
setCurrentDate((prevDate) => dayjs(prevDate).add(1, 'day').toDate())
|
||||
}
|
||||
/>
|
||||
|
||||
<Table variant='simple' colorScheme='blackAlpha'>
|
||||
<Thead>
|
||||
<Tr>
|
||||
@ -94,29 +34,13 @@ const Orders = () => {
|
||||
</Tr>
|
||||
</Thead>
|
||||
<Tbody>
|
||||
{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']}
|
||||
/>
|
||||
))}
|
||||
{data.body.map((order, index) => (
|
||||
<OrderItem
|
||||
key={index}
|
||||
{...order}
|
||||
status={order.status as OrderProps['status']}
|
||||
/>
|
||||
))}
|
||||
</Tbody>
|
||||
</Table>
|
||||
</Box>
|
||||
|
||||
@ -1,14 +1,9 @@
|
||||
import { Box, Button, Heading, VStack, Divider } from '@chakra-ui/react';
|
||||
import React from 'react';
|
||||
import { useLocation, Link } from 'react-router-dom';
|
||||
import { Link } from 'react-router-dom';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
|
||||
import { URLs } from '../../__data__/urls';
|
||||
|
||||
const Sidebar = () => {
|
||||
const location = useLocation();
|
||||
const isActive = (keyword: string) => location.pathname.includes(keyword);
|
||||
|
||||
const { t } = useTranslation('~', {
|
||||
keyPrefix: 'dry-wash.arm.master.sideBar',
|
||||
});
|
||||
@ -28,29 +23,25 @@ const Sidebar = () => {
|
||||
|
||||
<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>
|
||||
)}
|
||||
<Button
|
||||
as={Link}
|
||||
to='orders'
|
||||
w='100%'
|
||||
colorScheme='green'
|
||||
variant='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>
|
||||
)}
|
||||
<Button
|
||||
as={Link}
|
||||
to='masters'
|
||||
w='100%'
|
||||
colorScheme='green'
|
||||
variant='ghost'
|
||||
>
|
||||
{t('master')}
|
||||
</Button>
|
||||
<Divider />
|
||||
</VStack>
|
||||
</Box>
|
||||
|
||||
@ -1,29 +1,52 @@
|
||||
import React, { FC } from 'react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import {
|
||||
MdEco,
|
||||
MdMiscellaneousServices,
|
||||
MdPlace,
|
||||
MdHandshake,
|
||||
} from 'react-icons/md';
|
||||
import { Heading, HStack, List, Text, VStack } from '@chakra-ui/react';
|
||||
|
||||
import { CtaButton, PageSection } from '../';
|
||||
|
||||
import { ListItem } from './ListItem';
|
||||
import { BenefitsSectionProps } from './types';
|
||||
import { iconsMap } from './helper';
|
||||
|
||||
export const BenefitsSection: FC<BenefitsSectionProps> = ({
|
||||
data: { heading, description, list } = {},
|
||||
}) => {
|
||||
const { t } = useTranslation('~', { keyPrefix: 'dry-wash.landing' });
|
||||
export const BenefitsSection: FC = () => {
|
||||
const { t } = useTranslation('~', {
|
||||
keyPrefix: 'dry-wash.landing.benefits-section',
|
||||
});
|
||||
|
||||
const listData = [
|
||||
{
|
||||
Icon: MdEco,
|
||||
children: t('list.0'),
|
||||
},
|
||||
{
|
||||
Icon: MdMiscellaneousServices,
|
||||
children: t('list.1'),
|
||||
},
|
||||
{
|
||||
Icon: MdPlace,
|
||||
children: t('list.2'),
|
||||
},
|
||||
{
|
||||
Icon: MdHandshake,
|
||||
children: t('list.3'),
|
||||
},
|
||||
];
|
||||
|
||||
return (
|
||||
<PageSection>
|
||||
<VStack w='full' spacing={2}>
|
||||
<Heading as='h2'>{t(heading)}</Heading>
|
||||
<Text>{t(description)}</Text>
|
||||
<Heading as='h2'>{t('heading')}</Heading>
|
||||
<Text>
|
||||
{t('description')}
|
||||
</Text>
|
||||
</VStack>
|
||||
<List display='flex' flexDirection='column' spacing={3}>
|
||||
{list.map((itemKey, i) => (
|
||||
<ListItem key={i} Icon={iconsMap[itemKey]}>
|
||||
{t(itemKey)}
|
||||
</ListItem>
|
||||
{listData.map((props, i) => (
|
||||
<ListItem key={i} {...props} />
|
||||
))}
|
||||
</List>
|
||||
<HStack w='full' justify='flex-end'>
|
||||
|
||||
@ -1,13 +0,0 @@
|
||||
import { IconType } from "react-icons";
|
||||
import { MdEco, MdMiscellaneousServices, MdPlace, MdHandshake } from "react-icons/md";
|
||||
|
||||
import { ArrElement } from "../../../lib";
|
||||
|
||||
import { BenefitsList } from "./types";
|
||||
|
||||
export const iconsMap: Record<ArrElement<BenefitsList>, IconType> = {
|
||||
"benefits-section.list.0": MdEco,
|
||||
"benefits-section.list.1": MdMiscellaneousServices,
|
||||
"benefits-section.list.2": MdPlace,
|
||||
"benefits-section.list.3": MdHandshake,
|
||||
};
|
||||
@ -1,2 +1 @@
|
||||
export type { BenefitsSectionProps } from './types';
|
||||
export { BenefitsSection } from './BenefitsSection';
|
||||
@ -1,14 +0,0 @@
|
||||
export type BenefitsList = [
|
||||
'benefits-section.list.0',
|
||||
'benefits-section.list.1',
|
||||
'benefits-section.list.2',
|
||||
'benefits-section.list.3',
|
||||
];
|
||||
|
||||
export type BenefitsSectionProps = {
|
||||
data: {
|
||||
heading: 'benefits-section.heading';
|
||||
description: 'benefits-section.description';
|
||||
list: BenefitsList;
|
||||
};
|
||||
};
|
||||
@ -6,16 +6,16 @@ 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' });
|
||||
const { t } = useTranslation();
|
||||
|
||||
return (
|
||||
<Button
|
||||
as={RouterLink}
|
||||
to={URLs.orderCreate.getUrl()}
|
||||
to={URLs.orderForm.getUrl()}
|
||||
colorScheme='primary'
|
||||
{...props}
|
||||
>
|
||||
{t('make-order-button')}
|
||||
{t('~:dry-wash.landing.make-order-button')}
|
||||
</Button>
|
||||
);
|
||||
};
|
||||
|
||||
@ -1,23 +1,22 @@
|
||||
import React, { FC } from 'react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { Box, Heading, Text, Center, VStack } from '@chakra-ui/react';
|
||||
import { Box, Heading, Text, Center, VStack, BoxProps } from '@chakra-ui/react';
|
||||
|
||||
import { DemoVideoPosterImg } from '../../../assets/images';
|
||||
import { CtaButton, SiteLogo, PageSection } from '../';
|
||||
|
||||
import { HeroSectionProps } from './types';
|
||||
type HeroSectionProps = Pick<BoxProps, 'flexShrink'>;
|
||||
|
||||
export const HeroSection: FC<HeroSectionProps> = ({
|
||||
data: { headline, description, video } = {},
|
||||
flexShrink,
|
||||
}) => {
|
||||
const { t } = useTranslation('~', { keyPrefix: 'dry-wash.landing' });
|
||||
export const HeroSection: FC<HeroSectionProps> = ({ flexShrink }) => {
|
||||
const { t } = useTranslation('~', {
|
||||
keyPrefix: 'dry-wash.landing.hero-section',
|
||||
});
|
||||
|
||||
return (
|
||||
<Box flexShrink={flexShrink} as='header' pos='relative' zIndex={0}>
|
||||
<Box
|
||||
as='video'
|
||||
src={`${__webpack_public_path__}/remote-assets/${video}`}
|
||||
src={`${__webpack_public_path__}/remote-assets/demo.mp4`}
|
||||
poster={DemoVideoPosterImg}
|
||||
autoPlay
|
||||
loop
|
||||
@ -48,14 +47,14 @@ export const HeroSection: FC<HeroSectionProps> = ({
|
||||
color='white'
|
||||
__css={{ textWrap: 'balance' }}
|
||||
>
|
||||
{t(headline)}
|
||||
{t('headline')}
|
||||
</Heading>
|
||||
<Text
|
||||
textAlign='center'
|
||||
__css={{ textWrap: 'balance' }}
|
||||
color='white'
|
||||
>
|
||||
{t(description)}
|
||||
{t('description')}
|
||||
</Text>
|
||||
</VStack>
|
||||
<CtaButton size='lg' />
|
||||
|
||||
@ -1,9 +0,0 @@
|
||||
import { BoxProps } from "@chakra-ui/react";
|
||||
|
||||
export type HeroSectionProps = {
|
||||
data: {
|
||||
headline: 'hero-section.headline';
|
||||
description: 'hero-section.description';
|
||||
video: string;
|
||||
};
|
||||
} & Pick<BoxProps, 'flexShrink'>;
|
||||
@ -5,16 +5,15 @@ 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 = () => {
|
||||
const { t } = useTranslation('~', {
|
||||
keyPrefix: 'dry-wash.landing.social-proof-section',
|
||||
});
|
||||
|
||||
return (
|
||||
<PageSection>
|
||||
<Heading as='h2'>{t(heading)}</Heading>
|
||||
<Heading as='h2'>{t('heading')}</Heading>
|
||||
<ReviewsSlider />
|
||||
<HStack w='full' justify='flex-end'>
|
||||
<CtaButton />
|
||||
|
||||
@ -1,2 +1 @@
|
||||
export type { SocialProofSectionProps } from './types';
|
||||
export { SocialProofSection } from './SocialProofSection';
|
||||
@ -1,5 +0,0 @@
|
||||
export type SocialProofSectionProps = {
|
||||
data: {
|
||||
heading: 'social-proof-section.heading';
|
||||
};
|
||||
};
|
||||
@ -1,23 +0,0 @@
|
||||
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>
|
||||
);
|
||||
},
|
||||
);
|
||||
@ -1,50 +0,0 @@
|
||||
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 +0,0 @@
|
||||
export { CarBodySelect } from './car-body-select';
|
||||
@ -1,17 +0,0 @@
|
||||
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';
|
||||
};
|
||||
@ -1,23 +0,0 @@
|
||||
import React, { forwardRef, useId } from 'react';
|
||||
import { Input, InputProps } from '@chakra-ui/react';
|
||||
|
||||
import { CAR_COLORS } from './helper';
|
||||
|
||||
export const CarColorInput = forwardRef<HTMLInputElement, InputProps>(
|
||||
function CarColorInput(props, ref) {
|
||||
const listId = useId();
|
||||
|
||||
return (
|
||||
<>
|
||||
<Input ref={ref} list={listId} {...props} />
|
||||
<datalist id={listId}>
|
||||
{CAR_COLORS.map(({ code, name }) => (
|
||||
<option key={code} label={name} value={code}>{name}</option>
|
||||
))}
|
||||
</datalist>
|
||||
</>
|
||||
);
|
||||
},
|
||||
);
|
||||
|
||||
// todo: add option color visual indication
|
||||
@ -1,34 +0,0 @@
|
||||
export const CAR_COLORS: Record<'name' | 'code', string>[] = [
|
||||
{
|
||||
name: 'white',
|
||||
code: '#ffffff'
|
||||
},
|
||||
{
|
||||
name: 'black',
|
||||
code: '#000000'
|
||||
},
|
||||
{
|
||||
name: 'silver',
|
||||
code: '#c0c0c0'
|
||||
},
|
||||
{
|
||||
name: 'gray',
|
||||
code: '#808080'
|
||||
},
|
||||
{
|
||||
name: 'beige-brown',
|
||||
code: '#796745'
|
||||
},
|
||||
{
|
||||
name: 'red',
|
||||
code: '#b90000'
|
||||
},
|
||||
{
|
||||
name: 'blue',
|
||||
code: '#003B62'
|
||||
},
|
||||
{
|
||||
name: 'green',
|
||||
code: '#078d51'
|
||||
},
|
||||
];
|
||||
@ -1 +0,0 @@
|
||||
export { CarColorInput } from './car-color-input';
|
||||
@ -1,22 +0,0 @@
|
||||
import React, { forwardRef } from 'react';
|
||||
import { Input, InputProps } from '@chakra-ui/react';
|
||||
|
||||
import { handleInputChange } from './helper';
|
||||
|
||||
export const CarNumberInput = forwardRef<HTMLInputElement, InputProps>(
|
||||
function CarNumberInput({ onChange, ...props }, ref) {
|
||||
return (
|
||||
<Input
|
||||
{...props}
|
||||
ref={ref}
|
||||
onChange={(e) => {
|
||||
const formattedValue = handleInputChange(e.target.value);
|
||||
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
||||
// @ts-ignore
|
||||
onChange?.(formattedValue);
|
||||
}}
|
||||
maxLength={8}
|
||||
/>
|
||||
);
|
||||
},
|
||||
);
|
||||
@ -1,33 +0,0 @@
|
||||
const VALID_LETTER = 'а|в|е|к|м|н|о|р|с|т|у|х';
|
||||
|
||||
const invalidCharsRe = new RegExp(`[^(${VALID_LETTER})0-9]`, 'gi');
|
||||
const cleanValue = (value: string) => value.replace(invalidCharsRe, '');
|
||||
|
||||
const validCarNumberInputRe = new RegExp(`^([${VALID_LETTER}]{1}|$)((?:[0-9]|$)(?:[0-9]|$)(?:[0-9]|$))([${VALID_LETTER}]{1,2}|$)$`, '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);
|
||||
};
|
||||
@ -1,2 +0,0 @@
|
||||
export { CarNumberInput } from './car-number-input';
|
||||
export { isValidCarNumber } from './helper';
|
||||
@ -1,12 +0,0 @@
|
||||
import React, { forwardRef } from 'react';
|
||||
import { Input, InputProps } from '@chakra-ui/react';
|
||||
|
||||
export type DateTimeInputProps = InputProps;
|
||||
|
||||
export const DateTimeInput = forwardRef<HTMLInputElement, DateTimeInputProps>(
|
||||
function DateTimeInput(props, ref) {
|
||||
return <Input ref={ref} {...props} type='datetime-local' />;
|
||||
},
|
||||
);
|
||||
|
||||
// todo: apply brand styles to popover
|
||||
@ -1 +0,0 @@
|
||||
export { type DateTimeInputProps, DateTimeInput } from './date-time';
|
||||
@ -1,35 +0,0 @@
|
||||
import React from 'react';
|
||||
import { FormControl, FormLabel, FormErrorMessage } from '@chakra-ui/react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
|
||||
import { FormControllerFieldProps } from './types';
|
||||
|
||||
export const FormControllerField = ({
|
||||
control,
|
||||
name,
|
||||
label,
|
||||
isRequired,
|
||||
rules,
|
||||
errors,
|
||||
Controller
|
||||
}: FormControllerFieldProps) => {
|
||||
const { t } = useTranslation('~', {
|
||||
keyPrefix: 'dry-wash.order-create.form.field',
|
||||
});
|
||||
const fieldErrors = errors[name];
|
||||
|
||||
return (
|
||||
<FormControl isRequired={isRequired} isInvalid={!!fieldErrors}>
|
||||
<FormLabel htmlFor={name}>{label}</FormLabel>
|
||||
<Controller
|
||||
control={control}
|
||||
name={name}
|
||||
rules={{
|
||||
required: isRequired && t('validation.required'),
|
||||
...rules,
|
||||
}}
|
||||
/>
|
||||
<FormErrorMessage>{fieldErrors?.message}</FormErrorMessage>
|
||||
</FormControl>
|
||||
);
|
||||
};
|
||||
@ -1,47 +0,0 @@
|
||||
import React from 'react';
|
||||
import {
|
||||
FormControl,
|
||||
FormLabel,
|
||||
FormErrorMessage,
|
||||
FormHelperText,
|
||||
} from '@chakra-ui/react';
|
||||
import { Controller } from 'react-hook-form';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
|
||||
import { FormInputFieldProps } from './types';
|
||||
|
||||
export const FormInputField = ({
|
||||
control,
|
||||
name,
|
||||
label,
|
||||
isRequired,
|
||||
rules,
|
||||
errors,
|
||||
Input,
|
||||
inputProps,
|
||||
help,
|
||||
}: FormInputFieldProps) => {
|
||||
const { t } = useTranslation('~', {
|
||||
keyPrefix: 'dry-wash.order-create.form.field',
|
||||
});
|
||||
const fieldErrors = errors[name];
|
||||
|
||||
return (
|
||||
<FormControl isRequired={label && isRequired} isInvalid={!!fieldErrors}>
|
||||
{label && <FormLabel htmlFor={name}>{label}</FormLabel>}
|
||||
<Controller
|
||||
control={control}
|
||||
name={name}
|
||||
rules={{
|
||||
required: isRequired && t('validation.required'),
|
||||
...rules,
|
||||
}}
|
||||
render={({ field }) => (
|
||||
<Input variant='filled' {...field} {...inputProps} />
|
||||
)}
|
||||
/>
|
||||
<FormErrorMessage>{fieldErrors?.message}</FormErrorMessage>
|
||||
{help && <FormHelperText>{help}</FormHelperText>}
|
||||
</FormControl>
|
||||
);
|
||||
};
|
||||
@ -1,3 +0,0 @@
|
||||
export type { FormFieldProps } from './types';
|
||||
export { FormInputField } from './form-input-field';
|
||||
export { FormControllerField } from './form-controller-field';
|
||||
@ -1,26 +0,0 @@
|
||||
import { ReactElement, ReactNode } from 'react';
|
||||
import { ControllerProps, ControllerRenderProps, FieldErrors } from 'react-hook-form';
|
||||
import { FormLabelProps, FormControlProps, HelpTextProps, InputProps as ChakraInputProps, SelectProps as ChakraSelectProps } from '@chakra-ui/react';
|
||||
|
||||
import { OrderFormValues } from '../types';
|
||||
|
||||
export type FormFieldProps<FormValues = OrderFormValues> = {
|
||||
name: ControllerProps<FormValues>['name'] & FormLabelProps['htmlFor'];
|
||||
label?: FormLabelProps['children'];
|
||||
errors: FieldErrors<FormValues>;
|
||||
control: ControllerProps<FormValues>['control'];
|
||||
isRequired?: FormControlProps['isRequired'];
|
||||
rules?: ControllerProps<FormValues>['rules'];
|
||||
};
|
||||
|
||||
type InputProps<FormValues = OrderFormValues> = Partial<ControllerRenderProps<FormValues> & ChakraInputProps & ChakraSelectProps>;
|
||||
|
||||
export type FormInputFieldProps<FormValues = OrderFormValues, Input = (props: InputProps<FormValues>) => ReactNode> = FormFieldProps<FormValues> & {
|
||||
Input: Input;
|
||||
inputProps?: InputProps<FormValues>;
|
||||
help?: HelpTextProps['children'];
|
||||
};
|
||||
|
||||
export type FormControllerFieldProps<FormValues = OrderFormValues> = FormFieldProps<FormValues> & {
|
||||
Controller: (props: Pick<ControllerProps<FormValues>, 'control' | 'name' | 'rules'>) => ReactElement;
|
||||
};
|
||||
@ -1,67 +0,0 @@
|
||||
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 +0,0 @@
|
||||
export { OrderForm } from './order-form';
|
||||
@ -1,15 +0,0 @@
|
||||
import { Location, StringCoordinates, StringLocation } from "./types";
|
||||
|
||||
export const splitLocation = (stringifiedLocation: StringLocation) => {
|
||||
return stringifiedLocation.replace(' ', '~').split('~');
|
||||
};
|
||||
|
||||
export const stringifyLocation = (location: Location): StringLocation => {
|
||||
const { coordinates, address } = location;
|
||||
const [latitude, longitude] = coordinates;
|
||||
const coordinatesString = `${latitude},${longitude}` satisfies StringCoordinates;
|
||||
return `${coordinatesString} ${address}`;
|
||||
};
|
||||
|
||||
const locationRe = new RegExp(/^[-0-9]+.[0-9]+,[-0-9]+.[0-9]+ .*/);
|
||||
export const isValidLocation = (value: string): value is StringLocation => locationRe.test(value);
|
||||
@ -1,4 +0,0 @@
|
||||
export type { StringLocation } from './types';
|
||||
export * from './location-input';
|
||||
export * from './map';
|
||||
export * from './ymaps';
|
||||
@ -1,40 +0,0 @@
|
||||
import { YMapsApi } from "@pbe/react-yandex-maps/typings/util/typing";
|
||||
|
||||
import { Address, Location, StringLocation } from "../types";
|
||||
import { splitLocation, stringifyLocation } from "../helper";
|
||||
|
||||
export const formatLocation = (location: Location | undefined): StringLocation | '' => {
|
||||
if (!location) {
|
||||
return '';
|
||||
}
|
||||
return stringifyLocation(location);
|
||||
};
|
||||
|
||||
const coordinatesRe = new RegExp(/^[-0-9]+.[0-9]+,[-0-9]+.[0-9]+/);
|
||||
export const extractAddress = (value: string) => value.replace(coordinatesRe, '').trim();
|
||||
|
||||
export const getLocationByAddress = async (ymaps: YMapsApi, address: Address): Promise<Location> => {
|
||||
try {
|
||||
const result = await ymaps.geocode(address);
|
||||
const firstGeoObject = result.geoObjects.get(
|
||||
0,
|
||||
) as unknown as ymaps.IGeoObject<ymaps.IBasePointGeometry>;
|
||||
const [latitude, longitude] = firstGeoObject.geometry.getCoordinates();
|
||||
return { coordinates: [latitude, longitude], address };
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
}
|
||||
};
|
||||
|
||||
export const isRealLocation = async (ymaps: YMapsApi, stringifiedLocation: StringLocation) => {
|
||||
const [coordinates, address] = splitLocation(stringifiedLocation);
|
||||
try {
|
||||
const result = await ymaps.geocode(coordinates);
|
||||
const firstGeoObject = result.geoObjects.get(0) as ymaps.GeocodeResult;
|
||||
const addressByCoordinates = firstGeoObject.getAddressLine();
|
||||
|
||||
return address === addressByCoordinates;
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
}
|
||||
};
|
||||
@ -1 +0,0 @@
|
||||
export { LocationInput } from './location-input';
|
||||
@ -1,144 +0,0 @@
|
||||
import React, { forwardRef, memo, useEffect, useState } from 'react';
|
||||
import {
|
||||
Input,
|
||||
Box,
|
||||
InputProps,
|
||||
PopoverAnchor,
|
||||
Popover,
|
||||
PopoverContent,
|
||||
PopoverBody,
|
||||
List,
|
||||
ListItem,
|
||||
} from '@chakra-ui/react';
|
||||
import { withYMaps } from '@pbe/react-yandex-maps';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
|
||||
import { Suggestion } from '../types';
|
||||
import { isValidLocation } from '../helper';
|
||||
|
||||
import {
|
||||
formatLocation,
|
||||
getLocationByAddress,
|
||||
isRealLocation,
|
||||
extractAddress,
|
||||
} from './helper';
|
||||
import { LocationInputProps } from './types';
|
||||
|
||||
export const LocationInput = memo(
|
||||
withYMaps(
|
||||
forwardRef<HTMLInputElement, LocationInputProps>(function LocationInput(
|
||||
{ ymaps, value, onChange, ...props },
|
||||
ref,
|
||||
) {
|
||||
const [inputValue, setInputValue] = useState<string>('');
|
||||
|
||||
useEffect(() => {
|
||||
setInputValue(value);
|
||||
}, [value]);
|
||||
|
||||
const [suggestions, setSuggestions] = useState<Suggestion[]>([]);
|
||||
const [isSuggestionsPanelOpen, setIsSuggestionsPanelOpen] =
|
||||
useState<boolean>(false);
|
||||
|
||||
const onInputChange: InputProps['onChange'] = async (e) => {
|
||||
const newInputValue = e.target.value;
|
||||
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
|
||||
@ -1,8 +0,0 @@
|
||||
import { YMapsApi } from "@pbe/react-yandex-maps/typings/util/typing";
|
||||
import { InputProps } from "@chakra-ui/react";
|
||||
|
||||
export type LocationInputProps = InputProps & {
|
||||
ymaps?: YMapsApi;
|
||||
value?: string;
|
||||
onChange?: (value: string) => void;
|
||||
};
|
||||
@ -1,10 +0,0 @@
|
||||
import { splitLocation } from "../helper";
|
||||
import { Coordinate, Location, StringLocation } from "../types";
|
||||
|
||||
export const KAZAN_CITY_CENTER: Coordinate[] = [55.797557, 49.107295];
|
||||
|
||||
export const parseLocation = (stringifiedLocation: StringLocation): Location => {
|
||||
const [coordinatesStr, address] = splitLocation(stringifiedLocation);
|
||||
const [latitude, longitude] = coordinatesStr.split(',').map(Number);
|
||||
return { coordinates: [latitude, longitude], address };
|
||||
};
|
||||
@ -1 +0,0 @@
|
||||
export { MapComponent } from './map';
|
||||
@ -1,70 +0,0 @@
|
||||
import React, { FC, memo, useEffect, useState } from 'react';
|
||||
import {
|
||||
Map,
|
||||
Placemark,
|
||||
GeolocationControl,
|
||||
ZoomControl,
|
||||
withYMaps,
|
||||
} from '@pbe/react-yandex-maps';
|
||||
import { YMapsApi } from '@pbe/react-yandex-maps/typings/util/typing';
|
||||
|
||||
import { Coordinate, StringLocation } from '../types';
|
||||
import { isValidLocation, stringifyLocation } from '../helper';
|
||||
|
||||
import { KAZAN_CITY_CENTER, parseLocation } from './helper';
|
||||
|
||||
export const MapComponent: FC<{
|
||||
ymaps?: YMapsApi;
|
||||
selectedLocation: StringLocation | null;
|
||||
onMapClick: (props: StringLocation) => void;
|
||||
}> = memo(
|
||||
withYMaps(
|
||||
({ ymaps, selectedLocation, onMapClick }) => {
|
||||
const [mapCenter, setMapCenter] =
|
||||
useState<Coordinate[]>(KAZAN_CITY_CENTER);
|
||||
|
||||
useEffect(() => {
|
||||
if (isValidLocation(selectedLocation)) {
|
||||
const location = parseLocation(selectedLocation);
|
||||
const { coordinates } = location;
|
||||
setMapCenter(coordinates);
|
||||
}
|
||||
}, [selectedLocation]);
|
||||
|
||||
return (
|
||||
<Map
|
||||
state={{
|
||||
center: mapCenter,
|
||||
zoom:
|
||||
isValidLocation(selectedLocation) &&
|
||||
parseLocation(selectedLocation)?.coordinates
|
||||
? 17
|
||||
: 10,
|
||||
}}
|
||||
width='100%'
|
||||
onClick={async (e: ymaps.MapEvent) => {
|
||||
try {
|
||||
const coordinates = e.get('coords');
|
||||
const address = await ymaps.geocode(coordinates).then((res) => {
|
||||
const firstGeoObject = res.geoObjects.get(
|
||||
0,
|
||||
) as ymaps.GeocodeResult;
|
||||
return firstGeoObject.getAddressLine();
|
||||
});
|
||||
onMapClick(stringifyLocation({ coordinates, address }));
|
||||
setMapCenter(coordinates);
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
}
|
||||
}}
|
||||
>
|
||||
<GeolocationControl options={{ float: 'left' }} />
|
||||
<ZoomControl />
|
||||
{selectedLocation && <Placemark geometry={mapCenter} />}
|
||||
</Map>
|
||||
);
|
||||
},
|
||||
true,
|
||||
['geocode'],
|
||||
),
|
||||
);
|
||||
@ -1,17 +0,0 @@
|
||||
export type Address = string;
|
||||
|
||||
export type Suggestion = {
|
||||
value: Address;
|
||||
displayName: string;
|
||||
};
|
||||
|
||||
export type Coordinate = number;
|
||||
|
||||
export type Location = {
|
||||
address: Address;
|
||||
coordinates: [Coordinate, Coordinate];
|
||||
};
|
||||
|
||||
export type StringCoordinates = `${Coordinate},${Coordinate}`;
|
||||
|
||||
export type StringLocation = `${StringCoordinates} ${Address}`;
|
||||
@ -1 +0,0 @@
|
||||
export { YMapsProvider } from './ymaps-provider';
|
||||
@ -1,16 +0,0 @@
|
||||
import { YMaps } from '@pbe/react-yandex-maps';
|
||||
import React, { PropsWithChildren } from 'react';
|
||||
|
||||
export const YMapsProvider = ({ children }: PropsWithChildren) => {
|
||||
return (
|
||||
<YMaps
|
||||
query={{
|
||||
lang: 'ru_RU',
|
||||
apikey: '19cbc387-db9a-4807-a620-5205215db40f',
|
||||
suggest_apikey: '3576e65e-5e75-4ea2-b21c-7f9db112682e',
|
||||
}}
|
||||
>
|
||||
{children}
|
||||
</YMaps>
|
||||
);
|
||||
};
|
||||
@ -1,133 +0,0 @@
|
||||
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 +0,0 @@
|
||||
export { isValidPhoneNumber } from "react-phone-number-input";
|
||||
@ -1,2 +0,0 @@
|
||||
export { PhoneInput } from './phone-input';
|
||||
export { isValidPhoneNumber } from './helper';
|
||||
@ -1,18 +0,0 @@
|
||||
import React from 'react';
|
||||
import ReactPhoneNumberInput from 'react-phone-number-input/react-hook-form-input';
|
||||
import { Input } from '@chakra-ui/react';
|
||||
|
||||
import 'react-phone-number-input/style.css';
|
||||
|
||||
import { PhoneInputType } from './types';
|
||||
|
||||
export const PhoneInput: PhoneInputType = (props) => {
|
||||
return (
|
||||
<ReactPhoneNumberInput
|
||||
defaultCountry='RU'
|
||||
inputComponent={Input}
|
||||
variant='filled'
|
||||
{...props}
|
||||
/>
|
||||
);
|
||||
};
|
||||
@ -1,7 +0,0 @@
|
||||
import { FieldValues } from 'react-hook-form';
|
||||
import { DefaultInputComponentProps } from 'react-phone-number-input';
|
||||
import { DefaultFormValues, Props } from 'react-phone-number-input/react-hook-form';
|
||||
|
||||
type PhoneInputProps<FormValues, InputComponentProps = DefaultInputComponentProps> = Props<InputComponentProps, FormValues>;
|
||||
|
||||
export type PhoneInputType = <FormValues extends FieldValues = DefaultFormValues, InputComponentProps = DefaultInputComponentProps>(props: PhoneInputProps<FormValues, InputComponentProps>) => JSX.Element;
|
||||
@ -1 +0,0 @@
|
||||
export { SubmitButton } from './submit-button';
|
||||
@ -1,15 +0,0 @@
|
||||
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>
|
||||
);
|
||||
};
|
||||
@ -1,9 +0,0 @@
|
||||
export type OrderFormValues = {
|
||||
phone: string;
|
||||
carNumber: string;
|
||||
carColor: string;
|
||||
carBody: string;
|
||||
carLocation: string;
|
||||
availableDatetimeBegin: string;
|
||||
availableDatetimeEnd: string;
|
||||
};
|
||||
@ -1 +0,0 @@
|
||||
export * from './form';
|
||||
@ -1 +0,0 @@
|
||||
export { OrderDetails } from './order-details';
|
||||
@ -1,99 +0,0 @@
|
||||
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 +0,0 @@
|
||||
export { OrderStatus } from './order-status';
|
||||
@ -1,49 +0,0 @@
|
||||
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 +0,0 @@
|
||||
export * from './details';
|
||||
@ -37,44 +37,6 @@ 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);
|
||||
@ -1,34 +0,0 @@
|
||||
import Keycloak from 'keycloak-js';
|
||||
|
||||
const keycloak = new Keycloak({
|
||||
url: 'https://kc.bro-js.ru',
|
||||
realm: 'open',
|
||||
clientId: 'dry-wash',
|
||||
});
|
||||
|
||||
const authLogin = async ({ redirect }) => {
|
||||
let user = null;
|
||||
|
||||
try {
|
||||
const authenticated = await keycloak.init({ onLoad: 'login-required' });
|
||||
if (authenticated) {
|
||||
user = { ...(await keycloak.loadUserInfo()), ...keycloak.tokenParsed };
|
||||
|
||||
const isOperator =
|
||||
user?.resource_access?.['dry-wash']?.roles.includes('operator');
|
||||
|
||||
if (!isOperator) {
|
||||
redirect();
|
||||
}
|
||||
|
||||
return user;
|
||||
} else {
|
||||
console.log('User is not authenticated');
|
||||
}
|
||||
} catch (error) {
|
||||
keycloak.login();
|
||||
console.error('Failed to initialize adapter:', error);
|
||||
}
|
||||
};
|
||||
|
||||
export default authLogin;
|
||||
@ -10,7 +10,3 @@ export const getTimeSlot = (start: string, end: string) => {
|
||||
end: endDay,
|
||||
});
|
||||
};
|
||||
|
||||
export const formatDatetime = (datetime: string) => {
|
||||
return dayjs(datetime).format('HH:mm DD.MM.YYYY');
|
||||
};
|
||||
@ -1,2 +0,0 @@
|
||||
export * from './date-helpers';
|
||||
export * from './types';
|
||||
@ -1,41 +0,0 @@
|
||||
/**
|
||||
* @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 +1,2 @@
|
||||
export * as mockOrder from './order';
|
||||
export * as mockReview from './review';
|
||||
7
src/mocks/landing/order.ts
Normal file
7
src/mocks/landing/order.ts
Normal file
@ -0,0 +1,7 @@
|
||||
import { Order } from "../../models";
|
||||
|
||||
export const orders: Order.View[] = [
|
||||
{ id: 'id1' },
|
||||
{ id: 'id2' },
|
||||
{ id: 'id3' },
|
||||
];
|
||||
@ -1 +0,0 @@
|
||||
export * from './order-view';
|
||||
@ -1,14 +0,0 @@
|
||||
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;
|
||||
};
|
||||
23
src/models/i18next.d.ts
vendored
23
src/models/i18next.d.ts
vendored
@ -1,5 +1,24 @@
|
||||
import defaultLocale from '../../locales/ru.json';
|
||||
import { CreateTree } from '../lib';
|
||||
|
||||
type Split<S extends string, D extends string> =
|
||||
S extends `${infer A}${D}${infer B}` ? [A, ...Split<B, D>] : [S];
|
||||
|
||||
type NestedObject<T extends string[]> =
|
||||
T extends [infer Head, ...infer Tail] ?
|
||||
Head extends string ?
|
||||
{ [key in Head]: NestedObject<Tail extends string[] ? Tail : []> } : never :
|
||||
string;
|
||||
|
||||
// Основная утилита для обработки union type
|
||||
type CreateTree<T> =
|
||||
UnionToIntersection<T extends infer U ?
|
||||
U extends string ?
|
||||
NestedObject<Split<U, '.'>> : never : never>;
|
||||
|
||||
// Утилита для объединения типов
|
||||
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;
|
||||
|
||||
type LanguageResource = CreateTree<keyof typeof defaultLocale>;
|
||||
|
||||
@ -7,6 +26,6 @@ declare module "i18next" {
|
||||
interface CustomTypeOptions {
|
||||
resources: {
|
||||
'~': LanguageResource
|
||||
}
|
||||
};
|
||||
}
|
||||
}
|
||||
@ -1 +1,3 @@
|
||||
export * from './i18n';
|
||||
export * as Order from './order';
|
||||
export * as Review from './review';
|
||||
@ -1,18 +0,0 @@
|
||||
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
|
||||
}
|
||||
@ -1 +0,0 @@
|
||||
export type PhoneNumber = string; // +79876543210
|
||||
@ -1,6 +0,0 @@
|
||||
export * as Car from './car';
|
||||
export * as Customer from './customer';
|
||||
export * as Washing from './washing';
|
||||
export * as Order from './order'; // import: Car, Customer, Washing
|
||||
export * as Review from './review';
|
||||
export * from './stubs';
|
||||
@ -1,38 +0,0 @@
|
||||
import { Car, Customer, Washing } from ".";
|
||||
|
||||
export type Id = string;
|
||||
|
||||
export type Status = 'pending' |
|
||||
'progress' |
|
||||
'working' |
|
||||
'canceled' |
|
||||
'complete';
|
||||
|
||||
export type Create = {
|
||||
customer: {
|
||||
phone: Customer.PhoneNumber,
|
||||
};
|
||||
car: {
|
||||
number: Car.RegistrationNumber,
|
||||
body: Car.BodyStyle,
|
||||
color: Car.Color,
|
||||
},
|
||||
washing: {
|
||||
location: Washing.Location
|
||||
begin: Washing.AvailableBeginDateTime,
|
||||
end: Washing.AvailableEndDateTime,
|
||||
}
|
||||
};
|
||||
|
||||
export type View = {
|
||||
id: Id;
|
||||
orderDate: string,
|
||||
status: Status,
|
||||
phone: Customer.PhoneNumber;
|
||||
carNumber: Car.RegistrationNumber;
|
||||
carBody: Car.BodyStyle;
|
||||
carColor?: Car.Color;
|
||||
location: Washing.Location;
|
||||
datetimeBegin: Washing.AvailableBeginDateTime;
|
||||
datetimeEnd: Washing.AvailableEndDateTime;
|
||||
};
|
||||
@ -1 +0,0 @@
|
||||
export { default as LandingSuccessStub } from './success';
|
||||
@ -1,27 +0,0 @@
|
||||
// Generated by json-literal-typer
|
||||
// <-- BEGIN
|
||||
interface HeroXsection {
|
||||
description: "hero-section.description";
|
||||
headline: "hero-section.headline";
|
||||
video: "demo.mp4";
|
||||
}
|
||||
|
||||
interface Sections {
|
||||
description?: "benefits-section.description";
|
||||
heading: "benefits-section.heading" | "social-proof-section.heading";
|
||||
list?: ("benefits-section.list.0" | "benefits-section.list.1" | "benefits-section.list.2" | "benefits-section.list.3")[];
|
||||
type: "benefits-section" | "social-proof-section";
|
||||
}
|
||||
|
||||
interface Body {
|
||||
"hero-section": HeroXsection;
|
||||
sections: Sections[];
|
||||
}
|
||||
|
||||
interface Root {
|
||||
body: Body;
|
||||
success: true;
|
||||
}
|
||||
// END -->
|
||||
|
||||
export default Root;
|
||||
@ -1,5 +0,0 @@
|
||||
export type Location = string; // ?
|
||||
|
||||
export type AvailableBeginDateTime = string; // YYYY-MM-DDThh:mm
|
||||
|
||||
export type AvailableEndDateTime = string; // YYYY-MM-DDThh:mm
|
||||
5
src/models/order.ts
Normal file
5
src/models/order.ts
Normal file
@ -0,0 +1,5 @@
|
||||
export type Id = string;
|
||||
|
||||
export type View = {
|
||||
id: Id;
|
||||
};
|
||||
@ -1,30 +1,8 @@
|
||||
import React, { useEffect, useState } from 'react';
|
||||
import { useNavigate } from 'react-router-dom';
|
||||
import { AbsoluteCenter, Spinner } from '@chakra-ui/react';
|
||||
import React from 'react';
|
||||
|
||||
import LayoutArm from '../../components/LayoutArm';
|
||||
import authLogin from '../../keycloak';
|
||||
import { URLs } from '../../__data__/urls';
|
||||
|
||||
|
||||
const Page = () => {
|
||||
const [user, setUser] = useState(null);
|
||||
|
||||
const navigate = useNavigate();
|
||||
|
||||
useEffect(() => {
|
||||
authLogin({ redirect: () => navigate(URLs.landing.url) }).then((user) =>
|
||||
setUser(user),
|
||||
);
|
||||
}, []);
|
||||
|
||||
if (!user)
|
||||
return (
|
||||
<AbsoluteCenter>
|
||||
<Spinner />
|
||||
</AbsoluteCenter>
|
||||
);
|
||||
|
||||
return <LayoutArm />;
|
||||
};
|
||||
|
||||
|
||||
@ -8,12 +8,6 @@ import {
|
||||
SocialProofSection,
|
||||
} from '../../components/landing';
|
||||
import { LandingThemeProvider } from '../../containers';
|
||||
import { LandingSuccessStub } from '../../models/landing';
|
||||
import landingSuccessStubJson from '../../../stubs/json/landing/success.json';
|
||||
|
||||
import { isBenefitsSectionData, isSocialProofSectionData } from './types';
|
||||
|
||||
const landingSuccessStub = landingSuccessStubJson as LandingSuccessStub;
|
||||
|
||||
const Page: FC = () => {
|
||||
return (
|
||||
@ -27,19 +21,10 @@ const Page: FC = () => {
|
||||
centerContent
|
||||
>
|
||||
<VStack w='full' h='full' alignItems='stretch' flexGrow={1}>
|
||||
<HeroSection
|
||||
data={landingSuccessStub['body']['hero-section']}
|
||||
flexShrink={0}
|
||||
/>
|
||||
<HeroSection flexShrink={0} />
|
||||
<VStack as='main' flexGrow={1}>
|
||||
{landingSuccessStub.body.sections.map(({ type, ...data }, i) => {
|
||||
if (isBenefitsSectionData(type, data)) {
|
||||
return <BenefitsSection key={i} data={data} />;
|
||||
}
|
||||
if (isSocialProofSectionData(type, data)) {
|
||||
return <SocialProofSection key={i} data={data} />;
|
||||
}
|
||||
})}
|
||||
<BenefitsSection />
|
||||
<SocialProofSection />
|
||||
</VStack>
|
||||
<Footer />
|
||||
</VStack>
|
||||
|
||||
@ -1,15 +0,0 @@
|
||||
import LandingSuccess from "../../../stubs/json/landing/success.json";
|
||||
import { BenefitsSectionProps, SocialProofSectionProps } from "../../components/landing";
|
||||
import { ArrElement } from "../../lib";
|
||||
|
||||
type SectionsItemData = ArrElement<typeof LandingSuccess['body']['sections']>;
|
||||
type SectionType = SectionsItemData['type'];
|
||||
type SectionData = Omit<SectionsItemData, 'type'>;
|
||||
|
||||
export const isBenefitsSectionData = (type: SectionType, data: SectionData): data is BenefitsSectionProps['data'] => {
|
||||
return type === 'benefits-section';
|
||||
};
|
||||
|
||||
export const isSocialProofSectionData = (type: SectionType, data: SectionData): data is SocialProofSectionProps['data'] => {
|
||||
return type === 'social-proof-section';
|
||||
};
|
||||
@ -2,15 +2,11 @@ import React from 'react';
|
||||
import { Text, Button, Center, VStack, Heading } from '@chakra-ui/react';
|
||||
import { Link } from 'react-router-dom';
|
||||
import { Player } from '@lottiefiles/react-lottie-player';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import i18next from 'i18next';
|
||||
|
||||
import animate from '../../assets/animation/notFound.json';
|
||||
|
||||
const NotFound = () => {
|
||||
const { t } = useTranslation('~', {
|
||||
keyPrefix: 'dry-wash',
|
||||
});
|
||||
|
||||
return (
|
||||
<Center minH='100vh'>
|
||||
<VStack spacing={4} textAlign='center'>
|
||||
@ -25,8 +21,12 @@ const NotFound = () => {
|
||||
maxWidth: '450px',
|
||||
}}
|
||||
/>
|
||||
<Heading fontSize='xl'>{t(`notFound.title`)}</Heading>
|
||||
<Text fontSize='lg'>{t(`notFound.description`)}</Text>
|
||||
<Heading fontSize='xl'>
|
||||
{i18next.t(`dry-wash.arm.notFound.title`)}
|
||||
</Heading>
|
||||
<Text fontSize='lg'>
|
||||
{i18next.t(`dry-wash.arm.notFound.description`)}
|
||||
</Text>
|
||||
<Button
|
||||
as={Link}
|
||||
to='/dry-wash'
|
||||
@ -34,7 +34,7 @@ const NotFound = () => {
|
||||
size='lg'
|
||||
variant='outline'
|
||||
>
|
||||
{t(`notFound.button.back`)}
|
||||
{i18next.t(`dry-wash.arm.notFound.button.back`)}
|
||||
</Button>
|
||||
</VStack>
|
||||
</Center>
|
||||
|
||||
@ -1,32 +0,0 @@
|
||||
import React, { FC } from 'react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { Container, Heading, VStack } from '@chakra-ui/react';
|
||||
|
||||
import { LandingThemeProvider } from '../../containers';
|
||||
import { OrderForm } from '../../components/order-form';
|
||||
|
||||
const Page: FC = () => {
|
||||
const { t } = useTranslation('~', {
|
||||
keyPrefix: 'dry-wash.order-create',
|
||||
});
|
||||
|
||||
return (
|
||||
<LandingThemeProvider>
|
||||
<Container
|
||||
w='full'
|
||||
maxWidth='container.xl'
|
||||
minH='100vh'
|
||||
padding={0}
|
||||
bg='white'
|
||||
centerContent
|
||||
>
|
||||
<VStack w='full' h='full' alignItems='stretch' flexGrow={1}>
|
||||
<Heading textAlign='center' mt={4}>{t('title')}</Heading>
|
||||
<OrderForm />
|
||||
</VStack>
|
||||
</Container>
|
||||
</LandingThemeProvider>
|
||||
);
|
||||
};
|
||||
|
||||
export default Page;
|
||||
21
src/pages/order-form/index.tsx
Normal file
21
src/pages/order-form/index.tsx
Normal file
@ -0,0 +1,21 @@
|
||||
import React from 'react';
|
||||
import { Link as RouterLink } from 'react-router-dom';
|
||||
import { Button } from '@chakra-ui/react';
|
||||
|
||||
import { URLs } from '../../__data__/urls';
|
||||
import { mockOrder } from '../../mocks/landing';
|
||||
|
||||
const Page = () => {
|
||||
return (
|
||||
<>
|
||||
<h1>Order form</h1>
|
||||
{mockOrder.orders.map(({ id }) => (
|
||||
<Button key={id} as={RouterLink} to={URLs.orderView.getUrl(id)}>
|
||||
Посмотреть заказ {id}
|
||||
</Button>
|
||||
))}
|
||||
</>
|
||||
);
|
||||
};
|
||||
|
||||
export default Page;
|
||||
@ -1,40 +0,0 @@
|
||||
import { useEffect, useState } from 'react';
|
||||
|
||||
import { LandingService } from '../../api/landing';
|
||||
import { Order } from '../../models/landing';
|
||||
import { FetchOrderQueryResponse } from '../../models/api';
|
||||
|
||||
export const useFetchOrderDetails = ({
|
||||
orderId,
|
||||
}: {
|
||||
orderId: Order.View['id'];
|
||||
}) => {
|
||||
const { fetchOrder } = LandingService();
|
||||
|
||||
const [data, setData] = useState<FetchOrderQueryResponse>();
|
||||
const [isLoading, setIsLoading] = useState(false);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
|
||||
useEffect(() => {
|
||||
const fetchData = async () => {
|
||||
setIsLoading(true);
|
||||
|
||||
try {
|
||||
const data = await fetchOrder(orderId);
|
||||
setData(data.body);
|
||||
} catch (error) {
|
||||
setError(error.message);
|
||||
} finally {
|
||||
setIsLoading(false);
|
||||
}
|
||||
};
|
||||
|
||||
fetchData();
|
||||
}, []);
|
||||
|
||||
return {
|
||||
isLoading,
|
||||
data,
|
||||
error,
|
||||
};
|
||||
};
|
||||
@ -1,75 +1,7 @@
|
||||
import React, { FC, useEffect } from 'react';
|
||||
import { HStack, Spinner, useToast } from '@chakra-ui/react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { Container, Heading, VStack } from '@chakra-ui/react';
|
||||
import { useParams } from 'react-router-dom';
|
||||
import React from "react";
|
||||
|
||||
import { LandingThemeProvider } from '../../containers';
|
||||
import { OrderDetails } from '../../components/order-view';
|
||||
|
||||
import { useFetchOrderDetails } from './helper';
|
||||
|
||||
const Page: FC = () => {
|
||||
const { t } = useTranslation('~', {
|
||||
keyPrefix: 'dry-wash.order-view',
|
||||
});
|
||||
|
||||
const { orderId } = useParams();
|
||||
|
||||
const { isLoading, data, error } = useFetchOrderDetails({ orderId });
|
||||
|
||||
const toast = useToast();
|
||||
useEffect(() => {
|
||||
if (error) {
|
||||
toast({
|
||||
title: t('error.title'),
|
||||
description: t('fetch.error'),
|
||||
status: 'error',
|
||||
duration: 5000,
|
||||
isClosable: true,
|
||||
position: 'bottom-right',
|
||||
});
|
||||
}
|
||||
}, [error]);
|
||||
|
||||
return (
|
||||
<LandingThemeProvider>
|
||||
<Container
|
||||
w='full'
|
||||
maxWidth='container.xl'
|
||||
minH='100vh'
|
||||
padding={0}
|
||||
bg='white'
|
||||
centerContent
|
||||
>
|
||||
<VStack w='full' h='full' alignItems='stretch' flexGrow={1}>
|
||||
<Heading textAlign='center' mt={4}>
|
||||
{t('title')}
|
||||
</Heading>
|
||||
{isLoading ? (
|
||||
<HStack width='full' justifyContent='center'>
|
||||
<Spinner size='lg' />
|
||||
</HStack>
|
||||
) : (
|
||||
data && (
|
||||
<OrderDetails
|
||||
id={data.id}
|
||||
orderDate={data.orderDate}
|
||||
status={data.status}
|
||||
phone={data.phone}
|
||||
carNumber={data.carNumber}
|
||||
carBody={data.carBody}
|
||||
carColor={data.carColor}
|
||||
location={data.location}
|
||||
datetimeBegin={data.startWashTime}
|
||||
datetimeEnd={data.endWashTime}
|
||||
/>
|
||||
)
|
||||
)}
|
||||
</VStack>
|
||||
</Container>
|
||||
</LandingThemeProvider>
|
||||
);
|
||||
const Page = () => {
|
||||
return <h1>Order view</h1>;
|
||||
};
|
||||
|
||||
export default Page;
|
||||
|
||||
@ -7,21 +7,17 @@ import { URLs } from './__data__/urls';
|
||||
import NotFound from './pages/notFound/notFound';
|
||||
|
||||
const Landing = lazy(() => import('./pages/landing'));
|
||||
const OrderCreate = lazy(() => import('./pages/order-create'));
|
||||
const OrderForm = lazy(() => import('./pages/order-form'));
|
||||
const OrderView = lazy(() => import('./pages/order-view'));
|
||||
|
||||
const Routers = () => {
|
||||
return (
|
||||
<Suspense fallback={<PageSpinner />}>
|
||||
<Routes>
|
||||
<Route path={URLs.landing.url}>
|
||||
<Route index element={<Landing />} />
|
||||
<Route path={URLs.orderCreate.url} element={<OrderCreate />} />
|
||||
<Route path={URLs.orderView.url} element={<OrderView />} />
|
||||
</Route>
|
||||
{URLs.armBase.isOn && (
|
||||
<Route path={URLs.armBase.url} element={<Arm />}></Route>
|
||||
)}
|
||||
<Route path={URLs.landing.url} element={<Landing />} />
|
||||
<Route path={URLs.orderForm.url} element={<OrderForm />} />
|
||||
<Route path={URLs.orderView.url} element={<OrderView />} />
|
||||
<Route path='/dry-wash/arm/*' element={<Arm />}></Route>
|
||||
<Route path='*' element={<NotFound />} />
|
||||
</Routes>
|
||||
</Suspense>
|
||||
|
||||
@ -1,43 +0,0 @@
|
||||
/* eslint-disable no-undef */
|
||||
/* eslint-disable @typescript-eslint/no-require-imports */
|
||||
const router = require('express').Router();
|
||||
|
||||
const STUBS = { masters: 'success', orders: 'success', orderView: 'success' };
|
||||
|
||||
router.get('/set/:name/:value', (req, res) => {
|
||||
const { name, value } = req.params;
|
||||
|
||||
STUBS[name] = value;
|
||||
|
||||
res.send('ok');
|
||||
});
|
||||
|
||||
router.get('/', (req, res) => {
|
||||
res.send(`<div>
|
||||
<fieldset>
|
||||
<legend>Мастера</legend>
|
||||
${generateRadioInput('masters', 'success')}
|
||||
${generateRadioInput('masters', 'error')}
|
||||
</fieldset>
|
||||
<fieldset>
|
||||
<legend>Заказы</legend>
|
||||
${generateRadioInput('orders', 'success')}
|
||||
${generateRadioInput('orders', 'error')}
|
||||
</fieldset>
|
||||
<fieldset>
|
||||
<legend>Лендинг - Детали заказа</legend>
|
||||
${generateRadioInput('orderView', 'success')}
|
||||
${generateRadioInput('orderView', 'error')}
|
||||
</fieldset>
|
||||
</div>`);
|
||||
});
|
||||
|
||||
module.exports = router;
|
||||
module.exports.STUBS = STUBS;
|
||||
|
||||
function generateRadioInput(name, type) {
|
||||
return `<label>
|
||||
<input ${STUBS[name] === type ? 'checked' : ''} onclick="fetch('/api/admin/set/${name}/${type}')" type="radio" name="${name}">
|
||||
${type}
|
||||
</label>`;
|
||||
}
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user