Fix/booking flow

src/assets/Icons/DeletePetIcon.tsx

@@ -0,0 +1,24 @@
+import { memo } from "react"
+import { TIconProps } from "./types"
+
+const Component: React.FC<TIconProps> = props => {
+  const { width = 16, height = 16, ...rest } = props
+  return (
+    <svg
+      width={width}
+      height={height}
+      {...rest}
+      viewBox="0 0 32 32"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+    >
+      <rect x="0.5" y="0.5" width="31" height="31" rx="15.5" stroke="#757575" />
+      <path
+        d="M18.885 11.7575L16 14.6425L13.115 11.7575C12.6907 11.3332 12.0968 11.4181 11.7573 11.7575C11.4179 12.0969 11.3331 12.6909 11.7573 13.1151L14.7272 16.085L11.8422 18.97C11.4179 19.2245 11.4179 19.9033 11.7573 20.2428C12.0968 20.5822 12.6907 20.667 13.115 20.2428L16.0848 17.2729L19.0547 20.2428C19.2244 20.5822 19.9032 20.5822 20.2426 20.2428C20.582 19.9033 20.6669 19.3094 20.2426 18.8851L17.3576 16.0001L20.3275 13.0303C20.6669 12.6909 20.582 12.0969 20.2426 11.7575C19.9032 11.4181 19.3092 11.3332 18.885 11.7575Z"
+        fill="#181A1A"
+      />
+    </svg>
+  )
+}
+
+export const DeletePetIcon = memo(Component)

src/assets/Icons/RoundedPlusIcon.tsx

@@ -0,0 +1,34 @@
+import { memo } from "react"
+import { TIconProps } from "./types"
+
+const Component: React.FC<TIconProps> = props => {
+  const { width = 16, height = 16, ...rest } = props
+  return (
+    <svg
+      width={width}
+      height={height}
+      viewBox="0 0 32 32"
+      fill="none"
+      xmlns="http://www.w3.org/2000/svg"
+      {...rest}
+    >
+      <rect x="0.5" y="0.5" width="31" height="31" rx="15.5" stroke="#757575" />
+      <path
+        d="M12 16H20"
+        stroke="#181A1A"
+        stroke-width="1.5"
+        stroke-linecap="round"
+        stroke-linejoin="round"
+      />
+      <path
+        d="M16 20V12"
+        stroke="#181A1A"
+        stroke-width="1.5"
+        stroke-linecap="round"
+        stroke-linejoin="round"
+      />
+    </svg>
+  )
+}
+
+export const RoundedPlusIcon = memo(Component)

src/assets/Icons/types.tsx

@@ -17,7 +17,8 @@ import { DownArrowIcon } from "./DownArrowIcon"
 import { AttentionYellow } from "./AttentionYellow"
 import { AttentionBlue } from "./AttentionBlue"
 import { AttentionRed } from "./AttentionRed"
-
+import { DeletePetIcon } from "./DeletePetIcon"
+import { RoundedPlusIcon } from "./RoundedPlusIcon"
 
 export type TIcon =
   | "PlusIcon"
@@ -39,6 +40,8 @@ export type TIcon =
   | "AttentionYellow"
   | "AttentionBlue"
   | "AttentionRed"
+  | "DeletePetIcon"
+  | "RoundedPlusIcon"
 
 export type TIconProps = SVGProps<SVGSVGElement>
 
@@ -61,4 +64,6 @@ export const iconTypes = new Map<TIcon, React.JSX.Element>([
   ["AttentionYellow", <AttentionYellow key={"AttentionYellow"} />],
   ["AttentionBlue", <AttentionBlue key={"AttentionBlue"} />],
   ["AttentionRed", <AttentionRed key={"AttentionRed"} />],
+  ["DeletePetIcon", <DeletePetIcon key={"DeletePetIcon"} />],
+  ["RoundedPlusIcon", <RoundedPlusIcon key={"RoundedPlusIcon"} />],
 ])

src/modules/Authorization/pages/AuthorizationPage.tsx

@@ -1,10 +1,11 @@
 import { useForm, SubmitHandler } from "react-hook-form"
-import { EMAIL_VALIDATION_PATTERN, TAuthUser } from "../const"
 
 import { Box, Avatar, Typography } from "@mui/material"
 import { TextField } from "@/shared/ui/TextField"
 import { Button, EButtonSize, EButtonVariant } from "@/shared/ui/Button/Button"
 import { useDocumentTitle } from "@/shared/hooks/useDocumentTitle"
+import { TAuthUser } from "@/modules/Booking/const"
+import { EMAIL_VALIDATION_PATTERN } from "@/modules/Employee/const"
 
 export const AuthorizationPage: React.FC = () => {
   useDocumentTitle({ title: "Авторизация" })

src/modules/Booking/components/form/blocks/CategoryForm/CategoryRoomsForm.tsx

@@ -28,7 +28,7 @@ export const CategoryRoomsForm = (props: CategoryRoomsProps) => {
         render={({ field }) => {
           return (
             <CategorySelect
-              className="w-60"
+              className="w-64"
               onChange={field.onChange}
               value={bookingData.categories || field.value || ""}
               error={errors?.categories?.message}

src/modules/Booking/components/form/blocks/CommentForm/CommentForm.tsx

@@ -3,7 +3,7 @@ import {
   IComment,
 } from "@/modules/Booking/model/types/BookingValidationSchema"
 import { TextField } from "@/shared/ui/TextField"
-import { DeepPartial, UseFormReturn } from "react-hook-form"
+import { Controller, DeepPartial, UseFormReturn } from "react-hook-form"
 
 interface CommentFormProps {
   form: UseFormReturn<IComment>
@@ -12,15 +12,21 @@ interface CommentFormProps {
 
 export const CommentForm = (props: CommentFormProps) => {
   const { form } = props
-  const { register } = form
+  const { control } = form
   return (
-    <TextField
-      id="comment"
-      placeholder="Комментарий"
-      label="Комментарий"
-      isTextarea
-      width={541}
-      {...register("comment")}
+    <Controller
+      control={control}
+      name={"comment"}
+      render={({ field }) => (
+        <TextField
+          id="comment"
+          placeholder="Комментарий"
+          label="Комментарий"
+          isTextarea
+          width={541}
+          {...field}
+        />
+      )}
     />
   )
 }