Compare commits
4 Commits
feature/te
...
feature/pl
| Author | SHA1 | Date | |
|---|---|---|---|
| 859fa4f2e1 | |||
| ad1f948641 | |||
| bd66f00b81 | |||
| 9a20c9f098 |
8
.gitignore
vendored
8
.gitignore
vendored
@@ -130,4 +130,10 @@ dist
|
|||||||
.yarn/install-state.gz
|
.yarn/install-state.gz
|
||||||
.pnp.*
|
.pnp.*
|
||||||
|
|
||||||
.idea
|
.idea
|
||||||
|
|
||||||
|
# Playwright
|
||||||
|
/test-results/
|
||||||
|
/playwright-report/
|
||||||
|
/blob-report/
|
||||||
|
/playwright/.cache/
|
||||||
|
|||||||
@@ -86,6 +86,15 @@
|
|||||||
"dry-wash.arm.master.drawer.inputPhone.placeholder": "Enter 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.save": "Save",
|
||||||
"dry-wash.arm.master.drawer.button.cancel": "Cancel",
|
"dry-wash.arm.master.drawer.button.cancel": "Cancel",
|
||||||
|
"dry-wash.arm.master.drawer.toast.create-master": "Master created",
|
||||||
|
"dry-wash.arm.master.drawer.toast.error.empty-fields": "Fields cannot be empty",
|
||||||
|
"dry-wash.arm.master.drawer.toast.error.base": "Error",
|
||||||
|
"dry-wash.arm.master.drawer.toast.error.create-master": "Error creating master",
|
||||||
|
"dry-wash.arm.master.drawer.toast.error.create-master-details": "Failed to add master. Please try again",
|
||||||
|
"dry-wash.arm.master.drawer.form.name.required": "Master name is required",
|
||||||
|
"dry-wash.arm.master.drawer.form.phone.required": "Phone number is required",
|
||||||
|
"dry-wash.arm.master.drawer.form.phone.pattern": "Invalid phone number",
|
||||||
|
"dry-wash.arm.master.drawer.form.name.minLength": "Name must contain at least 2 characters",
|
||||||
"dry-wash.arm.master.sideBar.orders": "Orders",
|
"dry-wash.arm.master.sideBar.orders": "Orders",
|
||||||
"dry-wash.arm.master.sideBar.master": "Masters",
|
"dry-wash.arm.master.sideBar.master": "Masters",
|
||||||
"dry-wash.arm.master.sideBar.title": "Dry Master",
|
"dry-wash.arm.master.sideBar.title": "Dry Master",
|
||||||
|
|||||||
@@ -36,6 +36,15 @@
|
|||||||
"dry-wash.arm.master.drawer.inputPhone.placeholder": "Введите номер телефона",
|
"dry-wash.arm.master.drawer.inputPhone.placeholder": "Введите номер телефона",
|
||||||
"dry-wash.arm.master.drawer.button.save": "Сохранить",
|
"dry-wash.arm.master.drawer.button.save": "Сохранить",
|
||||||
"dry-wash.arm.master.drawer.button.cancel": "Отменить",
|
"dry-wash.arm.master.drawer.button.cancel": "Отменить",
|
||||||
|
"dry-wash.arm.master.drawer.toast.create-master": "Мастер создан",
|
||||||
|
"dry-wash.arm.master.drawer.toast.error.empty-fields": "Поля не могут быть пустыми",
|
||||||
|
"dry-wash.arm.master.drawer.toast.error.base": "Ошибка",
|
||||||
|
"dry-wash.arm.master.drawer.toast.error.create-master": "Ошибка при создании мастера",
|
||||||
|
"dry-wash.arm.master.drawer.toast.error.create-master-details": "Не удалось добавить мастера. Попробуйте еще раз",
|
||||||
|
"dry-wash.arm.master.drawer.form.name.required": "Имя мастера обязательно",
|
||||||
|
"dry-wash.arm.master.drawer.form.phone.required": "Телефон обязателен",
|
||||||
|
"dry-wash.arm.master.drawer.form.phone.pattern": "Некорректный номер телефона",
|
||||||
|
"dry-wash.arm.master.drawer.form.name.minLength": "Имя должно содержать минимум 2 символа",
|
||||||
"dry-wash.arm.master.sideBar.orders": "Заказы",
|
"dry-wash.arm.master.sideBar.orders": "Заказы",
|
||||||
"dry-wash.arm.master.sideBar.master": "Мастера",
|
"dry-wash.arm.master.sideBar.master": "Мастера",
|
||||||
"dry-wash.arm.master.sideBar.title": "Сухой мастер",
|
"dry-wash.arm.master.sideBar.title": "Сухой мастер",
|
||||||
|
|||||||
77
package-lock.json
generated
77
package-lock.json
generated
@@ -48,7 +48,9 @@
|
|||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@eslint/js": "^9.14.0",
|
"@eslint/js": "^9.14.0",
|
||||||
|
"@playwright/test": "^1.50.1",
|
||||||
"@stylistic/eslint-plugin": "^2.10.1",
|
"@stylistic/eslint-plugin": "^2.10.1",
|
||||||
|
"@types/node": "^22.13.1",
|
||||||
"@types/react-dom": "^18.3.1",
|
"@types/react-dom": "^18.3.1",
|
||||||
"eslint": "^9.14.0",
|
"eslint": "^9.14.0",
|
||||||
"eslint-plugin-import": "^2.31.0",
|
"eslint-plugin-import": "^2.31.0",
|
||||||
@@ -3619,6 +3621,21 @@
|
|||||||
"node": ">=14"
|
"node": ">=14"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/@playwright/test": {
|
||||||
|
"version": "1.50.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.50.1.tgz",
|
||||||
|
"integrity": "sha512-Jii3aBg+CEDpgnuDxEp/h7BimHcUTDlpEtce89xEumlJ5ef2hqepZ+PWp1DDpYC/VO9fmWVI1IlEaoI5fK9FXQ==",
|
||||||
|
"dev": true,
|
||||||
|
"dependencies": {
|
||||||
|
"playwright": "1.50.1"
|
||||||
|
},
|
||||||
|
"bin": {
|
||||||
|
"playwright": "cli.js"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">=18"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/@popperjs/core": {
|
"node_modules/@popperjs/core": {
|
||||||
"version": "2.11.8",
|
"version": "2.11.8",
|
||||||
"resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz",
|
"resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz",
|
||||||
@@ -4003,12 +4020,11 @@
|
|||||||
"integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA=="
|
"integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA=="
|
||||||
},
|
},
|
||||||
"node_modules/@types/node": {
|
"node_modules/@types/node": {
|
||||||
"version": "22.9.0",
|
"version": "22.13.1",
|
||||||
"resolved": "https://registry.npmjs.org/@types/node/-/node-22.9.0.tgz",
|
"resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.1.tgz",
|
||||||
"integrity": "sha512-vuyHg81vvWA1Z1ELfvLko2c8f34gyA0zaic0+Rllc5lbCnbSyuvb2Oxpm6TAUAC/2xZN3QGqxBNggD1nNR2AfQ==",
|
"integrity": "sha512-jK8uzQlrvXqEU91UxiK5J7pKHyzgnI1Qnl0QDHIgVGuolJhRb9EEl28Cj9b3rGR8B2lhFCtvIm5os8lFnO/1Ew==",
|
||||||
"license": "MIT",
|
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"undici-types": "~6.19.8"
|
"undici-types": "~6.20.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@types/parse-json": {
|
"node_modules/@types/parse-json": {
|
||||||
@@ -12110,6 +12126,50 @@
|
|||||||
"node": ">=4"
|
"node": ">=4"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/playwright": {
|
||||||
|
"version": "1.50.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/playwright/-/playwright-1.50.1.tgz",
|
||||||
|
"integrity": "sha512-G8rwsOQJ63XG6BbKj2w5rHeavFjy5zynBA9zsJMMtBoe/Uf757oG12NXz6e6OirF7RCrTVAKFXbLmn1RbL7Qaw==",
|
||||||
|
"dev": true,
|
||||||
|
"dependencies": {
|
||||||
|
"playwright-core": "1.50.1"
|
||||||
|
},
|
||||||
|
"bin": {
|
||||||
|
"playwright": "cli.js"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">=18"
|
||||||
|
},
|
||||||
|
"optionalDependencies": {
|
||||||
|
"fsevents": "2.3.2"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/playwright-core": {
|
||||||
|
"version": "1.50.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.50.1.tgz",
|
||||||
|
"integrity": "sha512-ra9fsNWayuYumt+NiM069M6OkcRb1FZSK8bgi66AtpFoWkg2+y0bJSNmkFrWhMbEBbVKC/EruAHH3g0zmtwGmQ==",
|
||||||
|
"dev": true,
|
||||||
|
"bin": {
|
||||||
|
"playwright-core": "cli.js"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">=18"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/playwright/node_modules/fsevents": {
|
||||||
|
"version": "2.3.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz",
|
||||||
|
"integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==",
|
||||||
|
"dev": true,
|
||||||
|
"hasInstallScript": true,
|
||||||
|
"optional": true,
|
||||||
|
"os": [
|
||||||
|
"darwin"
|
||||||
|
],
|
||||||
|
"engines": {
|
||||||
|
"node": "^8.16.0 || ^10.6.0 || >=11.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/popmotion": {
|
"node_modules/popmotion": {
|
||||||
"version": "11.0.3",
|
"version": "11.0.3",
|
||||||
"resolved": "https://registry.npmjs.org/popmotion/-/popmotion-11.0.3.tgz",
|
"resolved": "https://registry.npmjs.org/popmotion/-/popmotion-11.0.3.tgz",
|
||||||
@@ -14382,10 +14442,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/undici-types": {
|
"node_modules/undici-types": {
|
||||||
"version": "6.19.8",
|
"version": "6.20.0",
|
||||||
"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.19.8.tgz",
|
"resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
|
||||||
"integrity": "sha512-ve2KP6f/JnbPBFyobGHuerC9g1FYGn/F8n1LWTwNxCEzd6IfqTwUQcNXgEtmmQ6DlRrC1hrSrBnCZPokRrDHjw==",
|
"integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg=="
|
||||||
"license": "MIT"
|
|
||||||
},
|
},
|
||||||
"node_modules/unicode-canonical-property-names-ecmascript": {
|
"node_modules/unicode-canonical-property-names-ecmascript": {
|
||||||
"version": "2.0.1",
|
"version": "2.0.1",
|
||||||
|
|||||||
142
package.json
142
package.json
@@ -1,72 +1,74 @@
|
|||||||
{
|
{
|
||||||
"name": "dry-wash",
|
"name": "dry-wash",
|
||||||
"version": "0.5.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": {
|
||||||
"test": "jest -u",
|
"test": "jest -u",
|
||||||
"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": "npx eslint .",
|
||||||
"eslint:fix": "npx eslint . --fix",
|
"eslint:fix": "npx eslint . --fix",
|
||||||
"preversion": "npm run eslint"
|
"preversion": "npm run eslint"
|
||||||
},
|
},
|
||||||
"keywords": [],
|
"keywords": [],
|
||||||
"author": "",
|
"author": "",
|
||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@brojs/cli": "^1.8.4",
|
"@babel/core": "^7.26.7",
|
||||||
"@babel/core": "^7.26.7",
|
"@babel/preset-env": "^7.26.7",
|
||||||
"@babel/preset-env": "^7.26.7",
|
"@babel/preset-react": "^7.26.3",
|
||||||
"@babel/preset-react": "^7.26.3",
|
"@babel/preset-typescript": "^7.26.0",
|
||||||
"@babel/preset-typescript": "^7.26.0",
|
"@brojs/cli": "^1.8.4",
|
||||||
"@chakra-ui/icons": "^2.2.4",
|
"@chakra-ui/icons": "^2.2.4",
|
||||||
"@chakra-ui/react": "^2.10.5",
|
"@chakra-ui/react": "^2.10.5",
|
||||||
"@emotion/react": "^11.4.1",
|
"@emotion/react": "^11.4.1",
|
||||||
"@emotion/styled": "^11.3.0",
|
"@emotion/styled": "^11.3.0",
|
||||||
"@fontsource/open-sans": "^5.1.0",
|
"@fontsource/open-sans": "^5.1.0",
|
||||||
"@lottiefiles/react-lottie-player": "^3.5.4",
|
"@lottiefiles/react-lottie-player": "^3.5.4",
|
||||||
"@pbe/react-yandex-maps": "^1.2.5",
|
"@pbe/react-yandex-maps": "^1.2.5",
|
||||||
"@reduxjs/toolkit": "^2.5.0",
|
"@reduxjs/toolkit": "^2.5.0",
|
||||||
"@testing-library/dom": "^10.4.0",
|
"@testing-library/dom": "^10.4.0",
|
||||||
"@testing-library/react": "^16.2.0",
|
"@testing-library/react": "^16.2.0",
|
||||||
"@types/react": "^18.3.12",
|
"@types/react": "^18.3.12",
|
||||||
"babel-jest": "^29.7.0",
|
"babel-jest": "^29.7.0",
|
||||||
"dayjs": "^1.11.13",
|
"dayjs": "^1.11.13",
|
||||||
"express": "^4.21.1",
|
"express": "^4.21.1",
|
||||||
"framer-motion": "^6.2.8",
|
"framer-motion": "^6.2.8",
|
||||||
"i18next": "^23.16.4",
|
"i18next": "^23.16.4",
|
||||||
"jest": "^29.7.0",
|
"jest": "^29.7.0",
|
||||||
"jest-environment-jsdom": "^29.7.0",
|
"jest-environment-jsdom": "^29.7.0",
|
||||||
"jest-fixed-jsdom": "^0.0.9",
|
"jest-fixed-jsdom": "^0.0.9",
|
||||||
"keycloak-js": "^23.0.7",
|
"keycloak-js": "^23.0.7",
|
||||||
"msw": "^2.7.0",
|
"msw": "^2.7.0",
|
||||||
"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-hook-form": "^7.53.2",
|
||||||
"react-i18next": "^15.1.1",
|
"react-i18next": "^15.1.1",
|
||||||
"react-icons": "^5.3.0",
|
"react-icons": "^5.3.0",
|
||||||
"react-phone-number-input": "^3.4.9",
|
"react-phone-number-input": "^3.4.9",
|
||||||
"react-redux": "^9.2.0",
|
"react-redux": "^9.2.0",
|
||||||
"react-router-dom": "^6.27.0",
|
"react-router-dom": "^6.27.0",
|
||||||
"ts-jest": "^29.2.5",
|
"ts-jest": "^29.2.5",
|
||||||
"ts-node": "^10.9.2"
|
"ts-node": "^10.9.2"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@eslint/js": "^9.14.0",
|
"@eslint/js": "^9.14.0",
|
||||||
"@stylistic/eslint-plugin": "^2.10.1",
|
"@playwright/test": "^1.50.1",
|
||||||
"@types/react-dom": "^18.3.1",
|
"@stylistic/eslint-plugin": "^2.10.1",
|
||||||
"eslint": "^9.14.0",
|
"@types/node": "^22.13.1",
|
||||||
"eslint-plugin-import": "^2.31.0",
|
"@types/react-dom": "^18.3.1",
|
||||||
"eslint-plugin-react": "^7.37.2",
|
"eslint": "^9.14.0",
|
||||||
"globals": "^15.11.0",
|
"eslint-plugin-import": "^2.31.0",
|
||||||
"prettier": "3.3.3",
|
"eslint-plugin-react": "^7.37.2",
|
||||||
"typescript": "^5.7.3",
|
"globals": "^15.11.0",
|
||||||
"typescript-eslint": "^8.12.2"
|
"prettier": "3.3.3",
|
||||||
},
|
"typescript": "^5.7.3",
|
||||||
"jest": {
|
"typescript-eslint": "^8.12.2"
|
||||||
"preset": "./jest-preset-it/jest-preset.ts"
|
},
|
||||||
}
|
"jest": {
|
||||||
|
"preset": "./jest-preset-it/jest-preset.ts"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
79
playwright.config.ts
Normal file
79
playwright.config.ts
Normal file
@@ -0,0 +1,79 @@
|
|||||||
|
import { defineConfig, devices } from '@playwright/test';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Read environment variables from file.
|
||||||
|
* https://github.com/motdotla/dotenv
|
||||||
|
*/
|
||||||
|
// import dotenv from 'dotenv';
|
||||||
|
// import path from 'path';
|
||||||
|
// dotenv.config({ path: path.resolve(__dirname, '.env') });
|
||||||
|
|
||||||
|
/**
|
||||||
|
* See https://playwright.dev/docs/test-configuration.
|
||||||
|
*/
|
||||||
|
export default defineConfig({
|
||||||
|
testDir: './tests',
|
||||||
|
/* Run tests in files in parallel */
|
||||||
|
fullyParallel: true,
|
||||||
|
/* Fail the build on CI if you accidentally left test.only in the source code. */
|
||||||
|
forbidOnly: !!process.env.CI,
|
||||||
|
/* Retry on CI only */
|
||||||
|
retries: process.env.CI ? 2 : 0,
|
||||||
|
/* Opt out of parallel tests on CI. */
|
||||||
|
workers: process.env.CI ? 1 : undefined,
|
||||||
|
/* Reporter to use. See https://playwright.dev/docs/test-reporters */
|
||||||
|
reporter: 'html',
|
||||||
|
/* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
|
||||||
|
use: {
|
||||||
|
/* Base URL to use in actions like `await page.goto('/')`. */
|
||||||
|
// baseURL: 'http://127.0.0.1:3000',
|
||||||
|
|
||||||
|
/* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
|
||||||
|
trace: 'on-first-retry',
|
||||||
|
},
|
||||||
|
|
||||||
|
/* Configure projects for major browsers */
|
||||||
|
projects: [
|
||||||
|
{
|
||||||
|
name: 'chromium',
|
||||||
|
use: { ...devices['Desktop Chrome'] },
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
name: 'firefox',
|
||||||
|
use: { ...devices['Desktop Firefox'] },
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
name: 'webkit',
|
||||||
|
use: { ...devices['Desktop Safari'] },
|
||||||
|
},
|
||||||
|
|
||||||
|
/* Test against mobile viewports. */
|
||||||
|
// {
|
||||||
|
// name: 'Mobile Chrome',
|
||||||
|
// use: { ...devices['Pixel 5'] },
|
||||||
|
// },
|
||||||
|
// {
|
||||||
|
// name: 'Mobile Safari',
|
||||||
|
// use: { ...devices['iPhone 12'] },
|
||||||
|
// },
|
||||||
|
|
||||||
|
/* Test against branded browsers. */
|
||||||
|
// {
|
||||||
|
// name: 'Microsoft Edge',
|
||||||
|
// use: { ...devices['Desktop Edge'], channel: 'msedge' },
|
||||||
|
// },
|
||||||
|
// {
|
||||||
|
// name: 'Google Chrome',
|
||||||
|
// use: { ...devices['Desktop Chrome'], channel: 'chrome' },
|
||||||
|
// },
|
||||||
|
],
|
||||||
|
|
||||||
|
/* Run your local dev server before starting the tests */
|
||||||
|
// webServer: {
|
||||||
|
// command: 'npm run start',
|
||||||
|
// url: 'http://127.0.0.1:3000',
|
||||||
|
// reuseExistingServer: !process.env.CI,
|
||||||
|
// },
|
||||||
|
});
|
||||||
@@ -1,4 +1,5 @@
|
|||||||
import React, { useEffect, useState } from 'react';
|
import React, { useEffect } from 'react';
|
||||||
|
import { useForm, SubmitHandler } from 'react-hook-form';
|
||||||
import {
|
import {
|
||||||
Button,
|
Button,
|
||||||
FormControl,
|
FormControl,
|
||||||
@@ -14,107 +15,136 @@ import {
|
|||||||
useToast,
|
useToast,
|
||||||
InputGroup,
|
InputGroup,
|
||||||
InputLeftElement,
|
InputLeftElement,
|
||||||
|
FormErrorMessage,
|
||||||
} from '@chakra-ui/react';
|
} from '@chakra-ui/react';
|
||||||
import { useTranslation } from 'react-i18next';
|
import { useTranslation } from 'react-i18next';
|
||||||
import { PhoneIcon } from '@chakra-ui/icons';
|
import { PhoneIcon } from '@chakra-ui/icons';
|
||||||
|
|
||||||
import { api } from '../../__data__/service/api';
|
import { api } from '../../__data__/service/api';
|
||||||
|
import showToast from '../../helpers/showToast';
|
||||||
|
import { DrawerInputs } from '../../models/arm/form';
|
||||||
|
|
||||||
const MasterDrawer = ({ isOpen, onClose }) => {
|
interface MasterDrawerProps {
|
||||||
const [addMaster, { error, isSuccess }] = api.useAddMasterMutation();
|
isOpen: boolean;
|
||||||
const toast = useToast();
|
onClose: () => void;
|
||||||
|
}
|
||||||
|
|
||||||
const [newMaster, setNewMaster] = useState({ name: '', phone: '' });
|
const MasterDrawer = ({ isOpen, onClose }: MasterDrawerProps) => {
|
||||||
|
const {
|
||||||
|
register,
|
||||||
|
handleSubmit,
|
||||||
|
reset,
|
||||||
|
formState: { errors },
|
||||||
|
} = useForm<DrawerInputs>();
|
||||||
|
|
||||||
const handleSave = async () => {
|
const { t } = useTranslation('~', {
|
||||||
|
keyPrefix: 'dry-wash.arm.master.drawer',
|
||||||
|
});
|
||||||
|
|
||||||
|
const onSubmit: SubmitHandler<DrawerInputs> = async (data) => {
|
||||||
const trimMaster = {
|
const trimMaster = {
|
||||||
phone: newMaster.phone.trim(),
|
name: data.name.trim(),
|
||||||
name: newMaster.name.trim(),
|
phone: data.phone.trim(),
|
||||||
};
|
};
|
||||||
|
|
||||||
if (trimMaster.name === '' || trimMaster.phone === '') {
|
const isEmptyFields = trimMaster.name === '' || trimMaster.phone === '';
|
||||||
|
|
||||||
|
if (isEmptyFields) {
|
||||||
|
showToast({
|
||||||
|
toast,
|
||||||
|
title: t('toast.error.base'),
|
||||||
|
description: t('toast.error.empty-fields'),
|
||||||
|
status: 'error',
|
||||||
|
});
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
addMaster(trimMaster);
|
await addMaster(trimMaster);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
const [addMaster, { error, isSuccess }] = api.useAddMasterMutation();
|
||||||
|
const toast = useToast();
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (isSuccess) {
|
if (isSuccess) {
|
||||||
toast({
|
showToast({
|
||||||
title: 'Мастер создан.',
|
toast,
|
||||||
description: `Мастер "${newMaster.name}" успешно добавлен.`,
|
title: t('toast.create-master'),
|
||||||
status: 'success',
|
status: 'success',
|
||||||
duration: 5000,
|
|
||||||
isClosable: true,
|
|
||||||
position: 'top-right',
|
|
||||||
});
|
});
|
||||||
|
reset();
|
||||||
onClose();
|
onClose();
|
||||||
}
|
}
|
||||||
}, [isSuccess]);
|
}, [isSuccess]);
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
if (error) {
|
if (error) {
|
||||||
toast({
|
showToast({
|
||||||
title: 'Ошибка при создании мастера.',
|
toast,
|
||||||
description: 'Не удалось добавить мастера. Попробуйте еще раз.',
|
title: t('toast.error.create-master'),
|
||||||
|
description: t('toast.error.create-master-details'),
|
||||||
status: 'error',
|
status: 'error',
|
||||||
duration: 5000,
|
|
||||||
isClosable: true,
|
|
||||||
position: 'top-right',
|
|
||||||
});
|
});
|
||||||
console.error(error);
|
console.error(error);
|
||||||
}
|
}
|
||||||
}, [error]);
|
}, [error]);
|
||||||
|
|
||||||
const { t } = useTranslation('~', {
|
|
||||||
keyPrefix: 'dry-wash.arm.master.drawer',
|
|
||||||
});
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Drawer isOpen={isOpen} onClose={onClose} size='md'>
|
<Drawer isOpen={isOpen} onClose={onClose} size='md'>
|
||||||
<DrawerOverlay />
|
<DrawerOverlay />
|
||||||
<DrawerContent>
|
<DrawerContent>
|
||||||
<DrawerCloseButton />
|
<form onSubmit={handleSubmit(onSubmit)}>
|
||||||
<DrawerHeader>{t('title')}</DrawerHeader>
|
<DrawerCloseButton />
|
||||||
<DrawerBody>
|
<DrawerHeader>{t('title')}</DrawerHeader>
|
||||||
<FormControl mb='4'>
|
<DrawerBody>
|
||||||
<FormLabel>{t('inputName.label')}</FormLabel>
|
<FormControl mb='4' isInvalid={!!errors.name}>
|
||||||
<Input
|
<FormLabel>{t('inputName.label')}</FormLabel>
|
||||||
// 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
|
<Input
|
||||||
// isInvalid
|
{...register('name', {
|
||||||
value={newMaster.phone}
|
required: t('form.name.required'),
|
||||||
onChange={(e) =>
|
minLength: {
|
||||||
setNewMaster({ ...newMaster, phone: e.target.value })
|
value: 2,
|
||||||
}
|
message: t('form.name.minLength'),
|
||||||
placeholder={t('inputPhone.placeholder')}
|
},
|
||||||
|
})}
|
||||||
|
placeholder={t('inputName.placeholder')}
|
||||||
/>
|
/>
|
||||||
</InputGroup>
|
<FormErrorMessage>
|
||||||
</FormControl>
|
{errors.name && errors.name.message}
|
||||||
</DrawerBody>
|
</FormErrorMessage>
|
||||||
<DrawerFooter>
|
</FormControl>
|
||||||
<Button colorScheme='teal' mr={3} onClick={handleSave}>
|
<FormControl isInvalid={!!errors.phone}>
|
||||||
{t('button.save')}
|
<FormLabel>{t('inputPhone.label')}</FormLabel>
|
||||||
</Button>
|
<InputGroup>
|
||||||
<Button variant='ghost' onClick={onClose}>
|
<InputLeftElement pointerEvents='none'>
|
||||||
{t('button.cancel')}
|
<PhoneIcon color='gray.300' />
|
||||||
</Button>
|
</InputLeftElement>
|
||||||
</DrawerFooter>
|
<Input
|
||||||
|
{...register('phone', {
|
||||||
|
required: t('form.phone.required'),
|
||||||
|
pattern: {
|
||||||
|
value: /^(\+7|8)\d{10}$/,
|
||||||
|
message: t('form.phone.pattern'),
|
||||||
|
},
|
||||||
|
setValueAs: (value) => value.replace(/[^\d+]/g, ''),
|
||||||
|
})}
|
||||||
|
placeholder={t('inputPhone.placeholder')}
|
||||||
|
/>
|
||||||
|
</InputGroup>
|
||||||
|
<FormErrorMessage>
|
||||||
|
{errors.phone && errors.phone.message}
|
||||||
|
</FormErrorMessage>
|
||||||
|
</FormControl>
|
||||||
|
</DrawerBody>
|
||||||
|
<DrawerFooter>
|
||||||
|
<Button colorScheme='teal' mr={3} type='submit'>
|
||||||
|
{t('button.save')}
|
||||||
|
</Button>
|
||||||
|
<Button variant='ghost' onClick={onClose}>
|
||||||
|
{t('button.cancel')}
|
||||||
|
</Button>
|
||||||
|
</DrawerFooter>
|
||||||
|
</form>
|
||||||
</DrawerContent>
|
</DrawerContent>
|
||||||
</Drawer>
|
</Drawer>
|
||||||
);
|
);
|
||||||
|
|||||||
21
src/helpers/showToast.ts
Normal file
21
src/helpers/showToast.ts
Normal file
@@ -0,0 +1,21 @@
|
|||||||
|
import { UseToastOptions } from '@chakra-ui/react';
|
||||||
|
|
||||||
|
interface ShowToast {
|
||||||
|
toast: (options: UseToastOptions) => void;
|
||||||
|
title: string;
|
||||||
|
description?: string;
|
||||||
|
status: 'info' | 'warning' | 'success' | 'error';
|
||||||
|
}
|
||||||
|
|
||||||
|
const showToast = ({ toast, title, description, status }: ShowToast) => {
|
||||||
|
toast({
|
||||||
|
title,
|
||||||
|
description,
|
||||||
|
status,
|
||||||
|
duration: 5000,
|
||||||
|
isClosable: true,
|
||||||
|
position: 'top-right',
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
|
export default showToast;
|
||||||
4
src/models/arm/form.ts
Normal file
4
src/models/arm/form.ts
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
export type DrawerInputs = {
|
||||||
|
phone: string;
|
||||||
|
name: string;
|
||||||
|
};
|
||||||
26
tests/example.spec.ts
Normal file
26
tests/example.spec.ts
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
import { test, expect } from '@playwright/test';
|
||||||
|
|
||||||
|
test.beforeEach('check server is up', async ({ page }) => {
|
||||||
|
try {
|
||||||
|
await page.goto('http://localhost:8099/dry-wash');
|
||||||
|
const makeOrderText = page.getByText('Сделать заказ', { exact: true });
|
||||||
|
await expect(makeOrderText).toBeVisible();
|
||||||
|
} catch (error) {
|
||||||
|
console.error('server not up');
|
||||||
|
test.skip();
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
test('login', async ({ page }) => {
|
||||||
|
await page.goto('http://localhost:8099/dry-wash/arm');
|
||||||
|
await page.getByRole('textbox', { name: 'Username or email' }).click();
|
||||||
|
await page
|
||||||
|
.getByRole('textbox', { name: 'Username or email' })
|
||||||
|
.fill('237x237');
|
||||||
|
await page.getByRole('textbox', { name: 'Password' }).click();
|
||||||
|
await page.getByRole('textbox', { name: 'Password' }).fill('');
|
||||||
|
await page.getByRole('button', { name: 'Sign In' }).click();
|
||||||
|
await page.getByRole('heading', { name: 'Заказы' }).click();
|
||||||
|
await page.getByRole('link', { name: 'Мастера' }).click();
|
||||||
|
await page.getByRole('link', { name: 'Заказы' }).click();
|
||||||
|
});
|
||||||
Reference in New Issue
Block a user