Compare commits
No commits in common. "main" and "feature/routing" have entirely different histories.
main
...
feature/ro
1
.gitignore
vendored
1
.gitignore
vendored
@ -130,4 +130,3 @@ dist
|
|||||||
.yarn/install-state.gz
|
.yarn/install-state.gz
|
||||||
.pnp.*
|
.pnp.*
|
||||||
|
|
||||||
.idea
|
|
||||||
@ -1,8 +0,0 @@
|
|||||||
{
|
|
||||||
"singleQuote": true,
|
|
||||||
"jsxSingleQuote": true,
|
|
||||||
"arrowParens": "always",
|
|
||||||
"max-len": ["error", 140, 2],
|
|
||||||
"tabWidth": 2,
|
|
||||||
"useTabs": false
|
|
||||||
}
|
|
||||||
57
Jenkinsfile
vendored
57
Jenkinsfile
vendored
@ -1,57 +0,0 @@
|
|||||||
pipeline {
|
|
||||||
agent {
|
|
||||||
docker {
|
|
||||||
image 'node:20'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
stages {
|
|
||||||
stage('install (ci)') {
|
|
||||||
steps {
|
|
||||||
sh 'node -v'
|
|
||||||
sh 'npm -v'
|
|
||||||
script {
|
|
||||||
String tag = sh(returnStdout: true, script: 'git tag --contains').trim()
|
|
||||||
String branchName = sh(returnStdout: true, script: 'git rev-parse --abbrev-ref HEAD').trim()
|
|
||||||
String commit = sh(returnStdout: true, script: 'git log -1 --oneline').trim()
|
|
||||||
String commitMsg = commit.substring(commit.indexOf(' ')).trim()
|
|
||||||
|
|
||||||
if (tag) {
|
|
||||||
currentBuild.displayName = "#${BUILD_NUMBER}, tag ${tag}"
|
|
||||||
} else {
|
|
||||||
currentBuild.displayName = "#${BUILD_NUMBER}, branch ${branchName}"
|
|
||||||
}
|
|
||||||
|
|
||||||
String author = sh(returnStdout: true, script: "git log -1 --pretty=format:'%an'").trim()
|
|
||||||
currentBuild.description = "${author}<br />${commitMsg}"
|
|
||||||
echo 'starting installing'
|
|
||||||
sh 'npm ci'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
stage('checks') {
|
|
||||||
parallel {
|
|
||||||
stage('eslint') {
|
|
||||||
steps {
|
|
||||||
sh 'npm run eslint'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
stage('build') {
|
|
||||||
steps {
|
|
||||||
sh 'npm run build'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
stage('clean-all') {
|
|
||||||
steps {
|
|
||||||
sh 'rm -rf .[!.]*'
|
|
||||||
sh 'rm -rf ./*'
|
|
||||||
sh 'ls -a'
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
13
README.md
13
README.md
@ -45,12 +45,10 @@
|
|||||||
### MVP1
|
### MVP1
|
||||||
|
|
||||||
**1. Landing**
|
**1. Landing**
|
||||||
|
|
||||||
- преимущества сервиса
|
- преимущества сервиса
|
||||||
- оставить заявку (редирект на Страницу оформления заказа)
|
- оставить заявку (редирект на Страницу оформления заказа)
|
||||||
|
|
||||||
**2. Страница для оформления заказа**
|
**2. Страница для оформления заказа**
|
||||||
|
|
||||||
- форма
|
- форма
|
||||||
- номер машины (mask input)
|
- номер машины (mask input)
|
||||||
- цвет машины
|
- цвет машины
|
||||||
@ -60,12 +58,10 @@
|
|||||||
- после заполнения редирект на страницу с деталями заказа
|
- после заполнения редирект на страницу с деталями заказа
|
||||||
|
|
||||||
**3. Страница с деталями заказа**
|
**3. Страница с деталями заказа**
|
||||||
|
|
||||||
- описание заказа
|
- описание заказа
|
||||||
- детали заказа (id, статус)
|
- детали заказа (id, статус)
|
||||||
|
|
||||||
**3. АРМ оператора**
|
**3. АРМ оператора**
|
||||||
|
|
||||||
- список заказов (RUD)
|
- список заказов (RUD)
|
||||||
- id заказа
|
- id заказа
|
||||||
- статус заказа (готово / не готово)
|
- статус заказа (готово / не готово)
|
||||||
@ -76,6 +72,7 @@
|
|||||||
- кнопка "Добавить"
|
- кнопка "Добавить"
|
||||||
- кнопка "Удалить"
|
- кнопка "Удалить"
|
||||||
|
|
||||||
|
|
||||||
### Built With
|
### Built With
|
||||||
|
|
||||||
[![React][React.js]][React-url]
|
[![React][React.js]][React-url]
|
||||||
@ -106,14 +103,6 @@
|
|||||||
|
|
||||||
<p align="right">(<a href="#readme-top">back to top</a>)</p>
|
<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 -->
|
||||||
|
|
||||||
## Participants
|
## Participants
|
||||||
|
|||||||
@ -1,9 +1,7 @@
|
|||||||
/* eslint-disable no-undef */
|
const pkg = require("./package");
|
||||||
/* eslint-disable @typescript-eslint/no-require-imports */
|
|
||||||
const pkg = require('./package');
|
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
apiPath: 'stubs/api',
|
apiPath: "stubs/api",
|
||||||
webpackConfig: {
|
webpackConfig: {
|
||||||
output: {
|
output: {
|
||||||
publicPath: `/static/${pkg.name}/${process.env.VERSION || pkg.version}/`,
|
publicPath: `/static/${pkg.name}/${process.env.VERSION || pkg.version}/`,
|
||||||
@ -11,19 +9,17 @@ module.exports = {
|
|||||||
},
|
},
|
||||||
/* use https://admin.bro-js.ru/ to create config, navigations and features */
|
/* use https://admin.bro-js.ru/ to create config, navigations and features */
|
||||||
navigations: {
|
navigations: {
|
||||||
'dry-wash.main': '/dry-wash',
|
"dry-wash.main": "/dry-wash",
|
||||||
'dry-wash.order.create': '/order',
|
"dry-wash.create": "/order",
|
||||||
'dry-wash.order.view': '/order/:orderId',
|
"dry-wash.view.order": "/order/:orderId",
|
||||||
'dry-wash.arm.master': 'master',
|
"dry-wash.arm": "/arm",
|
||||||
'dry-wash.arm.order': 'order',
|
|
||||||
'dry-wash.arm': '/arm/*',
|
|
||||||
},
|
},
|
||||||
features: {
|
features: {
|
||||||
'dry-wash-pl': {
|
"dry-wash-pl": {
|
||||||
// add your features here in the format [featureName]: { value: string }
|
// add your features here in the format [featureName]: { value: string }
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
config: {
|
config: {
|
||||||
'dry-wash.api': '/api',
|
"dry-wash-pl.api": "/api",
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|||||||
@ -1,48 +0,0 @@
|
|||||||
import globals from "globals";
|
|
||||||
import pluginJs from "@eslint/js";
|
|
||||||
import tseslint from "typescript-eslint";
|
|
||||||
import pluginReact from "eslint-plugin-react";
|
|
||||||
import stylistic from '@stylistic/eslint-plugin';
|
|
||||||
import pluginImport from 'eslint-plugin-import';
|
|
||||||
|
|
||||||
export default [
|
|
||||||
{ files: ["**/*.{js,mjs,cjs,ts,jsx,tsx}"] },
|
|
||||||
{ languageOptions: { globals: globals.browser } },
|
|
||||||
pluginJs.configs.recommended,
|
|
||||||
...tseslint.configs.recommended,
|
|
||||||
pluginReact.configs.flat.recommended,
|
|
||||||
{
|
|
||||||
plugins: {
|
|
||||||
'@stylistic': stylistic,
|
|
||||||
'import': pluginImport,
|
|
||||||
},
|
|
||||||
"rules": {
|
|
||||||
"no-unused-vars": "off",
|
|
||||||
"@typescript-eslint/no-unused-vars": [
|
|
||||||
"warn", // or "error"
|
|
||||||
{
|
|
||||||
"argsIgnorePattern": "^_",
|
|
||||||
"varsIgnorePattern": "^_",
|
|
||||||
"caughtErrorsIgnorePattern": "^_"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"sort-imports": ["off"],
|
|
||||||
"import/order": [
|
|
||||||
"error",
|
|
||||||
{
|
|
||||||
"groups": [
|
|
||||||
"builtin",
|
|
||||||
"external",
|
|
||||||
"internal",
|
|
||||||
"parent",
|
|
||||||
["sibling", "index"]
|
|
||||||
],
|
|
||||||
"newlines-between": "always",
|
|
||||||
}
|
|
||||||
],
|
|
||||||
semi: ["error", "always"],
|
|
||||||
'@stylistic/indent': ['error', 2],
|
|
||||||
'react/prop-types': 'off'
|
|
||||||
},
|
|
||||||
}
|
|
||||||
];
|
|
||||||
@ -1,92 +0,0 @@
|
|||||||
{
|
|
||||||
"dry-wash.landing.benefits-section.description": "Discover the benefits of our car dry cleaning services",
|
|
||||||
"dry-wash.landing.benefits-section.heading": "Advantages of an eco-friendly car wash",
|
|
||||||
"dry-wash.landing.benefits-section.list.0": "Environmentally friendly products",
|
|
||||||
"dry-wash.landing.benefits-section.list.1": "Fast and efficient service",
|
|
||||||
"dry-wash.landing.benefits-section.list.2": "Convenient mobile access",
|
|
||||||
"dry-wash.landing.benefits-section.list.3": "Reliable and trustworthy",
|
|
||||||
"dry-wash.landing.footer.copyright": "\u00A9 {{currentYear}} DryMaster. All rights reserved",
|
|
||||||
"dry-wash.landing.footer.links.faq": "FAQ",
|
|
||||||
"dry-wash.landing.footer.links.privacy-policy": "Privacy policy",
|
|
||||||
"dry-wash.landing.footer.links.service-terms": "Terms of service",
|
|
||||||
"dry-wash.landing.hero-section.description": "Experience the ultimate convenience of a dry car wash, designed for a cleaner planet.",
|
|
||||||
"dry-wash.landing.hero-section.headline": "Revitalize Your Ride with Eco-Friendly Care!",
|
|
||||||
"dry-wash.landing.make-order-button": "Make order",
|
|
||||||
"dry-wash.landing.site-logo": "The logo of the \"Dry Master\" company",
|
|
||||||
"dry-wash.landing.social-proof-section.heading": "We are being chosen",
|
|
||||||
"dry-wash.order-create.title": "Order a car wash",
|
|
||||||
"dry-wash.order-create.form.field.validation.required": "This field is required",
|
|
||||||
"dry-wash.order-create.form.phone-field.label": "Phone number",
|
|
||||||
"dry-wash.order-create.form.phone-field.invalid": "Enter the valid phone number",
|
|
||||||
"dry-wash.order-create.form.car-number-field.label": "Car number",
|
|
||||||
"dry-wash.order-create.form.car-number-field.invalid": "Enter the valid vehicle number",
|
|
||||||
"dry-wash.order-create.form.car-color-field.label": "The color of the car",
|
|
||||||
"dry-wash.order-create.form.car-body-field.label": "Car body type",
|
|
||||||
"dry-wash.order-create.form.washing-datetime-field.label": "What time is the car available?",
|
|
||||||
"dry-wash.order-create.form.washing-location-field.label": "Where is the car located?",
|
|
||||||
"dry-wash.order-create.form.washing-location-field.placeholder": "Enter the address or select on the map",
|
|
||||||
"dry-wash.order-create.form.washing-location-field.help": "For example, 55.754364, 48.743295 Universitetskaya Street, 1, Innopolis, Verkhneuslonsky district, Republic of Tatarstan (Tatarstan), 420500",
|
|
||||||
"dry-wash.order-create.car-body-select.placeholder": "Not specified",
|
|
||||||
"dry-wash.order-create.car-body-select.options.sedan": "Sedan",
|
|
||||||
"dry-wash.order-create.car-body-select.options.hatchback" : "Hatchback",
|
|
||||||
"dry-wash.order-create.car-body-select.options.crossover" : "Crossover",
|
|
||||||
"dry-wash.order-create.car-body-select.options.suv" : "Sport utility vehicle",
|
|
||||||
"dry-wash.order-create.car-body-select.options.station-wagon" : "Station wagon",
|
|
||||||
"dry-wash.order-create.car-body-select.options.coupe" : "Coupe",
|
|
||||||
"dry-wash.order-create.car-body-select.options.minivan" : "Minivan",
|
|
||||||
"dry-wash.order-create.car-body-select.options.pickup" : "Pickup",
|
|
||||||
"dry-wash.order-create.car-body-select.options.liftback" : "Liftback",
|
|
||||||
"dry-wash.order-create.car-body-select.options.sports-car" : "Sports-car",
|
|
||||||
"dry-wash.order-create.car-body-select.options.other": "Other",
|
|
||||||
"dry-wash.order-create.form.submit-button.label": "Submit",
|
|
||||||
"dry-wash.order-view.title": "Your order",
|
|
||||||
"dry-wash.order-view.error.title": "Error",
|
|
||||||
"dry-wash.order-view.fetch.error": "Failed to fetch the details of order #{{number}}",
|
|
||||||
"dry-wash.order-view.details.title": "Order #{{number}}",
|
|
||||||
"dry-wash.order-view.details.owner": "Owner",
|
|
||||||
"dry-wash.order-view.details.car": "Car",
|
|
||||||
"dry-wash.order-view.details.location": "Where",
|
|
||||||
"dry-wash.order-view.details.datetime-range": "When",
|
|
||||||
"dry-wash.order-view.details.alert": "The operator will contact you about the payment at the specified phone number",
|
|
||||||
"dry-wash.arm.master.add": "Add",
|
|
||||||
"dry-wash.arm.order.title": "Orders",
|
|
||||||
"dry-wash.arm.order.table.empty": "Table empty",
|
|
||||||
"dry-wash.arm.order.error.title": "Error loading data",
|
|
||||||
"dry-wash.arm.order.status.progress": "In Progress",
|
|
||||||
"dry-wash.arm.order.status.complete": "Completed",
|
|
||||||
"dry-wash.arm.order.status.pending": "Pending",
|
|
||||||
"dry-wash.arm.order.status.working": "Working",
|
|
||||||
"dry-wash.arm.order.status.canceled": "Canceled",
|
|
||||||
"dry-wash.arm.order.status.placeholder": "Select Status",
|
|
||||||
"dry-wash.arm.order.table.header.carNumber": "Car Number",
|
|
||||||
"dry-wash.arm.order.table.header.washingTime": "Washing Time",
|
|
||||||
"dry-wash.arm.order.table.header.orderDate": "Order Date",
|
|
||||||
"dry-wash.arm.order.table.header.status": "Status",
|
|
||||||
"dry-wash.arm.order.table.header.telephone": "Telephone",
|
|
||||||
"dry-wash.arm.order.table.header.location": "Location",
|
|
||||||
"dry-wash.arm.master.title": "Masters",
|
|
||||||
"dry-wash.arm.master.table.header.name": "Name",
|
|
||||||
"dry-wash.arm.master.table.empty": "Table empty",
|
|
||||||
"dry-wash.arm.master.error.title": "Error loading data",
|
|
||||||
"dry-wash.arm.master.table.header.currentJob": "Current Job",
|
|
||||||
"dry-wash.arm.master.table.header.phone": "Phone",
|
|
||||||
"dry-wash.arm.master.table.header.actions": "Actions",
|
|
||||||
"dry-wash.arm.master.table.actionsMenu.delete": "Delete Master",
|
|
||||||
"dry-wash.arm.master.drawer.title": "Add New Master",
|
|
||||||
"dry-wash.arm.master.drawer.inputName.label": "Full Name",
|
|
||||||
"dry-wash.arm.master.drawer.inputName.placeholder": "Enter Full Name",
|
|
||||||
"dry-wash.arm.master.drawer.inputPhone.label": "Phone Number",
|
|
||||||
"dry-wash.arm.master.drawer.inputPhone.placeholder": "Enter Phone Number",
|
|
||||||
"dry-wash.arm.master.drawer.button.save": "Save",
|
|
||||||
"dry-wash.arm.master.drawer.button.cancel": "Cancel",
|
|
||||||
"dry-wash.arm.master.sideBar.orders": "Orders",
|
|
||||||
"dry-wash.arm.master.sideBar.master": "Masters",
|
|
||||||
"dry-wash.arm.master.sideBar.title": "Dry Master",
|
|
||||||
"dry-wash.notFound.title": "Page Not Found",
|
|
||||||
"dry-wash.notFound.description": "Unfortunately, the page you are looking for does not exist.",
|
|
||||||
"dry-wash.notFound.button.back": "Back to Home",
|
|
||||||
"dry-wash.errorBoundary.title": "Something went wrong",
|
|
||||||
"dry-wash.errorBoundary.description": "We are already working on fixing the issue",
|
|
||||||
"dry-wash.errorBoundary.button.reload": "Reload Page",
|
|
||||||
"dry-wash.washTime.timeSlot": "{{start}} - {{end}}"
|
|
||||||
}
|
|
||||||
@ -1,92 +0,0 @@
|
|||||||
{
|
|
||||||
"dry-wash.arm.master.add": "Добавить",
|
|
||||||
"dry-wash.arm.order.title": "Заказы",
|
|
||||||
"dry-wash.arm.order.status.progress": "Выполняется",
|
|
||||||
"dry-wash.arm.order.status.complete": "Завершено",
|
|
||||||
"dry-wash.arm.order.status.pending": "В ожидании",
|
|
||||||
"dry-wash.arm.order.status.working": "В работе",
|
|
||||||
"dry-wash.arm.order.status.canceled": "Отменено",
|
|
||||||
"dry-wash.arm.order.status.placeholder": "Выберите статус",
|
|
||||||
"dry-wash.arm.order.table.header.carNumber": "Номер машины",
|
|
||||||
"dry-wash.arm.order.table.header.washingTime": "Время мойки",
|
|
||||||
"dry-wash.arm.order.table.header.orderDate": "Дата заказа",
|
|
||||||
"dry-wash.arm.order.table.header.status": "Статус",
|
|
||||||
"dry-wash.arm.order.table.header.telephone": "Телефон",
|
|
||||||
"dry-wash.arm.order.table.header.location": "Расположение",
|
|
||||||
"dry-wash.arm.order.table.empty": "Список пуст",
|
|
||||||
"dry-wash.arm.order.error.title": "Ошибка при загрузке данных",
|
|
||||||
"dry-wash.arm.master.title": "Мастера",
|
|
||||||
"dry-wash.arm.master.table.empty": "Список пуст",
|
|
||||||
"dry-wash.arm.master.error.title": "Ошибка при загрузке данных",
|
|
||||||
"dry-wash.arm.master.table.header.name": "Имя",
|
|
||||||
"dry-wash.arm.master.table.header.currentJob": "Актуальная занятость",
|
|
||||||
"dry-wash.arm.master.table.header.phone": "Телефон",
|
|
||||||
"dry-wash.arm.master.table.header.actions": "Действия",
|
|
||||||
"dry-wash.arm.master.table.actionsMenu.delete": "Удалить мастера",
|
|
||||||
"dry-wash.arm.master.drawer.title": "Добавить нового мастера",
|
|
||||||
"dry-wash.arm.master.drawer.inputName.label": "ФИО",
|
|
||||||
"dry-wash.arm.master.drawer.inputName.placeholder": "Введите ФИО",
|
|
||||||
"dry-wash.arm.master.drawer.inputPhone.label": "Номер телефона",
|
|
||||||
"dry-wash.arm.master.drawer.inputPhone.placeholder": "Введите номер телефона",
|
|
||||||
"dry-wash.arm.master.drawer.button.save": "Сохранить",
|
|
||||||
"dry-wash.arm.master.drawer.button.cancel": "Отменить",
|
|
||||||
"dry-wash.arm.master.sideBar.orders": "Заказы",
|
|
||||||
"dry-wash.arm.master.sideBar.master": "Мастера",
|
|
||||||
"dry-wash.arm.master.sideBar.title": "Сухой мастер",
|
|
||||||
"dry-wash.landing.benefits-section.description": "Откройте для себя преимущества наших услуг по химчистке автомобилей",
|
|
||||||
"dry-wash.landing.benefits-section.heading": "Преимущества экологичной автомойки",
|
|
||||||
"dry-wash.landing.benefits-section.list.0": "Экологически безопасные продукты",
|
|
||||||
"dry-wash.landing.benefits-section.list.1": "Быстрое и эффективное обслуживание",
|
|
||||||
"dry-wash.landing.benefits-section.list.2": "Удобный мобильный доступ",
|
|
||||||
"dry-wash.landing.benefits-section.list.3": "Надежный и заслуживающий доверия",
|
|
||||||
"dry-wash.landing.footer.copyright": "\u00A9 {{currentYear}} DryMaster. Все права защищены",
|
|
||||||
"dry-wash.landing.footer.links.faq": "FAQ",
|
|
||||||
"dry-wash.landing.footer.links.privacy-policy": "Политика конфиденциальности",
|
|
||||||
"dry-wash.landing.footer.links.service-terms": "Условия обслуживания",
|
|
||||||
"dry-wash.landing.hero-section.description": "Ощутите максимальное удобство сухой мойки автомобилей, созданной для того, чтобы планета стала чище",
|
|
||||||
"dry-wash.landing.hero-section.headline": "Оживите свою поездку с помощью экологически чистого ухода!",
|
|
||||||
"dry-wash.landing.make-order-button": "Сделать заказ",
|
|
||||||
"dry-wash.landing.site-logo": "Логотип компании \u00ABDry Master\u00BB",
|
|
||||||
"dry-wash.landing.social-proof-section.heading": "Нас выбирают",
|
|
||||||
"dry-wash.order-create.title": "Заказать мойку",
|
|
||||||
"dry-wash.order-create.form.field.validation.required": "Это поле обязательно для заполнения",
|
|
||||||
"dry-wash.order-create.form.phone-field.label": "Номер телефона",
|
|
||||||
"dry-wash.order-create.form.phone-field.invalid": "Введите корректный номер телефона",
|
|
||||||
"dry-wash.order-create.form.car-number-field.label": "Номер автомобиля",
|
|
||||||
"dry-wash.order-create.form.car-number-field.invalid": "Введите корректный номер автомобиля",
|
|
||||||
"dry-wash.order-create.form.car-color-field.label": "Цвет автомобиля",
|
|
||||||
"dry-wash.order-create.form.car-body-field.label": "Тип кузова автомобиля",
|
|
||||||
"dry-wash.order-create.form.washing-datetime-field.label": "В какое время автомобиль доступен?",
|
|
||||||
"dry-wash.order-create.form.washing-location-field.label": "Где находится автомобиль?",
|
|
||||||
"dry-wash.order-create.form.washing-location-field.placeholder": "Введите адрес или выберите на карте",
|
|
||||||
"dry-wash.order-create.form.washing-location-field.help": "Например, 55.754364, 48.743295 Университетская улица, 1, Иннополис, Верхнеуслонский район, Республика Татарстан (Татарстан), 420500",
|
|
||||||
"dry-wash.order-create.car-body-select.placeholder": "Не указан",
|
|
||||||
"dry-wash.order-create.car-body-select.options.sedan": "Седан",
|
|
||||||
"dry-wash.order-create.car-body-select.options.hatchback": "Хэтчбек",
|
|
||||||
"dry-wash.order-create.car-body-select.options.crossover": "Кроссовер",
|
|
||||||
"dry-wash.order-create.car-body-select.options.suv": "Внедорожник",
|
|
||||||
"dry-wash.order-create.car-body-select.options.station-wagon": "Универсал",
|
|
||||||
"dry-wash.order-create.car-body-select.options.coupe": "Купе",
|
|
||||||
"dry-wash.order-create.car-body-select.options.minivan": "Минивэн",
|
|
||||||
"dry-wash.order-create.car-body-select.options.pickup": "Пикап",
|
|
||||||
"dry-wash.order-create.car-body-select.options.liftback": "Лифтбек",
|
|
||||||
"dry-wash.order-create.car-body-select.options.sports-car": "Спорткар",
|
|
||||||
"dry-wash.order-create.car-body-select.options.other": "Другой",
|
|
||||||
"dry-wash.order-create.form.submit-button.label": "Отправить",
|
|
||||||
"dry-wash.order-view.title": "Ваш заказ",
|
|
||||||
"dry-wash.order-view.error.title": "Ошибка",
|
|
||||||
"dry-wash.order-view.fetch.error": "Не удалось загрузить детали заказа №{{number}}",
|
|
||||||
"dry-wash.order-view.details.title": "Заказ №{{number}}",
|
|
||||||
"dry-wash.order-view.details.owner": "Владелец",
|
|
||||||
"dry-wash.order-view.details.car": "Автомобиль",
|
|
||||||
"dry-wash.order-view.details.location": "Где",
|
|
||||||
"dry-wash.order-view.details.datetime-range": "Когда",
|
|
||||||
"dry-wash.order-view.details.alert": "С вами свяжется оператор насчет оплаты по указанному номеру телефона",
|
|
||||||
"dry-wash.notFound.title": "Страница не найдена",
|
|
||||||
"dry-wash.notFound.description": "К сожалению, запрашиваемая вами страница не существует.",
|
|
||||||
"dry-wash.notFound.button.back": "Вернуться на главную",
|
|
||||||
"dry-wash.errorBoundary.title": "Что-то пошло не так",
|
|
||||||
"dry-wash.errorBoundary.description": "Мы уже работаем над исправлением проблемы",
|
|
||||||
"dry-wash.errorBoundary.button.reload": "Перезагрузить страницу",
|
|
||||||
"dry-wash.washTime.timeSlot": "{{start}} - {{end}}"
|
|
||||||
}
|
|
||||||
7131
package-lock.json
generated
7131
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
38
package.json
38
package.json
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "dry-wash",
|
"name": "dry-wash-pl",
|
||||||
"version": "0.3.0",
|
"version": "0.0.0",
|
||||||
"description": "<a id=\"readme-top\"></a>",
|
"description": "<a id=\"readme-top\"></a>",
|
||||||
"main": "./src/index.tsx",
|
"main": "./src/index.tsx",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
@ -8,46 +8,16 @@
|
|||||||
"start": "brojs server --port=8099 --with-open-browser",
|
"start": "brojs server --port=8099 --with-open-browser",
|
||||||
"build": "npm run clean && brojs build --dev",
|
"build": "npm run clean && brojs build --dev",
|
||||||
"build:prod": "npm run clean && brojs build",
|
"build:prod": "npm run clean && brojs build",
|
||||||
"clean": "rimraf dist",
|
"clean": "rimraf dist"
|
||||||
"eslint": "npx eslint .",
|
|
||||||
"eslint:fix": "npx eslint . --fix",
|
|
||||||
"preversion": "npm run eslint"
|
|
||||||
},
|
},
|
||||||
"keywords": [],
|
"keywords": [],
|
||||||
"author": "",
|
"author": "",
|
||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@brojs/cli": "^1.6.3",
|
"@brojs/cli": "^1.3.0",
|
||||||
"@chakra-ui/icons": "^2.2.4",
|
|
||||||
"@chakra-ui/react": "^2.4.2",
|
|
||||||
"@emotion/react": "^11.4.1",
|
|
||||||
"@emotion/styled": "^11.3.0",
|
|
||||||
"@fontsource/open-sans": "^5.1.0",
|
|
||||||
"@lottiefiles/react-lottie-player": "^3.5.4",
|
|
||||||
"@pbe/react-yandex-maps": "^1.2.5",
|
|
||||||
"@types/react": "^18.3.12",
|
|
||||||
"dayjs": "^1.11.13",
|
|
||||||
"express": "^4.21.1",
|
"express": "^4.21.1",
|
||||||
"framer-motion": "^6.2.8",
|
|
||||||
"i18next": "^23.16.4",
|
|
||||||
"keycloak-js": "^23.0.7",
|
|
||||||
"react": "^18.3.1",
|
"react": "^18.3.1",
|
||||||
"react-dom": "^18.3.1",
|
"react-dom": "^18.3.1",
|
||||||
"react-hook-form": "^7.53.2",
|
|
||||||
"react-i18next": "^15.1.1",
|
|
||||||
"react-icons": "^5.3.0",
|
|
||||||
"react-phone-number-input": "^3.4.9",
|
|
||||||
"react-router-dom": "^6.27.0"
|
"react-router-dom": "^6.27.0"
|
||||||
},
|
|
||||||
"devDependencies": {
|
|
||||||
"@eslint/js": "^9.14.0",
|
|
||||||
"@stylistic/eslint-plugin": "^2.10.1",
|
|
||||||
"@types/react-dom": "^18.3.1",
|
|
||||||
"eslint": "^9.14.0",
|
|
||||||
"eslint-plugin-import": "^2.31.0",
|
|
||||||
"eslint-plugin-react": "^7.37.2",
|
|
||||||
"globals": "^15.11.0",
|
|
||||||
"prettier": "3.3.3",
|
|
||||||
"typescript-eslint": "^8.12.2"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Binary file not shown.
@ -1,40 +0,0 @@
|
|||||||
import { generatePath } from 'react-router-dom';
|
|
||||||
import { getNavigationValue } from '@brojs/cli';
|
|
||||||
|
|
||||||
import { Order } from '../models/landing';
|
|
||||||
|
|
||||||
const getFullUrls = (url: string) =>
|
|
||||||
`${getNavigationValue('dry-wash.main')}${url}`;
|
|
||||||
|
|
||||||
export const URLs = {
|
|
||||||
landing: {
|
|
||||||
url: getNavigationValue('dry-wash.main'),
|
|
||||||
getUrl() {
|
|
||||||
return this.url;
|
|
||||||
},
|
|
||||||
},
|
|
||||||
orderCreate: {
|
|
||||||
url: getFullUrls(getNavigationValue('dry-wash.order.create')),
|
|
||||||
getUrl() {
|
|
||||||
return this.url;
|
|
||||||
},
|
|
||||||
},
|
|
||||||
orderView: {
|
|
||||||
url: getFullUrls(getNavigationValue('dry-wash.order.view')),
|
|
||||||
getUrl(orderId: Order.Id) {
|
|
||||||
return generatePath(this.url, { orderId });
|
|
||||||
},
|
|
||||||
},
|
|
||||||
armMaster: {
|
|
||||||
url: getNavigationValue('dry-wash.arm.master'),
|
|
||||||
isOn: Boolean(getNavigationValue('dry-wash.arm.master')),
|
|
||||||
},
|
|
||||||
armOrder: {
|
|
||||||
url: getNavigationValue('dry-wash.arm.order'),
|
|
||||||
isOn: Boolean(getNavigationValue('dry-wash.arm.order')),
|
|
||||||
},
|
|
||||||
armBase: {
|
|
||||||
url: getFullUrls(getNavigationValue('dry-wash.arm')),
|
|
||||||
isOn: Boolean(getNavigationValue('dry-wash.arm')),
|
|
||||||
},
|
|
||||||
};
|
|
||||||
@ -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 };
|
|
||||||
19
src/app.tsx
19
src/app.tsx
@ -1,19 +1,12 @@
|
|||||||
import React from 'react';
|
import React from "react";
|
||||||
import { BrowserRouter } from 'react-router-dom';
|
import { BrowserRouter } from "react-router-dom";
|
||||||
import { ChakraProvider, theme as chakraTheme } from '@chakra-ui/react';
|
import Routers from "./routes";
|
||||||
|
|
||||||
import Routers from './routes';
|
|
||||||
import ErrorBoundary from './components/ErrorBoundary';
|
|
||||||
|
|
||||||
const App = () => {
|
const App = () => {
|
||||||
return (
|
return (
|
||||||
<ChakraProvider theme={chakraTheme}>
|
<BrowserRouter>
|
||||||
<ErrorBoundary>
|
<Routers></Routers>
|
||||||
<BrowserRouter>
|
</BrowserRouter>
|
||||||
<Routers />
|
|
||||||
</BrowserRouter>
|
|
||||||
</ErrorBoundary>
|
|
||||||
</ChakraProvider>
|
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
|
Before Width: | Height: | Size: 11 KiB |
@ -1 +0,0 @@
|
|||||||
export { default as LogoSvg } from './dry-master-logo.svg';
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 51 KiB |
@ -1 +0,0 @@
|
|||||||
export { default as DemoVideoPosterImg } from './demo-video-poster.webp';
|
|
||||||
@ -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';
|
|
||||||
@ -1,65 +0,0 @@
|
|||||||
import React, { Component, ErrorInfo, ReactNode } from 'react';
|
|
||||||
import { Heading, Text, Button, Center, VStack } from '@chakra-ui/react';
|
|
||||||
import i18next from 'i18next';
|
|
||||||
|
|
||||||
interface ErrorBoundaryState {
|
|
||||||
hasError: boolean;
|
|
||||||
error: Error | null;
|
|
||||||
errorInfo: ErrorInfo | null;
|
|
||||||
}
|
|
||||||
|
|
||||||
interface ErrorBoundaryProps {
|
|
||||||
children: ReactNode;
|
|
||||||
}
|
|
||||||
|
|
||||||
class ErrorBoundary extends Component<ErrorBoundaryProps, ErrorBoundaryState> {
|
|
||||||
constructor(props: ErrorBoundaryProps) {
|
|
||||||
super(props);
|
|
||||||
this.state = {
|
|
||||||
hasError: false,
|
|
||||||
error: null,
|
|
||||||
errorInfo: null,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
static getDerivedStateFromError(): Partial<ErrorBoundaryState> {
|
|
||||||
return { hasError: true };
|
|
||||||
}
|
|
||||||
|
|
||||||
componentDidCatch(error: Error, errorInfo: ErrorInfo): void {
|
|
||||||
console.error('Error caught by ErrorBoundary:', error, errorInfo);
|
|
||||||
this.setState({ error, errorInfo });
|
|
||||||
}
|
|
||||||
|
|
||||||
render() {
|
|
||||||
const { hasError } = this.state;
|
|
||||||
//TODO: добавить анимацию после залива 404 страницы
|
|
||||||
//TODO: может сделать обертку для хука, чтоб язык менялся без перезагрузки
|
|
||||||
if (hasError) {
|
|
||||||
return (
|
|
||||||
<Center minH='100vh'>
|
|
||||||
<VStack spacing={4} textAlign='center'>
|
|
||||||
<Heading as='h1' size='2xl'>
|
|
||||||
{i18next.t('~:dry-wash.errorBoundary.title')}
|
|
||||||
</Heading>
|
|
||||||
<Text fontSize='lg'>
|
|
||||||
{i18next.t('~:dry-wash.errorBoundary.description')}
|
|
||||||
</Text>
|
|
||||||
<Button
|
|
||||||
colorScheme='teal'
|
|
||||||
size='lg'
|
|
||||||
variant='outline'
|
|
||||||
onClick={() => window.location.reload()}
|
|
||||||
>
|
|
||||||
{i18next.t('~:dry-wash.errorBoundary.button.reload')}
|
|
||||||
</Button>
|
|
||||||
</VStack>
|
|
||||||
</Center>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
return this.props.children;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export default ErrorBoundary;
|
|
||||||
@ -1 +0,0 @@
|
|||||||
export { default } from './ErrorBoundary';
|
|
||||||
@ -1,37 +0,0 @@
|
|||||||
import { Box, Flex } from '@chakra-ui/react';
|
|
||||||
import React from 'react';
|
|
||||||
import { Navigate, Route, Routes } from 'react-router-dom';
|
|
||||||
|
|
||||||
import Sidebar from '../Sidebar';
|
|
||||||
import Orders from '../Orders';
|
|
||||||
import Masters from '../Masters';
|
|
||||||
import { URLs } from '../../__data__/urls';
|
|
||||||
|
|
||||||
const LayoutArm = () => {
|
|
||||||
let defaultRedirect = null;
|
|
||||||
|
|
||||||
if (URLs.armOrder.isOn) {
|
|
||||||
defaultRedirect = URLs.armOrder.url;
|
|
||||||
} else if (URLs.armMaster.isOn) {
|
|
||||||
defaultRedirect = URLs.armMaster.url;
|
|
||||||
}
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Flex h='100vh'>
|
|
||||||
<Sidebar />
|
|
||||||
<Box flex='1' bg='gray.50'>
|
|
||||||
<Routes>
|
|
||||||
<Route index element={<Navigate to={defaultRedirect} replace />} />
|
|
||||||
{URLs.armOrder.isOn && (
|
|
||||||
<Route path={URLs.armOrder.url} element={<Orders />} />
|
|
||||||
)}
|
|
||||||
{URLs.armMaster.isOn && (
|
|
||||||
<Route path={URLs.armMaster.url} element={<Masters />} />
|
|
||||||
)}
|
|
||||||
</Routes>
|
|
||||||
</Box>
|
|
||||||
</Flex>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default LayoutArm;
|
|
||||||
@ -1 +0,0 @@
|
|||||||
export { default } from './LayoutArm';
|
|
||||||
@ -1,27 +0,0 @@
|
|||||||
import React from 'react';
|
|
||||||
import {
|
|
||||||
Menu,
|
|
||||||
MenuButton,
|
|
||||||
MenuList,
|
|
||||||
MenuItem,
|
|
||||||
IconButton,
|
|
||||||
} from '@chakra-ui/react';
|
|
||||||
import { EditIcon } from '@chakra-ui/icons';
|
|
||||||
import { useTranslation } from 'react-i18next';
|
|
||||||
|
|
||||||
const MasterActionsMenu = () => {
|
|
||||||
const { t } = useTranslation('~', {
|
|
||||||
keyPrefix: 'dry-wash.arm.master.table.actionsMenu',
|
|
||||||
});
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Menu>
|
|
||||||
<MenuButton icon={<EditIcon />} as={IconButton} variant='outline' />
|
|
||||||
<MenuList>
|
|
||||||
<MenuItem>{t('delete')}</MenuItem>
|
|
||||||
</MenuList>
|
|
||||||
</Menu>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default MasterActionsMenu;
|
|
||||||
@ -1 +0,0 @@
|
|||||||
export { default } from './MasterActionsMenu';
|
|
||||||
@ -1,70 +0,0 @@
|
|||||||
import React, { useState } from 'react';
|
|
||||||
import {
|
|
||||||
Button,
|
|
||||||
FormControl,
|
|
||||||
FormLabel,
|
|
||||||
Input,
|
|
||||||
Drawer,
|
|
||||||
DrawerBody,
|
|
||||||
DrawerCloseButton,
|
|
||||||
DrawerContent,
|
|
||||||
DrawerFooter,
|
|
||||||
DrawerHeader,
|
|
||||||
DrawerOverlay,
|
|
||||||
} from '@chakra-ui/react';
|
|
||||||
import { useTranslation } from 'react-i18next';
|
|
||||||
|
|
||||||
const MasterDrawer = ({ isOpen, onClose }) => {
|
|
||||||
const [newMaster, setNewMaster] = useState({ name: '', phone: '' });
|
|
||||||
|
|
||||||
const handleSave = () => {
|
|
||||||
console.log(`Сохранение мастера: ${newMaster}`);
|
|
||||||
onClose();
|
|
||||||
};
|
|
||||||
|
|
||||||
const { t } = useTranslation('~', {
|
|
||||||
keyPrefix: 'dry-wash.arm.master.drawer',
|
|
||||||
});
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Drawer isOpen={isOpen} onClose={onClose} size='md'>
|
|
||||||
<DrawerOverlay />
|
|
||||||
<DrawerContent>
|
|
||||||
<DrawerCloseButton />
|
|
||||||
<DrawerHeader>{t('title')}</DrawerHeader>
|
|
||||||
<DrawerBody>
|
|
||||||
<FormControl mb='4'>
|
|
||||||
<FormLabel>{t('inputName.label')}</FormLabel>
|
|
||||||
<Input
|
|
||||||
value={newMaster.name}
|
|
||||||
onChange={(e) =>
|
|
||||||
setNewMaster({ ...newMaster, name: e.target.value })
|
|
||||||
}
|
|
||||||
placeholder={t('inputName.placeholder')}
|
|
||||||
/>
|
|
||||||
</FormControl>
|
|
||||||
<FormControl>
|
|
||||||
<FormLabel> {t('inputPhone.label')}</FormLabel>
|
|
||||||
<Input
|
|
||||||
value={newMaster.phone}
|
|
||||||
onChange={(e) =>
|
|
||||||
setNewMaster({ ...newMaster, phone: e.target.value })
|
|
||||||
}
|
|
||||||
placeholder={t('inputPhone.placeholder')}
|
|
||||||
/>
|
|
||||||
</FormControl>
|
|
||||||
</DrawerBody>
|
|
||||||
<DrawerFooter>
|
|
||||||
<Button colorScheme='teal' mr={3} onClick={handleSave}>
|
|
||||||
{t('button.save')}
|
|
||||||
</Button>
|
|
||||||
<Button variant='ghost' onClick={onClose}>
|
|
||||||
{t('button.cancel')}
|
|
||||||
</Button>
|
|
||||||
</DrawerFooter>
|
|
||||||
</DrawerContent>
|
|
||||||
</Drawer>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default MasterDrawer;
|
|
||||||
@ -1 +0,0 @@
|
|||||||
export { default } from './MasterDrawer';
|
|
||||||
@ -1,43 +0,0 @@
|
|||||||
import React from 'react';
|
|
||||||
import { Badge, Link, Stack, Td, Tr } from '@chakra-ui/react';
|
|
||||||
|
|
||||||
import MasterActionsMenu from '../MasterActionsMenu';
|
|
||||||
import { getTimeSlot } from '../../lib/date-helpers';
|
|
||||||
|
|
||||||
export interface Schedule {
|
|
||||||
id: string;
|
|
||||||
startWashTime: string;
|
|
||||||
endWashTime: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
export type MasterProps = {
|
|
||||||
id: string;
|
|
||||||
name: string;
|
|
||||||
schedule: Schedule[];
|
|
||||||
phone: string;
|
|
||||||
};
|
|
||||||
|
|
||||||
const MasterItem = ({ name, schedule, phone }) => {
|
|
||||||
return (
|
|
||||||
<Tr>
|
|
||||||
<Td>{name}</Td>
|
|
||||||
<Td>
|
|
||||||
<Stack direction='row'>
|
|
||||||
{schedule.map(({ startWashTime, endWashTime }, index) => (
|
|
||||||
<Badge colorScheme={'green'} key={index}>
|
|
||||||
{getTimeSlot(startWashTime, endWashTime)}
|
|
||||||
</Badge>
|
|
||||||
))}
|
|
||||||
</Stack>
|
|
||||||
</Td>
|
|
||||||
<Td>
|
|
||||||
<Link href='tel:'>{phone}</Link>
|
|
||||||
</Td>
|
|
||||||
<Td>
|
|
||||||
<MasterActionsMenu />
|
|
||||||
</Td>
|
|
||||||
</Tr>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default MasterItem;
|
|
||||||
@ -1 +0,0 @@
|
|||||||
export { default } from './MasterItem';
|
|
||||||
@ -1,112 +0,0 @@
|
|||||||
import React, { useEffect, useState } from 'react';
|
|
||||||
import {
|
|
||||||
Box,
|
|
||||||
Heading,
|
|
||||||
Table,
|
|
||||||
Thead,
|
|
||||||
Tbody,
|
|
||||||
Tr,
|
|
||||||
Th,
|
|
||||||
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';
|
|
||||||
|
|
||||||
const TABLE_HEADERS = [
|
|
||||||
'name' as const,
|
|
||||||
'currentJob' as const,
|
|
||||||
'phone' as const,
|
|
||||||
'actions' as const,
|
|
||||||
];
|
|
||||||
|
|
||||||
const Masters = () => {
|
|
||||||
const { isOpen, onOpen, onClose } = useDisclosure();
|
|
||||||
const toast = useToast();
|
|
||||||
const { t } = useTranslation('~', {
|
|
||||||
keyPrefix: 'dry-wash.arm.master',
|
|
||||||
});
|
|
||||||
|
|
||||||
const [masters, setMasters] = useState<MasterProps[]>([]);
|
|
||||||
const [loading, setLoading] = useState(false);
|
|
||||||
const [error, setError] = useState<string | null>(null);
|
|
||||||
|
|
||||||
const { fetchMasters } = armService();
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
const loadMasters = async () => {
|
|
||||||
setLoading(true);
|
|
||||||
|
|
||||||
try {
|
|
||||||
const data = await fetchMasters();
|
|
||||||
setMasters(data.body);
|
|
||||||
} catch (err) {
|
|
||||||
setError(err.message);
|
|
||||||
toast({
|
|
||||||
title: t('error.title'),
|
|
||||||
status: 'error',
|
|
||||||
duration: 5000,
|
|
||||||
isClosable: true,
|
|
||||||
position: 'bottom-right',
|
|
||||||
});
|
|
||||||
} finally {
|
|
||||||
setLoading(false);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
loadMasters();
|
|
||||||
}, [toast, t]);
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Box p='8'>
|
|
||||||
<Flex justifyContent='space-between' alignItems='center' mb='5'>
|
|
||||||
<Heading size='lg'> {t('title')}</Heading>
|
|
||||||
<Button colorScheme='green' onClick={onOpen}>
|
|
||||||
+ {t('add')}
|
|
||||||
</Button>
|
|
||||||
</Flex>
|
|
||||||
<Table variant='simple' colorScheme='blackAlpha'>
|
|
||||||
<Thead>
|
|
||||||
<Tr>
|
|
||||||
{TABLE_HEADERS.map((name) => (
|
|
||||||
<Th key={name}>{t(`table.header.${name}`)}</Th>
|
|
||||||
))}
|
|
||||||
</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} />
|
|
||||||
))}
|
|
||||||
</Tbody>
|
|
||||||
</Table>
|
|
||||||
<MasterDrawer isOpen={isOpen} onClose={onClose} />
|
|
||||||
</Box>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default Masters;
|
|
||||||
@ -1 +0,0 @@
|
|||||||
export { default } from './Masters';
|
|
||||||
@ -1,70 +0,0 @@
|
|||||||
import React, { useState } from 'react';
|
|
||||||
import { Td, Tr, Link, Select } from '@chakra-ui/react';
|
|
||||||
import { useTranslation } from 'react-i18next';
|
|
||||||
import dayjs from 'dayjs';
|
|
||||||
|
|
||||||
import { getTimeSlot } from '../../lib/date-helpers';
|
|
||||||
|
|
||||||
const statuses = [
|
|
||||||
'pending' as const,
|
|
||||||
'progress' as const,
|
|
||||||
'working' as const,
|
|
||||||
'canceled' as const,
|
|
||||||
'complete' as const,
|
|
||||||
];
|
|
||||||
|
|
||||||
type GetArrItemType<ArrType> =
|
|
||||||
ArrType extends Array<infer ItemType> ? ItemType : never;
|
|
||||||
|
|
||||||
export type OrderProps = {
|
|
||||||
carNumber?: string;
|
|
||||||
startWashTime?: string;
|
|
||||||
endWashTime?: string;
|
|
||||||
orderDate?: string;
|
|
||||||
status?: GetArrItemType<typeof statuses>;
|
|
||||||
phone?: string;
|
|
||||||
location?: string;
|
|
||||||
};
|
|
||||||
|
|
||||||
const OrderItem = ({
|
|
||||||
carNumber,
|
|
||||||
startWashTime,
|
|
||||||
endWashTime,
|
|
||||||
orderDate,
|
|
||||||
status,
|
|
||||||
phone,
|
|
||||||
location,
|
|
||||||
}: OrderProps) => {
|
|
||||||
const { t } = useTranslation('~', {
|
|
||||||
keyPrefix: 'dry-wash.arm.order',
|
|
||||||
});
|
|
||||||
|
|
||||||
const [statusSelect, setStatus] = useState(status);
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Tr>
|
|
||||||
<Td>{carNumber}</Td>
|
|
||||||
<Td>{getTimeSlot(startWashTime, endWashTime)}</Td>
|
|
||||||
<Td>{dayjs(orderDate).format('DD.MM.YYYY')}</Td>
|
|
||||||
<Td>
|
|
||||||
<Select
|
|
||||||
value={statusSelect}
|
|
||||||
onChange={(e) => setStatus(e.target.value as OrderProps['status'])}
|
|
||||||
placeholder={t(`status.placeholder`)}
|
|
||||||
>
|
|
||||||
{statuses.map((status) => (
|
|
||||||
<option key={status} value={status}>
|
|
||||||
{t(`status.${status}`)}
|
|
||||||
</option>
|
|
||||||
))}
|
|
||||||
</Select>
|
|
||||||
</Td>
|
|
||||||
<Td>
|
|
||||||
<Link href='tel:'>{phone}</Link>
|
|
||||||
</Td>
|
|
||||||
<Td>{location}</Td>
|
|
||||||
</Tr>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default OrderItem;
|
|
||||||
@ -1 +0,0 @@
|
|||||||
export { default } from './OrderItem';
|
|
||||||
@ -1,126 +0,0 @@
|
|||||||
import React, { useEffect, useState } from 'react';
|
|
||||||
import {
|
|
||||||
Box,
|
|
||||||
Heading,
|
|
||||||
Table,
|
|
||||||
Thead,
|
|
||||||
Tbody,
|
|
||||||
Tr,
|
|
||||||
Th,
|
|
||||||
Spinner,
|
|
||||||
Text,
|
|
||||||
Td,
|
|
||||||
useToast,
|
|
||||||
} from '@chakra-ui/react';
|
|
||||||
import { useTranslation } from 'react-i18next';
|
|
||||||
import dayjs from 'dayjs';
|
|
||||||
|
|
||||||
import OrderItem from '../OrderItem';
|
|
||||||
import { OrderProps } from '../OrderItem/OrderItem';
|
|
||||||
import { armService } from '../../api/arm';
|
|
||||||
import DateNavigator from '../DateNavigator';
|
|
||||||
|
|
||||||
const TABLE_HEADERS = [
|
|
||||||
'carNumber' as const,
|
|
||||||
'washingTime' as const,
|
|
||||||
'orderDate' as const,
|
|
||||||
'status' as const,
|
|
||||||
'telephone' as const,
|
|
||||||
'location' as const,
|
|
||||||
];
|
|
||||||
|
|
||||||
const Orders = () => {
|
|
||||||
const { t } = useTranslation('~', {
|
|
||||||
keyPrefix: 'dry-wash.arm.order',
|
|
||||||
});
|
|
||||||
|
|
||||||
const { fetchOrders } = armService();
|
|
||||||
|
|
||||||
const toast = useToast();
|
|
||||||
|
|
||||||
const [orders, setOrders] = useState<OrderProps[]>([]);
|
|
||||||
const [loading, setLoading] = useState(false);
|
|
||||||
const [error, setError] = useState<string | null>(null);
|
|
||||||
const [currentDate, setCurrentDate] = useState(new Date());
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
const loadOrders = async () => {
|
|
||||||
setLoading(true);
|
|
||||||
|
|
||||||
try {
|
|
||||||
const data = await fetchOrders({ date: currentDate });
|
|
||||||
setOrders(data.body);
|
|
||||||
} catch (err) {
|
|
||||||
setError(err.message);
|
|
||||||
toast({
|
|
||||||
title: t('error.title'),
|
|
||||||
status: 'error',
|
|
||||||
duration: 5000,
|
|
||||||
isClosable: true,
|
|
||||||
position: 'bottom-right',
|
|
||||||
});
|
|
||||||
} finally {
|
|
||||||
setLoading(false);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
loadOrders();
|
|
||||||
}, [toast, t, currentDate]);
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Box p='8'>
|
|
||||||
<Heading size='lg' mb='5'>
|
|
||||||
{t('title')}
|
|
||||||
</Heading>
|
|
||||||
|
|
||||||
<DateNavigator
|
|
||||||
currentDate={currentDate}
|
|
||||||
onPreviousDate={() =>
|
|
||||||
setCurrentDate((prevDate) =>
|
|
||||||
dayjs(prevDate).subtract(1, 'day').toDate(),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
onNextDate={() =>
|
|
||||||
setCurrentDate((prevDate) => dayjs(prevDate).add(1, 'day').toDate())
|
|
||||||
}
|
|
||||||
/>
|
|
||||||
|
|
||||||
<Table variant='simple' colorScheme='blackAlpha'>
|
|
||||||
<Thead>
|
|
||||||
<Tr>
|
|
||||||
{TABLE_HEADERS.map((name, key) => (
|
|
||||||
<Th key={key}>{t(`table.header.${name}`)}</Th>
|
|
||||||
))}
|
|
||||||
</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']}
|
|
||||||
/>
|
|
||||||
))}
|
|
||||||
</Tbody>
|
|
||||||
</Table>
|
|
||||||
</Box>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default Orders;
|
|
||||||
@ -1 +0,0 @@
|
|||||||
export { default } from './Orders';
|
|
||||||
@ -1,16 +0,0 @@
|
|||||||
import React, { FC } from 'react';
|
|
||||||
import { Flex, Spinner } from '@chakra-ui/react';
|
|
||||||
|
|
||||||
export const PageSpinner: FC = () => {
|
|
||||||
return (
|
|
||||||
<Flex w='full' h='100vh' justifyContent='center' alignItems='center'>
|
|
||||||
<Spinner
|
|
||||||
thickness='5px'
|
|
||||||
speed='0.65s'
|
|
||||||
emptyColor='gray.200'
|
|
||||||
color='green.500'
|
|
||||||
size='xl'
|
|
||||||
/>
|
|
||||||
</Flex>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
@ -1 +0,0 @@
|
|||||||
export { PageSpinner } from './PageSpinner';
|
|
||||||
@ -1,60 +0,0 @@
|
|||||||
import { Box, Button, Heading, VStack, Divider } from '@chakra-ui/react';
|
|
||||||
import React from 'react';
|
|
||||||
import { useLocation, Link } from 'react-router-dom';
|
|
||||||
import { useTranslation } from 'react-i18next';
|
|
||||||
|
|
||||||
import { URLs } from '../../__data__/urls';
|
|
||||||
|
|
||||||
const Sidebar = () => {
|
|
||||||
const location = useLocation();
|
|
||||||
const isActive = (keyword: string) => location.pathname.includes(keyword);
|
|
||||||
|
|
||||||
const { t } = useTranslation('~', {
|
|
||||||
keyPrefix: 'dry-wash.arm.master.sideBar',
|
|
||||||
});
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Box
|
|
||||||
borderRight='1px solid black'
|
|
||||||
bg='gray.50'
|
|
||||||
color='white'
|
|
||||||
w='250px'
|
|
||||||
p='5'
|
|
||||||
pt='8'
|
|
||||||
>
|
|
||||||
<Heading color='green' size='lg' mb='5'>
|
|
||||||
{t('title')}
|
|
||||||
</Heading>
|
|
||||||
|
|
||||||
<VStack align='start' spacing='4'>
|
|
||||||
<Divider />
|
|
||||||
{URLs.armOrder.isOn && (
|
|
||||||
<Button
|
|
||||||
as={Link}
|
|
||||||
to={URLs.armOrder.url}
|
|
||||||
w='100%'
|
|
||||||
colorScheme={isActive(URLs.armOrder.url) ? 'green' : 'blue'}
|
|
||||||
variant={isActive(URLs.armOrder.url) ? 'solid' : 'ghost'}
|
|
||||||
>
|
|
||||||
{t('orders')}
|
|
||||||
</Button>
|
|
||||||
)}
|
|
||||||
<Divider />
|
|
||||||
{URLs.armMaster.isOn && (
|
|
||||||
<Button
|
|
||||||
as={Link}
|
|
||||||
to={URLs.armMaster.url}
|
|
||||||
w='100%'
|
|
||||||
colorScheme={isActive(URLs.armMaster.url) ? 'green' : 'blue'}
|
|
||||||
variant={isActive(URLs.armMaster.url) ? 'solid' : 'ghost'}
|
|
||||||
>
|
|
||||||
{t('master')}
|
|
||||||
</Button>
|
|
||||||
)}
|
|
||||||
<Divider />
|
|
||||||
</VStack>
|
|
||||||
</Box>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
|
|
||||||
export default Sidebar;
|
|
||||||
@ -1 +0,0 @@
|
|||||||
export { default } from './Sidebar';
|
|
||||||
@ -1 +0,0 @@
|
|||||||
export * from './PageSpinner';
|
|
||||||
@ -1,34 +0,0 @@
|
|||||||
import React, { FC } from 'react';
|
|
||||||
import { useTranslation } from 'react-i18next';
|
|
||||||
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' });
|
|
||||||
|
|
||||||
return (
|
|
||||||
<PageSection>
|
|
||||||
<VStack w='full' spacing={2}>
|
|
||||||
<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>
|
|
||||||
))}
|
|
||||||
</List>
|
|
||||||
<HStack w='full' justify='flex-end'>
|
|
||||||
<CtaButton />
|
|
||||||
</HStack>
|
|
||||||
</PageSection>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
@ -1,16 +0,0 @@
|
|||||||
import React, { FC, PropsWithChildren } from 'react';
|
|
||||||
import { ListIcon, ListItem as ChakraListItem } from '@chakra-ui/react';
|
|
||||||
import { IconType } from 'react-icons';
|
|
||||||
|
|
||||||
export type ListItemProps = PropsWithChildren & {
|
|
||||||
Icon: IconType;
|
|
||||||
};
|
|
||||||
|
|
||||||
export const ListItem: FC<ListItemProps> = ({ Icon, children }) => {
|
|
||||||
return (
|
|
||||||
<ChakraListItem display='inline-flex'>
|
|
||||||
<ListIcon as={Icon} color='primary.500' boxSize='6' />
|
|
||||||
{children}
|
|
||||||
</ChakraListItem>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
@ -1 +0,0 @@
|
|||||||
export { type ListItemProps, ListItem } from './ListItem';
|
|
||||||
@ -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 +0,0 @@
|
|||||||
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;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
@ -1,21 +0,0 @@
|
|||||||
import React, { FC } from 'react';
|
|
||||||
import { useTranslation } from 'react-i18next';
|
|
||||||
import { Link as RouterLink } from 'react-router-dom';
|
|
||||||
import { ButtonProps, Button } from '@chakra-ui/react';
|
|
||||||
|
|
||||||
import { URLs } from '../../../__data__/urls';
|
|
||||||
|
|
||||||
export const CtaButton: FC<ButtonProps> = (props) => {
|
|
||||||
const { t } = useTranslation('~', { keyPrefix: 'dry-wash.landing' });
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Button
|
|
||||||
as={RouterLink}
|
|
||||||
to={URLs.orderCreate.getUrl()}
|
|
||||||
colorScheme='primary'
|
|
||||||
{...props}
|
|
||||||
>
|
|
||||||
{t('make-order-button')}
|
|
||||||
</Button>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
@ -1 +0,0 @@
|
|||||||
export { CtaButton } from './CtaButton';
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
import React, { FC } from 'react';
|
|
||||||
import { useTranslation } from 'react-i18next';
|
|
||||||
import { Text } from '@chakra-ui/react';
|
|
||||||
|
|
||||||
const currentYear = new Date().getFullYear();
|
|
||||||
|
|
||||||
export const Copyright: FC = () => {
|
|
||||||
const { t } = useTranslation();
|
|
||||||
|
|
||||||
return <Text color='whiteAlpha.500'>{t('dry-wash.landing.footer.copyright', { currentYear })}</Text>;
|
|
||||||
};
|
|
||||||
@ -1 +0,0 @@
|
|||||||
export { Copyright } from './Copyright';
|
|
||||||
@ -1,36 +0,0 @@
|
|||||||
import React, { FC } from 'react';
|
|
||||||
import { useTranslation } from 'react-i18next';
|
|
||||||
import { Link, List, ListItem } from '@chakra-ui/react';
|
|
||||||
import { Link as RouterLink } from 'react-router-dom';
|
|
||||||
|
|
||||||
import { SiteLogo, PageSection } from '../';
|
|
||||||
|
|
||||||
import { Copyright } from './Copyright';
|
|
||||||
|
|
||||||
export const Footer: FC = () => {
|
|
||||||
const { t } = useTranslation('~', {
|
|
||||||
keyPrefix: 'dry-wash.landing.footer.links',
|
|
||||||
});
|
|
||||||
|
|
||||||
const listData = [
|
|
||||||
{ to: '#', label: t('privacy-policy') },
|
|
||||||
{ to: '#', label: t('service-terms') },
|
|
||||||
{ to: '#', label: t('faq') },
|
|
||||||
];
|
|
||||||
|
|
||||||
return (
|
|
||||||
<PageSection as='footer' py={5} bg='gray.700' color='white'>
|
|
||||||
<SiteLogo />
|
|
||||||
<Copyright />
|
|
||||||
<List spacing={2}>
|
|
||||||
{listData.map(({ to, label }, i) => (
|
|
||||||
<ListItem key={i}>
|
|
||||||
<Link as={RouterLink} to={to}>
|
|
||||||
{label}
|
|
||||||
</Link>
|
|
||||||
</ListItem>
|
|
||||||
))}
|
|
||||||
</List>
|
|
||||||
</PageSection>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
@ -1 +0,0 @@
|
|||||||
export { Footer } from './Footer';
|
|
||||||
@ -1,65 +0,0 @@
|
|||||||
import React, { FC } from 'react';
|
|
||||||
import { useTranslation } from 'react-i18next';
|
|
||||||
import { Box, Heading, Text, Center, VStack } from '@chakra-ui/react';
|
|
||||||
|
|
||||||
import { DemoVideoPosterImg } from '../../../assets/images';
|
|
||||||
import { CtaButton, SiteLogo, PageSection } from '../';
|
|
||||||
|
|
||||||
import { HeroSectionProps } from './types';
|
|
||||||
|
|
||||||
export const HeroSection: FC<HeroSectionProps> = ({
|
|
||||||
data: { headline, description, video } = {},
|
|
||||||
flexShrink,
|
|
||||||
}) => {
|
|
||||||
const { t } = useTranslation('~', { keyPrefix: 'dry-wash.landing' });
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Box flexShrink={flexShrink} as='header' pos='relative' zIndex={0}>
|
|
||||||
<Box
|
|
||||||
as='video'
|
|
||||||
src={`${__webpack_public_path__}/remote-assets/${video}`}
|
|
||||||
poster={DemoVideoPosterImg}
|
|
||||||
autoPlay
|
|
||||||
loop
|
|
||||||
muted
|
|
||||||
w='full'
|
|
||||||
h='full'
|
|
||||||
pos='absolute'
|
|
||||||
objectFit='cover'
|
|
||||||
filter='brightness(50%)'
|
|
||||||
zIndex={-1}
|
|
||||||
/>
|
|
||||||
<PageSection
|
|
||||||
h='full'
|
|
||||||
minH='375px'
|
|
||||||
maxH='1000px'
|
|
||||||
py={10}
|
|
||||||
justifyContent='center'
|
|
||||||
alignItems='center'
|
|
||||||
spacing={8}
|
|
||||||
>
|
|
||||||
<Center>
|
|
||||||
<SiteLogo />
|
|
||||||
</Center>
|
|
||||||
<VStack spacing={4}>
|
|
||||||
<Heading
|
|
||||||
as='h1'
|
|
||||||
textAlign='center'
|
|
||||||
color='white'
|
|
||||||
__css={{ textWrap: 'balance' }}
|
|
||||||
>
|
|
||||||
{t(headline)}
|
|
||||||
</Heading>
|
|
||||||
<Text
|
|
||||||
textAlign='center'
|
|
||||||
__css={{ textWrap: 'balance' }}
|
|
||||||
color='white'
|
|
||||||
>
|
|
||||||
{t(description)}
|
|
||||||
</Text>
|
|
||||||
</VStack>
|
|
||||||
<CtaButton size='lg' />
|
|
||||||
</PageSection>
|
|
||||||
</Box>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
@ -1 +0,0 @@
|
|||||||
export { HeroSection } from './HeroSection';
|
|
||||||
@ -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'>;
|
|
||||||
@ -1,12 +0,0 @@
|
|||||||
import React, { FC, PropsWithChildren } from 'react';
|
|
||||||
import { StackProps, VStack } from '@chakra-ui/react';
|
|
||||||
|
|
||||||
type PageSectionProps = StackProps & PropsWithChildren;
|
|
||||||
|
|
||||||
export const PageSection: FC<PageSectionProps> = ({ children, ...restProps }) => {
|
|
||||||
return (
|
|
||||||
<VStack as='section' w='full' px={5} py={5} spacing={6} alignItems='flex-start' {...restProps}>
|
|
||||||
{children}
|
|
||||||
</VStack>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
@ -1 +0,0 @@
|
|||||||
export { PageSection } from './PageSection';
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
import React, { FC } from 'react';
|
|
||||||
import { useTranslation } from 'react-i18next';
|
|
||||||
import { Image } from '@chakra-ui/react';
|
|
||||||
|
|
||||||
import { LogoSvg } from '../../../assets/icons';
|
|
||||||
|
|
||||||
export const SiteLogo: FC = () => {
|
|
||||||
const { t } = useTranslation();
|
|
||||||
|
|
||||||
return <Image src={LogoSvg} alt={t('~:dry-wash.landing.site-logo')} w={40} />;
|
|
||||||
};
|
|
||||||
|
|
||||||
// todo: replace Image by SVG React component
|
|
||||||
@ -1 +0,0 @@
|
|||||||
export { SiteLogo } from './SiteLogo';
|
|
||||||
@ -1,37 +0,0 @@
|
|||||||
import React, { FC } from 'react';
|
|
||||||
import { Card, Avatar, Text } from '@chakra-ui/react';
|
|
||||||
|
|
||||||
type ReviewCardProps = {
|
|
||||||
firstname: string;
|
|
||||||
lastname: string;
|
|
||||||
picture: string;
|
|
||||||
text: string;
|
|
||||||
};
|
|
||||||
|
|
||||||
export const ReviewCard: FC<ReviewCardProps> = ({
|
|
||||||
firstname,
|
|
||||||
lastname,
|
|
||||||
picture,
|
|
||||||
text,
|
|
||||||
}) => {
|
|
||||||
const name = [firstname, lastname].join(' ');
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Card p={4} gap={2} alignItems='center' variant='elevated'>
|
|
||||||
<Avatar
|
|
||||||
name={name}
|
|
||||||
src={picture}
|
|
||||||
size='xl'
|
|
||||||
boxShadow='2px 2px 0 1px var(--chakra-colors-secondary-500)'
|
|
||||||
/>
|
|
||||||
<Text
|
|
||||||
as='q'
|
|
||||||
fontSize='sm'
|
|
||||||
textAlign='center'
|
|
||||||
__css={{ textWrap: 'balance' }}
|
|
||||||
>
|
|
||||||
{text}
|
|
||||||
</Text>
|
|
||||||
</Card>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
@ -1 +0,0 @@
|
|||||||
export { ReviewCard } from './ReviewCard';
|
|
||||||
@ -1,80 +0,0 @@
|
|||||||
import React, { FC, useEffect, useState } from 'react';
|
|
||||||
import { useTranslation } from 'react-i18next';
|
|
||||||
import {
|
|
||||||
Tab,
|
|
||||||
TabList,
|
|
||||||
TabPanel,
|
|
||||||
TabPanels,
|
|
||||||
Tabs,
|
|
||||||
Text,
|
|
||||||
} from '@chakra-ui/react';
|
|
||||||
|
|
||||||
import { mockReview } from '../../../../mocks/landing';
|
|
||||||
import { Review } from '../../../../models';
|
|
||||||
|
|
||||||
import { ReviewCard } from './ReviewCard';
|
|
||||||
|
|
||||||
const SLIDE_CHANGE_INTERVAL = 5000;
|
|
||||||
|
|
||||||
export const ReviewsSlider: FC = () => {
|
|
||||||
const { i18n } = useTranslation();
|
|
||||||
const mockReviews: Review.View[] = mockReview.getReviewsByLocale(i18n.language);
|
|
||||||
const reviewsCount = mockReviews.length;
|
|
||||||
|
|
||||||
const [activeTab, setActiveTab] = useState(0);
|
|
||||||
const [isSlideShowStopped, setIsSlideShowStopped] = useState(false);
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
const timer = setInterval(() => {
|
|
||||||
const newActiveTab = (activeTab + 1) % reviewsCount;
|
|
||||||
setActiveTab(newActiveTab);
|
|
||||||
}, SLIDE_CHANGE_INTERVAL);
|
|
||||||
|
|
||||||
if (isSlideShowStopped) {
|
|
||||||
clearInterval(timer);
|
|
||||||
}
|
|
||||||
|
|
||||||
return () => {
|
|
||||||
clearInterval(timer);
|
|
||||||
};
|
|
||||||
}, [activeTab]);
|
|
||||||
|
|
||||||
return (
|
|
||||||
<Tabs
|
|
||||||
index={activeTab}
|
|
||||||
onChange={(selectedTab) => {
|
|
||||||
setIsSlideShowStopped(true);
|
|
||||||
setActiveTab(selectedTab);
|
|
||||||
}}
|
|
||||||
display='flex'
|
|
||||||
flexDir='column'
|
|
||||||
alignItems='center'
|
|
||||||
variant='soft-rounded'
|
|
||||||
colorScheme='gray'
|
|
||||||
>
|
|
||||||
<TabList gap={2}>
|
|
||||||
{mockReviews.map(({ id }, i) => (
|
|
||||||
<Tab
|
|
||||||
key={id}
|
|
||||||
w={4}
|
|
||||||
h={4}
|
|
||||||
p={0}
|
|
||||||
bg='gray.100'
|
|
||||||
_selected={{
|
|
||||||
bg: 'secondary.100',
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<Text visibility='hidden'>{i}</Text>
|
|
||||||
</Tab>
|
|
||||||
))}
|
|
||||||
</TabList>
|
|
||||||
<TabPanels>
|
|
||||||
{mockReviews.map(({ id, ...reviewProps }) => (
|
|
||||||
<TabPanel key={id}>
|
|
||||||
<ReviewCard {...reviewProps} />
|
|
||||||
</TabPanel>
|
|
||||||
))}
|
|
||||||
</TabPanels>
|
|
||||||
</Tabs>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
@ -1 +0,0 @@
|
|||||||
export { ReviewsSlider } from './ReviewsSlider';
|
|
||||||
@ -1,24 +0,0 @@
|
|||||||
import React, { FC } from 'react';
|
|
||||||
import { useTranslation } from 'react-i18next';
|
|
||||||
import { Heading, HStack } from '@chakra-ui/react';
|
|
||||||
|
|
||||||
import { CtaButton, PageSection } from '../';
|
|
||||||
|
|
||||||
import { ReviewsSlider } from './ReviewsSlider';
|
|
||||||
import { SocialProofSectionProps } from './types';
|
|
||||||
|
|
||||||
export const SocialProofSection: FC<SocialProofSectionProps> = ({
|
|
||||||
data: { heading } = {},
|
|
||||||
}) => {
|
|
||||||
const { t } = useTranslation('~', { keyPrefix: 'dry-wash.landing' });
|
|
||||||
|
|
||||||
return (
|
|
||||||
<PageSection>
|
|
||||||
<Heading as='h2'>{t(heading)}</Heading>
|
|
||||||
<ReviewsSlider />
|
|
||||||
<HStack w='full' justify='flex-end'>
|
|
||||||
<CtaButton />
|
|
||||||
</HStack>
|
|
||||||
</PageSection>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
@ -1,2 +0,0 @@
|
|||||||
export type { SocialProofSectionProps } from './types';
|
|
||||||
export { SocialProofSection } from './SocialProofSection';
|
|
||||||
@ -1,5 +0,0 @@
|
|||||||
export type SocialProofSectionProps = {
|
|
||||||
data: {
|
|
||||||
heading: 'social-proof-section.heading';
|
|
||||||
};
|
|
||||||
};
|
|
||||||
@ -1,7 +0,0 @@
|
|||||||
export * from './CtaButton';
|
|
||||||
export * from './PageSection';
|
|
||||||
export * from './BenefitsSection'; // CtaButton, PageSection
|
|
||||||
export * from './SocialProofSection'; // CtaButton, PageSection
|
|
||||||
export * from './SiteLogo';
|
|
||||||
export * from './Footer'; // PageSection, SiteLogo
|
|
||||||
export * from './HeroSection'; // CtaButton, PageSection, SiteLogo
|
|
||||||
@ -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>
|
|
||||||
);
|
|
||||||
};
|
|
||||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user