Compare commits
141 Commits
feature/ro
...
v0.5.0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3382ae3ada | ||
|
|
5ed023866e | ||
|
|
e73773f359 | ||
|
|
a9a9b3cadd | ||
| 06abc15c9a | |||
| 6ca7de9467 | |||
| 939f107d1c | |||
| 4f92125e6d | |||
| 3ea501161c | |||
| e8634c396f | |||
| edddf6d857 | |||
| 1276b13fec | |||
| 2aa361e3db | |||
|
|
4cda998bd7 | ||
| 9b0bda3cda | |||
| cad31605d9 | |||
| 1dee68b65d | |||
| 6096cfc15c | |||
| fc699e7890 | |||
|
|
3e0e570ff6 | ||
| 7b24804498 | |||
| 5498122109 | |||
| ef90173b80 | |||
| c7162d0045 | |||
| 885ad16782 | |||
|
|
5e24537919 | ||
| 707a77d7ad | |||
|
|
8a0dff682b | ||
|
|
b8606ac05f | ||
| 6218b6f5d8 | |||
| 8cc8391a09 | |||
| e2c65fd39c | |||
| 9f530204fa | |||
| fb3ca156fb | |||
| 48d076a829 | |||
| e4b9aefe57 | |||
|
|
77ea7d301e | ||
|
|
93adc1fb7d | ||
|
|
0457bf7ffc | ||
|
|
11fe40b86d | ||
|
|
ab40b587ba | ||
|
|
b79c957779 | ||
|
|
440e87ef76 | ||
| 0b2dae79ac | |||
|
|
7c157574c8 | ||
| 5ef0d5953d | |||
|
|
6705e74ece | ||
| 52bb3790c7 | |||
|
|
2cf60c7b16 | ||
|
|
d30202108c | ||
|
|
012de3c670 | ||
|
|
409c339b3c | ||
|
|
8611405edd | ||
|
|
407da721af | ||
|
|
409473413a | ||
|
|
823e192c51 | ||
|
|
d4965b7aba | ||
|
|
16b4627166 | ||
| 7025c1a31b | |||
| 2d55f26de5 | |||
| da244adee0 | |||
| 5d1a679c68 | |||
| a9738c7d8a | |||
| 6442f1f407 | |||
| 2130532dfd | |||
| 3b4f5a8486 | |||
| b5f3838536 | |||
| dee3a04310 | |||
| acd39b1e32 | |||
| c2fad8a3ff | |||
| 9eb0080d13 | |||
| 920f4440e9 | |||
| e374cbfdd3 | |||
| 0b30ce6571 | |||
| 3b47e1dcdf | |||
| 4e8bc2fca5 | |||
| 0c9663fcef | |||
|
|
181198c0cb | ||
|
|
5ca3fd2613 | ||
|
|
0cd7ec8b22 | ||
|
|
66c1323f00 | ||
| a63304b5e4 | |||
|
|
effd9dae2d | ||
|
|
1787e94f8e | ||
|
|
855ec2f138 | ||
|
|
d15d761f1a | ||
| 05303092e2 | |||
|
|
98181ff354 | ||
|
|
5822f5f7b0 | ||
|
|
e72736e692 | ||
|
|
3cdb9a997e | ||
|
|
425a47b33c | ||
|
|
862f2ef5f5 | ||
|
|
7e18d765bc | ||
| edc329c154 | |||
| 5d208b1fc5 | |||
| 1839136c9f | |||
| a6ec94785a | |||
| 18ca96bfe9 | |||
| db918ba7c7 | |||
|
|
c92c879b31 | ||
|
|
752fe72786 | ||
|
|
36200382a8 | ||
|
|
8328ee8028 | ||
| d1d92c63e8 | |||
|
|
95d26e58a3 | ||
|
|
bc629eabdf | ||
| dedc7e1608 | |||
| 1c8348dee5 | |||
| 04e4d011ff | |||
|
|
cba5beda72 | ||
|
|
3ade6f83cc | ||
|
|
897602c471 | ||
|
|
d2b74a1467 | ||
| e4969938c3 | |||
| 5fa37ad2db | |||
| d7da2b5618 | |||
| 413181617b | |||
|
|
10854c836b | ||
|
|
98e11704e6 | ||
|
|
1d8e9c7e90 | ||
|
|
1930333d64 | ||
|
|
0b47fb4a2a | ||
|
|
83f0dc77e4 | ||
|
|
d713f074d9 | ||
|
|
915e402647 | ||
|
|
1c8054f7e8 | ||
|
|
374d2d2ebe | ||
|
|
4cb3fba14a | ||
| 116e883e91 | |||
| 9b3a204657 | |||
| 9a490bd993 | |||
| 7ff8a99505 | |||
|
|
43c283ed0e | ||
| 660019d107 | |||
| 75c55a11fb | |||
| 9b2c8be1d9 | |||
| 52c9ecd3c8 | |||
| 6cf619d88e | |||
| d8d6731046 | |||
| 177bedf381 |
1
.gitignore
vendored
@@ -130,3 +130,4 @@ dist
|
|||||||
.yarn/install-state.gz
|
.yarn/install-state.gz
|
||||||
.pnp.*
|
.pnp.*
|
||||||
|
|
||||||
|
.idea
|
||||||
8
.prettierrc.json
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
{
|
||||||
|
"singleQuote": true,
|
||||||
|
"jsxSingleQuote": true,
|
||||||
|
"arrowParens": "always",
|
||||||
|
"max-len": ["error", 140, 2],
|
||||||
|
"tabWidth": 2,
|
||||||
|
"useTabs": false
|
||||||
|
}
|
||||||
57
Jenkinsfile
vendored
Normal file
@@ -0,0 +1,57 @@
|
|||||||
|
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
@@ -45,10 +45,12 @@
|
|||||||
### MVP1
|
### MVP1
|
||||||
|
|
||||||
**1. Landing**
|
**1. Landing**
|
||||||
|
|
||||||
- преимущества сервиса
|
- преимущества сервиса
|
||||||
- оставить заявку (редирект на Страницу оформления заказа)
|
- оставить заявку (редирект на Страницу оформления заказа)
|
||||||
|
|
||||||
**2. Страница для оформления заказа**
|
**2. Страница для оформления заказа**
|
||||||
|
|
||||||
- форма
|
- форма
|
||||||
- номер машины (mask input)
|
- номер машины (mask input)
|
||||||
- цвет машины
|
- цвет машины
|
||||||
@@ -58,10 +60,12 @@
|
|||||||
- после заполнения редирект на страницу с деталями заказа
|
- после заполнения редирект на страницу с деталями заказа
|
||||||
|
|
||||||
**3. Страница с деталями заказа**
|
**3. Страница с деталями заказа**
|
||||||
|
|
||||||
- описание заказа
|
- описание заказа
|
||||||
- детали заказа (id, статус)
|
- детали заказа (id, статус)
|
||||||
|
|
||||||
**3. АРМ оператора**
|
**3. АРМ оператора**
|
||||||
|
|
||||||
- список заказов (RUD)
|
- список заказов (RUD)
|
||||||
- id заказа
|
- id заказа
|
||||||
- статус заказа (готово / не готово)
|
- статус заказа (готово / не готово)
|
||||||
@@ -72,7 +76,6 @@
|
|||||||
- кнопка "Добавить"
|
- кнопка "Добавить"
|
||||||
- кнопка "Удалить"
|
- кнопка "Удалить"
|
||||||
|
|
||||||
|
|
||||||
### Built With
|
### Built With
|
||||||
|
|
||||||
[![React][React.js]][React-url]
|
[![React][React.js]][React-url]
|
||||||
@@ -103,6 +106,14 @@
|
|||||||
|
|
||||||
<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,7 +1,9 @@
|
|||||||
const pkg = require("./package");
|
/* eslint-disable no-undef */
|
||||||
|
/* 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}/`,
|
||||||
@@ -9,17 +11,19 @@ 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.create": "/order",
|
'dry-wash.order.create': '/order',
|
||||||
"dry-wash.view.order": "/order/:orderId",
|
'dry-wash.order.view': '/order/:orderId',
|
||||||
"dry-wash.arm": "/arm",
|
'dry-wash.arm.master': 'master',
|
||||||
|
'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-pl.api": "/api",
|
'dry-wash.api': '/api',
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|||||||
48
eslint.config.mjs
Normal file
@@ -0,0 +1,48 @@
|
|||||||
|
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'
|
||||||
|
},
|
||||||
|
}
|
||||||
|
];
|
||||||
97
locales/en.json
Normal file
@@ -0,0 +1,97 @@
|
|||||||
|
{
|
||||||
|
"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.masters": "Master",
|
||||||
|
"dry-wash.arm.order.table.header.telephone": "Telephone",
|
||||||
|
"dry-wash.arm.order.table.header.location": "Location",
|
||||||
|
"dry-wash.arm.master.title": "Masters",
|
||||||
|
"dry-wash.arm.master.table.header.name": "Name",
|
||||||
|
"dry-wash.arm.master.table.empty": "Table empty",
|
||||||
|
"dry-wash.arm.master.error.title": "Error loading data",
|
||||||
|
"dry-wash.arm.master.table.header.currentJob": "Current Job",
|
||||||
|
"dry-wash.arm.master.table.header.phone": "Phone",
|
||||||
|
"dry-wash.arm.master.table.header.actions": "Actions",
|
||||||
|
"dry-wash.arm.master.table.actionsMenu.delete": "Delete Master",
|
||||||
|
"dry-wash.arm.master.schedule.empty": "free",
|
||||||
|
"dry-wash.arm.master.editable.aria.cancel": "Undo changes",
|
||||||
|
"dry-wash.arm.master.editable.aria.save": "Save changes ",
|
||||||
|
"dry-wash.arm.master.editable.aria.edit": "Edit",
|
||||||
|
"dry-wash.arm.master.drawer.title": "Add New Master",
|
||||||
|
"dry-wash.arm.master.drawer.inputName.label": "Full Name",
|
||||||
|
"dry-wash.arm.master.drawer.inputName.placeholder": "Enter Full Name",
|
||||||
|
"dry-wash.arm.master.drawer.inputPhone.label": "Phone Number",
|
||||||
|
"dry-wash.arm.master.drawer.inputPhone.placeholder": "Enter Phone Number",
|
||||||
|
"dry-wash.arm.master.drawer.button.save": "Save",
|
||||||
|
"dry-wash.arm.master.drawer.button.cancel": "Cancel",
|
||||||
|
"dry-wash.arm.master.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}}"
|
||||||
|
}
|
||||||
97
locales/ru.json
Normal file
@@ -0,0 +1,97 @@
|
|||||||
|
{
|
||||||
|
"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.masters": "Мастер",
|
||||||
|
"dry-wash.arm.order.table.header.telephone": "Телефон",
|
||||||
|
"dry-wash.arm.order.table.header.location": "Расположение",
|
||||||
|
"dry-wash.arm.order.table.empty": "Список пуст",
|
||||||
|
"dry-wash.arm.order.error.title": "Ошибка при загрузке данных",
|
||||||
|
"dry-wash.arm.master.title": "Мастера",
|
||||||
|
"dry-wash.arm.master.table.empty": "Список пуст",
|
||||||
|
"dry-wash.arm.master.error.title": "Ошибка при загрузке данных",
|
||||||
|
"dry-wash.arm.master.table.header.name": "Имя",
|
||||||
|
"dry-wash.arm.master.table.header.currentJob": "Актуальная занятость",
|
||||||
|
"dry-wash.arm.master.table.header.phone": "Телефон",
|
||||||
|
"dry-wash.arm.master.table.header.actions": "Действия",
|
||||||
|
"dry-wash.arm.master.table.actionsMenu.delete": "Удалить мастера",
|
||||||
|
"dry-wash.arm.master.schedule.empty": "Свободен",
|
||||||
|
"dry-wash.arm.master.editable.aria.cancel": "Отменить изменения",
|
||||||
|
"dry-wash.arm.master.editable.aria.save": "Сохранить изменения",
|
||||||
|
"dry-wash.arm.master.editable.aria.edit": "Редактировать",
|
||||||
|
"dry-wash.arm.master.drawer.title": "Добавить нового мастера",
|
||||||
|
"dry-wash.arm.master.drawer.inputName.label": "ФИО",
|
||||||
|
"dry-wash.arm.master.drawer.inputName.placeholder": "Введите ФИО",
|
||||||
|
"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}}"
|
||||||
|
}
|
||||||
7139
package-lock.json
generated
38
package.json
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "dry-wash-pl",
|
"name": "dry-wash",
|
||||||
"version": "0.0.0",
|
"version": "0.5.0",
|
||||||
"description": "<a id=\"readme-top\"></a>",
|
"description": "<a id=\"readme-top\"></a>",
|
||||||
"main": "./src/index.tsx",
|
"main": "./src/index.tsx",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
@@ -8,16 +8,46 @@
|
|||||||
"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.3.0",
|
"@brojs/cli": "^1.6.3",
|
||||||
|
"@chakra-ui/icons": "^2.2.4",
|
||||||
|
"@chakra-ui/react": "^2.4.2",
|
||||||
|
"@emotion/react": "^11.4.1",
|
||||||
|
"@emotion/styled": "^11.3.0",
|
||||||
|
"@fontsource/open-sans": "^5.1.0",
|
||||||
|
"@lottiefiles/react-lottie-player": "^3.5.4",
|
||||||
|
"@pbe/react-yandex-maps": "^1.2.5",
|
||||||
|
"@types/react": "^18.3.12",
|
||||||
|
"dayjs": "^1.11.13",
|
||||||
"express": "^4.21.1",
|
"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"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
BIN
remote-assets/demo.mp4
Normal file
40
src/__data__/urls.ts
Normal file
@@ -0,0 +1,40 @@
|
|||||||
|
import { generatePath } from 'react-router-dom';
|
||||||
|
import { getNavigationValue } from '@brojs/cli';
|
||||||
|
|
||||||
|
import { Order } from '../models/landing';
|
||||||
|
|
||||||
|
const getFullUrls = (url: string) =>
|
||||||
|
`${getNavigationValue('dry-wash.main')}${url}`;
|
||||||
|
|
||||||
|
export const URLs = {
|
||||||
|
landing: {
|
||||||
|
url: getNavigationValue('dry-wash.main'),
|
||||||
|
getUrl() {
|
||||||
|
return this.url;
|
||||||
|
},
|
||||||
|
},
|
||||||
|
orderCreate: {
|
||||||
|
url: getFullUrls(getNavigationValue('dry-wash.order.create')),
|
||||||
|
getUrl() {
|
||||||
|
return this.url;
|
||||||
|
},
|
||||||
|
},
|
||||||
|
orderView: {
|
||||||
|
url: getFullUrls(getNavigationValue('dry-wash.order.view')),
|
||||||
|
getUrl(orderId: Order.Id) {
|
||||||
|
return generatePath(this.url, { orderId });
|
||||||
|
},
|
||||||
|
},
|
||||||
|
armMaster: {
|
||||||
|
url: getNavigationValue('dry-wash.arm.master'),
|
||||||
|
isOn: Boolean(getNavigationValue('dry-wash.arm.master')),
|
||||||
|
},
|
||||||
|
armOrder: {
|
||||||
|
url: getNavigationValue('dry-wash.arm.order'),
|
||||||
|
isOn: Boolean(getNavigationValue('dry-wash.arm.order')),
|
||||||
|
},
|
||||||
|
armBase: {
|
||||||
|
url: getFullUrls(getNavigationValue('dry-wash.arm')),
|
||||||
|
isOn: Boolean(getNavigationValue('dry-wash.arm')),
|
||||||
|
},
|
||||||
|
};
|
||||||
104
src/api/arm.ts
Normal file
@@ -0,0 +1,104 @@
|
|||||||
|
import { getConfigValue } from '@brojs/cli';
|
||||||
|
import dayjs from 'dayjs';
|
||||||
|
|
||||||
|
enum ArmEndpoints {
|
||||||
|
ORDERS = '/arm/orders',
|
||||||
|
MASTERS = '/arm/masters',
|
||||||
|
}
|
||||||
|
|
||||||
|
const armService = () => {
|
||||||
|
const endpoint = getConfigValue('dry-wash.api');
|
||||||
|
|
||||||
|
const fetchOrders = async ({ date }: { date: Date }) => {
|
||||||
|
const startDate = dayjs(date).startOf('day').toISOString();
|
||||||
|
const endDate = dayjs(date).endOf('day').toISOString();
|
||||||
|
|
||||||
|
const response = await fetch(`${endpoint}${ArmEndpoints.ORDERS}`, {
|
||||||
|
method: 'POST',
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
},
|
||||||
|
body: JSON.stringify({ startDate, endDate }),
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new Error(`Failed to fetch orders: ${response.status}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
return await response.json();
|
||||||
|
};
|
||||||
|
|
||||||
|
const fetchMasters = async () => {
|
||||||
|
const response = await fetch(`${endpoint}${ArmEndpoints.MASTERS}`);
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new Error(`Failed to fetch masters: ${response.status}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
return await response.json();
|
||||||
|
};
|
||||||
|
|
||||||
|
const addMaster = async ({
|
||||||
|
name,
|
||||||
|
phone,
|
||||||
|
}: {
|
||||||
|
name: string;
|
||||||
|
phone: string;
|
||||||
|
}) => {
|
||||||
|
const response = await fetch(`${endpoint}${ArmEndpoints.MASTERS}`, {
|
||||||
|
method: 'POST',
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
},
|
||||||
|
body: JSON.stringify({ name, phone }),
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new Error(`Failed to fetch masters: ${response.status}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
return await response.json();
|
||||||
|
};
|
||||||
|
|
||||||
|
const deleteMaster = async ({ id }: { id: string }) => {
|
||||||
|
const response = await fetch(`${endpoint}${ArmEndpoints.MASTERS}/${id}`, {
|
||||||
|
method: 'DELETE',
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new Error(`Failed to fetch masters: ${response.status}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
return await response.json();
|
||||||
|
};
|
||||||
|
|
||||||
|
const updateMaster = async ({
|
||||||
|
id,
|
||||||
|
name,
|
||||||
|
phone,
|
||||||
|
}: {
|
||||||
|
id: string;
|
||||||
|
name?: string;
|
||||||
|
phone?: string;
|
||||||
|
}) => {
|
||||||
|
const body = JSON.stringify({ name, phone });
|
||||||
|
|
||||||
|
const response = await fetch(`${endpoint}${ArmEndpoints.MASTERS}/${id}`, {
|
||||||
|
method: 'PATCH',
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
},
|
||||||
|
body,
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new Error(`Failed to fetch update masters: ${response.status}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
return await response.json();
|
||||||
|
};
|
||||||
|
|
||||||
|
return { fetchOrders, fetchMasters, addMaster, deleteMaster, updateMaster };
|
||||||
|
};
|
||||||
|
|
||||||
|
export { armService, ArmEndpoints };
|
||||||
25
src/api/landing.ts
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
import { getConfigValue } from '@brojs/cli';
|
||||||
|
|
||||||
|
import { Order } from '../models/landing';
|
||||||
|
|
||||||
|
enum LandingEndpoints {
|
||||||
|
ORDER_VIEW = '/order'
|
||||||
|
}
|
||||||
|
|
||||||
|
const LandingService = () => {
|
||||||
|
const endpoint = getConfigValue('dry-wash.api');
|
||||||
|
|
||||||
|
const fetchOrder = async (orderId: Order.Id) => {
|
||||||
|
const response = await fetch(`${endpoint}${LandingEndpoints.ORDER_VIEW}/${orderId}`);
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new Error(`Failed to fetch order: ${response.status}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
return await response.json();
|
||||||
|
};
|
||||||
|
|
||||||
|
return { fetchOrder };
|
||||||
|
};
|
||||||
|
|
||||||
|
export { LandingService, LandingEndpoints };
|
||||||
19
src/app.tsx
@@ -1,12 +1,19 @@
|
|||||||
import React from "react";
|
import React from 'react';
|
||||||
import { BrowserRouter } from "react-router-dom";
|
import { BrowserRouter } from 'react-router-dom';
|
||||||
import Routers from "./routes";
|
import { ChakraProvider, theme as chakraTheme } from '@chakra-ui/react';
|
||||||
|
|
||||||
|
import Routers from './routes';
|
||||||
|
import ErrorBoundary from './components/ErrorBoundary';
|
||||||
|
|
||||||
const App = () => {
|
const App = () => {
|
||||||
return (
|
return (
|
||||||
<BrowserRouter>
|
<ChakraProvider theme={chakraTheme}>
|
||||||
<Routers></Routers>
|
<ErrorBoundary>
|
||||||
</BrowserRouter>
|
<BrowserRouter>
|
||||||
|
<Routers />
|
||||||
|
</BrowserRouter>
|
||||||
|
</ErrorBoundary>
|
||||||
|
</ChakraProvider>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
1
src/assets/animation/notFound.json
Normal file
14
src/assets/icons/dry-master-logo.svg
Normal file
|
After Width: | Height: | Size: 11 KiB |
1
src/assets/icons/index.ts
Normal file
@@ -0,0 +1 @@
|
|||||||
|
export { default as LogoSvg } from './dry-master-logo.svg';
|
||||||
BIN
src/assets/images/car-body-type/coupe.webp
Normal file
|
After Width: | Height: | Size: 1.9 KiB |
BIN
src/assets/images/car-body-type/crossover.webp
Normal file
|
After Width: | Height: | Size: 2.2 KiB |
BIN
src/assets/images/car-body-type/hatchback.webp
Normal file
|
After Width: | Height: | Size: 1.9 KiB |
10
src/assets/images/car-body-type/index.ts
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
export { default as CoupeImg } from './coupe.webp';
|
||||||
|
export { default as CrossoverImg } from './crossover.webp';
|
||||||
|
export { default as HatchbackImg } from './hatchback.webp';
|
||||||
|
export { default as LiftbackImg } from './liftback.webp';
|
||||||
|
export { default as MinivanImg } from './minivan.webp';
|
||||||
|
export { default as PickupImg } from './pickup.webp';
|
||||||
|
export { default as SedanImg } from './sedan.webp';
|
||||||
|
export { default as SportsCarImg } from './sports-car.webp';
|
||||||
|
export { default as StationWagonImg } from './station-wagon.webp';
|
||||||
|
export { default as SuvImg } from './suv.webp';
|
||||||
BIN
src/assets/images/car-body-type/liftback.webp
Normal file
|
After Width: | Height: | Size: 1.7 KiB |
BIN
src/assets/images/car-body-type/minivan.webp
Normal file
|
After Width: | Height: | Size: 1.9 KiB |
BIN
src/assets/images/car-body-type/pickup.webp
Normal file
|
After Width: | Height: | Size: 2.0 KiB |
BIN
src/assets/images/car-body-type/sedan.webp
Normal file
|
After Width: | Height: | Size: 1.8 KiB |
BIN
src/assets/images/car-body-type/sports-car.webp
Normal file
|
After Width: | Height: | Size: 1.9 KiB |
BIN
src/assets/images/car-body-type/station-wagon.webp
Normal file
|
After Width: | Height: | Size: 1.9 KiB |
BIN
src/assets/images/car-body-type/suv.webp
Normal file
|
After Width: | Height: | Size: 2.0 KiB |
BIN
src/assets/images/demo-video-poster.webp
Normal file
|
After Width: | Height: | Size: 51 KiB |
2
src/assets/images/index.ts
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
export * from './car-body-type';
|
||||||
|
export { default as DemoVideoPosterImg } from './demo-video-poster.webp';
|
||||||
31
src/components/DateNavigator/DateNavigator.tsx
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
import React from 'react';
|
||||||
|
import { Box, Button, Text } from '@chakra-ui/react';
|
||||||
|
import { ArrowBackIcon, ArrowForwardIcon } from '@chakra-ui/icons';
|
||||||
|
|
||||||
|
interface DateNavigatorProps {
|
||||||
|
currentDate: Date;
|
||||||
|
onPreviousDate: () => void;
|
||||||
|
onNextDate: () => void;
|
||||||
|
}
|
||||||
|
|
||||||
|
const DateNavigator = ({
|
||||||
|
currentDate,
|
||||||
|
onPreviousDate,
|
||||||
|
onNextDate,
|
||||||
|
}: DateNavigatorProps) => {
|
||||||
|
return (
|
||||||
|
<Box display='flex' alignItems='center' justifyContent='flex-start' mb='5'>
|
||||||
|
<Button onClick={onPreviousDate}>
|
||||||
|
<ArrowBackIcon />
|
||||||
|
</Button>
|
||||||
|
<Text mx='4' fontSize='lg' fontWeight='bold'>
|
||||||
|
{currentDate.toLocaleDateString()}
|
||||||
|
</Text>
|
||||||
|
<Button onClick={onNextDate}>
|
||||||
|
<ArrowForwardIcon />
|
||||||
|
</Button>
|
||||||
|
</Box>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default DateNavigator;
|
||||||
1
src/components/DateNavigator/index.ts
Normal file
@@ -0,0 +1 @@
|
|||||||
|
export { default } from './DateNavigator';
|
||||||
119
src/components/Editable/Editable.tsx
Normal file
@@ -0,0 +1,119 @@
|
|||||||
|
import React, { useState } from 'react';
|
||||||
|
import {
|
||||||
|
Editable,
|
||||||
|
EditableInput,
|
||||||
|
EditablePreview,
|
||||||
|
Flex,
|
||||||
|
IconButton,
|
||||||
|
Input,
|
||||||
|
useEditableControls,
|
||||||
|
ButtonGroup,
|
||||||
|
Stack,
|
||||||
|
useToast,
|
||||||
|
} from '@chakra-ui/react';
|
||||||
|
import { CheckIcon, CloseIcon, EditIcon } from '@chakra-ui/icons';
|
||||||
|
import { useTranslation } from 'react-i18next';
|
||||||
|
|
||||||
|
interface EditableWrapperProps {
|
||||||
|
value: string;
|
||||||
|
onSubmit: ({
|
||||||
|
id,
|
||||||
|
name,
|
||||||
|
phone,
|
||||||
|
}: {
|
||||||
|
id: string;
|
||||||
|
name?: string;
|
||||||
|
phone?: string;
|
||||||
|
}) => Promise<unknown>;
|
||||||
|
as: 'phone' | 'name';
|
||||||
|
id: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
const EditableWrapper = ({ value, onSubmit, as, id }: EditableWrapperProps) => {
|
||||||
|
const { t } = useTranslation('~', {
|
||||||
|
keyPrefix: 'dry-wash.arm.master.editable',
|
||||||
|
});
|
||||||
|
|
||||||
|
const toast = useToast();
|
||||||
|
const [currentValue, setCurrentValue] = useState<string>(value);
|
||||||
|
|
||||||
|
const handleSubmit = async (newValue: string) => {
|
||||||
|
if (currentValue === newValue) return;
|
||||||
|
|
||||||
|
try {
|
||||||
|
await onSubmit({ id, [as]: newValue });
|
||||||
|
|
||||||
|
setCurrentValue(newValue);
|
||||||
|
|
||||||
|
toast({
|
||||||
|
title: 'Успешно!',
|
||||||
|
description: 'Данные обновлены.',
|
||||||
|
status: 'success',
|
||||||
|
duration: 2000,
|
||||||
|
isClosable: true,
|
||||||
|
position: 'top-right',
|
||||||
|
});
|
||||||
|
} catch (error) {
|
||||||
|
toast({
|
||||||
|
title: 'Ошибка!',
|
||||||
|
description: 'Не удалось обновить данные.',
|
||||||
|
status: 'error',
|
||||||
|
duration: 2000,
|
||||||
|
isClosable: true,
|
||||||
|
position: 'top-right',
|
||||||
|
});
|
||||||
|
console.error('Ошибка при обновлении данных:', error);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
function EditableControls() {
|
||||||
|
const {
|
||||||
|
isEditing,
|
||||||
|
getSubmitButtonProps,
|
||||||
|
getCancelButtonProps,
|
||||||
|
getEditButtonProps,
|
||||||
|
} = useEditableControls();
|
||||||
|
|
||||||
|
return isEditing ? (
|
||||||
|
<ButtonGroup justifyContent='center' size='sm'>
|
||||||
|
<IconButton
|
||||||
|
aria-label={t('aria.save')}
|
||||||
|
icon={<CheckIcon />}
|
||||||
|
{...getSubmitButtonProps()}
|
||||||
|
/>
|
||||||
|
<IconButton
|
||||||
|
aria-label={t('aria.cancel')}
|
||||||
|
icon={<CloseIcon />}
|
||||||
|
{...getCancelButtonProps()}
|
||||||
|
/>
|
||||||
|
</ButtonGroup>
|
||||||
|
) : (
|
||||||
|
<Flex justifyContent='center'>
|
||||||
|
<IconButton
|
||||||
|
aria-label={t('aria.edit')}
|
||||||
|
size='sm'
|
||||||
|
icon={<EditIcon />}
|
||||||
|
{...getEditButtonProps()}
|
||||||
|
/>
|
||||||
|
</Flex>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Editable
|
||||||
|
textAlign='center'
|
||||||
|
defaultValue={currentValue}
|
||||||
|
fontSize='2xl'
|
||||||
|
isPreviewFocusable={false}
|
||||||
|
onSubmit={handleSubmit}
|
||||||
|
>
|
||||||
|
<Stack direction={['column', 'row']} spacing='15px'>
|
||||||
|
<EditablePreview />
|
||||||
|
<Input as={EditableInput} />
|
||||||
|
<EditableControls />
|
||||||
|
</Stack>
|
||||||
|
</Editable>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default EditableWrapper;
|
||||||
65
src/components/ErrorBoundary/ErrorBoundary.tsx
Normal file
@@ -0,0 +1,65 @@
|
|||||||
|
import React, { Component, ErrorInfo, ReactNode } from 'react';
|
||||||
|
import { Heading, Text, Button, Center, VStack } from '@chakra-ui/react';
|
||||||
|
import i18next from 'i18next';
|
||||||
|
|
||||||
|
interface ErrorBoundaryState {
|
||||||
|
hasError: boolean;
|
||||||
|
error: Error | null;
|
||||||
|
errorInfo: ErrorInfo | null;
|
||||||
|
}
|
||||||
|
|
||||||
|
interface ErrorBoundaryProps {
|
||||||
|
children: ReactNode;
|
||||||
|
}
|
||||||
|
|
||||||
|
class ErrorBoundary extends Component<ErrorBoundaryProps, ErrorBoundaryState> {
|
||||||
|
constructor(props: ErrorBoundaryProps) {
|
||||||
|
super(props);
|
||||||
|
this.state = {
|
||||||
|
hasError: false,
|
||||||
|
error: null,
|
||||||
|
errorInfo: null,
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
static getDerivedStateFromError(): Partial<ErrorBoundaryState> {
|
||||||
|
return { hasError: true };
|
||||||
|
}
|
||||||
|
|
||||||
|
componentDidCatch(error: Error, errorInfo: ErrorInfo): void {
|
||||||
|
console.error('Error caught by ErrorBoundary:', error, errorInfo);
|
||||||
|
this.setState({ error, errorInfo });
|
||||||
|
}
|
||||||
|
|
||||||
|
render() {
|
||||||
|
const { hasError } = this.state;
|
||||||
|
//TODO: добавить анимацию после залива 404 страницы
|
||||||
|
//TODO: может сделать обертку для хука, чтоб язык менялся без перезагрузки
|
||||||
|
if (hasError) {
|
||||||
|
return (
|
||||||
|
<Center minH='100vh'>
|
||||||
|
<VStack spacing={4} textAlign='center'>
|
||||||
|
<Heading as='h1' size='2xl'>
|
||||||
|
{i18next.t('~:dry-wash.errorBoundary.title')}
|
||||||
|
</Heading>
|
||||||
|
<Text fontSize='lg'>
|
||||||
|
{i18next.t('~:dry-wash.errorBoundary.description')}
|
||||||
|
</Text>
|
||||||
|
<Button
|
||||||
|
colorScheme='teal'
|
||||||
|
size='lg'
|
||||||
|
variant='outline'
|
||||||
|
onClick={() => window.location.reload()}
|
||||||
|
>
|
||||||
|
{i18next.t('~:dry-wash.errorBoundary.button.reload')}
|
||||||
|
</Button>
|
||||||
|
</VStack>
|
||||||
|
</Center>
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
return this.props.children;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
export default ErrorBoundary;
|
||||||
1
src/components/ErrorBoundary/index.ts
Normal file
@@ -0,0 +1 @@
|
|||||||
|
export { default } from './ErrorBoundary';
|
||||||
37
src/components/LayoutArm/LayoutArm.tsx
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
import { Box, Flex } from '@chakra-ui/react';
|
||||||
|
import React from 'react';
|
||||||
|
import { Navigate, Route, Routes } from 'react-router-dom';
|
||||||
|
|
||||||
|
import Sidebar from '../Sidebar';
|
||||||
|
import Orders from '../Orders';
|
||||||
|
import Masters from '../Masters';
|
||||||
|
import { 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
src/components/LayoutArm/index.ts
Normal file
@@ -0,0 +1 @@
|
|||||||
|
export { default } from './LayoutArm';
|
||||||
61
src/components/MasterActionsMenu/MasterActionsMenu.tsx
Normal file
@@ -0,0 +1,61 @@
|
|||||||
|
import React from 'react';
|
||||||
|
import {
|
||||||
|
Menu,
|
||||||
|
MenuButton,
|
||||||
|
MenuList,
|
||||||
|
MenuItem,
|
||||||
|
IconButton,
|
||||||
|
useToast,
|
||||||
|
} from '@chakra-ui/react';
|
||||||
|
import { EditIcon } from '@chakra-ui/icons';
|
||||||
|
import { useTranslation } from 'react-i18next';
|
||||||
|
|
||||||
|
import { armService } from '../../api/arm';
|
||||||
|
|
||||||
|
interface MasterActionsMenu {
|
||||||
|
id: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
const MasterActionsMenu = ({ id }: MasterActionsMenu) => {
|
||||||
|
const { t } = useTranslation('~', {
|
||||||
|
keyPrefix: 'dry-wash.arm.master.table.actionsMenu',
|
||||||
|
});
|
||||||
|
|
||||||
|
const { deleteMaster } = armService();
|
||||||
|
const toast = useToast();
|
||||||
|
|
||||||
|
const handleClickDelete = async () => {
|
||||||
|
try {
|
||||||
|
await deleteMaster({ id });
|
||||||
|
toast({
|
||||||
|
title: 'Мастер удалён.',
|
||||||
|
description: `Мастер с ID "${id}" успешно удалён.`,
|
||||||
|
status: 'success',
|
||||||
|
duration: 5000,
|
||||||
|
isClosable: true,
|
||||||
|
position: 'top-right',
|
||||||
|
});
|
||||||
|
} catch (error) {
|
||||||
|
toast({
|
||||||
|
title: 'Ошибка удаления мастера.',
|
||||||
|
description: 'Не удалось удалить мастера. Попробуйте ещё раз.',
|
||||||
|
status: 'error',
|
||||||
|
duration: 5000,
|
||||||
|
isClosable: true,
|
||||||
|
position: 'top-right',
|
||||||
|
});
|
||||||
|
console.error(error);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Menu>
|
||||||
|
<MenuButton icon={<EditIcon />} as={IconButton} variant='outline' />
|
||||||
|
<MenuList>
|
||||||
|
<MenuItem onClick={handleClickDelete}>{t('delete')}</MenuItem>
|
||||||
|
</MenuList>
|
||||||
|
</Menu>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default MasterActionsMenu;
|
||||||
1
src/components/MasterActionsMenu/index.ts
Normal file
@@ -0,0 +1 @@
|
|||||||
|
export { default } from './MasterActionsMenu';
|
||||||
111
src/components/MasterDrawer/MasterDrawer.tsx
Normal file
@@ -0,0 +1,111 @@
|
|||||||
|
import React, { useState } from 'react';
|
||||||
|
import {
|
||||||
|
Button,
|
||||||
|
FormControl,
|
||||||
|
FormLabel,
|
||||||
|
Input,
|
||||||
|
Drawer,
|
||||||
|
DrawerBody,
|
||||||
|
DrawerCloseButton,
|
||||||
|
DrawerContent,
|
||||||
|
DrawerFooter,
|
||||||
|
DrawerHeader,
|
||||||
|
DrawerOverlay,
|
||||||
|
useToast,
|
||||||
|
InputGroup,
|
||||||
|
InputLeftElement,
|
||||||
|
} from '@chakra-ui/react';
|
||||||
|
import { useTranslation } from 'react-i18next';
|
||||||
|
import { PhoneIcon } from '@chakra-ui/icons';
|
||||||
|
|
||||||
|
import { armService } from '../../api/arm';
|
||||||
|
|
||||||
|
const MasterDrawer = ({ isOpen, onClose }) => {
|
||||||
|
const { addMaster } = armService();
|
||||||
|
const toast = useToast();
|
||||||
|
|
||||||
|
const [newMaster, setNewMaster] = useState({ name: '', phone: '' });
|
||||||
|
|
||||||
|
const handleSave = async () => {
|
||||||
|
if (newMaster.name.trim() === '' || newMaster.phone.trim() === '') {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
await addMaster(newMaster);
|
||||||
|
toast({
|
||||||
|
title: 'Мастер создан.',
|
||||||
|
description: `Мастер "${newMaster.name}" успешно добавлен.`,
|
||||||
|
status: 'success',
|
||||||
|
duration: 5000,
|
||||||
|
isClosable: true,
|
||||||
|
position: 'top-right',
|
||||||
|
});
|
||||||
|
onClose();
|
||||||
|
} catch (error) {
|
||||||
|
toast({
|
||||||
|
title: 'Ошибка при создании мастера.',
|
||||||
|
description: 'Не удалось добавить мастера. Попробуйте еще раз.',
|
||||||
|
status: 'error',
|
||||||
|
duration: 5000,
|
||||||
|
isClosable: true,
|
||||||
|
position: 'top-right',
|
||||||
|
});
|
||||||
|
console.error(error);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
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
|
||||||
|
// isInvalid
|
||||||
|
value={newMaster.name}
|
||||||
|
onChange={(e) =>
|
||||||
|
setNewMaster({ ...newMaster, name: e.target.value })
|
||||||
|
}
|
||||||
|
placeholder={t('inputName.placeholder')}
|
||||||
|
/>
|
||||||
|
</FormControl>
|
||||||
|
<FormControl>
|
||||||
|
<FormLabel>{t('inputPhone.label')}</FormLabel>
|
||||||
|
|
||||||
|
<InputGroup>
|
||||||
|
<InputLeftElement pointerEvents='none'>
|
||||||
|
<PhoneIcon color='gray.300' />
|
||||||
|
</InputLeftElement>
|
||||||
|
<Input
|
||||||
|
// isInvalid
|
||||||
|
value={newMaster.phone}
|
||||||
|
onChange={(e) =>
|
||||||
|
setNewMaster({ ...newMaster, phone: e.target.value })
|
||||||
|
}
|
||||||
|
placeholder={t('inputPhone.placeholder')}
|
||||||
|
/>
|
||||||
|
</InputGroup>
|
||||||
|
</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
src/components/MasterDrawer/index.ts
Normal file
@@ -0,0 +1 @@
|
|||||||
|
export { default } from './MasterDrawer';
|
||||||
67
src/components/MasterItem/MasterItem.tsx
Normal file
@@ -0,0 +1,67 @@
|
|||||||
|
import React from 'react';
|
||||||
|
import { Badge, Stack, Td, Tr, Text } from '@chakra-ui/react';
|
||||||
|
import { useTranslation } from 'react-i18next';
|
||||||
|
|
||||||
|
import MasterActionsMenu from '../MasterActionsMenu';
|
||||||
|
import { getTimeSlot } from '../../lib';
|
||||||
|
import EditableWrapper from '../Editable/Editable';
|
||||||
|
import { armService } from '../../api/arm';
|
||||||
|
|
||||||
|
export interface Schedule {
|
||||||
|
id: string;
|
||||||
|
startWashTime: string;
|
||||||
|
endWashTime: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export type MasterProps = {
|
||||||
|
id: string;
|
||||||
|
name: string;
|
||||||
|
phone: string;
|
||||||
|
schedule: Schedule[];
|
||||||
|
};
|
||||||
|
|
||||||
|
const MasterItem = ({ name, phone, id, schedule }) => {
|
||||||
|
const { updateMaster } = armService();
|
||||||
|
const { t } = useTranslation('~', {
|
||||||
|
keyPrefix: 'dry-wash.arm.master',
|
||||||
|
});
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Tr>
|
||||||
|
<Td>
|
||||||
|
<EditableWrapper
|
||||||
|
id={id}
|
||||||
|
as={'name'}
|
||||||
|
value={name}
|
||||||
|
onSubmit={updateMaster}
|
||||||
|
/>
|
||||||
|
</Td>
|
||||||
|
<Td>
|
||||||
|
{schedule?.length > 0 ? (
|
||||||
|
<Stack direction='row'>
|
||||||
|
{schedule?.map(({ startWashTime, endWashTime }, index: number) => (
|
||||||
|
<Badge colorScheme={'green'} key={index}>
|
||||||
|
{getTimeSlot(startWashTime, endWashTime)}
|
||||||
|
</Badge>
|
||||||
|
))}
|
||||||
|
</Stack>
|
||||||
|
) : (
|
||||||
|
<Text color='gray.500'>{t('schedule.empty')}</Text>
|
||||||
|
)}
|
||||||
|
</Td>
|
||||||
|
<Td>
|
||||||
|
<EditableWrapper
|
||||||
|
id={id}
|
||||||
|
as={'phone'}
|
||||||
|
value={phone}
|
||||||
|
onSubmit={updateMaster}
|
||||||
|
/>
|
||||||
|
</Td>
|
||||||
|
<Td>
|
||||||
|
<MasterActionsMenu id={id} />
|
||||||
|
</Td>
|
||||||
|
</Tr>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default MasterItem;
|
||||||
1
src/components/MasterItem/index.ts
Normal file
@@ -0,0 +1 @@
|
|||||||
|
export { default } from './MasterItem';
|
||||||
112
src/components/Masters/Masters.tsx
Normal file
@@ -0,0 +1,112 @@
|
|||||||
|
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
src/components/Masters/index.ts
Normal file
@@ -0,0 +1 @@
|
|||||||
|
export { default } from './Masters';
|
||||||
102
src/components/OrderItem/OrderItem.tsx
Normal file
@@ -0,0 +1,102 @@
|
|||||||
|
import React, { useState } from 'react';
|
||||||
|
import { Td, Tr, Link, Select } from '@chakra-ui/react';
|
||||||
|
import { useTranslation } from 'react-i18next';
|
||||||
|
import dayjs from 'dayjs';
|
||||||
|
|
||||||
|
import { MasterProps } from '../MasterItem/MasterItem';
|
||||||
|
import { getTimeSlot } from '../../lib';
|
||||||
|
|
||||||
|
const statuses = [
|
||||||
|
'pending' as const,
|
||||||
|
'progress' as const,
|
||||||
|
'working' as const,
|
||||||
|
'canceled' as const,
|
||||||
|
'complete' as const,
|
||||||
|
];
|
||||||
|
|
||||||
|
type GetArrItemType<ArrType> =
|
||||||
|
ArrType extends Array<infer ItemType> ? ItemType : never;
|
||||||
|
|
||||||
|
export type OrderProps = {
|
||||||
|
carNumber?: string;
|
||||||
|
startWashTime?: string;
|
||||||
|
endWashTime?: string;
|
||||||
|
orderDate?: string;
|
||||||
|
status?: GetArrItemType<typeof statuses>;
|
||||||
|
phone?: string;
|
||||||
|
location?: string;
|
||||||
|
master: MasterProps;
|
||||||
|
notes: '';
|
||||||
|
allMasters: MasterProps[];
|
||||||
|
};
|
||||||
|
|
||||||
|
type Status = (typeof statuses)[number];
|
||||||
|
|
||||||
|
const statusColors: Record<Status, string> = {
|
||||||
|
pending: 'yellow.100',
|
||||||
|
progress: 'blue.100',
|
||||||
|
working: 'orange.100',
|
||||||
|
canceled: 'red.100',
|
||||||
|
complete: 'green.100',
|
||||||
|
};
|
||||||
|
|
||||||
|
const OrderItem = ({
|
||||||
|
carNumber,
|
||||||
|
startWashTime,
|
||||||
|
endWashTime,
|
||||||
|
orderDate,
|
||||||
|
status,
|
||||||
|
phone,
|
||||||
|
location,
|
||||||
|
master,
|
||||||
|
allMasters,
|
||||||
|
}: OrderProps) => {
|
||||||
|
const { t } = useTranslation('~', {
|
||||||
|
keyPrefix: 'dry-wash.arm.order',
|
||||||
|
});
|
||||||
|
|
||||||
|
const [statusSelect, setStatus] = useState(status);
|
||||||
|
const bgColor = statusColors[statusSelect];
|
||||||
|
const [masterSelect, setMaster] = useState(master?.name);
|
||||||
|
|
||||||
|
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`)}
|
||||||
|
bg={bgColor}
|
||||||
|
>
|
||||||
|
{statuses.map((status) => (
|
||||||
|
<option key={status} value={status}>
|
||||||
|
{t(`status.${status}`)}
|
||||||
|
</option>
|
||||||
|
))}
|
||||||
|
</Select>
|
||||||
|
</Td>
|
||||||
|
<Td>
|
||||||
|
<Select
|
||||||
|
value={masterSelect}
|
||||||
|
onChange={(e) => setMaster(e.target.value as OrderProps['status'])}
|
||||||
|
placeholder={t(`status.placeholder`)}
|
||||||
|
>
|
||||||
|
{allMasters.map((item) => (
|
||||||
|
<option key={item.id} value={item.name}>
|
||||||
|
{item.name}
|
||||||
|
</option>
|
||||||
|
))}
|
||||||
|
</Select>
|
||||||
|
</Td>
|
||||||
|
<Td>
|
||||||
|
<Link href='tel:'>{phone}</Link>
|
||||||
|
</Td>
|
||||||
|
<Td>{location}</Td>
|
||||||
|
</Tr>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default OrderItem;
|
||||||
1
src/components/OrderItem/index.ts
Normal file
@@ -0,0 +1 @@
|
|||||||
|
export { default } from './OrderItem';
|
||||||
137
src/components/Orders/Orders.tsx
Normal file
@@ -0,0 +1,137 @@
|
|||||||
|
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';
|
||||||
|
import { MasterProps } from '../MasterItem/MasterItem';
|
||||||
|
|
||||||
|
const TABLE_HEADERS = [
|
||||||
|
'carNumber' as const,
|
||||||
|
'washingTime' as const,
|
||||||
|
'orderDate' as const,
|
||||||
|
'status' as const,
|
||||||
|
'masters' as const,
|
||||||
|
'telephone' as const,
|
||||||
|
'location' as const,
|
||||||
|
];
|
||||||
|
|
||||||
|
const Orders = () => {
|
||||||
|
const { t } = useTranslation('~', {
|
||||||
|
keyPrefix: 'dry-wash.arm.order',
|
||||||
|
});
|
||||||
|
|
||||||
|
const { fetchOrders } = armService();
|
||||||
|
const { fetchMasters } = armService();
|
||||||
|
|
||||||
|
const toast = useToast();
|
||||||
|
|
||||||
|
const [orders, setOrders] = useState<OrderProps[]>([]);
|
||||||
|
const [allMasters, setAllMasters] = useState<MasterProps[]>([]);
|
||||||
|
const [loading, setLoading] = useState(false);
|
||||||
|
const [error, setError] = useState<string | null>(null);
|
||||||
|
const [currentDate, setCurrentDate] = useState(new Date());
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
const loadData = async () => {
|
||||||
|
setLoading(true);
|
||||||
|
setError(null);
|
||||||
|
|
||||||
|
try {
|
||||||
|
const [ordersData, mastersData] = await Promise.all([
|
||||||
|
fetchOrders({ date: currentDate }),
|
||||||
|
fetchMasters(),
|
||||||
|
]);
|
||||||
|
|
||||||
|
setOrders(ordersData.body);
|
||||||
|
setAllMasters(mastersData.body);
|
||||||
|
} catch (err) {
|
||||||
|
setError(err.message);
|
||||||
|
toast({
|
||||||
|
title: t('error.title'),
|
||||||
|
status: 'error',
|
||||||
|
duration: 5000,
|
||||||
|
isClosable: true,
|
||||||
|
position: 'bottom-right',
|
||||||
|
});
|
||||||
|
} finally {
|
||||||
|
setLoading(false);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
loadData();
|
||||||
|
}, [currentDate, toast, t]);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Box p='8'>
|
||||||
|
<Heading size='lg' mb='5'>
|
||||||
|
{t('title')}
|
||||||
|
</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
|
||||||
|
allMasters={allMasters}
|
||||||
|
key={index}
|
||||||
|
{...order}
|
||||||
|
status={order.status as OrderProps['status']}
|
||||||
|
/>
|
||||||
|
))}
|
||||||
|
</Tbody>
|
||||||
|
</Table>
|
||||||
|
</Box>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
export default Orders;
|
||||||
1
src/components/Orders/index.ts
Normal file
@@ -0,0 +1 @@
|
|||||||
|
export { default } from './Orders';
|
||||||
16
src/components/PageSpinner/PageSpinner.tsx
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
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
src/components/PageSpinner/index.ts
Normal file
@@ -0,0 +1 @@
|
|||||||
|
export { PageSpinner } from './PageSpinner';
|
||||||
60
src/components/Sidebar/Sidebar.tsx
Normal file
@@ -0,0 +1,60 @@
|
|||||||
|
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
src/components/Sidebar/index.ts
Normal file
@@ -0,0 +1 @@
|
|||||||
|
export { default } from './Sidebar';
|
||||||
1
src/components/index.ts
Normal file
@@ -0,0 +1 @@
|
|||||||
|
export * from './PageSpinner';
|
||||||
34
src/components/landing/BenefitsSection/BenefitsSection.tsx
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
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>
|
||||||
|
);
|
||||||
|
};
|
||||||
16
src/components/landing/BenefitsSection/ListItem/ListItem.tsx
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
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
src/components/landing/BenefitsSection/ListItem/index.ts
Normal file
@@ -0,0 +1 @@
|
|||||||
|
export { type ListItemProps, ListItem } from './ListItem';
|
||||||
13
src/components/landing/BenefitsSection/helper.ts
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
import { IconType } from "react-icons";
|
||||||
|
import { MdEco, MdMiscellaneousServices, MdPlace, MdHandshake } from "react-icons/md";
|
||||||
|
|
||||||
|
import { ArrElement } from "../../../lib";
|
||||||
|
|
||||||
|
import { BenefitsList } from "./types";
|
||||||
|
|
||||||
|
export const iconsMap: Record<ArrElement<BenefitsList>, IconType> = {
|
||||||
|
"benefits-section.list.0": MdEco,
|
||||||
|
"benefits-section.list.1": MdMiscellaneousServices,
|
||||||
|
"benefits-section.list.2": MdPlace,
|
||||||
|
"benefits-section.list.3": MdHandshake,
|
||||||
|
};
|
||||||
2
src/components/landing/BenefitsSection/index.ts
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
export type { BenefitsSectionProps } from './types';
|
||||||
|
export { BenefitsSection } from './BenefitsSection';
|
||||||
14
src/components/landing/BenefitsSection/types.ts
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
export type BenefitsList = [
|
||||||
|
'benefits-section.list.0',
|
||||||
|
'benefits-section.list.1',
|
||||||
|
'benefits-section.list.2',
|
||||||
|
'benefits-section.list.3',
|
||||||
|
];
|
||||||
|
|
||||||
|
export type BenefitsSectionProps = {
|
||||||
|
data: {
|
||||||
|
heading: 'benefits-section.heading';
|
||||||
|
description: 'benefits-section.description';
|
||||||
|
list: BenefitsList;
|
||||||
|
};
|
||||||
|
};
|
||||||
21
src/components/landing/CtaButton/CtaButton.tsx
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
import React, { FC } from 'react';
|
||||||
|
import { useTranslation } from 'react-i18next';
|
||||||
|
import { Link as RouterLink } from 'react-router-dom';
|
||||||
|
import { ButtonProps, Button } from '@chakra-ui/react';
|
||||||
|
|
||||||
|
import { URLs } from '../../../__data__/urls';
|
||||||
|
|
||||||
|
export const CtaButton: FC<ButtonProps> = (props) => {
|
||||||
|
const { t } = useTranslation('~', { keyPrefix: 'dry-wash.landing' });
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Button
|
||||||
|
as={RouterLink}
|
||||||
|
to={URLs.orderCreate.getUrl()}
|
||||||
|
colorScheme='primary'
|
||||||
|
{...props}
|
||||||
|
>
|
||||||
|
{t('make-order-button')}
|
||||||
|
</Button>
|
||||||
|
);
|
||||||
|
};
|
||||||
1
src/components/landing/CtaButton/index.ts
Normal file
@@ -0,0 +1 @@
|
|||||||
|
export { CtaButton } from './CtaButton';
|
||||||
11
src/components/landing/Footer/Copyright/Copyright.tsx
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
import React, { FC } from 'react';
|
||||||
|
import { useTranslation } from 'react-i18next';
|
||||||
|
import { Text } from '@chakra-ui/react';
|
||||||
|
|
||||||
|
const currentYear = new Date().getFullYear();
|
||||||
|
|
||||||
|
export const Copyright: FC = () => {
|
||||||
|
const { t } = useTranslation();
|
||||||
|
|
||||||
|
return <Text color='whiteAlpha.500'>{t('dry-wash.landing.footer.copyright', { currentYear })}</Text>;
|
||||||
|
};
|
||||||
1
src/components/landing/Footer/Copyright/index.ts
Normal file
@@ -0,0 +1 @@
|
|||||||
|
export { Copyright } from './Copyright';
|
||||||
36
src/components/landing/Footer/Footer.tsx
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
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
src/components/landing/Footer/index.ts
Normal file
@@ -0,0 +1 @@
|
|||||||
|
export { Footer } from './Footer';
|
||||||
65
src/components/landing/HeroSection/HeroSection.tsx
Normal file
@@ -0,0 +1,65 @@
|
|||||||
|
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
src/components/landing/HeroSection/index.ts
Normal file
@@ -0,0 +1 @@
|
|||||||
|
export { HeroSection } from './HeroSection';
|
||||||
9
src/components/landing/HeroSection/types.ts
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
import { BoxProps } from "@chakra-ui/react";
|
||||||
|
|
||||||
|
export type HeroSectionProps = {
|
||||||
|
data: {
|
||||||
|
headline: 'hero-section.headline';
|
||||||
|
description: 'hero-section.description';
|
||||||
|
video: string;
|
||||||
|
};
|
||||||
|
} & Pick<BoxProps, 'flexShrink'>;
|
||||||
12
src/components/landing/PageSection/PageSection.tsx
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
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
src/components/landing/PageSection/index.ts
Normal file
@@ -0,0 +1 @@
|
|||||||
|
export { PageSection } from './PageSection';
|
||||||
13
src/components/landing/SiteLogo/SiteLogo.tsx
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
import React, { FC } from 'react';
|
||||||
|
import { useTranslation } from 'react-i18next';
|
||||||
|
import { Image } from '@chakra-ui/react';
|
||||||
|
|
||||||
|
import { LogoSvg } from '../../../assets/icons';
|
||||||
|
|
||||||
|
export const SiteLogo: FC = () => {
|
||||||
|
const { t } = useTranslation();
|
||||||
|
|
||||||
|
return <Image src={LogoSvg} alt={t('~:dry-wash.landing.site-logo')} w={40} />;
|
||||||
|
};
|
||||||
|
|
||||||
|
// todo: replace Image by SVG React component
|
||||||
1
src/components/landing/SiteLogo/index.ts
Normal file
@@ -0,0 +1 @@
|
|||||||
|
export { SiteLogo } from './SiteLogo';
|
||||||
@@ -0,0 +1,37 @@
|
|||||||
|
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>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
export { ReviewCard } from './ReviewCard';
|
||||||
@@ -0,0 +1,80 @@
|
|||||||
|
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>
|
||||||
|
);
|
||||||
|
};
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
export { ReviewsSlider } from './ReviewsSlider';
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
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>
|
||||||
|
);
|
||||||
|
};
|
||||||
2
src/components/landing/SocialProofSection/index.ts
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
export type { SocialProofSectionProps } from './types';
|
||||||
|
export { SocialProofSection } from './SocialProofSection';
|
||||||
5
src/components/landing/SocialProofSection/types.ts
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
export type SocialProofSectionProps = {
|
||||||
|
data: {
|
||||||
|
heading: 'social-proof-section.heading';
|
||||||
|
};
|
||||||
|
};
|
||||||
7
src/components/landing/index.ts
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
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
|
||||||
92
src/components/order-form/form/car-body/car-body-select.tsx
Normal file
@@ -0,0 +1,92 @@
|
|||||||
|
import React, { forwardRef, useState } from 'react';
|
||||||
|
import {
|
||||||
|
Input,
|
||||||
|
Image,
|
||||||
|
InputProps,
|
||||||
|
Box,
|
||||||
|
Popover,
|
||||||
|
PopoverAnchor,
|
||||||
|
PopoverContent,
|
||||||
|
PopoverBody,
|
||||||
|
List,
|
||||||
|
ListItem,
|
||||||
|
} from '@chakra-ui/react';
|
||||||
|
import { useTranslation } from 'react-i18next';
|
||||||
|
|
||||||
|
import { carBodySelectOptions } from './helper';
|
||||||
|
import { CarBodySelectOption } from './types';
|
||||||
|
|
||||||
|
export const CarBodySelect = forwardRef<HTMLInputElement, InputProps>(
|
||||||
|
function CarBodySelect(props, ref) {
|
||||||
|
const [selected, setSelected] = useState<Partial<CarBodySelectOption>>({});
|
||||||
|
const handleOptionClick = (option: CarBodySelectOption) => {
|
||||||
|
setSelected(option);
|
||||||
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
||||||
|
// @ts-ignore
|
||||||
|
props.onChange(option.value);
|
||||||
|
};
|
||||||
|
|
||||||
|
const [isDropdownOpen, setIsDropdownOpen] = useState<boolean>(false);
|
||||||
|
|
||||||
|
const { t } = useTranslation('~', {
|
||||||
|
keyPrefix: 'dry-wash.order-create.car-body-select',
|
||||||
|
});
|
||||||
|
|
||||||
|
return (
|
||||||
|
<Box width='100%'>
|
||||||
|
<Popover
|
||||||
|
isOpen={isDropdownOpen}
|
||||||
|
autoFocus={false}
|
||||||
|
placement='bottom-start'
|
||||||
|
matchWidth
|
||||||
|
>
|
||||||
|
<PopoverAnchor>
|
||||||
|
<Input
|
||||||
|
{...props}
|
||||||
|
ref={ref}
|
||||||
|
value={
|
||||||
|
selected?.labelTKey
|
||||||
|
? t(`options.${selected.labelTKey}`)
|
||||||
|
: undefined
|
||||||
|
}
|
||||||
|
readOnly
|
||||||
|
onClick={() => setIsDropdownOpen(true)}
|
||||||
|
onBlur={() => setIsDropdownOpen(false)}
|
||||||
|
placeholder={t('placeholder')}
|
||||||
|
/>
|
||||||
|
</PopoverAnchor>
|
||||||
|
<PopoverContent width='100%' maxWidth='100%'>
|
||||||
|
<PopoverBody border='1px' borderColor='gray.300' p={0}>
|
||||||
|
<List
|
||||||
|
display='grid'
|
||||||
|
gridTemplateColumns='repeat(auto-fit, minmax(150px, 1fr))'
|
||||||
|
>
|
||||||
|
{carBodySelectOptions.map((option) => (
|
||||||
|
<ListItem
|
||||||
|
key={option.value}
|
||||||
|
display='flex'
|
||||||
|
flexDirection='column'
|
||||||
|
justifyContent='flex-end'
|
||||||
|
alignItems='center'
|
||||||
|
p={2}
|
||||||
|
cursor='pointer'
|
||||||
|
_hover={{
|
||||||
|
bgColor: 'primary.50',
|
||||||
|
}}
|
||||||
|
_active={{
|
||||||
|
bgColor: 'primary.100',
|
||||||
|
}}
|
||||||
|
onClick={() => handleOptionClick(option)}
|
||||||
|
>
|
||||||
|
<Image src={option.img} />
|
||||||
|
{t(`options.${option.labelTKey}`)}
|
||||||
|
</ListItem>
|
||||||
|
))}
|
||||||
|
</List>
|
||||||
|
</PopoverBody>
|
||||||
|
</PopoverContent>
|
||||||
|
</Popover>
|
||||||
|
</Box>
|
||||||
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
72
src/components/order-form/form/car-body/helper.ts
Normal file
@@ -0,0 +1,72 @@
|
|||||||
|
import {
|
||||||
|
CoupeImg,
|
||||||
|
CrossoverImg,
|
||||||
|
HatchbackImg,
|
||||||
|
LiftbackImg,
|
||||||
|
MinivanImg,
|
||||||
|
PickupImg,
|
||||||
|
SedanImg,
|
||||||
|
SportsCarImg,
|
||||||
|
StationWagonImg,
|
||||||
|
SuvImg
|
||||||
|
} from "../../../../assets/images";
|
||||||
|
import { Car } from "../../../../models/landing";
|
||||||
|
|
||||||
|
import { CarBodySelectOption } from "./types";
|
||||||
|
|
||||||
|
export const carBodySelectOptions: CarBodySelectOption[] = [
|
||||||
|
{
|
||||||
|
value: Car.BodyStyle.SEDAN,
|
||||||
|
labelTKey: 'sedan',
|
||||||
|
img: SedanImg
|
||||||
|
},
|
||||||
|
{
|
||||||
|
value: Car.BodyStyle.HATCHBACK,
|
||||||
|
labelTKey: 'hatchback',
|
||||||
|
img: HatchbackImg
|
||||||
|
},
|
||||||
|
{
|
||||||
|
value: Car.BodyStyle.CROSSOVER,
|
||||||
|
labelTKey: 'crossover',
|
||||||
|
img: CrossoverImg
|
||||||
|
},
|
||||||
|
{
|
||||||
|
value: Car.BodyStyle.SUV,
|
||||||
|
labelTKey: 'suv',
|
||||||
|
img: SuvImg
|
||||||
|
},
|
||||||
|
{
|
||||||
|
value: Car.BodyStyle.STATION_WAGON,
|
||||||
|
labelTKey: 'station-wagon',
|
||||||
|
img: StationWagonImg
|
||||||
|
},
|
||||||
|
{
|
||||||
|
value: Car.BodyStyle.COUPE,
|
||||||
|
labelTKey: 'coupe',
|
||||||
|
img: CoupeImg
|
||||||
|
},
|
||||||
|
{
|
||||||
|
value: Car.BodyStyle.MINIVAN,
|
||||||
|
labelTKey: 'minivan',
|
||||||
|
img: MinivanImg
|
||||||
|
},
|
||||||
|
{
|
||||||
|
value: Car.BodyStyle.PICKUP,
|
||||||
|
labelTKey: 'pickup',
|
||||||
|
img: PickupImg
|
||||||
|
},
|
||||||
|
{
|
||||||
|
value: Car.BodyStyle.LIFTBACK,
|
||||||
|
labelTKey: 'liftback',
|
||||||
|
img: LiftbackImg
|
||||||
|
},
|
||||||
|
{
|
||||||
|
value: Car.BodyStyle.SPORTS_CAR,
|
||||||
|
labelTKey: 'sports-car',
|
||||||
|
img: SportsCarImg
|
||||||
|
},
|
||||||
|
{
|
||||||
|
value: Car.BodyStyle.OTHER,
|
||||||
|
labelTKey: 'other'
|
||||||
|
},
|
||||||
|
];
|
||||||
1
src/components/order-form/form/car-body/index.ts
Normal file
@@ -0,0 +1 @@
|
|||||||
|
export { CarBodySelect } from './car-body-select';
|
||||||
18
src/components/order-form/form/car-body/types.ts
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
import { Car } from "../../../../models/landing";
|
||||||
|
|
||||||
|
export type CarBodySelectOption = {
|
||||||
|
value: Car.BodyStyle;
|
||||||
|
labelTKey:
|
||||||
|
'sedan' |
|
||||||
|
'hatchback' |
|
||||||
|
'crossover' |
|
||||||
|
'suv' |
|
||||||
|
'station-wagon' |
|
||||||
|
'coupe' |
|
||||||
|
'minivan' |
|
||||||
|
'pickup' |
|
||||||
|
'liftback' |
|
||||||
|
'sports-car' |
|
||||||
|
'other';
|
||||||
|
img?: string;
|
||||||
|
};
|
||||||
23
src/components/order-form/form/car-color/car-color-input.tsx
Normal file
@@ -0,0 +1,23 @@
|
|||||||
|
import React, { forwardRef, useId } from 'react';
|
||||||
|
import { Input, InputProps } from '@chakra-ui/react';
|
||||||
|
|
||||||
|
import { CAR_COLORS } from './helper';
|
||||||
|
|
||||||
|
export const CarColorInput = forwardRef<HTMLInputElement, InputProps>(
|
||||||
|
function CarColorInput(props, ref) {
|
||||||
|
const listId = useId();
|
||||||
|
|
||||||
|
return (
|
||||||
|
<>
|
||||||
|
<Input ref={ref} list={listId} {...props} />
|
||||||
|
<datalist id={listId}>
|
||||||
|
{CAR_COLORS.map(({ code, name }) => (
|
||||||
|
<option key={code} label={name} value={code}>{name}</option>
|
||||||
|
))}
|
||||||
|
</datalist>
|
||||||
|
</>
|
||||||
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
// todo: add option color visual indication
|
||||||
34
src/components/order-form/form/car-color/helper.ts
Normal file
@@ -0,0 +1,34 @@
|
|||||||
|
export const CAR_COLORS: Record<'name' | 'code', string>[] = [
|
||||||
|
{
|
||||||
|
name: 'white',
|
||||||
|
code: '#ffffff'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'black',
|
||||||
|
code: '#000000'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'silver',
|
||||||
|
code: '#c0c0c0'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'gray',
|
||||||
|
code: '#808080'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'beige-brown',
|
||||||
|
code: '#796745'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'red',
|
||||||
|
code: '#b90000'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'blue',
|
||||||
|
code: '#003B62'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'green',
|
||||||
|
code: '#078d51'
|
||||||
|
},
|
||||||
|
];
|
||||||
1
src/components/order-form/form/car-color/index.ts
Normal file
@@ -0,0 +1 @@
|
|||||||
|
export { CarColorInput } from './car-color-input';
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
import React, { forwardRef } from 'react';
|
||||||
|
import { Input, InputProps } from '@chakra-ui/react';
|
||||||
|
|
||||||
|
import { handleInputChange } from './helper';
|
||||||
|
|
||||||
|
export const CarNumberInput = forwardRef<HTMLInputElement, InputProps>(
|
||||||
|
function CarNumberInput({ onChange, ...props }, ref) {
|
||||||
|
return (
|
||||||
|
<Input
|
||||||
|
{...props}
|
||||||
|
ref={ref}
|
||||||
|
onChange={(e) => {
|
||||||
|
const formattedValue = handleInputChange(e.target.value);
|
||||||
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
||||||
|
// @ts-ignore
|
||||||
|
onChange?.(formattedValue);
|
||||||
|
}}
|
||||||
|
maxLength={12}
|
||||||
|
/>
|
||||||
|
);
|
||||||
|
},
|
||||||
|
);
|
||||||
33
src/components/order-form/form/car-number/helper.ts
Normal file
@@ -0,0 +1,33 @@
|
|||||||
|
const VALID_LETTER = 'а|в|е|к|м|н|о|р|с|т|у|х';
|
||||||
|
|
||||||
|
const invalidCharsRe = new RegExp(`[^(${VALID_LETTER})0-9]`, 'gi');
|
||||||
|
const cleanValue = (value: string) => value.replace(invalidCharsRe, '');
|
||||||
|
|
||||||
|
const validCarNumberInputRe = new RegExp(`^([${VALID_LETTER}]{1}|$)((?:[0-9]|$)(?:[0-9]|$)(?:[0-9]|$))([${VALID_LETTER}]{1,2}|$)((?:[0-9]|$)(?:[0-9]|$)(?:[0-9]|$))$`, 'gi');
|
||||||
|
const isValidInput = (cleanedValue: string) => validCarNumberInputRe.test(cleanedValue);
|
||||||
|
|
||||||
|
const formatAsCarNumber = (cleanedValue: string) => {
|
||||||
|
return cleanedValue.replace(validCarNumberInputRe, (_, p1, p2, p3, p4) => [p1, p2, p3, p4].join(' ')).toUpperCase();
|
||||||
|
};
|
||||||
|
const getWithoutLastChar = (value: string) => value.substring(0, value.length - 1);
|
||||||
|
|
||||||
|
export const handleInputChange = (value: string | undefined | null) => {
|
||||||
|
const cleanedValue = cleanValue(value);
|
||||||
|
|
||||||
|
if (!cleanedValue) {
|
||||||
|
return '';
|
||||||
|
}
|
||||||
|
|
||||||
|
if (isValidInput(cleanedValue)) {
|
||||||
|
return formatAsCarNumber(cleanedValue).trim();
|
||||||
|
}
|
||||||
|
|
||||||
|
return getWithoutLastChar(value).trim();
|
||||||
|
};
|
||||||
|
|
||||||
|
const validCarNumberRe = new RegExp(`^[${VALID_LETTER}][0-9]{3}[${VALID_LETTER}]{2}[0-9]{2,3}$`, 'i');
|
||||||
|
|
||||||
|
export const isValidCarNumber = (value: string) => {
|
||||||
|
const cleanedValue = cleanValue(value);
|
||||||
|
return validCarNumberRe.test(cleanedValue);
|
||||||
|
};
|
||||||
2
src/components/order-form/form/car-number/index.ts
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
export { CarNumberInput } from './car-number-input';
|
||||||
|
export { isValidCarNumber } from './helper';
|
||||||
12
src/components/order-form/form/date-time/date-time.tsx
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
import React, { forwardRef } from 'react';
|
||||||
|
import { Input, InputProps } from '@chakra-ui/react';
|
||||||
|
|
||||||
|
export type DateTimeInputProps = InputProps;
|
||||||
|
|
||||||
|
export const DateTimeInput = forwardRef<HTMLInputElement, DateTimeInputProps>(
|
||||||
|
function DateTimeInput(props, ref) {
|
||||||
|
return <Input ref={ref} {...props} type='datetime-local' />;
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
// todo: apply brand styles to popover
|
||||||
1
src/components/order-form/form/date-time/index.ts
Normal file
@@ -0,0 +1 @@
|
|||||||
|
export { type DateTimeInputProps, DateTimeInput } from './date-time';
|
||||||
@@ -0,0 +1,35 @@
|
|||||||
|
import React from 'react';
|
||||||
|
import { FormControl, FormLabel, FormErrorMessage } from '@chakra-ui/react';
|
||||||
|
import { useTranslation } from 'react-i18next';
|
||||||
|
|
||||||
|
import { FormControllerFieldProps } from './types';
|
||||||
|
|
||||||
|
export const FormControllerField = ({
|
||||||
|
control,
|
||||||
|
name,
|
||||||
|
label,
|
||||||
|
isRequired,
|
||||||
|
rules,
|
||||||
|
errors,
|
||||||
|
Controller
|
||||||
|
}: FormControllerFieldProps) => {
|
||||||
|
const { t } = useTranslation('~', {
|
||||||
|
keyPrefix: 'dry-wash.order-create.form.field',
|
||||||
|
});
|
||||||
|
const fieldErrors = errors[name];
|
||||||
|
|
||||||
|
return (
|
||||||
|
<FormControl isRequired={isRequired} isInvalid={!!fieldErrors}>
|
||||||
|
<FormLabel htmlFor={name}>{label}</FormLabel>
|
||||||
|
<Controller
|
||||||
|
control={control}
|
||||||
|
name={name}
|
||||||
|
rules={{
|
||||||
|
required: isRequired && t('validation.required'),
|
||||||
|
...rules,
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
<FormErrorMessage>{fieldErrors?.message}</FormErrorMessage>
|
||||||
|
</FormControl>
|
||||||
|
);
|
||||||
|
};
|
||||||
47
src/components/order-form/form/field/form-input-field.tsx
Normal file
@@ -0,0 +1,47 @@
|
|||||||
|
import React from 'react';
|
||||||
|
import {
|
||||||
|
FormControl,
|
||||||
|
FormLabel,
|
||||||
|
FormErrorMessage,
|
||||||
|
FormHelperText,
|
||||||
|
} from '@chakra-ui/react';
|
||||||
|
import { Controller } from 'react-hook-form';
|
||||||
|
import { useTranslation } from 'react-i18next';
|
||||||
|
|
||||||
|
import { FormInputFieldProps } from './types';
|
||||||
|
|
||||||
|
export const FormInputField = ({
|
||||||
|
control,
|
||||||
|
name,
|
||||||
|
label,
|
||||||
|
isRequired,
|
||||||
|
rules,
|
||||||
|
errors,
|
||||||
|
Input,
|
||||||
|
inputProps,
|
||||||
|
help,
|
||||||
|
}: FormInputFieldProps) => {
|
||||||
|
const { t } = useTranslation('~', {
|
||||||
|
keyPrefix: 'dry-wash.order-create.form.field',
|
||||||
|
});
|
||||||
|
const fieldErrors = errors[name];
|
||||||
|
|
||||||
|
return (
|
||||||
|
<FormControl isRequired={label && isRequired} isInvalid={!!fieldErrors}>
|
||||||
|
{label && <FormLabel htmlFor={name}>{label}</FormLabel>}
|
||||||
|
<Controller
|
||||||
|
control={control}
|
||||||
|
name={name}
|
||||||
|
rules={{
|
||||||
|
required: isRequired && t('validation.required'),
|
||||||
|
...rules,
|
||||||
|
}}
|
||||||
|
render={({ field }) => (
|
||||||
|
<Input variant='filled' {...field} {...inputProps} />
|
||||||
|
)}
|
||||||
|
/>
|
||||||
|
<FormErrorMessage>{fieldErrors?.message}</FormErrorMessage>
|
||||||
|
{help && <FormHelperText>{help}</FormHelperText>}
|
||||||
|
</FormControl>
|
||||||
|
);
|
||||||
|
};
|
||||||
3
src/components/order-form/form/field/index.ts
Normal file
@@ -0,0 +1,3 @@
|
|||||||
|
export type { FormFieldProps } from './types';
|
||||||
|
export { FormInputField } from './form-input-field';
|
||||||
|
export { FormControllerField } from './form-controller-field';
|
||||||
26
src/components/order-form/form/field/types.ts
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
import { ReactElement, ReactNode } from 'react';
|
||||||
|
import { ControllerProps, ControllerRenderProps, FieldErrors } from 'react-hook-form';
|
||||||
|
import { FormLabelProps, FormControlProps, HelpTextProps, InputProps as ChakraInputProps, SelectProps as ChakraSelectProps } from '@chakra-ui/react';
|
||||||
|
|
||||||
|
import { OrderFormValues } from '../types';
|
||||||
|
|
||||||
|
export type FormFieldProps<FormValues = OrderFormValues> = {
|
||||||
|
name: ControllerProps<FormValues>['name'] & FormLabelProps['htmlFor'];
|
||||||
|
label?: FormLabelProps['children'];
|
||||||
|
errors: FieldErrors<FormValues>;
|
||||||
|
control: ControllerProps<FormValues>['control'];
|
||||||
|
isRequired?: FormControlProps['isRequired'];
|
||||||
|
rules?: ControllerProps<FormValues>['rules'];
|
||||||
|
};
|
||||||
|
|
||||||
|
type InputProps<FormValues = OrderFormValues> = Partial<ControllerRenderProps<FormValues> & ChakraInputProps & ChakraSelectProps>;
|
||||||
|
|
||||||
|
export type FormInputFieldProps<FormValues = OrderFormValues, Input = (props: InputProps<FormValues>) => ReactNode> = FormFieldProps<FormValues> & {
|
||||||
|
Input: Input;
|
||||||
|
inputProps?: InputProps<FormValues>;
|
||||||
|
help?: HelpTextProps['children'];
|
||||||
|
};
|
||||||
|
|
||||||
|
export type FormControllerFieldProps<FormValues = OrderFormValues> = FormFieldProps<FormValues> & {
|
||||||
|
Controller: (props: Pick<ControllerProps<FormValues>, 'control' | 'name' | 'rules'>) => ReactElement;
|
||||||
|
};
|
||||||
80
src/components/order-form/form/helper.ts
Normal file
@@ -0,0 +1,80 @@
|
|||||||
|
import { useTranslation } from "react-i18next";
|
||||||
|
import { getConfigValue } from '@brojs/cli';
|
||||||
|
import { InputProps, SelectProps } from "@chakra-ui/react";
|
||||||
|
import dayjs from "dayjs";
|
||||||
|
|
||||||
|
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: dayjs(availableDatetimeBegin).toISOString(),
|
||||||
|
end: dayjs(availableDatetimeEnd).toISOString(),
|
||||||
|
}
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
const endpoint = getConfigValue('dry-wash.api');
|
||||||
|
|
||||||
|
export const onSubmit = async (values: OrderFormValues) => {
|
||||||
|
const response = await fetch(`${endpoint}/order/create`, {
|
||||||
|
method: 'POST',
|
||||||
|
headers: {
|
||||||
|
'Content-Type': 'application/json',
|
||||||
|
},
|
||||||
|
body: JSON.stringify(formatFormValues(values)),
|
||||||
|
});
|
||||||
|
|
||||||
|
if (!response.ok) {
|
||||||
|
throw new Error(`Failed to create order: ${response.status}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
return await response.json();
|
||||||
|
};
|
||||||
|
|
||||||
|
export const inputCommonStyles: Partial<InputProps & SelectProps> = {
|
||||||
|
};
|
||||||
1
src/components/order-form/form/index.ts
Normal file
@@ -0,0 +1 @@
|
|||||||
|
export { OrderForm } from './order-form';
|
||||||