Compare commits

..

109 Commits

Author SHA1 Message Date
9f530204fa 0.2.0
All checks were successful
it-academy/dry-wash-pl/pipeline/head This commit looks good
2024-12-08 11:57:46 +03:00
fb3ca156fb Merge pull request 'feature/order-form' (#46) from feature/order-form into main
All checks were successful
it-academy/dry-wash-pl/pipeline/head This commit looks good
Reviewed-on: #46
2024-12-08 11:31:17 +03:00
48d076a829 Merge pull request 'feature/successJson' (#45) from feature/successJson into main
All checks were successful
it-academy/dry-wash-pl/pipeline/head This commit looks good
Reviewed-on: #45
2024-12-08 11:18:35 +03:00
e4b9aefe57 fix: add spaces
All checks were successful
it-academy/dry-wash-pl/pipeline/pr-main This commit looks good
2024-12-08 11:00:43 +03:00
RustamRu
77ea7d301e feat: order form page (#8)
All checks were successful
it-academy/dry-wash-pl/pipeline/head This commit looks good
it-academy/dry-wash-pl/pipeline/pr-main This commit looks good
2024-12-08 09:57:46 +03:00
RustamRu
93adc1fb7d add order form components (#8) 2024-12-08 09:57:18 +03:00
RustamRu
0457bf7ffc install react-hook-form, react-phone-number-input (#8) 2024-12-08 09:57:01 +03:00
RustamRu
11fe40b86d override Input, Select components styles (#8) 2024-12-08 09:56:34 +03:00
RustamRu
ab40b587ba add order form page locales (#8) 2024-12-08 09:55:59 +03:00
RustamRu
b79c957779 add order form page models, reorder landing models (#8) 2024-12-08 09:55:13 +03:00
RustamRu
440e87ef76 fix landing route names (#8) 2024-12-08 09:54:17 +03:00
0b2dae79ac feat: add stub fetch admin (#44)
Some checks failed
it-academy/dry-wash-pl/pipeline/pr-main There was a failure building this commit
it-academy/dry-wash-pl/pipeline/head There was a failure building this commit
2024-12-07 23:41:26 +03:00
RustamRu
7c157574c8 feat: extract admin (#43)
All checks were successful
it-academy/dry-wash-pl/pipeline/head This commit looks good
2024-12-01 12:17:04 +03:00
5ef0d5953d feat: add stub admin (#43)
All checks were successful
it-academy/dry-wash-pl/pipeline/head This commit looks good
2024-12-01 11:53:20 +03:00
RustamRu
6705e74ece 0.1.1
All checks were successful
it-academy/dry-wash-pl/pipeline/head This commit looks good
2024-11-26 18:31:12 +03:00
52bb3790c7 Merge pull request 'feature/landing-stubs 0.1.0 (#33)' (#34) from feature/landing-stubs into main
All checks were successful
it-academy/dry-wash-pl/pipeline/head This commit looks good
Reviewed-on: #34
Reviewed-by: Primakov Alexandr Alexandrovich <primakovpro@gmail.com>
2024-11-26 18:27:39 +03:00
RustamRu
2cf60c7b16 fix: import landingSuccessStub (#33)
All checks were successful
it-academy/dry-wash-pl/pipeline/pr-main This commit looks good
it-academy/dry-wash-pl/pipeline/head This commit looks good
2024-11-25 23:53:09 +03:00
RustamRu
d30202108c Merge branch 'feature/landing-stubs' of ssh://85.143.175.152:222/dry_wash_inc/dry-wash-pl into feature/landing-stubs
All checks were successful
it-academy/dry-wash-pl/pipeline/pr-main This commit looks good
2024-11-25 23:48:29 +03:00
RustamRu
012de3c670 feat: generate landing stub types outside (#33) 2024-11-25 23:48:25 +03:00
RustamRu
409c339b3c feat: create success stubs json with type generation (#33) 2024-11-25 23:48:25 +03:00
RustamRu
8611405edd fix: eslint imports order 2024-11-25 23:48:25 +03:00
RustamRu
407da721af feat: apply success stubs to landing content (#33) 2024-11-25 23:48:24 +03:00
RustamRu
409473413a feat: create success stubs json with type generation (#33) 2024-11-25 23:48:06 +03:00
RustamRu
823e192c51 feat: move i18n type utils to lib and describe (#33) 2024-11-25 23:48:06 +03:00
RustamRu
d4965b7aba feat: generate landing stub types outside (#33)
Some checks failed
it-academy/dry-wash-pl/pipeline/pr-main There was a failure building this commit
2024-11-25 23:39:39 +03:00
RustamRu
16b4627166 feat: create success stubs json with type generation (#33)
Some checks failed
it-academy/dry-wash-pl/pipeline/pr-main There was a failure building this commit
2024-11-25 21:30:14 +03:00
7025c1a31b Merge pull request 'feat: add sideBar active(#36)' (#41) from feature/sideBar-active into main
All checks were successful
it-academy/dry-wash-pl/pipeline/head This commit looks good
Reviewed-on: #41
Reviewed-by: Primakov Alexandr Alexandrovich <primakovpro@gmail.com>
2024-11-25 10:11:52 +03:00
2d55f26de5 Merge remote-tracking branch 'origin/feature/sideBar-active' into feature/sideBar-active
All checks were successful
it-academy/dry-wash-pl/pipeline/pr-main This commit looks good
# Conflicts:
#	src/components/Sidebar/Sidebar.tsx
2024-11-24 22:40:44 +03:00
da244adee0 fix: Update URL references and conditional checks (#36) 2024-11-24 22:37:19 +03:00
5d1a679c68 feat: add sideBar active(#36) 2024-11-24 22:31:21 +03:00
a9738c7d8a Merge pull request 'feature/stubsArm' (#40) from feature/stubsArm into main
All checks were successful
it-academy/dry-wash-pl/pipeline/head This commit looks good
Reviewed-on: #40
Reviewed-by: Primakov Alexandr Alexandrovich <primakovpro@gmail.com>
2024-11-24 19:57:51 +03:00
6442f1f407 Merge pull request 'feat: add dynamic routing (#25)' (#42) from feature/router-arm-dynamic into main
All checks were successful
it-academy/dry-wash-pl/pipeline/head This commit looks good
Reviewed-on: #42
Reviewed-by: Primakov Alexandr Alexandrovich <primakovpro@gmail.com>
2024-11-24 19:54:27 +03:00
2130532dfd feat: separation of imports MasterItem.tsx (#40)
All checks were successful
it-academy/dry-wash-pl/pipeline/pr-main This commit looks good
it-academy/dry-wash-pl/pipeline/head This commit looks good
2024-11-24 14:59:38 +03:00
3b4f5a8486 feat: separation of imports (#40)
Some checks failed
it-academy/dry-wash-pl/pipeline/pr-main There was a failure building this commit
2024-11-24 14:57:36 +03:00
b5f3838536 feat: separation of imports (#25)
All checks were successful
it-academy/dry-wash-pl/pipeline/pr-main This commit looks good
it-academy/dry-wash-pl/pipeline/head This commit looks good
2024-11-24 14:54:01 +03:00
dee3a04310 feat: add dynamic routing (#25)
Some checks failed
it-academy/dry-wash-pl/pipeline/pr-main There was a failure building this commit
it-academy/dry-wash-pl/pipeline/head There was a failure building this commit
2024-11-24 14:50:51 +03:00
acd39b1e32 feat: add format date(#40)
Some checks failed
it-academy/dry-wash-pl/pipeline/pr-main There was a failure building this commit
2024-11-24 12:08:45 +03:00
c2fad8a3ff Merge pull request 'feat: add multilingualism (#35)' (#39) from feature/i18next-multilingualism into main
All checks were successful
it-academy/dry-wash-pl/pipeline/head This commit looks good
Reviewed-on: #39
Reviewed-by: Primakov Alexandr Alexandrovich <primakovpro@gmail.com>
2024-11-24 11:22:09 +03:00
9eb0080d13 feat: add sideBar active(#36)
Some checks failed
it-academy/dry-wash-pl/pipeline/head This commit looks good
it-academy/dry-wash-pl/pipeline/pr-main There was a failure building this commit
2024-11-23 18:34:53 +03:00
920f4440e9 fix: divide the imports(#37)
All checks were successful
it-academy/dry-wash-pl/pipeline/pr-main This commit looks good
2024-11-23 15:59:21 +03:00
e374cbfdd3 feat: add stub success(#37)
Some checks failed
it-academy/dry-wash-pl/pipeline/head There was a failure building this commit
it-academy/dry-wash-pl/pipeline/pr-main There was a failure building this commit
2024-11-23 15:56:40 +03:00
0b30ce6571 feat: divide imports by types (#35)
All checks were successful
it-academy/dry-wash-pl/pipeline/pr-main This commit looks good
2024-11-23 15:37:06 +03:00
3b47e1dcdf Merge remote-tracking branch 'origin/feature/i18next-multilingualism' into feature/i18next-multilingualism
Some checks failed
it-academy/dry-wash-pl/pipeline/pr-main There was a failure building this commit
2024-11-23 15:28:44 +03:00
4e8bc2fca5 feat: add multilingualism (#35) 2024-11-23 15:27:53 +03:00
0c9663fcef feat: add multilingualism (#35)
Some checks failed
it-academy/dry-wash-pl/pipeline/pr-main There was a failure building this commit
it-academy/dry-wash-pl/pipeline/head This commit looks good
2024-11-23 15:19:44 +03:00
RustamRu
181198c0cb fix: eslint imports order 2024-11-17 18:39:31 +03:00
RustamRu
5ca3fd2613 feat: apply success stubs to landing content (#33) 2024-11-17 18:38:32 +03:00
RustamRu
0cd7ec8b22 feat: create success stubs json with type generation (#33) 2024-11-17 18:36:57 +03:00
RustamRu
66c1323f00 feat: move i18n type utils to lib and describe (#33) 2024-11-17 18:36:26 +03:00
a63304b5e4 Merge pull request 'feature/eslint-import-order' (#32) from feature/eslint-import-order into main
All checks were successful
it-academy/dry-wash-pl/pipeline/head This commit looks good
Reviewed-on: #32
Reviewed-by: Primakov Alexandr Alexandrovich <primakovpro@gmail.com>
2024-11-17 13:56:21 +03:00
RustamRu
effd9dae2d Merge branch 'feature/eslint-import-order' of ssh://85.143.175.152:222/dry_wash_inc/dry-wash-pl into feature/eslint-import-order
All checks were successful
it-academy/dry-wash-pl/pipeline/head This commit looks good
it-academy/dry-wash-pl/pipeline/pr-main This commit looks good
2024-11-17 13:46:28 +03:00
RustamRu
1787e94f8e feat: update eslint import order rule (#31) 2024-11-17 13:46:24 +03:00
RustamRu
855ec2f138 feat: update eslint import order rule
All checks were successful
it-academy/dry-wash-pl/pipeline/head This commit looks good
2024-11-17 13:43:41 +03:00
RustamRu
d15d761f1a 0.1.0
All checks were successful
it-academy/dry-wash-pl/pipeline/pr-feat/landing This commit looks good
2024-11-17 11:44:54 +03:00
05303092e2 Merge pull request 'feat/landing' (#30) from feat/landing into main
All checks were successful
it-academy/dry-wash-pl/pipeline/pr-feat/landing This commit looks good
Reviewed-on: #30
2024-11-17 11:39:24 +03:00
RustamRu
98181ff354 update brojs/cli
All checks were successful
it-academy/dry-wash-pl/pipeline/pr-main This commit looks good
2024-11-17 11:28:04 +03:00
RustamRu
5822f5f7b0 Merge remote-tracking branch 'origin/main' into feat/landing
All checks were successful
it-academy/dry-wash-pl/pipeline/head This commit looks good
it-academy/dry-wash-pl/pipeline/pr-main This commit looks good
2024-11-17 11:22:38 +03:00
RustamRu
e72736e692 Merge branch 'feat/landing' of ssh://85.143.175.152:222/dry_wash_inc/dry-wash-pl into feat/landing
All checks were successful
it-academy/dry-wash-pl/pipeline/head This commit looks good
2024-11-17 11:18:16 +03:00
RustamRu
3cdb9a997e feat: add translations to landing (#18) 2024-11-17 11:18:12 +03:00
RustamRu
425a47b33c feat: add localized review mock files (#18) 2024-11-17 11:18:12 +03:00
RustamRu
862f2ef5f5 feat: add landing translation files (#18) 2024-11-17 11:18:12 +03:00
RustamRu
7e18d765bc feat: init i18n with type hints (#18) 2024-11-17 11:18:12 +03:00
edc329c154 Merge pull request 'feature/page404' (#27) from feature/page404 into main
Some checks failed
it-academy/dry-wash-pl/pipeline/pr-feat/landing There was a failure building this commit
Reviewed-on: #27
2024-11-17 11:17:51 +03:00
5d208b1fc5 feat: delete word test(#22)
Some checks are pending
it-academy/dry-wash-pl/pipeline/pr-main Build started...
it-academy/dry-wash-pl/pipeline/head This commit looks good
2024-11-17 11:16:23 +03:00
1839136c9f feat: add not found page (#22) 2024-11-17 11:16:16 +03:00
a6ec94785a feat: test (#22) 2024-11-17 11:14:09 +03:00
18ca96bfe9 Merge pull request 'feat: add ErrorBoundary page (#23)' (#28) from feature/errorBoundary into main
Some checks failed
it-academy/dry-wash-pl/pipeline/pr-feat/landing There was a failure building this commit
Reviewed-on: #28
2024-11-17 11:07:38 +03:00
db918ba7c7 Merge pull request 'feat: add router to the arm page (#14)' (#20) from feature/router-arm into main
Some checks failed
it-academy/dry-wash-pl/pipeline/pr-feat/landing There was a failure building this commit
Reviewed-on: #20
2024-11-17 11:02:45 +03:00
RustamRu
c92c879b31 feat: add translations to landing (#18)
All checks were successful
it-academy/dry-wash-pl/pipeline/head This commit looks good
2024-11-16 22:43:51 +03:00
RustamRu
752fe72786 feat: add localized review mock files (#18) 2024-11-16 22:43:28 +03:00
RustamRu
36200382a8 feat: add landing translation files (#18) 2024-11-16 22:43:08 +03:00
RustamRu
8328ee8028 feat: init i18n with type hints (#18) 2024-11-16 22:41:32 +03:00
d1d92c63e8 feat: add ErrorBoundary page (#23)
All checks were successful
it-academy/dry-wash-pl/pipeline/head This commit looks good
it-academy/dry-wash-pl/pipeline/pr-main This commit looks good
2024-11-16 20:09:02 +03:00
RustamRu
95d26e58a3 Merge branch 'feat/landing' of ssh://85.143.175.152:222/dry_wash_inc/dry-wash-pl into feat/landing
All checks were successful
it-academy/dry-wash-pl/pipeline/head This commit looks good
2024-11-16 19:38:06 +03:00
RustamRu
bc629eabdf feat: add navigation keys and routing check (#24) 2024-11-16 19:37:50 +03:00
dedc7e1608 feat: convert link to button (#14)
All checks were successful
it-academy/dry-wash-pl/pipeline/pr-main This commit looks good
it-academy/dry-wash-pl/pipeline/head This commit looks good
2024-11-16 18:24:51 +03:00
1c8348dee5 Merge remote-tracking branch 'origin/feature/router-arm' into feature/router-arm
All checks were successful
it-academy/dry-wash-pl/pipeline/pr-main This commit looks good
# Conflicts:
#	src/components/Sidebar/Sidebar.tsx
#	src/routes.tsx
2024-11-16 17:26:22 +03:00
04e4d011ff feat: add router to the arm page (#14) 2024-11-16 17:05:21 +03:00
RustamRu
cba5beda72 feat: add navigation keys and routing check (#24)
All checks were successful
it-academy/dry-wash-pl/pipeline/head This commit looks good
2024-11-16 15:41:14 +03:00
RustamRu
3ade6f83cc Merge branch 'feat/landing' of ssh://85.143.175.152:222/dry_wash_inc/dry-wash-pl into feat/landing
All checks were successful
it-academy/dry-wash-pl/pipeline/head This commit looks good
2024-11-16 14:24:05 +03:00
RustamRu
897602c471 fix: align footer to bottom (#7) 2024-11-16 14:24:02 +03:00
RustamRu
d2b74a1467 fix: align footer to bottom (#7)
All checks were successful
it-academy/dry-wash-pl/pipeline/head This commit looks good
2024-11-10 12:34:01 +03:00
e4969938c3 Merge pull request 'feat: add i18next for arm (#17)' (#19) from feature/i18next-arm into main
All checks were successful
it-academy/dry-wash-pl/pipeline/head This commit looks good
it-academy/dry-wash-pl/pipeline/pr-feat/landing This commit looks good
Reviewed-on: #19
Reviewed-by: Primakov Alexandr Alexandrovich <primakovpro@gmail.com>
2024-11-10 12:17:54 +03:00
5fa37ad2db fix: update bro cli and delete @brojs/i18nextreactconfig (#17)
All checks were successful
it-academy/dry-wash-pl/pipeline/pr-main This commit looks good
it-academy/dry-wash-pl/pipeline/head This commit looks good
2024-11-10 12:04:15 +03:00
d7da2b5618 feat: add i18next for arm (#17)
All checks were successful
it-academy/dry-wash-pl/pipeline/pr-main This commit looks good
2024-11-10 11:54:40 +03:00
413181617b Merge pull request 'feat: landing (#7)' (#21) from feat/landing into main
All checks were successful
it-academy/dry-wash-pl/pipeline/head This commit looks good
Reviewed-on: #21
Reviewed-by: Primakov Alexandr Alexandrovich <primakovpro@gmail.com>
2024-11-10 11:50:19 +03:00
RustamRu
10854c836b feat: move demo video to remote assets (#7)
All checks were successful
it-academy/dry-wash-pl/pipeline/pr-main This commit looks good
it-academy/dry-wash-pl/pipeline/head This commit looks good
2024-11-10 11:35:39 +03:00
RustamRu
98e11704e6 rename Jenkins config file
All checks were successful
it-ac-2024/dry_wash_inc/pipeline/pr-main This commit looks good
it-academy/dry-wash-pl/pipeline/pr-main This commit looks good
2024-11-10 11:14:45 +03:00
RustamRu
1d8e9c7e90 Merge branch 'feat/landing' of ssh://85.143.175.152:222/dry_wash_inc/dry-wash-pl into feat/landing 2024-11-10 11:08:33 +03:00
RustamRu
1930333d64 add Landing page (#7) 2024-11-10 11:07:50 +03:00
RustamRu
0b47fb4a2a add Jenkins config 2024-11-10 11:04:14 +03:00
RustamRu
83f0dc77e4 add Landing routing 2024-11-10 02:48:06 +03:00
RustamRu
d713f074d9 combine Landing page 2024-11-10 02:47:48 +03:00
RustamRu
915e402647 add landing components 2024-11-10 02:47:19 +03:00
RustamRu
1c8054f7e8 add mocks 2024-11-10 02:46:56 +03:00
RustamRu
374d2d2ebe add assets 2024-11-10 02:46:08 +03:00
RustamRu
4cb3fba14a add theme config 2024-11-10 02:45:54 +03:00
116e883e91 feat: add router to the arm page (#14) 2024-11-09 19:34:12 +03:00
9b3a204657 Merge pull request 'feat: add i18next (#11)' (#16) from feature/i18next into main
Reviewed-on: #16
Reviewed-by: Rustam <kagapov.rustam@yandex.ru>
Reviewed-by: Primakov Alexandr Alexandrovich <primakovpro@gmail.com>
2024-11-06 13:44:40 +03:00
9a490bd993 feat: add i18next (#11) 2024-11-03 12:53:20 +03:00
7ff8a99505 Merge pull request 'feat: add eslint (#12)' (#15) from feature/eslint into main
Reviewed-on: #15
2024-11-03 12:28:50 +03:00
RustamRu
43c283ed0e feat: add eslint (#12) 2024-11-03 12:23:47 +03:00
660019d107 fix: delete space mocks v2 2024-11-03 11:59:10 +03:00
75c55a11fb fix: delete space mocks 2024-11-03 11:55:13 +03:00
9b2c8be1d9 fix: delete pl and space 2024-11-03 11:53:12 +03:00
52c9ecd3c8 feat: make layout, form, order pages and wizards (#6) (#13)
Reviewed-on: #13
Reviewed-by: Primakov Alexandr Alexandrovich <primakovpro@gmail.com>
Reviewed-by: Rustam <kagapov.rustam@yandex.ru>
Co-authored-by: ilnaz <237x237@gmail.com>
Co-committed-by: ilnaz <237x237@gmail.com>
2024-11-03 11:44:23 +03:00
6cf619d88e Merge pull request 'feat: add routing (#4)' (#5) from feature/routing into main
Reviewed-on: #5
2024-10-27 16:08:28 +03:00
d8d6731046 Обновить package.json 2024-10-19 12:13:03 +03:00
177bedf381 Merge pull request 'feat: project init (#2)' (#3) from feature/init into main
Reviewed-on: #3
Reviewed-by: Primakov Alexandr Alexandrovich <primakovpro@gmail.com>
Reviewed-by: Rustam <kagapov.rustam@yandex.ru>
2024-10-19 12:11:18 +03:00
130 changed files with 8785 additions and 1123 deletions

1
.gitignore vendored
View File

@@ -130,3 +130,4 @@ dist
.yarn/install-state.gz
.pnp.*
.idea

8
.prettierrc.json Normal file
View 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
View 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'
}
}
}
}

View File

@@ -45,10 +45,12 @@
### MVP1
**1. Landing**
- преимущества сервиса
- оставить заявку (редирект на Страницу оформления заказа)
**2. Страница для оформления заказа**
- форма
- номер машины (mask input)
- цвет машины
@@ -58,10 +60,12 @@
- после заполнения редирект на страницу с деталями заказа
**3. Страница с деталями заказа**
- описание заказа
- детали заказа (id, статус)
**3. АРМ оператора**
- список заказов (RUD)
- id заказа
- статус заказа (готово / не готово)
@@ -72,7 +76,6 @@
- кнопка "Добавить"
- кнопка "Удалить"
### Built With
[![React][React.js]][React-url]
@@ -103,6 +106,14 @@
<p align="right">(<a href="#readme-top">back to top</a>)</p>
## Instructions
### Stubs types generation
1. generate types with json-literal-typer (should be installed globally)
```sh
npx json-literal-typer -i <path to json> -o <path to output ts-file>
```
2. export default type from output file
<!-- PARTICIPANTS -->
## Participants

View File

@@ -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 = {
apiPath: "stubs/api",
apiPath: 'stubs/api',
webpackConfig: {
output: {
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 */
navigations: {
"dry-wash.main": "/dry-wash",
"dry-wash.create": "/order",
"dry-wash.view.order": "/order/:orderId",
"dry-wash.arm": "/arm",
'dry-wash.main': '/dry-wash',
'dry-wash.order.create': '/order',
'dry-wash.order.view': '/order/:orderId',
'dry-wash.arm.master': 'master',
'dry-wash.arm.order': 'order',
'dry-wash.arm': '/arm/*',
},
features: {
"dry-wash-pl": {
'dry-wash-pl': {
// add your features here in the format [featureName]: { value: string }
},
},
config: {
"dry-wash-pl.api": "/api",
'dry-wash.api': '/api',
},
};

48
eslint.config.mjs Normal file
View 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'
},
}
];

81
locales/en.json Normal file
View File

@@ -0,0 +1,81 @@
{
"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.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.arm.master.add": "Add",
"dry-wash.arm.order.title": "Orders",
"dry-wash.arm.order.table.empty": "Table empty",
"dry-wash.arm.order.error.title": "Error loading data",
"dry-wash.arm.order.status.progress": "In Progress",
"dry-wash.arm.order.status.complete": "Completed",
"dry-wash.arm.order.status.pending": "Pending",
"dry-wash.arm.order.status.working": "Working",
"dry-wash.arm.order.status.canceled": "Canceled",
"dry-wash.arm.order.status.placeholder": "Select Status",
"dry-wash.arm.order.table.header.carNumber": "Car Number",
"dry-wash.arm.order.table.header.washingTime": "Washing Time",
"dry-wash.arm.order.table.header.orderDate": "Order Date",
"dry-wash.arm.order.table.header.status": "Status",
"dry-wash.arm.order.table.header.telephone": "Telephone",
"dry-wash.arm.order.table.header.location": "Location",
"dry-wash.arm.master.title": "Masters",
"dry-wash.arm.master.table.header.name": "Name",
"dry-wash.arm.master.table.empty": "Table empty",
"dry-wash.arm.master.error.title": "Error loading data",
"dry-wash.arm.master.table.header.currentJob": "Current Job",
"dry-wash.arm.master.table.header.phone": "Phone",
"dry-wash.arm.master.table.header.actions": "Actions",
"dry-wash.arm.master.table.actionsMenu.delete": "Delete Master",
"dry-wash.arm.master.drawer.title": "Add New Master",
"dry-wash.arm.master.drawer.inputName.label": "Full Name",
"dry-wash.arm.master.drawer.inputName.placeholder": "Enter Full Name",
"dry-wash.arm.master.drawer.inputPhone.label": "Phone Number",
"dry-wash.arm.master.drawer.inputPhone.placeholder": "Enter Phone Number",
"dry-wash.arm.master.drawer.button.save": "Save",
"dry-wash.arm.master.drawer.button.cancel": "Cancel",
"dry-wash.arm.master.sideBar.orders": "Orders",
"dry-wash.arm.master.sideBar.master": "Masters",
"dry-wash.arm.master.sideBar.title": "Dry Master",
"dry-wash.notFound.title": "Page Not Found",
"dry-wash.notFound.description": "Unfortunately, the page you are looking for does not exist.",
"dry-wash.notFound.button.back": "Back to Home",
"dry-wash.errorBoundary.title": "Something went wrong",
"dry-wash.errorBoundary.description": "We are already working on fixing the issue",
"dry-wash.errorBoundary.button.reload": "Reload Page"
}

82
locales/ru.json Normal file
View File

@@ -0,0 +1,82 @@
{
"dry-wash.arm.master.add": "Добавить",
"dry-wash.arm.order.title": "Заказы",
"dry-wash.arm.order.status.progress": "Выполняется",
"dry-wash.arm.order.status.complete": "Завершено",
"dry-wash.arm.order.status.pending": "В ожидании",
"dry-wash.arm.order.status.working": "В работе",
"dry-wash.arm.order.status.canceled": "Отменено",
"dry-wash.arm.order.status.placeholder": "Выберите статус",
"dry-wash.arm.order.table.header.carNumber": "Номер машины",
"dry-wash.arm.order.table.header.washingTime": "Время мойки",
"dry-wash.arm.order.table.header.orderDate": "Дата заказа",
"dry-wash.arm.order.table.header.status": "Статус",
"dry-wash.arm.order.table.header.telephone": "Телефон",
"dry-wash.arm.order.table.header.location": "Расположение",
"dry-wash.arm.order.table.empty": "Список пуст",
"dry-wash.arm.order.error.title": "Ошибка при загрузке данных",
"dry-wash.arm.master.title": "Мастера",
"dry-wash.arm.master.table.empty": "Список пуст",
"dry-wash.arm.master.error.title": "Ошибка при загрузке данных",
"dry-wash.arm.master.table.header.name": "Имя",
"dry-wash.arm.master.table.header.currentJob": "Актуальная занятость",
"dry-wash.arm.master.table.header.phone": "Телефон",
"dry-wash.arm.master.table.header.actions": "Действия",
"dry-wash.arm.master.table.actionsMenu.delete": "Удалить мастера",
"dry-wash.arm.master.drawer.title": "Добавить нового мастера",
"dry-wash.arm.master.drawer.inputName.label": "ФИО",
"dry-wash.arm.master.drawer.inputName.placeholder": "Введите ФИО",
"dry-wash.arm.master.drawer.inputPhone.label": "Номер телефона",
"dry-wash.arm.master.drawer.inputPhone.placeholder": "Введите номер телефона",
"dry-wash.arm.master.drawer.button.save": "Сохранить",
"dry-wash.arm.master.drawer.button.cancel": "Отменить",
"dry-wash.arm.master.sideBar.orders": "Заказы",
"dry-wash.arm.master.sideBar.master": "Мастера",
"dry-wash.arm.master.sideBar.title": "Сухой мастер",
"dry-wash.landing.benefits-section.description": "Откройте для себя преимущества наших услуг по химчистке автомобилей",
"dry-wash.landing.benefits-section.heading": "Преимущества экологичной автомойки",
"dry-wash.landing.benefits-section.list.0": "Экологически безопасные продукты",
"dry-wash.landing.benefits-section.list.1": "Быстрое и эффективное обслуживание",
"dry-wash.landing.benefits-section.list.2": "Удобный мобильный доступ",
"dry-wash.landing.benefits-section.list.3": "Надежный и заслуживающий доверия",
"dry-wash.landing.footer.copyright": "\u00A9 {{currentYear}} DryMaster. Все права защищены",
"dry-wash.landing.footer.links.faq": "FAQ",
"dry-wash.landing.footer.links.privacy-policy": "Политика конфиденциальности",
"dry-wash.landing.footer.links.service-terms": "Условия обслуживания",
"dry-wash.landing.hero-section.description": "Ощутите максимальное удобство сухой мойки автомобилей, созданной для того, чтобы планета стала чище",
"dry-wash.landing.hero-section.headline": "Оживите свою поездку с помощью экологически чистого ухода!",
"dry-wash.landing.make-order-button": "Сделать заказ",
"dry-wash.landing.site-logo": "Логотип компании \u00ABDry Master\u00BB",
"dry-wash.landing.social-proof-section.heading": "Нас выбирают",
"dry-wash.order-create.title": "Заказать мойку",
"dry-wash.order-create.form.field.validation.required": "Это поле обязательно для заполнения",
"dry-wash.order-create.form.phone-field.label": "Номер телефона",
"dry-wash.order-create.form.phone-field.invalid": "Введите корректный номер телефона",
"dry-wash.order-create.form.car-number-field.label": "Номер автомобиля",
"dry-wash.order-create.form.car-number-field.invalid": "Введите корректный номер автомобиля",
"dry-wash.order-create.form.car-color-field.label": "Цвет автомобиля",
"dry-wash.order-create.form.car-body-field.label": "Тип кузова автомобиля",
"dry-wash.order-create.form.washing-datetime-field.label": "В какое время автомобиль доступен?",
"dry-wash.order-create.form.washing-location-field.label": "Где находится автомобиль?",
"dry-wash.order-create.form.washing-location-field.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.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}}"
}

7074
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -1,6 +1,6 @@
{
"name": "dry-wash-pl",
"version": "0.0.0",
"name": "dry-wash",
"version": "0.2.0",
"description": "<a id=\"readme-top\"></a>",
"main": "./src/index.tsx",
"scripts": {
@@ -8,16 +8,44 @@
"start": "brojs server --port=8099 --with-open-browser",
"build": "npm run clean && brojs build --dev",
"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": [],
"author": "",
"license": "ISC",
"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",
"@types/react": "^18.3.12",
"dayjs": "^1.11.13",
"express": "^4.21.1",
"framer-motion": "^6.2.8",
"i18next": "^23.16.4",
"react": "^18.3.1",
"react-dom": "^18.3.1",
"react-hook-form": "^7.53.2",
"react-i18next": "^15.1.1",
"react-icons": "^5.3.0",
"react-phone-number-input": "^3.4.9",
"react-router-dom": "^6.27.0"
},
"devDependencies": {
"@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

Binary file not shown.

40
src/__data__/urls.ts Normal file
View 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')),
},
};

34
src/api/arm.ts Normal file
View File

@@ -0,0 +1,34 @@
import { getConfigValue } from '@brojs/cli';
enum ArmEndpoints {
ORDERS = '/arm/orders',
MASTERS = '/arm/masters',
}
const armService = () => {
const endpoint = getConfigValue('dry-wash.api');
const fetchOrders = async () => {
const response = await fetch(`${endpoint}${ArmEndpoints.ORDERS}`);
if (!response.ok) {
throw new Error(`Failed to fetch orders: ${response.status}`);
}
return await response.json();
};
const fetchMasters = async () => {
const response = await fetch(`${endpoint}${ArmEndpoints.MASTERS}`);
if (!response.ok) {
throw new Error(`Failed to fetch masters: ${response.status}`);
}
return await response.json();
};
return { fetchOrders, fetchMasters };
};
export { armService, ArmEndpoints };

View File

@@ -1,12 +1,19 @@
import React from "react";
import { BrowserRouter } from "react-router-dom";
import Routers from "./routes";
import React from 'react';
import { BrowserRouter } from 'react-router-dom';
import { ChakraProvider, theme as chakraTheme } from '@chakra-ui/react';
import Routers from './routes';
import ErrorBoundary from './components/ErrorBoundary';
const App = () => {
return (
<BrowserRouter>
<Routers></Routers>
</BrowserRouter>
<ChakraProvider theme={chakraTheme}>
<ErrorBoundary>
<BrowserRouter>
<Routers />
</BrowserRouter>
</ErrorBoundary>
</ChakraProvider>
);
};

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 11 KiB

View File

@@ -0,0 +1 @@
export { default as LogoSvg } from './dry-master-logo.svg';

Binary file not shown.

After

Width:  |  Height:  |  Size: 51 KiB

View File

@@ -0,0 +1 @@
export { default as DemoVideoPosterImg } from './demo-video-poster.webp';

View 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;

View File

@@ -0,0 +1 @@
export { default } from './ErrorBoundary';

View 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;

View File

@@ -0,0 +1 @@
export { default } from './LayoutArm';

View File

@@ -0,0 +1,27 @@
import React from 'react';
import {
Menu,
MenuButton,
MenuList,
MenuItem,
IconButton,
} from '@chakra-ui/react';
import { EditIcon } from '@chakra-ui/icons';
import { useTranslation } from 'react-i18next';
const MasterActionsMenu = () => {
const { t } = useTranslation('~', {
keyPrefix: 'dry-wash.arm.master.table.actionsMenu',
});
return (
<Menu>
<MenuButton icon={<EditIcon />} as={IconButton} variant='outline' />
<MenuList>
<MenuItem>{t('delete')}</MenuItem>
</MenuList>
</Menu>
);
};
export default MasterActionsMenu;

View File

@@ -0,0 +1 @@
export { default } from './MasterActionsMenu';

View File

@@ -0,0 +1,70 @@
import React, { useState } from 'react';
import {
Button,
FormControl,
FormLabel,
Input,
Drawer,
DrawerBody,
DrawerCloseButton,
DrawerContent,
DrawerFooter,
DrawerHeader,
DrawerOverlay,
} from '@chakra-ui/react';
import { useTranslation } from 'react-i18next';
const MasterDrawer = ({ isOpen, onClose }) => {
const [newMaster, setNewMaster] = useState({ name: '', phone: '' });
const handleSave = () => {
console.log(`Сохранение мастера: ${newMaster}`);
onClose();
};
const { t } = useTranslation('~', {
keyPrefix: 'dry-wash.arm.master.drawer',
});
return (
<Drawer isOpen={isOpen} onClose={onClose} size='md'>
<DrawerOverlay />
<DrawerContent>
<DrawerCloseButton />
<DrawerHeader>{t('title')}</DrawerHeader>
<DrawerBody>
<FormControl mb='4'>
<FormLabel>{t('inputName.label')}</FormLabel>
<Input
value={newMaster.name}
onChange={(e) =>
setNewMaster({ ...newMaster, name: e.target.value })
}
placeholder={t('inputName.placeholder')}
/>
</FormControl>
<FormControl>
<FormLabel> {t('inputPhone.label')}</FormLabel>
<Input
value={newMaster.phone}
onChange={(e) =>
setNewMaster({ ...newMaster, phone: e.target.value })
}
placeholder={t('inputPhone.placeholder')}
/>
</FormControl>
</DrawerBody>
<DrawerFooter>
<Button colorScheme='teal' mr={3} onClick={handleSave}>
{t('button.save')}
</Button>
<Button variant='ghost' onClick={onClose}>
{t('button.cancel')}
</Button>
</DrawerFooter>
</DrawerContent>
</Drawer>
);
};
export default MasterDrawer;

View File

@@ -0,0 +1 @@
export { default } from './MasterDrawer';

View File

@@ -0,0 +1,43 @@
import React from 'react';
import { Badge, Link, Stack, Td, Tr } from '@chakra-ui/react';
import MasterActionsMenu from '../MasterActionsMenu';
import { getTimeSlot } from '../../lib/date-helpers';
export interface Schedule {
id: string;
startWashTime: string;
endWashTime: string;
}
export type MasterProps = {
id: string;
name: string;
schedule: Schedule[];
phone: string;
};
const MasterItem = ({ name, schedule, phone }) => {
return (
<Tr>
<Td>{name}</Td>
<Td>
<Stack direction='row'>
{schedule.map(({ startWashTime, endWashTime }, index) => (
<Badge colorScheme={'green'} key={index}>
{getTimeSlot(startWashTime, endWashTime)}
</Badge>
))}
</Stack>
</Td>
<Td>
<Link href='tel:'>{phone}</Link>
</Td>
<Td>
<MasterActionsMenu />
</Td>
</Tr>
);
};
export default MasterItem;

View File

@@ -0,0 +1 @@
export { default } from './MasterItem';

View 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;

View File

@@ -0,0 +1 @@
export { default } from './Masters';

View File

@@ -0,0 +1,70 @@
import React, { useState } from 'react';
import { Td, Tr, Link, Select } from '@chakra-ui/react';
import { useTranslation } from 'react-i18next';
import dayjs from 'dayjs';
import { getTimeSlot } from '../../lib/date-helpers';
const statuses = [
'pending' as const,
'progress' as const,
'working' as const,
'canceled' as const,
'complete' as const,
];
type GetArrItemType<ArrType> =
ArrType extends Array<infer ItemType> ? ItemType : never;
export type OrderProps = {
carNumber?: string;
startWashTime?: string;
endWashTime?: string;
orderDate?: string;
status?: GetArrItemType<typeof statuses>;
phone?: string;
location?: string;
};
const OrderItem = ({
carNumber,
startWashTime,
endWashTime,
orderDate,
status,
phone,
location,
}: OrderProps) => {
const { t } = useTranslation('~', {
keyPrefix: 'dry-wash.arm.order',
});
const [statusSelect, setStatus] = useState(status);
return (
<Tr>
<Td>{carNumber}</Td>
<Td>{getTimeSlot(startWashTime, endWashTime)}</Td>
<Td>{dayjs(orderDate).format('DD.MM.YYYY')}</Td>
<Td>
<Select
value={statusSelect}
onChange={(e) => setStatus(e.target.value as OrderProps['status'])}
placeholder={t(`status.placeholder`)}
>
{statuses.map((status) => (
<option key={status} value={status}>
{t(`status.${status}`)}
</option>
))}
</Select>
</Td>
<Td>
<Link href='tel:'>{phone}</Link>
</Td>
<Td>{location}</Td>
</Tr>
);
};
export default OrderItem;

View File

@@ -0,0 +1 @@
export { default } from './OrderItem';

View File

@@ -0,0 +1,110 @@
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 OrderItem from '../OrderItem';
import { OrderProps } from '../OrderItem/OrderItem';
import { armService } from '../../api/arm';
const TABLE_HEADERS = [
'carNumber' as const,
'washingTime' as const,
'orderDate' as const,
'status' as const,
'telephone' as const,
'location' as const,
];
const Orders = () => {
const { t } = useTranslation('~', {
keyPrefix: 'dry-wash.arm.order',
});
const { fetchOrders } = armService();
const toast = useToast();
const [orders, setOrders] = useState<OrderProps[]>([]);
const [loading, setLoading] = useState(false);
const [error, setError] = useState<string | null>(null);
useEffect(() => {
const loadOrders = async () => {
setLoading(true);
try {
const data = await fetchOrders();
setOrders(data.body);
} catch (err) {
setError(err.message);
toast({
title: t('error.title'),
status: 'error',
duration: 5000,
isClosable: true,
position: 'bottom-right',
});
} finally {
setLoading(false);
}
};
loadOrders();
}, [toast, t]);
return (
<Box p='8'>
<Heading size='lg' mb='5'>
{t('title')}
</Heading>
<Table variant='simple' colorScheme='blackAlpha'>
<Thead>
<Tr>
{TABLE_HEADERS.map((name, key) => (
<Th key={key}>{t(`table.header.${name}`)}</Th>
))}
</Tr>
</Thead>
<Tbody>
{loading && (
<Tr>
<Td colSpan={TABLE_HEADERS.length} textAlign='center' py='8'>
<Spinner size='lg' />
</Td>
</Tr>
)}
{!loading && orders.length === 0 && !error && (
<Tr>
<Td colSpan={TABLE_HEADERS.length}>
<Text>{t('table.empty')}</Text>
</Td>
</Tr>
)}
{!loading &&
!error &&
orders.map((order, index) => (
<OrderItem
key={index}
{...order}
status={order.status as OrderProps['status']}
/>
))}
</Tbody>
</Table>
</Box>
);
};
export default Orders;

View File

@@ -0,0 +1 @@
export { default } from './Orders';

View 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>
);
};

View File

@@ -0,0 +1 @@
export { PageSpinner } from './PageSpinner';

View 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;

View File

@@ -0,0 +1 @@
export { default } from './Sidebar';

1
src/components/index.ts Normal file
View File

@@ -0,0 +1 @@
export * from './PageSpinner';

View 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>
);
};

View 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>
);
};

View File

@@ -0,0 +1 @@
export { type ListItemProps, ListItem } from './ListItem';

View 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,
};

View File

@@ -0,0 +1,2 @@
export type { BenefitsSectionProps } from './types';
export { BenefitsSection } from './BenefitsSection';

View 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;
};
};

View 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>
);
};

View File

@@ -0,0 +1 @@
export { CtaButton } from './CtaButton';

View 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>;
};

View File

@@ -0,0 +1 @@
export { Copyright } from './Copyright';

View 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>
);
};

View File

@@ -0,0 +1 @@
export { Footer } from './Footer';

View 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>
);
};

View File

@@ -0,0 +1 @@
export { HeroSection } from './HeroSection';

View 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'>;

View 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>
);
};

View File

@@ -0,0 +1 @@
export { PageSection } from './PageSection';

View 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

View File

@@ -0,0 +1 @@
export { SiteLogo } from './SiteLogo';

View File

@@ -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>
);
};

View File

@@ -0,0 +1 @@
export { ReviewCard } from './ReviewCard';

View File

@@ -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>
);
};

View File

@@ -0,0 +1 @@
export { ReviewsSlider } from './ReviewsSlider';

View File

@@ -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>
);
};

View File

@@ -0,0 +1,2 @@
export type { SocialProofSectionProps } from './types';
export { SocialProofSection } from './SocialProofSection';

View File

@@ -0,0 +1,5 @@
export type SocialProofSectionProps = {
data: {
heading: 'social-proof-section.heading';
};
};

View 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

View File

@@ -0,0 +1,23 @@
import React, { forwardRef } from 'react';
import { Select, SelectProps } from '@chakra-ui/react';
import { useTranslation } from 'react-i18next';
import { carBodySelectOptions } from './helper';
export const CarBodySelect = forwardRef<HTMLSelectElement, SelectProps>(
function CarBodySelect(props, ref) {
const { t } = useTranslation('~', {
keyPrefix: 'dry-wash.order-create.car-body-select',
});
return (
<Select ref={ref} placeholder={t('placeholder')} {...props}>
{carBodySelectOptions.map(({ value, labelTKey }, i) => (
<option key={i} value={value}>
{t(`options.${labelTKey}`)}
</option>
))}
</Select>
);
},
);

View File

@@ -0,0 +1,50 @@
import { Car } from "../../../../models/landing";
import { CarBodySelectOption } from "./types";
export const carBodySelectOptions: CarBodySelectOption[] = [
{
value: Car.BodyStyle.SEDAN,
labelTKey: 'sedan'
},
{
value: Car.BodyStyle.HATCHBACK,
labelTKey: 'hatchback'
},
{
value: Car.BodyStyle.CROSSOVER,
labelTKey: 'crossover'
},
{
value: Car.BodyStyle.SUV,
labelTKey: 'suv'
},
{
value: Car.BodyStyle.STATION_WAGON,
labelTKey: 'station-wagon'
},
{
value: Car.BodyStyle.COUPE,
labelTKey: 'coupe'
},
{
value: Car.BodyStyle.MINIVAN,
labelTKey: 'minivan'
},
{
value: Car.BodyStyle.PICKUP,
labelTKey: 'pickup'
},
{
value: Car.BodyStyle.LIFTBACK,
labelTKey: 'liftback'
},
{
value: Car.BodyStyle.SPORTS_CAR,
labelTKey: 'sports-car'
},
{
value: Car.BodyStyle.OTHER,
labelTKey: 'other'
},
];

View File

@@ -0,0 +1 @@
export { CarBodySelect } from './car-body-select';

View File

@@ -0,0 +1,17 @@
import { Car } from "../../../../models/landing";
export type CarBodySelectOption = {
value: Car.BodyStyle;
labelTKey:
'sedan' |
'hatchback' |
'crossover' |
'suv' |
'station-wagon' |
'coupe' |
'minivan' |
'pickup' |
'liftback' |
'sports-car' |
'other';
};

View 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

View 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'
},
];

View File

@@ -0,0 +1 @@
export { CarColorInput } from './car-color-input';

View File

@@ -0,0 +1,22 @@
import React, { forwardRef } from 'react';
import { Input, InputProps } from '@chakra-ui/react';
import { handleInputChange } from './helper';
export const CarNumberInput = forwardRef<HTMLInputElement, InputProps>(
function CarNumberInput({ onChange, ...props }, ref) {
return (
<Input
{...props}
ref={ref}
onChange={(e) => {
const formattedValue = handleInputChange(e.target.value);
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
onChange?.(formattedValue);
}}
maxLength={8}
/>
);
},
);

View File

@@ -0,0 +1,33 @@
const VALID_LETTER = 'а|в|е|к|м|н|о|р|с|т|у|х';
const invalidCharsRe = new RegExp(`[^(${VALID_LETTER})0-9]`, 'gi');
const cleanValue = (value: string) => value.replace(invalidCharsRe, '');
const validCarNumberInputRe = new RegExp(`^([${VALID_LETTER}]{1}|$)((?:[0-9]|$)(?:[0-9]|$)(?:[0-9]|$))([${VALID_LETTER}]{1,2}|$)$`, 'gi');
const isValidInput = (cleanedValue: string) => validCarNumberInputRe.test(cleanedValue);
const formatAsCarNumber = (cleanedValue: string) => {
return cleanedValue.replace(validCarNumberInputRe, (_, p1, p2, p3) => [p1, p2, p3].join(' ')).toUpperCase();
};
const getWithoutLastChar = (value: string) => value.substring(0, value.length - 1);
export const handleInputChange = (value: string | undefined | null) => {
const cleanedValue = cleanValue(value);
if (!cleanedValue) {
return '';
}
if (isValidInput(cleanedValue)) {
return formatAsCarNumber(cleanedValue).trim();
}
return getWithoutLastChar(value).trim();
};
const validCarNumberRe = new RegExp(`^[${VALID_LETTER}][0-9]{3}[${VALID_LETTER}]{2}$`, 'i');
export const isValidCarNumber = (value: string) => {
const cleanedValue = cleanValue(value);
return validCarNumberRe.test(cleanedValue);
};

View File

@@ -0,0 +1,2 @@
export { CarNumberInput } from './car-number-input';
export { isValidCarNumber } from './helper';

View 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

View File

@@ -0,0 +1 @@
export { type DateTimeInputProps, DateTimeInput } from './date-time';

View File

@@ -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>
);
};

View 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>
);
};

View File

@@ -0,0 +1,3 @@
export type { FormFieldProps } from './types';
export { FormInputField } from './form-input-field';
export { FormControllerField } from './form-controller-field';

View 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;
};

View File

@@ -0,0 +1,67 @@
import { useTranslation } from "react-i18next";
import { InputProps, SelectProps } from "@chakra-ui/react";
import { Order } from "../../../models/landing";
import { FormFieldProps } from "./field";
import { OrderFormValues } from "./types";
import { isValidCarNumber } from "./car-number";
import { isValidPhoneNumber } from "./phone";
export const defaultValues: Partial<OrderFormValues> = {
phone: '',
carNumber: '',
carColor: '',
availableDatetimeBegin: '',
availableDatetimeEnd: '',
};
export const useGetValidationRules = () => {
const { t } = useTranslation('~', {
keyPrefix: 'dry-wash.order-create.form',
});
return {
isValidPhoneNumber: {
validate: (value: string) => isValidPhoneNumber(value) || t('phone-field.invalid')
},
isValidCarNumber: {
validate: (value: string) => isValidCarNumber(value) || t('car-number-field.invalid')
},
} satisfies Record<string, FormFieldProps['rules']>;
};
const removeAllSpaces = (str: string) => str.replace(/\s+/g, '');
const getValidCarBodyStyle = (fieldValue: string) => {
const carBodyAsNumber = Number(fieldValue);
return Number.isNaN(carBodyAsNumber) ? undefined : carBodyAsNumber;
};
export const formatFormValues = ({ phone, carNumber, carBody, carColor, carLocation, availableDatetimeBegin, availableDatetimeEnd }: OrderFormValues): Order.Create => {
return {
customer: {
phone
},
car: {
number: removeAllSpaces(carNumber),
body: getValidCarBodyStyle(carBody),
color: carColor
},
washing: {
location: carLocation,
begin: availableDatetimeBegin,
end: availableDatetimeEnd,
}
};
};
export const onSubmit = (values: OrderFormValues) => {
return new Promise((resolve) => {
console.log(formatFormValues(values));
resolve(formatFormValues(values));
});
};
export const inputCommonStyles: Partial<InputProps & SelectProps> = {
};

View File

@@ -0,0 +1 @@
export { OrderForm } from './order-form';

View File

@@ -0,0 +1,130 @@
import React, { FC } from 'react';
import { useForm } from 'react-hook-form';
import { useTranslation } from 'react-i18next';
import {
Box,
Flex,
FormControl,
FormLabel,
Input,
VStack,
} from '@chakra-ui/react';
import { CarBodySelect } from './car-body';
import { CarColorInput } from './car-color';
import { CarNumberInput } from './car-number';
import { FormInputField, FormControllerField } from './field';
import { OrderFormValues } from './types';
import { PhoneInput } from './phone';
import { SubmitButton } from './submit';
import { defaultValues, onSubmit, useGetValidationRules } from './helper';
import { DateTimeInput } from './date-time';
export const OrderForm: FC = () => {
const {
handleSubmit,
control,
formState: { errors, isSubmitting },
watch,
} = useForm<OrderFormValues>({ defaultValues, shouldFocusError: true });
const { t } = useTranslation('~', {
keyPrefix: 'dry-wash.order-create.form',
});
const RULES = useGetValidationRules();
const [availableDatetimeBegin, availableDatetimeEnd] = watch([
'availableDatetimeBegin',
'availableDatetimeEnd',
]);
return (
<Box p={4} marginInline='auto'>
<VStack
as='form'
noValidate
onSubmit={handleSubmit(onSubmit)}
align='flex-start'
gap={6}
>
<FormControllerField
control={control}
name='phone'
label={t('phone-field.label')}
isRequired
rules={RULES.isValidPhoneNumber}
errors={errors}
Controller={PhoneInput}
/>
<FormInputField
control={control}
name='carNumber'
label={t('car-number-field.label')}
isRequired
rules={RULES.isValidCarNumber}
errors={errors}
Input={CarNumberInput}
/>
<FormInputField
control={control}
name='carColor'
label={t('car-color-field.label')}
errors={errors}
Input={CarColorInput}
/>
<FormInputField
control={control}
name='carBody'
label={t('car-body-field.label')}
isRequired
errors={errors}
Input={CarBodySelect}
/>
<FormInputField
control={control}
name='carLocation'
label={t('washing-location-field.label')}
isRequired
errors={errors}
Input={Input}
help={t('washing-location-field.help')}
/>
<FormControl isRequired>
<FormLabel>{t('washing-datetime-field.label')}</FormLabel>
<Flex flexWrap='wrap' gap={4}>
<Box flex='1 0 100px'>
<FormInputField
control={control}
name='availableDatetimeBegin'
isRequired
errors={errors}
Input={DateTimeInput}
inputProps={{
max: availableDatetimeEnd,
}}
/>
</Box>
<Box flex='1 0 100px'>
<FormInputField
control={control}
name='availableDatetimeEnd'
isRequired
errors={errors}
Input={DateTimeInput}
inputProps={{
min: availableDatetimeBegin,
}}
/>
</Box>
</Flex>
</FormControl>
<SubmitButton isLoading={isSubmitting} mt={4} />
</VStack>
</Box>
);
};
// todo: remove layout shift, when a validation message is displayed
// todo: select location using an interactive map
// todo: fix time range available values

View File

@@ -0,0 +1 @@
export { isValidPhoneNumber } from "react-phone-number-input";

View File

@@ -0,0 +1,2 @@
export { PhoneInput } from './phone-input';
export { isValidPhoneNumber } from './helper';

View File

@@ -0,0 +1,18 @@
import React from 'react';
import ReactPhoneNumberInput from 'react-phone-number-input/react-hook-form-input';
import { Input } from '@chakra-ui/react';
import 'react-phone-number-input/style.css';
import { PhoneInputType } from './types';
export const PhoneInput: PhoneInputType = (props) => {
return (
<ReactPhoneNumberInput
defaultCountry='RU'
inputComponent={Input}
variant='filled'
{...props}
/>
);
};

View File

@@ -0,0 +1,7 @@
import { FieldValues } from 'react-hook-form';
import { DefaultInputComponentProps } from 'react-phone-number-input';
import { DefaultFormValues, Props } from 'react-phone-number-input/react-hook-form';
type PhoneInputProps<FormValues, InputComponentProps = DefaultInputComponentProps> = Props<InputComponentProps, FormValues>;
export type PhoneInputType = <FormValues extends FieldValues = DefaultFormValues, InputComponentProps = DefaultInputComponentProps>(props: PhoneInputProps<FormValues, InputComponentProps>) => JSX.Element;

View File

@@ -0,0 +1 @@
export { SubmitButton } from './submit-button';

View File

@@ -0,0 +1,15 @@
import React, { FC } from 'react';
import { Button, ButtonProps } from '@chakra-ui/react';
import { useTranslation } from 'react-i18next';
export const SubmitButton: FC<ButtonProps> = (props) => {
const { t } = useTranslation('~', {
keyPrefix: 'dry-wash.order-create.form.submit-button',
});
return (
<Button type='submit' colorScheme='primary' borderRadius={50} paddingInline={8} {...props}>
{t('label')}
</Button>
);
};

View File

@@ -0,0 +1,9 @@
export type OrderFormValues = {
phone: string;
carNumber: string;
carColor: string;
carBody: string;
carLocation: string;
availableDatetimeBegin: string;
availableDatetimeEnd: string;
};

View File

@@ -0,0 +1 @@
export * from './form';

View File

@@ -0,0 +1,31 @@
import React from 'react';
import { Global } from '@emotion/react';
import '@fontsource/open-sans/400.css';
import '@fontsource/open-sans/700.css';
const Fonts = () => (
<Global
styles={`
/* open-sans-cyrillic-400-normal */
@font-face {
font-family: 'Open Sans';
font-style: normal;
font-display: swap;
font-weight: 400;
src: url(./files/open-sans-cyrillic-400-normal.woff2) format('woff2'), url(./files/open-sans-cyrillic-400-normal.woff) format('woff');
unicode-range: U+0301,U+0400-045F,U+0490-0491,U+04B0-04B1,U+2116;
}
/* open-sans-cyrillic-700-normal */
@font-face {
font-family: 'Open Sans';
font-style: normal;
font-display: swap;
font-weight: 700;
src: url(./files/open-sans-cyrillic-700-normal.woff2) format('woff2'), url(./files/open-sans-cyrillic-700-normal.woff) format('woff');
unicode-range: U+0301,U+0400-045F,U+0490-0491,U+04B0-04B1,U+2116;
}
`}
/>
);
export default Fonts;

View File

@@ -0,0 +1,14 @@
import React, { FC, PropsWithChildren } from 'react';
import { ChakraProvider } from '@chakra-ui/react';
import { default as landingTheme } from './theme-config';
import Fonts from './Fonts';
export const LandingThemeProvider: FC<PropsWithChildren> = ({ children }) => {
return (
<ChakraProvider theme={landingTheme}>
<Fonts />
{children}
</ChakraProvider>
);
};

View File

@@ -0,0 +1 @@
export { LandingThemeProvider } from './LandingThemeProvider';

View File

@@ -0,0 +1,80 @@
import { extendTheme } from '@chakra-ui/react';
const overrides = {
colors: {
primary: {
50: "#F1F8ED",
100: "#D9EACC",
200: "#C0DDAC",
300: "#A8D08B",
400: "#8FC26B",
500: "#77B54A",
600: "#5F913B",
700: "#476D2C",
800: "#2F481E",
900: "#18240F"
},
secondary: {
50: "#E7F7FD",
100: "#BCEAFB",
200: "#91DCF8",
300: "#66CEF5",
400: "#3BC1F2",
500: "#0FB3F0",
600: "#0C8FC0",
700: "#096B90",
800: "#064860",
900: "#032430"
}
},
fonts: {
heading: `'Open Sans', sans-serif`,
},
styles: {
global: {
body: {
bg: 'gray.100'
}
},
},
components: {
Input: {
variants: {
filled: {
field: {
borderRadius: 12,
bgColor: 'primary.50',
color: 'primary.600',
_hover: {
borderColor: 'primary.100',
bgColor: 'primary.50',
},
_focus: {
borderColor: 'primary.200',
}
}
}
}
},
Select: {
variants: {
filled: {
field: {
borderRadius: 12,
bgColor: 'primary.50',
color: 'primary.600',
_hover: {
borderColor: 'primary.100',
bgColor: 'primary.50',
},
_focus: {
borderColor: 'primary.200',
}
}
}
}
}
}
};
export default extendTheme(overrides);

1
src/containers/index.ts Normal file
View File

@@ -0,0 +1 @@
export * from './LandingThemeProvider';

View File

@@ -1,22 +1,29 @@
/* eslint-disable @typescript-eslint/no-explicit-any */
/* eslint-disable react/display-name */
import React from 'react';
import ReactDOM from 'react-dom/client';
import App from './app';
export default () => <App/>;
let rootElement: ReactDOM.Root
export const mount = (Сomponent, element = document.getElementById('app')) => {
const rootElement = ReactDOM.createRoot(element);
rootElement.render(<Сomponent/>);
import { i18nextReactInitConfig } from '@brojs/cli';
import i18next from 'i18next';
if(module.hot) {
module.hot.accept('./app', ()=> {
rootElement.render(<Сomponent/>);
})
import App from './app';
i18next.t = i18next.t.bind(i18next);
const i18nextPromise = i18nextReactInitConfig(i18next);
export default () => <App />;
let rootElement: ReactDOM.Root;
export const mount = async (
Component,
element = document.getElementById('app'),
) => {
const rootElement = ReactDOM.createRoot(element);
await i18nextPromise;
rootElement.render(<Component />);
if (module.hot) {
module.hot.accept('./app', async () => {
await i18next.reloadResources();
rootElement.render(<Component />);
});
}
};

Some files were not shown because too many files have changed in this diff Show More