fix: add :id

Reviewed-on: #66
Reviewed-by: Primakov Alexandr Alexandrovich <primakovpro@gmail.com>

locales/en.json

@@ -24,6 +24,7 @@
   "dry-wash.order-create.form.car-body-field.label": "Car body type",
   "dry-wash.order-create.form.washing-datetime-field.label": "What time is the car available?",
   "dry-wash.order-create.form.washing-location-field.label": "Where is the car located?",
+  "dry-wash.order-create.form.washing-location-field.placeholder": "Enter the address or select on the map",
   "dry-wash.order-create.form.washing-location-field.help": "For example, 55.754364, 48.743295 Universitetskaya Street, 1, Innopolis, Verkhneuslonsky district, Republic of Tatarstan (Tatarstan), 420500",
   "dry-wash.order-create.car-body-select.placeholder": "Not specified",
   "dry-wash.order-create.car-body-select.options.sedan": "Sedan",
@@ -38,6 +39,16 @@
   "dry-wash.order-create.car-body-select.options.sports-car" : "Sports-car",
   "dry-wash.order-create.car-body-select.options.other": "Other",
   "dry-wash.order-create.form.submit-button.label": "Submit",
+  "dry-wash.order-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.details.title": "Order #{{number}}",
+  "dry-wash.order-view.details.owner": "Owner",
+  "dry-wash.order-view.details.car": "Car",
+  "dry-wash.order-view.details.location": "Where",
+  "dry-wash.order-view.details.datetime-range": "When",
+  "dry-wash.order-view.details.alert": "The operator will contact you about the payment at the specified phone number",
   "dry-wash.arm.master.add": "Add",
   "dry-wash.arm.order.title": "Orders",
   "dry-wash.arm.order.table.empty": "Table empty",
@@ -47,11 +58,13 @@
   "dry-wash.arm.order.status.pending": "Pending",
   "dry-wash.arm.order.status.working": "Working",
   "dry-wash.arm.order.status.canceled": "Canceled",
-  "dry-wash.arm.order.status.placeholder": "Select Status",
+  "dry-wash.arm.order.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.washingTime": "Washing Time",
   "dry-wash.arm.order.table.header.orderDate": "Order Date",
   "dry-wash.arm.order.table.header.status": "Status",
+  "dry-wash.arm.order.table.header.masters": "Master",
   "dry-wash.arm.order.table.header.telephone": "Telephone",
   "dry-wash.arm.order.table.header.location": "Location",
   "dry-wash.arm.master.title": "Masters",
@@ -62,6 +75,10 @@
   "dry-wash.arm.master.table.header.phone": "Phone",
   "dry-wash.arm.master.table.header.actions": "Actions",
   "dry-wash.arm.master.table.actionsMenu.delete": "Delete Master",
+  "dry-wash.arm.master.schedule.empty": "free",
+  "dry-wash.arm.master.editable.aria.cancel": "Undo changes",
+  "dry-wash.arm.master.editable.aria.save": "Save changes ",
+  "dry-wash.arm.master.editable.aria.edit": "Edit",
   "dry-wash.arm.master.drawer.title": "Add New Master",
   "dry-wash.arm.master.drawer.inputName.label": "Full Name",
   "dry-wash.arm.master.drawer.inputName.placeholder": "Enter Full Name",

locales/ru.json

@@ -7,10 +7,12 @@
   "dry-wash.arm.order.status.working": "В работе",
   "dry-wash.arm.order.status.canceled": "Отменено",
   "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.washingTime": "Время мойки",
   "dry-wash.arm.order.table.header.orderDate": "Дата заказа",
   "dry-wash.arm.order.table.header.status": "Статус",
+  "dry-wash.arm.order.table.header.masters": "Мастер",
   "dry-wash.arm.order.table.header.telephone": "Телефон",
   "dry-wash.arm.order.table.header.location": "Расположение",
   "dry-wash.arm.order.table.empty": "Список пуст",
@@ -23,6 +25,10 @@
   "dry-wash.arm.master.table.header.phone": "Телефон",
   "dry-wash.arm.master.table.header.actions": "Действия",
   "dry-wash.arm.master.table.actionsMenu.delete": "Удалить мастера",
+  "dry-wash.arm.master.schedule.empty": "Свободен",
+  "dry-wash.arm.master.editable.aria.cancel": "Отменить изменения",
+  "dry-wash.arm.master.editable.aria.save": "Сохранить изменения",
+  "dry-wash.arm.master.editable.aria.edit": "Редактировать",
   "dry-wash.arm.master.drawer.title": "Добавить нового мастера",
   "dry-wash.arm.master.drawer.inputName.label": "ФИО",
   "dry-wash.arm.master.drawer.inputName.placeholder": "Введите ФИО",
@@ -58,20 +64,31 @@
   "dry-wash.order-create.form.car-body-field.label": "Тип кузова автомобиля",
   "dry-wash.order-create.form.washing-datetime-field.label": "В какое время автомобиль доступен?",
   "dry-wash.order-create.form.washing-location-field.label": "Где находится автомобиль?",
+  "dry-wash.order-create.form.washing-location-field.placeholder": "Введите адрес или выберите на карте",
   "dry-wash.order-create.form.washing-location-field.help": "Например, 55.754364, 48.743295 Университетская улица, 1, Иннополис, Верхнеуслонский район, Республика Татарстан (Татарстан), 420500",
   "dry-wash.order-create.car-body-select.placeholder": "Не указан",
   "dry-wash.order-create.car-body-select.options.sedan": "Седан",
-  "dry-wash.order-create.car-body-select.options.hatchback" : "Хэтчбек",
+  "dry-wash.order-create.car-body-select.options.hatchback": "Хэтчбек",
-  "dry-wash.order-create.car-body-select.options.crossover" : "Кроссовер",
+  "dry-wash.order-create.car-body-select.options.crossover": "Кроссовер",
-  "dry-wash.order-create.car-body-select.options.suv" : "Внедорожник",
+  "dry-wash.order-create.car-body-select.options.suv": "Внедорожник",
-  "dry-wash.order-create.car-body-select.options.station-wagon" : "Универсал",
+  "dry-wash.order-create.car-body-select.options.station-wagon": "Универсал",
-  "dry-wash.order-create.car-body-select.options.coupe" : "Купе",
+  "dry-wash.order-create.car-body-select.options.coupe": "Купе",
-  "dry-wash.order-create.car-body-select.options.minivan" : "Минивэн",
+  "dry-wash.order-create.car-body-select.options.minivan": "Минивэн",
-  "dry-wash.order-create.car-body-select.options.pickup" : "Пикап",
+  "dry-wash.order-create.car-body-select.options.pickup": "Пикап",
-  "dry-wash.order-create.car-body-select.options.liftback" : "Лифтбек",
+  "dry-wash.order-create.car-body-select.options.liftback": "Лифтбек",
-  "dry-wash.order-create.car-body-select.options.sports-car" : "Спорткар",
+  "dry-wash.order-create.car-body-select.options.sports-car": "Спорткар",
   "dry-wash.order-create.car-body-select.options.other": "Другой",
   "dry-wash.order-create.form.submit-button.label": "Отправить",
+  "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.details.title": "Заказ №{{number}}",
+  "dry-wash.order-view.details.owner": "Владелец",
+  "dry-wash.order-view.details.car": "Автомобиль",
+  "dry-wash.order-view.details.location": "Где",
+  "dry-wash.order-view.details.datetime-range": "Когда",
+  "dry-wash.order-view.details.alert": "С вами свяжется оператор насчет оплаты по указанному номеру телефона",
   "dry-wash.notFound.title": "Страница не найдена",
   "dry-wash.notFound.description": "К сожалению, запрашиваемая вами страница не существует.",
   "dry-wash.notFound.button.back": "Вернуться на главную",
@@ -79,4 +96,4 @@
   "dry-wash.errorBoundary.description": "Мы уже работаем над исправлением проблемы",
   "dry-wash.errorBoundary.button.reload": "Перезагрузить страницу",
   "dry-wash.washTime.timeSlot": "{{start}} - {{end}}"
-}
+}

package.json

