Compare commits
17 Commits
feature/up
...
feature/te
| Author | SHA1 | Date | |
|---|---|---|---|
| d48f8011c1 | |||
| f2319542e7 | |||
| 3fb01392f0 | |||
| 1dd14caed2 | |||
| 12982cdf9e | |||
|
|
31b440656c | ||
|
|
45c4ca16c8 | ||
| e3d316c418 | |||
|
|
4c26928d23 | ||
| 1471bf94dd | |||
|
|
d3ffaa97f8 | ||
| acd09d427c | |||
| 34bf557a6f | |||
| 5e0ac9f7a5 | |||
| 9a2ef18925 | |||
| d15bd6f7d2 | |||
| adce5392a1 |
1
__mocks__/file-mock.ts
Normal file
1
__mocks__/file-mock.ts
Normal file
@@ -0,0 +1 @@
|
||||
module.exports = 'file';
|
||||
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' }],
|
||||
],
|
||||
};
|
||||
@@ -21,6 +21,7 @@ module.exports = {
|
||||
features: {
|
||||
'dry-wash-pl': {
|
||||
// add your features here in the format [featureName]: { value: string }
|
||||
'order-view-status-polling': { value: '3000' }
|
||||
},
|
||||
},
|
||||
config: {
|
||||
|
||||
@@ -1,12 +1,13 @@
|
||||
import globals from "globals";
|
||||
import pluginJs from "@eslint/js";
|
||||
import tseslint from "typescript-eslint";
|
||||
import pluginReact from "eslint-plugin-react";
|
||||
import globals from 'globals';
|
||||
import pluginJs from '@eslint/js';
|
||||
import tseslint from 'typescript-eslint';
|
||||
import pluginReact from 'eslint-plugin-react';
|
||||
import stylistic from '@stylistic/eslint-plugin';
|
||||
import pluginImport from 'eslint-plugin-import';
|
||||
|
||||
export default [
|
||||
{ files: ["**/*.{js,mjs,cjs,ts,jsx,tsx}"] },
|
||||
{ files: ['**/*.{js,mjs,cjs,ts,jsx,tsx}'] },
|
||||
|
||||
{ languageOptions: { globals: globals.browser } },
|
||||
pluginJs.configs.recommended,
|
||||
...tseslint.configs.recommended,
|
||||
@@ -14,35 +15,38 @@ export default [
|
||||
{
|
||||
plugins: {
|
||||
'@stylistic': stylistic,
|
||||
'import': pluginImport,
|
||||
import: pluginImport,
|
||||
},
|
||||
"rules": {
|
||||
"no-unused-vars": "off",
|
||||
"@typescript-eslint/no-unused-vars": [
|
||||
"warn", // or "error"
|
||||
rules: {
|
||||
'no-unused-vars': 'off',
|
||||
'@typescript-eslint/no-unused-vars': [
|
||||
'warn', // or "error"
|
||||
{
|
||||
"argsIgnorePattern": "^_",
|
||||
"varsIgnorePattern": "^_",
|
||||
"caughtErrorsIgnorePattern": "^_"
|
||||
}
|
||||
argsIgnorePattern: '^_',
|
||||
varsIgnorePattern: '^_',
|
||||
caughtErrorsIgnorePattern: '^_',
|
||||
},
|
||||
],
|
||||
"sort-imports": ["off"],
|
||||
"import/order": [
|
||||
"error",
|
||||
'sort-imports': ['off'],
|
||||
'import/order': [
|
||||
'error',
|
||||
{
|
||||
"groups": [
|
||||
"builtin",
|
||||
"external",
|
||||
"internal",
|
||||
"parent",
|
||||
["sibling", "index"]
|
||||
groups: [
|
||||
'builtin',
|
||||
'external',
|
||||
'internal',
|
||||
'parent',
|
||||
['sibling', 'index'],
|
||||
],
|
||||
"newlines-between": "always",
|
||||
}
|
||||
'newlines-between': 'always',
|
||||
},
|
||||
],
|
||||
semi: ["error", "always"],
|
||||
semi: ['error', 'always'],
|
||||
'@stylistic/indent': ['error', 2],
|
||||
'react/prop-types': 'off'
|
||||
'react/prop-types': 'off',
|
||||
},
|
||||
}
|
||||
},
|
||||
{
|
||||
ignores: ['babel.config.js'],
|
||||
},
|
||||
];
|
||||
|
||||
17
jest-preset-it/jest-preset.ts
Normal file
17
jest-preset-it/jest-preset.ts
Normal file
@@ -0,0 +1,17 @@
|
||||
module.exports = {
|
||||
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',
|
||||
},
|
||||
testEnvironmentOptions: {
|
||||
customExportConditions: [''],
|
||||
},
|
||||
testEnvironment: 'jest-fixed-jsdom',
|
||||
};
|
||||
@@ -42,7 +42,7 @@
|
||||
"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.get-order-query.error.title": "Failed to fetch the details of order #{{number}}",
|
||||
"dry-wash.order-view.get-order-query.error.title": "Failed to fetch the details of order",
|
||||
"dry-wash.order-view.details.title": "Order #{{number}}",
|
||||
"dry-wash.order-view.details.owner": "Owner",
|
||||
"dry-wash.order-view.details.car": "Car",
|
||||
|
||||
@@ -82,7 +82,7 @@
|
||||
"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.get-order-query.error.title": "Не удалось загрузить детали заказа №{{number}}",
|
||||
"dry-wash.order-view.get-order-query.error.title": "Не удалось загрузить детали заказа",
|
||||
"dry-wash.order-view.details.title": "Заказ №{{number}}",
|
||||
"dry-wash.order-view.details.owner": "Владелец",
|
||||
"dry-wash.order-view.details.car": "Автомобиль",
|
||||
|
||||
5606
package-lock.json
generated
5606
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
25
package.json
25
package.json
@@ -4,7 +4,7 @@
|
||||
"description": "<a id=\"readme-top\"></a>",
|
||||
"main": "./src/index.tsx",
|
||||
"scripts": {
|
||||
"test": "echo \"Error: no test specified\" && exit 1",
|
||||
"test": "jest -u",
|
||||
"start": "brojs server --port=8099 --with-open-browser",
|
||||
"build": "npm run clean && brojs build --dev",
|
||||
"build:prod": "npm run clean && brojs build",
|
||||
@@ -17,7 +17,11 @@
|
||||
"author": "",
|
||||
"license": "ISC",
|
||||
"dependencies": {
|
||||
"@brojs/cli": "^1.6.3",
|
||||
"@brojs/cli": "^1.8.4",
|
||||
"@babel/core": "^7.26.7",
|
||||
"@babel/preset-env": "^7.26.7",
|
||||
"@babel/preset-react": "^7.26.3",
|
||||
"@babel/preset-typescript": "^7.26.0",
|
||||
"@chakra-ui/icons": "^2.2.4",
|
||||
"@chakra-ui/react": "^2.10.5",
|
||||
"@emotion/react": "^11.4.1",
|
||||
@@ -25,19 +29,30 @@
|
||||
"@fontsource/open-sans": "^5.1.0",
|
||||
"@lottiefiles/react-lottie-player": "^3.5.4",
|
||||
"@pbe/react-yandex-maps": "^1.2.5",
|
||||
"@reduxjs/toolkit": "^2.5.0",
|
||||
"@testing-library/dom": "^10.4.0",
|
||||
"@testing-library/react": "^16.2.0",
|
||||
"@types/react": "^18.3.12",
|
||||
"babel-jest": "^29.7.0",
|
||||
"dayjs": "^1.11.13",
|
||||
"express": "^4.21.1",
|
||||
"framer-motion": "^6.2.8",
|
||||
"i18next": "^23.16.4",
|
||||
"jest": "^29.7.0",
|
||||
"jest-environment-jsdom": "^29.7.0",
|
||||
"jest-fixed-jsdom": "^0.0.9",
|
||||
"keycloak-js": "^23.0.7",
|
||||
"msw": "^2.7.0",
|
||||
"react": "^18.3.1",
|
||||
"react-dom": "^18.3.1",
|
||||
"react-hook-form": "^7.53.2",
|
||||
"react-i18next": "^15.1.1",
|
||||
"react-icons": "^5.3.0",
|
||||
"react-phone-number-input": "^3.4.9",
|
||||
"react-router-dom": "^6.27.0"
|
||||
"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",
|
||||
@@ -48,6 +63,10 @@
|
||||
"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"
|
||||
}
|
||||
}
|
||||
|
||||
15
src/__data__/features.ts
Normal file
15
src/__data__/features.ts
Normal file
@@ -0,0 +1,15 @@
|
||||
import { getFeatures } from "@brojs/cli";
|
||||
|
||||
const features = getFeatures('dry-wash-pl');
|
||||
|
||||
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;
|
||||
}
|
||||
}
|
||||
}
|
||||
};
|
||||
27
src/__data__/service/api.ts
Normal file
27
src/__data__/service/api.ts
Normal file
@@ -0,0 +1,27 @@
|
||||
import { createApi, fetchBaseQuery } from '@reduxjs/toolkit/query/react';
|
||||
import { getConfigValue } from '@brojs/cli';
|
||||
|
||||
import { Master } from '../../models/api/master';
|
||||
|
||||
import { extractBodyFromResponse } from './utils';
|
||||
|
||||
export const api = createApi({
|
||||
reducerPath: 'api',
|
||||
baseQuery: fetchBaseQuery({ baseUrl: getConfigValue('dry-wash.api') }),
|
||||
tagTypes: ['Masters'],
|
||||
endpoints: (builder) => ({
|
||||
getMasters: builder.query<Master[], void>({
|
||||
query: () => ({ url: '/arm/masters' }),
|
||||
transformResponse: extractBodyFromResponse<Master[]>,
|
||||
providesTags: ['Masters'],
|
||||
}),
|
||||
addMaster: builder.mutation<void, Pick<Master, 'name' | 'phone'>>({
|
||||
query: (master) => ({
|
||||
url: '/arm/masters',
|
||||
method: 'POST',
|
||||
body: master,
|
||||
}),
|
||||
invalidatesTags: ['Masters'],
|
||||
}),
|
||||
}),
|
||||
});
|
||||
14
src/__data__/service/landing.api.ts
Normal file
14
src/__data__/service/landing.api.ts
Normal file
@@ -0,0 +1,14 @@
|
||||
import { GetOrder } from "../../models/api";
|
||||
|
||||
import { api } from "./api";
|
||||
import { extractBodyFromResponse, extractErrorMessageFromResponse } from "./utils";
|
||||
|
||||
export const landingApi = api.injectEndpoints({
|
||||
endpoints: ({ query }) => ({
|
||||
getOrder: query<GetOrder.Response, GetOrder.Params>({
|
||||
query: ({ orderId }) => `/order/${orderId}`,
|
||||
transformResponse: extractBodyFromResponse<GetOrder.Response>,
|
||||
transformErrorResponse: extractErrorMessageFromResponse,
|
||||
})
|
||||
})
|
||||
});
|
||||
15
src/__data__/service/utils.ts
Normal file
15
src/__data__/service/utils.ts
Normal file
@@ -0,0 +1,15 @@
|
||||
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' && 'message' in data && typeof data.message === 'string') {
|
||||
return data.message;
|
||||
}
|
||||
};
|
||||
14
src/__data__/store.ts
Normal file
14
src/__data__/store.ts
Normal file
@@ -0,0 +1,14 @@
|
||||
import { configureStore } from '@reduxjs/toolkit';
|
||||
|
||||
import { api } from './service/api';
|
||||
|
||||
export const store = configureStore({
|
||||
reducer: {
|
||||
[api.reducerPath]: api.reducer,
|
||||
},
|
||||
middleware: (getDefaultMiddleware) =>
|
||||
getDefaultMiddleware().concat(api.middleware),
|
||||
});
|
||||
|
||||
export type RootState = ReturnType<typeof store.getState>;
|
||||
export type AppDispatch = typeof store.dispatch;
|
||||
@@ -85,7 +85,7 @@ const armService = () => {
|
||||
}) => {
|
||||
const body = JSON.stringify({ status, notes, masterId });
|
||||
|
||||
const response = await fetch(`${endpoint}${ArmEndpoints.MASTERS}/${id}`, {
|
||||
const response = await fetch(`${endpoint}/order/${id}`, {
|
||||
method: 'PATCH',
|
||||
headers: {
|
||||
'Content-Type': 'application/json',
|
||||
|
||||
@@ -1,12 +1,11 @@
|
||||
import { getConfigValue } from '@brojs/cli';
|
||||
import { useEffect, useState } from 'react';
|
||||
import { useState } from 'react';
|
||||
|
||||
import { CreateOrder, GetOrder } from '../models/api';
|
||||
import { CreateOrder } from '../models/api';
|
||||
|
||||
import { QueryState, Trigger } from './types';
|
||||
|
||||
enum LandingEndpoints {
|
||||
ORDER = '/order',
|
||||
ORDER_CREATE = '/order/create',
|
||||
}
|
||||
|
||||
@@ -63,45 +62,4 @@ const useCreateOrderMutation = <D extends CreateOrder.Response>(): [
|
||||
return [createOrder, { isLoading, isSuccess, data, isError, error }];
|
||||
};
|
||||
|
||||
const useGetOrderQuery = <D extends GetOrder.Response>({
|
||||
orderId,
|
||||
}: GetOrder.Params): QueryState<D> => {
|
||||
const [isLoading, setIsLoading] = useState<QueryState<D>['isLoading']>(true);
|
||||
const [isSuccess, setIsSuccess] = useState<QueryState<D>['isSuccess']>();
|
||||
const [data, setData] = useState<QueryState<D>['data']>();
|
||||
const [isError, setIsError] = useState<QueryState<D>['isError']>();
|
||||
const [error, setError] = useState<QueryState<D>['error']>();
|
||||
|
||||
useEffect(() => {
|
||||
(async () => {
|
||||
try {
|
||||
const response = await fetch(
|
||||
`${endpoint}${LandingEndpoints.ORDER}/${orderId}`,
|
||||
);
|
||||
|
||||
if (!response.ok) {
|
||||
const errorResponseObject =
|
||||
(await response.json()) as QueryState<D>['error'];
|
||||
setIsError(true);
|
||||
setError(errorResponseObject);
|
||||
throw errorResponseObject;
|
||||
}
|
||||
|
||||
const dataResponseObject =
|
||||
(await response.json()) as QueryState<D>['data'];
|
||||
setIsSuccess(true);
|
||||
setData(dataResponseObject);
|
||||
} catch (error) {
|
||||
setIsError(true);
|
||||
setError(error);
|
||||
throw error;
|
||||
} finally {
|
||||
setIsLoading(false);
|
||||
}
|
||||
})();
|
||||
}, []);
|
||||
|
||||
return { isLoading, isSuccess, data, isError, error };
|
||||
};
|
||||
|
||||
export { useCreateOrderMutation, useGetOrderQuery };
|
||||
export { useCreateOrderMutation };
|
||||
|
||||
18
src/app.tsx
18
src/app.tsx
@@ -1,19 +1,23 @@
|
||||
import React from 'react';
|
||||
import { BrowserRouter } from 'react-router-dom';
|
||||
import { ChakraProvider, theme as chakraTheme } from '@chakra-ui/react';
|
||||
import { Provider } from 'react-redux';
|
||||
|
||||
import Routers from './routes';
|
||||
import ErrorBoundary from './components/ErrorBoundary';
|
||||
import { store } from './__data__/store';
|
||||
|
||||
const App = () => {
|
||||
return (
|
||||
<ChakraProvider theme={chakraTheme}>
|
||||
<ErrorBoundary>
|
||||
<BrowserRouter>
|
||||
<Routers />
|
||||
</BrowserRouter>
|
||||
</ErrorBoundary>
|
||||
</ChakraProvider>
|
||||
<Provider store={store}>
|
||||
<ChakraProvider theme={chakraTheme}>
|
||||
<ErrorBoundary>
|
||||
<BrowserRouter>
|
||||
<Routers />
|
||||
</BrowserRouter>
|
||||
</ErrorBoundary>
|
||||
</ChakraProvider>
|
||||
</Provider>
|
||||
);
|
||||
};
|
||||
|
||||
|
||||
@@ -3,6 +3,7 @@ export { default as CrossoverImg } from './crossover.webp';
|
||||
export { default as HatchbackImg } from './hatchback.webp';
|
||||
export { default as LiftbackImg } from './liftback.webp';
|
||||
export { default as MinivanImg } from './minivan.webp';
|
||||
export { default as OtherImg } from './other.webp';
|
||||
export { default as PickupImg } from './pickup.webp';
|
||||
export { default as SedanImg } from './sedan.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,4 +1,4 @@
|
||||
import React, { useState } from 'react';
|
||||
import React, { useEffect, useState } from 'react';
|
||||
import {
|
||||
Button,
|
||||
FormControl,
|
||||
@@ -18,21 +18,29 @@ import {
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { PhoneIcon } from '@chakra-ui/icons';
|
||||
|
||||
import { armService } from '../../api/arm';
|
||||
import { api } from '../../__data__/service/api';
|
||||
|
||||
const MasterDrawer = ({ isOpen, onClose }) => {
|
||||
const { addMaster } = armService();
|
||||
const [addMaster, { error, isSuccess }] = api.useAddMasterMutation();
|
||||
const toast = useToast();
|
||||
|
||||
const [newMaster, setNewMaster] = useState({ name: '', phone: '' });
|
||||
|
||||
const handleSave = async () => {
|
||||
if (newMaster.name.trim() === '' || newMaster.phone.trim() === '') {
|
||||
const trimMaster = {
|
||||
phone: newMaster.phone.trim(),
|
||||
name: newMaster.name.trim(),
|
||||
};
|
||||
|
||||
if (trimMaster.name === '' || trimMaster.phone === '') {
|
||||
return;
|
||||
}
|
||||
|
||||
try {
|
||||
await addMaster(newMaster);
|
||||
addMaster(trimMaster);
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
if (isSuccess) {
|
||||
toast({
|
||||
title: 'Мастер создан.',
|
||||
description: `Мастер "${newMaster.name}" успешно добавлен.`,
|
||||
@@ -42,7 +50,11 @@ const MasterDrawer = ({ isOpen, onClose }) => {
|
||||
position: 'top-right',
|
||||
});
|
||||
onClose();
|
||||
} catch (error) {
|
||||
}
|
||||
}, [isSuccess]);
|
||||
|
||||
useEffect(() => {
|
||||
if (error) {
|
||||
toast({
|
||||
title: 'Ошибка при создании мастера.',
|
||||
description: 'Не удалось добавить мастера. Попробуйте еще раз.',
|
||||
@@ -53,7 +65,7 @@ const MasterDrawer = ({ isOpen, onClose }) => {
|
||||
});
|
||||
console.error(error);
|
||||
}
|
||||
};
|
||||
}, [error]);
|
||||
|
||||
const { t } = useTranslation('~', {
|
||||
keyPrefix: 'dry-wash.arm.master.drawer',
|
||||
|
||||
@@ -7,19 +7,6 @@ import { getTimeSlot } from '../../lib';
|
||||
import EditableWrapper from '../Editable/Editable';
|
||||
import { armService } from '../../api/arm';
|
||||
|
||||
export interface Schedule {
|
||||
id: string;
|
||||
startWashTime: string;
|
||||
endWashTime: string;
|
||||
}
|
||||
|
||||
export type MasterProps = {
|
||||
id: string;
|
||||
name: string;
|
||||
phone: string;
|
||||
schedule: Schedule[];
|
||||
};
|
||||
|
||||
const MasterItem = ({ name, phone, id, schedule }) => {
|
||||
const { updateMaster } = armService();
|
||||
const { t } = useTranslation('~', {
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
import React, { useEffect, useState } from 'react';
|
||||
import React, { useEffect } from 'react';
|
||||
import {
|
||||
Box,
|
||||
Heading,
|
||||
@@ -19,8 +19,7 @@ import { useTranslation } from 'react-i18next';
|
||||
|
||||
import MasterItem from '../MasterItem';
|
||||
import MasterDrawer from '../MasterDrawer';
|
||||
import { armService } from '../../api/arm';
|
||||
import { MasterProps } from '../MasterItem/MasterItem';
|
||||
import { api } from '../../__data__/service/api';
|
||||
|
||||
const TABLE_HEADERS = [
|
||||
'name' as const,
|
||||
@@ -36,35 +35,23 @@ const Masters = () => {
|
||||
keyPrefix: 'dry-wash.arm.master',
|
||||
});
|
||||
|
||||
const [masters, setMasters] = useState<MasterProps[]>([]);
|
||||
const [loading, setLoading] = useState(false);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
|
||||
const { fetchMasters } = armService();
|
||||
const {
|
||||
data: masters,
|
||||
error,
|
||||
isLoading,
|
||||
isSuccess,
|
||||
} = api.useGetMastersQuery();
|
||||
|
||||
useEffect(() => {
|
||||
const loadMasters = async () => {
|
||||
setLoading(true);
|
||||
|
||||
try {
|
||||
const data = await fetchMasters();
|
||||
setMasters(data.body);
|
||||
} catch (err) {
|
||||
setError(err.message);
|
||||
toast({
|
||||
title: t('error.title'),
|
||||
status: 'error',
|
||||
duration: 5000,
|
||||
isClosable: true,
|
||||
position: 'bottom-right',
|
||||
});
|
||||
} finally {
|
||||
setLoading(false);
|
||||
}
|
||||
};
|
||||
|
||||
loadMasters();
|
||||
}, [toast, t]);
|
||||
if (error) {
|
||||
toast({
|
||||
title: t('error.title'),
|
||||
status: 'error',
|
||||
isClosable: true,
|
||||
position: 'bottom-right',
|
||||
});
|
||||
}
|
||||
}, [error]);
|
||||
|
||||
return (
|
||||
<Box p='8'>
|
||||
@@ -83,22 +70,21 @@ const Masters = () => {
|
||||
</Tr>
|
||||
</Thead>
|
||||
<Tbody>
|
||||
{loading && (
|
||||
{isLoading && (
|
||||
<Tr>
|
||||
<Td colSpan={TABLE_HEADERS.length} textAlign='center' py='8'>
|
||||
<Spinner size='lg' />
|
||||
</Td>
|
||||
</Tr>
|
||||
)}
|
||||
{!loading && masters.length === 0 && !error && (
|
||||
{isSuccess && masters.length === 0 && (
|
||||
<Tr>
|
||||
<Td colSpan={TABLE_HEADERS.length}>
|
||||
<Text>{t('table.empty')}</Text>
|
||||
</Td>
|
||||
</Tr>
|
||||
)}
|
||||
{!loading &&
|
||||
!error &&
|
||||
{isSuccess &&
|
||||
masters.map((master, index) => (
|
||||
<MasterItem key={index} {...master} />
|
||||
))}
|
||||
|
||||
@@ -3,8 +3,8 @@ import { Td, Tr, Link, Select } from '@chakra-ui/react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import dayjs from 'dayjs';
|
||||
|
||||
import { MasterProps } from '../MasterItem/MasterItem';
|
||||
import { getTimeSlot } from '../../lib';
|
||||
import { Master } from '../../models/api/master';
|
||||
import { armService } from '../../api/arm';
|
||||
|
||||
const statuses = [
|
||||
@@ -26,9 +26,9 @@ export type OrderProps = {
|
||||
status?: GetArrItemType<typeof statuses>;
|
||||
phone?: string;
|
||||
location?: string;
|
||||
master: MasterProps;
|
||||
master: Master;
|
||||
notes: '';
|
||||
allMasters: MasterProps[];
|
||||
allMasters: Master[];
|
||||
id: string;
|
||||
};
|
||||
|
||||
|
||||
@@ -19,7 +19,7 @@ import OrderItem from '../OrderItem';
|
||||
import { OrderProps } from '../OrderItem/OrderItem';
|
||||
import { armService } from '../../api/arm';
|
||||
import DateNavigator from '../DateNavigator';
|
||||
import { MasterProps } from '../MasterItem/MasterItem';
|
||||
import { Master } from '../../models/api/master';
|
||||
|
||||
const TABLE_HEADERS = [
|
||||
'carNumber' as const,
|
||||
@@ -41,7 +41,7 @@ const Orders = () => {
|
||||
const toast = useToast();
|
||||
|
||||
const [orders, setOrders] = useState<OrderProps[]>([]);
|
||||
const [allMasters, setAllMasters] = useState<MasterProps[]>([]);
|
||||
const [allMasters, setAllMasters] = useState<Master[]>([]);
|
||||
const [loading, setLoading] = useState(false);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
const [currentDate, setCurrentDate] = useState(new Date());
|
||||
|
||||
@@ -1,34 +1,38 @@
|
||||
import React, { forwardRef, useState } from 'react';
|
||||
import React, { forwardRef } from 'react';
|
||||
import {
|
||||
Input,
|
||||
Image,
|
||||
InputProps,
|
||||
Box,
|
||||
Popover,
|
||||
PopoverAnchor,
|
||||
PopoverContent,
|
||||
PopoverBody,
|
||||
List,
|
||||
ListItem,
|
||||
useRadioGroup,
|
||||
Grid,
|
||||
GridItem,
|
||||
UseRadioGroupProps,
|
||||
useDisclosure,
|
||||
} from '@chakra-ui/react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
|
||||
import { carBodySelectOptions } from './helper';
|
||||
import { CarBodySelectOption } from './types';
|
||||
import { carBodySelectOptions, getInputValue } from './helper';
|
||||
import { CarBodyOption } from './option';
|
||||
import { CarBodySelectProps } from './types';
|
||||
|
||||
export const CarBodySelect = forwardRef<HTMLInputElement, InputProps>(
|
||||
export const CarBodySelect = forwardRef<HTMLInputElement, CarBodySelectProps>(
|
||||
function CarBodySelect(props, ref) {
|
||||
const initialOption = carBodySelectOptions.find(({ value }) => value === Number(props.value));
|
||||
const [selected, setSelected] = useState<Partial<CarBodySelectOption>>(initialOption);
|
||||
|
||||
const handleOptionClick = (option: CarBodySelectOption) => {
|
||||
setSelected(option);
|
||||
const handleOptionClick: UseRadioGroupProps['onChange'] = (value) => {
|
||||
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
||||
// @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('~', {
|
||||
keyPrefix: 'dry-wash.order-create.car-body-select',
|
||||
@@ -37,7 +41,7 @@ export const CarBodySelect = forwardRef<HTMLInputElement, InputProps>(
|
||||
return (
|
||||
<Box width='100%'>
|
||||
<Popover
|
||||
isOpen={isDropdownOpen}
|
||||
isOpen={isOpen}
|
||||
autoFocus={false}
|
||||
placement='bottom-start'
|
||||
matchWidth
|
||||
@@ -46,45 +50,29 @@ export const CarBodySelect = forwardRef<HTMLInputElement, InputProps>(
|
||||
<Input
|
||||
{...props}
|
||||
ref={ref}
|
||||
value={
|
||||
selected?.labelTKey
|
||||
? t(`options.${selected.labelTKey}`)
|
||||
: undefined
|
||||
}
|
||||
value={getInputValue(Number(value), t) ?? props.value}
|
||||
readOnly
|
||||
onClick={() => setIsDropdownOpen(true)}
|
||||
onBlur={() => setIsDropdownOpen(false)}
|
||||
onClick={onOpen}
|
||||
onBlur={onClose}
|
||||
placeholder={t('placeholder')}
|
||||
/>
|
||||
</PopoverAnchor>
|
||||
<PopoverContent width='100%' maxWidth='100%'>
|
||||
<PopoverBody border='1px' borderColor='gray.300' p={0}>
|
||||
<List
|
||||
display='grid'
|
||||
gridTemplateColumns='repeat(auto-fit, minmax(150px, 1fr))'
|
||||
<Grid
|
||||
templateColumns='repeat(auto-fit, minmax(150px, 1fr))'
|
||||
{...getRootProps()}
|
||||
>
|
||||
{carBodySelectOptions.map((option) => (
|
||||
<ListItem
|
||||
key={option.value}
|
||||
display='flex'
|
||||
flexDirection='column'
|
||||
justifyContent='flex-end'
|
||||
alignItems='center'
|
||||
p={2}
|
||||
cursor='pointer'
|
||||
_hover={{
|
||||
bgColor: 'primary.50',
|
||||
}}
|
||||
_active={{
|
||||
bgColor: 'primary.100',
|
||||
}}
|
||||
onClick={() => handleOptionClick(option)}
|
||||
>
|
||||
<Image src={option.img} />
|
||||
{t(`options.${option.labelTKey}`)}
|
||||
</ListItem>
|
||||
{carBodySelectOptions.map(({ value, img, labelTKey }) => (
|
||||
<GridItem key={value}>
|
||||
<CarBodyOption
|
||||
image={img}
|
||||
label={t(`options.${labelTKey}`)}
|
||||
{...getRadioProps({ value: String(value) })}
|
||||
/>
|
||||
</GridItem>
|
||||
))}
|
||||
</List>
|
||||
</Grid>
|
||||
</PopoverBody>
|
||||
</PopoverContent>
|
||||
</Popover>
|
||||
|
||||
@@ -1,3 +1,6 @@
|
||||
import { TFunction } from "i18next";
|
||||
import { InputProps } from "@chakra-ui/react";
|
||||
|
||||
import {
|
||||
CoupeImg,
|
||||
CrossoverImg,
|
||||
@@ -8,7 +11,8 @@ import {
|
||||
SedanImg,
|
||||
SportsCarImg,
|
||||
StationWagonImg,
|
||||
SuvImg
|
||||
SuvImg,
|
||||
OtherImg
|
||||
} from "../../../../assets/images";
|
||||
import { Car } from "../../../../models/landing";
|
||||
|
||||
@@ -67,6 +71,17 @@ export const carBodySelectOptions: CarBodySelectOption[] = [
|
||||
},
|
||||
{
|
||||
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";
|
||||
|
||||
export type CarBodySelectOption = {
|
||||
@@ -16,3 +18,7 @@ export type CarBodySelectOption = {
|
||||
'other';
|
||||
img?: string;
|
||||
};
|
||||
|
||||
export type CarBodySelectProps = {
|
||||
value?: string;
|
||||
} & Pick<InputProps, 'onChange'>;
|
||||
@@ -9,6 +9,7 @@ export const defaultValues: Partial<OrderFormValues> = {
|
||||
phone: '',
|
||||
carNumber: '',
|
||||
carColor: '',
|
||||
carBody: '',
|
||||
availableDatetimeBegin: '',
|
||||
availableDatetimeEnd: '',
|
||||
};
|
||||
|
||||
@@ -42,21 +42,29 @@ export const LocationInput = memo(
|
||||
|
||||
const onInputChange: InputProps['onChange'] = async (e) => {
|
||||
const newInputValue = e.target.value;
|
||||
setInputValue(newInputValue);
|
||||
|
||||
if (newInputValue.trim().length > 3) {
|
||||
try {
|
||||
const address = extractAddress(newInputValue);
|
||||
const results = await ymaps.suggest(address);
|
||||
setSuggestions(results);
|
||||
} catch (error) {
|
||||
console.error(error);
|
||||
}
|
||||
if (
|
||||
isValidLocation(newInputValue) &&
|
||||
(await isRealLocation(ymaps, newInputValue))
|
||||
) {
|
||||
onChange(newInputValue);
|
||||
} 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'] = () => {
|
||||
@@ -103,7 +111,7 @@ export const LocationInput = memo(
|
||||
{...props}
|
||||
ref={ref}
|
||||
onBlur={onBlur}
|
||||
value={inputValue}
|
||||
value={inputValue ?? value}
|
||||
onChange={onInputChange}
|
||||
onFocus={onFocus}
|
||||
placeholder={t('placeholder')}
|
||||
|
||||
@@ -19,7 +19,7 @@ import { OrderStatus } from './status';
|
||||
|
||||
type OrderDetailsProps = Pick<
|
||||
Order.View,
|
||||
| 'id'
|
||||
| 'orderNumber'
|
||||
| 'status'
|
||||
| 'phone'
|
||||
| 'carNumber'
|
||||
@@ -32,7 +32,7 @@ type OrderDetailsProps = Pick<
|
||||
>;
|
||||
|
||||
export const OrderDetails: FC<OrderDetailsProps> = ({
|
||||
id,
|
||||
orderNumber,
|
||||
status,
|
||||
phone,
|
||||
carNumber,
|
||||
@@ -58,7 +58,7 @@ export const OrderDetails: FC<OrderDetailsProps> = ({
|
||||
gap={2}
|
||||
>
|
||||
<Heading as='h2' size='lg'>
|
||||
{t('title', { number: id })}
|
||||
{t('title', { number: orderNumber })}
|
||||
</Heading>
|
||||
<OrderStatus value={status} />
|
||||
</HStack>
|
||||
|
||||
@@ -15,19 +15,19 @@ const getPropsByStatus = (
|
||||
colorScheme: 'red',
|
||||
children: t('canceled'),
|
||||
};
|
||||
case 'progress':
|
||||
return {
|
||||
colorScheme: 'yellow',
|
||||
children: t('progress'),
|
||||
};
|
||||
case 'pending':
|
||||
return {
|
||||
colorScheme: 'yellow',
|
||||
children: t('pending'),
|
||||
};
|
||||
case 'progress':
|
||||
return {
|
||||
colorScheme: 'orange',
|
||||
children: t('progress'),
|
||||
};
|
||||
case 'working':
|
||||
return {
|
||||
colorScheme: 'yellow',
|
||||
colorScheme: 'orange',
|
||||
children: t('working'),
|
||||
};
|
||||
case 'complete':
|
||||
|
||||
13
src/models/api/common.ts
Normal file
13
src/models/api/common.ts
Normal file
@@ -0,0 +1,13 @@
|
||||
type SuccessResponse<Body> = {
|
||||
success: true;
|
||||
body: Body;
|
||||
};
|
||||
|
||||
export type ErrorMessage = string;
|
||||
|
||||
type ErrorResponse = {
|
||||
success: false;
|
||||
message: ErrorMessage;
|
||||
};
|
||||
|
||||
export type BaseResponse<Body> = SuccessResponse<Body> | ErrorResponse;
|
||||
@@ -1 +1,2 @@
|
||||
export * from './common';
|
||||
export * from './order';
|
||||
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,6 +1,16 @@
|
||||
/* eslint-disable @typescript-eslint/no-namespace */
|
||||
import { Order } from "../landing";
|
||||
|
||||
import { ErrorMessage } from "./common";
|
||||
|
||||
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
|
||||
@@ -8,11 +18,4 @@ export namespace CreateOrder {
|
||||
export type Params = {
|
||||
body: Order.Create
|
||||
};
|
||||
};
|
||||
|
||||
export namespace GetOrder {
|
||||
export type Response = Order.View;
|
||||
export type Params = {
|
||||
orderId: Order.Id
|
||||
};
|
||||
};
|
||||
@@ -26,6 +26,8 @@ export type Create = {
|
||||
}
|
||||
};
|
||||
|
||||
export type Number = string;
|
||||
|
||||
export type View = {
|
||||
phone: Customer.PhoneNumber;
|
||||
carNumber: Car.RegistrationNumber;
|
||||
@@ -34,6 +36,7 @@ export type View = {
|
||||
location: Washing.Location;
|
||||
startWashTime: Washing.AvailableBeginDateTime;
|
||||
endWashTime: Washing.AvailableEndDateTime;
|
||||
orderNumber: Number,
|
||||
status: Status,
|
||||
notes: string;
|
||||
created: IsoDate;
|
||||
|
||||
325
src/pages/__tests__/__snapshots__/arm.test.tsx.snap
Normal file
325
src/pages/__tests__/__snapshots__/arm.test.tsx.snap
Normal file
@@ -0,0 +1,325 @@
|
||||
// Jest Snapshot v1, https://goo.gl/fbAQLP
|
||||
|
||||
exports[`Arm Page render 1`] = `
|
||||
<div>
|
||||
<div
|
||||
class="css-1yeiifd"
|
||||
>
|
||||
<div
|
||||
class="css-1fp6kaj"
|
||||
>
|
||||
<h2
|
||||
class="chakra-heading css-9q1d0h"
|
||||
>
|
||||
title
|
||||
</h2>
|
||||
<div
|
||||
class="chakra-stack css-1oen434"
|
||||
>
|
||||
<hr
|
||||
aria-orientation="horizontal"
|
||||
class="chakra-divider css-1upb9tn"
|
||||
/>
|
||||
<a
|
||||
class="chakra-button css-uxt1e8"
|
||||
href="/auth/login"
|
||||
>
|
||||
orders
|
||||
</a>
|
||||
<hr
|
||||
aria-orientation="horizontal"
|
||||
class="chakra-divider css-1upb9tn"
|
||||
/>
|
||||
<a
|
||||
class="chakra-button css-uxt1e8"
|
||||
href="/auth/login"
|
||||
>
|
||||
master
|
||||
</a>
|
||||
<hr
|
||||
aria-orientation="horizontal"
|
||||
class="chakra-divider css-1upb9tn"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<div
|
||||
class="css-sy55x5"
|
||||
>
|
||||
<div
|
||||
class="css-hpgf8j"
|
||||
>
|
||||
<h2
|
||||
class="chakra-heading css-r7q7qr"
|
||||
>
|
||||
title
|
||||
</h2>
|
||||
<div
|
||||
class="css-1me9tx"
|
||||
>
|
||||
<button
|
||||
class="chakra-button css-4xx2wk"
|
||||
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-1bntq7d"
|
||||
>
|
||||
2/2/2025
|
||||
</p>
|
||||
<button
|
||||
class="chakra-button css-4xx2wk"
|
||||
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-0"
|
||||
>
|
||||
<thead
|
||||
class="css-0"
|
||||
>
|
||||
<tr
|
||||
class="css-0"
|
||||
>
|
||||
<th
|
||||
class="css-0"
|
||||
>
|
||||
table.header.carNumber
|
||||
</th>
|
||||
<th
|
||||
class="css-0"
|
||||
>
|
||||
table.header.orderDate
|
||||
</th>
|
||||
<th
|
||||
class="css-0"
|
||||
>
|
||||
table.header.status
|
||||
</th>
|
||||
<th
|
||||
class="css-0"
|
||||
>
|
||||
table.header.masters
|
||||
</th>
|
||||
<th
|
||||
class="css-0"
|
||||
>
|
||||
table.header.telephone
|
||||
</th>
|
||||
<th
|
||||
class="css-0"
|
||||
>
|
||||
table.header.location
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody
|
||||
class="css-0"
|
||||
>
|
||||
<tr
|
||||
class="css-0"
|
||||
>
|
||||
<td
|
||||
class="css-12rlgei"
|
||||
colspan="6"
|
||||
>
|
||||
<div
|
||||
class="chakra-spinner css-1y7joxr"
|
||||
>
|
||||
<span
|
||||
class="css-8b45rq"
|
||||
>
|
||||
Loading...
|
||||
</span>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
`;
|
||||
|
||||
exports[`Arm Page render 2`] = `
|
||||
<div>
|
||||
<div
|
||||
class="css-1yeiifd"
|
||||
>
|
||||
<div
|
||||
class="css-1fp6kaj"
|
||||
>
|
||||
<h2
|
||||
class="chakra-heading css-9q1d0h"
|
||||
>
|
||||
title
|
||||
</h2>
|
||||
<div
|
||||
class="chakra-stack css-1oen434"
|
||||
>
|
||||
<hr
|
||||
aria-orientation="horizontal"
|
||||
class="chakra-divider css-1upb9tn"
|
||||
/>
|
||||
<a
|
||||
class="chakra-button css-uxt1e8"
|
||||
href="/auth/login"
|
||||
>
|
||||
orders
|
||||
</a>
|
||||
<hr
|
||||
aria-orientation="horizontal"
|
||||
class="chakra-divider css-1upb9tn"
|
||||
/>
|
||||
<a
|
||||
class="chakra-button css-uxt1e8"
|
||||
href="/auth/login"
|
||||
>
|
||||
master
|
||||
</a>
|
||||
<hr
|
||||
aria-orientation="horizontal"
|
||||
class="chakra-divider css-1upb9tn"
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
<div
|
||||
class="css-sy55x5"
|
||||
>
|
||||
<div
|
||||
class="css-hpgf8j"
|
||||
>
|
||||
<h2
|
||||
class="chakra-heading css-r7q7qr"
|
||||
>
|
||||
title
|
||||
</h2>
|
||||
<div
|
||||
class="css-1me9tx"
|
||||
>
|
||||
<button
|
||||
class="chakra-button css-4xx2wk"
|
||||
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-1bntq7d"
|
||||
>
|
||||
2/2/2025
|
||||
</p>
|
||||
<button
|
||||
class="chakra-button css-4xx2wk"
|
||||
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-0"
|
||||
>
|
||||
<thead
|
||||
class="css-0"
|
||||
>
|
||||
<tr
|
||||
class="css-0"
|
||||
>
|
||||
<th
|
||||
class="css-0"
|
||||
>
|
||||
table.header.carNumber
|
||||
</th>
|
||||
<th
|
||||
class="css-0"
|
||||
>
|
||||
table.header.orderDate
|
||||
</th>
|
||||
<th
|
||||
class="css-0"
|
||||
>
|
||||
table.header.status
|
||||
</th>
|
||||
<th
|
||||
class="css-0"
|
||||
>
|
||||
table.header.masters
|
||||
</th>
|
||||
<th
|
||||
class="css-0"
|
||||
>
|
||||
table.header.telephone
|
||||
</th>
|
||||
<th
|
||||
class="css-0"
|
||||
>
|
||||
table.header.location
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody
|
||||
class="css-0"
|
||||
>
|
||||
<tr
|
||||
class="css-0"
|
||||
>
|
||||
<td
|
||||
class="css-12rlgei"
|
||||
colspan="6"
|
||||
>
|
||||
<div
|
||||
class="chakra-spinner css-1y7joxr"
|
||||
>
|
||||
<span
|
||||
class="css-8b45rq"
|
||||
>
|
||||
Loading...
|
||||
</span>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
`;
|
||||
130
src/pages/__tests__/arm.test.tsx
Normal file
130
src/pages/__tests__/arm.test.tsx
Normal file
@@ -0,0 +1,130 @@
|
||||
import 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 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('react-i18next', () => {
|
||||
return {
|
||||
useTranslation: () => {
|
||||
return {
|
||||
t: (key: never) => `${key}`,
|
||||
i18n: {},
|
||||
};
|
||||
},
|
||||
};
|
||||
});
|
||||
|
||||
jest.mock('@brojs/cli', () => {
|
||||
return {
|
||||
getNavigationValue: () => '/auth/login',
|
||||
getConfigValue: () => '/api',
|
||||
};
|
||||
});
|
||||
|
||||
describe('Arm Page', () => {
|
||||
beforeAll(() => server.listen());
|
||||
afterEach(() => server.resetHandlers());
|
||||
afterAll(() => server.close());
|
||||
|
||||
it('render ', async () => {
|
||||
server.events.on('request:start', ({ request }) => {
|
||||
console.log('Outgoing:', request.method, request.url);
|
||||
});
|
||||
|
||||
const { container } = render(
|
||||
<BrowserRouter>
|
||||
<Page mockUser={{ name: 'ilnaz' }} />
|
||||
</BrowserRouter>,
|
||||
);
|
||||
|
||||
expect(container).toMatchSnapshot();
|
||||
|
||||
await waitFor(() => screen.getByText('A123BC'));
|
||||
|
||||
expect(container).toMatchSnapshot();
|
||||
});
|
||||
});
|
||||
@@ -6,8 +6,12 @@ import LayoutArm from '../../components/LayoutArm';
|
||||
import authLogin from '../../keycloak';
|
||||
import { URLs } from '../../__data__/urls';
|
||||
|
||||
const Page = () => {
|
||||
const [user, setUser] = useState(null);
|
||||
interface PageProps {
|
||||
mockUser?: { name: string };
|
||||
}
|
||||
|
||||
const Page = ({ mockUser }: PageProps) => {
|
||||
const [user, setUser] = useState(mockUser || null);
|
||||
|
||||
const navigate = useNavigate();
|
||||
|
||||
|
||||
@@ -1,5 +1,13 @@
|
||||
import React, { FC } from 'react';
|
||||
import { Alert, AlertDescription, AlertIcon, AlertTitle, HStack, Spinner } from '@chakra-ui/react';
|
||||
import {
|
||||
Alert,
|
||||
AlertDescription,
|
||||
AlertIcon,
|
||||
AlertTitle,
|
||||
Box,
|
||||
HStack,
|
||||
Spinner,
|
||||
} from '@chakra-ui/react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { Container, Heading, VStack } from '@chakra-ui/react';
|
||||
import { useParams } from 'react-router-dom';
|
||||
@@ -10,7 +18,9 @@ import {
|
||||
} from '../../containers';
|
||||
import { OrderDetails } from '../../components/order-view';
|
||||
import { Order } from '../../models/landing';
|
||||
import { useGetOrderQuery } from '../../api';
|
||||
import { landingApi } from '../../__data__/service/landing.api';
|
||||
import { ErrorMessage } from '../../models/api';
|
||||
import { FEATURE } from '../../__data__/features';
|
||||
|
||||
const Page: FC = () => {
|
||||
const { t } = useTranslation('~', {
|
||||
@@ -21,12 +31,21 @@ const Page: FC = () => {
|
||||
const {
|
||||
isLoading,
|
||||
isSuccess,
|
||||
data: { body: order } = {},
|
||||
data: order,
|
||||
isError,
|
||||
error,
|
||||
} = useGetOrderQuery({
|
||||
orderId,
|
||||
});
|
||||
} = landingApi.useGetOrderQuery(
|
||||
{
|
||||
orderId,
|
||||
},
|
||||
FEATURE.orderViewStatusPolling.isOn
|
||||
? {
|
||||
pollingInterval: FEATURE.orderViewStatusPolling.getValue(),
|
||||
skipPollingIfUnfocused: true,
|
||||
}
|
||||
: undefined,
|
||||
);
|
||||
const errorMessage = error as ErrorMessage;
|
||||
|
||||
return (
|
||||
<LandingThemeProvider>
|
||||
@@ -51,7 +70,7 @@ const Page: FC = () => {
|
||||
<>
|
||||
{isSuccess && (
|
||||
<OrderDetails
|
||||
id={order.id}
|
||||
orderNumber={order.orderNumber}
|
||||
status={order.status}
|
||||
phone={order.phone}
|
||||
carNumber={order.carNumber}
|
||||
@@ -66,14 +85,14 @@ const Page: FC = () => {
|
||||
</>
|
||||
<>
|
||||
{isError && (
|
||||
<Alert status='error'>
|
||||
<Alert status='error' alignItems='flex-start'>
|
||||
<AlertIcon />
|
||||
<AlertTitle>
|
||||
{t('get-order-query.error.title', {
|
||||
number: orderId,
|
||||
})}
|
||||
</AlertTitle>
|
||||
<AlertDescription>{error.data?.error}</AlertDescription>
|
||||
<Box>
|
||||
<AlertTitle>
|
||||
{t('get-order-query.error.title')}
|
||||
</AlertTitle>
|
||||
<AlertDescription>{errorMessage}</AlertDescription>
|
||||
</Box>
|
||||
</Alert>
|
||||
)}
|
||||
</>
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
/* eslint-disable @typescript-eslint/no-require-imports */
|
||||
const router = require('express').Router();
|
||||
|
||||
const STUBS = { masters: 'success', orders: 'success', orderView: 'success' };
|
||||
const STUBS = { masters: 'success', orders: 'success', orderView: 'success-pending' };
|
||||
|
||||
router.get('/set/:name/:value', (req, res) => {
|
||||
const { name, value } = req.params;
|
||||
@@ -18,15 +18,18 @@ router.get('/', (req, res) => {
|
||||
<legend>Мастера</legend>
|
||||
${generateRadioInput('masters', 'success')}
|
||||
${generateRadioInput('masters', 'error')}
|
||||
${generateRadioInput('masters', 'empty')}
|
||||
</fieldset>
|
||||
<fieldset>
|
||||
<legend>Заказы</legend>
|
||||
${generateRadioInput('orders', 'success')}
|
||||
${generateRadioInput('orders', 'error')}
|
||||
${generateRadioInput('orders', 'error')}
|
||||
${generateRadioInput('orders', 'empty')}
|
||||
</fieldset>
|
||||
<fieldset>
|
||||
<legend>Лендинг - Детали заказа</legend>
|
||||
${generateRadioInput('orderView', 'success')}
|
||||
${generateRadioInput('orderView', 'success-pending')}
|
||||
${generateRadioInput('orderView', 'success-working')}
|
||||
${generateRadioInput('orderView', 'error')}
|
||||
</fieldset>
|
||||
</div>`);
|
||||
@@ -40,4 +43,4 @@ function generateRadioInput(name, type) {
|
||||
<input ${STUBS[name] === type ? 'checked' : ''} onclick="fetch('/api/admin/set/${name}/${type}')" type="radio" name="${name}">
|
||||
${type}
|
||||
</label>`;
|
||||
}
|
||||
}
|
||||
|
||||
4
stubs/json/arm-masters/empty.json
Normal file
4
stubs/json/arm-masters/empty.json
Normal file
@@ -0,0 +1,4 @@
|
||||
{
|
||||
"success": true,
|
||||
"body": []
|
||||
}
|
||||
4
stubs/json/arm-orders/empty.json
Normal file
4
stubs/json/arm-orders/empty.json
Normal file
@@ -0,0 +1,4 @@
|
||||
{
|
||||
"success": true,
|
||||
"body": []
|
||||
}
|
||||
4
stubs/json/landing-order-view/id1-error.json
Normal file
4
stubs/json/landing-order-view/id1-error.json
Normal file
@@ -0,0 +1,4 @@
|
||||
{
|
||||
"success": false,
|
||||
"message": "Не удалось загрузить детали заказа"
|
||||
}
|
||||
@@ -8,10 +8,11 @@
|
||||
"startWashTime": "2025-01-19T14:03:00.000Z",
|
||||
"endWashTime": "2025-01-19T14:03:00.000Z",
|
||||
"location": "55.793833888711006,49.19037910644527 Республика Татарстан (Татарстан), Казань, жилой район Седьмое Небо",
|
||||
"status": "progress",
|
||||
"orderNumber": "1",
|
||||
"status": "pending",
|
||||
"notes": "",
|
||||
"created": "2025-01-19T14:04:02.985Z",
|
||||
"updated": "2025-01-19T14:04:02.987Z",
|
||||
"id": "678d06527d78ec30be2679d8"
|
||||
"id": "id1"
|
||||
}
|
||||
}
|
||||
18
stubs/json/landing-order-view/id1-success-working.json
Normal file
18
stubs/json/landing-order-view/id1-success-working.json
Normal file
@@ -0,0 +1,18 @@
|
||||
{
|
||||
"success": true,
|
||||
"body": {
|
||||
"phone": "+79876543210",
|
||||
"carNumber": "А123АА16",
|
||||
"carBody": 2,
|
||||
"carColor": "#ffffff",
|
||||
"startWashTime": "2025-01-19T14:03:00.000Z",
|
||||
"endWashTime": "2025-01-19T14:03:00.000Z",
|
||||
"location": "55.793833888711006,49.19037910644527 Республика Татарстан (Татарстан), Казань, жилой район Седьмое Небо",
|
||||
"orderNumber": "1",
|
||||
"status": "working",
|
||||
"notes": "",
|
||||
"created": "2025-01-19T14:04:02.985Z",
|
||||
"updated": "2025-01-19T14:04:02.987Z",
|
||||
"id": "id1"
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user