Compare commits
82 Commits
feature/up
...
v0.9.0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ac006267a2 | ||
|
|
63d9d069c0 | ||
| c83ebf02bc | |||
|
|
1968df7bb3 | ||
|
|
811e0e3f24 | ||
| a2ffd6f38f | |||
|
|
20017cad3c | ||
|
|
de54ac6669 | ||
|
|
eda869622e | ||
|
|
7b3889aa02 | ||
|
|
cee124fca5 | ||
|
|
b77eccc8e8 | ||
|
|
ebfaa7ea8f | ||
|
|
0027cc09b1 | ||
|
|
dd612d662c | ||
|
|
69251745fa | ||
|
|
253e3b3856 | ||
|
|
c9c17340c6 | ||
|
|
7fc5455c37 | ||
|
|
24779e2592 | ||
|
|
9111724519 | ||
|
|
c2511e0917 | ||
| b7d935f557 | |||
| fdc20e7464 | |||
| a616d3815b | |||
| 56f65fbd3a | |||
|
|
73d649f519 | ||
|
|
cf6b8ebd51 | ||
|
|
251ea5184e | ||
|
|
f07f7aeba5 | ||
|
|
bbc96a2f27 | ||
|
|
88242c5681 | ||
|
|
b2a067a644 | ||
|
|
52fec13377 | ||
|
|
1d4b796a39 | ||
|
|
142067e9ce | ||
| 3c291baa0e | |||
|
|
3cdc47b91b | ||
|
|
901d8d78a1 | ||
|
|
7736592830 | ||
|
|
8d447c9461 | ||
| 6506b89dc7 | |||
| 89d432b360 | |||
| f6cc2efb86 | |||
| 859fa4f2e1 | |||
|
|
0ec9e146b9 | ||
|
|
1669f01879 | ||
| 658e23d4e3 | |||
| ed8ae95436 | |||
| a00aaff29d | |||
| ad1f948641 | |||
| bd66f00b81 | |||
| 9a20c9f098 | |||
| d48f8011c1 | |||
| f2319542e7 | |||
| 3fb01392f0 | |||
| 1dd14caed2 | |||
| 12982cdf9e | |||
|
|
31b440656c | ||
|
|
45c4ca16c8 | ||
| e3d316c418 | |||
|
|
4c26928d23 | ||
| 1471bf94dd | |||
|
|
d3ffaa97f8 | ||
| acd09d427c | |||
| 34bf557a6f | |||
| 5e0ac9f7a5 | |||
| 9a2ef18925 | |||
| d15bd6f7d2 | |||
| adce5392a1 | |||
| 1b01c0ba4f | |||
| 54ced18ea2 | |||
| 0ddcaa5d52 | |||
| 85d96b930c | |||
|
|
adb812280d | ||
|
|
3382ae3ada | ||
|
|
5ed023866e | ||
|
|
e73773f359 | ||
|
|
a9a9b3cadd | ||
| 06abc15c9a | |||
| 6ca7de9467 | |||
| 939f107d1c |
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/
|
||||||
|
|||||||
5
.vscode/settings.json
vendored
Normal file
5
.vscode/settings.json
vendored
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
{
|
||||||
|
"i18n-ally.localesPaths": [
|
||||||
|
"locales"
|
||||||
|
]
|
||||||
|
}
|
||||||
28
Jenkinsfile
vendored
28
Jenkinsfile
vendored
@@ -1,7 +1,7 @@
|
|||||||
pipeline {
|
pipeline {
|
||||||
agent {
|
agent {
|
||||||
docker {
|
docker {
|
||||||
image 'node:20'
|
image 'node:22'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -30,19 +30,21 @@ pipeline {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
stage('checks') {
|
stage('eslint') {
|
||||||
parallel {
|
steps {
|
||||||
stage('eslint') {
|
sh 'npm run eslint'
|
||||||
steps {
|
}
|
||||||
sh 'npm run eslint'
|
}
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
stage('build') {
|
stage('test') {
|
||||||
steps {
|
steps {
|
||||||
sh 'npm run build'
|
sh 'npm run test'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
stage('build') {
|
||||||
|
steps {
|
||||||
|
sh 'npm run build'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
18
__mocks__/app-context-mock.tsx
Normal file
18
__mocks__/app-context-mock.tsx
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
import React, { PropsWithChildren } from 'react';
|
||||||
|
import { jest } from '@jest/globals';
|
||||||
|
import { BrowserRouter } from 'react-router-dom';
|
||||||
|
import { ChakraProvider, theme as chakraTheme } from '@chakra-ui/react';
|
||||||
|
import { Provider } from 'react-redux';
|
||||||
|
|
||||||
|
import ErrorBoundary from '../src/components/ErrorBoundary';
|
||||||
|
import { store } from '../src/__data__/store';
|
||||||
|
|
||||||
|
export const AppContext = jest.fn(({ children }: PropsWithChildren) => (
|
||||||
|
<Provider store={store}>
|
||||||
|
<ChakraProvider theme={chakraTheme}>
|
||||||
|
<ErrorBoundary>
|
||||||
|
<BrowserRouter>{children}</BrowserRouter>
|
||||||
|
</ErrorBoundary>
|
||||||
|
</ChakraProvider>
|
||||||
|
</Provider>
|
||||||
|
));
|
||||||
18
__mocks__/brojs-cli-mock.ts
Normal file
18
__mocks__/brojs-cli-mock.ts
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
import { jest } from '@jest/globals';
|
||||||
|
|
||||||
|
jest.mock('@brojs/cli', () => ({
|
||||||
|
getConfigValue: jest.fn(() => '/api'),
|
||||||
|
getFeatures: jest.fn(() => ({
|
||||||
|
['order-view-status-polling']: { value: '3000' }
|
||||||
|
})),
|
||||||
|
getNavigationValue: jest.fn((navKey: string) => {
|
||||||
|
switch (navKey) {
|
||||||
|
case 'dry-wash.main':
|
||||||
|
return '/dry-wash';
|
||||||
|
case 'dry-wash.order.create':
|
||||||
|
return '/order';
|
||||||
|
case 'dry-wash.order.view':
|
||||||
|
return '/order/:orderId';
|
||||||
|
}
|
||||||
|
}),
|
||||||
|
}));
|
||||||
1
__mocks__/file-mock.ts
Normal file
1
__mocks__/file-mock.ts
Normal file
@@ -0,0 +1 @@
|
|||||||
|
module.exports = 'file';
|
||||||
6
__mocks__/lottiefiles-mock.tsx
Normal file
6
__mocks__/lottiefiles-mock.tsx
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
import { jest } from '@jest/globals';
|
||||||
|
import React from 'react';
|
||||||
|
|
||||||
|
jest.mock('@lottiefiles/react-lottie-player', () => ({
|
||||||
|
Player: jest.fn(() => <></>),
|
||||||
|
}));
|
||||||
13
__mocks__/react-i18next.ts
Normal file
13
__mocks__/react-i18next.ts
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
import localeRu from '../locales/ru.json';
|
||||||
|
|
||||||
|
module.exports = {
|
||||||
|
useTranslation: (_, options) => {
|
||||||
|
const { keyPrefix } = options ?? {};
|
||||||
|
return {
|
||||||
|
t: keyPrefix ? (key: string) => localeRu[`${keyPrefix}.${key}`] : undefined,
|
||||||
|
i18n: {
|
||||||
|
language: 'ru'
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
};
|
||||||
11
__mocks__/react-yandex-maps-mock.tsx
Normal file
11
__mocks__/react-yandex-maps-mock.tsx
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
import { jest } from '@jest/globals';
|
||||||
|
import React from 'react';
|
||||||
|
|
||||||
|
jest.mock('@pbe/react-yandex-maps', () => ({
|
||||||
|
YMaps: jest.fn(() => <></>),
|
||||||
|
Map: jest.fn(() => <></>),
|
||||||
|
Placemark: jest.fn(() => <></>),
|
||||||
|
GeolocationControl: jest.fn(() => <></>),
|
||||||
|
ZoomControl: jest.fn(() => <></>),
|
||||||
|
withYMaps: jest.fn(() => <></>),
|
||||||
|
}));
|
||||||
20
__mocks__/server/handlers.ts
Normal file
20
__mocks__/server/handlers.ts
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
import { http, delay, HttpResponse } from 'msw';
|
||||||
|
|
||||||
|
import OrderPendingMock from '../../stubs/json/landing-order-view/id1-success-pending.json';
|
||||||
|
import OrderErrorMock from '../../stubs/json/landing-order-view/id1-error.json';
|
||||||
|
|
||||||
|
export const handlers = [
|
||||||
|
http.get('/api/order/:id', async ({ params }) => {
|
||||||
|
await delay();
|
||||||
|
|
||||||
|
const { id } = params;
|
||||||
|
if (id === 'id1') {
|
||||||
|
return HttpResponse.json(OrderPendingMock);
|
||||||
|
}
|
||||||
|
|
||||||
|
return new HttpResponse(null, {
|
||||||
|
status: 500,
|
||||||
|
statusText: OrderErrorMock.message
|
||||||
|
});
|
||||||
|
})
|
||||||
|
];
|
||||||
5
__mocks__/server/server.ts
Normal file
5
__mocks__/server/server.ts
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
import { setupServer } from 'msw/node';
|
||||||
|
|
||||||
|
import { handlers } from './handlers';
|
||||||
|
|
||||||
|
export const server = setupServer(...handlers);
|
||||||
1
__mocks__/style-mock.ts
Normal file
1
__mocks__/style-mock.ts
Normal file
@@ -0,0 +1 @@
|
|||||||
|
module.exports = {};
|
||||||
7
babel.config.js
Normal file
7
babel.config.js
Normal file
@@ -0,0 +1,7 @@
|
|||||||
|
module.exports = {
|
||||||
|
presets: [
|
||||||
|
'@babel/preset-env',
|
||||||
|
'@babel/preset-typescript',
|
||||||
|
['@babel/preset-react', { runtime: 'automatic' }],
|
||||||
|
],
|
||||||
|
};
|
||||||
@@ -19,8 +19,18 @@ module.exports = {
|
|||||||
'dry-wash.arm': '/arm/*',
|
'dry-wash.arm': '/arm/*',
|
||||||
},
|
},
|
||||||
features: {
|
features: {
|
||||||
'dry-wash-pl': {
|
'dry-wash': {
|
||||||
// add your features here in the format [featureName]: { value: string }
|
// add your features here in the format [featureName]: { value: string }
|
||||||
|
"order-view-status-polling": {
|
||||||
|
"on": true,
|
||||||
|
"value": "3000",
|
||||||
|
"key": "order-view-status-polling"
|
||||||
|
},
|
||||||
|
"car-img-upload": {
|
||||||
|
"on": true,
|
||||||
|
"value": "true",
|
||||||
|
"key": "car-img-upload"
|
||||||
|
}
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
config: {
|
config: {
|
||||||
|
|||||||
26
e2e/example.spec.ts
Normal file
26
e2e/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', error);
|
||||||
|
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();
|
||||||
|
});
|
||||||
@@ -1,12 +1,13 @@
|
|||||||
import globals from "globals";
|
import globals from 'globals';
|
||||||
import pluginJs from "@eslint/js";
|
import pluginJs from '@eslint/js';
|
||||||
import tseslint from "typescript-eslint";
|
import tseslint from 'typescript-eslint';
|
||||||
import pluginReact from "eslint-plugin-react";
|
import pluginReact from 'eslint-plugin-react';
|
||||||
import stylistic from '@stylistic/eslint-plugin';
|
import stylistic from '@stylistic/eslint-plugin';
|
||||||
import pluginImport from 'eslint-plugin-import';
|
import pluginImport from 'eslint-plugin-import';
|
||||||
|
|
||||||
export default [
|
export default [
|
||||||
{ files: ["**/*.{js,mjs,cjs,ts,jsx,tsx}"] },
|
{ files: ['**/*.{js,mjs,cjs,ts,jsx,tsx}'] },
|
||||||
|
|
||||||
{ languageOptions: { globals: globals.browser } },
|
{ languageOptions: { globals: globals.browser } },
|
||||||
pluginJs.configs.recommended,
|
pluginJs.configs.recommended,
|
||||||
...tseslint.configs.recommended,
|
...tseslint.configs.recommended,
|
||||||
@@ -14,35 +15,38 @@ export default [
|
|||||||
{
|
{
|
||||||
plugins: {
|
plugins: {
|
||||||
'@stylistic': stylistic,
|
'@stylistic': stylistic,
|
||||||
'import': pluginImport,
|
import: pluginImport,
|
||||||
},
|
},
|
||||||
"rules": {
|
rules: {
|
||||||
"no-unused-vars": "off",
|
'no-unused-vars': 'off',
|
||||||
"@typescript-eslint/no-unused-vars": [
|
'@typescript-eslint/no-unused-vars': [
|
||||||
"warn", // or "error"
|
'warn', // or "error"
|
||||||
{
|
{
|
||||||
"argsIgnorePattern": "^_",
|
argsIgnorePattern: '^_',
|
||||||
"varsIgnorePattern": "^_",
|
varsIgnorePattern: '^_',
|
||||||
"caughtErrorsIgnorePattern": "^_"
|
caughtErrorsIgnorePattern: '^_',
|
||||||
}
|
},
|
||||||
],
|
],
|
||||||
"sort-imports": ["off"],
|
'sort-imports': ['off'],
|
||||||
"import/order": [
|
'import/order': [
|
||||||
"error",
|
'error',
|
||||||
{
|
{
|
||||||
"groups": [
|
groups: [
|
||||||
"builtin",
|
'builtin',
|
||||||
"external",
|
'external',
|
||||||
"internal",
|
'internal',
|
||||||
"parent",
|
'parent',
|
||||||
["sibling", "index"]
|
['sibling', 'index'],
|
||||||
],
|
],
|
||||||
"newlines-between": "always",
|
'newlines-between': 'always',
|
||||||
}
|
},
|
||||||
],
|
],
|
||||||
semi: ["error", "always"],
|
semi: ['error', 'always'],
|
||||||
'@stylistic/indent': ['error', 2],
|
'@stylistic/indent': ['error', 2],
|
||||||
'react/prop-types': 'off'
|
'react/prop-types': 'off',
|
||||||
},
|
},
|
||||||
}
|
},
|
||||||
|
{
|
||||||
|
ignores: ['babel.config.js'],
|
||||||
|
},
|
||||||
];
|
];
|
||||||
|
|||||||
22
jest-preset-it/jest-preset.ts
Normal file
22
jest-preset-it/jest-preset.ts
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
module.exports = {
|
||||||
|
preset: 'ts-jest',
|
||||||
|
transform: {
|
||||||
|
'^.+\\.tsx?$': 'babel-jest',
|
||||||
|
},
|
||||||
|
coverageProvider: 'v8',
|
||||||
|
coverageDirectory: 'coverage',
|
||||||
|
collectCoverageFrom: ['**/src/**/*.{ts,tsx}', '!**/src/app.tsx'],
|
||||||
|
collectCoverage: true,
|
||||||
|
clearMocks: true,
|
||||||
|
moduleNameMapper: {
|
||||||
|
'\\.(svg|webp)$': '<rootDir>/__mocks__/file-mock',
|
||||||
|
'\\.(css|scss)$': '<rootDir>/__mocks__/style-mock',
|
||||||
|
'react-i18next': '<rootDir>/__mocks__/react-i18next',
|
||||||
|
},
|
||||||
|
testEnvironmentOptions: {
|
||||||
|
customExportConditions: [''],
|
||||||
|
},
|
||||||
|
testEnvironment: 'jest-fixed-jsdom',
|
||||||
|
testPathIgnorePatterns: ['/node_modules/', '<rootDir>/e2e'],
|
||||||
|
setupFilesAfterEnv: ['<rootDir>/jest-preset-it/jest.setup.js', '<rootDir>/__mocks__/brojs-cli-mock.ts', '<rootDir>/__mocks__/lottiefiles-mock.tsx'],
|
||||||
|
};
|
||||||
5
jest-preset-it/jest.setup.js
Normal file
5
jest-preset-it/jest.setup.js
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
// eslint-disable-next-line @typescript-eslint/no-require-imports, no-undef
|
||||||
|
require('@testing-library/jest-dom');
|
||||||
|
|
||||||
|
// eslint-disable-next-line no-undef
|
||||||
|
global.__webpack_public_path__ = '';
|
||||||
@@ -39,15 +39,23 @@
|
|||||||
"dry-wash.order-create.car-body-select.options.sports-car" : "Sports-car",
|
"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.car-body-select.options.other": "Other",
|
||||||
"dry-wash.order-create.form.submit-button.label": "Submit",
|
"dry-wash.order-create.form.submit-button.label": "Submit",
|
||||||
|
"dry-wash.order-create.order-creation-title": "Creating order ...",
|
||||||
|
"dry-wash.order-create.create-order-query.success.title": "The order is successfully created",
|
||||||
|
"dry-wash.order-create.create-order-query.error.title": "Failed to create an order",
|
||||||
"dry-wash.order-view.title": "Your order",
|
"dry-wash.order-view.title": "Your order",
|
||||||
"dry-wash.order-view.error.title": "Error",
|
"dry-wash.order-view.get-order-query.error.title": "Failed to fetch the details of order",
|
||||||
"dry-wash.order-view.fetch.error": "Failed to fetch the details of order #{{number}}",
|
|
||||||
"dry-wash.order-view.details.title": "Order #{{number}}",
|
"dry-wash.order-view.details.title": "Order #{{number}}",
|
||||||
"dry-wash.order-view.details.owner": "Owner",
|
"dry-wash.order-view.details.owner": "Owner",
|
||||||
"dry-wash.order-view.details.car": "Car",
|
"dry-wash.order-view.details.car": "Car",
|
||||||
"dry-wash.order-view.details.location": "Where",
|
"dry-wash.order-view.details.location": "Where",
|
||||||
"dry-wash.order-view.details.datetime-range": "When",
|
"dry-wash.order-view.details.datetime-range": "When",
|
||||||
"dry-wash.order-view.details.alert": "The operator will contact you about the payment at the specified phone number",
|
"dry-wash.order-view.details.alert": "The operator will contact you about the payment at the specified phone number",
|
||||||
|
"dry-wash.order-view.upload-car-image.field.label": "Upload a photo of your car, and our service will quickly calculate the pre-order price!",
|
||||||
|
"dry-wash.order-view.upload-car-image.field.help": "Allowed formats: .jpg, .png. Maximum size: 5MB",
|
||||||
|
"dry-wash.order-view.upload-car-image.file-input.placeholder": "Upload a file",
|
||||||
|
"dry-wash.order-view.upload-car-image.file-input.button": "Upload",
|
||||||
|
"dry-wash.order-view.upload-car-image-query.success.title": "The car image is successfully uploaded",
|
||||||
|
"dry-wash.order-view.upload-car-image-query.error.title": "Failed to upload the car image",
|
||||||
"dry-wash.arm.master.add": "Add",
|
"dry-wash.arm.master.add": "Add",
|
||||||
"dry-wash.arm.order.title": "Orders",
|
"dry-wash.arm.order.title": "Orders",
|
||||||
"dry-wash.arm.order.table.empty": "Table empty",
|
"dry-wash.arm.order.table.empty": "Table empty",
|
||||||
@@ -57,7 +65,8 @@
|
|||||||
"dry-wash.arm.order.status.pending": "Pending",
|
"dry-wash.arm.order.status.pending": "Pending",
|
||||||
"dry-wash.arm.order.status.working": "Working",
|
"dry-wash.arm.order.status.working": "Working",
|
||||||
"dry-wash.arm.order.status.canceled": "Canceled",
|
"dry-wash.arm.order.status.canceled": "Canceled",
|
||||||
"dry-wash.arm.order.status.placeholder": "Select Status",
|
"dry-wash.arm.order.status.placeholder": "Select status",
|
||||||
|
"dry-wash.arm.order.master.placeholder": "Select master",
|
||||||
"dry-wash.arm.order.table.header.carNumber": "Car Number",
|
"dry-wash.arm.order.table.header.carNumber": "Car Number",
|
||||||
"dry-wash.arm.order.table.header.washingTime": "Washing Time",
|
"dry-wash.arm.order.table.header.washingTime": "Washing Time",
|
||||||
"dry-wash.arm.order.table.header.orderDate": "Order Date",
|
"dry-wash.arm.order.table.header.orderDate": "Order Date",
|
||||||
@@ -84,6 +93,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",
|
||||||
|
|||||||
@@ -7,6 +7,7 @@
|
|||||||
"dry-wash.arm.order.status.working": "В работе",
|
"dry-wash.arm.order.status.working": "В работе",
|
||||||
"dry-wash.arm.order.status.canceled": "Отменено",
|
"dry-wash.arm.order.status.canceled": "Отменено",
|
||||||
"dry-wash.arm.order.status.placeholder": "Выберите статус",
|
"dry-wash.arm.order.status.placeholder": "Выберите статус",
|
||||||
|
"dry-wash.arm.order.master.placeholder": "Выберите мастера",
|
||||||
"dry-wash.arm.order.table.header.carNumber": "Номер машины",
|
"dry-wash.arm.order.table.header.carNumber": "Номер машины",
|
||||||
"dry-wash.arm.order.table.header.washingTime": "Время мойки",
|
"dry-wash.arm.order.table.header.washingTime": "Время мойки",
|
||||||
"dry-wash.arm.order.table.header.orderDate": "Дата заказа",
|
"dry-wash.arm.order.table.header.orderDate": "Дата заказа",
|
||||||
@@ -24,10 +25,16 @@
|
|||||||
"dry-wash.arm.master.table.header.phone": "Телефон",
|
"dry-wash.arm.master.table.header.phone": "Телефон",
|
||||||
"dry-wash.arm.master.table.header.actions": "Действия",
|
"dry-wash.arm.master.table.header.actions": "Действия",
|
||||||
"dry-wash.arm.master.table.actionsMenu.delete": "Удалить мастера",
|
"dry-wash.arm.master.table.actionsMenu.delete": "Удалить мастера",
|
||||||
|
"dry-wash.arm.master.table.actionsMenu.toast.success": "Мастер удалён",
|
||||||
|
"dry-wash.arm.master.table.actionsMenu.toast.error.title": "Ошибка!",
|
||||||
|
"dry-wash.arm.master.table.actionsMenu.toast.error.description": "Не удалось удалить мастера. Попробуйте ещё раз.",
|
||||||
"dry-wash.arm.master.schedule.empty": "Свободен",
|
"dry-wash.arm.master.schedule.empty": "Свободен",
|
||||||
"dry-wash.arm.master.editable.aria.cancel": "Отменить изменения",
|
"dry-wash.arm.master.editable.aria.cancel": "Отменить изменения",
|
||||||
"dry-wash.arm.master.editable.aria.save": "Сохранить изменения",
|
"dry-wash.arm.master.editable.aria.save": "Сохранить изменения",
|
||||||
"dry-wash.arm.master.editable.aria.edit": "Редактировать",
|
"dry-wash.arm.master.editable.aria.edit": "Редактировать",
|
||||||
|
"dry-wash.arm.master.editable.toast.success": "Успешно!",
|
||||||
|
"dry-wash.arm.master.editable.toast.error.description": "Не удалось обновить данные",
|
||||||
|
"dry-wash.arm.master.editable.toast.error.title": "Ошибка!",
|
||||||
"dry-wash.arm.master.drawer.title": "Добавить нового мастера",
|
"dry-wash.arm.master.drawer.title": "Добавить нового мастера",
|
||||||
"dry-wash.arm.master.drawer.inputName.label": "ФИО",
|
"dry-wash.arm.master.drawer.inputName.label": "ФИО",
|
||||||
"dry-wash.arm.master.drawer.inputName.placeholder": "Введите ФИО",
|
"dry-wash.arm.master.drawer.inputName.placeholder": "Введите ФИО",
|
||||||
@@ -35,6 +42,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": "Сухой мастер",
|
||||||
@@ -78,15 +94,23 @@
|
|||||||
"dry-wash.order-create.car-body-select.options.sports-car": "Спорткар",
|
"dry-wash.order-create.car-body-select.options.sports-car": "Спорткар",
|
||||||
"dry-wash.order-create.car-body-select.options.other": "Другой",
|
"dry-wash.order-create.car-body-select.options.other": "Другой",
|
||||||
"dry-wash.order-create.form.submit-button.label": "Отправить",
|
"dry-wash.order-create.form.submit-button.label": "Отправить",
|
||||||
|
"dry-wash.order-create.order-creation-title": "Создаем заказ ...",
|
||||||
|
"dry-wash.order-create.create-order-query.success.title": "Заказ успешно создан",
|
||||||
|
"dry-wash.order-create.create-order-query.error.title": "Не удалось создать заказ",
|
||||||
"dry-wash.order-view.title": "Ваш заказ",
|
"dry-wash.order-view.title": "Ваш заказ",
|
||||||
"dry-wash.order-view.error.title": "Ошибка",
|
"dry-wash.order-view.get-order-query.error.title": "Не удалось загрузить детали заказа",
|
||||||
"dry-wash.order-view.fetch.error": "Не удалось загрузить детали заказа №{{number}}",
|
|
||||||
"dry-wash.order-view.details.title": "Заказ №{{number}}",
|
"dry-wash.order-view.details.title": "Заказ №{{number}}",
|
||||||
"dry-wash.order-view.details.owner": "Владелец",
|
"dry-wash.order-view.details.owner": "Владелец",
|
||||||
"dry-wash.order-view.details.car": "Автомобиль",
|
"dry-wash.order-view.details.car": "Автомобиль",
|
||||||
"dry-wash.order-view.details.location": "Где",
|
"dry-wash.order-view.details.location": "Где",
|
||||||
"dry-wash.order-view.details.datetime-range": "Когда",
|
"dry-wash.order-view.details.datetime-range": "Когда",
|
||||||
"dry-wash.order-view.details.alert": "С вами свяжется оператор насчет оплаты по указанному номеру телефона",
|
"dry-wash.order-view.details.alert": "С вами свяжется оператор насчет оплаты по указанному номеру телефона",
|
||||||
|
"dry-wash.order-view.upload-car-image.field.label": "Загрузите фото вашего автомобиля, и наш сервис быстро рассчитает предварительную стоимость заказа!",
|
||||||
|
"dry-wash.order-view.upload-car-image.field.help": "Допустимые форматы: .jpg, .png. Максимальный размер: 5МБ",
|
||||||
|
"dry-wash.order-view.upload-car-image.file-input.placeholder": "Загрузите файл",
|
||||||
|
"dry-wash.order-view.upload-car-image.file-input.button": "Загрузить",
|
||||||
|
"dry-wash.order-view.upload-car-image-query.success.title": "Изображение автомобиля успешно загружено",
|
||||||
|
"dry-wash.order-view.upload-car-image-query.error.title": "Не удалось загрузить изображение автомобиля",
|
||||||
"dry-wash.notFound.title": "Страница не найдена",
|
"dry-wash.notFound.title": "Страница не найдена",
|
||||||
"dry-wash.notFound.description": "К сожалению, запрашиваемая вами страница не существует.",
|
"dry-wash.notFound.description": "К сожалению, запрашиваемая вами страница не существует.",
|
||||||
"dry-wash.notFound.button.back": "Вернуться на главную",
|
"dry-wash.notFound.button.back": "Вернуться на главную",
|
||||||
|
|||||||
27175
package-lock.json
generated
27175
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
126
package.json
126
package.json
@@ -1,53 +1,77 @@
|
|||||||
{
|
{
|
||||||
"name": "dry-wash",
|
"name": "dry-wash",
|
||||||
"version": "0.4.0",
|
"version": "0.9.0",
|
||||||
"description": "<a id=\"readme-top\"></a>",
|
"description": "<a id=\"readme-top\"></a>",
|
||||||
"main": "./src/index.tsx",
|
"main": "./src/index.tsx",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"test": "echo \"Error: no test specified\" && exit 1",
|
"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 src",
|
||||||
"eslint:fix": "npx eslint . --fix",
|
"eslint:fix": "npx eslint src --fix",
|
||||||
"preversion": "npm run eslint"
|
"preversion": "npm run eslint"
|
||||||
},
|
},
|
||||||
"keywords": [],
|
"keywords": [],
|
||||||
"author": "",
|
"author": "",
|
||||||
"license": "ISC",
|
"license": "ISC",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@brojs/cli": "^1.6.3",
|
"@babel/core": "^7.26.7",
|
||||||
"@chakra-ui/icons": "^2.2.4",
|
"@babel/preset-env": "^7.26.7",
|
||||||
"@chakra-ui/react": "^2.4.2",
|
"@babel/preset-react": "^7.26.3",
|
||||||
"@emotion/react": "^11.4.1",
|
"@babel/preset-typescript": "^7.26.0",
|
||||||
"@emotion/styled": "^11.3.0",
|
"@brojs/cli": "^1.8.4",
|
||||||
"@fontsource/open-sans": "^5.1.0",
|
"@chakra-ui/icons": "^2.2.4",
|
||||||
"@lottiefiles/react-lottie-player": "^3.5.4",
|
"@chakra-ui/react": "^2.10.5",
|
||||||
"@pbe/react-yandex-maps": "^1.2.5",
|
"@emotion/react": "^11.4.1",
|
||||||
"@types/react": "^18.3.12",
|
"@emotion/styled": "^11.3.0",
|
||||||
"dayjs": "^1.11.13",
|
"@fontsource/open-sans": "^5.1.0",
|
||||||
"express": "^4.21.1",
|
"@lottiefiles/react-lottie-player": "^3.5.4",
|
||||||
"framer-motion": "^6.2.8",
|
"@pbe/react-yandex-maps": "^1.2.5",
|
||||||
"i18next": "^23.16.4",
|
"@reduxjs/toolkit": "^2.5.0",
|
||||||
"keycloak-js": "^23.0.7",
|
"@testing-library/dom": "^10.4.0",
|
||||||
"react": "^18.3.1",
|
"@testing-library/react": "^16.2.0",
|
||||||
"react-dom": "^18.3.1",
|
"@types/react": "^18.3.12",
|
||||||
"react-hook-form": "^7.53.2",
|
"babel-jest": "^29.7.0",
|
||||||
"react-i18next": "^15.1.1",
|
"dayjs": "^1.11.13",
|
||||||
"react-icons": "^5.3.0",
|
"express": "^4.21.1",
|
||||||
"react-phone-number-input": "^3.4.9",
|
"framer-motion": "^6.2.8",
|
||||||
"react-router-dom": "^6.27.0"
|
"i18next": "^23.16.4",
|
||||||
},
|
"jest": "^29.7.0",
|
||||||
"devDependencies": {
|
"jest-environment-jsdom": "^29.7.0",
|
||||||
"@eslint/js": "^9.14.0",
|
"jest-fixed-jsdom": "^0.0.9",
|
||||||
"@stylistic/eslint-plugin": "^2.10.1",
|
"keycloak-js": "^23.0.7",
|
||||||
"@types/react-dom": "^18.3.1",
|
"msw": "^2.7.0",
|
||||||
"eslint": "^9.14.0",
|
"react": "^18.3.1",
|
||||||
"eslint-plugin-import": "^2.31.0",
|
"react-dom": "^18.3.1",
|
||||||
"eslint-plugin-react": "^7.37.2",
|
"react-hook-form": "^7.53.2",
|
||||||
"globals": "^15.11.0",
|
"react-i18next": "^15.1.1",
|
||||||
"prettier": "3.3.3",
|
"react-icons": "^5.3.0",
|
||||||
"typescript-eslint": "^8.12.2"
|
"react-phone-number-input": "^3.4.9",
|
||||||
}
|
"react-redux": "^9.2.0",
|
||||||
|
"react-router-dom": "^6.27.0",
|
||||||
|
"ts-jest": "^29.2.5",
|
||||||
|
"ts-node": "^10.9.2"
|
||||||
|
},
|
||||||
|
"devDependencies": {
|
||||||
|
"@eslint/js": "^9.14.0",
|
||||||
|
"@playwright/test": "^1.50.1",
|
||||||
|
"@stylistic/eslint-plugin": "^2.10.1",
|
||||||
|
"@testing-library/jest-dom": "^6.6.3",
|
||||||
|
"@types/jest": "^29.5.14",
|
||||||
|
"@types/node": "^22.13.1",
|
||||||
|
"@types/react-dom": "^18.3.1",
|
||||||
|
"@types/testing-library__jest-dom": "^5.14.9",
|
||||||
|
"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": "^5.7.3",
|
||||||
|
"typescript-eslint": "^8.12.2"
|
||||||
|
},
|
||||||
|
"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,
|
||||||
|
// },
|
||||||
|
});
|
||||||
18
src/__data__/features.ts
Normal file
18
src/__data__/features.ts
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
import { getFeatures } from "@brojs/cli";
|
||||||
|
|
||||||
|
const features = getFeatures('dry-wash');
|
||||||
|
|
||||||
|
export const FEATURE = {
|
||||||
|
orderViewStatusPolling: {
|
||||||
|
isOn: Boolean(features?.['order-view-status-polling']),
|
||||||
|
getValue: () => {
|
||||||
|
const interval = parseInt(features?.['order-view-status-polling']?.value);
|
||||||
|
if (!Number.isNaN(interval)) {
|
||||||
|
return interval;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
},
|
||||||
|
carImageUpload: {
|
||||||
|
isOn: Boolean(features?.['car-img-upload'])
|
||||||
|
}
|
||||||
|
};
|
||||||
84
src/__data__/service/api.ts
Normal file
84
src/__data__/service/api.ts
Normal file
@@ -0,0 +1,84 @@
|
|||||||
|
import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query/react';
|
||||||
|
import { getConfigValue } from '@brojs/cli';
|
||||||
|
import dayjs from 'dayjs';
|
||||||
|
|
||||||
|
import { Master, OrderArm } from '../../models/api';
|
||||||
|
|
||||||
|
import { extractBodyFromResponse } from './utils';
|
||||||
|
|
||||||
|
export type UpdateMasterPayload = Required<Pick<Master, 'id'>> &
|
||||||
|
Partial<Omit<Master, 'id'>>;
|
||||||
|
|
||||||
|
type UpdateOrderProps = Required<Pick<OrderArm, 'id'>> &
|
||||||
|
Partial<Pick<OrderArm, 'status' | 'notes'>> & {
|
||||||
|
master?: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
export const api = createApi({
|
||||||
|
reducerPath: 'api',
|
||||||
|
baseQuery: fetchBaseQuery({
|
||||||
|
baseUrl: new URL(getConfigValue('dry-wash.api'), location.origin).href,
|
||||||
|
}),
|
||||||
|
tagTypes: ['Masters', 'Orders'],
|
||||||
|
endpoints: (builder) => ({
|
||||||
|
getMasters: builder.query<Master[], void>({
|
||||||
|
query: () => ({ url: '/arm/masters' }),
|
||||||
|
transformResponse: extractBodyFromResponse<Master[]>,
|
||||||
|
providesTags: ['Masters'],
|
||||||
|
}),
|
||||||
|
updateOrders: builder.mutation<void, UpdateOrderProps>({
|
||||||
|
query: ({ id, status, notes, master }) => ({
|
||||||
|
url: `/order/${id}`,
|
||||||
|
method: 'PATCH',
|
||||||
|
body: { status, notes, master },
|
||||||
|
}),
|
||||||
|
invalidatesTags: ['Orders'],
|
||||||
|
}),
|
||||||
|
getOrders: builder.query<OrderArm[], { date: Date }>({
|
||||||
|
query: ({ date }) => {
|
||||||
|
const startDate = dayjs(date).startOf('day').toISOString();
|
||||||
|
const endDate = dayjs(date).endOf('day').toISOString();
|
||||||
|
return {
|
||||||
|
url: '/arm/orders',
|
||||||
|
method: 'POST',
|
||||||
|
body: { startDate, endDate },
|
||||||
|
};
|
||||||
|
},
|
||||||
|
transformResponse: extractBodyFromResponse<OrderArm[]>,
|
||||||
|
providesTags: ['Orders'],
|
||||||
|
}),
|
||||||
|
|
||||||
|
addMaster: builder.mutation<void, Pick<Master, 'name' | 'phone'>>({
|
||||||
|
query: (master) => ({
|
||||||
|
url: '/arm/masters',
|
||||||
|
method: 'POST',
|
||||||
|
body: master,
|
||||||
|
}),
|
||||||
|
invalidatesTags: ['Masters'],
|
||||||
|
}),
|
||||||
|
deleteMaster: builder.mutation<void, { id: string }>({
|
||||||
|
query: ({ id }) => ({
|
||||||
|
url: `/arm/masters/${id}`,
|
||||||
|
method: 'DELETE',
|
||||||
|
}),
|
||||||
|
invalidatesTags: ['Masters'],
|
||||||
|
}),
|
||||||
|
updateMaster: builder.mutation<void, UpdateMasterPayload>({
|
||||||
|
query: ({ id, name, phone }) => ({
|
||||||
|
url: `/arm/masters/${id}`,
|
||||||
|
method: 'PATCH',
|
||||||
|
body: { name, phone },
|
||||||
|
}),
|
||||||
|
invalidatesTags: ['Masters'],
|
||||||
|
}),
|
||||||
|
}),
|
||||||
|
});
|
||||||
|
|
||||||
|
export const {
|
||||||
|
useGetMastersQuery,
|
||||||
|
useAddMasterMutation,
|
||||||
|
useDeleteMasterMutation,
|
||||||
|
useUpdateMasterMutation,
|
||||||
|
useGetOrdersQuery,
|
||||||
|
useUpdateOrdersMutation,
|
||||||
|
} = api;
|
||||||
31
src/__data__/service/landing.api.ts
Normal file
31
src/__data__/service/landing.api.ts
Normal file
@@ -0,0 +1,31 @@
|
|||||||
|
import { GetOrder, CreateOrder, UploadCarImage } from "../../models/api";
|
||||||
|
|
||||||
|
import { api } from "./api";
|
||||||
|
import { extractBodyFromResponse, extractErrorMessageFromResponse } from "./utils";
|
||||||
|
|
||||||
|
export const landingApi = api.injectEndpoints({
|
||||||
|
endpoints: ({ mutation, query }) => ({
|
||||||
|
getOrder: query<GetOrder.Response, GetOrder.Params>({
|
||||||
|
query: ({ orderId }) => `/order/${orderId}`,
|
||||||
|
transformResponse: extractBodyFromResponse<GetOrder.Response>,
|
||||||
|
transformErrorResponse: extractErrorMessageFromResponse,
|
||||||
|
}),
|
||||||
|
createOrder: mutation<CreateOrder.Response, CreateOrder.Params>({
|
||||||
|
query: ({ body }) => ({
|
||||||
|
url: `/order/create`,
|
||||||
|
body,
|
||||||
|
method: 'POST'
|
||||||
|
}),
|
||||||
|
transformResponse: extractBodyFromResponse<CreateOrder.Response>,
|
||||||
|
transformErrorResponse: extractErrorMessageFromResponse,
|
||||||
|
}),
|
||||||
|
uploadCarImage: mutation<UploadCarImage.Response, UploadCarImage.Params>({
|
||||||
|
query: ({ orderId, body }) => ({
|
||||||
|
url: `/order/${orderId}/upload-car-img`,
|
||||||
|
body,
|
||||||
|
method: 'POST'
|
||||||
|
}),
|
||||||
|
transformErrorResponse: extractErrorMessageFromResponse,
|
||||||
|
}),
|
||||||
|
})
|
||||||
|
});
|
||||||
22
src/__data__/service/utils.ts
Normal file
22
src/__data__/service/utils.ts
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
import { FetchBaseQueryError } from '@reduxjs/toolkit/query';
|
||||||
|
|
||||||
|
import { BaseResponse } from '../../models/api';
|
||||||
|
|
||||||
|
export const extractBodyFromResponse = <Body>(response: BaseResponse<Body>) => {
|
||||||
|
if (response.success) {
|
||||||
|
return response.body;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
export const extractErrorMessageFromResponse = ({
|
||||||
|
data,
|
||||||
|
}: FetchBaseQueryError) => {
|
||||||
|
if (
|
||||||
|
typeof data === 'object' &&
|
||||||
|
data !== null &&
|
||||||
|
'error' in data &&
|
||||||
|
typeof data.error === 'string'
|
||||||
|
) {
|
||||||
|
return data.error;
|
||||||
|
}
|
||||||
|
};
|
||||||
16
src/__data__/store.ts
Normal file
16
src/__data__/store.ts
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
import { configureStore } from '@reduxjs/toolkit';
|
||||||
|
|
||||||
|
import { api } from './service/api';
|
||||||
|
|
||||||
|
export const store = configureStore({
|
||||||
|
reducer: {
|
||||||
|
[api.reducerPath]: api.reducer,
|
||||||
|
},
|
||||||
|
middleware: (getDefaultMiddleware) =>
|
||||||
|
getDefaultMiddleware({
|
||||||
|
serializableCheck: false
|
||||||
|
}).concat(api.middleware),
|
||||||
|
});
|
||||||
|
|
||||||
|
export type RootState = ReturnType<typeof store.getState>;
|
||||||
|
export type AppDispatch = typeof store.dispatch;
|
||||||
100
src/api/arm.ts
100
src/api/arm.ts
@@ -1,100 +0,0 @@
|
|||||||
import { getConfigValue } from '@brojs/cli';
|
|
||||||
|
|
||||||
enum ArmEndpoints {
|
|
||||||
ORDERS = '/arm/orders',
|
|
||||||
MASTERS = '/arm/masters',
|
|
||||||
}
|
|
||||||
|
|
||||||
const armService = () => {
|
|
||||||
const endpoint = getConfigValue('dry-wash.api');
|
|
||||||
|
|
||||||
const fetchOrders = async ({ date }: { date: Date }) => {
|
|
||||||
const response = await fetch(`${endpoint}${ArmEndpoints.ORDERS}`, {
|
|
||||||
method: 'POST',
|
|
||||||
headers: {
|
|
||||||
'Content-Type': 'application/json',
|
|
||||||
},
|
|
||||||
body: JSON.stringify({ date }),
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!response.ok) {
|
|
||||||
throw new Error(`Failed to fetch orders: ${response.status}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
return await response.json();
|
|
||||||
};
|
|
||||||
|
|
||||||
const fetchMasters = async () => {
|
|
||||||
const response = await fetch(`${endpoint}${ArmEndpoints.MASTERS}`);
|
|
||||||
|
|
||||||
if (!response.ok) {
|
|
||||||
throw new Error(`Failed to fetch masters: ${response.status}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
return await response.json();
|
|
||||||
};
|
|
||||||
|
|
||||||
const addMaster = async ({
|
|
||||||
name,
|
|
||||||
phone,
|
|
||||||
}: {
|
|
||||||
name: string;
|
|
||||||
phone: string;
|
|
||||||
}) => {
|
|
||||||
const response = await fetch(`${endpoint}${ArmEndpoints.MASTERS}`, {
|
|
||||||
method: 'POST',
|
|
||||||
headers: {
|
|
||||||
'Content-Type': 'application/json',
|
|
||||||
},
|
|
||||||
body: JSON.stringify({ name, phone }),
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!response.ok) {
|
|
||||||
throw new Error(`Failed to fetch masters: ${response.status}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
return await response.json();
|
|
||||||
};
|
|
||||||
|
|
||||||
const deleteMaster = async ({ id }: { id: string }) => {
|
|
||||||
const response = await fetch(`${endpoint}${ArmEndpoints.MASTERS}/${id}`, {
|
|
||||||
method: 'DELETE',
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!response.ok) {
|
|
||||||
throw new Error(`Failed to fetch masters: ${response.status}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
return await response.json();
|
|
||||||
};
|
|
||||||
|
|
||||||
const updateMaster = async ({
|
|
||||||
id,
|
|
||||||
name,
|
|
||||||
phone,
|
|
||||||
}: {
|
|
||||||
id: string;
|
|
||||||
name?: string;
|
|
||||||
phone?: string;
|
|
||||||
}) => {
|
|
||||||
const body = JSON.stringify({ name, phone });
|
|
||||||
|
|
||||||
const response = await fetch(`${endpoint}${ArmEndpoints.MASTERS}/${id}`, {
|
|
||||||
method: 'PATCH',
|
|
||||||
headers: {
|
|
||||||
'Content-Type': 'application/json',
|
|
||||||
},
|
|
||||||
body,
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!response.ok) {
|
|
||||||
throw new Error(`Failed to fetch update masters: ${response.status}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
return await response.json();
|
|
||||||
};
|
|
||||||
|
|
||||||
return { fetchOrders, fetchMasters, addMaster, deleteMaster, updateMaster };
|
|
||||||
};
|
|
||||||
|
|
||||||
export { armService, ArmEndpoints };
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
import { getConfigValue } from '@brojs/cli';
|
|
||||||
|
|
||||||
import { Order } from '../models/landing';
|
|
||||||
|
|
||||||
enum LandingEndpoints {
|
|
||||||
ORDER_VIEW = '/order'
|
|
||||||
}
|
|
||||||
|
|
||||||
const LandingService = () => {
|
|
||||||
const endpoint = getConfigValue('dry-wash.api');
|
|
||||||
|
|
||||||
const fetchOrder = async (orderId: Order.Id) => {
|
|
||||||
const response = await fetch(`${endpoint}${LandingEndpoints.ORDER_VIEW}/${orderId}`);
|
|
||||||
|
|
||||||
if (!response.ok) {
|
|
||||||
throw new Error(`Failed to fetch order: ${response.status}`);
|
|
||||||
}
|
|
||||||
|
|
||||||
return await response.json();
|
|
||||||
};
|
|
||||||
|
|
||||||
return { fetchOrder };
|
|
||||||
};
|
|
||||||
|
|
||||||
export { LandingService, LandingEndpoints };
|
|
||||||
18
src/app.tsx
18
src/app.tsx
@@ -1,19 +1,23 @@
|
|||||||
import React from 'react';
|
import React from 'react';
|
||||||
import { BrowserRouter } from 'react-router-dom';
|
import { BrowserRouter } from 'react-router-dom';
|
||||||
import { ChakraProvider, theme as chakraTheme } from '@chakra-ui/react';
|
import { ChakraProvider, theme as chakraTheme } from '@chakra-ui/react';
|
||||||
|
import { Provider } from 'react-redux';
|
||||||
|
|
||||||
import Routers from './routes';
|
import Routers from './routes';
|
||||||
import ErrorBoundary from './components/ErrorBoundary';
|
import ErrorBoundary from './components/ErrorBoundary';
|
||||||
|
import { store } from './__data__/store';
|
||||||
|
|
||||||
const App = () => {
|
const App = () => {
|
||||||
return (
|
return (
|
||||||
<ChakraProvider theme={chakraTheme}>
|
<Provider store={store}>
|
||||||
<ErrorBoundary>
|
<ChakraProvider theme={chakraTheme}>
|
||||||
<BrowserRouter>
|
<ErrorBoundary>
|
||||||
<Routers />
|
<BrowserRouter>
|
||||||
</BrowserRouter>
|
<Routers />
|
||||||
</ErrorBoundary>
|
</BrowserRouter>
|
||||||
</ChakraProvider>
|
</ErrorBoundary>
|
||||||
|
</ChakraProvider>
|
||||||
|
</Provider>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
1
src/assets/animation/index.ts
Normal file
1
src/assets/animation/index.ts
Normal file
@@ -0,0 +1 @@
|
|||||||
|
export { default as OrderCreationAnimation } from './order-creation.json';
|
||||||
1
src/assets/animation/order-creation.json
Normal file
1
src/assets/animation/order-creation.json
Normal file
File diff suppressed because one or more lines are too long
@@ -3,6 +3,7 @@ export { default as CrossoverImg } from './crossover.webp';
|
|||||||
export { default as HatchbackImg } from './hatchback.webp';
|
export { default as HatchbackImg } from './hatchback.webp';
|
||||||
export { default as LiftbackImg } from './liftback.webp';
|
export { default as LiftbackImg } from './liftback.webp';
|
||||||
export { default as MinivanImg } from './minivan.webp';
|
export { default as MinivanImg } from './minivan.webp';
|
||||||
|
export { default as OtherImg } from './other.webp';
|
||||||
export { default as PickupImg } from './pickup.webp';
|
export { default as PickupImg } from './pickup.webp';
|
||||||
export { default as SedanImg } from './sedan.webp';
|
export { default as SedanImg } from './sedan.webp';
|
||||||
export { default as SportsCarImg } from './sports-car.webp';
|
export { default as SportsCarImg } from './sports-car.webp';
|
||||||
|
|||||||
BIN
src/assets/images/car-body-type/other.webp
Normal file
BIN
src/assets/images/car-body-type/other.webp
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.2 KiB |
@@ -1,6 +1,7 @@
|
|||||||
import React from 'react';
|
import React from 'react';
|
||||||
import { Box, Button, Text } from '@chakra-ui/react';
|
import { Box, Button, Text } from '@chakra-ui/react';
|
||||||
import { ArrowBackIcon, ArrowForwardIcon } from '@chakra-ui/icons';
|
import { ArrowBackIcon, ArrowForwardIcon } from '@chakra-ui/icons';
|
||||||
|
import dayjs from 'dayjs';
|
||||||
|
|
||||||
interface DateNavigatorProps {
|
interface DateNavigatorProps {
|
||||||
currentDate: Date;
|
currentDate: Date;
|
||||||
@@ -19,7 +20,7 @@ const DateNavigator = ({
|
|||||||
<ArrowBackIcon />
|
<ArrowBackIcon />
|
||||||
</Button>
|
</Button>
|
||||||
<Text mx='4' fontSize='lg' fontWeight='bold'>
|
<Text mx='4' fontSize='lg' fontWeight='bold'>
|
||||||
{currentDate.toLocaleDateString()}
|
{dayjs(currentDate).format('DD.MM.YYYY')}
|
||||||
</Text>
|
</Text>
|
||||||
<Button onClick={onNextDate}>
|
<Button onClick={onNextDate}>
|
||||||
<ArrowForwardIcon />
|
<ArrowForwardIcon />
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import React, { useState } from 'react';
|
import React, { useEffect, useState } from 'react';
|
||||||
import {
|
import {
|
||||||
Editable,
|
Editable,
|
||||||
EditableInput,
|
EditableInput,
|
||||||
@@ -9,63 +9,51 @@ import {
|
|||||||
useEditableControls,
|
useEditableControls,
|
||||||
ButtonGroup,
|
ButtonGroup,
|
||||||
Stack,
|
Stack,
|
||||||
useToast,
|
|
||||||
} from '@chakra-ui/react';
|
} from '@chakra-ui/react';
|
||||||
import { CheckIcon, CloseIcon, EditIcon } from '@chakra-ui/icons';
|
import { CheckIcon, CloseIcon, EditIcon } from '@chakra-ui/icons';
|
||||||
import { useTranslation } from 'react-i18next';
|
import { useTranslation } from 'react-i18next';
|
||||||
|
|
||||||
|
import { useUpdateMasterMutation } from '../../__data__/service/api';
|
||||||
|
import useShowToast from '../../hooks/useShowToast';
|
||||||
|
|
||||||
interface EditableWrapperProps {
|
interface EditableWrapperProps {
|
||||||
value: string;
|
value: string;
|
||||||
onSubmit: ({
|
fieldName: 'phone' | 'name';
|
||||||
id,
|
|
||||||
name,
|
|
||||||
phone,
|
|
||||||
}: {
|
|
||||||
id: string;
|
|
||||||
name?: string;
|
|
||||||
phone?: string;
|
|
||||||
}) => Promise<unknown>;
|
|
||||||
as: 'phone' | 'name';
|
|
||||||
id: string;
|
id: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
const EditableWrapper = ({ value, onSubmit, as, id }: EditableWrapperProps) => {
|
const EditableWrapper = ({ value, fieldName, id }: EditableWrapperProps) => {
|
||||||
|
const [updateMaster, { isError, isSuccess, error }] =
|
||||||
|
useUpdateMasterMutation();
|
||||||
|
|
||||||
const { t } = useTranslation('~', {
|
const { t } = useTranslation('~', {
|
||||||
keyPrefix: 'dry-wash.arm.master.editable',
|
keyPrefix: 'dry-wash.arm.master.editable',
|
||||||
});
|
});
|
||||||
|
|
||||||
const toast = useToast();
|
const showToast = useShowToast();
|
||||||
const [currentValue, setCurrentValue] = useState<string>(value);
|
const [currentValue, setCurrentValue] = useState<string>(value);
|
||||||
|
|
||||||
const handleSubmit = async (newValue: string) => {
|
const handleSubmit = async (newValue: string) => {
|
||||||
if (currentValue === newValue) return;
|
if (currentValue === newValue) return;
|
||||||
|
|
||||||
try {
|
await updateMaster({ id, [fieldName]: newValue });
|
||||||
await onSubmit({ id, [as]: newValue });
|
|
||||||
|
|
||||||
setCurrentValue(newValue);
|
setCurrentValue(newValue);
|
||||||
|
|
||||||
toast({
|
|
||||||
title: 'Успешно!',
|
|
||||||
description: 'Данные обновлены.',
|
|
||||||
status: 'success',
|
|
||||||
duration: 2000,
|
|
||||||
isClosable: true,
|
|
||||||
position: 'top-right',
|
|
||||||
});
|
|
||||||
} catch (error) {
|
|
||||||
toast({
|
|
||||||
title: 'Ошибка!',
|
|
||||||
description: 'Не удалось обновить данные.',
|
|
||||||
status: 'error',
|
|
||||||
duration: 2000,
|
|
||||||
isClosable: true,
|
|
||||||
position: 'top-right',
|
|
||||||
});
|
|
||||||
console.error('Ошибка при обновлении данных:', error);
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (isSuccess) {
|
||||||
|
showToast(t('toast.success'), 'success');
|
||||||
|
}
|
||||||
|
}, [isSuccess]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (isError) {
|
||||||
|
showToast(t('toast.error.title'), 'error', t('toast.error.description'));
|
||||||
|
console.error(t('toast.error.description'), error);
|
||||||
|
}
|
||||||
|
}, [isError, error]);
|
||||||
|
|
||||||
function EditableControls() {
|
function EditableControls() {
|
||||||
const {
|
const {
|
||||||
isEditing,
|
isEditing,
|
||||||
|
|||||||
@@ -33,22 +33,22 @@ class ErrorBoundary extends Component<ErrorBoundaryProps, ErrorBoundaryState> {
|
|||||||
|
|
||||||
render() {
|
render() {
|
||||||
const { hasError } = this.state;
|
const { hasError } = this.state;
|
||||||
//TODO: добавить анимацию после залива 404 страницы
|
|
||||||
//TODO: может сделать обертку для хука, чтоб язык менялся без перезагрузки
|
|
||||||
if (hasError) {
|
if (hasError) {
|
||||||
return (
|
return (
|
||||||
<Center minH='100vh'>
|
<Center minH='100vh' data-testid='error-boundary'>
|
||||||
<VStack spacing={4} textAlign='center'>
|
<VStack spacing={4} textAlign='center'>
|
||||||
<Heading as='h1' size='2xl'>
|
<Heading as='h1' size='2xl' data-testid='error-title'>
|
||||||
{i18next.t('~:dry-wash.errorBoundary.title')}
|
{i18next.t('~:dry-wash.errorBoundary.title')}
|
||||||
</Heading>
|
</Heading>
|
||||||
<Text fontSize='lg'>
|
<Text fontSize='lg' data-testid='error-description'>
|
||||||
{i18next.t('~:dry-wash.errorBoundary.description')}
|
{i18next.t('~:dry-wash.errorBoundary.description')}
|
||||||
</Text>
|
</Text>
|
||||||
<Button
|
<Button
|
||||||
colorScheme='teal'
|
colorScheme='teal'
|
||||||
size='lg'
|
size='lg'
|
||||||
variant='outline'
|
variant='outline'
|
||||||
|
data-testid='error-reload-button'
|
||||||
onClick={() => window.location.reload()}
|
onClick={() => window.location.reload()}
|
||||||
>
|
>
|
||||||
{i18next.t('~:dry-wash.errorBoundary.button.reload')}
|
{i18next.t('~:dry-wash.errorBoundary.button.reload')}
|
||||||
|
|||||||
@@ -0,0 +1,51 @@
|
|||||||
|
import * as React from 'react';
|
||||||
|
import { describe, expect, it, jest } from '@jest/globals';
|
||||||
|
import { render, screen, waitFor } from '@testing-library/react';
|
||||||
|
import { BrowserRouter } from 'react-router-dom';
|
||||||
|
import { Provider } from 'react-redux';
|
||||||
|
import { useEffect } from 'react';
|
||||||
|
|
||||||
|
import ErrorBoundary from '../ErrorBoundary';
|
||||||
|
import { store } from '../../../__data__/store';
|
||||||
|
|
||||||
|
const ProblematicComponent = () => {
|
||||||
|
useEffect(() => {
|
||||||
|
throw new Error('Test Error');
|
||||||
|
}, []);
|
||||||
|
|
||||||
|
return <div>Этот текст не должен появиться</div>;
|
||||||
|
};
|
||||||
|
jest.mock('@brojs/cli', () => {
|
||||||
|
return {
|
||||||
|
getNavigationValue: () => '/auth/login',
|
||||||
|
getConfigValue: () => '/api',
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('ErrorBoundary', () => {
|
||||||
|
it('должен отобразить запасной UI при ошибке', async () => {
|
||||||
|
// Подавляем вывод ошибки в консоль во время теста
|
||||||
|
const consoleSpy = jest.spyOn(console, 'error');
|
||||||
|
consoleSpy.mockImplementation(() => {});
|
||||||
|
|
||||||
|
const { container } = render(
|
||||||
|
<Provider store={store}>
|
||||||
|
<ErrorBoundary>
|
||||||
|
<BrowserRouter>
|
||||||
|
<ProblematicComponent />
|
||||||
|
</BrowserRouter>
|
||||||
|
</ErrorBoundary>
|
||||||
|
</Provider>,
|
||||||
|
);
|
||||||
|
|
||||||
|
const button = await waitFor(() =>
|
||||||
|
screen.getByTestId('error-reload-button'),
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(button).not.toBeNull();
|
||||||
|
expect(container).toMatchSnapshot();
|
||||||
|
|
||||||
|
// Восстанавливаем console.error после теста
|
||||||
|
consoleSpy.mockRestore();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
// Jest Snapshot v1, https://goo.gl/fbAQLP
|
||||||
|
|
||||||
|
exports[`ErrorBoundary должен отобразить запасной UI при ошибке 1`] = `
|
||||||
|
<div>
|
||||||
|
<div
|
||||||
|
class="css-1o0ed15"
|
||||||
|
data-testid="error-boundary"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="chakra-stack css-zefqyp"
|
||||||
|
>
|
||||||
|
<h1
|
||||||
|
class="chakra-heading css-0"
|
||||||
|
data-testid="error-title"
|
||||||
|
/>
|
||||||
|
<p
|
||||||
|
class="chakra-text css-1ezsviu"
|
||||||
|
data-testid="error-description"
|
||||||
|
/>
|
||||||
|
<button
|
||||||
|
class="chakra-button css-4xx2wk"
|
||||||
|
data-testid="error-reload-button"
|
||||||
|
type="button"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
@@ -1,16 +1,16 @@
|
|||||||
import React from 'react';
|
import React, { useEffect } from 'react';
|
||||||
import {
|
import {
|
||||||
Menu,
|
Menu,
|
||||||
MenuButton,
|
MenuButton,
|
||||||
MenuList,
|
MenuList,
|
||||||
MenuItem,
|
MenuItem,
|
||||||
IconButton,
|
IconButton,
|
||||||
useToast,
|
|
||||||
} from '@chakra-ui/react';
|
} from '@chakra-ui/react';
|
||||||
import { EditIcon } from '@chakra-ui/icons';
|
import { EditIcon } from '@chakra-ui/icons';
|
||||||
import { useTranslation } from 'react-i18next';
|
import { useTranslation } from 'react-i18next';
|
||||||
|
|
||||||
import { armService } from '../../api/arm';
|
import { useDeleteMasterMutation } from '../../__data__/service/api';
|
||||||
|
import useShowToast from '../../hooks/useShowToast';
|
||||||
|
|
||||||
interface MasterActionsMenu {
|
interface MasterActionsMenu {
|
||||||
id: string;
|
id: string;
|
||||||
@@ -21,38 +21,35 @@ const MasterActionsMenu = ({ id }: MasterActionsMenu) => {
|
|||||||
keyPrefix: 'dry-wash.arm.master.table.actionsMenu',
|
keyPrefix: 'dry-wash.arm.master.table.actionsMenu',
|
||||||
});
|
});
|
||||||
|
|
||||||
const { deleteMaster } = armService();
|
const [deleteMaster, { isSuccess, isError, error, isLoading }] =
|
||||||
const toast = useToast();
|
useDeleteMasterMutation();
|
||||||
|
|
||||||
|
const showToast = useShowToast();
|
||||||
|
|
||||||
const handleClickDelete = async () => {
|
const handleClickDelete = async () => {
|
||||||
try {
|
await deleteMaster({ id });
|
||||||
await deleteMaster({ id });
|
};
|
||||||
toast({
|
|
||||||
title: 'Мастер удалён.',
|
useEffect(() => {
|
||||||
description: `Мастер с ID "${id}" успешно удалён.`,
|
if (isSuccess) {
|
||||||
status: 'success',
|
showToast(t('toast.success'), 'success');
|
||||||
duration: 5000,
|
}
|
||||||
isClosable: true,
|
}, [isSuccess]);
|
||||||
position: 'top-right',
|
|
||||||
});
|
useEffect(() => {
|
||||||
} catch (error) {
|
if (isError) {
|
||||||
toast({
|
showToast(t('toast.error.title'), 'error', t('toast.error.description'));
|
||||||
title: 'Ошибка удаления мастера.',
|
|
||||||
description: 'Не удалось удалить мастера. Попробуйте ещё раз.',
|
|
||||||
status: 'error',
|
|
||||||
duration: 5000,
|
|
||||||
isClosable: true,
|
|
||||||
position: 'top-right',
|
|
||||||
});
|
|
||||||
console.error(error);
|
console.error(error);
|
||||||
}
|
}
|
||||||
};
|
}, [isError]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Menu>
|
<Menu>
|
||||||
<MenuButton icon={<EditIcon />} as={IconButton} variant='outline' />
|
<MenuButton icon={<EditIcon />} as={IconButton} variant='outline' />
|
||||||
<MenuList>
|
<MenuList>
|
||||||
<MenuItem onClick={handleClickDelete}>{t('delete')}</MenuItem>
|
<MenuItem onClick={handleClickDelete} isDisabled={isLoading}>
|
||||||
|
{t('delete')}
|
||||||
|
</MenuItem>
|
||||||
</MenuList>
|
</MenuList>
|
||||||
</Menu>
|
</Menu>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
import React, { useState } from 'react';
|
import React, { useEffect } from 'react';
|
||||||
|
import { useForm, SubmitHandler } from 'react-hook-form';
|
||||||
import {
|
import {
|
||||||
Button,
|
Button,
|
||||||
FormControl,
|
FormControl,
|
||||||
@@ -11,98 +12,128 @@ import {
|
|||||||
DrawerFooter,
|
DrawerFooter,
|
||||||
DrawerHeader,
|
DrawerHeader,
|
||||||
DrawerOverlay,
|
DrawerOverlay,
|
||||||
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 { armService } from '../../api/arm';
|
import { useAddMasterMutation } from '../../__data__/service/api';
|
||||||
|
import { DrawerInputs } from '../../models/arm/form';
|
||||||
|
import useShowToast from '../../hooks/useShowToast';
|
||||||
|
|
||||||
const MasterDrawer = ({ isOpen, onClose }) => {
|
interface MasterDrawerProps {
|
||||||
const { addMaster } = armService();
|
isOpen: boolean;
|
||||||
const toast = useToast();
|
onClose: () => void;
|
||||||
|
}
|
||||||
|
|
||||||
const [newMaster, setNewMaster] = useState({ name: '', phone: '' });
|
const MasterDrawer = ({ isOpen, onClose }: MasterDrawerProps) => {
|
||||||
|
const {
|
||||||
const handleSave = async () => {
|
register,
|
||||||
if (newMaster.name.trim() === '' || newMaster.phone.trim() === '') {
|
handleSubmit,
|
||||||
return;
|
reset,
|
||||||
}
|
formState: { errors },
|
||||||
|
} = useForm<DrawerInputs>();
|
||||||
try {
|
|
||||||
await addMaster(newMaster);
|
|
||||||
toast({
|
|
||||||
title: 'Мастер создан.',
|
|
||||||
description: `Мастер "${newMaster.name}" успешно добавлен.`,
|
|
||||||
status: 'success',
|
|
||||||
duration: 5000,
|
|
||||||
isClosable: true,
|
|
||||||
position: 'top-right',
|
|
||||||
});
|
|
||||||
onClose();
|
|
||||||
} catch (error) {
|
|
||||||
toast({
|
|
||||||
title: 'Ошибка при создании мастера.',
|
|
||||||
description: 'Не удалось добавить мастера. Попробуйте еще раз.',
|
|
||||||
status: 'error',
|
|
||||||
duration: 5000,
|
|
||||||
isClosable: true,
|
|
||||||
position: 'top-right',
|
|
||||||
});
|
|
||||||
console.error(error);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
const { t } = useTranslation('~', {
|
const { t } = useTranslation('~', {
|
||||||
keyPrefix: 'dry-wash.arm.master.drawer',
|
keyPrefix: 'dry-wash.arm.master.drawer',
|
||||||
});
|
});
|
||||||
|
|
||||||
|
const onSubmit: SubmitHandler<DrawerInputs> = async (data) => {
|
||||||
|
const trimMaster = {
|
||||||
|
name: data.name.trim(),
|
||||||
|
phone: data.phone.trim(),
|
||||||
|
};
|
||||||
|
|
||||||
|
const isEmptyFields = trimMaster.name === '' || trimMaster.phone === '';
|
||||||
|
|
||||||
|
if (isEmptyFields) {
|
||||||
|
showToast(t('toast.error.base'), 'error', t('toast.error.empty-fields'));
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
await addMaster(trimMaster);
|
||||||
|
};
|
||||||
|
|
||||||
|
const [addMaster, { error, isSuccess }] = useAddMasterMutation();
|
||||||
|
const showToast = useShowToast();
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (isSuccess) {
|
||||||
|
showToast(t('toast.create-master'), 'success');
|
||||||
|
reset();
|
||||||
|
onClose();
|
||||||
|
}
|
||||||
|
}, [isSuccess]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (error) {
|
||||||
|
showToast(
|
||||||
|
t('toast.error.create-master'),
|
||||||
|
'error',
|
||||||
|
t('toast.error.create-master-details'),
|
||||||
|
);
|
||||||
|
console.error(error);
|
||||||
|
}
|
||||||
|
}, [error]);
|
||||||
|
|
||||||
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>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -5,23 +5,8 @@ import { useTranslation } from 'react-i18next';
|
|||||||
import MasterActionsMenu from '../MasterActionsMenu';
|
import MasterActionsMenu from '../MasterActionsMenu';
|
||||||
import { getTimeSlot } from '../../lib';
|
import { getTimeSlot } from '../../lib';
|
||||||
import EditableWrapper from '../Editable/Editable';
|
import EditableWrapper from '../Editable/Editable';
|
||||||
import { armService } from '../../api/arm';
|
|
||||||
|
|
||||||
export interface Schedule {
|
|
||||||
id: string;
|
|
||||||
startWashTime: string;
|
|
||||||
endWashTime: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
export type MasterProps = {
|
|
||||||
id: string;
|
|
||||||
name: string;
|
|
||||||
phone: string;
|
|
||||||
schedule: Schedule[];
|
|
||||||
};
|
|
||||||
|
|
||||||
const MasterItem = ({ name, phone, id, schedule }) => {
|
const MasterItem = ({ name, phone, id, schedule }) => {
|
||||||
const { updateMaster } = armService();
|
|
||||||
const { t } = useTranslation('~', {
|
const { t } = useTranslation('~', {
|
||||||
keyPrefix: 'dry-wash.arm.master',
|
keyPrefix: 'dry-wash.arm.master',
|
||||||
});
|
});
|
||||||
@@ -29,12 +14,7 @@ const MasterItem = ({ name, phone, id, schedule }) => {
|
|||||||
return (
|
return (
|
||||||
<Tr>
|
<Tr>
|
||||||
<Td>
|
<Td>
|
||||||
<EditableWrapper
|
<EditableWrapper id={id} fieldName={'name'} value={name} />
|
||||||
id={id}
|
|
||||||
as={'name'}
|
|
||||||
value={name}
|
|
||||||
onSubmit={updateMaster}
|
|
||||||
/>
|
|
||||||
</Td>
|
</Td>
|
||||||
<Td>
|
<Td>
|
||||||
{schedule?.length > 0 ? (
|
{schedule?.length > 0 ? (
|
||||||
@@ -50,12 +30,7 @@ const MasterItem = ({ name, phone, id, schedule }) => {
|
|||||||
)}
|
)}
|
||||||
</Td>
|
</Td>
|
||||||
<Td>
|
<Td>
|
||||||
<EditableWrapper
|
<EditableWrapper id={id} fieldName={'phone'} value={phone} />
|
||||||
id={id}
|
|
||||||
as={'phone'}
|
|
||||||
value={phone}
|
|
||||||
onSubmit={updateMaster}
|
|
||||||
/>
|
|
||||||
</Td>
|
</Td>
|
||||||
<Td>
|
<Td>
|
||||||
<MasterActionsMenu id={id} />
|
<MasterActionsMenu id={id} />
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import React, { useEffect, useState } from 'react';
|
import React, { useEffect } from 'react';
|
||||||
import {
|
import {
|
||||||
Box,
|
Box,
|
||||||
Heading,
|
Heading,
|
||||||
@@ -10,7 +10,6 @@ import {
|
|||||||
Button,
|
Button,
|
||||||
useDisclosure,
|
useDisclosure,
|
||||||
Flex,
|
Flex,
|
||||||
useToast,
|
|
||||||
Td,
|
Td,
|
||||||
Text,
|
Text,
|
||||||
Spinner,
|
Spinner,
|
||||||
@@ -19,8 +18,8 @@ import { useTranslation } from 'react-i18next';
|
|||||||
|
|
||||||
import MasterItem from '../MasterItem';
|
import MasterItem from '../MasterItem';
|
||||||
import MasterDrawer from '../MasterDrawer';
|
import MasterDrawer from '../MasterDrawer';
|
||||||
import { armService } from '../../api/arm';
|
import { useGetMastersQuery } from '../../__data__/service/api';
|
||||||
import { MasterProps } from '../MasterItem/MasterItem';
|
import useShowToast from '../../hooks/useShowToast';
|
||||||
|
|
||||||
const TABLE_HEADERS = [
|
const TABLE_HEADERS = [
|
||||||
'name' as const,
|
'name' as const,
|
||||||
@@ -31,40 +30,19 @@ const TABLE_HEADERS = [
|
|||||||
|
|
||||||
const Masters = () => {
|
const Masters = () => {
|
||||||
const { isOpen, onOpen, onClose } = useDisclosure();
|
const { isOpen, onOpen, onClose } = useDisclosure();
|
||||||
const toast = useToast();
|
const showToast = useShowToast();
|
||||||
|
|
||||||
const { t } = useTranslation('~', {
|
const { t } = useTranslation('~', {
|
||||||
keyPrefix: 'dry-wash.arm.master',
|
keyPrefix: 'dry-wash.arm.master',
|
||||||
});
|
});
|
||||||
|
|
||||||
const [masters, setMasters] = useState<MasterProps[]>([]);
|
const { data: masters, error, isLoading, isSuccess } = useGetMastersQuery();
|
||||||
const [loading, setLoading] = useState(false);
|
|
||||||
const [error, setError] = useState<string | null>(null);
|
|
||||||
|
|
||||||
const { fetchMasters } = armService();
|
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const loadMasters = async () => {
|
if (error) {
|
||||||
setLoading(true);
|
showToast(t('error.title'), 'error');
|
||||||
|
}
|
||||||
try {
|
}, [error]);
|
||||||
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 (
|
return (
|
||||||
<Box p='8'>
|
<Box p='8'>
|
||||||
@@ -83,22 +61,21 @@ const Masters = () => {
|
|||||||
</Tr>
|
</Tr>
|
||||||
</Thead>
|
</Thead>
|
||||||
<Tbody>
|
<Tbody>
|
||||||
{loading && (
|
{isLoading && (
|
||||||
<Tr>
|
<Tr>
|
||||||
<Td colSpan={TABLE_HEADERS.length} textAlign='center' py='8'>
|
<Td colSpan={TABLE_HEADERS.length} textAlign='center' py='8'>
|
||||||
<Spinner size='lg' />
|
<Spinner size='lg' />
|
||||||
</Td>
|
</Td>
|
||||||
</Tr>
|
</Tr>
|
||||||
)}
|
)}
|
||||||
{!loading && masters.length === 0 && !error && (
|
{isSuccess && masters.length === 0 && (
|
||||||
<Tr>
|
<Tr>
|
||||||
<Td colSpan={TABLE_HEADERS.length}>
|
<Td colSpan={TABLE_HEADERS.length}>
|
||||||
<Text>{t('table.empty')}</Text>
|
<Text>{t('table.empty')}</Text>
|
||||||
</Td>
|
</Td>
|
||||||
</Tr>
|
</Tr>
|
||||||
)}
|
)}
|
||||||
{!loading &&
|
{isSuccess &&
|
||||||
!error &&
|
|
||||||
masters.map((master, index) => (
|
masters.map((master, index) => (
|
||||||
<MasterItem key={index} {...master} />
|
<MasterItem key={index} {...master} />
|
||||||
))}
|
))}
|
||||||
|
|||||||
@@ -1,36 +1,11 @@
|
|||||||
import React, { useState } from 'react';
|
import React, { ChangeEvent, useState } from 'react';
|
||||||
import { Td, Tr, Link, Select } from '@chakra-ui/react';
|
import { Td, Tr, Link, Select } from '@chakra-ui/react';
|
||||||
import { useTranslation } from 'react-i18next';
|
import { useTranslation } from 'react-i18next';
|
||||||
import dayjs from 'dayjs';
|
import dayjs from 'dayjs';
|
||||||
|
|
||||||
import { MasterProps } from '../MasterItem/MasterItem';
|
|
||||||
import { getTimeSlot } from '../../lib';
|
import { getTimeSlot } from '../../lib';
|
||||||
|
import { useUpdateOrdersMutation } from '../../__data__/service/api';
|
||||||
const statuses = [
|
import { OrderArm, Status, statuses } from '../../models/api';
|
||||||
'pending' as const,
|
|
||||||
'progress' as const,
|
|
||||||
'working' as const,
|
|
||||||
'canceled' as const,
|
|
||||||
'complete' as const,
|
|
||||||
];
|
|
||||||
|
|
||||||
type GetArrItemType<ArrType> =
|
|
||||||
ArrType extends Array<infer ItemType> ? ItemType : never;
|
|
||||||
|
|
||||||
export type OrderProps = {
|
|
||||||
carNumber?: string;
|
|
||||||
startWashTime?: string;
|
|
||||||
endWashTime?: string;
|
|
||||||
orderDate?: string;
|
|
||||||
status?: GetArrItemType<typeof statuses>;
|
|
||||||
phone?: string;
|
|
||||||
location?: string;
|
|
||||||
master: MasterProps;
|
|
||||||
notes: '';
|
|
||||||
allMasters: MasterProps[];
|
|
||||||
};
|
|
||||||
|
|
||||||
type Status = (typeof statuses)[number];
|
|
||||||
|
|
||||||
const statusColors: Record<Status, string> = {
|
const statusColors: Record<Status, string> = {
|
||||||
pending: 'yellow.100',
|
pending: 'yellow.100',
|
||||||
@@ -50,7 +25,9 @@ const OrderItem = ({
|
|||||||
location,
|
location,
|
||||||
master,
|
master,
|
||||||
allMasters,
|
allMasters,
|
||||||
}: OrderProps) => {
|
id,
|
||||||
|
}: OrderArm) => {
|
||||||
|
const [updateOrders] = useUpdateOrdersMutation();
|
||||||
const { t } = useTranslation('~', {
|
const { t } = useTranslation('~', {
|
||||||
keyPrefix: 'dry-wash.arm.order',
|
keyPrefix: 'dry-wash.arm.order',
|
||||||
});
|
});
|
||||||
@@ -59,15 +36,37 @@ const OrderItem = ({
|
|||||||
const bgColor = statusColors[statusSelect];
|
const bgColor = statusColors[statusSelect];
|
||||||
const [masterSelect, setMaster] = useState(master?.name);
|
const [masterSelect, setMaster] = useState(master?.name);
|
||||||
|
|
||||||
|
const handelChangeMasters = (e: ChangeEvent<HTMLSelectElement>) => {
|
||||||
|
const masterName = e.target.value;
|
||||||
|
const selectedMaster = allMasters.find(
|
||||||
|
(master) => master.name === masterName,
|
||||||
|
);
|
||||||
|
|
||||||
|
if (selectedMaster) {
|
||||||
|
setMaster(masterName);
|
||||||
|
updateOrders({ id, master: selectedMaster.id });
|
||||||
|
} else {
|
||||||
|
console.error('Master not found');
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
const handeChangeStatus = (e: ChangeEvent<HTMLSelectElement>) => {
|
||||||
|
const status = e.target.value as OrderArm['status'];
|
||||||
|
updateOrders({ id, status });
|
||||||
|
setStatus(status);
|
||||||
|
};
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Tr>
|
<Tr>
|
||||||
<Td>{carNumber}</Td>
|
<Td>{carNumber}</Td>
|
||||||
<Td>{getTimeSlot(startWashTime, endWashTime)}</Td>
|
<Td>
|
||||||
<Td>{dayjs(orderDate).format('DD.MM.YYYY')}</Td>
|
{dayjs(orderDate).format('DD.MM.YYYY')} <br />
|
||||||
|
{getTimeSlot(startWashTime, endWashTime)}
|
||||||
|
</Td>
|
||||||
<Td>
|
<Td>
|
||||||
<Select
|
<Select
|
||||||
value={statusSelect}
|
value={statusSelect}
|
||||||
onChange={(e) => setStatus(e.target.value as OrderProps['status'])}
|
onChange={handeChangeStatus}
|
||||||
placeholder={t(`status.placeholder`)}
|
placeholder={t(`status.placeholder`)}
|
||||||
bg={bgColor}
|
bg={bgColor}
|
||||||
>
|
>
|
||||||
@@ -81,8 +80,8 @@ const OrderItem = ({
|
|||||||
<Td>
|
<Td>
|
||||||
<Select
|
<Select
|
||||||
value={masterSelect}
|
value={masterSelect}
|
||||||
onChange={(e) => setMaster(e.target.value as OrderProps['status'])}
|
onChange={handelChangeMasters}
|
||||||
placeholder={t(`status.placeholder`)}
|
placeholder={t(`master.placeholder`)}
|
||||||
>
|
>
|
||||||
{allMasters.map((item) => (
|
{allMasters.map((item) => (
|
||||||
<option key={item.id} value={item.name}>
|
<option key={item.id} value={item.name}>
|
||||||
|
|||||||
@@ -10,20 +10,21 @@ import {
|
|||||||
Spinner,
|
Spinner,
|
||||||
Text,
|
Text,
|
||||||
Td,
|
Td,
|
||||||
useToast,
|
|
||||||
} from '@chakra-ui/react';
|
} from '@chakra-ui/react';
|
||||||
import { useTranslation } from 'react-i18next';
|
import { useTranslation } from 'react-i18next';
|
||||||
import dayjs from 'dayjs';
|
import dayjs from 'dayjs';
|
||||||
|
|
||||||
import OrderItem from '../OrderItem';
|
import OrderItem from '../OrderItem';
|
||||||
import { OrderProps } from '../OrderItem/OrderItem';
|
|
||||||
import { armService } from '../../api/arm';
|
|
||||||
import DateNavigator from '../DateNavigator';
|
import DateNavigator from '../DateNavigator';
|
||||||
import { MasterProps } from '../MasterItem/MasterItem';
|
import {
|
||||||
|
useGetMastersQuery,
|
||||||
|
useGetOrdersQuery,
|
||||||
|
} from '../../__data__/service/api';
|
||||||
|
import useShowToast from '../../hooks/useShowToast';
|
||||||
|
import { OrderArm } from '../../models/api';
|
||||||
|
|
||||||
const TABLE_HEADERS = [
|
const TABLE_HEADERS = [
|
||||||
'carNumber' as const,
|
'carNumber' as const,
|
||||||
'washingTime' as const,
|
|
||||||
'orderDate' as const,
|
'orderDate' as const,
|
||||||
'status' as const,
|
'status' as const,
|
||||||
'masters' as const,
|
'masters' as const,
|
||||||
@@ -35,54 +36,40 @@ const Orders = () => {
|
|||||||
const { t } = useTranslation('~', {
|
const { t } = useTranslation('~', {
|
||||||
keyPrefix: 'dry-wash.arm.order',
|
keyPrefix: 'dry-wash.arm.order',
|
||||||
});
|
});
|
||||||
|
const showToast = useShowToast();
|
||||||
|
|
||||||
const { fetchOrders } = armService();
|
|
||||||
const { fetchMasters } = armService();
|
|
||||||
|
|
||||||
const toast = useToast();
|
|
||||||
|
|
||||||
const [orders, setOrders] = useState<OrderProps[]>([]);
|
|
||||||
const [allMasters, setAllMasters] = useState<MasterProps[]>([]);
|
|
||||||
const [loading, setLoading] = useState(false);
|
|
||||||
const [error, setError] = useState<string | null>(null);
|
|
||||||
const [currentDate, setCurrentDate] = useState(new Date());
|
const [currentDate, setCurrentDate] = useState(new Date());
|
||||||
|
const {
|
||||||
|
data: orders,
|
||||||
|
isLoading: isOrdersLoading,
|
||||||
|
isSuccess: isOrdersSuccess,
|
||||||
|
isError: isOrdersError,
|
||||||
|
error: ordersError,
|
||||||
|
} = useGetOrdersQuery({ date: currentDate });
|
||||||
|
|
||||||
|
const {
|
||||||
|
data: masters,
|
||||||
|
isLoading: isMastersLoading,
|
||||||
|
isSuccess: isMastersSuccess,
|
||||||
|
isError: isMastersError,
|
||||||
|
error: mastersError,
|
||||||
|
} = useGetMastersQuery();
|
||||||
|
|
||||||
|
const isLoading = isOrdersLoading || isMastersLoading;
|
||||||
|
const isSuccess = isOrdersSuccess && isMastersSuccess;
|
||||||
|
const isError = isOrdersError || isMastersError;
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
const loadData = async () => {
|
if (isError) {
|
||||||
setLoading(true);
|
showToast(t('error.title'), 'error');
|
||||||
setError(null);
|
}
|
||||||
|
}, [isError, ordersError, mastersError, t]);
|
||||||
try {
|
|
||||||
const [ordersData, mastersData] = await Promise.all([
|
|
||||||
fetchOrders({ date: currentDate }),
|
|
||||||
fetchMasters(),
|
|
||||||
]);
|
|
||||||
|
|
||||||
setOrders(ordersData.body);
|
|
||||||
setAllMasters(mastersData.body);
|
|
||||||
} catch (err) {
|
|
||||||
setError(err.message);
|
|
||||||
toast({
|
|
||||||
title: t('error.title'),
|
|
||||||
status: 'error',
|
|
||||||
duration: 5000,
|
|
||||||
isClosable: true,
|
|
||||||
position: 'bottom-right',
|
|
||||||
});
|
|
||||||
} finally {
|
|
||||||
setLoading(false);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
loadData();
|
|
||||||
}, [currentDate, toast, t]);
|
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Box p='8'>
|
<Box p='8'>
|
||||||
<Heading size='lg' mb='5'>
|
<Heading size='lg' mb='5'>
|
||||||
{t('title')}
|
{t('title')}
|
||||||
</Heading>
|
</Heading>
|
||||||
|
|
||||||
<DateNavigator
|
<DateNavigator
|
||||||
currentDate={currentDate}
|
currentDate={currentDate}
|
||||||
onPreviousDate={() =>
|
onPreviousDate={() =>
|
||||||
@@ -104,28 +91,27 @@ const Orders = () => {
|
|||||||
</Tr>
|
</Tr>
|
||||||
</Thead>
|
</Thead>
|
||||||
<Tbody>
|
<Tbody>
|
||||||
{loading && (
|
{isLoading && (
|
||||||
<Tr>
|
<Tr>
|
||||||
<Td colSpan={TABLE_HEADERS.length} textAlign='center' py='8'>
|
<Td colSpan={TABLE_HEADERS.length} textAlign='center' py='8'>
|
||||||
<Spinner size='lg' />
|
<Spinner size='lg' />
|
||||||
</Td>
|
</Td>
|
||||||
</Tr>
|
</Tr>
|
||||||
)}
|
)}
|
||||||
{!loading && orders.length === 0 && !error && (
|
{isSuccess && orders.length === 0 && (
|
||||||
<Tr>
|
<Tr>
|
||||||
<Td colSpan={TABLE_HEADERS.length}>
|
<Td colSpan={TABLE_HEADERS.length}>
|
||||||
<Text>{t('table.empty')}</Text>
|
<Text>{t('table.empty')}</Text>
|
||||||
</Td>
|
</Td>
|
||||||
</Tr>
|
</Tr>
|
||||||
)}
|
)}
|
||||||
{!loading &&
|
{isSuccess &&
|
||||||
!error &&
|
|
||||||
orders.map((order, index) => (
|
orders.map((order, index) => (
|
||||||
<OrderItem
|
<OrderItem
|
||||||
allMasters={allMasters}
|
allMasters={masters}
|
||||||
key={index}
|
key={index}
|
||||||
{...order}
|
{...order}
|
||||||
status={order.status as OrderProps['status']}
|
status={order.status as OrderArm['status']}
|
||||||
/>
|
/>
|
||||||
))}
|
))}
|
||||||
</Tbody>
|
</Tbody>
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ export const PageSpinner: FC = () => {
|
|||||||
return (
|
return (
|
||||||
<Flex w='full' h='100vh' justifyContent='center' alignItems='center'>
|
<Flex w='full' h='100vh' justifyContent='center' alignItems='center'>
|
||||||
<Spinner
|
<Spinner
|
||||||
|
data-testid='spinner'
|
||||||
thickness='5px'
|
thickness='5px'
|
||||||
speed='0.65s'
|
speed='0.65s'
|
||||||
emptyColor='gray.200'
|
emptyColor='gray.200'
|
||||||
|
|||||||
@@ -47,6 +47,7 @@ const Sidebar = () => {
|
|||||||
w='100%'
|
w='100%'
|
||||||
colorScheme={isActive(URLs.armMaster.url) ? 'green' : 'blue'}
|
colorScheme={isActive(URLs.armMaster.url) ? 'green' : 'blue'}
|
||||||
variant={isActive(URLs.armMaster.url) ? 'solid' : 'ghost'}
|
variant={isActive(URLs.armMaster.url) ? 'solid' : 'ghost'}
|
||||||
|
data-testid='master-button'
|
||||||
>
|
>
|
||||||
{t('master')}
|
{t('master')}
|
||||||
</Button>
|
</Button>
|
||||||
|
|||||||
@@ -9,12 +9,12 @@ import { BenefitsSectionProps } from './types';
|
|||||||
import { iconsMap } from './helper';
|
import { iconsMap } from './helper';
|
||||||
|
|
||||||
export const BenefitsSection: FC<BenefitsSectionProps> = ({
|
export const BenefitsSection: FC<BenefitsSectionProps> = ({
|
||||||
data: { heading, description, list } = {},
|
data: { heading, description, list } = {}, ...props
|
||||||
}) => {
|
}) => {
|
||||||
const { t } = useTranslation('~', { keyPrefix: 'dry-wash.landing' });
|
const { t } = useTranslation('~', { keyPrefix: 'dry-wash.landing' });
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<PageSection>
|
<PageSection {...props}>
|
||||||
<VStack w='full' spacing={2}>
|
<VStack w='full' spacing={2}>
|
||||||
<Heading as='h2'>{t(heading)}</Heading>
|
<Heading as='h2'>{t(heading)}</Heading>
|
||||||
<Text>{t(description)}</Text>
|
<Text>{t(description)}</Text>
|
||||||
|
|||||||
@@ -5,7 +5,9 @@ import { Text } from '@chakra-ui/react';
|
|||||||
const currentYear = new Date().getFullYear();
|
const currentYear = new Date().getFullYear();
|
||||||
|
|
||||||
export const Copyright: FC = () => {
|
export const Copyright: FC = () => {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation('~', {
|
||||||
|
keyPrefix: 'dry-wash.landing.footer'
|
||||||
|
});
|
||||||
|
|
||||||
return <Text color='whiteAlpha.500'>{t('dry-wash.landing.footer.copyright', { currentYear })}</Text>;
|
return <Text color='whiteAlpha.500'>{t('copyright', { currentYear })}</Text>;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import { SiteLogo, PageSection } from '../';
|
|||||||
|
|
||||||
import { Copyright } from './Copyright';
|
import { Copyright } from './Copyright';
|
||||||
|
|
||||||
export const Footer: FC = () => {
|
export const Footer: FC = (props) => {
|
||||||
const { t } = useTranslation('~', {
|
const { t } = useTranslation('~', {
|
||||||
keyPrefix: 'dry-wash.landing.footer.links',
|
keyPrefix: 'dry-wash.landing.footer.links',
|
||||||
});
|
});
|
||||||
@@ -15,11 +15,17 @@ export const Footer: FC = () => {
|
|||||||
const listData = [
|
const listData = [
|
||||||
{ to: '#', label: t('privacy-policy') },
|
{ to: '#', label: t('privacy-policy') },
|
||||||
{ to: '#', label: t('service-terms') },
|
{ to: '#', label: t('service-terms') },
|
||||||
{ to: '#', label: t('faq') },
|
{ to: '#', label: t('faq') },
|
||||||
];
|
];
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<PageSection as='footer' py={5} bg='gray.700' color='white'>
|
<PageSection
|
||||||
|
as='footer'
|
||||||
|
py={5}
|
||||||
|
bg='gray.700'
|
||||||
|
color='white'
|
||||||
|
{...props}
|
||||||
|
>
|
||||||
<SiteLogo />
|
<SiteLogo />
|
||||||
<Copyright />
|
<Copyright />
|
||||||
<List spacing={2}>
|
<List spacing={2}>
|
||||||
|
|||||||
@@ -10,11 +10,18 @@ import { HeroSectionProps } from './types';
|
|||||||
export const HeroSection: FC<HeroSectionProps> = ({
|
export const HeroSection: FC<HeroSectionProps> = ({
|
||||||
data: { headline, description, video } = {},
|
data: { headline, description, video } = {},
|
||||||
flexShrink,
|
flexShrink,
|
||||||
|
...props
|
||||||
}) => {
|
}) => {
|
||||||
const { t } = useTranslation('~', { keyPrefix: 'dry-wash.landing' });
|
const { t } = useTranslation('~', { keyPrefix: 'dry-wash.landing' });
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Box flexShrink={flexShrink} as='header' pos='relative' zIndex={0}>
|
<Box
|
||||||
|
flexShrink={flexShrink}
|
||||||
|
as='header'
|
||||||
|
pos='relative'
|
||||||
|
zIndex={0}
|
||||||
|
{...props}
|
||||||
|
>
|
||||||
<Box
|
<Box
|
||||||
as='video'
|
as='video'
|
||||||
src={`${__webpack_public_path__}/remote-assets/${video}`}
|
src={`${__webpack_public_path__}/remote-assets/${video}`}
|
||||||
|
|||||||
@@ -5,9 +5,9 @@ import { Image } from '@chakra-ui/react';
|
|||||||
import { LogoSvg } from '../../../assets/icons';
|
import { LogoSvg } from '../../../assets/icons';
|
||||||
|
|
||||||
export const SiteLogo: FC = () => {
|
export const SiteLogo: FC = () => {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation('~', { keyPrefix: 'dry-wash.landing' });
|
||||||
|
|
||||||
return <Image src={LogoSvg} alt={t('~:dry-wash.landing.site-logo')} w={40} />;
|
return <Image src={LogoSvg} alt={t('site-logo')} w={40} />;
|
||||||
};
|
};
|
||||||
|
|
||||||
// todo: replace Image by SVG React component
|
// todo: replace Image by SVG React component
|
||||||
|
|||||||
@@ -9,11 +9,12 @@ import { SocialProofSectionProps } from './types';
|
|||||||
|
|
||||||
export const SocialProofSection: FC<SocialProofSectionProps> = ({
|
export const SocialProofSection: FC<SocialProofSectionProps> = ({
|
||||||
data: { heading } = {},
|
data: { heading } = {},
|
||||||
|
...props
|
||||||
}) => {
|
}) => {
|
||||||
const { t } = useTranslation('~', { keyPrefix: 'dry-wash.landing' });
|
const { t } = useTranslation('~', { keyPrefix: 'dry-wash.landing' });
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<PageSection>
|
<PageSection {...props}>
|
||||||
<Heading as='h2'>{t(heading)}</Heading>
|
<Heading as='h2'>{t(heading)}</Heading>
|
||||||
<ReviewsSlider />
|
<ReviewsSlider />
|
||||||
<HStack w='full' justify='flex-end'>
|
<HStack w='full' justify='flex-end'>
|
||||||
|
|||||||
@@ -1,32 +1,38 @@
|
|||||||
import React, { forwardRef, useState } from 'react';
|
import React, { forwardRef } from 'react';
|
||||||
import {
|
import {
|
||||||
Input,
|
Input,
|
||||||
Image,
|
|
||||||
InputProps,
|
|
||||||
Box,
|
Box,
|
||||||
Popover,
|
Popover,
|
||||||
PopoverAnchor,
|
PopoverAnchor,
|
||||||
PopoverContent,
|
PopoverContent,
|
||||||
PopoverBody,
|
PopoverBody,
|
||||||
List,
|
useRadioGroup,
|
||||||
ListItem,
|
Grid,
|
||||||
|
GridItem,
|
||||||
|
UseRadioGroupProps,
|
||||||
|
useDisclosure,
|
||||||
} from '@chakra-ui/react';
|
} from '@chakra-ui/react';
|
||||||
import { useTranslation } from 'react-i18next';
|
import { useTranslation } from 'react-i18next';
|
||||||
|
|
||||||
import { carBodySelectOptions } from './helper';
|
import { carBodySelectOptions, getInputValue } from './helper';
|
||||||
import { CarBodySelectOption } from './types';
|
import { CarBodyOption } from './option';
|
||||||
|
import { CarBodySelectProps } from './types';
|
||||||
|
|
||||||
export const CarBodySelect = forwardRef<HTMLInputElement, InputProps>(
|
export const CarBodySelect = forwardRef<HTMLInputElement, CarBodySelectProps>(
|
||||||
function CarBodySelect(props, ref) {
|
function CarBodySelect(props, ref) {
|
||||||
const [selected, setSelected] = useState<Partial<CarBodySelectOption>>({});
|
const handleOptionClick: UseRadioGroupProps['onChange'] = (value) => {
|
||||||
const handleOptionClick = (option: CarBodySelectOption) => {
|
|
||||||
setSelected(option);
|
|
||||||
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
props.onChange(option.value);
|
props.onChange(value);
|
||||||
};
|
};
|
||||||
|
|
||||||
const [isDropdownOpen, setIsDropdownOpen] = useState<boolean>(false);
|
const { value, getRadioProps, getRootProps } = useRadioGroup({
|
||||||
|
defaultValue: props.value,
|
||||||
|
value: props.value,
|
||||||
|
onChange: handleOptionClick,
|
||||||
|
});
|
||||||
|
|
||||||
|
const { isOpen, onOpen, onClose } = useDisclosure();
|
||||||
|
|
||||||
const { t } = useTranslation('~', {
|
const { t } = useTranslation('~', {
|
||||||
keyPrefix: 'dry-wash.order-create.car-body-select',
|
keyPrefix: 'dry-wash.order-create.car-body-select',
|
||||||
@@ -35,7 +41,7 @@ export const CarBodySelect = forwardRef<HTMLInputElement, InputProps>(
|
|||||||
return (
|
return (
|
||||||
<Box width='100%'>
|
<Box width='100%'>
|
||||||
<Popover
|
<Popover
|
||||||
isOpen={isDropdownOpen}
|
isOpen={isOpen}
|
||||||
autoFocus={false}
|
autoFocus={false}
|
||||||
placement='bottom-start'
|
placement='bottom-start'
|
||||||
matchWidth
|
matchWidth
|
||||||
@@ -44,45 +50,29 @@ export const CarBodySelect = forwardRef<HTMLInputElement, InputProps>(
|
|||||||
<Input
|
<Input
|
||||||
{...props}
|
{...props}
|
||||||
ref={ref}
|
ref={ref}
|
||||||
value={
|
value={getInputValue(Number(value), t) ?? props.value}
|
||||||
selected?.labelTKey
|
|
||||||
? t(`options.${selected.labelTKey}`)
|
|
||||||
: undefined
|
|
||||||
}
|
|
||||||
readOnly
|
readOnly
|
||||||
onClick={() => setIsDropdownOpen(true)}
|
onClick={onOpen}
|
||||||
onBlur={() => setIsDropdownOpen(false)}
|
onBlur={onClose}
|
||||||
placeholder={t('placeholder')}
|
placeholder={t('placeholder')}
|
||||||
/>
|
/>
|
||||||
</PopoverAnchor>
|
</PopoverAnchor>
|
||||||
<PopoverContent width='100%' maxWidth='100%'>
|
<PopoverContent width='100%' maxWidth='100%'>
|
||||||
<PopoverBody border='1px' borderColor='gray.300' p={0}>
|
<PopoverBody border='1px' borderColor='gray.300' p={0}>
|
||||||
<List
|
<Grid
|
||||||
display='grid'
|
templateColumns='repeat(auto-fit, minmax(150px, 1fr))'
|
||||||
gridTemplateColumns='repeat(auto-fit, minmax(150px, 1fr))'
|
{...getRootProps()}
|
||||||
>
|
>
|
||||||
{carBodySelectOptions.map((option) => (
|
{carBodySelectOptions.map(({ value, img, labelTKey }) => (
|
||||||
<ListItem
|
<GridItem key={value}>
|
||||||
key={option.value}
|
<CarBodyOption
|
||||||
display='flex'
|
image={img}
|
||||||
flexDirection='column'
|
label={t(`options.${labelTKey}`)}
|
||||||
justifyContent='flex-end'
|
{...getRadioProps({ value: String(value) })}
|
||||||
alignItems='center'
|
/>
|
||||||
p={2}
|
</GridItem>
|
||||||
cursor='pointer'
|
|
||||||
_hover={{
|
|
||||||
bgColor: 'primary.50',
|
|
||||||
}}
|
|
||||||
_active={{
|
|
||||||
bgColor: 'primary.100',
|
|
||||||
}}
|
|
||||||
onClick={() => handleOptionClick(option)}
|
|
||||||
>
|
|
||||||
<Image src={option.img} />
|
|
||||||
{t(`options.${option.labelTKey}`)}
|
|
||||||
</ListItem>
|
|
||||||
))}
|
))}
|
||||||
</List>
|
</Grid>
|
||||||
</PopoverBody>
|
</PopoverBody>
|
||||||
</PopoverContent>
|
</PopoverContent>
|
||||||
</Popover>
|
</Popover>
|
||||||
|
|||||||
@@ -1,3 +1,6 @@
|
|||||||
|
import { TFunction } from "i18next";
|
||||||
|
import { InputProps } from "@chakra-ui/react";
|
||||||
|
|
||||||
import {
|
import {
|
||||||
CoupeImg,
|
CoupeImg,
|
||||||
CrossoverImg,
|
CrossoverImg,
|
||||||
@@ -8,7 +11,8 @@ import {
|
|||||||
SedanImg,
|
SedanImg,
|
||||||
SportsCarImg,
|
SportsCarImg,
|
||||||
StationWagonImg,
|
StationWagonImg,
|
||||||
SuvImg
|
SuvImg,
|
||||||
|
OtherImg
|
||||||
} from "../../../../assets/images";
|
} from "../../../../assets/images";
|
||||||
import { Car } from "../../../../models/landing";
|
import { Car } from "../../../../models/landing";
|
||||||
|
|
||||||
@@ -67,6 +71,17 @@ export const carBodySelectOptions: CarBodySelectOption[] = [
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
value: Car.BodyStyle.OTHER,
|
value: Car.BodyStyle.OTHER,
|
||||||
labelTKey: 'other'
|
labelTKey: 'other',
|
||||||
|
img: OtherImg
|
||||||
},
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
|
export const getInputValue = (value: Car.BodyStyle, t: TFunction<"~", "dry-wash.order-create.car-body-select">): InputProps['value'] => {
|
||||||
|
const { labelTKey } = carBodySelectOptions.find((option) => value === option.value) ?? {};
|
||||||
|
|
||||||
|
if (labelTKey) {
|
||||||
|
return t(`options.${labelTKey}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
return;
|
||||||
|
};
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
import React from 'react';
|
||||||
|
import {
|
||||||
|
ImageProps,
|
||||||
|
StackProps,
|
||||||
|
Image,
|
||||||
|
useRadio,
|
||||||
|
chakra,
|
||||||
|
Box,
|
||||||
|
UseRadioProps,
|
||||||
|
Flex,
|
||||||
|
} from '@chakra-ui/react';
|
||||||
|
|
||||||
|
import { getPropsByState } from './helper';
|
||||||
|
|
||||||
|
type CarBodyOptionProps = {
|
||||||
|
image: ImageProps['src'];
|
||||||
|
label: StackProps['children'];
|
||||||
|
} & UseRadioProps;
|
||||||
|
|
||||||
|
export const CarBodyOption = ({
|
||||||
|
image,
|
||||||
|
label,
|
||||||
|
...radioProps
|
||||||
|
}: CarBodyOptionProps) => {
|
||||||
|
const { state, getInputProps, getRadioProps, htmlProps, getLabelProps } =
|
||||||
|
useRadio(radioProps);
|
||||||
|
|
||||||
|
return (
|
||||||
|
<chakra.label {...htmlProps} cursor='pointer'>
|
||||||
|
<input {...getInputProps({})} hidden />
|
||||||
|
<Box {...getRadioProps()} p={2} {...getPropsByState(state)}>
|
||||||
|
<Flex direction='column' alignItems='center' {...getLabelProps()}>
|
||||||
|
<Image src={image} rounded={4} />
|
||||||
|
{label}
|
||||||
|
</Flex>
|
||||||
|
</Box>
|
||||||
|
</chakra.label>
|
||||||
|
);
|
||||||
|
};
|
||||||
19
src/components/order-form/form/car-body/option/helper.ts
Normal file
19
src/components/order-form/form/car-body/option/helper.ts
Normal file
@@ -0,0 +1,19 @@
|
|||||||
|
import {
|
||||||
|
BoxProps,
|
||||||
|
} from '@chakra-ui/react';
|
||||||
|
import { RadioState } from '@chakra-ui/react/dist/types/radio/use-radio';
|
||||||
|
|
||||||
|
export const getPropsByState = ({ isChecked }: RadioState): BoxProps => {
|
||||||
|
if (isChecked) {
|
||||||
|
return {
|
||||||
|
bgColor: 'primary.200',
|
||||||
|
_hover: { bgColor: 'primary.100' },
|
||||||
|
_active: { bgColor: 'primary.300' },
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
_hover: { bgColor: 'primary.50' },
|
||||||
|
_active: { bgColor: 'primary.100' },
|
||||||
|
};
|
||||||
|
};
|
||||||
1
src/components/order-form/form/car-body/option/index.ts
Normal file
1
src/components/order-form/form/car-body/option/index.ts
Normal file
@@ -0,0 +1 @@
|
|||||||
|
export { CarBodyOption } from './car-body-option';
|
||||||
@@ -1,3 +1,5 @@
|
|||||||
|
import { InputProps } from "@chakra-ui/react";
|
||||||
|
|
||||||
import { Car } from "../../../../models/landing";
|
import { Car } from "../../../../models/landing";
|
||||||
|
|
||||||
export type CarBodySelectOption = {
|
export type CarBodySelectOption = {
|
||||||
@@ -16,3 +18,7 @@ export type CarBodySelectOption = {
|
|||||||
'other';
|
'other';
|
||||||
img?: string;
|
img?: string;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export type CarBodySelectProps = {
|
||||||
|
value?: string;
|
||||||
|
} & Pick<InputProps, 'onChange'>;
|
||||||
@@ -1,7 +1,4 @@
|
|||||||
import { useTranslation } from "react-i18next";
|
import { useTranslation } from "react-i18next";
|
||||||
import { InputProps, SelectProps } from "@chakra-ui/react";
|
|
||||||
|
|
||||||
import { Order } from "../../../models/landing";
|
|
||||||
|
|
||||||
import { FormFieldProps } from "./field";
|
import { FormFieldProps } from "./field";
|
||||||
import { OrderFormValues } from "./types";
|
import { OrderFormValues } from "./types";
|
||||||
@@ -12,6 +9,7 @@ export const defaultValues: Partial<OrderFormValues> = {
|
|||||||
phone: '',
|
phone: '',
|
||||||
carNumber: '',
|
carNumber: '',
|
||||||
carColor: '',
|
carColor: '',
|
||||||
|
carBody: '',
|
||||||
availableDatetimeBegin: '',
|
availableDatetimeBegin: '',
|
||||||
availableDatetimeEnd: '',
|
availableDatetimeEnd: '',
|
||||||
};
|
};
|
||||||
@@ -29,39 +27,4 @@ export const useGetValidationRules = () => {
|
|||||||
validate: (value: string) => isValidCarNumber(value) || t('car-number-field.invalid')
|
validate: (value: string) => isValidCarNumber(value) || t('car-number-field.invalid')
|
||||||
},
|
},
|
||||||
} satisfies Record<string, FormFieldProps['rules']>;
|
} satisfies Record<string, FormFieldProps['rules']>;
|
||||||
};
|
|
||||||
|
|
||||||
const removeAllSpaces = (str: string) => str.replace(/\s+/g, '');
|
|
||||||
|
|
||||||
const getValidCarBodyStyle = (fieldValue: string) => {
|
|
||||||
const carBodyAsNumber = Number(fieldValue);
|
|
||||||
return Number.isNaN(carBodyAsNumber) ? undefined : carBodyAsNumber;
|
|
||||||
};
|
|
||||||
|
|
||||||
export const formatFormValues = ({ phone, carNumber, carBody, carColor, carLocation, availableDatetimeBegin, availableDatetimeEnd }: OrderFormValues): Order.Create => {
|
|
||||||
return {
|
|
||||||
customer: {
|
|
||||||
phone
|
|
||||||
},
|
|
||||||
car: {
|
|
||||||
number: removeAllSpaces(carNumber),
|
|
||||||
body: getValidCarBodyStyle(carBody),
|
|
||||||
color: carColor
|
|
||||||
},
|
|
||||||
washing: {
|
|
||||||
location: carLocation,
|
|
||||||
begin: availableDatetimeBegin,
|
|
||||||
end: availableDatetimeEnd,
|
|
||||||
}
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
export const onSubmit = (values: OrderFormValues) => {
|
|
||||||
return new Promise((resolve) => {
|
|
||||||
console.log(formatFormValues(values));
|
|
||||||
resolve(formatFormValues(values));
|
|
||||||
});
|
|
||||||
};
|
|
||||||
|
|
||||||
export const inputCommonStyles: Partial<InputProps & SelectProps> = {
|
|
||||||
};
|
};
|
||||||
@@ -1 +1,2 @@
|
|||||||
|
export type { OrderFormValues, OrderFormProps } from './types';
|
||||||
export { OrderForm } from './order-form';
|
export { OrderForm } from './order-form';
|
||||||
@@ -42,21 +42,29 @@ export const LocationInput = memo(
|
|||||||
|
|
||||||
const onInputChange: InputProps['onChange'] = async (e) => {
|
const onInputChange: InputProps['onChange'] = async (e) => {
|
||||||
const newInputValue = e.target.value;
|
const newInputValue = e.target.value;
|
||||||
setInputValue(newInputValue);
|
|
||||||
|
|
||||||
if (newInputValue.trim().length > 3) {
|
if (
|
||||||
try {
|
isValidLocation(newInputValue) &&
|
||||||
const address = extractAddress(newInputValue);
|
(await isRealLocation(ymaps, newInputValue))
|
||||||
const results = await ymaps.suggest(address);
|
) {
|
||||||
setSuggestions(results);
|
onChange(newInputValue);
|
||||||
} catch (error) {
|
|
||||||
console.error(error);
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
setSuggestions([]);
|
setInputValue(newInputValue);
|
||||||
|
|
||||||
|
if (newInputValue.trim().length > 3) {
|
||||||
|
try {
|
||||||
|
const address = extractAddress(newInputValue);
|
||||||
|
const results = await ymaps.suggest(address);
|
||||||
|
setSuggestions(results);
|
||||||
|
} catch (error) {
|
||||||
|
console.error(error);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
setSuggestions([]);
|
||||||
|
}
|
||||||
|
|
||||||
|
setIsSuggestionsPanelOpen(suggestions.length > 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
setIsSuggestionsPanelOpen(suggestions.length > 1);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
const onFocus: InputProps['onFocus'] = () => {
|
const onFocus: InputProps['onFocus'] = () => {
|
||||||
@@ -103,7 +111,7 @@ export const LocationInput = memo(
|
|||||||
{...props}
|
{...props}
|
||||||
ref={ref}
|
ref={ref}
|
||||||
onBlur={onBlur}
|
onBlur={onBlur}
|
||||||
value={inputValue}
|
value={inputValue ?? value}
|
||||||
onChange={onInputChange}
|
onChange={onInputChange}
|
||||||
onFocus={onFocus}
|
onFocus={onFocus}
|
||||||
placeholder={t('placeholder')}
|
placeholder={t('placeholder')}
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import React, { FC } from 'react';
|
import React from 'react';
|
||||||
import { useForm } from 'react-hook-form';
|
import { useForm } from 'react-hook-form';
|
||||||
import { useTranslation } from 'react-i18next';
|
import { useTranslation } from 'react-i18next';
|
||||||
import { Box, Flex, FormControl, FormLabel, VStack } from '@chakra-ui/react';
|
import { Box, Flex, FormControl, FormLabel, VStack } from '@chakra-ui/react';
|
||||||
@@ -7,14 +7,19 @@ import { CarBodySelect } from './car-body';
|
|||||||
import { CarColorInput } from './car-color';
|
import { CarColorInput } from './car-color';
|
||||||
import { CarNumberInput } from './car-number';
|
import { CarNumberInput } from './car-number';
|
||||||
import { FormInputField, FormControllerField } from './field';
|
import { FormInputField, FormControllerField } from './field';
|
||||||
import { OrderFormValues } from './types';
|
import { OrderFormProps, OrderFormValues } from './types';
|
||||||
import { PhoneInput } from './phone';
|
import { PhoneInput } from './phone';
|
||||||
import { SubmitButton } from './submit';
|
import { SubmitButton } from './submit';
|
||||||
import { defaultValues, onSubmit, useGetValidationRules } from './helper';
|
import { defaultValues, useGetValidationRules } from './helper';
|
||||||
import { DateTimeInput } from './date-time';
|
import { DateTimeInput } from './date-time';
|
||||||
import { LocationInput, MapComponent, StringLocation, YMapsProvider } from './location';
|
import {
|
||||||
|
LocationInput,
|
||||||
|
MapComponent,
|
||||||
|
StringLocation,
|
||||||
|
YMapsProvider,
|
||||||
|
} from './location';
|
||||||
|
|
||||||
export const OrderForm: FC = () => {
|
export const OrderForm = ({ onSubmit, loading, ...props }: OrderFormProps) => {
|
||||||
const {
|
const {
|
||||||
handleSubmit,
|
handleSubmit,
|
||||||
control,
|
control,
|
||||||
@@ -36,7 +41,7 @@ export const OrderForm: FC = () => {
|
|||||||
]);
|
]);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Box p={4} marginInline='auto'>
|
<Box p={4} marginInline='auto' {...props}>
|
||||||
<VStack
|
<VStack
|
||||||
as='form'
|
as='form'
|
||||||
noValidate
|
noValidate
|
||||||
@@ -123,7 +128,7 @@ export const OrderForm: FC = () => {
|
|||||||
}}
|
}}
|
||||||
/>
|
/>
|
||||||
</YMapsProvider>
|
</YMapsProvider>
|
||||||
<SubmitButton isLoading={isSubmitting} mt={4} />
|
<SubmitButton isLoading={isSubmitting || loading} mt={4} />
|
||||||
</VStack>
|
</VStack>
|
||||||
</Box>
|
</Box>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
import { SubmitHandler } from "react-hook-form";
|
||||||
|
|
||||||
export type OrderFormValues = {
|
export type OrderFormValues = {
|
||||||
phone: string;
|
phone: string;
|
||||||
carNumber: string;
|
carNumber: string;
|
||||||
@@ -6,4 +8,9 @@ export type OrderFormValues = {
|
|||||||
carLocation: string;
|
carLocation: string;
|
||||||
availableDatetimeBegin: string;
|
availableDatetimeBegin: string;
|
||||||
availableDatetimeEnd: string;
|
availableDatetimeEnd: string;
|
||||||
|
};
|
||||||
|
|
||||||
|
export type OrderFormProps = {
|
||||||
|
onSubmit: SubmitHandler<OrderFormValues>;
|
||||||
|
loading: boolean;
|
||||||
};
|
};
|
||||||
102
src/components/order-view/car-img/car-img-form.tsx
Normal file
102
src/components/order-view/car-img/car-img-form.tsx
Normal file
@@ -0,0 +1,102 @@
|
|||||||
|
import React, { FC, memo, useRef } from 'react';
|
||||||
|
import { Controller, useForm } from 'react-hook-form';
|
||||||
|
import {
|
||||||
|
Button,
|
||||||
|
FormControl,
|
||||||
|
FormErrorMessage,
|
||||||
|
FormHelperText,
|
||||||
|
FormLabel,
|
||||||
|
HStack,
|
||||||
|
Input,
|
||||||
|
} from '@chakra-ui/react';
|
||||||
|
import { useTranslation } from 'react-i18next';
|
||||||
|
|
||||||
|
import { landingApi } from '../../../__data__/service/landing.api';
|
||||||
|
import { UploadCarImage } from '../../../models/api';
|
||||||
|
|
||||||
|
import { useHandleUploadCarImageResponse } from './helper';
|
||||||
|
|
||||||
|
type FormValues = {
|
||||||
|
carImg: File & {
|
||||||
|
fileName: string;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
type CarImageFormProps = {
|
||||||
|
orderId: UploadCarImage.Params['orderId'];
|
||||||
|
};
|
||||||
|
|
||||||
|
export const CarImageForm: FC<CarImageFormProps> = memo(function CarImageForm({
|
||||||
|
orderId,
|
||||||
|
}) {
|
||||||
|
const {
|
||||||
|
handleSubmit,
|
||||||
|
control,
|
||||||
|
formState: { errors, isSubmitting },
|
||||||
|
} = useForm<FormValues>({ shouldFocusError: true });
|
||||||
|
|
||||||
|
const [uploadCarImage, uploadCarImageMutation] =
|
||||||
|
landingApi.useUploadCarImageMutation();
|
||||||
|
useHandleUploadCarImageResponse(uploadCarImageMutation);
|
||||||
|
|
||||||
|
const onSubmit = (formData: FormValues) => {
|
||||||
|
const body = new FormData();
|
||||||
|
body.append('file', formData.carImg);
|
||||||
|
uploadCarImage({ orderId, body });
|
||||||
|
};
|
||||||
|
|
||||||
|
const fileInputRef = useRef(null);
|
||||||
|
|
||||||
|
const { t } = useTranslation('~', {
|
||||||
|
keyPrefix: 'dry-wash.order-view.upload-car-image',
|
||||||
|
});
|
||||||
|
|
||||||
|
return (
|
||||||
|
<form>
|
||||||
|
<FormControl>
|
||||||
|
<FormLabel htmlFor='carImg'>{t('field.label')}</FormLabel>
|
||||||
|
<Controller
|
||||||
|
control={control}
|
||||||
|
name='carImg'
|
||||||
|
render={({ field: { value, onChange, ...field } }) => {
|
||||||
|
return (
|
||||||
|
<HStack gap={0}>
|
||||||
|
<Input
|
||||||
|
{...field}
|
||||||
|
ref={fileInputRef}
|
||||||
|
accept='.jpg,.png'
|
||||||
|
value={value?.fileName}
|
||||||
|
onChange={(event) => {
|
||||||
|
onChange(event.target.files[0]);
|
||||||
|
handleSubmit(onSubmit)();
|
||||||
|
}}
|
||||||
|
type='file'
|
||||||
|
hidden
|
||||||
|
/>
|
||||||
|
<Input
|
||||||
|
placeholder={t('file-input.placeholder')}
|
||||||
|
value={value?.name || ''}
|
||||||
|
readOnly
|
||||||
|
borderRightRadius={0}
|
||||||
|
/>
|
||||||
|
<Button
|
||||||
|
onClick={() => {
|
||||||
|
fileInputRef.current.click();
|
||||||
|
}}
|
||||||
|
isLoading={isSubmitting || uploadCarImageMutation.isLoading}
|
||||||
|
colorScheme='primary'
|
||||||
|
paddingInline={8}
|
||||||
|
borderLeftRadius={0}
|
||||||
|
>
|
||||||
|
{t('file-input.button')}
|
||||||
|
</Button>
|
||||||
|
</HStack>
|
||||||
|
);
|
||||||
|
}}
|
||||||
|
/>
|
||||||
|
<FormErrorMessage>{errors.carImg?.message}</FormErrorMessage>
|
||||||
|
<FormHelperText>{t('field.help')}</FormHelperText>
|
||||||
|
</FormControl>
|
||||||
|
</form>
|
||||||
|
);
|
||||||
|
});
|
||||||
35
src/components/order-view/car-img/helper.ts
Normal file
35
src/components/order-view/car-img/helper.ts
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
import { useEffect } from "react";
|
||||||
|
import { useToast } from "@chakra-ui/react";
|
||||||
|
import { useTranslation } from "react-i18next";
|
||||||
|
|
||||||
|
import { isErrorMessage } from "../../../models/api";
|
||||||
|
|
||||||
|
export const useHandleUploadCarImageResponse = (query: {
|
||||||
|
isSuccess: boolean;
|
||||||
|
isError: boolean;
|
||||||
|
error?: unknown;
|
||||||
|
}) => {
|
||||||
|
const toast = useToast();
|
||||||
|
const { t } = useTranslation('~', {
|
||||||
|
keyPrefix: 'dry-wash.order-create.upload-car-image-query',
|
||||||
|
});
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (query.isError) {
|
||||||
|
toast({
|
||||||
|
status: 'error',
|
||||||
|
title: t('error.title'),
|
||||||
|
description: isErrorMessage(query.error) ? query.error : undefined,
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}, [query.isError]);
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (query.isSuccess) {
|
||||||
|
toast({
|
||||||
|
status: 'success',
|
||||||
|
title: t('success.title'),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}, [query.isSuccess]);
|
||||||
|
};
|
||||||
1
src/components/order-view/car-img/index.ts
Normal file
1
src/components/order-view/car-img/index.ts
Normal file
@@ -0,0 +1 @@
|
|||||||
|
export { CarImageForm } from './car-img-form';
|
||||||
@@ -5,11 +5,13 @@ import {
|
|||||||
Heading,
|
Heading,
|
||||||
HStack,
|
HStack,
|
||||||
UnorderedList,
|
UnorderedList,
|
||||||
VStack,
|
|
||||||
ListItem,
|
ListItem,
|
||||||
Text,
|
Text,
|
||||||
} from '@chakra-ui/react';
|
} from '@chakra-ui/react';
|
||||||
import { useTranslation } from 'react-i18next';
|
import { useTranslation } from 'react-i18next';
|
||||||
|
import dayjs from 'dayjs';
|
||||||
|
import localizedFormat from "dayjs/plugin/localizedFormat";
|
||||||
|
dayjs.extend(localizedFormat);
|
||||||
|
|
||||||
import { Order } from '../../../models/landing';
|
import { Order } from '../../../models/landing';
|
||||||
import { formatDatetime } from '../../../lib';
|
import { formatDatetime } from '../../../lib';
|
||||||
@@ -17,18 +19,31 @@ import { carBodySelectOptions } from '../../order-form/form/car-body/helper';
|
|||||||
|
|
||||||
import { OrderStatus } from './status';
|
import { OrderStatus } from './status';
|
||||||
|
|
||||||
type OrderDetailsProps = Order.View;
|
type OrderDetailsProps = Pick<
|
||||||
|
Order.View,
|
||||||
|
| 'orderNumber'
|
||||||
|
| 'status'
|
||||||
|
| 'phone'
|
||||||
|
| 'carNumber'
|
||||||
|
| 'carBody'
|
||||||
|
| 'carColor'
|
||||||
|
| 'location'
|
||||||
|
| 'startWashTime'
|
||||||
|
| 'endWashTime'
|
||||||
|
| 'created'
|
||||||
|
>;
|
||||||
|
|
||||||
export const OrderDetails: FC<OrderDetailsProps> = ({
|
export const OrderDetails: FC<OrderDetailsProps> = ({
|
||||||
id,
|
orderNumber,
|
||||||
status,
|
status,
|
||||||
phone,
|
phone,
|
||||||
carNumber,
|
carNumber,
|
||||||
carBody,
|
carBody,
|
||||||
carColor,
|
carColor,
|
||||||
location,
|
location,
|
||||||
datetimeBegin,
|
startWashTime,
|
||||||
datetimeEnd,
|
endWashTime,
|
||||||
|
created
|
||||||
}) => {
|
}) => {
|
||||||
const { t } = useTranslation('~', {
|
const { t } = useTranslation('~', {
|
||||||
keyPrefix: 'dry-wash.order-view.details',
|
keyPrefix: 'dry-wash.order-view.details',
|
||||||
@@ -38,7 +53,7 @@ export const OrderDetails: FC<OrderDetailsProps> = ({
|
|||||||
});
|
});
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<VStack p={4} alignItems='flex-start' gap={4}>
|
<>
|
||||||
<HStack
|
<HStack
|
||||||
width='full'
|
width='full'
|
||||||
flexWrap='wrap'
|
flexWrap='wrap'
|
||||||
@@ -46,7 +61,7 @@ export const OrderDetails: FC<OrderDetailsProps> = ({
|
|||||||
gap={2}
|
gap={2}
|
||||||
>
|
>
|
||||||
<Heading as='h2' size='lg'>
|
<Heading as='h2' size='lg'>
|
||||||
{t('title', { number: id })}
|
{t('title', { number: orderNumber })} ({dayjs(created).format('LLLL')})
|
||||||
</Heading>
|
</Heading>
|
||||||
<OrderStatus value={status} />
|
<OrderStatus value={status} />
|
||||||
</HStack>
|
</HStack>
|
||||||
@@ -75,8 +90,8 @@ export const OrderDetails: FC<OrderDetailsProps> = ({
|
|||||||
{
|
{
|
||||||
label: t('datetime-range'),
|
label: t('datetime-range'),
|
||||||
value: [
|
value: [
|
||||||
formatDatetime(datetimeBegin),
|
formatDatetime(startWashTime),
|
||||||
formatDatetime(datetimeEnd),
|
formatDatetime(endWashTime),
|
||||||
].join(' - '),
|
].join(' - '),
|
||||||
},
|
},
|
||||||
].map(({ label, value }, i) => (
|
].map(({ label, value }, i) => (
|
||||||
@@ -92,7 +107,7 @@ export const OrderDetails: FC<OrderDetailsProps> = ({
|
|||||||
<AlertIcon />
|
<AlertIcon />
|
||||||
{t('alert')}
|
{t('alert')}
|
||||||
</Alert>
|
</Alert>
|
||||||
</VStack>
|
</>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -15,19 +15,19 @@ const getPropsByStatus = (
|
|||||||
colorScheme: 'red',
|
colorScheme: 'red',
|
||||||
children: t('canceled'),
|
children: t('canceled'),
|
||||||
};
|
};
|
||||||
case 'progress':
|
|
||||||
return {
|
|
||||||
colorScheme: 'yellow',
|
|
||||||
children: t('progress'),
|
|
||||||
};
|
|
||||||
case 'pending':
|
case 'pending':
|
||||||
return {
|
return {
|
||||||
colorScheme: 'yellow',
|
colorScheme: 'yellow',
|
||||||
children: t('pending'),
|
children: t('pending'),
|
||||||
};
|
};
|
||||||
|
case 'progress':
|
||||||
|
return {
|
||||||
|
colorScheme: 'orange',
|
||||||
|
children: t('progress'),
|
||||||
|
};
|
||||||
case 'working':
|
case 'working':
|
||||||
return {
|
return {
|
||||||
colorScheme: 'yellow',
|
colorScheme: 'orange',
|
||||||
children: t('working'),
|
children: t('working'),
|
||||||
};
|
};
|
||||||
case 'complete':
|
case 'complete':
|
||||||
|
|||||||
@@ -1,14 +1,31 @@
|
|||||||
import React, { FC, PropsWithChildren } from 'react';
|
import React, { ComponentType, FC, PropsWithChildren } from 'react';
|
||||||
import { ChakraProvider } from '@chakra-ui/react';
|
import { ChakraProvider } from '@chakra-ui/react';
|
||||||
|
|
||||||
import { default as landingTheme } from './theme-config';
|
import { default as landingTheme } from './theme-config';
|
||||||
import Fonts from './Fonts';
|
import Fonts from './Fonts';
|
||||||
|
import { toastOptions } from './toast-options';
|
||||||
|
|
||||||
export const LandingThemeProvider: FC<PropsWithChildren> = ({ children }) => {
|
export const LandingThemeProvider: FC<PropsWithChildren> = ({ children }) => {
|
||||||
return (
|
return (
|
||||||
<ChakraProvider theme={landingTheme}>
|
<ChakraProvider theme={landingTheme} toastOptions={toastOptions}>
|
||||||
<Fonts />
|
<Fonts />
|
||||||
{children}
|
{children}
|
||||||
</ChakraProvider>
|
</ChakraProvider>
|
||||||
);
|
);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export function withLandingThemeProvider<T extends JSX.IntrinsicAttributes>(WrappedComponent: ComponentType<T>) {
|
||||||
|
const displayName = WrappedComponent.displayName || WrappedComponent.name || 'Component';
|
||||||
|
|
||||||
|
const ComponentWithLandingThemeProvider = (props: T) => {
|
||||||
|
return (
|
||||||
|
<LandingThemeProvider>
|
||||||
|
<WrappedComponent {...props} />
|
||||||
|
</LandingThemeProvider>
|
||||||
|
);
|
||||||
|
};
|
||||||
|
|
||||||
|
ComponentWithLandingThemeProvider.displayName = `withLandingThemeProvider(${displayName})`;
|
||||||
|
|
||||||
|
return ComponentWithLandingThemeProvider;
|
||||||
|
}
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
export { LandingThemeProvider } from './LandingThemeProvider';
|
export { LandingThemeProvider, withLandingThemeProvider } from './LandingThemeProvider';
|
||||||
8
src/containers/LandingThemeProvider/toast-options.ts
Normal file
8
src/containers/LandingThemeProvider/toast-options.ts
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
import { ToastProviderProps } from "@chakra-ui/react";
|
||||||
|
|
||||||
|
export const toastOptions: ToastProviderProps = {
|
||||||
|
defaultOptions: {
|
||||||
|
position: 'top-right',
|
||||||
|
isClosable: true,
|
||||||
|
}
|
||||||
|
};
|
||||||
28
src/hooks/useShowToast.ts
Normal file
28
src/hooks/useShowToast.ts
Normal file
@@ -0,0 +1,28 @@
|
|||||||
|
import { useToast } from '@chakra-ui/react';
|
||||||
|
import { useCallback } from 'react';
|
||||||
|
|
||||||
|
const useShowToast = () => {
|
||||||
|
const toast = useToast();
|
||||||
|
|
||||||
|
const showToast = useCallback(
|
||||||
|
(
|
||||||
|
title: string,
|
||||||
|
status: 'info' | 'warning' | 'success' | 'error',
|
||||||
|
description?: string,
|
||||||
|
) => {
|
||||||
|
toast({
|
||||||
|
title,
|
||||||
|
description,
|
||||||
|
status,
|
||||||
|
duration: 5000,
|
||||||
|
isClosable: true,
|
||||||
|
position: 'top-right',
|
||||||
|
});
|
||||||
|
},
|
||||||
|
[toast],
|
||||||
|
);
|
||||||
|
|
||||||
|
return showToast;
|
||||||
|
};
|
||||||
|
|
||||||
|
export default useShowToast;
|
||||||
15
src/models/api/common.ts
Normal file
15
src/models/api/common.ts
Normal file
@@ -0,0 +1,15 @@
|
|||||||
|
type SuccessResponse<Body> = {
|
||||||
|
success: true;
|
||||||
|
body: Body;
|
||||||
|
};
|
||||||
|
|
||||||
|
export type ErrorMessage = string;
|
||||||
|
|
||||||
|
export const isErrorMessage = (error: unknown): error is ErrorMessage => typeof error === 'string';
|
||||||
|
|
||||||
|
type ErrorResponse = {
|
||||||
|
success: false;
|
||||||
|
error: ErrorMessage;
|
||||||
|
};
|
||||||
|
|
||||||
|
export type BaseResponse<Body> = SuccessResponse<Body> | ErrorResponse;
|
||||||
@@ -1 +1,3 @@
|
|||||||
export * from './order-view';
|
export * from './common';
|
||||||
|
export * from './order';
|
||||||
|
export * from './master';
|
||||||
|
|||||||
12
src/models/api/master.ts
Normal file
12
src/models/api/master.ts
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
export interface Schedule {
|
||||||
|
id: string;
|
||||||
|
startWashTime: string;
|
||||||
|
endWashTime: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export type Master = {
|
||||||
|
id: string;
|
||||||
|
name: string;
|
||||||
|
phone: string;
|
||||||
|
schedule: Schedule[];
|
||||||
|
};
|
||||||
@@ -1,14 +0,0 @@
|
|||||||
import { Order } from "../landing";
|
|
||||||
|
|
||||||
export type FetchOrderQueryResponse = {
|
|
||||||
id: string;
|
|
||||||
orderDate: string;
|
|
||||||
carNumber: string;
|
|
||||||
carBody: number;
|
|
||||||
carColor?: string;
|
|
||||||
startWashTime: string;
|
|
||||||
endWashTime: string;
|
|
||||||
status: Order.Status;
|
|
||||||
phone: string;
|
|
||||||
location: string;
|
|
||||||
};
|
|
||||||
60
src/models/api/order.ts
Normal file
60
src/models/api/order.ts
Normal file
@@ -0,0 +1,60 @@
|
|||||||
|
/* eslint-disable @typescript-eslint/no-namespace */
|
||||||
|
import { Order } from '../landing';
|
||||||
|
|
||||||
|
import { ErrorMessage } from './common';
|
||||||
|
import { Master } from './master';
|
||||||
|
|
||||||
|
export namespace GetOrder {
|
||||||
|
export type Response = Order.View;
|
||||||
|
export type Params = {
|
||||||
|
orderId: Order.Id;
|
||||||
|
};
|
||||||
|
export type Error = ErrorMessage;
|
||||||
|
}
|
||||||
|
|
||||||
|
export namespace CreateOrder {
|
||||||
|
export type Response = {
|
||||||
|
id: Order.Id;
|
||||||
|
};
|
||||||
|
export type Params = {
|
||||||
|
body: Order.Create;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
export namespace UploadCarImage {
|
||||||
|
export type Response = void;
|
||||||
|
export type Params = {
|
||||||
|
orderId: Order.Id;
|
||||||
|
/**
|
||||||
|
* @example { file: File }
|
||||||
|
*/
|
||||||
|
body: FormData;
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
type GetArrItemType<ArrType> =
|
||||||
|
ArrType extends Array<infer ItemType> ? ItemType : never;
|
||||||
|
|
||||||
|
export const statuses = [
|
||||||
|
'pending' as const,
|
||||||
|
'progress' as const,
|
||||||
|
'working' as const,
|
||||||
|
'canceled' as const,
|
||||||
|
'complete' as const,
|
||||||
|
];
|
||||||
|
|
||||||
|
export type Status = (typeof statuses)[number];
|
||||||
|
|
||||||
|
export type OrderArm = {
|
||||||
|
carNumber?: string;
|
||||||
|
startWashTime?: string;
|
||||||
|
endWashTime?: string;
|
||||||
|
orderDate?: string;
|
||||||
|
status?: GetArrItemType<typeof statuses>;
|
||||||
|
phone?: string;
|
||||||
|
location?: string;
|
||||||
|
master: Master;
|
||||||
|
notes: '';
|
||||||
|
allMasters: Master[];
|
||||||
|
id: string;
|
||||||
|
};
|
||||||
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;
|
||||||
|
};
|
||||||
1
src/models/common.ts
Normal file
1
src/models/common.ts
Normal file
@@ -0,0 +1 @@
|
|||||||
|
export type IsoDate = string; // YYYY-MM-DDThh:mm:ss.mmmZ
|
||||||
@@ -1 +1,2 @@
|
|||||||
export * from './i18n';
|
export * from './i18n';
|
||||||
|
export * from './landing';
|
||||||
@@ -1,4 +1,4 @@
|
|||||||
export type RegistrationNumber = string; // А012ВЕ
|
export type RegistrationNumber = string; // А012ВЕ16
|
||||||
|
|
||||||
export type Color = string; // #000000
|
export type Color = string; // #000000
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
import { IsoDate } from "../common";
|
||||||
|
|
||||||
import { Car, Customer, Washing } from ".";
|
import { Car, Customer, Washing } from ".";
|
||||||
|
|
||||||
export type Id = string;
|
export type Id = string;
|
||||||
@@ -24,15 +26,20 @@ export type Create = {
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export type Number = string;
|
||||||
|
|
||||||
export type View = {
|
export type View = {
|
||||||
id: Id;
|
|
||||||
orderDate: string,
|
|
||||||
status: Status,
|
|
||||||
phone: Customer.PhoneNumber;
|
phone: Customer.PhoneNumber;
|
||||||
carNumber: Car.RegistrationNumber;
|
carNumber: Car.RegistrationNumber;
|
||||||
carBody: Car.BodyStyle;
|
carBody: Car.BodyStyle;
|
||||||
carColor?: Car.Color;
|
carColor?: Car.Color;
|
||||||
location: Washing.Location;
|
location: Washing.Location;
|
||||||
datetimeBegin: Washing.AvailableBeginDateTime;
|
startWashTime: Washing.AvailableBeginDateTime;
|
||||||
datetimeEnd: Washing.AvailableEndDateTime;
|
endWashTime: Washing.AvailableEndDateTime;
|
||||||
|
orderNumber: Number,
|
||||||
|
status: Status,
|
||||||
|
notes: string;
|
||||||
|
created: IsoDate;
|
||||||
|
updated: IsoDate;
|
||||||
|
id: Id;
|
||||||
};
|
};
|
||||||
@@ -1 +1 @@
|
|||||||
export { default as LandingSuccessStub } from './success';
|
export type { default as LandingSuccessStub } from './success';
|
||||||
@@ -1,5 +1,7 @@
|
|||||||
export type Location = string; // ?
|
import { IsoDate } from "../common";
|
||||||
|
|
||||||
export type AvailableBeginDateTime = string; // YYYY-MM-DDThh:mm
|
export type Location = string; // 55.754364, 48.743295 Университетская улица, 1, Иннополис, Верхнеуслонский район, Республика Татарстан (Татарстан), 420500
|
||||||
|
|
||||||
export type AvailableEndDateTime = string; // YYYY-MM-DDThh:mm
|
export type AvailableBeginDateTime = IsoDate;
|
||||||
|
|
||||||
|
export type AvailableEndDateTime = IsoDate;
|
||||||
472
src/pages/__tests__/__snapshots__/landing.test.tsx.snap
Normal file
472
src/pages/__tests__/__snapshots__/landing.test.tsx.snap
Normal file
@@ -0,0 +1,472 @@
|
|||||||
|
// Jest Snapshot v1, https://goo.gl/fbAQLP
|
||||||
|
|
||||||
|
exports[`Landing page renders page structure 1`] = `
|
||||||
|
<div>
|
||||||
|
<div
|
||||||
|
class="chakra-container css-3n6qh3"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="chakra-stack css-oo194l"
|
||||||
|
>
|
||||||
|
<header
|
||||||
|
class="css-18v4itn"
|
||||||
|
data-testid="hero-section"
|
||||||
|
>
|
||||||
|
<video
|
||||||
|
autoplay=""
|
||||||
|
class="css-ekis1p"
|
||||||
|
loop=""
|
||||||
|
poster="file"
|
||||||
|
src="/remote-assets/demo.mp4"
|
||||||
|
/>
|
||||||
|
<section
|
||||||
|
class="chakra-stack css-1thnzu5"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="css-gmuwbf"
|
||||||
|
>
|
||||||
|
<img
|
||||||
|
alt="Логотип компании «Dry Master»"
|
||||||
|
class="chakra-image css-1pkgess"
|
||||||
|
src="file"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
class="chakra-stack css-o51fhk"
|
||||||
|
>
|
||||||
|
<h1
|
||||||
|
class="chakra-heading css-stv3c1"
|
||||||
|
>
|
||||||
|
Оживите свою поездку с помощью экологически чистого ухода!
|
||||||
|
</h1>
|
||||||
|
<p
|
||||||
|
class="chakra-text css-1wocpjt"
|
||||||
|
>
|
||||||
|
Ощутите максимальное удобство сухой мойки автомобилей, созданной для того, чтобы планета стала чище
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<a
|
||||||
|
class="chakra-button css-y8aoxt"
|
||||||
|
href="/dry-wash/order"
|
||||||
|
>
|
||||||
|
Сделать заказ
|
||||||
|
</a>
|
||||||
|
</section>
|
||||||
|
</header>
|
||||||
|
<main
|
||||||
|
class="chakra-stack css-t04jrd"
|
||||||
|
>
|
||||||
|
<section
|
||||||
|
class="chakra-stack css-w9e24l"
|
||||||
|
data-testid="benefits-section"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="chakra-stack css-10k9nsp"
|
||||||
|
>
|
||||||
|
<h2
|
||||||
|
class="chakra-heading css-1dklj6k"
|
||||||
|
>
|
||||||
|
Преимущества экологичной автомойки
|
||||||
|
</h2>
|
||||||
|
<p
|
||||||
|
class="chakra-text css-0"
|
||||||
|
>
|
||||||
|
Откройте для себя преимущества наших услуг по химчистке автомобилей
|
||||||
|
</p>
|
||||||
|
</div>
|
||||||
|
<ul
|
||||||
|
class="css-1okvvnm"
|
||||||
|
role="list"
|
||||||
|
>
|
||||||
|
<li
|
||||||
|
class="css-vxcmzt"
|
||||||
|
>
|
||||||
|
<svg
|
||||||
|
class="chakra-icon css-cobjw9"
|
||||||
|
fill="currentColor"
|
||||||
|
focusable="false"
|
||||||
|
height="1em"
|
||||||
|
role="presentation"
|
||||||
|
stroke="currentColor"
|
||||||
|
stroke-width="0"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
width="1em"
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
d="M0 0h24v24H0z"
|
||||||
|
fill="none"
|
||||||
|
/>
|
||||||
|
<path
|
||||||
|
d="M6.05 8.05a7.001 7.001 0 0 0-.02 9.88c1.47-3.4 4.09-6.24 7.36-7.93A15.952 15.952 0 0 0 8 19.32c2.6 1.23 5.8.78 7.95-1.37C19.43 14.47 20 4 20 4S9.53 4.57 6.05 8.05z"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
Экологически безопасные продукты
|
||||||
|
</li>
|
||||||
|
<li
|
||||||
|
class="css-vxcmzt"
|
||||||
|
>
|
||||||
|
<svg
|
||||||
|
class="chakra-icon css-cobjw9"
|
||||||
|
fill="currentColor"
|
||||||
|
focusable="false"
|
||||||
|
height="1em"
|
||||||
|
role="presentation"
|
||||||
|
stroke="currentColor"
|
||||||
|
stroke-width="0"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
width="1em"
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
d="M0 0h24v24H0z"
|
||||||
|
fill="none"
|
||||||
|
/>
|
||||||
|
<path
|
||||||
|
d="m14.17 13.71 1.4-2.42c.09-.15.05-.34-.08-.45l-1.48-1.16c.03-.22.05-.45.05-.68s-.02-.46-.05-.69l1.48-1.16c.13-.11.17-.3.08-.45l-1.4-2.42c-.09-.15-.27-.21-.43-.15l-1.74.7c-.36-.28-.75-.51-1.18-.69l-.26-1.85a.364.364 0 0 0-.35-.29h-2.8c-.17 0-.32.13-.35.3L6.8 4.15c-.42.18-.82.41-1.18.69l-1.74-.7c-.16-.06-.34 0-.43.15l-1.4 2.42c-.09.15-.05.34.08.45l1.48 1.16c-.03.22-.05.45-.05.68s.02.46.05.69l-1.48 1.16c-.13.11-.17.3-.08.45l1.4 2.42c.09.15.27.21.43.15l1.74-.7c.36.28.75.51 1.18.69l.26 1.85c.03.16.18.29.35.29h2.8c.17 0 .32-.13.35-.3l.26-1.85c.42-.18.82-.41 1.18-.69l1.74.7c.16.06.34 0 .43-.15zM8.81 11c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2zM21.92 18.67l-.96-.74c.02-.14.04-.29.04-.44 0-.15-.01-.3-.04-.44l.95-.74c.08-.07.11-.19.05-.29l-.9-1.55c-.05-.1-.17-.13-.28-.1l-1.11.45c-.23-.18-.48-.33-.76-.44l-.17-1.18a.216.216 0 0 0-.21-.2h-1.79c-.11 0-.21.08-.22.19l-.17 1.18c-.27.12-.53.26-.76.44l-1.11-.45a.23.23 0 0 0-.28.1l-.9 1.55c-.05.1-.04.22.05.29l.95.74a3.145 3.145 0 0 0 0 .88l-.95.74c-.08.07-.11.19-.05.29l.9 1.55c.05.1.17.13.28.1l1.11-.45c.23.18.48.33.76.44l.17 1.18c.02.11.11.19.22.19h1.79c.11 0 .21-.08.22-.19l.17-1.18c.27-.12.53-.26.75-.44l1.12.45c.1.04.22 0 .28-.1l.9-1.55c.06-.09.03-.21-.05-.28zm-4.29.16a1.35 1.35 0 1 1 .001-2.701 1.35 1.35 0 0 1-.001 2.701z"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
Быстрое и эффективное обслуживание
|
||||||
|
</li>
|
||||||
|
<li
|
||||||
|
class="css-vxcmzt"
|
||||||
|
>
|
||||||
|
<svg
|
||||||
|
class="chakra-icon css-cobjw9"
|
||||||
|
fill="currentColor"
|
||||||
|
focusable="false"
|
||||||
|
height="1em"
|
||||||
|
role="presentation"
|
||||||
|
stroke="currentColor"
|
||||||
|
stroke-width="0"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
width="1em"
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
d="M0 0h24v24H0z"
|
||||||
|
fill="none"
|
||||||
|
/>
|
||||||
|
<path
|
||||||
|
d="M12 2C8.13 2 5 5.13 5 9c0 5.25 7 13 7 13s7-7.75 7-13c0-3.87-3.13-7-7-7zm0 9.5a2.5 2.5 0 0 1 0-5 2.5 2.5 0 0 1 0 5z"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
Удобный мобильный доступ
|
||||||
|
</li>
|
||||||
|
<li
|
||||||
|
class="css-vxcmzt"
|
||||||
|
>
|
||||||
|
<svg
|
||||||
|
class="chakra-icon css-cobjw9"
|
||||||
|
fill="currentColor"
|
||||||
|
focusable="false"
|
||||||
|
height="1em"
|
||||||
|
role="presentation"
|
||||||
|
stroke="currentColor"
|
||||||
|
stroke-width="0"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
width="1em"
|
||||||
|
xmlns="http://www.w3.org/2000/svg"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
d="M0 0h24v24H0z"
|
||||||
|
fill="none"
|
||||||
|
/>
|
||||||
|
<path
|
||||||
|
d="M16.48 10.41c-.39.39-1.04.39-1.43 0l-4.47-4.46-7.05 7.04-.66-.63a3 3 0 0 1 0-4.24l4.24-4.24a3 3 0 0 1 4.24 0L16.48 9c.39.39.39 1.02 0 1.41zm.7-2.12c.78.78.78 2.05 0 2.83-1.27 1.27-2.61.22-2.83 0l-3.76-3.76-5.57 5.57a.996.996 0 0 0 0 1.41c.39.39 1.02.39 1.42 0l4.62-4.62.71.71-4.62 4.62a.996.996 0 0 0 0 1.41c.39.39 1.02.39 1.42 0l4.62-4.62.71.71-4.62 4.62a.996.996 0 1 0 1.41 1.41l4.62-4.62.71.71-4.62 4.62a.996.996 0 1 0 1.41 1.41l8.32-8.34a3 3 0 0 0 0-4.24l-4.24-4.24a3.001 3.001 0 0 0-4.18-.06l4.47 4.47z"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
Надежный и заслуживающий доверия
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
<div
|
||||||
|
class="chakra-stack css-1ybfgv"
|
||||||
|
>
|
||||||
|
<a
|
||||||
|
class="chakra-button css-vda7qx"
|
||||||
|
href="/dry-wash/order"
|
||||||
|
>
|
||||||
|
Сделать заказ
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
<section
|
||||||
|
class="chakra-stack css-w9e24l"
|
||||||
|
data-testid="social-proof-section"
|
||||||
|
>
|
||||||
|
<h2
|
||||||
|
class="chakra-heading css-1dklj6k"
|
||||||
|
>
|
||||||
|
Нас выбирают
|
||||||
|
</h2>
|
||||||
|
<div
|
||||||
|
class="chakra-tabs css-wk0uhf"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
aria-orientation="horizontal"
|
||||||
|
class="chakra-tabs__tablist css-b6qpy9"
|
||||||
|
role="tablist"
|
||||||
|
>
|
||||||
|
<button
|
||||||
|
aria-controls="tabs-:r0:--tabpanel-0"
|
||||||
|
aria-disabled="false"
|
||||||
|
aria-selected="true"
|
||||||
|
class="chakra-tabs__tab css-57d70n"
|
||||||
|
data-index="0"
|
||||||
|
id="tabs-:r0:--tab-0"
|
||||||
|
role="tab"
|
||||||
|
tabindex="0"
|
||||||
|
type="button"
|
||||||
|
>
|
||||||
|
<p
|
||||||
|
class="chakra-text css-gyp8mm"
|
||||||
|
>
|
||||||
|
0
|
||||||
|
</p>
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
aria-controls="tabs-:r0:--tabpanel-1"
|
||||||
|
aria-disabled="false"
|
||||||
|
aria-selected="false"
|
||||||
|
class="chakra-tabs__tab css-57d70n"
|
||||||
|
data-index="1"
|
||||||
|
id="tabs-:r0:--tab-1"
|
||||||
|
role="tab"
|
||||||
|
tabindex="-1"
|
||||||
|
type="button"
|
||||||
|
>
|
||||||
|
<p
|
||||||
|
class="chakra-text css-gyp8mm"
|
||||||
|
>
|
||||||
|
1
|
||||||
|
</p>
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
aria-controls="tabs-:r0:--tabpanel-2"
|
||||||
|
aria-disabled="false"
|
||||||
|
aria-selected="false"
|
||||||
|
class="chakra-tabs__tab css-57d70n"
|
||||||
|
data-index="2"
|
||||||
|
id="tabs-:r0:--tab-2"
|
||||||
|
role="tab"
|
||||||
|
tabindex="-1"
|
||||||
|
type="button"
|
||||||
|
>
|
||||||
|
<p
|
||||||
|
class="chakra-text css-gyp8mm"
|
||||||
|
>
|
||||||
|
2
|
||||||
|
</p>
|
||||||
|
</button>
|
||||||
|
<button
|
||||||
|
aria-controls="tabs-:r0:--tabpanel-3"
|
||||||
|
aria-disabled="false"
|
||||||
|
aria-selected="false"
|
||||||
|
class="chakra-tabs__tab css-57d70n"
|
||||||
|
data-index="3"
|
||||||
|
id="tabs-:r0:--tab-3"
|
||||||
|
role="tab"
|
||||||
|
tabindex="-1"
|
||||||
|
type="button"
|
||||||
|
>
|
||||||
|
<p
|
||||||
|
class="chakra-text css-gyp8mm"
|
||||||
|
>
|
||||||
|
3
|
||||||
|
</p>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
class="chakra-tabs__tab-panels css-8atqhb"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
aria-labelledby="tabs-:r0:--tab-0"
|
||||||
|
class="chakra-tabs__tab-panel css-a5mhaz"
|
||||||
|
id="tabs-:r0:--tabpanel-0"
|
||||||
|
role="tabpanel"
|
||||||
|
tabindex="0"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="chakra-card css-wxdwo7"
|
||||||
|
>
|
||||||
|
<span
|
||||||
|
class="chakra-avatar css-3i6ll4"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
aria-label="Анна Смирнова"
|
||||||
|
class="chakra-avatar__initials css-1ebyn6"
|
||||||
|
role="img"
|
||||||
|
>
|
||||||
|
АС
|
||||||
|
</div>
|
||||||
|
</span>
|
||||||
|
<q
|
||||||
|
class="chakra-text css-w3tajv"
|
||||||
|
>
|
||||||
|
Недавно воспользовалась услугами сухой мойки автомобилей и осталась крайне удовлетворена. Процесс был проведён профессионально: сотрудники использовали качественные средства, которые не повредили лакокрасочное покрытие. Особенно впечатлила возможность мыть машину без воды, что не только экономит ресурсы, но и бережет окружающую среду. Рекомендую всем, кто заботится о своём автомобиле и экологии!
|
||||||
|
</q>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
aria-labelledby="tabs-:r0:--tab-1"
|
||||||
|
class="chakra-tabs__tab-panel css-a5mhaz"
|
||||||
|
hidden=""
|
||||||
|
id="tabs-:r0:--tabpanel-1"
|
||||||
|
role="tabpanel"
|
||||||
|
tabindex="0"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="chakra-card css-wxdwo7"
|
||||||
|
>
|
||||||
|
<span
|
||||||
|
class="chakra-avatar css-qvlgfo"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
aria-label="Дмитрий Петров"
|
||||||
|
class="chakra-avatar__initials css-1ebyn6"
|
||||||
|
role="img"
|
||||||
|
>
|
||||||
|
ДП
|
||||||
|
</div>
|
||||||
|
</span>
|
||||||
|
<q
|
||||||
|
class="chakra-text css-w3tajv"
|
||||||
|
>
|
||||||
|
Как же я рад, что нашел эту сухую мойку! Моя машина сияет, как новенькая! 🌟 Сначала был скептически настроен, думал, как же без воды можно отмыть всё это? Но результат превзошёл все ожидания! Ветеринар мойки профессионально подошёл к делу, и она теперь выглядит потрясающе. Если вы хотите, чтобы ваш автомобиль всегда выглядел на 100%, обязательно попробуйте!
|
||||||
|
</q>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
aria-labelledby="tabs-:r0:--tab-2"
|
||||||
|
class="chakra-tabs__tab-panel css-a5mhaz"
|
||||||
|
hidden=""
|
||||||
|
id="tabs-:r0:--tabpanel-2"
|
||||||
|
role="tabpanel"
|
||||||
|
tabindex="0"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="chakra-card css-wxdwo7"
|
||||||
|
>
|
||||||
|
<span
|
||||||
|
class="chakra-avatar css-1d83cyw"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
aria-label="Алексей Сидоров"
|
||||||
|
class="chakra-avatar__initials css-1ebyn6"
|
||||||
|
role="img"
|
||||||
|
>
|
||||||
|
АС
|
||||||
|
</div>
|
||||||
|
</span>
|
||||||
|
<q
|
||||||
|
class="chakra-text css-w3tajv"
|
||||||
|
>
|
||||||
|
Сухая мойка автомобилей - интересное решение, которое я опробовал недавно. В целом остался доволен качеством работы. Однако, не все загрязнения удалось удалить с первого раза, но сотрудник предложил дополнительные услуги, что меня устроило. Плюс, большое внимание уделили защите поверхности, что тоже немаловажно. Думаю, в следующий раз снова воспользуюсь этой услугой.
|
||||||
|
</q>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
aria-labelledby="tabs-:r0:--tab-3"
|
||||||
|
class="chakra-tabs__tab-panel css-a5mhaz"
|
||||||
|
hidden=""
|
||||||
|
id="tabs-:r0:--tabpanel-3"
|
||||||
|
role="tabpanel"
|
||||||
|
tabindex="0"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="chakra-card css-wxdwo7"
|
||||||
|
>
|
||||||
|
<span
|
||||||
|
class="chakra-avatar css-ct2cfw"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
aria-label="Екатерина Иванова"
|
||||||
|
class="chakra-avatar__initials css-1ebyn6"
|
||||||
|
role="img"
|
||||||
|
>
|
||||||
|
ЕИ
|
||||||
|
</div>
|
||||||
|
</span>
|
||||||
|
<q
|
||||||
|
class="chakra-text css-w3tajv"
|
||||||
|
>
|
||||||
|
К сожалению, мой опыт с сухой мойкой автомобилей оказался неудачным. Ожидала увидеть чистую машину после процедуры, но многие участки остались незаделанными. Кроме того, процедура заняла больше времени, чем мне обещали. Возможно, в этом конкретном центре что-то пошло не так, но я бы не стала повторно обращаться за этой услугой.
|
||||||
|
</q>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
class="chakra-stack css-1ybfgv"
|
||||||
|
>
|
||||||
|
<a
|
||||||
|
class="chakra-button css-vda7qx"
|
||||||
|
href="/dry-wash/order"
|
||||||
|
>
|
||||||
|
Сделать заказ
|
||||||
|
</a>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
</main>
|
||||||
|
<footer
|
||||||
|
class="chakra-stack css-1fatox6"
|
||||||
|
data-testid="footer"
|
||||||
|
>
|
||||||
|
<img
|
||||||
|
alt="Логотип компании «Dry Master»"
|
||||||
|
class="chakra-image css-1pkgess"
|
||||||
|
src="file"
|
||||||
|
/>
|
||||||
|
<p
|
||||||
|
class="chakra-text css-znk605"
|
||||||
|
>
|
||||||
|
© {{currentYear}} DryMaster. Все права защищены
|
||||||
|
</p>
|
||||||
|
<ul
|
||||||
|
class="css-bhb3xr"
|
||||||
|
role="list"
|
||||||
|
>
|
||||||
|
<li
|
||||||
|
class="css-0"
|
||||||
|
>
|
||||||
|
<a
|
||||||
|
class="chakra-link css-spn4bz"
|
||||||
|
href="/"
|
||||||
|
>
|
||||||
|
Политика конфиденциальности
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
<li
|
||||||
|
class="css-0"
|
||||||
|
>
|
||||||
|
<a
|
||||||
|
class="chakra-link css-spn4bz"
|
||||||
|
href="/"
|
||||||
|
>
|
||||||
|
Условия обслуживания
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
<li
|
||||||
|
class="css-0"
|
||||||
|
>
|
||||||
|
<a
|
||||||
|
class="chakra-link css-spn4bz"
|
||||||
|
href="/"
|
||||||
|
>
|
||||||
|
FAQ
|
||||||
|
</a>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
</footer>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<span
|
||||||
|
hidden=""
|
||||||
|
id="__chakra_env"
|
||||||
|
/>
|
||||||
|
<span
|
||||||
|
hidden=""
|
||||||
|
id="__chakra_env"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
643
src/pages/__tests__/__snapshots__/masters.test.tsx.snap
Normal file
643
src/pages/__tests__/__snapshots__/masters.test.tsx.snap
Normal file
@@ -0,0 +1,643 @@
|
|||||||
|
// Jest Snapshot v1, https://goo.gl/fbAQLP
|
||||||
|
|
||||||
|
exports[`Master Page should display master list and show details when master button is clicked 1`] = `
|
||||||
|
<div>
|
||||||
|
<div
|
||||||
|
class="css-1yeiifd"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="css-13owfwq"
|
||||||
|
>
|
||||||
|
<h2
|
||||||
|
class="chakra-heading css-173d1bl"
|
||||||
|
>
|
||||||
|
Сухой мастер
|
||||||
|
</h2>
|
||||||
|
<div
|
||||||
|
class="chakra-stack css-1cggwyz"
|
||||||
|
>
|
||||||
|
<hr
|
||||||
|
aria-orientation="horizontal"
|
||||||
|
class="chakra-divider css-svjswr"
|
||||||
|
/>
|
||||||
|
<a
|
||||||
|
class="chakra-button css-18yoix2"
|
||||||
|
href="/order"
|
||||||
|
>
|
||||||
|
Заказы
|
||||||
|
</a>
|
||||||
|
<hr
|
||||||
|
aria-orientation="horizontal"
|
||||||
|
class="chakra-divider css-svjswr"
|
||||||
|
/>
|
||||||
|
<a
|
||||||
|
class="chakra-button css-1kg18wp"
|
||||||
|
data-testid="master-button"
|
||||||
|
href="/master"
|
||||||
|
>
|
||||||
|
Мастера
|
||||||
|
</a>
|
||||||
|
<hr
|
||||||
|
aria-orientation="horizontal"
|
||||||
|
class="chakra-divider css-svjswr"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
class="css-jiwy8d"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="css-1glkkdp"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="css-sd3fvu"
|
||||||
|
>
|
||||||
|
<h2
|
||||||
|
class="chakra-heading css-1jb3vzl"
|
||||||
|
>
|
||||||
|
|
||||||
|
Мастера
|
||||||
|
</h2>
|
||||||
|
<button
|
||||||
|
class="chakra-button css-h211ee"
|
||||||
|
type="button"
|
||||||
|
>
|
||||||
|
+
|
||||||
|
Добавить
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
<table
|
||||||
|
class="chakra-table css-5605sr"
|
||||||
|
>
|
||||||
|
<thead
|
||||||
|
class="css-0"
|
||||||
|
>
|
||||||
|
<tr
|
||||||
|
class="css-0"
|
||||||
|
>
|
||||||
|
<th
|
||||||
|
class="css-1szkfps"
|
||||||
|
>
|
||||||
|
Имя
|
||||||
|
</th>
|
||||||
|
<th
|
||||||
|
class="css-1szkfps"
|
||||||
|
>
|
||||||
|
Актуальная занятость
|
||||||
|
</th>
|
||||||
|
<th
|
||||||
|
class="css-1szkfps"
|
||||||
|
>
|
||||||
|
Телефон
|
||||||
|
</th>
|
||||||
|
<th
|
||||||
|
class="css-1szkfps"
|
||||||
|
>
|
||||||
|
Действия
|
||||||
|
</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody
|
||||||
|
class="css-0"
|
||||||
|
>
|
||||||
|
<tr
|
||||||
|
class="css-0"
|
||||||
|
>
|
||||||
|
<td
|
||||||
|
class="css-zgoslk"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="chakra-editable css-vtl58r"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="chakra-stack css-c2wmld"
|
||||||
|
>
|
||||||
|
<span
|
||||||
|
class="chakra-editable__preview css-1gasyng"
|
||||||
|
>
|
||||||
|
Иван Иванов
|
||||||
|
</span>
|
||||||
|
<input
|
||||||
|
class="chakra-editable__input chakra-input css-2lpiar"
|
||||||
|
hidden=""
|
||||||
|
value="Иван Иванов"
|
||||||
|
/>
|
||||||
|
<div
|
||||||
|
class="css-1l4w6pd"
|
||||||
|
>
|
||||||
|
<button
|
||||||
|
aria-label="Edit"
|
||||||
|
class="chakra-button css-1pqvhxt"
|
||||||
|
type="button"
|
||||||
|
>
|
||||||
|
<svg
|
||||||
|
aria-hidden="true"
|
||||||
|
class="chakra-icon css-onkibi"
|
||||||
|
focusable="false"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
>
|
||||||
|
<g
|
||||||
|
fill="none"
|
||||||
|
stroke="currentColor"
|
||||||
|
stroke-linecap="round"
|
||||||
|
stroke-width="2"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
d="M11 4H4a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-7"
|
||||||
|
/>
|
||||||
|
<path
|
||||||
|
d="M18.5 2.5a2.121 2.121 0 0 1 3 3L12 15l-4 1 1-4 9.5-9.5z"
|
||||||
|
/>
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
<td
|
||||||
|
class="css-zgoslk"
|
||||||
|
>
|
||||||
|
<p
|
||||||
|
class="chakra-text css-q9k0mw"
|
||||||
|
>
|
||||||
|
Свободен
|
||||||
|
</p>
|
||||||
|
</td>
|
||||||
|
<td
|
||||||
|
class="css-zgoslk"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="chakra-editable css-vtl58r"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="chakra-stack css-c2wmld"
|
||||||
|
>
|
||||||
|
<span
|
||||||
|
class="chakra-editable__preview css-1gasyng"
|
||||||
|
>
|
||||||
|
+7 900 123 45 67
|
||||||
|
</span>
|
||||||
|
<input
|
||||||
|
class="chakra-editable__input chakra-input css-2lpiar"
|
||||||
|
hidden=""
|
||||||
|
value="+7 900 123 45 67"
|
||||||
|
/>
|
||||||
|
<div
|
||||||
|
class="css-1l4w6pd"
|
||||||
|
>
|
||||||
|
<button
|
||||||
|
aria-label="Edit"
|
||||||
|
class="chakra-button css-1pqvhxt"
|
||||||
|
type="button"
|
||||||
|
>
|
||||||
|
<svg
|
||||||
|
aria-hidden="true"
|
||||||
|
class="chakra-icon css-onkibi"
|
||||||
|
focusable="false"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
>
|
||||||
|
<g
|
||||||
|
fill="none"
|
||||||
|
stroke="currentColor"
|
||||||
|
stroke-linecap="round"
|
||||||
|
stroke-width="2"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
d="M11 4H4a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-7"
|
||||||
|
/>
|
||||||
|
<path
|
||||||
|
d="M18.5 2.5a2.121 2.121 0 0 1 3 3L12 15l-4 1 1-4 9.5-9.5z"
|
||||||
|
/>
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
<td
|
||||||
|
class="css-zgoslk"
|
||||||
|
>
|
||||||
|
<button
|
||||||
|
aria-controls="menu-list-:r2:"
|
||||||
|
aria-expanded="false"
|
||||||
|
aria-haspopup="menu"
|
||||||
|
class="chakra-button chakra-menu__menu-button css-13sr8jm"
|
||||||
|
id="menu-button-:r2:"
|
||||||
|
type="button"
|
||||||
|
>
|
||||||
|
<svg
|
||||||
|
aria-hidden="true"
|
||||||
|
class="chakra-icon css-onkibi"
|
||||||
|
focusable="false"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
>
|
||||||
|
<g
|
||||||
|
fill="none"
|
||||||
|
stroke="currentColor"
|
||||||
|
stroke-linecap="round"
|
||||||
|
stroke-width="2"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
d="M11 4H4a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-7"
|
||||||
|
/>
|
||||||
|
<path
|
||||||
|
d="M18.5 2.5a2.121 2.121 0 0 1 3 3L12 15l-4 1 1-4 9.5-9.5z"
|
||||||
|
/>
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
</button>
|
||||||
|
<div
|
||||||
|
class="css-ktd6ms"
|
||||||
|
style="visibility: hidden; position: absolute; min-width: max-content; inset: 0 auto auto 0;"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
aria-orientation="vertical"
|
||||||
|
class="chakra-menu__menu-list css-s5t7bz"
|
||||||
|
id="menu-list-:r2:"
|
||||||
|
role="menu"
|
||||||
|
style="transform-origin: var(--popper-transform-origin); opacity: 0; visibility: hidden; transform: scale(0.8) translateZ(0);"
|
||||||
|
tabindex="-1"
|
||||||
|
>
|
||||||
|
<button
|
||||||
|
aria-disabled="false"
|
||||||
|
class="chakra-menu__menuitem css-y7jzs3"
|
||||||
|
data-index="0"
|
||||||
|
id="menu-list-:r2:-menuitem-:r3:"
|
||||||
|
role="menuitem"
|
||||||
|
tabindex="-1"
|
||||||
|
type="button"
|
||||||
|
>
|
||||||
|
Удалить мастера
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr
|
||||||
|
class="css-0"
|
||||||
|
>
|
||||||
|
<td
|
||||||
|
class="css-zgoslk"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="chakra-editable css-vtl58r"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="chakra-stack css-c2wmld"
|
||||||
|
>
|
||||||
|
<span
|
||||||
|
class="chakra-editable__preview css-1gasyng"
|
||||||
|
>
|
||||||
|
Олег Макаров
|
||||||
|
</span>
|
||||||
|
<input
|
||||||
|
class="chakra-editable__input chakra-input css-2lpiar"
|
||||||
|
hidden=""
|
||||||
|
value="Олег Макаров"
|
||||||
|
/>
|
||||||
|
<div
|
||||||
|
class="css-1l4w6pd"
|
||||||
|
>
|
||||||
|
<button
|
||||||
|
aria-label="Edit"
|
||||||
|
class="chakra-button css-1pqvhxt"
|
||||||
|
type="button"
|
||||||
|
>
|
||||||
|
<svg
|
||||||
|
aria-hidden="true"
|
||||||
|
class="chakra-icon css-onkibi"
|
||||||
|
focusable="false"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
>
|
||||||
|
<g
|
||||||
|
fill="none"
|
||||||
|
stroke="currentColor"
|
||||||
|
stroke-linecap="round"
|
||||||
|
stroke-width="2"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
d="M11 4H4a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-7"
|
||||||
|
/>
|
||||||
|
<path
|
||||||
|
d="M18.5 2.5a2.121 2.121 0 0 1 3 3L12 15l-4 1 1-4 9.5-9.5z"
|
||||||
|
/>
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
<td
|
||||||
|
class="css-zgoslk"
|
||||||
|
>
|
||||||
|
<p
|
||||||
|
class="chakra-text css-q9k0mw"
|
||||||
|
>
|
||||||
|
Свободен
|
||||||
|
</p>
|
||||||
|
</td>
|
||||||
|
<td
|
||||||
|
class="css-zgoslk"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="chakra-editable css-vtl58r"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="chakra-stack css-c2wmld"
|
||||||
|
>
|
||||||
|
<span
|
||||||
|
class="chakra-editable__preview css-1gasyng"
|
||||||
|
>
|
||||||
|
79001234567
|
||||||
|
</span>
|
||||||
|
<input
|
||||||
|
class="chakra-editable__input chakra-input css-2lpiar"
|
||||||
|
hidden=""
|
||||||
|
value="79001234567"
|
||||||
|
/>
|
||||||
|
<div
|
||||||
|
class="css-1l4w6pd"
|
||||||
|
>
|
||||||
|
<button
|
||||||
|
aria-label="Edit"
|
||||||
|
class="chakra-button css-1pqvhxt"
|
||||||
|
type="button"
|
||||||
|
>
|
||||||
|
<svg
|
||||||
|
aria-hidden="true"
|
||||||
|
class="chakra-icon css-onkibi"
|
||||||
|
focusable="false"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
>
|
||||||
|
<g
|
||||||
|
fill="none"
|
||||||
|
stroke="currentColor"
|
||||||
|
stroke-linecap="round"
|
||||||
|
stroke-width="2"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
d="M11 4H4a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-7"
|
||||||
|
/>
|
||||||
|
<path
|
||||||
|
d="M18.5 2.5a2.121 2.121 0 0 1 3 3L12 15l-4 1 1-4 9.5-9.5z"
|
||||||
|
/>
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
<td
|
||||||
|
class="css-zgoslk"
|
||||||
|
>
|
||||||
|
<button
|
||||||
|
aria-controls="menu-list-:r5:"
|
||||||
|
aria-expanded="false"
|
||||||
|
aria-haspopup="menu"
|
||||||
|
class="chakra-button chakra-menu__menu-button css-13sr8jm"
|
||||||
|
id="menu-button-:r5:"
|
||||||
|
type="button"
|
||||||
|
>
|
||||||
|
<svg
|
||||||
|
aria-hidden="true"
|
||||||
|
class="chakra-icon css-onkibi"
|
||||||
|
focusable="false"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
>
|
||||||
|
<g
|
||||||
|
fill="none"
|
||||||
|
stroke="currentColor"
|
||||||
|
stroke-linecap="round"
|
||||||
|
stroke-width="2"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
d="M11 4H4a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-7"
|
||||||
|
/>
|
||||||
|
<path
|
||||||
|
d="M18.5 2.5a2.121 2.121 0 0 1 3 3L12 15l-4 1 1-4 9.5-9.5z"
|
||||||
|
/>
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
</button>
|
||||||
|
<div
|
||||||
|
class="css-ktd6ms"
|
||||||
|
style="visibility: hidden; position: absolute; min-width: max-content; inset: 0 auto auto 0;"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
aria-orientation="vertical"
|
||||||
|
class="chakra-menu__menu-list css-s5t7bz"
|
||||||
|
id="menu-list-:r5:"
|
||||||
|
role="menu"
|
||||||
|
style="transform-origin: var(--popper-transform-origin); opacity: 0; visibility: hidden; transform: scale(0.8) translateZ(0);"
|
||||||
|
tabindex="-1"
|
||||||
|
>
|
||||||
|
<button
|
||||||
|
aria-disabled="false"
|
||||||
|
class="chakra-menu__menuitem css-y7jzs3"
|
||||||
|
data-index="0"
|
||||||
|
id="menu-list-:r5:-menuitem-:r6:"
|
||||||
|
role="menuitem"
|
||||||
|
tabindex="-1"
|
||||||
|
type="button"
|
||||||
|
>
|
||||||
|
Удалить мастера
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr
|
||||||
|
class="css-0"
|
||||||
|
>
|
||||||
|
<td
|
||||||
|
class="css-zgoslk"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="chakra-editable css-vtl58r"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="chakra-stack css-c2wmld"
|
||||||
|
>
|
||||||
|
<span
|
||||||
|
class="chakra-editable__preview css-1gasyng"
|
||||||
|
>
|
||||||
|
Иван Галкин
|
||||||
|
</span>
|
||||||
|
<input
|
||||||
|
class="chakra-editable__input chakra-input css-2lpiar"
|
||||||
|
hidden=""
|
||||||
|
value="Иван Галкин"
|
||||||
|
/>
|
||||||
|
<div
|
||||||
|
class="css-1l4w6pd"
|
||||||
|
>
|
||||||
|
<button
|
||||||
|
aria-label="Edit"
|
||||||
|
class="chakra-button css-1pqvhxt"
|
||||||
|
type="button"
|
||||||
|
>
|
||||||
|
<svg
|
||||||
|
aria-hidden="true"
|
||||||
|
class="chakra-icon css-onkibi"
|
||||||
|
focusable="false"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
>
|
||||||
|
<g
|
||||||
|
fill="none"
|
||||||
|
stroke="currentColor"
|
||||||
|
stroke-linecap="round"
|
||||||
|
stroke-width="2"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
d="M11 4H4a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-7"
|
||||||
|
/>
|
||||||
|
<path
|
||||||
|
d="M18.5 2.5a2.121 2.121 0 0 1 3 3L12 15l-4 1 1-4 9.5-9.5z"
|
||||||
|
/>
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
<td
|
||||||
|
class="css-zgoslk"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="chakra-stack css-1f0wxn3"
|
||||||
|
>
|
||||||
|
<span
|
||||||
|
class="chakra-badge css-1g1qw76"
|
||||||
|
/>
|
||||||
|
<span
|
||||||
|
class="chakra-badge css-1g1qw76"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
<td
|
||||||
|
class="css-zgoslk"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="chakra-editable css-vtl58r"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="chakra-stack css-c2wmld"
|
||||||
|
>
|
||||||
|
<span
|
||||||
|
class="chakra-editable__preview css-1gasyng"
|
||||||
|
>
|
||||||
|
+7 900 123 45 67
|
||||||
|
</span>
|
||||||
|
<input
|
||||||
|
class="chakra-editable__input chakra-input css-2lpiar"
|
||||||
|
hidden=""
|
||||||
|
value="+7 900 123 45 67"
|
||||||
|
/>
|
||||||
|
<div
|
||||||
|
class="css-1l4w6pd"
|
||||||
|
>
|
||||||
|
<button
|
||||||
|
aria-label="Edit"
|
||||||
|
class="chakra-button css-1pqvhxt"
|
||||||
|
type="button"
|
||||||
|
>
|
||||||
|
<svg
|
||||||
|
aria-hidden="true"
|
||||||
|
class="chakra-icon css-onkibi"
|
||||||
|
focusable="false"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
>
|
||||||
|
<g
|
||||||
|
fill="none"
|
||||||
|
stroke="currentColor"
|
||||||
|
stroke-linecap="round"
|
||||||
|
stroke-width="2"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
d="M11 4H4a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-7"
|
||||||
|
/>
|
||||||
|
<path
|
||||||
|
d="M18.5 2.5a2.121 2.121 0 0 1 3 3L12 15l-4 1 1-4 9.5-9.5z"
|
||||||
|
/>
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
<td
|
||||||
|
class="css-zgoslk"
|
||||||
|
>
|
||||||
|
<button
|
||||||
|
aria-controls="menu-list-:r8:"
|
||||||
|
aria-expanded="false"
|
||||||
|
aria-haspopup="menu"
|
||||||
|
class="chakra-button chakra-menu__menu-button css-13sr8jm"
|
||||||
|
id="menu-button-:r8:"
|
||||||
|
type="button"
|
||||||
|
>
|
||||||
|
<svg
|
||||||
|
aria-hidden="true"
|
||||||
|
class="chakra-icon css-onkibi"
|
||||||
|
focusable="false"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
>
|
||||||
|
<g
|
||||||
|
fill="none"
|
||||||
|
stroke="currentColor"
|
||||||
|
stroke-linecap="round"
|
||||||
|
stroke-width="2"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
d="M11 4H4a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-7"
|
||||||
|
/>
|
||||||
|
<path
|
||||||
|
d="M18.5 2.5a2.121 2.121 0 0 1 3 3L12 15l-4 1 1-4 9.5-9.5z"
|
||||||
|
/>
|
||||||
|
</g>
|
||||||
|
</svg>
|
||||||
|
</button>
|
||||||
|
<div
|
||||||
|
class="css-ktd6ms"
|
||||||
|
style="visibility: hidden; position: absolute; min-width: max-content; inset: 0 auto auto 0;"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
aria-orientation="vertical"
|
||||||
|
class="chakra-menu__menu-list css-s5t7bz"
|
||||||
|
id="menu-list-:r8:"
|
||||||
|
role="menu"
|
||||||
|
style="transform-origin: var(--popper-transform-origin); opacity: 0; visibility: hidden; transform: scale(0.8) translateZ(0);"
|
||||||
|
tabindex="-1"
|
||||||
|
>
|
||||||
|
<button
|
||||||
|
aria-disabled="false"
|
||||||
|
class="chakra-menu__menuitem css-y7jzs3"
|
||||||
|
data-index="0"
|
||||||
|
id="menu-list-:r8:-menuitem-:r9:"
|
||||||
|
role="menuitem"
|
||||||
|
tabindex="-1"
|
||||||
|
type="button"
|
||||||
|
>
|
||||||
|
Удалить мастера
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<span
|
||||||
|
hidden=""
|
||||||
|
id="__chakra_env"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
666
src/pages/__tests__/__snapshots__/order-create.test.tsx.snap
Normal file
666
src/pages/__tests__/__snapshots__/order-create.test.tsx.snap
Normal file
@@ -0,0 +1,666 @@
|
|||||||
|
// Jest Snapshot v1, https://goo.gl/fbAQLP
|
||||||
|
|
||||||
|
exports[`Create Order page renders page structure 1`] = `
|
||||||
|
<div>
|
||||||
|
<div
|
||||||
|
class="chakra-container css-3n6qh3"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="chakra-stack css-oo194l"
|
||||||
|
>
|
||||||
|
<h2
|
||||||
|
class="chakra-heading css-1c6lvb5"
|
||||||
|
data-testid="heading"
|
||||||
|
>
|
||||||
|
Заказать мойку
|
||||||
|
</h2>
|
||||||
|
<div
|
||||||
|
class="css-1cq1v9f"
|
||||||
|
data-testid="order-form"
|
||||||
|
>
|
||||||
|
<form
|
||||||
|
class="chakra-stack css-1dhetpf"
|
||||||
|
novalidate=""
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="chakra-form-control css-1kxonj9"
|
||||||
|
role="group"
|
||||||
|
>
|
||||||
|
<label
|
||||||
|
class="chakra-form__label css-g6pte"
|
||||||
|
for="phone"
|
||||||
|
id="field-:r0:-label"
|
||||||
|
>
|
||||||
|
Номер телефона
|
||||||
|
<span
|
||||||
|
aria-hidden="true"
|
||||||
|
class="chakra-form__required-indicator css-1tfjd1n"
|
||||||
|
role="presentation"
|
||||||
|
>
|
||||||
|
*
|
||||||
|
</span>
|
||||||
|
</label>
|
||||||
|
<input
|
||||||
|
aria-required="true"
|
||||||
|
autocomplete="tel"
|
||||||
|
class="chakra-input css-moii5c"
|
||||||
|
id="field-:r0:"
|
||||||
|
name="phone"
|
||||||
|
required=""
|
||||||
|
type="tel"
|
||||||
|
value=""
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
class="chakra-form-control css-1kxonj9"
|
||||||
|
role="group"
|
||||||
|
>
|
||||||
|
<label
|
||||||
|
class="chakra-form__label css-g6pte"
|
||||||
|
for="carNumber"
|
||||||
|
id="field-:r1:-label"
|
||||||
|
>
|
||||||
|
Номер автомобиля
|
||||||
|
<span
|
||||||
|
aria-hidden="true"
|
||||||
|
class="chakra-form__required-indicator css-1tfjd1n"
|
||||||
|
role="presentation"
|
||||||
|
>
|
||||||
|
*
|
||||||
|
</span>
|
||||||
|
</label>
|
||||||
|
<input
|
||||||
|
aria-required="true"
|
||||||
|
class="chakra-input css-moii5c"
|
||||||
|
id="field-:r1:"
|
||||||
|
maxlength="12"
|
||||||
|
name="carNumber"
|
||||||
|
required=""
|
||||||
|
value=""
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
class="chakra-form-control css-1kxonj9"
|
||||||
|
role="group"
|
||||||
|
>
|
||||||
|
<label
|
||||||
|
class="chakra-form__label css-g6pte"
|
||||||
|
for="carColor"
|
||||||
|
id="field-:r2:-label"
|
||||||
|
>
|
||||||
|
Цвет автомобиля
|
||||||
|
</label>
|
||||||
|
<input
|
||||||
|
class="chakra-input css-moii5c"
|
||||||
|
id="field-:r2:"
|
||||||
|
list=":r3:"
|
||||||
|
name="carColor"
|
||||||
|
value=""
|
||||||
|
/>
|
||||||
|
<datalist
|
||||||
|
id=":r3:"
|
||||||
|
>
|
||||||
|
<option
|
||||||
|
label="white"
|
||||||
|
value="#ffffff"
|
||||||
|
>
|
||||||
|
white
|
||||||
|
</option>
|
||||||
|
<option
|
||||||
|
label="black"
|
||||||
|
value="#000000"
|
||||||
|
>
|
||||||
|
black
|
||||||
|
</option>
|
||||||
|
<option
|
||||||
|
label="silver"
|
||||||
|
value="#c0c0c0"
|
||||||
|
>
|
||||||
|
silver
|
||||||
|
</option>
|
||||||
|
<option
|
||||||
|
label="gray"
|
||||||
|
value="#808080"
|
||||||
|
>
|
||||||
|
gray
|
||||||
|
</option>
|
||||||
|
<option
|
||||||
|
label="beige-brown"
|
||||||
|
value="#796745"
|
||||||
|
>
|
||||||
|
beige-brown
|
||||||
|
</option>
|
||||||
|
<option
|
||||||
|
label="red"
|
||||||
|
value="#b90000"
|
||||||
|
>
|
||||||
|
red
|
||||||
|
</option>
|
||||||
|
<option
|
||||||
|
label="blue"
|
||||||
|
value="#003B62"
|
||||||
|
>
|
||||||
|
blue
|
||||||
|
</option>
|
||||||
|
<option
|
||||||
|
label="green"
|
||||||
|
value="#078d51"
|
||||||
|
>
|
||||||
|
green
|
||||||
|
</option>
|
||||||
|
</datalist>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
class="chakra-form-control css-1kxonj9"
|
||||||
|
role="group"
|
||||||
|
>
|
||||||
|
<label
|
||||||
|
class="chakra-form__label css-g6pte"
|
||||||
|
for="carBody"
|
||||||
|
id="field-:r4:-label"
|
||||||
|
>
|
||||||
|
Тип кузова автомобиля
|
||||||
|
<span
|
||||||
|
aria-hidden="true"
|
||||||
|
class="chakra-form__required-indicator css-1tfjd1n"
|
||||||
|
role="presentation"
|
||||||
|
>
|
||||||
|
*
|
||||||
|
</span>
|
||||||
|
</label>
|
||||||
|
<div
|
||||||
|
class="css-8atqhb"
|
||||||
|
>
|
||||||
|
<input
|
||||||
|
aria-readonly="true"
|
||||||
|
aria-required="true"
|
||||||
|
class="chakra-input css-moii5c"
|
||||||
|
id="field-:r4:"
|
||||||
|
name="carBody"
|
||||||
|
placeholder="Не указан"
|
||||||
|
readonly=""
|
||||||
|
required=""
|
||||||
|
value=""
|
||||||
|
/>
|
||||||
|
<div
|
||||||
|
class="chakra-popover__popper css-iy22zq"
|
||||||
|
style="visibility: hidden; position: absolute; inset: 0 auto auto 0;"
|
||||||
|
>
|
||||||
|
<section
|
||||||
|
aria-describedby="popover-body-:r8:"
|
||||||
|
class="chakra-popover__content css-1mvj5hv"
|
||||||
|
id="popover-content-:r8:"
|
||||||
|
role="dialog"
|
||||||
|
style="transform-origin: var(--popper-transform-origin); opacity: 0; visibility: hidden; transform: scale(0.95) translateZ(0);"
|
||||||
|
tabindex="-1"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="chakra-popover__body css-1uqsyei"
|
||||||
|
id="popover-body-:r8:"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="css-124gwxm"
|
||||||
|
role="radiogroup"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="css-0"
|
||||||
|
>
|
||||||
|
<label
|
||||||
|
class="css-4g6ai3"
|
||||||
|
>
|
||||||
|
<input
|
||||||
|
aria-required="true"
|
||||||
|
hidden=""
|
||||||
|
id="radio-:r9:"
|
||||||
|
name="radio-:r5:"
|
||||||
|
required=""
|
||||||
|
style="border: 0px; clip: rect(0px, 0px, 0px, 0px); height: 1px; width: 1px; margin: -1px; padding: 0px; overflow: hidden; white-space: nowrap; position: absolute;"
|
||||||
|
type="radio"
|
||||||
|
value="1"
|
||||||
|
/>
|
||||||
|
<div
|
||||||
|
aria-hidden="true"
|
||||||
|
class="css-daiawq"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="css-dvxtzn"
|
||||||
|
>
|
||||||
|
<img
|
||||||
|
class="chakra-image css-wtpnzt"
|
||||||
|
src="file"
|
||||||
|
/>
|
||||||
|
Седан
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
class="css-0"
|
||||||
|
>
|
||||||
|
<label
|
||||||
|
class="css-4g6ai3"
|
||||||
|
>
|
||||||
|
<input
|
||||||
|
aria-required="true"
|
||||||
|
hidden=""
|
||||||
|
id="radio-:ra:"
|
||||||
|
name="radio-:r5:"
|
||||||
|
required=""
|
||||||
|
style="border: 0px; clip: rect(0px, 0px, 0px, 0px); height: 1px; width: 1px; margin: -1px; padding: 0px; overflow: hidden; white-space: nowrap; position: absolute;"
|
||||||
|
type="radio"
|
||||||
|
value="2"
|
||||||
|
/>
|
||||||
|
<div
|
||||||
|
aria-hidden="true"
|
||||||
|
class="css-daiawq"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="css-dvxtzn"
|
||||||
|
>
|
||||||
|
<img
|
||||||
|
class="chakra-image css-wtpnzt"
|
||||||
|
src="file"
|
||||||
|
/>
|
||||||
|
Хэтчбек
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
class="css-0"
|
||||||
|
>
|
||||||
|
<label
|
||||||
|
class="css-4g6ai3"
|
||||||
|
>
|
||||||
|
<input
|
||||||
|
aria-required="true"
|
||||||
|
hidden=""
|
||||||
|
id="radio-:rb:"
|
||||||
|
name="radio-:r5:"
|
||||||
|
required=""
|
||||||
|
style="border: 0px; clip: rect(0px, 0px, 0px, 0px); height: 1px; width: 1px; margin: -1px; padding: 0px; overflow: hidden; white-space: nowrap; position: absolute;"
|
||||||
|
type="radio"
|
||||||
|
value="3"
|
||||||
|
/>
|
||||||
|
<div
|
||||||
|
aria-hidden="true"
|
||||||
|
class="css-daiawq"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="css-dvxtzn"
|
||||||
|
>
|
||||||
|
<img
|
||||||
|
class="chakra-image css-wtpnzt"
|
||||||
|
src="file"
|
||||||
|
/>
|
||||||
|
Кроссовер
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
class="css-0"
|
||||||
|
>
|
||||||
|
<label
|
||||||
|
class="css-4g6ai3"
|
||||||
|
>
|
||||||
|
<input
|
||||||
|
aria-required="true"
|
||||||
|
hidden=""
|
||||||
|
id="radio-:rc:"
|
||||||
|
name="radio-:r5:"
|
||||||
|
required=""
|
||||||
|
style="border: 0px; clip: rect(0px, 0px, 0px, 0px); height: 1px; width: 1px; margin: -1px; padding: 0px; overflow: hidden; white-space: nowrap; position: absolute;"
|
||||||
|
type="radio"
|
||||||
|
value="4"
|
||||||
|
/>
|
||||||
|
<div
|
||||||
|
aria-hidden="true"
|
||||||
|
class="css-daiawq"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="css-dvxtzn"
|
||||||
|
>
|
||||||
|
<img
|
||||||
|
class="chakra-image css-wtpnzt"
|
||||||
|
src="file"
|
||||||
|
/>
|
||||||
|
Внедорожник
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
class="css-0"
|
||||||
|
>
|
||||||
|
<label
|
||||||
|
class="css-4g6ai3"
|
||||||
|
>
|
||||||
|
<input
|
||||||
|
aria-required="true"
|
||||||
|
hidden=""
|
||||||
|
id="radio-:rd:"
|
||||||
|
name="radio-:r5:"
|
||||||
|
required=""
|
||||||
|
style="border: 0px; clip: rect(0px, 0px, 0px, 0px); height: 1px; width: 1px; margin: -1px; padding: 0px; overflow: hidden; white-space: nowrap; position: absolute;"
|
||||||
|
type="radio"
|
||||||
|
value="5"
|
||||||
|
/>
|
||||||
|
<div
|
||||||
|
aria-hidden="true"
|
||||||
|
class="css-daiawq"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="css-dvxtzn"
|
||||||
|
>
|
||||||
|
<img
|
||||||
|
class="chakra-image css-wtpnzt"
|
||||||
|
src="file"
|
||||||
|
/>
|
||||||
|
Универсал
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
class="css-0"
|
||||||
|
>
|
||||||
|
<label
|
||||||
|
class="css-4g6ai3"
|
||||||
|
>
|
||||||
|
<input
|
||||||
|
aria-required="true"
|
||||||
|
hidden=""
|
||||||
|
id="radio-:re:"
|
||||||
|
name="radio-:r5:"
|
||||||
|
required=""
|
||||||
|
style="border: 0px; clip: rect(0px, 0px, 0px, 0px); height: 1px; width: 1px; margin: -1px; padding: 0px; overflow: hidden; white-space: nowrap; position: absolute;"
|
||||||
|
type="radio"
|
||||||
|
value="6"
|
||||||
|
/>
|
||||||
|
<div
|
||||||
|
aria-hidden="true"
|
||||||
|
class="css-daiawq"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="css-dvxtzn"
|
||||||
|
>
|
||||||
|
<img
|
||||||
|
class="chakra-image css-wtpnzt"
|
||||||
|
src="file"
|
||||||
|
/>
|
||||||
|
Купе
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
class="css-0"
|
||||||
|
>
|
||||||
|
<label
|
||||||
|
class="css-4g6ai3"
|
||||||
|
>
|
||||||
|
<input
|
||||||
|
aria-required="true"
|
||||||
|
hidden=""
|
||||||
|
id="radio-:rf:"
|
||||||
|
name="radio-:r5:"
|
||||||
|
required=""
|
||||||
|
style="border: 0px; clip: rect(0px, 0px, 0px, 0px); height: 1px; width: 1px; margin: -1px; padding: 0px; overflow: hidden; white-space: nowrap; position: absolute;"
|
||||||
|
type="radio"
|
||||||
|
value="7"
|
||||||
|
/>
|
||||||
|
<div
|
||||||
|
aria-hidden="true"
|
||||||
|
class="css-daiawq"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="css-dvxtzn"
|
||||||
|
>
|
||||||
|
<img
|
||||||
|
class="chakra-image css-wtpnzt"
|
||||||
|
src="file"
|
||||||
|
/>
|
||||||
|
Минивэн
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
class="css-0"
|
||||||
|
>
|
||||||
|
<label
|
||||||
|
class="css-4g6ai3"
|
||||||
|
>
|
||||||
|
<input
|
||||||
|
aria-required="true"
|
||||||
|
hidden=""
|
||||||
|
id="radio-:rg:"
|
||||||
|
name="radio-:r5:"
|
||||||
|
required=""
|
||||||
|
style="border: 0px; clip: rect(0px, 0px, 0px, 0px); height: 1px; width: 1px; margin: -1px; padding: 0px; overflow: hidden; white-space: nowrap; position: absolute;"
|
||||||
|
type="radio"
|
||||||
|
value="8"
|
||||||
|
/>
|
||||||
|
<div
|
||||||
|
aria-hidden="true"
|
||||||
|
class="css-daiawq"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="css-dvxtzn"
|
||||||
|
>
|
||||||
|
<img
|
||||||
|
class="chakra-image css-wtpnzt"
|
||||||
|
src="file"
|
||||||
|
/>
|
||||||
|
Пикап
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
class="css-0"
|
||||||
|
>
|
||||||
|
<label
|
||||||
|
class="css-4g6ai3"
|
||||||
|
>
|
||||||
|
<input
|
||||||
|
aria-required="true"
|
||||||
|
hidden=""
|
||||||
|
id="radio-:rh:"
|
||||||
|
name="radio-:r5:"
|
||||||
|
required=""
|
||||||
|
style="border: 0px; clip: rect(0px, 0px, 0px, 0px); height: 1px; width: 1px; margin: -1px; padding: 0px; overflow: hidden; white-space: nowrap; position: absolute;"
|
||||||
|
type="radio"
|
||||||
|
value="9"
|
||||||
|
/>
|
||||||
|
<div
|
||||||
|
aria-hidden="true"
|
||||||
|
class="css-daiawq"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="css-dvxtzn"
|
||||||
|
>
|
||||||
|
<img
|
||||||
|
class="chakra-image css-wtpnzt"
|
||||||
|
src="file"
|
||||||
|
/>
|
||||||
|
Лифтбек
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
class="css-0"
|
||||||
|
>
|
||||||
|
<label
|
||||||
|
class="css-4g6ai3"
|
||||||
|
>
|
||||||
|
<input
|
||||||
|
aria-required="true"
|
||||||
|
hidden=""
|
||||||
|
id="radio-:ri:"
|
||||||
|
name="radio-:r5:"
|
||||||
|
required=""
|
||||||
|
style="border: 0px; clip: rect(0px, 0px, 0px, 0px); height: 1px; width: 1px; margin: -1px; padding: 0px; overflow: hidden; white-space: nowrap; position: absolute;"
|
||||||
|
type="radio"
|
||||||
|
value="10"
|
||||||
|
/>
|
||||||
|
<div
|
||||||
|
aria-hidden="true"
|
||||||
|
class="css-daiawq"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="css-dvxtzn"
|
||||||
|
>
|
||||||
|
<img
|
||||||
|
class="chakra-image css-wtpnzt"
|
||||||
|
src="file"
|
||||||
|
/>
|
||||||
|
Спорткар
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
class="css-0"
|
||||||
|
>
|
||||||
|
<label
|
||||||
|
class="css-4g6ai3"
|
||||||
|
>
|
||||||
|
<input
|
||||||
|
aria-required="true"
|
||||||
|
hidden=""
|
||||||
|
id="radio-:rj:"
|
||||||
|
name="radio-:r5:"
|
||||||
|
required=""
|
||||||
|
style="border: 0px; clip: rect(0px, 0px, 0px, 0px); height: 1px; width: 1px; margin: -1px; padding: 0px; overflow: hidden; white-space: nowrap; position: absolute;"
|
||||||
|
type="radio"
|
||||||
|
value="99"
|
||||||
|
/>
|
||||||
|
<div
|
||||||
|
aria-hidden="true"
|
||||||
|
class="css-daiawq"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="css-dvxtzn"
|
||||||
|
>
|
||||||
|
<img
|
||||||
|
class="chakra-image css-wtpnzt"
|
||||||
|
src="file"
|
||||||
|
/>
|
||||||
|
Другой
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</label>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</section>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
class="chakra-form-control css-1kxonj9"
|
||||||
|
role="group"
|
||||||
|
>
|
||||||
|
<label
|
||||||
|
class="chakra-form__label css-g6pte"
|
||||||
|
for="field-:rk:"
|
||||||
|
id="field-:rk:-label"
|
||||||
|
>
|
||||||
|
В какое время автомобиль доступен?
|
||||||
|
<span
|
||||||
|
aria-hidden="true"
|
||||||
|
class="chakra-form__required-indicator css-1tfjd1n"
|
||||||
|
role="presentation"
|
||||||
|
>
|
||||||
|
*
|
||||||
|
</span>
|
||||||
|
</label>
|
||||||
|
<div
|
||||||
|
class="css-17bf4de"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="css-brwuli"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="chakra-form-control css-1kxonj9"
|
||||||
|
role="group"
|
||||||
|
>
|
||||||
|
<input
|
||||||
|
class="chakra-input css-moii5c"
|
||||||
|
id="field-:rl:"
|
||||||
|
max=""
|
||||||
|
name="availableDatetimeBegin"
|
||||||
|
type="datetime-local"
|
||||||
|
value=""
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
class="css-brwuli"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="chakra-form-control css-1kxonj9"
|
||||||
|
role="group"
|
||||||
|
>
|
||||||
|
<input
|
||||||
|
class="chakra-input css-moii5c"
|
||||||
|
id="field-:rm:"
|
||||||
|
min=""
|
||||||
|
name="availableDatetimeEnd"
|
||||||
|
type="datetime-local"
|
||||||
|
value=""
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
class="chakra-form-control css-1kxonj9"
|
||||||
|
role="group"
|
||||||
|
>
|
||||||
|
<label
|
||||||
|
class="chakra-form__label css-g6pte"
|
||||||
|
for="carLocation"
|
||||||
|
id="field-:rn:-label"
|
||||||
|
>
|
||||||
|
Где находится автомобиль?
|
||||||
|
<span
|
||||||
|
aria-hidden="true"
|
||||||
|
class="chakra-form__required-indicator css-1tfjd1n"
|
||||||
|
role="presentation"
|
||||||
|
>
|
||||||
|
*
|
||||||
|
</span>
|
||||||
|
</label>
|
||||||
|
<div />
|
||||||
|
<div
|
||||||
|
class="chakra-form__helper-text css-186pyma"
|
||||||
|
id="field-:rn:-helptext"
|
||||||
|
>
|
||||||
|
Например, 55.754364, 48.743295 Университетская улица, 1, Иннополис, Верхнеуслонский район, Республика Татарстан (Татарстан), 420500
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div />
|
||||||
|
<button
|
||||||
|
class="chakra-button css-13n15nk"
|
||||||
|
type="submit"
|
||||||
|
>
|
||||||
|
Отправить
|
||||||
|
</button>
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<span
|
||||||
|
hidden=""
|
||||||
|
id="__chakra_env"
|
||||||
|
/>
|
||||||
|
<span
|
||||||
|
hidden=""
|
||||||
|
id="__chakra_env"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
237
src/pages/__tests__/__snapshots__/order-view.test.tsx.snap
Normal file
237
src/pages/__tests__/__snapshots__/order-view.test.tsx.snap
Normal file
@@ -0,0 +1,237 @@
|
|||||||
|
// Jest Snapshot v1, https://goo.gl/fbAQLP
|
||||||
|
|
||||||
|
exports[`Страница просмотра заказа отображает детали заказа после успешной загрузки 1`] = `
|
||||||
|
<div>
|
||||||
|
<div
|
||||||
|
class="chakra-container css-3n6qh3"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="chakra-stack css-oo194l"
|
||||||
|
>
|
||||||
|
<h2
|
||||||
|
class="chakra-heading css-1c6lvb5"
|
||||||
|
data-testid="heading"
|
||||||
|
>
|
||||||
|
Ваш заказ
|
||||||
|
</h2>
|
||||||
|
<div
|
||||||
|
class="chakra-stack css-1n38vgh"
|
||||||
|
data-testid="order-details"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="chakra-stack css-1ofajmr"
|
||||||
|
>
|
||||||
|
<h2
|
||||||
|
class="chakra-heading css-1jb3vzl"
|
||||||
|
>
|
||||||
|
Заказ №{{number}}
|
||||||
|
(
|
||||||
|
Sunday, January 19, 2025 5:04 PM
|
||||||
|
)
|
||||||
|
</h2>
|
||||||
|
<span
|
||||||
|
class="css-6jfsiv"
|
||||||
|
>
|
||||||
|
В ожидании
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
<ul
|
||||||
|
class="css-1laduhn"
|
||||||
|
role="list"
|
||||||
|
>
|
||||||
|
<li
|
||||||
|
class="css-0"
|
||||||
|
>
|
||||||
|
Владелец
|
||||||
|
:
|
||||||
|
|
||||||
|
<span
|
||||||
|
class="chakra-text css-1qxum2s"
|
||||||
|
>
|
||||||
|
+79876543210
|
||||||
|
</span>
|
||||||
|
</li>
|
||||||
|
<li
|
||||||
|
class="css-0"
|
||||||
|
>
|
||||||
|
Автомобиль
|
||||||
|
:
|
||||||
|
|
||||||
|
<span
|
||||||
|
class="chakra-text css-1qxum2s"
|
||||||
|
>
|
||||||
|
А123АА16, Хэтчбек, #ffffff
|
||||||
|
</span>
|
||||||
|
</li>
|
||||||
|
<li
|
||||||
|
class="css-0"
|
||||||
|
>
|
||||||
|
Где
|
||||||
|
:
|
||||||
|
|
||||||
|
<span
|
||||||
|
class="chakra-text css-1qxum2s"
|
||||||
|
>
|
||||||
|
55.793833888711006,49.19037910644527 Республика Татарстан (Татарстан), Казань, жилой район Седьмое Небо
|
||||||
|
</span>
|
||||||
|
</li>
|
||||||
|
<li
|
||||||
|
class="css-0"
|
||||||
|
>
|
||||||
|
Когда
|
||||||
|
:
|
||||||
|
|
||||||
|
<span
|
||||||
|
class="chakra-text css-1qxum2s"
|
||||||
|
>
|
||||||
|
17:03 19.01.2025 - 17:03 19.01.2025
|
||||||
|
</span>
|
||||||
|
</li>
|
||||||
|
</ul>
|
||||||
|
<div
|
||||||
|
class="chakra-alert css-d7mf12"
|
||||||
|
data-status="info"
|
||||||
|
role="alert"
|
||||||
|
>
|
||||||
|
<span
|
||||||
|
class="chakra-alert__icon css-14ogjxt"
|
||||||
|
data-status="info"
|
||||||
|
>
|
||||||
|
<svg
|
||||||
|
class="chakra-icon css-qk6lof"
|
||||||
|
focusable="false"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
d="M12,0A12,12,0,1,0,24,12,12.013,12.013,0,0,0,12,0Zm.25,5a1.5,1.5,0,1,1-1.5,1.5A1.5,1.5,0,0,1,12.25,5ZM14.5,18.5h-4a1,1,0,0,1,0-2h.75a.25.25,0,0,0,.25-.25v-4.5a.25.25,0,0,0-.25-.25H10.5a1,1,0,0,1,0-2h1a2,2,0,0,1,2,2v4.75a.25.25,0,0,0,.25.25h.75a1,1,0,1,1,0,2Z"
|
||||||
|
fill="currentColor"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
</span>
|
||||||
|
С вами свяжется оператор насчет оплаты по указанному номеру телефона
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<span
|
||||||
|
hidden=""
|
||||||
|
id="__chakra_env"
|
||||||
|
/>
|
||||||
|
<span
|
||||||
|
hidden=""
|
||||||
|
id="__chakra_env"
|
||||||
|
/>
|
||||||
|
<span
|
||||||
|
hidden=""
|
||||||
|
id="__chakra_env"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
|
|
||||||
|
exports[`Страница просмотра заказа отображает индикатор загрузки деталей заказа 1`] = `
|
||||||
|
<div>
|
||||||
|
<div
|
||||||
|
class="chakra-container css-3n6qh3"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="chakra-stack css-oo194l"
|
||||||
|
>
|
||||||
|
<h2
|
||||||
|
class="chakra-heading css-1c6lvb5"
|
||||||
|
data-testid="heading"
|
||||||
|
>
|
||||||
|
Ваш заказ
|
||||||
|
</h2>
|
||||||
|
<div
|
||||||
|
class="chakra-stack css-egjlgc"
|
||||||
|
data-testid="loader"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="chakra-spinner css-1j92705"
|
||||||
|
>
|
||||||
|
<span
|
||||||
|
class="css-8b45rq"
|
||||||
|
>
|
||||||
|
Loading...
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<span
|
||||||
|
hidden=""
|
||||||
|
id="__chakra_env"
|
||||||
|
/>
|
||||||
|
<span
|
||||||
|
hidden=""
|
||||||
|
id="__chakra_env"
|
||||||
|
/>
|
||||||
|
<span
|
||||||
|
hidden=""
|
||||||
|
id="__chakra_env"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
|
|
||||||
|
exports[`Страница просмотра заказа отображает ошибку при некорректном ID заказа 1`] = `
|
||||||
|
<div>
|
||||||
|
<div
|
||||||
|
class="chakra-container css-3n6qh3"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="chakra-stack css-oo194l"
|
||||||
|
>
|
||||||
|
<h2
|
||||||
|
class="chakra-heading css-1c6lvb5"
|
||||||
|
data-testid="heading"
|
||||||
|
>
|
||||||
|
Ваш заказ
|
||||||
|
</h2>
|
||||||
|
<div
|
||||||
|
class="chakra-alert css-g4o1ra"
|
||||||
|
data-status="error"
|
||||||
|
data-testid="error"
|
||||||
|
role="alert"
|
||||||
|
>
|
||||||
|
<span
|
||||||
|
class="chakra-alert__icon css-14ogjxt"
|
||||||
|
data-status="error"
|
||||||
|
>
|
||||||
|
<svg
|
||||||
|
class="chakra-icon css-qk6lof"
|
||||||
|
focusable="false"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
d="M11.983,0a12.206,12.206,0,0,0-8.51,3.653A11.8,11.8,0,0,0,0,12.207,11.779,11.779,0,0,0,11.8,24h.214A12.111,12.111,0,0,0,24,11.791h0A11.766,11.766,0,0,0,11.983,0ZM10.5,16.542a1.476,1.476,0,0,1,1.449-1.53h.027a1.527,1.527,0,0,1,1.523,1.47,1.475,1.475,0,0,1-1.449,1.53h-.027A1.529,1.529,0,0,1,10.5,16.542ZM11,12.5v-6a1,1,0,0,1,2,0v6a1,1,0,1,1-2,0Z"
|
||||||
|
fill="currentColor"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
</span>
|
||||||
|
<div
|
||||||
|
class="css-0"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="chakra-alert__title css-tidvy5"
|
||||||
|
data-status="error"
|
||||||
|
>
|
||||||
|
Не удалось загрузить детали заказа
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<span
|
||||||
|
hidden=""
|
||||||
|
id="__chakra_env"
|
||||||
|
/>
|
||||||
|
<span
|
||||||
|
hidden=""
|
||||||
|
id="__chakra_env"
|
||||||
|
/>
|
||||||
|
<span
|
||||||
|
hidden=""
|
||||||
|
id="__chakra_env"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
428
src/pages/__tests__/__snapshots__/ordersList.test.tsx.snap
Normal file
428
src/pages/__tests__/__snapshots__/ordersList.test.tsx.snap
Normal file
@@ -0,0 +1,428 @@
|
|||||||
|
// Jest Snapshot v1, https://goo.gl/fbAQLP
|
||||||
|
|
||||||
|
exports[`Страница заказов должна корректно отображать список заказов после загрузки данных 1`] = `
|
||||||
|
<div>
|
||||||
|
<div
|
||||||
|
class="css-1yeiifd"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="css-13owfwq"
|
||||||
|
>
|
||||||
|
<h2
|
||||||
|
class="chakra-heading css-173d1bl"
|
||||||
|
>
|
||||||
|
Сухой мастер
|
||||||
|
</h2>
|
||||||
|
<div
|
||||||
|
class="chakra-stack css-1cggwyz"
|
||||||
|
>
|
||||||
|
<hr
|
||||||
|
aria-orientation="horizontal"
|
||||||
|
class="chakra-divider css-svjswr"
|
||||||
|
/>
|
||||||
|
<a
|
||||||
|
class="chakra-button css-1kg18wp"
|
||||||
|
href="/auth/login"
|
||||||
|
>
|
||||||
|
Заказы
|
||||||
|
</a>
|
||||||
|
<hr
|
||||||
|
aria-orientation="horizontal"
|
||||||
|
class="chakra-divider css-svjswr"
|
||||||
|
/>
|
||||||
|
<a
|
||||||
|
class="chakra-button css-1kg18wp"
|
||||||
|
data-testid="master-button"
|
||||||
|
href="/auth/login"
|
||||||
|
>
|
||||||
|
Мастера
|
||||||
|
</a>
|
||||||
|
<hr
|
||||||
|
aria-orientation="horizontal"
|
||||||
|
class="chakra-divider css-svjswr"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div
|
||||||
|
class="css-jiwy8d"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="css-1glkkdp"
|
||||||
|
>
|
||||||
|
<h2
|
||||||
|
class="chakra-heading css-1xer3cv"
|
||||||
|
>
|
||||||
|
Заказы
|
||||||
|
</h2>
|
||||||
|
<div
|
||||||
|
class="css-1u3smh"
|
||||||
|
>
|
||||||
|
<button
|
||||||
|
class="chakra-button css-ez23ye"
|
||||||
|
type="button"
|
||||||
|
>
|
||||||
|
<svg
|
||||||
|
class="chakra-icon css-onkibi"
|
||||||
|
focusable="false"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
d="M20 11H7.83l5.59-5.59L12 4l-8 8 8 8 1.41-1.41L7.83 13H20v-2z"
|
||||||
|
fill="currentColor"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
</button>
|
||||||
|
<p
|
||||||
|
class="chakra-text css-52ukzg"
|
||||||
|
>
|
||||||
|
23.02.2025
|
||||||
|
</p>
|
||||||
|
<button
|
||||||
|
class="chakra-button css-ez23ye"
|
||||||
|
type="button"
|
||||||
|
>
|
||||||
|
<svg
|
||||||
|
class="chakra-icon css-onkibi"
|
||||||
|
focusable="false"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
d="M12 4l-1.41 1.41L16.17 11H4v2h12.17l-5.58 5.59L12 20l8-8z"
|
||||||
|
fill="currentColor"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
</button>
|
||||||
|
</div>
|
||||||
|
<table
|
||||||
|
class="chakra-table css-5605sr"
|
||||||
|
>
|
||||||
|
<thead
|
||||||
|
class="css-0"
|
||||||
|
>
|
||||||
|
<tr
|
||||||
|
class="css-0"
|
||||||
|
>
|
||||||
|
<th
|
||||||
|
class="css-1szkfps"
|
||||||
|
>
|
||||||
|
Номер машины
|
||||||
|
</th>
|
||||||
|
<th
|
||||||
|
class="css-1szkfps"
|
||||||
|
>
|
||||||
|
Дата заказа
|
||||||
|
</th>
|
||||||
|
<th
|
||||||
|
class="css-1szkfps"
|
||||||
|
>
|
||||||
|
Статус
|
||||||
|
</th>
|
||||||
|
<th
|
||||||
|
class="css-1szkfps"
|
||||||
|
>
|
||||||
|
Мастер
|
||||||
|
</th>
|
||||||
|
<th
|
||||||
|
class="css-1szkfps"
|
||||||
|
>
|
||||||
|
Телефон
|
||||||
|
</th>
|
||||||
|
<th
|
||||||
|
class="css-1szkfps"
|
||||||
|
>
|
||||||
|
Расположение
|
||||||
|
</th>
|
||||||
|
</tr>
|
||||||
|
</thead>
|
||||||
|
<tbody
|
||||||
|
class="css-0"
|
||||||
|
>
|
||||||
|
<tr
|
||||||
|
class="css-0"
|
||||||
|
>
|
||||||
|
<td
|
||||||
|
class="css-zgoslk"
|
||||||
|
>
|
||||||
|
A123BC
|
||||||
|
</td>
|
||||||
|
<td
|
||||||
|
class="css-zgoslk"
|
||||||
|
>
|
||||||
|
24.11.2024
|
||||||
|
|
||||||
|
<br />
|
||||||
|
</td>
|
||||||
|
<td
|
||||||
|
class="css-zgoslk"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="chakra-select__wrapper css-42b2qy"
|
||||||
|
>
|
||||||
|
<select
|
||||||
|
class="chakra-select css-11j19cx"
|
||||||
|
>
|
||||||
|
<option
|
||||||
|
value=""
|
||||||
|
>
|
||||||
|
Выберите статус
|
||||||
|
</option>
|
||||||
|
<option
|
||||||
|
value="pending"
|
||||||
|
>
|
||||||
|
В ожидании
|
||||||
|
</option>
|
||||||
|
<option
|
||||||
|
value="progress"
|
||||||
|
>
|
||||||
|
Выполняется
|
||||||
|
</option>
|
||||||
|
<option
|
||||||
|
value="working"
|
||||||
|
>
|
||||||
|
В работе
|
||||||
|
</option>
|
||||||
|
<option
|
||||||
|
value="canceled"
|
||||||
|
>
|
||||||
|
Отменено
|
||||||
|
</option>
|
||||||
|
<option
|
||||||
|
value="complete"
|
||||||
|
>
|
||||||
|
Завершено
|
||||||
|
</option>
|
||||||
|
</select>
|
||||||
|
<div
|
||||||
|
class="chakra-select__icon-wrapper css-iohxn1"
|
||||||
|
>
|
||||||
|
<svg
|
||||||
|
aria-hidden="true"
|
||||||
|
class="chakra-select__icon"
|
||||||
|
focusable="false"
|
||||||
|
role="presentation"
|
||||||
|
style="width: 1em; height: 1em; color: currentColor;"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
d="M16.59 8.59L12 13.17 7.41 8.59 6 10l6 6 6-6z"
|
||||||
|
fill="currentColor"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
<td
|
||||||
|
class="css-zgoslk"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="chakra-select__wrapper css-42b2qy"
|
||||||
|
>
|
||||||
|
<select
|
||||||
|
class="chakra-select css-161pkch"
|
||||||
|
>
|
||||||
|
<option
|
||||||
|
value=""
|
||||||
|
>
|
||||||
|
Выберите мастера
|
||||||
|
</option>
|
||||||
|
<option
|
||||||
|
value="Иван Иванов"
|
||||||
|
>
|
||||||
|
Иван Иванов
|
||||||
|
</option>
|
||||||
|
<option
|
||||||
|
value="Олег Макаров"
|
||||||
|
>
|
||||||
|
Олег Макаров
|
||||||
|
</option>
|
||||||
|
<option
|
||||||
|
value="Иван Галкин"
|
||||||
|
>
|
||||||
|
Иван Галкин
|
||||||
|
</option>
|
||||||
|
</select>
|
||||||
|
<div
|
||||||
|
class="chakra-select__icon-wrapper css-iohxn1"
|
||||||
|
>
|
||||||
|
<svg
|
||||||
|
aria-hidden="true"
|
||||||
|
class="chakra-select__icon"
|
||||||
|
focusable="false"
|
||||||
|
role="presentation"
|
||||||
|
style="width: 1em; height: 1em; color: currentColor;"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
d="M16.59 8.59L12 13.17 7.41 8.59 6 10l6 6 6-6z"
|
||||||
|
fill="currentColor"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
<td
|
||||||
|
class="css-zgoslk"
|
||||||
|
>
|
||||||
|
<a
|
||||||
|
class="chakra-link css-spn4bz"
|
||||||
|
href="tel:"
|
||||||
|
>
|
||||||
|
79001234563
|
||||||
|
</a>
|
||||||
|
</td>
|
||||||
|
<td
|
||||||
|
class="css-zgoslk"
|
||||||
|
>
|
||||||
|
Казань, ул. Баумана, 1
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr
|
||||||
|
class="css-0"
|
||||||
|
>
|
||||||
|
<td
|
||||||
|
class="css-zgoslk"
|
||||||
|
>
|
||||||
|
A245BC
|
||||||
|
</td>
|
||||||
|
<td
|
||||||
|
class="css-zgoslk"
|
||||||
|
>
|
||||||
|
24.11.2024
|
||||||
|
|
||||||
|
<br />
|
||||||
|
</td>
|
||||||
|
<td
|
||||||
|
class="css-zgoslk"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="chakra-select__wrapper css-42b2qy"
|
||||||
|
>
|
||||||
|
<select
|
||||||
|
class="chakra-select css-lvra4l"
|
||||||
|
>
|
||||||
|
<option
|
||||||
|
value=""
|
||||||
|
>
|
||||||
|
Выберите статус
|
||||||
|
</option>
|
||||||
|
<option
|
||||||
|
value="pending"
|
||||||
|
>
|
||||||
|
В ожидании
|
||||||
|
</option>
|
||||||
|
<option
|
||||||
|
value="progress"
|
||||||
|
>
|
||||||
|
Выполняется
|
||||||
|
</option>
|
||||||
|
<option
|
||||||
|
value="working"
|
||||||
|
>
|
||||||
|
В работе
|
||||||
|
</option>
|
||||||
|
<option
|
||||||
|
value="canceled"
|
||||||
|
>
|
||||||
|
Отменено
|
||||||
|
</option>
|
||||||
|
<option
|
||||||
|
value="complete"
|
||||||
|
>
|
||||||
|
Завершено
|
||||||
|
</option>
|
||||||
|
</select>
|
||||||
|
<div
|
||||||
|
class="chakra-select__icon-wrapper css-iohxn1"
|
||||||
|
>
|
||||||
|
<svg
|
||||||
|
aria-hidden="true"
|
||||||
|
class="chakra-select__icon"
|
||||||
|
focusable="false"
|
||||||
|
role="presentation"
|
||||||
|
style="width: 1em; height: 1em; color: currentColor;"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
d="M16.59 8.59L12 13.17 7.41 8.59 6 10l6 6 6-6z"
|
||||||
|
fill="currentColor"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
<td
|
||||||
|
class="css-zgoslk"
|
||||||
|
>
|
||||||
|
<div
|
||||||
|
class="chakra-select__wrapper css-42b2qy"
|
||||||
|
>
|
||||||
|
<select
|
||||||
|
class="chakra-select css-161pkch"
|
||||||
|
>
|
||||||
|
<option
|
||||||
|
value=""
|
||||||
|
>
|
||||||
|
Выберите мастера
|
||||||
|
</option>
|
||||||
|
<option
|
||||||
|
value="Иван Иванов"
|
||||||
|
>
|
||||||
|
Иван Иванов
|
||||||
|
</option>
|
||||||
|
<option
|
||||||
|
value="Олег Макаров"
|
||||||
|
>
|
||||||
|
Олег Макаров
|
||||||
|
</option>
|
||||||
|
<option
|
||||||
|
value="Иван Галкин"
|
||||||
|
>
|
||||||
|
Иван Галкин
|
||||||
|
</option>
|
||||||
|
</select>
|
||||||
|
<div
|
||||||
|
class="chakra-select__icon-wrapper css-iohxn1"
|
||||||
|
>
|
||||||
|
<svg
|
||||||
|
aria-hidden="true"
|
||||||
|
class="chakra-select__icon"
|
||||||
|
focusable="false"
|
||||||
|
role="presentation"
|
||||||
|
style="width: 1em; height: 1em; color: currentColor;"
|
||||||
|
viewBox="0 0 24 24"
|
||||||
|
>
|
||||||
|
<path
|
||||||
|
d="M16.59 8.59L12 13.17 7.41 8.59 6 10l6 6 6-6z"
|
||||||
|
fill="currentColor"
|
||||||
|
/>
|
||||||
|
</svg>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</td>
|
||||||
|
<td
|
||||||
|
class="css-zgoslk"
|
||||||
|
>
|
||||||
|
<a
|
||||||
|
class="chakra-link css-spn4bz"
|
||||||
|
href="tel:"
|
||||||
|
>
|
||||||
|
79001234567
|
||||||
|
</a>
|
||||||
|
</td>
|
||||||
|
<td
|
||||||
|
class="css-zgoslk"
|
||||||
|
>
|
||||||
|
Казань, ул. Баумана, 43
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
</tbody>
|
||||||
|
</table>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<span
|
||||||
|
hidden=""
|
||||||
|
id="__chakra_env"
|
||||||
|
/>
|
||||||
|
</div>
|
||||||
|
`;
|
||||||
22
src/pages/__tests__/landing.test.tsx
Normal file
22
src/pages/__tests__/landing.test.tsx
Normal file
@@ -0,0 +1,22 @@
|
|||||||
|
import { render, screen } from '@testing-library/react';
|
||||||
|
import React from 'react';
|
||||||
|
|
||||||
|
import { AppContext } from '../../../__mocks__/app-context-mock';
|
||||||
|
import Page from '../landing';
|
||||||
|
|
||||||
|
describe('Landing page', () => {
|
||||||
|
test('renders page structure', () => {
|
||||||
|
const { container } = render(
|
||||||
|
<AppContext>
|
||||||
|
<Page />
|
||||||
|
</AppContext>,
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(container).toMatchSnapshot();
|
||||||
|
|
||||||
|
expect(screen.getByTestId('hero-section')).toBeInTheDocument();
|
||||||
|
expect(screen.getByTestId('benefits-section')).toBeInTheDocument();
|
||||||
|
expect(screen.getByTestId('social-proof-section')).toBeInTheDocument();
|
||||||
|
expect(screen.getByTestId('footer')).toBeInTheDocument();
|
||||||
|
});
|
||||||
|
});
|
||||||
133
src/pages/__tests__/masters.test.tsx
Normal file
133
src/pages/__tests__/masters.test.tsx
Normal file
@@ -0,0 +1,133 @@
|
|||||||
|
import * as React from 'react';
|
||||||
|
import {
|
||||||
|
describe,
|
||||||
|
it,
|
||||||
|
expect,
|
||||||
|
jest,
|
||||||
|
beforeAll,
|
||||||
|
afterEach,
|
||||||
|
afterAll,
|
||||||
|
} from '@jest/globals';
|
||||||
|
import { fireEvent, render, screen, waitFor } from '@testing-library/react';
|
||||||
|
import { http, HttpResponse } from 'msw';
|
||||||
|
import { setupServer } from 'msw/node';
|
||||||
|
import { ChakraProvider, theme as chakraTheme } from '@chakra-ui/react';
|
||||||
|
import { Provider } from 'react-redux';
|
||||||
|
import { BrowserRouter } from 'react-router-dom';
|
||||||
|
|
||||||
|
import ErrorBoundary from '../../components/ErrorBoundary';
|
||||||
|
import { store } from '../../__data__/store';
|
||||||
|
import Page from '../arm';
|
||||||
|
|
||||||
|
const server = setupServer(
|
||||||
|
http.get('/api/arm/masters', () => {
|
||||||
|
return HttpResponse.json({
|
||||||
|
success: true,
|
||||||
|
body: [
|
||||||
|
{
|
||||||
|
id: '4545423234',
|
||||||
|
name: 'Иван Иванов',
|
||||||
|
phone: '+7 900 123 45 67',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'Олег Макаров',
|
||||||
|
phone: '79001234567',
|
||||||
|
id: '23423442',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: '345354234',
|
||||||
|
name: 'Иван Галкин',
|
||||||
|
schedule: [
|
||||||
|
{
|
||||||
|
id: 'order1',
|
||||||
|
startWashTime: '2024-11-24T10:30:00.000Z',
|
||||||
|
endWashTime: '2024-11-24T16:30:00.000Z',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 'order2',
|
||||||
|
startWashTime: '2024-11-24T11:30:00.000Z',
|
||||||
|
endWashTime: '2024-11-24T17:30:00.000Z',
|
||||||
|
},
|
||||||
|
],
|
||||||
|
phone: '+7 900 123 45 67',
|
||||||
|
},
|
||||||
|
],
|
||||||
|
});
|
||||||
|
}),
|
||||||
|
http.post('/api/arm/orders', () => {
|
||||||
|
return HttpResponse.json({
|
||||||
|
success: true,
|
||||||
|
body: [
|
||||||
|
{
|
||||||
|
id: 'order1',
|
||||||
|
carNumber: 'A123BC',
|
||||||
|
startWashTime: '2024-11-24T10:30:00.000Z',
|
||||||
|
endWashTime: '2024-11-24T16:30:00.000Z',
|
||||||
|
orderDate: '2024-11-24T08:41:46.366Z',
|
||||||
|
status: 'pending',
|
||||||
|
phone: '79001234563',
|
||||||
|
location: 'Казань, ул. Баумана, 1',
|
||||||
|
master: {
|
||||||
|
name: 'Олег Макаров',
|
||||||
|
phone: '79001234567',
|
||||||
|
id: '23423442',
|
||||||
|
},
|
||||||
|
notes: '',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 'order2',
|
||||||
|
carNumber: 'A245BC',
|
||||||
|
startWashTime: '2024-11-24T11:30:00.000Z',
|
||||||
|
endWashTime: '2024-11-24T17:30:00.000Z',
|
||||||
|
orderDate: '2024-11-24T07:40:46.366Z',
|
||||||
|
status: 'progress',
|
||||||
|
phone: '79001234567',
|
||||||
|
location: 'Казань, ул. Баумана, 43',
|
||||||
|
master: [],
|
||||||
|
notes: '',
|
||||||
|
},
|
||||||
|
],
|
||||||
|
});
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
|
jest.mock('@brojs/cli', () => {
|
||||||
|
return {
|
||||||
|
getNavigationValue: (key: string) =>
|
||||||
|
// eslint-disable-next-line @typescript-eslint/no-require-imports
|
||||||
|
require('../../../bro.config').navigations[key],
|
||||||
|
getConfigValue: () => '/api',
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('Master Page', () => {
|
||||||
|
beforeAll(() => server.listen());
|
||||||
|
afterEach(() => server.resetHandlers());
|
||||||
|
afterAll(() => server.close());
|
||||||
|
|
||||||
|
it('should display master list and show details when master button is clicked', async () => {
|
||||||
|
const { container } = render(
|
||||||
|
<Provider store={store}>
|
||||||
|
<ChakraProvider theme={chakraTheme}>
|
||||||
|
<ErrorBoundary>
|
||||||
|
<BrowserRouter>
|
||||||
|
<Page mockUser={{ name: 'ilnaz' }} />
|
||||||
|
</BrowserRouter>
|
||||||
|
</ErrorBoundary>
|
||||||
|
</ChakraProvider>
|
||||||
|
</Provider>,
|
||||||
|
);
|
||||||
|
|
||||||
|
const button = await waitFor(() => screen.getByTestId('master-button'));
|
||||||
|
fireEvent.click(button);
|
||||||
|
|
||||||
|
// Проверяем отображение всех мастеров
|
||||||
|
await waitFor(() => {
|
||||||
|
expect(screen.getByText('Иван Иванов')).toBeInTheDocument();
|
||||||
|
expect(screen.getByText('Олег Макаров')).toBeInTheDocument();
|
||||||
|
expect(screen.getByText('Иван Галкин')).toBeInTheDocument();
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(container).toMatchSnapshot();
|
||||||
|
});
|
||||||
|
});
|
||||||
20
src/pages/__tests__/order-create.test.tsx
Normal file
20
src/pages/__tests__/order-create.test.tsx
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
import { render, screen } from '@testing-library/react';
|
||||||
|
import React from 'react';
|
||||||
|
|
||||||
|
import { AppContext } from '../../../__mocks__/app-context-mock';
|
||||||
|
import Page from '../order-create';
|
||||||
|
|
||||||
|
describe('Create Order page', () => {
|
||||||
|
test('renders page structure', () => {
|
||||||
|
const { container } = render(
|
||||||
|
<AppContext>
|
||||||
|
<Page />
|
||||||
|
</AppContext>,
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(container).toMatchSnapshot();
|
||||||
|
|
||||||
|
expect(screen.getByTestId('heading')).toBeInTheDocument();
|
||||||
|
expect(screen.getByTestId('order-form')).toBeInTheDocument();
|
||||||
|
});
|
||||||
|
});
|
||||||
77
src/pages/__tests__/order-view.test.tsx
Normal file
77
src/pages/__tests__/order-view.test.tsx
Normal file
@@ -0,0 +1,77 @@
|
|||||||
|
import { render, screen, waitFor } from '@testing-library/react';
|
||||||
|
import React from 'react';
|
||||||
|
import { useParams } from 'react-router-dom';
|
||||||
|
|
||||||
|
import { AppContext } from '../../../__mocks__/app-context-mock';
|
||||||
|
import Page from '../order-view';
|
||||||
|
import { server } from '../../../__mocks__/server/server';
|
||||||
|
|
||||||
|
jest.mock('react-router-dom', () => ({
|
||||||
|
...jest.requireActual('react-router-dom'),
|
||||||
|
useParams: jest.fn(),
|
||||||
|
}));
|
||||||
|
|
||||||
|
describe('Страница просмотра заказа', () => {
|
||||||
|
beforeAll(() => server.listen());
|
||||||
|
afterEach(() => server.resetHandlers());
|
||||||
|
afterAll(() => server.close());
|
||||||
|
|
||||||
|
test('отображает индикатор загрузки деталей заказа', () => {
|
||||||
|
(useParams as jest.Mock).mockReturnValue({ orderId: 'id1' });
|
||||||
|
|
||||||
|
const { container } = render(
|
||||||
|
<AppContext>
|
||||||
|
<Page />
|
||||||
|
</AppContext>,
|
||||||
|
);
|
||||||
|
|
||||||
|
expect(screen.getByTestId('heading')).toBeInTheDocument();
|
||||||
|
expect(screen.getByTestId('loader')).toBeInTheDocument();
|
||||||
|
expect(screen.queryByTestId('order-details')).not.toBeInTheDocument();
|
||||||
|
expect(screen.queryByTestId('error')).not.toBeInTheDocument();
|
||||||
|
|
||||||
|
expect(container).toMatchSnapshot();
|
||||||
|
});
|
||||||
|
|
||||||
|
test('отображает детали заказа после успешной загрузки', async () => {
|
||||||
|
(useParams as jest.Mock).mockReturnValue({ orderId: 'id1' });
|
||||||
|
|
||||||
|
const { container } = render(
|
||||||
|
<AppContext>
|
||||||
|
<Page />
|
||||||
|
</AppContext>,
|
||||||
|
);
|
||||||
|
|
||||||
|
await waitFor(() => {
|
||||||
|
expect(screen.getByTestId('heading')).toBeInTheDocument();
|
||||||
|
expect(screen.queryByTestId('loader')).not.toBeInTheDocument();
|
||||||
|
expect(screen.getByTestId('order-details')).toBeInTheDocument();
|
||||||
|
expect(screen.queryByTestId('error')).not.toBeInTheDocument();
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(container).toMatchSnapshot();
|
||||||
|
});
|
||||||
|
|
||||||
|
test('отображает ошибку при некорректном ID заказа', async () => {
|
||||||
|
(useParams as jest.Mock).mockReturnValue({ orderId: null });
|
||||||
|
|
||||||
|
const { container } = render(
|
||||||
|
<AppContext>
|
||||||
|
<Page />
|
||||||
|
</AppContext>,
|
||||||
|
);
|
||||||
|
|
||||||
|
await waitFor(() => {
|
||||||
|
expect(screen.getByTestId('heading')).toBeInTheDocument();
|
||||||
|
expect(screen.queryByTestId('loader')).not.toBeInTheDocument();
|
||||||
|
expect(screen.queryByTestId('order-details')).not.toBeInTheDocument();
|
||||||
|
expect(screen.getByTestId('error')).toBeInTheDocument();
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(container).toMatchSnapshot();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
afterEach(() => {
|
||||||
|
jest.clearAllMocks();
|
||||||
|
});
|
||||||
63
src/pages/__tests__/ordersEmpty.test.tsx
Normal file
63
src/pages/__tests__/ordersEmpty.test.tsx
Normal file
@@ -0,0 +1,63 @@
|
|||||||
|
import * as React from 'react';
|
||||||
|
import {
|
||||||
|
describe,
|
||||||
|
it,
|
||||||
|
jest,
|
||||||
|
beforeAll,
|
||||||
|
afterEach,
|
||||||
|
afterAll,
|
||||||
|
} from '@jest/globals';
|
||||||
|
import { render, screen, waitFor } from '@testing-library/react';
|
||||||
|
import { http, HttpResponse } from 'msw';
|
||||||
|
import { setupServer } from 'msw/node';
|
||||||
|
import { BrowserRouter } from 'react-router-dom';
|
||||||
|
import { ChakraProvider, theme as chakraTheme } from '@chakra-ui/react';
|
||||||
|
import { Provider } from 'react-redux';
|
||||||
|
|
||||||
|
import ErrorBoundary from '../../components/ErrorBoundary';
|
||||||
|
import { store } from '../../__data__/store';
|
||||||
|
import Page from '../arm';
|
||||||
|
|
||||||
|
const server = setupServer(
|
||||||
|
http.post('/api/arm/orders', () => {
|
||||||
|
return HttpResponse.json({
|
||||||
|
success: true,
|
||||||
|
body: [],
|
||||||
|
});
|
||||||
|
}),
|
||||||
|
http.get('/api/arm/masters', () => {
|
||||||
|
return HttpResponse.json({
|
||||||
|
success: true,
|
||||||
|
body: [],
|
||||||
|
});
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
|
jest.mock('@brojs/cli', () => {
|
||||||
|
return {
|
||||||
|
getNavigationValue: () => '/auth/login',
|
||||||
|
getConfigValue: () => '/api',
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('order page', () => {
|
||||||
|
beforeAll(() => server.listen());
|
||||||
|
afterEach(() => server.resetHandlers());
|
||||||
|
afterAll(() => server.close());
|
||||||
|
|
||||||
|
it('получение пустого списка', async () => {
|
||||||
|
render(
|
||||||
|
<Provider store={store}>
|
||||||
|
<ChakraProvider theme={chakraTheme}>
|
||||||
|
<ErrorBoundary>
|
||||||
|
<BrowserRouter>
|
||||||
|
<Page mockUser={{ name: 'ilnaz' }} />
|
||||||
|
</BrowserRouter>
|
||||||
|
</ErrorBoundary>
|
||||||
|
</ChakraProvider>
|
||||||
|
</Provider>,
|
||||||
|
);
|
||||||
|
|
||||||
|
await waitFor(() => screen.getByText('Список пуст'));
|
||||||
|
});
|
||||||
|
});
|
||||||
98
src/pages/__tests__/ordersError.test.tsx
Normal file
98
src/pages/__tests__/ordersError.test.tsx
Normal file
@@ -0,0 +1,98 @@
|
|||||||
|
import * as React from 'react';
|
||||||
|
import {
|
||||||
|
describe,
|
||||||
|
it,
|
||||||
|
jest,
|
||||||
|
beforeAll,
|
||||||
|
afterEach,
|
||||||
|
afterAll,
|
||||||
|
expect,
|
||||||
|
} from '@jest/globals';
|
||||||
|
import { render, screen, waitFor } from '@testing-library/react';
|
||||||
|
import { http, HttpResponse } from 'msw';
|
||||||
|
import { setupServer } from 'msw/node';
|
||||||
|
import { BrowserRouter } from 'react-router-dom';
|
||||||
|
import { ChakraProvider, theme as chakraTheme } from '@chakra-ui/react';
|
||||||
|
import { Provider } from 'react-redux';
|
||||||
|
|
||||||
|
import ErrorBoundary from '../../components/ErrorBoundary';
|
||||||
|
import { store } from '../../__data__/store';
|
||||||
|
import Page from '../arm';
|
||||||
|
import { PageSpinner } from '../../components';
|
||||||
|
|
||||||
|
const server = setupServer(
|
||||||
|
http.post('/api/arm/orders', () => {
|
||||||
|
return HttpResponse.json({}, { status: 500 });
|
||||||
|
}),
|
||||||
|
http.get('/api/arm/masters', () => {
|
||||||
|
return HttpResponse.json({
|
||||||
|
success: true,
|
||||||
|
body: [
|
||||||
|
{
|
||||||
|
id: '4545423234',
|
||||||
|
name: 'Иван Иванов',
|
||||||
|
phone: '+7 900 123 45 67',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'Олег Макаров',
|
||||||
|
phone: '79001234567',
|
||||||
|
id: '23423442',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: '345354234',
|
||||||
|
name: 'Иван Галкин',
|
||||||
|
schedule: [
|
||||||
|
{
|
||||||
|
id: 'order1',
|
||||||
|
startWashTime: '2024-11-24T10:30:00.000Z',
|
||||||
|
endWashTime: '2024-11-24T16:30:00.000Z',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 'order2',
|
||||||
|
startWashTime: '2024-11-24T11:30:00.000Z',
|
||||||
|
endWashTime: '2024-11-24T17:30:00.000Z',
|
||||||
|
},
|
||||||
|
],
|
||||||
|
phone: '+7 900 123 45 67',
|
||||||
|
},
|
||||||
|
],
|
||||||
|
});
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
|
jest.mock('@brojs/cli', () => {
|
||||||
|
return {
|
||||||
|
getNavigationValue: () => '/auth/login',
|
||||||
|
getConfigValue: () => '/api',
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('order page', () => {
|
||||||
|
beforeAll(() => server.listen());
|
||||||
|
afterEach(() => server.resetHandlers());
|
||||||
|
afterAll(() => server.close());
|
||||||
|
|
||||||
|
it('обработка ошибки при загрузке данных', async () => {
|
||||||
|
render(
|
||||||
|
<Provider store={store}>
|
||||||
|
<ChakraProvider theme={chakraTheme}>
|
||||||
|
<ErrorBoundary>
|
||||||
|
<BrowserRouter>
|
||||||
|
<Page mockUser={{ name: 'ilnaz' }} />
|
||||||
|
</BrowserRouter>
|
||||||
|
</ErrorBoundary>
|
||||||
|
</ChakraProvider>
|
||||||
|
</Provider>,
|
||||||
|
);
|
||||||
|
|
||||||
|
await waitFor(() => screen.getByText('Ошибка при загрузке данных'));
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('Routers', () => {
|
||||||
|
it('отображает PageSpinner ', async () => {
|
||||||
|
render(<PageSpinner />);
|
||||||
|
|
||||||
|
expect(await screen.findByTestId('spinner')).toBeTruthy();
|
||||||
|
});
|
||||||
|
});
|
||||||
123
src/pages/__tests__/ordersList.test.tsx
Normal file
123
src/pages/__tests__/ordersList.test.tsx
Normal file
@@ -0,0 +1,123 @@
|
|||||||
|
import * as React from 'react';
|
||||||
|
import {
|
||||||
|
describe,
|
||||||
|
it,
|
||||||
|
expect,
|
||||||
|
jest,
|
||||||
|
beforeAll,
|
||||||
|
afterEach,
|
||||||
|
afterAll,
|
||||||
|
} from '@jest/globals';
|
||||||
|
import { render, screen, waitFor } from '@testing-library/react';
|
||||||
|
import { http, HttpResponse } from 'msw';
|
||||||
|
import { setupServer } from 'msw/node';
|
||||||
|
import { BrowserRouter } from 'react-router-dom';
|
||||||
|
import { ChakraProvider, theme as chakraTheme } from '@chakra-ui/react';
|
||||||
|
import { Provider } from 'react-redux';
|
||||||
|
|
||||||
|
import ErrorBoundary from '../../components/ErrorBoundary';
|
||||||
|
import { store } from '../../__data__/store';
|
||||||
|
import Page from '../arm';
|
||||||
|
|
||||||
|
const server = setupServer(
|
||||||
|
http.post('/api/arm/orders', () => {
|
||||||
|
return HttpResponse.json({
|
||||||
|
success: true,
|
||||||
|
body: [
|
||||||
|
{
|
||||||
|
id: 'order1',
|
||||||
|
carNumber: 'A123BC',
|
||||||
|
startWashTime: '2024-11-24T10:30:00.000Z',
|
||||||
|
endWashTime: '2024-11-24T16:30:00.000Z',
|
||||||
|
orderDate: '2024-11-24T08:41:46.366Z',
|
||||||
|
status: 'pending',
|
||||||
|
phone: '79001234563',
|
||||||
|
location: 'Казань, ул. Баумана, 1',
|
||||||
|
master: {
|
||||||
|
name: 'Олег Макаров',
|
||||||
|
phone: '79001234567',
|
||||||
|
id: '23423442',
|
||||||
|
},
|
||||||
|
notes: '',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 'order2',
|
||||||
|
carNumber: 'A245BC',
|
||||||
|
startWashTime: '2024-11-24T11:30:00.000Z',
|
||||||
|
endWashTime: '2024-11-24T17:30:00.000Z',
|
||||||
|
orderDate: '2024-11-24T07:40:46.366Z',
|
||||||
|
status: 'progress',
|
||||||
|
phone: '79001234567',
|
||||||
|
location: 'Казань, ул. Баумана, 43',
|
||||||
|
master: [],
|
||||||
|
notes: '',
|
||||||
|
},
|
||||||
|
],
|
||||||
|
});
|
||||||
|
}),
|
||||||
|
http.get('/api/arm/masters', () => {
|
||||||
|
return HttpResponse.json({
|
||||||
|
success: true,
|
||||||
|
body: [
|
||||||
|
{
|
||||||
|
id: '4545423234',
|
||||||
|
name: 'Иван Иванов',
|
||||||
|
phone: '+7 900 123 45 67',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'Олег Макаров',
|
||||||
|
phone: '79001234567',
|
||||||
|
id: '23423442',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: '345354234',
|
||||||
|
name: 'Иван Галкин',
|
||||||
|
schedule: [
|
||||||
|
{
|
||||||
|
id: 'order1',
|
||||||
|
startWashTime: '2024-11-24T10:30:00.000Z',
|
||||||
|
endWashTime: '2024-11-24T16:30:00.000Z',
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: 'order2',
|
||||||
|
startWashTime: '2024-11-24T11:30:00.000Z',
|
||||||
|
endWashTime: '2024-11-24T17:30:00.000Z',
|
||||||
|
},
|
||||||
|
],
|
||||||
|
phone: '+7 900 123 45 67',
|
||||||
|
},
|
||||||
|
],
|
||||||
|
});
|
||||||
|
}),
|
||||||
|
);
|
||||||
|
|
||||||
|
jest.mock('@brojs/cli', () => {
|
||||||
|
return {
|
||||||
|
getNavigationValue: () => '/auth/login',
|
||||||
|
getConfigValue: () => '/api',
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
describe('Страница заказов', () => {
|
||||||
|
beforeAll(() => server.listen());
|
||||||
|
afterEach(() => server.resetHandlers());
|
||||||
|
afterAll(() => server.close());
|
||||||
|
|
||||||
|
it('должна корректно отображать список заказов после загрузки данных', async () => {
|
||||||
|
const { container } = render(
|
||||||
|
<Provider store={store}>
|
||||||
|
<ChakraProvider theme={chakraTheme}>
|
||||||
|
<ErrorBoundary>
|
||||||
|
<BrowserRouter>
|
||||||
|
<Page mockUser={{ name: 'ilnaz' }} />
|
||||||
|
</BrowserRouter>
|
||||||
|
</ErrorBoundary>
|
||||||
|
</ChakraProvider>
|
||||||
|
</Provider>,
|
||||||
|
);
|
||||||
|
|
||||||
|
await waitFor(() => screen.getByText('A123BC'));
|
||||||
|
|
||||||
|
expect(container).toMatchSnapshot();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -6,8 +6,12 @@ import LayoutArm from '../../components/LayoutArm';
|
|||||||
import authLogin from '../../keycloak';
|
import authLogin from '../../keycloak';
|
||||||
import { URLs } from '../../__data__/urls';
|
import { URLs } from '../../__data__/urls';
|
||||||
|
|
||||||
const Page = () => {
|
interface PageProps {
|
||||||
const [user, setUser] = useState(null);
|
mockUser?: { name: string };
|
||||||
|
}
|
||||||
|
|
||||||
|
const Page = ({ mockUser }: PageProps) => {
|
||||||
|
const [user, setUser] = useState(mockUser || null);
|
||||||
|
|
||||||
const navigate = useNavigate();
|
const navigate = useNavigate();
|
||||||
|
|
||||||
|
|||||||
@@ -30,18 +30,19 @@ const Page: FC = () => {
|
|||||||
<HeroSection
|
<HeroSection
|
||||||
data={landingSuccessStub['body']['hero-section']}
|
data={landingSuccessStub['body']['hero-section']}
|
||||||
flexShrink={0}
|
flexShrink={0}
|
||||||
|
data-testid='hero-section'
|
||||||
/>
|
/>
|
||||||
<VStack as='main' flexGrow={1}>
|
<VStack as='main' flexGrow={1}>
|
||||||
{landingSuccessStub.body.sections.map(({ type, ...data }, i) => {
|
{landingSuccessStub.body.sections.map(({ type, ...data }, i) => {
|
||||||
if (isBenefitsSectionData(type, data)) {
|
if (isBenefitsSectionData(type, data)) {
|
||||||
return <BenefitsSection key={i} data={data} />;
|
return <BenefitsSection key={i} data={data} data-testid='benefits-section' />;
|
||||||
}
|
}
|
||||||
if (isSocialProofSectionData(type, data)) {
|
if (isSocialProofSectionData(type, data)) {
|
||||||
return <SocialProofSection key={i} data={data} />;
|
return <SocialProofSection key={i} data={data} data-testid='social-proof-section' />;
|
||||||
}
|
}
|
||||||
})}
|
})}
|
||||||
</VStack>
|
</VStack>
|
||||||
<Footer />
|
<Footer data-testid='footer' />
|
||||||
</VStack>
|
</VStack>
|
||||||
</Container>
|
</Container>
|
||||||
</LandingThemeProvider>
|
</LandingThemeProvider>
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user