@@ -1,6 +1,6 @@
 {
     "name": "dry-wash",
-    "version": "0.2.0",
+    "version": "0.5.0",
     "description": "<a id=\"readme-top\"></a>",
     "main": "./src/index.tsx",
     "scripts": {
@@ -19,16 +19,18 @@
     "dependencies": {
         "@brojs/cli": "^1.6.3",
         "@chakra-ui/icons": "^2.2.4",
-        "@chakra-ui/react": "^2.4.2",
+        "@chakra-ui/react": "^2.10.5",
         "@emotion/react": "^11.4.1",
         "@emotion/styled": "^11.3.0",
         "@fontsource/open-sans": "^5.1.0",
         "@lottiefiles/react-lottie-player": "^3.5.4",
+        "@pbe/react-yandex-maps": "^1.2.5",
         "@types/react": "^18.3.12",
         "dayjs": "^1.11.13",
         "express": "^4.21.1",
         "framer-motion": "^6.2.8",
         "i18next": "^23.16.4",
+        "keycloak-js": "^23.0.7",
         "react": "^18.3.1",
         "react-dom": "^18.3.1",
         "react-hook-form": "^7.53.2",

src/api/arm.ts

@@ -1,4 +1,5 @@
 import { getConfigValue } from '@brojs/cli';
+import dayjs from 'dayjs';
 
 enum ArmEndpoints {
   ORDERS = '/arm/orders',
@@ -9,12 +10,15 @@ const armService = () => {
   const endpoint = getConfigValue('dry-wash.api');
 
   const fetchOrders = async ({ date }: { date: Date }) => {
+    const startDate = dayjs(date).startOf('day').toISOString();
+    const endDate = dayjs(date).endOf('day').toISOString();
+
     const response = await fetch(`${endpoint}${ArmEndpoints.ORDERS}`, {
       method: 'POST',
       headers: {
         'Content-Type': 'application/json',
       },
-      body: JSON.stringify({ date }),
+      body: JSON.stringify({ startDate, endDate }),
     });
 
     if (!response.ok) {
@@ -34,7 +38,102 @@ const armService = () => {
     return await response.json();
   };
 
-  return { fetchOrders, fetchMasters };
+  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 updateOrders = async ({
+    id,
+    status,
+    notes,
+    masterId,
+  }: {
+    id: string;
+    status?: string;
+    notes?: string;
+    masterId?: string;
+  }) => {
+    const body = JSON.stringify({ status, notes, masterId });
+
+    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();
+  };
+
+  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,
+    updateOrders,
+  };
 };
 
 export { armService, ArmEndpoints };

src/api/index.ts

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

src/api/landing.tsx

@@ -0,0 +1,107 @@
+import { getConfigValue } from '@brojs/cli';
+import { useEffect, useState } from 'react';
+
+import { CreateOrder, GetOrder } from '../models/api';
+
+import { QueryState, Trigger } from './types';
+
+enum LandingEndpoints {
+  ORDER = '/order',
+  ORDER_CREATE = '/order/create',
+}
+
+const endpoint = getConfigValue('dry-wash.api');
+
+const useCreateOrderMutation = <D extends CreateOrder.Response>(): [
+  Trigger<CreateOrder.Params, QueryState<D>['data']>,
+  QueryState<D>,
+] => {
+  const [isLoading, setIsLoading] = useState<QueryState<D>['isLoading']>(false);
+  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']>();
+
+  const createOrder = async ({ body }: CreateOrder.Params) => {
+    setIsLoading(true);
+
+    try {
+      const response = await fetch(
+        `${endpoint}${LandingEndpoints.ORDER_CREATE}`,
+        {
+          method: 'POST',
+          headers: {
+            'Content-Type': 'application/json',
+          },
+          body: JSON.stringify(body),
+        },
+      );
+
+      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);
+
+      return dataResponseObject;
+    } catch (error) {
+      setIsError(true);
+      setError(error);
+      throw error;
+    } finally {
+      setIsLoading(false);
+    }
+  };
+
+  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 };

src/api/types.ts

@@ -0,0 +1,22 @@
+export type QueryData<D> = {
+  success: true;
+  body: D;
+};
+
+export type QueryErrorData = {
+  success: false;
+  error: string;
+};
+
+export type QueryState<D> = {
+  isLoading: boolean;
+  isSuccess: boolean;
+  data: QueryData<D>;
+  isError: boolean;
+  error: {
+    status: number;
+    data: QueryErrorData;
+  };
+};
+
+export type Trigger<P, D> = (params: P) => Promise<D>;

src/assets/images/car-body-type/index.ts

@@ -0,0 +1,10 @@
+export { default as CoupeImg } from './coupe.webp';
+export { default as CrossoverImg } from './crossover.webp';
+export { default as HatchbackImg } from './hatchback.webp';
+export { default as LiftbackImg } from './liftback.webp';
+export { default as MinivanImg } from './minivan.webp';
+export { default as PickupImg } from './pickup.webp';
+export { default as SedanImg } from './sedan.webp';
+export { default as SportsCarImg } from './sports-car.webp';
+export { default as StationWagonImg } from './station-wagon.webp';
+export { default as SuvImg } from './suv.webp';

src/assets/images/index.ts

@@ -1 +1,2 @@
+export * from './car-body-type';
 export { default as DemoVideoPosterImg } from './demo-video-poster.webp';

src/components/Editable/Editable.tsx

@@ -0,0 +1,119 @@
+import React, { useState } from 'react';
+import {
+  Editable,
+  EditableInput,
+  EditablePreview,
+  Flex,
+  IconButton,
+  Input,
+  useEditableControls,
+  ButtonGroup,
+  Stack,
+  useToast,
+} from '@chakra-ui/react';
+import { CheckIcon, CloseIcon, EditIcon } from '@chakra-ui/icons';
+import { useTranslation } from 'react-i18next';
+
+interface EditableWrapperProps {
+  value: string;
+  onSubmit: ({
+    id,
+    name,
+    phone,
+  }: {
+    id: string;
+    name?: string;
+    phone?: string;
+  }) => Promise<unknown>;
+  as: 'phone' | 'name';
+  id: string;
+}
+
+const EditableWrapper = ({ value, onSubmit, as, id }: EditableWrapperProps) => {
+  const { t } = useTranslation('~', {
+    keyPrefix: 'dry-wash.arm.master.editable',
+  });
+
+  const toast = useToast();
+  const [currentValue, setCurrentValue] = useState<string>(value);
+
+  const handleSubmit = async (newValue: string) => {
+    if (currentValue === newValue) return;
+
+    try {
+      await onSubmit({ id, [as]: newValue });
+
+      setCurrentValue(newValue);
+
+      toast({
+        title: 'Успешно!',
+        description: 'Данные обновлены.',
+        status: 'success',
+        duration: 2000,
+        isClosable: true,
+        position: 'top-right',
+      });
+    } catch (error) {
+      toast({
+        title: 'Ошибка!',
+        description: 'Не удалось обновить данные.',
+        status: 'error',
+        duration: 2000,
+        isClosable: true,
+        position: 'top-right',
+      });
+      console.error('Ошибка при обновлении данных:', error);
+    }
+  };
+
+  function EditableControls() {
+    const {
+      isEditing,
+      getSubmitButtonProps,
+      getCancelButtonProps,
+      getEditButtonProps,
+    } = useEditableControls();
+
+    return isEditing ? (
+      <ButtonGroup justifyContent='center' size='sm'>
+        <IconButton
+          aria-label={t('aria.save')}
+          icon={<CheckIcon />}
+          {...getSubmitButtonProps()}
+        />
+        <IconButton
+          aria-label={t('aria.cancel')}
+          icon={<CloseIcon />}
+          {...getCancelButtonProps()}
+        />
+      </ButtonGroup>
+    ) : (
+      <Flex justifyContent='center'>
+        <IconButton
+          aria-label={t('aria.edit')}
+          size='sm'
+          icon={<EditIcon />}
+          {...getEditButtonProps()}
+        />
+      </Flex>
+    );
+  }
+
+  return (
+    <Editable
+      textAlign='center'
+      defaultValue={currentValue}
+      fontSize='2xl'
+      isPreviewFocusable={false}
+      onSubmit={handleSubmit}
+    >
+      <Stack direction={['column', 'row']} spacing='15px'>
+        <EditablePreview />
+        <Input as={EditableInput} />
+        <EditableControls />
+      </Stack>
+    </Editable>
+  );
+};
+
+export default EditableWrapper;

src/components/MasterActionsMenu/MasterActionsMenu.tsx

@@ -5,20 +5,54 @@ import {
   MenuList,
   MenuItem,
   IconButton,
+  useToast,
 } from '@chakra-ui/react';
 import { EditIcon } from '@chakra-ui/icons';
 import { useTranslation } from 'react-i18next';
 
-const MasterActionsMenu = () => {
+import { armService } from '../../api/arm';
+
+interface MasterActionsMenu {
+  id: string;
+}
+
+const MasterActionsMenu = ({ id }: MasterActionsMenu) => {
   const { t } = useTranslation('~', {
     keyPrefix: 'dry-wash.arm.master.table.actionsMenu',
   });
 
+  const { deleteMaster } = armService();
+  const toast = useToast();
+
+  const handleClickDelete = async () => {
+    try {
+      await deleteMaster({ id });
+      toast({
+        title: 'Мастер удалён.',
+        description: `Мастер с ID "${id}" успешно удалён.`,
+        status: 'success',
+        duration: 5000,
+        isClosable: true,
+        position: 'top-right',
+      });
+    } catch (error) {
+      toast({
+        title: 'Ошибка удаления мастера.',
+        description: 'Не удалось удалить мастера. Попробуйте ещё раз.',
+        status: 'error',
+        duration: 5000,
+        isClosable: true,
+        position: 'top-right',
+      });
+      console.error(error);
+    }
+  };
+
   return (
     <Menu>
       <MenuButton icon={<EditIcon />} as={IconButton} variant='outline' />
       <MenuList>
-        <MenuItem>{t('delete')}</MenuItem>
+        <MenuItem onClick={handleClickDelete}>{t('delete')}</MenuItem>
       </MenuList>
     </Menu>
   );

src/components/MasterDrawer/MasterDrawer.tsx

@@ -11,15 +11,48 @@ import {
   DrawerFooter,
   DrawerHeader,
   DrawerOverlay,
+  useToast,
+  InputGroup,
+  InputLeftElement,
 } from '@chakra-ui/react';
 import { useTranslation } from 'react-i18next';
+import { PhoneIcon } from '@chakra-ui/icons';
+
+import { armService } from '../../api/arm';
 
 const MasterDrawer = ({ isOpen, onClose }) => {
+  const { addMaster } = armService();
+  const toast = useToast();
+
   const [newMaster, setNewMaster] = useState({ name: '', phone: '' });
 
-  const handleSave = () => {
+  const handleSave = async () => {
-    console.log(`Сохранение мастера: ${newMaster}`);
+    if (newMaster.name.trim() === '' || newMaster.phone.trim() === '') {
-    onClose();
+      return;
+    }
+
+    try {
+      await addMaster(newMaster);
+      toast({
+        title: 'Мастер создан.',
+        description: `Мастер "${newMaster.name}" успешно добавлен.`,
+        status: 'success',
+        duration: 5000,
+        isClosable: true,
+        position: 'top-right',
+      });
+      onClose();
+    } catch (error) {
+      toast({
+        title: 'Ошибка при создании мастера.',
+        description: 'Не удалось добавить мастера. Попробуйте еще раз.',
+        status: 'error',
+        duration: 5000,
+        isClosable: true,
+        position: 'top-right',
+      });
+      console.error(error);
+    }
   };
 
   const { t } = useTranslation('~', {
@@ -36,6 +69,7 @@ const MasterDrawer = ({ isOpen, onClose }) => {
           <FormControl mb='4'>
             <FormLabel>{t('inputName.label')}</FormLabel>
             <Input
+              // isInvalid
               value={newMaster.name}
               onChange={(e) =>
                 setNewMaster({ ...newMaster, name: e.target.value })
@@ -44,14 +78,21 @@ const MasterDrawer = ({ isOpen, onClose }) => {
             />
           </FormControl>
           <FormControl>
-            <FormLabel> {t('inputPhone.label')}</FormLabel>
+            <FormLabel>{t('inputPhone.label')}</FormLabel>
-            <Input
+
-              value={newMaster.phone}
+            <InputGroup>
-              onChange={(e) =>
+              <InputLeftElement pointerEvents='none'>
-                setNewMaster({ ...newMaster, phone: e.target.value })
+                <PhoneIcon color='gray.300' />
-              }
+              </InputLeftElement>
-              placeholder={t('inputPhone.placeholder')}
+              <Input
-            />
+                // isInvalid
+                value={newMaster.phone}
+                onChange={(e) =>
+                  setNewMaster({ ...newMaster, phone: e.target.value })
+                }
+                placeholder={t('inputPhone.placeholder')}
+              />
+            </InputGroup>
           </FormControl>
         </DrawerBody>
         <DrawerFooter>

src/components/MasterItem/MasterItem.tsx

@@ -1,8 +1,11 @@
 import React from 'react';
-import { Badge, Link, Stack, Td, Tr } from '@chakra-ui/react';
+import { Badge, Stack, Td, Tr, Text } from '@chakra-ui/react';
+import { useTranslation } from 'react-i18next';
 
 import MasterActionsMenu from '../MasterActionsMenu';
-import { getTimeSlot } from '../../lib/date-helpers';
+import { getTimeSlot } from '../../lib';
+import EditableWrapper from '../Editable/Editable';
+import { armService } from '../../api/arm';
 
 export interface Schedule {
   id: string;
@@ -13,28 +16,49 @@ export interface Schedule {
 export type MasterProps = {
   id: string;
   name: string;
-  schedule: Schedule[];
   phone: string;
+  schedule: Schedule[];
 };
 
-const MasterItem = ({ name, schedule, phone }) => {
+const MasterItem = ({ name, phone, id, schedule }) => {
+  const { updateMaster } = armService();
+  const { t } = useTranslation('~', {
+    keyPrefix: 'dry-wash.arm.master',
+  });
+
   return (
     <Tr>
-      <Td>{name}</Td>
       <Td>
-        <Stack direction='row'>
+        <EditableWrapper
-          {schedule.map(({ startWashTime, endWashTime }, index) => (
+          id={id}
-            <Badge colorScheme={'green'} key={index}>
+          as={'name'}
-              {getTimeSlot(startWashTime, endWashTime)}
+          value={name}
-            </Badge>
+          onSubmit={updateMaster}
-          ))}
+        />
-        </Stack>
       </Td>
       <Td>
-        <Link href='tel:'>{phone}</Link>
+        {schedule?.length > 0 ? (
+          <Stack direction='row'>
+            {schedule?.map(({ startWashTime, endWashTime }, index: number) => (
+              <Badge colorScheme={'green'} key={index}>
+                {getTimeSlot(startWashTime, endWashTime)}
+              </Badge>
+            ))}
+          </Stack>
+        ) : (
+          <Text color='gray.500'>{t('schedule.empty')}</Text>
+        )}
       </Td>
       <Td>
-        <MasterActionsMenu />
+        <EditableWrapper
+          id={id}
+          as={'phone'}
+          value={phone}
+          onSubmit={updateMaster}
+        />
+      </Td>
+      <Td>
+        <MasterActionsMenu id={id} />
       </Td>
     </Tr>
   );

src/components/OrderItem/OrderItem.tsx

@@ -1,9 +1,11 @@
-import React, { useState } from 'react';
+import React, { ChangeEvent, useState } from 'react';
 import { Td, Tr, Link, Select } from '@chakra-ui/react';
 import { useTranslation } from 'react-i18next';
 import dayjs from 'dayjs';
 
-import { getTimeSlot } from '../../lib/date-helpers';
+import { MasterProps } from '../MasterItem/MasterItem';
+import { getTimeSlot } from '../../lib';
+import { armService } from '../../api/arm';
 
 const statuses = [
   'pending' as const,
@@ -24,6 +26,20 @@ export type OrderProps = {
   status?: GetArrItemType<typeof statuses>;
   phone?: string;
   location?: string;
+  master: MasterProps;
+  notes: '';
+  allMasters: MasterProps[];
+  id: string;
+};
+
+type Status = (typeof statuses)[number];
+
+const statusColors: Record<Status, string> = {
+  pending: 'yellow.100',
+  progress: 'blue.100',
+  working: 'orange.100',
+  canceled: 'red.100',
+  complete: 'green.100',
 };
 
 const OrderItem = ({
@@ -34,23 +50,53 @@ const OrderItem = ({
   status,
   phone,
   location,
+  master,
+  allMasters,
+  id,
 }: OrderProps) => {
+  const { updateOrders } = armService();
+
   const { t } = useTranslation('~', {
     keyPrefix: 'dry-wash.arm.order',
   });
 
   const [statusSelect, setStatus] = useState(status);
+  const bgColor = statusColors[statusSelect];
+  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, masterId: selectedMaster.id });
+    } else {
+      console.error('Master not found');
+    }
+  };
+
+  const handeChangeStatus = (e: ChangeEvent<HTMLSelectElement>) => {
+    const status = e.target.value;
+    updateOrders({ id, status });
+    setStatus(e.target.value as OrderProps['status']);
+  };
 
   return (
     <Tr>
       <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>
         <Select
           value={statusSelect}
-          onChange={(e) => setStatus(e.target.value as OrderProps['status'])}
+          onChange={handeChangeStatus}
           placeholder={t(`status.placeholder`)}
+          bg={bgColor}
         >
           {statuses.map((status) => (
             <option key={status} value={status}>
@@ -59,6 +105,19 @@ const OrderItem = ({
           ))}
         </Select>
       </Td>
+      <Td>
+        <Select
+          value={masterSelect}
+          onChange={handelChangeMasters}
+          placeholder={t(`master.placeholder`)}
+        >
+          {allMasters.map((item) => (
+            <option key={item.id} value={item.name}>
+              {item.name}
+            </option>
+          ))}
+        </Select>
+      </Td>
       <Td>
         <Link href='tel:'>{phone}</Link>
       </Td>

src/components/Orders/Orders.tsx

@@ -19,12 +19,13 @@ import OrderItem from '../OrderItem';
 import { OrderProps } from '../OrderItem/OrderItem';
 import { armService } from '../../api/arm';
 import DateNavigator from '../DateNavigator';
+import { MasterProps } from '../MasterItem/MasterItem';
 
 const TABLE_HEADERS = [
   'carNumber' as const,
-  'washingTime' as const,
   'orderDate' as const,
   'status' as const,
+  'masters' as const,
   'telephone' as const,
   'location' as const,
 ];
@@ -35,21 +36,29 @@ const Orders = () => {
   });
 
   const { fetchOrders } = armService();
+  const { fetchMasters } = armService();
 
   const toast = useToast();
 
   const [orders, setOrders] = useState<OrderProps[]>([]);
+  const [allMasters, setAllMasters] = useState<MasterProps[]>([]);
   const [loading, setLoading] = useState(false);
   const [error, setError] = useState<string | null>(null);
   const [currentDate, setCurrentDate] = useState(new Date());
 
   useEffect(() => {
-    const loadOrders = async () => {
+    const loadData = async () => {
       setLoading(true);
+      setError(null);
 
       try {
-        const data = await fetchOrders({ date: currentDate });
+        const [ordersData, mastersData] = await Promise.all([
-        setOrders(data.body);
+          fetchOrders({ date: currentDate }),
+          fetchMasters(),
+        ]);
+
+        setOrders(ordersData.body);
+        setAllMasters(mastersData.body);
       } catch (err) {
         setError(err.message);
         toast({
@@ -64,8 +73,8 @@ const Orders = () => {
       }
     };
 
-    loadOrders();
+    loadData();
-  }, [toast, t, currentDate]);
+  }, [currentDate, toast, t]);
 
   return (
     <Box p='8'>
@@ -112,6 +121,7 @@ const Orders = () => {
             !error &&
             orders.map((order, index) => (
               <OrderItem
+                allMasters={allMasters}
                 key={index}
                 {...order}
                 status={order.status as OrderProps['status']}

src/components/order-form/form/car-body/car-body-select.tsx

@@ -1,23 +1,94 @@
-import React, { forwardRef } from 'react';
+import React, { forwardRef, useState } from 'react';
-import { Select, SelectProps } from '@chakra-ui/react';
+import {
+  Input,
+  Image,
+  InputProps,
+  Box,
+  Popover,
+  PopoverAnchor,
+  PopoverContent,
+  PopoverBody,
+  List,
+  ListItem,
+} from '@chakra-ui/react';
 import { useTranslation } from 'react-i18next';
 
 import { carBodySelectOptions } from './helper';
+import { CarBodySelectOption } from './types';
 
-export const CarBodySelect = forwardRef<HTMLSelectElement, SelectProps>(
+export const CarBodySelect = forwardRef<HTMLInputElement, InputProps>(
   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);
+      // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+      // @ts-ignore
+      props.onChange(option.value);
+    };
+
+    const [isDropdownOpen, setIsDropdownOpen] = useState<boolean>(false);
+
     const { t } = useTranslation('~', {
       keyPrefix: 'dry-wash.order-create.car-body-select',
     });
 
     return (
-      <Select ref={ref} placeholder={t('placeholder')} {...props}>
+      <Box width='100%'>
-        {carBodySelectOptions.map(({ value, labelTKey }, i) => (
+        <Popover
-          <option key={i} value={value}>
+          isOpen={isDropdownOpen}
-            {t(`options.${labelTKey}`)}
+          autoFocus={false}
-          </option>
+          placement='bottom-start'
-        ))}
+          matchWidth
-      </Select>
+        >
+          <PopoverAnchor>
+            <Input
+              {...props}
+              ref={ref}
+              value={
+                selected?.labelTKey
+                  ? t(`options.${selected.labelTKey}`)
+                  : undefined
+              }
+              readOnly
+              onClick={() => setIsDropdownOpen(true)}
+              onBlur={() => setIsDropdownOpen(false)}
+              placeholder={t('placeholder')}
+            />
+          </PopoverAnchor>
+          <PopoverContent width='100%' maxWidth='100%'>
+            <PopoverBody border='1px' borderColor='gray.300' p={0}>
+              <List
+                display='grid'
+                gridTemplateColumns='repeat(auto-fit, minmax(150px, 1fr))'
+              >
+                {carBodySelectOptions.map((option) => (
+                  <ListItem
+                    key={option.value}
+                    display='flex'
+                    flexDirection='column'
+                    justifyContent='flex-end'
+                    alignItems='center'
+                    p={2}
+                    cursor='pointer'
+                    _hover={{
+                      bgColor: 'primary.50',
+                    }}
+                    _active={{
+                      bgColor: 'primary.100',
+                    }}
+                    onClick={() => handleOptionClick(option)}
+                  >
+                    <Image src={option.img} />
+                    {t(`options.${option.labelTKey}`)}
+                  </ListItem>
+                ))}
+              </List>
+            </PopoverBody>
+          </PopoverContent>
+        </Popover>
+      </Box>
     );
   },
 );

src/components/order-form/form/car-body/helper.ts

@@ -1,3 +1,15 @@
+import {
+  CoupeImg,
+  CrossoverImg,
+  HatchbackImg,
+  LiftbackImg,
+  MinivanImg,
+  PickupImg,
+  SedanImg,
+  SportsCarImg,
+  StationWagonImg,
+  SuvImg
+} from "../../../../assets/images";
 import { Car } from "../../../../models/landing";
 
 import { CarBodySelectOption } from "./types";
@@ -5,43 +17,53 @@ import { CarBodySelectOption } from "./types";
 export const carBodySelectOptions: CarBodySelectOption[] = [
   {
     value: Car.BodyStyle.SEDAN,
-    labelTKey: 'sedan'
+    labelTKey: 'sedan',
+    img: SedanImg
   },
   {
     value: Car.BodyStyle.HATCHBACK,
-    labelTKey: 'hatchback'
+    labelTKey: 'hatchback',
+    img: HatchbackImg
   },
   {
     value: Car.BodyStyle.CROSSOVER,
-    labelTKey: 'crossover'
+    labelTKey: 'crossover',
+    img: CrossoverImg
   },
   {
     value: Car.BodyStyle.SUV,
-    labelTKey: 'suv'
+    labelTKey: 'suv',
+    img: SuvImg
   },
   {
     value: Car.BodyStyle.STATION_WAGON,
-    labelTKey: 'station-wagon'
+    labelTKey: 'station-wagon',
+    img: StationWagonImg
   },
   {
     value: Car.BodyStyle.COUPE,
-    labelTKey: 'coupe'
+    labelTKey: 'coupe',
+    img: CoupeImg
   },
   {
     value: Car.BodyStyle.MINIVAN,
-    labelTKey: 'minivan'
+    labelTKey: 'minivan',
+    img: MinivanImg
   },
   {
     value: Car.BodyStyle.PICKUP,
-    labelTKey: 'pickup'
+    labelTKey: 'pickup',
+    img: PickupImg
   },
   {
     value: Car.BodyStyle.LIFTBACK,
-    labelTKey: 'liftback'
+    labelTKey: 'liftback',
+    img: LiftbackImg
   },
   {
     value: Car.BodyStyle.SPORTS_CAR,
-    labelTKey: 'sports-car'
+    labelTKey: 'sports-car',
+    img: SportsCarImg
   },
   {
     value: Car.BodyStyle.OTHER,

src/components/order-form/form/car-body/types.ts

@@ -14,4 +14,5 @@ export type CarBodySelectOption = {
   'liftback' |
   'sports-car' |
   'other';
+  img?: string;
 };

src/components/order-form/form/car-number/car-number-input.tsx

@@ -15,7 +15,7 @@ export const CarNumberInput = forwardRef<HTMLInputElement, InputProps>(
           // @ts-ignore
           onChange?.(formattedValue);
         }}
-        maxLength={8}
+        maxLength={12}
       />
     );
   },

src/components/order-form/form/car-number/helper.ts

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

src/components/order-form/form/helper.ts

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

src/components/order-form/form/index.ts

@@ -1 +1,2 @@
+export type { OrderFormValues, OrderFormProps } from './types';
 export { OrderForm } from './order-form';

src/components/order-form/form/location/helper.ts

@@ -0,0 +1,15 @@
+import { Location, StringCoordinates, StringLocation } from "./types";
+
+export const splitLocation = (stringifiedLocation: StringLocation) => {
+  return stringifiedLocation.replace(' ', '~').split('~');
+};
+
+export const stringifyLocation = (location: Location): StringLocation => {
+  const { coordinates, address } = location;
+  const [latitude, longitude] = coordinates;
+  const coordinatesString = `${latitude},${longitude}` satisfies StringCoordinates;
+  return `${coordinatesString} ${address}`;
+};
+
+const locationRe = new RegExp(/^[-0-9]+.[0-9]+,[-0-9]+.[0-9]+ .*/);
+export const isValidLocation = (value: string): value is StringLocation => locationRe.test(value);

src/components/order-form/form/location/index.ts

@@ -0,0 +1,4 @@
+export type { StringLocation } from './types';
+export * from './location-input';
+export * from './map';
+export * from './ymaps';

src/components/order-form/form/location/location-input/helper.ts

@@ -0,0 +1,40 @@
+import { YMapsApi } from "@pbe/react-yandex-maps/typings/util/typing";
+
+import { Address, Location, StringLocation } from "../types";
+import { splitLocation, stringifyLocation } from "../helper";
+
+export const formatLocation = (location: Location | undefined): StringLocation | '' => {
+  if (!location) {
+    return '';
+  }
+  return stringifyLocation(location);
+};
+
+const coordinatesRe = new RegExp(/^[-0-9]+.[0-9]+,[-0-9]+.[0-9]+/);
+export const extractAddress = (value: string) => value.replace(coordinatesRe, '').trim();
+
+export const getLocationByAddress = async (ymaps: YMapsApi, address: Address): Promise<Location> => {
+  try {
+    const result = await ymaps.geocode(address);
+    const firstGeoObject = result.geoObjects.get(
+      0,
+    ) as unknown as ymaps.IGeoObject<ymaps.IBasePointGeometry>;
+    const [latitude, longitude] = firstGeoObject.geometry.getCoordinates();
+    return { coordinates: [latitude, longitude], address };    
+  } catch (error) {
+    console.error(error);    
+  }
+};
+
+export const isRealLocation = async (ymaps: YMapsApi, stringifiedLocation: StringLocation) => {
+  const [coordinates, address] = splitLocation(stringifiedLocation);
+  try {
+    const result = await ymaps.geocode(coordinates);
+    const firstGeoObject = result.geoObjects.get(0) as ymaps.GeocodeResult;
+    const addressByCoordinates = firstGeoObject.getAddressLine();
+  
+    return address === addressByCoordinates;
+  } catch (error) {
+    console.error(error);
+  }
+};

src/components/order-form/form/location/location-input/index.ts

@@ -0,0 +1 @@
+export { LocationInput } from './location-input';

src/components/order-form/form/location/location-input/location-input.tsx

@@ -0,0 +1,144 @@
+import React, { forwardRef, memo, useEffect, useState } from 'react';
+import {
+  Input,
+  Box,
+  InputProps,
+  PopoverAnchor,
+  Popover,
+  PopoverContent,
+  PopoverBody,
+  List,
+  ListItem,
+} from '@chakra-ui/react';
+import { withYMaps } from '@pbe/react-yandex-maps';
+import { useTranslation } from 'react-i18next';
+
+import { Suggestion } from '../types';
+import { isValidLocation } from '../helper';
+
+import {
+  formatLocation,
+  getLocationByAddress,
+  isRealLocation,
+  extractAddress,
+} from './helper';
+import { LocationInputProps } from './types';
+
+export const LocationInput = memo(
+  withYMaps(
+    forwardRef<HTMLInputElement, LocationInputProps>(function LocationInput(
+      { ymaps, value, onChange, ...props },
+      ref,
+    ) {
+      const [inputValue, setInputValue] = useState<string>('');
+
+      useEffect(() => {
+        setInputValue(value);
+      }, [value]);
+
+      const [suggestions, setSuggestions] = useState<Suggestion[]>([]);
+      const [isSuggestionsPanelOpen, setIsSuggestionsPanelOpen] =
+        useState<boolean>(false);
+
+      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);
+          }
+        } else {
+          setSuggestions([]);
+        }
+
+        setIsSuggestionsPanelOpen(suggestions.length > 1);
+      };
+
+      const onFocus: InputProps['onFocus'] = () => {
+        setIsSuggestionsPanelOpen(suggestions.length > 1);
+      };
+
+      const onBlur: InputProps['onBlur'] = async (e) => {
+        const inputValue = e.target.value;
+        if (
+          isValidLocation(inputValue) &&
+          (await isRealLocation(ymaps, inputValue))
+        ) {
+          onChange(inputValue);
+        } else {
+          setInputValue(value);
+        }
+        setIsSuggestionsPanelOpen(false);
+      };
+
+      const handleSuggestionClick = async ({ value: address }: Suggestion) => {
+        try {
+          const location = await getLocationByAddress(ymaps, address);
+          const newValue = formatLocation(location);
+          setInputValue(newValue);
+          onChange(newValue);
+        } catch (error) {
+          console.error(error);          
+        }
+      };
+
+      const { t } = useTranslation('~', {
+        keyPrefix: 'dry-wash.order-create.form.washing-location-field',
+      });
+
+      return (
+        <Box width='100%'>
+          <Popover
+            isOpen={isSuggestionsPanelOpen}
+            autoFocus={false}
+            placement='bottom-start'
+          >
+            <PopoverAnchor>
+              <Input
+                {...props}
+                ref={ref}
+                onBlur={onBlur}
+                value={inputValue}
+                onChange={onInputChange}
+                onFocus={onFocus}
+                placeholder={t('placeholder')}
+              />
+            </PopoverAnchor>
+            <PopoverContent width='100%' maxWidth='100%'>
+              <PopoverBody border='1px' borderColor='gray.300' p={0}>
+                <List>
+                  {suggestions.map((suggestion, index) => (
+                    <ListItem
+                      key={index}
+                      p={2}
+                      cursor='pointer'
+                      _hover={{
+                        bgColor: 'primary.50',
+                      }}
+                      _active={{
+                        bgColor: 'primary.100',
+                      }}
+                      onClick={() => handleSuggestionClick(suggestion)}
+                    >
+                      {suggestion.displayName}
+                    </ListItem>
+                  ))}
+                </List>
+              </PopoverBody>
+            </PopoverContent>
+          </Popover>
+        </Box>
+      );
+    }),
+    true,
+    ['suggest', 'geocode'],
+  ),
+);
+
+// todo: i18n
+// todo: replace console.error with toast

src/components/order-form/form/location/location-input/types.ts

@@ -0,0 +1,8 @@
+import { YMapsApi } from "@pbe/react-yandex-maps/typings/util/typing";
+import { InputProps } from "@chakra-ui/react";
+
+export type LocationInputProps = InputProps & {
+  ymaps?: YMapsApi;
+  value?: string;
+  onChange?: (value: string) => void;
+};

src/components/order-form/form/location/map/helper.ts

@@ -0,0 +1,10 @@
+import { splitLocation } from "../helper";
+import { Coordinate, Location, StringLocation } from "../types";
+
+export const KAZAN_CITY_CENTER: Coordinate[] = [55.797557, 49.107295];
+
+export const parseLocation = (stringifiedLocation: StringLocation): Location => {
+  const [coordinatesStr, address] = splitLocation(stringifiedLocation);
+  const [latitude, longitude] = coordinatesStr.split(',').map(Number);
+  return { coordinates: [latitude, longitude], address };
+};

src/components/order-form/form/location/map/index.ts

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

src/components/order-form/form/location/map/map.tsx

@@ -0,0 +1,70 @@
+import React, { FC, memo, useEffect, useState } from 'react';
+import {
+  Map,
+  Placemark,
+  GeolocationControl,
+  ZoomControl,
+  withYMaps,
+} from '@pbe/react-yandex-maps';
+import { YMapsApi } from '@pbe/react-yandex-maps/typings/util/typing';
+
+import { Coordinate, StringLocation } from '../types';
+import { isValidLocation, stringifyLocation } from '../helper';
+
+import { KAZAN_CITY_CENTER, parseLocation } from './helper';
+
+export const MapComponent: FC<{
+  ymaps?: YMapsApi;
+  selectedLocation: StringLocation | null;
+  onMapClick: (props: StringLocation) => void;
+}> = memo(
+  withYMaps(
+    ({ ymaps, selectedLocation, onMapClick }) => {
+      const [mapCenter, setMapCenter] =
+        useState<Coordinate[]>(KAZAN_CITY_CENTER);
+
+      useEffect(() => {
+        if (isValidLocation(selectedLocation)) {
+          const location = parseLocation(selectedLocation);
+          const { coordinates } = location;
+          setMapCenter(coordinates);
+        }
+      }, [selectedLocation]);
+
+      return (
+        <Map
+          state={{
+            center: mapCenter,
+            zoom:
+              isValidLocation(selectedLocation) &&
+              parseLocation(selectedLocation)?.coordinates
+                ? 17
+                : 10,
+          }}
+          width='100%'
+          onClick={async (e: ymaps.MapEvent) => {
+            try {
+              const coordinates = e.get('coords');
+              const address = await ymaps.geocode(coordinates).then((res) => {
+                const firstGeoObject = res.geoObjects.get(
+                  0,
+                ) as ymaps.GeocodeResult;
+                return firstGeoObject.getAddressLine();
+              });
+              onMapClick(stringifyLocation({ coordinates, address }));
+              setMapCenter(coordinates);
+            } catch (error) {
+              console.error(error);
+            }
+          }}
+        >
+          <GeolocationControl options={{ float: 'left' }} />
+          <ZoomControl />
+          {selectedLocation && <Placemark geometry={mapCenter} />}
+        </Map>
+      );
+    },
+    true,
+    ['geocode'],
+  ),
+);

src/components/order-form/form/location/types.ts

@@ -0,0 +1,17 @@
+export type Address = string;
+
+export type Suggestion = {
+  value: Address;
+  displayName: string;
+};
+
+export type Coordinate = number;
+
+export type Location = {
+  address: Address;
+  coordinates: [Coordinate, Coordinate];
+};
+
+export type StringCoordinates = `${Coordinate},${Coordinate}`;
+
+export type StringLocation = `${StringCoordinates} ${Address}`;

src/components/order-form/form/location/ymaps/index.ts

@@ -0,0 +1 @@
+export { YMapsProvider } from './ymaps-provider';

src/components/order-form/form/location/ymaps/ymaps-provider.tsx

@@ -0,0 +1,16 @@
+import { YMaps } from '@pbe/react-yandex-maps';
+import React, { PropsWithChildren } from 'react';
+
+export const YMapsProvider = ({ children }: PropsWithChildren) => {
+  return (
+    <YMaps
+      query={{
+        lang: 'ru_RU',
+        apikey: '19cbc387-db9a-4807-a620-5205215db40f',
+        suggest_apikey: '3576e65e-5e75-4ea2-b21c-7f9db112682e',
+      }}
+    >
+      {children}
+    </YMaps>
+  );
+};

src/components/order-form/form/order-form.tsx

@@ -1,31 +1,31 @@
-import React, { FC } from 'react';
+import React from 'react';
 import { useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
-import {
+import { Box, Flex, FormControl, FormLabel, VStack } from '@chakra-ui/react';
-  Box,
-  Flex,
-  FormControl,
-  FormLabel,
-  Input,
-  VStack,
-} from '@chakra-ui/react';
 
 import { CarBodySelect } from './car-body';
 import { CarColorInput } from './car-color';
 import { CarNumberInput } from './car-number';
 import { FormInputField, FormControllerField } from './field';
-import { OrderFormValues } from './types';
+import { OrderFormProps, OrderFormValues } from './types';
 import { PhoneInput } from './phone';
 import { SubmitButton } from './submit';
-import { defaultValues, onSubmit, useGetValidationRules } from './helper';
+import { defaultValues, useGetValidationRules } from './helper';
 import { DateTimeInput } from './date-time';
+import {
+  LocationInput,
+  MapComponent,
+  StringLocation,
+  YMapsProvider,
+} from './location';
 
-export const OrderForm: FC = () => {
+export const OrderForm = ({ onSubmit, loading }: OrderFormProps) => {
   const {
     handleSubmit,
     control,
     formState: { errors, isSubmitting },
     watch,
+    setValue,
   } = useForm<OrderFormValues>({ defaultValues, shouldFocusError: true });
 
   const { t } = useTranslation('~', {
@@ -34,9 +34,10 @@ export const OrderForm: FC = () => {
 
   const RULES = useGetValidationRules();
 
-  const [availableDatetimeBegin, availableDatetimeEnd] = watch([
+  const [availableDatetimeBegin, availableDatetimeEnd, carLocation] = watch([
     'availableDatetimeBegin',
     'availableDatetimeEnd',
+    'carLocation',
   ]);
 
   return (
@@ -81,15 +82,6 @@ export const OrderForm: FC = () => {
           errors={errors}
           Input={CarBodySelect}
         />
-        <FormInputField
-          control={control}
-          name='carLocation'
-          label={t('washing-location-field.label')}
-          isRequired
-          errors={errors}
-          Input={Input}
-          help={t('washing-location-field.help')}
-        />
         <FormControl isRequired>
           <FormLabel>{t('washing-datetime-field.label')}</FormLabel>
           <Flex flexWrap='wrap' gap={4}>
@@ -119,12 +111,28 @@ export const OrderForm: FC = () => {
             </Box>
           </Flex>
         </FormControl>
-        <SubmitButton isLoading={isSubmitting} mt={4} />
+        <YMapsProvider>
+          <FormInputField
+            control={control}
+            name='carLocation'
+            label={t('washing-location-field.label')}
+            help={t('washing-location-field.help')}
+            isRequired
+            errors={errors}
+            Input={LocationInput}
+          />
+          <MapComponent
+            selectedLocation={carLocation as StringLocation}
+            onMapClick={(location) => {
+              setValue('carLocation', location);
+            }}
+          />
+        </YMapsProvider>
+        <SubmitButton isLoading={isSubmitting || loading} mt={4} />
       </VStack>
     </Box>
   );
 };
 
 // todo: remove layout shift, when a validation message is displayed
-// todo: select location using an interactive map
+// todo: fix time range available values
-// todo: fix time range available values

src/components/order-form/form/types.ts

@@ -1,3 +1,5 @@
+import { SubmitHandler } from "react-hook-form";
+
 export type OrderFormValues = {
   phone: string;
   carNumber: string;
@@ -6,4 +8,9 @@ export type OrderFormValues = {
   carLocation: string;
   availableDatetimeBegin: string;
   availableDatetimeEnd: string;
+};
+
+export type OrderFormProps = {
+  onSubmit: SubmitHandler<OrderFormValues>;
+  loading: boolean;
 };

src/components/order-view/details/index.ts

@@ -0,0 +1 @@
+export { OrderDetails } from './order-details';

src/components/order-view/details/order-details.tsx

@@ -0,0 +1,111 @@
+import React, { FC } from 'react';
+import {
+  Alert,
+  AlertIcon,
+  Heading,
+  HStack,
+  UnorderedList,
+  VStack,
+  ListItem,
+  Text,
+} from '@chakra-ui/react';
+import { useTranslation } from 'react-i18next';
+
+import { Order } from '../../../models/landing';
+import { formatDatetime } from '../../../lib';
+import { carBodySelectOptions } from '../../order-form/form/car-body/helper';
+
+import { OrderStatus } from './status';
+
+type OrderDetailsProps = Pick<
+  Order.View,
+  | 'id'
+  | 'status'
+  | 'phone'
+  | 'carNumber'
+  | 'carBody'
+  | 'carColor'
+  | 'location'
+  | 'startWashTime'
+  | 'endWashTime'
+  | 'created'
+>;
+
+export const OrderDetails: FC<OrderDetailsProps> = ({
+  id,
+  status,
+  phone,
+  carNumber,
+  carBody,
+  carColor,
+  location,
+  startWashTime,
+  endWashTime,
+}) => {
+  const { t } = useTranslation('~', {
+    keyPrefix: 'dry-wash.order-view.details',
+  });
+  const { t: tCarBody } = useTranslation('~', {
+    keyPrefix: 'dry-wash.order-create.car-body-select.options',
+  });
+
+  return (
+    <VStack p={4} alignItems='flex-start' gap={4}>
+      <HStack
+        width='full'
+        flexWrap='wrap'
+        justifyContent='space-between'
+        gap={2}
+      >
+        <Heading as='h2' size='lg'>
+          {t('title', { number: id })}
+        </Heading>
+        <OrderStatus value={status} />
+      </HStack>
+      <UnorderedList styleType='none'>
+        {[
+          {
+            label: t('owner'),
+            value: phone,
+          },
+          {
+            label: t('car'),
+            value: [
+              carNumber,
+              tCarBody(
+                `${carBodySelectOptions.find(({ value }) => value === carBody)?.labelTKey}`,
+              ),
+              carColor,
+            ]
+              .filter((v) => v)
+              .join(', '),
+          },
+          {
+            label: t('location'),
+            value: location,
+          },
+          {
+            label: t('datetime-range'),
+            value: [
+              formatDatetime(startWashTime),
+              formatDatetime(endWashTime),
+            ].join(' - '),
+          },
+        ].map(({ label, value }, i) => (
+          <ListItem key={i}>
+            {label}:{' '}
+            <Text as='span' color='primary.500' fontWeight='bold'>
+              {value}
+            </Text>
+          </ListItem>
+        ))}
+      </UnorderedList>
+      <Alert status='info' alignItems='flex-start'>
+        <AlertIcon />
+        {t('alert')}
+      </Alert>
+    </VStack>
+  );
+};
+
+// todo: add i18n for date & time

src/components/order-view/details/status/index.ts

@@ -0,0 +1 @@
+export { OrderStatus } from './order-status';

src/components/order-view/details/status/order-status.tsx

@@ -0,0 +1,49 @@
+import { Tag, TagProps } from '@chakra-ui/react';
+import React, { FC } from 'react';
+import { useTranslation } from 'react-i18next';
+import { TFunction } from 'i18next';
+
+import { Order } from '../../../../models/landing';
+
+const getPropsByStatus = (
+  status: Order.Status,
+  t: TFunction<'~', 'dry-wash.arm.order.status'>,
+): TagProps => {
+  switch (status) {
+    case 'canceled':
+      return {
+        colorScheme: 'red',
+        children: t('canceled'),
+      };
+    case 'progress':
+      return {
+        colorScheme: 'yellow',
+        children: t('progress'),
+      };
+    case 'pending':
+      return {
+        colorScheme: 'yellow',
+        children: t('pending'),
+      };
+    case 'working':
+      return {
+        colorScheme: 'yellow',
+        children: t('working'),
+      };
+    case 'complete':
+      return {
+        colorScheme: 'green',
+        children: t('complete'),
+      };
+  }
+};
+
+export const OrderStatus: FC<{ value: Order.Status }> = ({ value }) => {
+  const { t } = useTranslation('~', {
+    keyPrefix: 'dry-wash.arm.order.status',
+  });
+
+  const props = getPropsByStatus(value, t);
+
+  return <Tag variant='solid' {...props} />;
+};

src/components/order-view/index.ts

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

src/containers/LandingThemeProvider/LandingThemeProvider.tsx

@@ -1,14 +1,31 @@
-import React, { FC, PropsWithChildren } from 'react';
+import React, { ComponentType, FC, PropsWithChildren } from 'react';
 import { ChakraProvider } from '@chakra-ui/react';
 
 import { default as landingTheme } from './theme-config';
 import Fonts from './Fonts';
+import { toastOptions } from './toast-options';
 
 export const LandingThemeProvider: FC<PropsWithChildren> = ({ children }) => {
   return (
-    <ChakraProvider theme={landingTheme}>
+    <ChakraProvider theme={landingTheme} toastOptions={toastOptions}>
       <Fonts />
       {children}
     </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;
+}

src/containers/LandingThemeProvider/index.ts

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

src/containers/LandingThemeProvider/toast-options.ts

@@ -0,0 +1,8 @@
+import { ToastProviderProps } from "@chakra-ui/react";
+
+export const toastOptions: ToastProviderProps = {
+  defaultOptions: {
+    position: 'top-right',
+    isClosable: true,
+  }
+};

src/keycloak.ts

@@ -0,0 +1,34 @@
+import Keycloak from 'keycloak-js';
+
+const keycloak = new Keycloak({
+  url: 'https://kc.bro-js.ru',
+  realm: 'open',
+  clientId: 'dry-wash',
+});
+
+const authLogin = async ({ redirect }) => {
+  let user = null;
+
+  try {
+    const authenticated = await keycloak.init({ onLoad: 'login-required' });
+    if (authenticated) {
+      user = { ...(await keycloak.loadUserInfo()), ...keycloak.tokenParsed };
+
+      const isOperator =
+        user?.resource_access?.['dry-wash']?.roles.includes('operator');
+
+      if (!isOperator) {
+        redirect();
+      }
+
+      return user;
+    } else {
+      console.log('User is not authenticated');
+    }
+  } catch (error) {
+    keycloak.login();
+    console.error('Failed to initialize adapter:', error);
+  }
+};
+
+export default authLogin;

src/lib/date-helpers.ts

@@ -10,3 +10,7 @@ export const getTimeSlot = (start: string, end: string) => {
     end: endDay,
   });
 };
+
+export const formatDatetime = (datetime: string) => {
+  return dayjs(datetime).format('HH:mm DD.MM.YYYY');
+};

src/lib/index.ts

@@ -1 +1,2 @@
+export * from './date-helpers';
 export * from './types';

src/mocks/landing/index.ts

@@ -1,2 +1 @@
-export * as mockOrder from './order';
 export * as mockReview from './review';

src/mocks/landing/order.ts

@@ -1,7 +0,0 @@
-import { Order } from "../../models";
-
-export const orders: Order.View[] = [
-  { id: 'id1' },
-  { id: 'id2' },
-  { id: 'id3' },
-];

src/models/api/index.ts

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

src/models/api/order.ts

@@ -0,0 +1,18 @@
+/* eslint-disable @typescript-eslint/no-namespace */
+import { Order } from "../landing";
+
+export namespace CreateOrder {
+  export type Response = {
+    id: Order.Id
+  };
+  export type Params = {
+    body: Order.Create
+  };
+};
+
+export namespace GetOrder {
+  export type Response = Order.View;
+  export type Params = {
+    orderId: Order.Id
+  };
+};

src/models/common.ts

@@ -0,0 +1 @@
+export type IsoDate = string; // YYYY-MM-DDThh:mm:ss.mmmZ

src/models/landing/car.ts

@@ -1,4 +1,4 @@
-export type RegistrationNumber = string; // А012ВЕ
+export type RegistrationNumber = string; // А012ВЕ16
 
 export type Color = string; // #000000
 

src/models/landing/order.ts

@@ -1,7 +1,15 @@
+import { IsoDate } from "../common";
+
 import { Car, Customer, Washing } from ".";
 
 export type Id = string;
 
+export type Status = 'pending' |
+  'progress' |
+  'working' |
+  'canceled' |
+  'complete';
+
 export type Create = {
   customer: {
     phone: Customer.PhoneNumber,
@@ -19,5 +27,16 @@ export type Create = {
 };
 
 export type View = {
+  phone: Customer.PhoneNumber;
+  carNumber: Car.RegistrationNumber;
+  carBody: Car.BodyStyle;
+  carColor?: Car.Color;
+  location: Washing.Location;
+  startWashTime: Washing.AvailableBeginDateTime;
+  endWashTime: Washing.AvailableEndDateTime;
+  status: Status,
+  notes: string;
+  created: IsoDate;
+  updated: IsoDate;
   id: Id;
 };

src/models/landing/washing.ts

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

src/pages/arm/index.tsx

@@ -1,8 +1,31 @@
-import React from 'react';
+import React, { useEffect, useState } from 'react';
+import { useNavigate } from 'react-router-dom';
+import { AbsoluteCenter, Box, Spinner } from '@chakra-ui/react';
 
 import LayoutArm from '../../components/LayoutArm';
+import authLogin from '../../keycloak';
+import { URLs } from '../../__data__/urls';
 
 const Page = () => {
+  const [user, setUser] = useState(null);
+
+  const navigate = useNavigate();
+
+  useEffect(() => {
+    authLogin({ redirect: () => navigate(URLs.landing.url) }).then((user) =>
+      setUser(user),
+    );
+  }, []);
+
+  if (!user)
+    return (
+      <Box position='relative' height='100vh'>
+        <AbsoluteCenter>
+          <Spinner />
+        </AbsoluteCenter>
+      </Box>
+    );
+
   return <LayoutArm />;
 };
 

src/pages/order-create/helper.ts

@@ -0,0 +1,29 @@
+import dayjs from "dayjs";
+
+import { Order } from "../../models/landing";
+import { OrderFormValues } from "../../components/order-form";
+
+const removeAllSpaces = (str: string) => str.replace(/\s+/g, '');
+
+const getValidCarBodyStyle = (fieldValue: string) => {
+  const carBodyAsNumber = Number(fieldValue);
+  return Number.isNaN(carBodyAsNumber) ? undefined : carBodyAsNumber;
+};
+
+export const formatFormValues = ({ phone, carNumber, carBody, carColor, carLocation, availableDatetimeBegin, availableDatetimeEnd }: OrderFormValues): Order.Create => {
+  return {
+    customer: {
+      phone
+    },
+    car: {
+      number: removeAllSpaces(carNumber),
+      body: getValidCarBodyStyle(carBody),
+      color: carColor
+    },
+    washing: {
+      location: carLocation,
+      begin: dayjs(availableDatetimeBegin).toISOString(),
+      end: dayjs(availableDatetimeEnd).toISOString(),
+    }
+  };
+};

src/pages/order-create/index.tsx

@@ -1,32 +1,63 @@
 import React, { FC } from 'react';
 import { useTranslation } from 'react-i18next';
-import { Container, Heading, VStack } from '@chakra-ui/react';
+import { Container, Heading, useToast, VStack } from '@chakra-ui/react';
+import { useNavigate } from 'react-router-dom';
 
-import { LandingThemeProvider } from '../../containers';
+import { withLandingThemeProvider } from '../../containers';
-import { OrderForm } from '../../components/order-form';
+import { OrderForm, OrderFormProps } from '../../components/order-form';
+import { useCreateOrderMutation } from '../../api';
+import { URLs } from '../../__data__/urls';
+
+import { formatFormValues } from './helper';
 
 const Page: FC = () => {
   const { t } = useTranslation('~', {
     keyPrefix: 'dry-wash.order-create',
   });
 
+  const [createOrder, createOrderMutation] = useCreateOrderMutation();
+
+  const toast = useToast();
+  const navigate = useNavigate();
+
+  const onOrderFormSubmit: OrderFormProps['onSubmit'] = (values) => {
+    createOrder({ body: formatFormValues(values) })
+      .then(({ body: { id: orderId } }) => {
+        navigate({ pathname: URLs.orderView.getUrl(orderId) });
+        toast({
+          status: 'success',
+          title: t('create-order-query.success.title'),
+        });
+      })
+      .catch(({ error: errorMessage }) => {
+        toast({
+          status: 'error',
+          title: t('create-order-query.error.title'),
+          description: errorMessage,
+        });
+      });
+  };
+
   return (
-    <LandingThemeProvider>
+    <Container
-      <Container
+      w='full'
-        w='full'
+      maxWidth='container.xl'
-        maxWidth='container.xl'
+      minH='100vh'
-        minH='100vh'
+      padding={0}
-        padding={0}
+      bg='white'
-        bg='white'
+      centerContent
-        centerContent
+    >
-      >
+      <VStack w='full' h='full' alignItems='stretch' flexGrow={1}>
-        <VStack w='full' h='full' alignItems='stretch' flexGrow={1}>
+        <Heading textAlign='center' mt={4}>
-          <Heading textAlign='center' mt={4}>{t('title')}</Heading>
+          {t('title')}
-          <OrderForm />
+        </Heading>
-        </VStack>
+        <OrderForm
-      </Container>
+          onSubmit={onOrderFormSubmit}
-    </LandingThemeProvider>
+          loading={createOrderMutation.isLoading}
+        />
+      </VStack>
+    </Container>
   );
 };
 
-export default Page;
+export default withLandingThemeProvider(Page);

src/pages/order-view/index.tsx

@@ -1,7 +1,88 @@
-import React from "react";
+import React, { FC } from 'react';
+import { Alert, AlertDescription, AlertIcon, AlertTitle, 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';
 
-const Page = () => {
+import {
-  return <h1>Order view</h1>;
+  LandingThemeProvider,
+  withLandingThemeProvider,
+} from '../../containers';
+import { OrderDetails } from '../../components/order-view';
+import { Order } from '../../models/landing';
+import { useGetOrderQuery } from '../../api';
+
+const Page: FC = () => {
+  const { t } = useTranslation('~', {
+    keyPrefix: 'dry-wash.order-view',
+  });
+
+  const { orderId } = useParams<Order.Id>();
+  const {
+    isLoading,
+    isSuccess,
+    data: { body: order } = {},
+    isError,
+    error,
+  } = useGetOrderQuery({
+    orderId,
+  });
+
+  return (
+    <LandingThemeProvider>
+      <Container
+        w='full'
+        maxWidth='container.xl'
+        minH='100vh'
+        padding={0}
+        bg='white'
+        centerContent
+      >
+        <VStack w='full' h='full' alignItems='stretch' flexGrow={1}>
+          <Heading textAlign='center' mt={4}>
+            {t('title')}
+          </Heading>
+          {isLoading ? (
+            <HStack width='full' justifyContent='center'>
+              <Spinner size='lg' />
+            </HStack>
+          ) : (
+            <>
+              <>
+                {isSuccess && (
+                  <OrderDetails
+                    id={order.id}
+                    status={order.status}
+                    phone={order.phone}
+                    carNumber={order.carNumber}
+                    carBody={order.carBody}
+                    carColor={order.carColor}
+                    location={order.location}
+                    startWashTime={order.startWashTime}
+                    endWashTime={order.endWashTime}
+                    created={order.created}
+                  />
+                )}
+              </>
+              <>
+                {isError && (
+                  <Alert status='error'>
+                    <AlertIcon />
+                    <AlertTitle>
+                      {t('get-order-query.error.title', {
+                        number: orderId,
+                      })}
+                    </AlertTitle>
+                    <AlertDescription>{error.data?.error}</AlertDescription>
+                  </Alert>
+                )}
+              </>
+            </>
+          )}
+        </VStack>
+      </Container>
+    </LandingThemeProvider>
+  );
 };
 
-export default Page;
+export default withLandingThemeProvider(Page);

stubs/api/admin.js

@@ -2,7 +2,7 @@
 /* eslint-disable @typescript-eslint/no-require-imports */
 const router = require('express').Router();
 
-const STUBS = { masters: 'success', orders: 'success' };
+const STUBS = { masters: 'success', orders: 'success', orderView: 'success' };
 
 router.get('/set/:name/:value', (req, res) => {
   const { name, value } = req.params;
@@ -24,6 +24,11 @@ router.get('/', (req, res) => {
       ${generateRadioInput('orders', 'success')}
       ${generateRadioInput('orders', 'error')}
     </fieldset>
+    <fieldset> 
+    <legend>Лендинг - Детали заказа</legend>
+      ${generateRadioInput('orderView', 'success')}
+      ${generateRadioInput('orderView', 'error')}
+    </fieldset>
 </div>`);
 });
 

stubs/api/index.js

@@ -23,6 +23,46 @@ router.get('/arm/masters', (req, res) => {
     );
 });
 
+router.post('/arm/masters', (req, res) => {
+  res
+    .status(/error/.test(STUBS.masters) ? 500 : 200)
+    .send(
+      /^error$/.test(STUBS.masters)
+        ? commonError
+        : require(`../json/arm-masters/${STUBS.masters}.json`),
+    );
+});
+
+router.patch('/arm/masters/:id', (req, res) => {
+  res
+    .status(/error/.test(STUBS.masters) ? 500 : 200)
+    .send(
+      /^error$/.test(STUBS.masters)
+        ? commonError
+        : require(`../json/arm-masters/${STUBS.masters}.json`),
+    );
+});
+
+router.delete('/arm/masters/:id', (req, res) => {
+  res
+    .status(/error/.test(STUBS.masters) ? 500 : 200)
+    .send(
+      /^error$/.test(STUBS.masters)
+        ? commonError
+        : require(`../json/arm-masters/${STUBS.masters}.json`),
+    );
+});
+
+router.patch('/orders/:id', (req, res) => {
+  res
+    .status(/error/.test(STUBS.orders) ? 500 : 200)
+    .send(
+      /^error$/.test(STUBS.orders)
+        ? commonError
+        : require(`../json/arm-orders/${STUBS.orders}.json`),
+    );
+});
+
 router.post('/arm/orders', (req, res) => {
   res
     .status(/error/.test(STUBS.orders) ? 500 : 200)
@@ -33,6 +73,23 @@ router.post('/arm/orders', (req, res) => {
     );
 });
 
+router.get('/order/:orderId', ({ params }, res) => {
+  const { orderId } = params;
+  const stubName = `${orderId}-${STUBS.orderView}`;
+
+  res
+    .status(/error/.test(stubName) ? 500 : 200)
+    .send(
+      /^error$/.test(stubName)
+        ? commonError
+        : require(`../json/landing-order-view/${stubName}.json`),
+    );
+});
+
+router.post('/order/create', (req, res) => {
+  res.status(200).send({ success: true, body: { ok: true } });
+});
+
 router.use('/admin', require('./admin'));
 
 module.exports = router;

stubs/json/arm-masters/success.json

@@ -2,23 +2,18 @@
   "success": true,
   "body": [
     {
-      "id": "masters1",
+      "id": "4545423234",
       "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"
     },
     {
-      "id": "masters12",
+      "name": "Олег Макаров",
-      "name": "Иван Иванов",
+      "phone": "79001234567",
+      "id": "23423442"
+    },
+    {
+      "id": "345354234",
+      "name": "Иван Галкин",
       "schedule": [ {
         "id": "order1",
         "startWashTime": "2024-11-24T10:30:00.000Z",

stubs/json/arm-orders/success.json

@@ -7,9 +7,15 @@
       "startWashTime": "2024-11-24T10:30:00.000Z",
       "endWashTime": "2024-11-24T16:30:00.000Z",
       "orderDate": "2024-11-24T08:41:46.366Z",
-      "status": "progress",
+      "status": "pending",
       "phone": "79001234563",
-      "location": "Казань, ул. Баумана, 1"
+      "location": "Казань, ул. Баумана, 1",
+      "master": {
+        "name": "Олег Макаров",
+        "phone": "79001234567",
+        "id": "23423442"
+      },
+      "notes": ""
     },
     {
       "id": "order2",
@@ -19,7 +25,9 @@
       "orderDate": "2024-11-24T07:40:46.366Z",
       "status": "progress",
       "phone": "79001234567",
-      "location": "Казань, ул. Баумана, 43"
+      "location": "Казань, ул. Баумана, 43",
+      "master": [],
+      "notes": ""
     }
   ]
-}
+}

stubs/json/landing-order-view/1-success.json

@@ -0,0 +1,17 @@
+{
+  "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 Республика Татарстан (Татарстан), Казань, жилой район Седьмое Небо",
+      "status": "progress",
+      "notes": "",
+      "created": "2025-01-19T14:04:02.985Z",
+      "updated": "2025-01-19T14:04:02.987Z",
+      "id": "678d06527d78ec30be2679d8"
+  }
+}