feat: tag delete

src/components/ModalTags.tsx

@@ -1,13 +1,17 @@
+import { IAPITag } from "@/pages/profile_tasks.dto";
+import apiClient from "@/services/api";
 import { cn } from "@/utils/class-merge";
-import { BookOpenIcon, DocumentDuplicateIcon } from "@heroicons/react/24/outline";
+import { BookOpenIcon, CheckIcon, DocumentDuplicateIcon, PlusCircleIcon } from "@heroicons/react/24/outline";
+import { XMarkIcon } from "@heroicons/react/24/solid";
 import { FunctionComponent } from "preact";
-import { Dispatch, StateUpdater, useEffect, useState } from "preact/hooks";
+import { Dispatch, StateUpdater, useEffect, useRef, useState } from "preact/hooks";
 import Button from "./ui/Button";
+import Dialog from "./ui/Dialog";
 import ModalWindow, { ModalWindowProps } from "./ui/Modal";
 
 export interface ITags {
-  first: string;
+  first: number;
-  second: string;
+  second: number;
   overdue: boolean;
 }
 
@@ -18,9 +22,10 @@ interface ModalTagsProps extends ModalWindowProps {
   value?: ITags;
   onChange?: Dispatch<StateUpdater<ITags>>;
   tagsList?: {
-    first: string[];
+    first: IAPITag[];
-    second: string[];
+    second: IAPITag[];
   };
+  refreshTags: () => void;
 }
 
 const ModalTags: FunctionComponent<ModalTagsProps> = ({
@@ -30,103 +35,234 @@ const ModalTags: FunctionComponent<ModalTagsProps> = ({
   onChange,
   value,
   tagsList,
+  refreshTags,
   ...rest
 }) => {
   const [showFirstTags, setShowFirstTags] = useState(false);
   const [showSecondTags, setShowSecondTags] = useState(false);
+  const [showAddFirstTag, setShowAddFirstTag] = useState(false);
+  const [showAddSecondTag, setShowAddSecondTag] = useState(false);
+  const [showErrorDialog, setShowErrorDialog] = useState(false);
+  const [errorMessage, setErrorMessage] = useState<string[]>([]);
+  const addFirstTagRef = useRef<HTMLInputElement>(null);
+  const addSecondTagRef = useRef<HTMLInputElement>(null);
   useEffect(() => {
     if (showFirstTags && showSecondTags) setShowFirstTags(false);
   }, [showSecondTags]);
   useEffect(() => {
     if (showFirstTags && showSecondTags) setShowSecondTags(false);
   }, [showFirstTags]);
+
+  const handleCreateTag = async () => {
+    if (!addFirstTagRef.current?.value && !addSecondTagRef.current?.value) return;
+
+    const data: { subject_name?: string; taskType_name?: string } = {};
+    if (addFirstTagRef.current && addFirstTagRef.current.value) data.subject_name = addFirstTagRef.current.value;
+    if (addSecondTagRef.current && addSecondTagRef.current.value) data.taskType_name = addSecondTagRef.current.value;
+    const response = await apiClient<{ success: boolean; subject?: IAPITag; taskType?: IAPITag }>(
+      "/api/tags/create_tags/",
+      { method: "POST", body: JSON.stringify(data) }
+    );
+    if (response.success) {
+      refreshTags();
+      if (showAddFirstTag) {
+        const new_subject_id = response.subject!.id;
+        onChange!((prev) => ({ ...prev, first: new_subject_id }));
+        setShowAddFirstTag(false);
+      }
+      if (showAddSecondTag) {
+        const new_taskType_id = response.taskType!.id;
+        onChange!((prev) => ({ ...prev, second: new_taskType_id }));
+        setShowAddSecondTag(false);
+      }
+    }
+    if (addFirstTagRef.current) addFirstTagRef.current.value = "";
+    if (addSecondTagRef.current) addSecondTagRef.current.value = "";
+  };
+
+  const handleDeleteTag = async (id: number) => {
+    const data: { subject_id?: number; taskType_id?: number } = {};
+    if (showFirstTags) data.subject_id = id;
+    if (showSecondTags) data.taskType_id = id;
+    const response = await apiClient<{ error?: string }>(`/api/tags/delete_tag/`, {
+      method: "DELETE",
+      body: JSON.stringify(data),
+    });
+    if (!response.error) {
+      refreshTags();
+    } else {
+      setShowErrorDialog(true);
+      const match = response.error?.match(/\[(.+)\]/);
+      if (match) setErrorMessage(match[1].split(", ").map((s) => s.trim().replace(/'/g, "")));
+    }
+  };
+
   return (
-    <ModalWindow
+    <>
-      isOpen={isOpen}
+      <Dialog
-      {...rest}
+        isOpen={showErrorDialog}
-      setIsOpen={setIsOpen}
+        setIsOpen={setShowErrorDialog}
-      onClose={() => {
+        title="Ошибка!"
-        onClose!();
+        confirmation={false}
-        setShowFirstTags(false);
+        cancelText="Ок"
-        setShowSecondTags(false);
+      >
-      }}
+        <div class="flex flex-col items-start gap-1">
-      className="relative h-[14rem] justify-between py-4 md:h-[14rem] md:w-[25rem]"
+          <p class="mb-6 text-sm sm:text-[1rem]">
-      zIndex={70}
+            Данный тег есть в других задачах. Поменяйте теги в них и повторите операцию.
-    >
+          </p>
-      <p class="text-2xl font-semibold">Теги</p>
+          <p class="text-sm sm:text-[1rem]">Задачи с этим тегом:</p>
-      <div class="flex w-[85%] flex-col gap-2 md:w-full">
+          <ul class="ms-6 list-disc">
-        <Button
+            {errorMessage.map((s, i) => (
-          className="flex w-full flex-row items-center justify-center gap-1 text-[1rem]!"
+              <li key={i}>{s}</li>
-          onClick={() => setShowFirstTags(!showFirstTags)}
+            ))}
-        >
+          </ul>
-          <BookOpenIcon class="size-6" />
+        </div>
-          {value?.first || "Предмет"}
+      </Dialog>
-        </Button>
+      <ModalWindow
-        <Button
+        isOpen={isOpen}
-          className="flex w-full flex-row items-center justify-center gap-1 text-[1rem]! break-words"
+        {...rest}
-          onClick={() => setShowSecondTags(!showSecondTags)}
+        setIsOpen={setIsOpen}
-        >
+        onClose={() => {
-          <DocumentDuplicateIcon class="size-6" />
+          onClose!();
-          {value?.second || "Тема"}
+          setShowFirstTags(false);
-        </Button>
+          setShowSecondTags(false);
-        {showFirstTags && (
+          setShowAddFirstTag(false);
-          <div class="absolute top-full left-0 mt-3 ml-2 flex h-fit w-[18rem] flex-col items-center rounded-[4rem] bg-white px-8 py-4 text-xs md:top-0 md:left-full md:mt-0 md:ml-5">
+          setShowAddSecondTag(false);
-            <div class="flex h-fit max-h-[45vh] w-full flex-col gap-3 overflow-y-auto">
+        }}
-              {tagsList?.first.map((tag) => (
+        className="relative h-[14rem] justify-between py-4 md:h-[14rem] md:w-[25rem]"
-                <div
+        zIndex={70}
-                  class="flex cursor-pointer flex-row gap-2"
+      >
-                  onClick={() =>
+        <p class="text-2xl font-semibold">Теги</p>
-                    onChange?.((prev) => {
+        <div class="flex w-[85%] flex-col gap-2 md:w-full">
-                      return { ...prev, first: tag };
+          <Button
-                    })
+            className="flex w-full flex-row items-center justify-center gap-1 text-[1rem]!"
-                  }
+            onClick={() => {
-                >
+              setShowFirstTags(!showFirstTags);
+              setShowSecondTags(false);
+              setShowAddFirstTag(false);
+              setShowAddSecondTag(false);
+            }}
+          >
+            <BookOpenIcon class="size-6" />
+            {tagsList?.first?.find((tag) => tag.id === value?.first)?.name || "Предмет"}
+          </Button>
+          <Button
+            className="flex w-full flex-row items-center justify-center gap-1 text-[1rem]! break-words"
+            onClick={() => {
+              setShowSecondTags(!showSecondTags);
+              setShowFirstTags(false);
+              setShowAddFirstTag(false);
+              setShowAddSecondTag(false);
+            }}
+          >
+            <DocumentDuplicateIcon class="size-6" />
+            {tagsList?.second?.find((tag) => tag.id === value?.second)?.name || "Тема"}
+          </Button>
+          {showFirstTags && (
+            <div class="absolute top-full left-0 mt-3 ml-2 flex h-fit w-[18rem] flex-col items-center gap-3 md:top-0 md:left-full md:mt-0 md:ml-5">
+              <div class="flex h-fit max-h-[15rem] w-full flex-col gap-3 overflow-y-auto rounded-[4rem] bg-white px-8 py-4 text-xs">
+                {tagsList?.first.map((tag) => (
                   <div
-                    class={cn(
+                    class="flex cursor-pointer flex-row items-center gap-2"
-                      "pointer-events-none flex aspect-square size-4 flex-col items-center justify-center rounded-full border-1 border-black text-white select-none",
+                    onClick={() =>
-                      {
+                      onChange?.((prev) => {
-                        "bg-black": value?.first === tag,
+                        return { ...prev, first: tag.id };
-                      }
+                      })
-                    )}
+                    }
                   >
-                    ✓
+                    <div
+                      class={cn(
+                        "pointer-events-none flex aspect-square size-4 flex-col items-center justify-center rounded-full border-1 border-black text-white select-none",
+                        {
+                          "bg-black": value?.first === tag.id,
+                        }
+                      )}
+                    >
+                      ✓
+                    </div>
+                    <p class="flex-1">{tag.name}</p>
+                    <XMarkIcon
+                      class="size-4 cursor-pointer"
+                      onClick={(e) => {
+                        e.stopPropagation();
+                        handleDeleteTag(tag.id);
+                      }}
+                    />
                   </div>
-                  <p>{tag}</p>
+                ))}
-                </div>
+                <button
-              ))}
+                  class="mt-2 flex w-full cursor-pointer flex-row items-center gap-2"
-            </div>
+                  onClick={() => {
-          </div>
+                    setShowAddFirstTag(!showAddFirstTag);
-        )}
+                    setTimeout(() => addFirstTagRef.current?.focus(), 100);
-        {showSecondTags && (
+                  }}
-          <div class="absolute top-full left-0 mt-3 ml-2 flex h-fit w-[18rem] flex-col items-center rounded-[4rem] bg-white px-8 py-4 text-xs md:top-0 md:left-full md:mt-0 md:ml-5">
-            <div class="flex h-fit max-h-[45vh] w-full flex-col gap-3 overflow-y-auto">
-              {tagsList?.second.map((tag) => (
-                <div
-                  class="flex cursor-pointer flex-row gap-2"
-                  onClick={() =>
-                    onChange?.((prev) => {
-                      return { ...prev, second: tag };
-                    })
-                  }
                 >
-                  <div
+                  <PlusCircleIcon class="size-5" />
-                    class={cn(
+                  <span>Добавить</span>
-                      "pointer-events-none flex aspect-square size-4 flex-col items-center justify-center rounded-full border-1 border-black text-white select-none",
+                </button>
-                      {
+              </div>
-                        "bg-black": value?.second === tag,
+              {showAddFirstTag && (
-                      }
+                <div class="flex w-full flex-row items-center rounded-[4rem] bg-white px-8 py-4 text-xs">
-                    )}
+                  <input placeholder="Введите текст" class="flex-1 outline-0" ref={addFirstTagRef} />
-                  >
+                  <CheckIcon class="size-6 cursor-pointer" onClick={handleCreateTag} />
-                    ✓
-                  </div>
-                  <p>{tag}</p>
                 </div>
-              ))}
+              )}
             </div>
-          </div>
+          )}
-        )}
+          {showSecondTags && (
-      </div>
+            <div class="absolute top-full left-0 mt-3 ml-2 flex h-fit w-[18rem] flex-col items-center gap-3 md:top-0 md:left-full md:mt-0 md:ml-5">
-    </ModalWindow>
+              <div class="flex h-fit max-h-[15rem] w-full flex-col gap-3 overflow-y-auto rounded-[4rem] bg-white px-8 py-4 text-xs">
+                {tagsList?.second.map((tag) => (
+                  <div
+                    class="flex cursor-pointer flex-row gap-2"
+                    onClick={() =>
+                      onChange?.((prev) => {
+                        return { ...prev, second: tag.id };
+                      })
+                    }
+                  >
+                    <div
+                      class={cn(
+                        "pointer-events-none flex aspect-square size-4 flex-col items-center justify-center rounded-full border-1 border-black text-white select-none",
+                        {
+                          "bg-black": value?.second === tag.id,
+                        }
+                      )}
+                    >
+                      ✓
+                    </div>
+                    <p class="flex-1">{tag.name}</p>
+                    <XMarkIcon
+                      class="size-4 cursor-pointer"
+                      onClick={(e) => {
+                        e.stopPropagation();
+                        handleDeleteTag(tag.id);
+                      }}
+                    />
+                  </div>
+                ))}
+                <button
+                  class="mt-2 flex w-full cursor-pointer flex-row items-center gap-2"
+                  onClick={() => {
+                    setShowAddSecondTag(!showAddSecondTag);
+                    setTimeout(() => addSecondTagRef.current?.focus(), 100);
+                  }}
+                >
+                  <PlusCircleIcon class="size-5" />
+                  <span>Добавить</span>
+                </button>
+              </div>
+              {showAddSecondTag && (
+                <div class="flex w-full flex-row items-center rounded-[4rem] bg-white px-8 py-4 text-xs">
+                  <input placeholder="Введите текст" class="flex-1 outline-0" ref={addSecondTagRef} />
+                  <CheckIcon class="size-6 cursor-pointer" onClick={handleCreateTag} />
+                </div>
+              )}
+            </div>
+          )}
+        </div>
+      </ModalWindow>
+    </>
   );
 };
 

src/components/task.module.scss

@@ -1,5 +1,5 @@
 @reference "../index.scss";
 
 .task {
-  @apply relative flex h-24 w-full cursor-pointer flex-row items-center justify-start gap-4 rounded-[3rem] bg-[rgba(251,194,199,0.53)] px-5 py-6 text-xl shadow-[0px_4px_4px_0px_rgba(0,0,0,0.25)] transition-transform hover:scale-[1.05] hover:bg-[rgba(251,194,199,0.7)] active:scale-[1.05] md:w-[500px];
+  @apply relative flex h-24 w-full cursor-pointer flex-row items-center justify-start gap-4 rounded-[3rem] px-5 py-6 text-xl shadow-[0px_4px_4px_0px_rgba(0,0,0,0.25)] transition-transform hover:scale-[1.05] active:scale-[1.05] md:w-[500px];
 }

src/components/task.tsx

@@ -1,3 +1,4 @@
+import { cn } from "@/utils/class-merge";
 import { FunctionComponent } from "preact";
 import { MouseEventHandler } from "preact/compat";
 import { tv } from "tailwind-variants";
@@ -5,6 +6,7 @@ import classes from "./task.module.scss";
 
 interface TaskProps {
   name: string;
+  priority?: number;
   checked?: boolean;
   overdue?: boolean;
   onClick?: () => void;
@@ -36,11 +38,21 @@ const Task: FunctionComponent<TaskProps> = ({
   checked = false,
   onClick = () => {},
   onMarkClick = () => {},
+  priority = 4,
   overdue,
 }) => {
   return (
     <div class="w-[95%]">
-      <div class={classes.task} onClick={onClick}>
+      <div
+        class={cn(
+          classes.task,
+          { "bg-[linear-gradient(90.00deg,rgba(18,26,230,0.29),rgba(251,194,199,0.34)_100%)]": priority == 1 },
+          { "bg-[linear-gradient(90.00deg,rgba(97,200,232,0.6),rgba(251,194,199,0.42)_100%)]": priority == 2 },
+          { "bg-[linear-gradient(90.00deg,rgba(247,220,52,0.61),rgba(251,194,199,0.38)_97.71%)]": priority == 3 },
+          { "bg-[rgba(251,194,199,0.53)] hover:bg-[rgba(251,194,199,0.7)]": priority == 4 }
+        )}
+        onClick={onClick}
+      >
         <div
           class={taskStyle({ checked })}
           onClick={(e) => {

src/components/ui/Dialog.tsx

@@ -5,20 +5,21 @@ interface DialogProps {
   isOpen: boolean;
   setIsOpen: (isOpen: boolean) => void;
   title: string;
-  content: string;
+  onConfirm?: () => void;
-  onConfirm: () => void;
   confirmText?: string;
   cancelText?: string;
+  confirmation?: boolean;
 }
 
 const Dialog: FunctionComponent<DialogProps> = ({
   isOpen,
   setIsOpen,
   title,
-  content,
+  children,
-  onConfirm,
+  onConfirm = () => {},
   confirmText = "Подтвердить",
   cancelText = "Отмена",
+  confirmation = true,
 }) => {
   if (!isOpen) return null;
 
@@ -26,20 +27,28 @@ const Dialog: FunctionComponent<DialogProps> = ({
     <div class="fixed inset-0 z-150 flex items-center justify-center bg-black/50">
       <div class="w-full max-w-md rounded-[4rem] bg-white p-6 shadow-lg">
         <h2 class="mb-4 text-xl font-semibold">{title}</h2>
-        <p class="mb-6 text-sm sm:text-[1rem]">{content}</p>
+        {children}
         <div class="flex justify-end gap-4">
-          <Button onClick={() => setIsOpen(false)} className="bg-gray-200 text-gray-800 hover:bg-gray-300">
+          {confirmation ? (
-            {cancelText}
+            <>
-          </Button>
+              <Button onClick={() => setIsOpen(false)} className="bg-gray-200 text-gray-800 hover:bg-gray-300">
-          <Button
+                {cancelText}
-            onClick={() => {
+              </Button>
-              onConfirm();
+              <Button
-              setIsOpen(false);
+                onClick={() => {
-            }}
+                  onConfirm();
-            color="red"
+                  setIsOpen(false);
-          >
+                }}
-            {confirmText}
+                color="red"
-          </Button>
+              >
+                {confirmText}
+              </Button>
+            </>
+          ) : (
+            <Button onClick={() => setIsOpen(false)} className="bg-gray-200 text-gray-800 hover:bg-gray-300">
+              {cancelText}
+            </Button>
+          )}
         </div>
       </div>
     </div>

src/pages/profile_calendar.tsx

@@ -22,12 +22,14 @@ import { Nullable } from "primereact/ts-helpers";
 import { SubmitHandler, useForm } from "react-hook-form";
 import {
   IApiResponse,
+  IAPITag,
   ICreateTaskResponse,
   IDeleteTaskResponse,
   IEditTaskResponse,
   ITask,
   ITaskDetails,
   ITaskForm,
+  IViewTagsResponse,
 } from "./profile_tasks.dto";
 
 const calendarStyles = {
@@ -61,10 +63,10 @@ const ProfileCalendar: FunctionComponent = () => {
   const [isEditModal, setIsEditModal] = useState(false);
   const [editContent, setEditContent] = useState<ITask | null>(null);
   const [calendarDate, setCalendarDate] = useState<Nullable<Date>>();
-  const [tags, setTags] = useState<ITags>({ first: "", second: "", overdue: false });
+  const [tags, setTags] = useState<ITags>({ first: 0, second: 0, overdue: false });
   const [showDeleteDialog, setShowDeleteDialog] = useState(false);
-  const [subjectChoices, setSubjectChoices] = useState<Record<string, string>>({});
+  const [subjectChoices, setSubjectChoices] = useState<IAPITag[]>([]);
-  const [taskTypeChoices, setTaskTypeChoices] = useState<Record<string, string>>({});
+  const [taskTypeChoices, setTaskTypeChoices] = useState<IAPITag[]>([]);
   const [isLoading, setIsLoading] = useState(true);
 
   const {
@@ -75,29 +77,46 @@ const ProfileCalendar: FunctionComponent = () => {
     formState: { errors },
   } = useForm<ITaskForm>({
     defaultValues: {
-      tags: [],
+      subject: {
+        name: "",
+        id: 0,
+      },
+      taskType: {
+        name: "",
+        id: 0,
+      },
     },
   });
 
   useEffect(() => {
     fetchTasks();
+    fetchTags();
   }, []);
 
+  const fetchTags = async () => {
+    try {
+      const response = await apiClient<IViewTagsResponse>("/api/tags/view_tags/");
+      setSubjectChoices(response.subjects);
+      setTaskTypeChoices(response.taskTypes);
+    } catch (error) {
+      console.error("Failed to fetch tags:", error);
+    }
+  };
+
   const fetchTasks = async () => {
     try {
       setIsLoading(true);
       const response = await apiClient<IApiResponse>("/api/tasks/view_tasks/");
 
-      setSubjectChoices(response.subject_choices);
-      setTaskTypeChoices(response.task_type_choices);
-
       const convertedTasks: ITask[] = response.tasks.map((apiTask) => ({
         id: apiTask.id.toString(),
         name: apiTask.title,
         checked: apiTask.isCompleted,
         date: new Date(apiTask.due_date),
         description: apiTask.description,
-        tags: [apiTask.subject, apiTask.task_type],
+        priority: apiTask.priority,
+        subject: apiTask.subject,
+        taskType: apiTask.taskType,
         new: false,
       }));
 
@@ -111,8 +130,8 @@ const ProfileCalendar: FunctionComponent = () => {
 
   const example_tags = useMemo(
     () => ({
-      first: Object.keys(subjectChoices),
+      first: subjectChoices,
-      second: Object.keys(taskTypeChoices),
+      second: taskTypeChoices,
     }),
     [subjectChoices, taskTypeChoices]
   );
@@ -122,14 +141,14 @@ const ProfileCalendar: FunctionComponent = () => {
       setError("date", { message: "Выберите дату" });
       return;
     }
-    if ((!editContent?.tags[0] || !editContent.tags[1]) && (!tags.first || !tags.second)) {
+    if ((!editContent?.subject.id || !editContent.taskType.id) && (!tags.first || !tags.second)) {
-      setError("tags", { message: "Выберите теги" });
+      setError("subject", { message: "Выберите теги" });
       return;
     }
 
     try {
-      const selectedSubject = editContent?.tags[0] || tags.first;
+      const selectedSubject = editContent?.subject.id || tags.first;
-      const selectedTaskType = editContent?.tags[1] || tags.second;
+      const selectedTaskType = editContent?.taskType.id || tags.second;
 
       // Format date to DD-MM-YYYYTHH:MM
       const formattedDate = calendarDate
@@ -176,7 +195,7 @@ const ProfileCalendar: FunctionComponent = () => {
 
       await fetchTasks();
       setIsOpen(false);
-      setTags({ first: "", second: "", overdue: false });
+      setTags({ first: 0, second: 0, overdue: false });
     } catch (error) {
       console.error("Failed to save task:", error);
     }
@@ -226,8 +245,9 @@ const ProfileCalendar: FunctionComponent = () => {
         checked: false,
         date: new Date(taskDetails.dateTime_due),
         description: taskDetails.description,
-        tags: [taskDetails.subject, taskDetails.taskType],
+        subject: taskDetails.subject,
-        new: false,
+        taskType: taskDetails.task_type,
+        priority: taskDetails.priority,
       };
 
       setIsOpen(true);
@@ -263,8 +283,8 @@ const ProfileCalendar: FunctionComponent = () => {
   useEffect(() => {
     if (!editContent) return;
     const newEditContent = editContent;
-    if (tags.first) newEditContent.tags = [tags.first, newEditContent.tags[1]];
+    if (tags.first) newEditContent.subject = subjectChoices.find((tag) => tag.id === tags.first)!;
-    if (tags.second) newEditContent.tags = [newEditContent.tags[0], tags.second];
+    if (tags.second) newEditContent.taskType = taskTypeChoices.find((tag) => tag.id === tags.second)!;
     setEditContent(newEditContent);
   }, [tags]);
 
@@ -358,12 +378,13 @@ const ProfileCalendar: FunctionComponent = () => {
       ) : (
         <>
           <ModalTags
+            refreshTags={fetchTags}
             isOpen={openModalTags}
             setIsOpen={setOpenModalTags}
             tagsList={example_tags}
             value={tags}
             onClose={() => {
-              setTags({ first: "", second: "", overdue: false });
+              setTags({ first: 0, second: 0, overdue: false });
             }}
             onChange={setTags}
           />
@@ -383,7 +404,7 @@ const ProfileCalendar: FunctionComponent = () => {
               setIsEdit(false);
               setEditContent(null);
               setIsEditModal(false);
-              setTags({ first: "", second: "", overdue: false });
+              setTags({ first: 0, second: 0, overdue: false });
               setCalendarDate(null);
             }}
           >
@@ -461,7 +482,7 @@ const ProfileCalendar: FunctionComponent = () => {
                 {errors.name && <p class="text-red-500">{errors.name.message}</p>}
                 {errors.description && <p class="text-red-500">{errors.description.message}</p>}
                 {errors.date && <p class="text-red-500">{errors.date.message}</p>}
-                {errors.tags && <p class="text-red-500">{errors.tags.message}</p>}
+                {errors.subject && <p class="text-red-500">{errors.subject.message}</p>}
                 <div class="flex flex-col items-center gap-6 self-center md:flex-row md:justify-start md:self-start">
                   <div
                     class={cn(
@@ -496,17 +517,17 @@ const ProfileCalendar: FunctionComponent = () => {
                     )}
                     onClick={() => {
                       if (!isEditModal) return;
-                      setTags({ first: editContent.tags[0], second: editContent.tags[1], overdue: false });
+                      setTags({ first: editContent.subject.id, second: editContent.taskType.id, overdue: false });
                       setOpenModalTags(true);
                     }}
                   >
                     <p class="flex flex-row gap-2">
                       <BookOpenIcon class="size-5" />
-                      {editContent.tags[0]}
+                      {editContent.subject.name}
                     </p>
                     <p class="flex flex-row gap-2">
                       <DocumentDuplicateIcon class="size-5" />
-                      {editContent.tags[1]}
+                      {editContent.taskType.name}
                     </p>
                   </div>
                 </div>
@@ -517,11 +538,12 @@ const ProfileCalendar: FunctionComponent = () => {
             isOpen={showDeleteDialog}
             setIsOpen={setShowDeleteDialog}
             title="Удаление задачи"
-            content="Вы уверены, что хотите удалить эту задачу?"
             onConfirm={handleDeleteTask}
             confirmText="Удалить"
             cancelText="Отмена"
-          />
+          >
+            <p class="mb-6 text-sm sm:text-[1rem]">"Вы уверены, что хотите удалить эту задачу?"</p>
+          </Dialog>
           <Calendar
             value={currentDate}
             onChange={(e) => setCurrentDate(e ? e.value! : new Date())}
@@ -540,6 +562,8 @@ const ProfileCalendar: FunctionComponent = () => {
                     key={task.id}
                     name={task.name}
                     checked={task.checked}
+                    priority={task.priority}
+                    overdue={task.date < new Date()}
                     onClick={() => handleViewTask(task.id)}
                     onMarkClick={() => handleTaskCheck(task.id)}
                   />

src/pages/profile_tasks.dto.ts

@@ -1,11 +1,20 @@
+export interface IAPITag {
+  name: string;
+  id: number;
+}
 export interface ITask {
   id: string;
   name: string;
   checked: boolean;
+  priority: number;
   date: Date;
   description: string;
-  tags: string[];
+  subject: IAPITag;
-  new?: boolean;
+  taskType: IAPITag;
+}
+
+export interface ITaskView extends Omit<ITask, "taskType"> {
+  task_type: IAPITag;
 }
 
 export interface ITaskForm extends Omit<ITask, "date"> {
@@ -16,17 +25,16 @@ export interface IApiTask {
   id: number;
   title: string;
   description: string;
+  priority: number;
   isCompleted: boolean;
   due_date: string;
-  subject: string;
+  subject: IAPITag;
-  task_type: string;
+  taskType: IAPITag;
 }
 
 export interface IApiResponse {
   profile: string;
   tasks: IApiTask[];
-  subject_choices: Record<string, string>;
-  task_type_choices: Record<string, string>;
 }
 
 export interface ICreateTaskResponse {
@@ -53,12 +61,10 @@ export interface ITaskDetails {
   profile: string;
   title: string;
   description: string;
-  subject: string;
+  subject: IAPITag;
-  taskType: string;
+  task_type: IAPITag;
+  priority: number;
   dateTime_due: string;
-  remind_before_days: number;
-  repeat_reminder: number;
-  reminder_time: string;
 }
 
 export interface IDeleteTaskResponse {
@@ -85,3 +91,9 @@ export interface IEditTaskResponse {
     };
   };
 }
+
+export interface IViewTagsResponse {
+  profile: string;
+  subjects: IAPITag[];
+  taskTypes: IAPITag[];
+}

src/pages/profile_tasks.prime.styles.tsx

@@ -0,0 +1,86 @@
+import { cn } from "@/utils/class-merge";
+import { FlagIcon as FlagIconSolid } from "@heroicons/react/20/solid";
+import { DropdownPassThroughMethodOptions, DropdownPassThroughOptions } from "primereact/dropdown";
+
+export const DropdownStyles: DropdownPassThroughOptions = {
+  root: ({ props }: DropdownPassThroughMethodOptions) => ({
+    className: cn(
+      "cursor-pointer inline-flex relative select-none mb-2",
+      "bg-white border border-gray-400 transition-colors duration-200 ease-in-out rounded-md",
+      "w-full md:w-56",
+      "hover:border-[rgba(251,194,199,0.7)] focus:outline-none focus:outline-offset-0 focus:shadow-[0_0_0_0.2rem_rgba(251,194,199,1)] ",
+      { "opacity-60 select-none pointer-events-none cursor-default": props.disabled }
+    ),
+  }),
+  input: ({ props }: DropdownPassThroughMethodOptions) => ({
+    className: cn(
+      "cursor-pointer flex flex-auto overflow-hidden overflow-ellipsis whitespace-nowrap relative",
+      "bg-transparent border-0 text-gray-800",
+      "p-3 transition duration-200 bg-transparent rounded appearance-none font-sans text-base",
+      "focus:outline-none focus:shadow-none",
+      { "pr-7": props.showClear }
+    ),
+  }),
+  trigger: {
+    className: cn(
+      "flex items-center justify-center shrink-0",
+      "bg-transparent text-gray-500 w-12 rounded-tr-lg rounded-br-lg"
+    ),
+  },
+  wrapper: {
+    className: cn("max-h-[200px] overflow-auto", "bg-white text-gray-700 border-0 rounded-md shadow-lg", " "),
+  },
+  list: { className: "py-3 list-none m-0" },
+  item: ({ context }: DropdownPassThroughMethodOptions) => ({
+    className: cn(
+      "cursor-pointer font-normal overflow-hidden relative whitespace-nowrap",
+      "m-0 p-3 border-0  transition-shadow duration-200 rounded-none",
+      "hover:text-gray-700 hover:bg-gray-200",
+      {
+        "text-gray-700": !context.focused && !context.selected,
+        "bg-gray-300 text-gray-700  ": context.focused && !context.selected,
+        "bg-[rgba(251,194,199,0.7)] text-black  ": context.focused && context.selected,
+        "bg-blue-50 text-gray-700": !context.focused && context.selected,
+        "opacity-60 select-none pointer-events-none cursor-default": context.disabled,
+      }
+    ),
+  }),
+  itemGroup: {
+    className: cn("m-0 p-3 text-gray-800 bg-white font-bold", " ", "cursor-auto"),
+  },
+  header: {
+    className: cn("p-3 border-b border-gray-300 text-gray-700 bg-gray-100 mt-0 rounded-tl-lg rounded-tr-lg"),
+  },
+  filterContainer: {
+    className: "relative",
+  },
+  filterInput: {
+    className: cn(
+      "pr-7 -mr-7",
+      "w-full",
+      "font-sans text-base text-gray-700 bg-white py-3 px-3 border border-gray-300 transition duration-200 rounded-lg appearance-none",
+      "hover:border-[rgba(251,194,199,0.7)] focus:outline-none focus:outline-offset-0 focus:shadow-[0_0_0_0.2rem_rgba(251,194,199,1)] "
+    ),
+  },
+  filterIcon: { className: "-mt-2 absolute top-1/2" },
+  clearIcon: { className: "text-gray-500 right-12 -mt-2 absolute top-1/2" },
+};
+
+export const selectedPriorityTemplate = (option: { label: string; value: number }) => {
+  return (
+    <div class="flex items-center">
+      <FlagIconSolid
+        className={cn(
+          "mr-2 size-4",
+          { "text-[rgba(18,26,230,0.29)]": option.value == 1 },
+          { "text-[rgba(97,200,232,0.6)]": option.value == 2 },
+          {
+            "text-[rgba(247,220,52,0.61)]": option.value == 3,
+          },
+          { "text-[rgba(251,194,199,0.53)]": option.value == 4 }
+        )}
+      />
+      <span>{option.label}</span>
+    </div>
+  );
+};

src/pages/profile_tasks.tsx

@@ -1,6 +1,7 @@
 //! Файл большой, потому что было лень делить на компоненты
 import Task from "@/components/task";
 
+import MainSvg from "@/assets/main.svg";
 import ModalCalendar from "@/components/ModalCalendar";
 import ModalTags, { ITags } from "@/components/ModalTags";
 import Button from "@/components/ui/Button";
@@ -24,21 +25,34 @@ import {
   XMarkIcon,
 } from "@heroicons/react/24/outline";
 import { FunctionComponent } from "preact";
+import "preact/debug";
 import { useEffect, useMemo, useRef, useState } from "preact/hooks";
 import { Checkbox, CheckboxPassThroughMethodOptions } from "primereact/checkbox";
+import { Dropdown } from "primereact/dropdown";
+import { SelectItem } from "primereact/selectitem";
 import { Nullable } from "primereact/ts-helpers";
 import { SubmitHandler, useForm } from "react-hook-form";
 import { v4 as uuid } from "uuid";
 import {
   IApiResponse,
+  IAPITag,
   ICreateTaskResponse,
   IDeleteTaskResponse,
   IEditTaskResponse,
   ITask,
   ITaskDetails,
   ITaskForm,
+  IViewTagsResponse,
 } from "./profile_tasks.dto";
 import classes from "./profile_tasks.module.scss";
+import { DropdownStyles, selectedPriorityTemplate } from "./profile_tasks.prime.styles";
+
+const priorities: SelectItem[] = [
+  { label: "Приоритет 1", value: 1 },
+  { label: "Приоритет 2", value: 2 },
+  { label: "Приоритет 3", value: 3 },
+  { label: "Приоритет 4", value: 4 },
+];
 
 const ProfileTasks: FunctionComponent = () => {
   const [openModal, setIsOpen] = useState(false); // Открыта модалка
@@ -51,42 +65,51 @@ const ProfileTasks: FunctionComponent = () => {
   const [isCreating, setIsCreating] = useState(false); // Включено создание задачи
   const [editContent, setEditContent] = useState<ITask | null>(null); // Содержимое редактируемой задачи
   const [calendarDate, setCalendarDate] = useState<Nullable<Date>>(); // Выбранная в календаре дата
-  const [tags, setTags] = useState<ITags>({ first: "", second: "", overdue: false });
+  const [tags, setTags] = useState<ITags>({ first: 0, second: 0, overdue: false });
   const [showDeleteDialog, setShowDeleteDialog] = useState(false);
   const [searchQuery, setSearchQuery] = useState(""); // Текст поиска
-  const [filterTags, setFilterTags] = useState<ITags>({ first: "", second: "", overdue: false });
+  const [filterTags, setFilterTags] = useState<ITags>({ first: 0, second: 0, overdue: false });
   const [openFirstList, setOpenFirstList] = useState(false);
   const [openSecondList, setOpenSecondList] = useState(false);
+  const [selectedPriority, setSelectedPriority] = useState(4);
   const getDate = useMemo(() => {
     const date = new Date();
     const formatter = new Intl.DateTimeFormat("ru-RU", { month: "long", day: "numeric" });
     return formatter.format(date);
   }, []);
   const [tasks, setTasks] = useState<ITask[]>([]);
-  const [subjectChoices, setSubjectChoices] = useState<Record<string, string>>({});
+  const [subjectChoices, setSubjectChoices] = useState<IAPITag[]>([]);
-  const [taskTypeChoices, setTaskTypeChoices] = useState<Record<string, string>>({});
+  const [taskTypeChoices, setTaskTypeChoices] = useState<IAPITag[]>([]);
   const [isLoading, setIsLoading] = useState(true);
 
   useEffect(() => {
     fetchTasks();
+    fetchTags();
   }, []);
 
+  const fetchTags = async () => {
+    try {
+      const response = await apiClient<IViewTagsResponse>("/api/tags/view_tags/");
+      setSubjectChoices(response.subjects);
+      setTaskTypeChoices(response.taskTypes);
+    } catch (error) {
+      console.error("Failed to fetch tags:", error);
+    }
+  };
+
   const fetchTasks = async () => {
     try {
       setIsLoading(true);
       const response = await apiClient<IApiResponse>("/api/tasks/view_tasks/");
-
-      setSubjectChoices(response.subject_choices);
-      setTaskTypeChoices(response.task_type_choices);
-
       const convertedTasks: ITask[] = response.tasks.map((apiTask) => ({
         id: apiTask.id.toString(),
         name: apiTask.title,
+        priority: apiTask.priority,
         checked: apiTask.isCompleted,
         date: new Date(apiTask.due_date),
         description: apiTask.description,
-        tags: [apiTask.subject, apiTask.task_type],
+        subject: apiTask.subject,
-        new: false,
+        taskType: apiTask.taskType,
       }));
 
       setTasks(convertedTasks);
@@ -105,14 +128,21 @@ const ProfileTasks: FunctionComponent = () => {
     formState: { errors },
   } = useForm<ITaskForm>({
     defaultValues: {
-      tags: [],
+      subject: {
+        name: "",
+        id: 0,
+      },
+      taskType: {
+        name: "",
+        id: 0,
+      },
     },
   });
 
   const example_tags = useMemo(
     () => ({
-      first: Object.keys(subjectChoices),
+      first: subjectChoices,
-      second: Object.keys(taskTypeChoices),
+      second: taskTypeChoices,
     }),
     [subjectChoices, taskTypeChoices]
   );
@@ -122,14 +152,14 @@ const ProfileTasks: FunctionComponent = () => {
       setError("date", { message: "Выберите дату" });
       return;
     }
-    if ((!editContent?.tags[0] || !editContent.tags[1]) && (!tags.first || !tags.second)) {
+    if ((!editContent?.subject.id || !editContent.taskType.id) && (!tags.first || !tags.second)) {
-      setError("tags", { message: "Выберите теги" });
+      setError("subject", { message: "Выберите теги" });
       return;
     }
 
     try {
-      const selectedSubject = editContent?.tags[0] || tags.first;
+      const selectedSubject = editContent?.subject.id || tags.first;
-      const selectedTaskType = editContent?.tags[1] || tags.second;
+      const selectedTaskType = editContent?.taskType.id || tags.second;
 
       // Format date to DD-MM-YYYYTHH:MM
       const formattedDate = calendarDate
@@ -148,9 +178,10 @@ const ProfileTasks: FunctionComponent = () => {
       const taskData = {
         title: data.name,
         description: data.description || "",
-        subject: selectedSubject,
+        subject_id: selectedSubject,
-        taskType: selectedTaskType,
+        taskType_id: selectedTaskType,
         dateTime_due: formattedDate,
+        priority: selectedPriority,
         telegram_notifications: false,
       };
 
@@ -177,7 +208,7 @@ const ProfileTasks: FunctionComponent = () => {
       await fetchTasks();
 
       if (isCreating) setIsOpen(false);
-      setTags({ first: "", second: "", overdue: false });
+      setTags({ first: 0, second: 0, overdue: false });
     } catch (error) {
       console.error("Failed to save task:", error);
     }
@@ -192,15 +223,24 @@ const ProfileTasks: FunctionComponent = () => {
       name: "",
       description: "",
       date: "",
-      tags: [],
+      subject: {
+        name: "",
+        id: 0,
+      },
+      taskType: {
+        name: "",
+        id: 0,
+      },
+      priority: 4,
       checked: false,
     });
+    setSelectedPriority(4);
   }, [isCreating]);
   useEffect(() => {
     if (!editContent) return;
     const newEditContent = editContent;
-    if (tags.first) newEditContent.tags = [tags.first, newEditContent.tags[1]];
+    if (tags.first) newEditContent.subject = subjectChoices.find((choice) => choice.id === tags.first)!;
-    if (tags.second) newEditContent.tags = [newEditContent.tags[0], tags.second];
+    if (tags.second) newEditContent.taskType = taskTypeChoices.find((choice) => choice.id === tags.second)!;
     setEditContent(newEditContent);
   }, [tags]);
 
@@ -304,8 +344,8 @@ const ProfileTasks: FunctionComponent = () => {
     if (filterTags.first || filterTags.second) {
       filtered = filtered.filter(
         (task) =>
-          (!filterTags.first || task.tags[0] === filterTags.first) &&
+          (!filterTags.first || task.subject.id === filterTags.first) &&
-          (!filterTags.second || task.tags[1] === filterTags.second)
+          (!filterTags.second || task.taskType.id === filterTags.second)
       );
     }
 
@@ -326,18 +366,21 @@ const ProfileTasks: FunctionComponent = () => {
       const task: ITask = {
         id: taskId,
         name: taskDetails.title,
+        priority: taskDetails.priority,
         checked: false,
         date: new Date(taskDetails.dateTime_due),
         description: taskDetails.description,
-        tags: [taskDetails.subject, taskDetails.taskType],
+        subject: taskDetails.subject,
-        new: false,
+        taskType: taskDetails.task_type,
       };
+      console.log(task);
 
       setIsOpen(true);
       setIsEdit(true);
       setEditContent(task);
       setCalendarDate(task.date);
       setIsEditModal(false);
+      setSelectedPriority(task.priority);
     } catch (error) {
       console.error("Failed to fetch task details:", error);
     }
@@ -351,13 +394,14 @@ const ProfileTasks: FunctionComponent = () => {
         </div>
       ) : (
         <ModalTags
+          refreshTags={fetchTags}
           zIndex={70}
           isOpen={openModalTags}
           setIsOpen={setOpenModalTags}
           tagsList={example_tags}
           value={tags}
           onClose={() => {
-            if (!isCreating) setTags({ first: "", second: "", overdue: false });
+            if (!isCreating) setTags({ first: 0, second: 0, overdue: false });
           }}
           onChange={setTags}
         />
@@ -381,7 +425,7 @@ const ProfileTasks: FunctionComponent = () => {
           setEditContent(null);
           setIsCreating(false);
           setIsEditModal(false);
-          setTags({ first: "", second: "", overdue: false });
+          setTags({ first: 0, second: 0, overdue: false });
           setCalendarDate(null);
         }}
       >
@@ -417,6 +461,7 @@ const ProfileTasks: FunctionComponent = () => {
                     maxLength: { value: 200, message: "Максимум 200 символов в описании" },
                   })}
                 />
+
                 <input
                   type="datetime-local"
                   value={calendarDate ? calendarDate.toISOString().slice(0, 16) : ""}
@@ -459,7 +504,7 @@ const ProfileTasks: FunctionComponent = () => {
             {errors.name && <p class="text-red-500">{errors.name.message}</p>}
             {errors.description && <p class="text-red-500">{errors.description.message}</p>}
             {errors.date && <p class="text-red-500">{errors.date.message}</p>}
-            {errors.tags && <p class="text-red-500">{errors.tags.message}</p>}
+            {errors.subject && <p class="text-red-500">{errors.subject.message}</p>}
             <div class="flex flex-col items-center gap-6 self-center md:flex-row md:justify-start md:self-start">
               <div
                 class={cn("flex h-full flex-row items-center gap-1 rounded-2xl bg-[rgba(251,194,199,0.38)] px-2 py-1", {
@@ -488,19 +533,28 @@ const ProfileTasks: FunctionComponent = () => {
                 })}
                 onClick={() => {
                   if (!isEditModal) return;
-                  setTags({ first: editContent.tags[0], second: editContent.tags[1], overdue: false });
+                  setTags({ first: editContent.subject.id, second: editContent.taskType.id, overdue: false });
                   setOpenModalTags(true);
                 }}
               >
                 <p class="flex flex-row gap-2">
                   <BookOpenIcon class="size-5" />
-                  {editContent.tags[0]}
+                  {editContent.subject.name}
                 </p>
                 <p class="flex flex-row gap-2">
                   <DocumentDuplicateIcon class="size-5" />
-                  {editContent.tags[1]}
+                  {editContent.taskType.name}
                 </p>
               </div>
+              <Dropdown
+                disabled={!isEditModal}
+                pt={DropdownStyles}
+                options={priorities}
+                value={selectedPriority}
+                onChange={(e) => setSelectedPriority(e.value)}
+                itemTemplate={selectedPriorityTemplate}
+                valueTemplate={selectedPriorityTemplate}
+              />
             </div>
           </form>
         )}
@@ -532,6 +586,14 @@ const ProfileTasks: FunctionComponent = () => {
                   hidden
                   {...register("date")}
                 />
+                <Dropdown
+                  pt={DropdownStyles}
+                  options={priorities}
+                  value={selectedPriority}
+                  onChange={(e) => setSelectedPriority(e.value)}
+                  itemTemplate={selectedPriorityTemplate}
+                  valueTemplate={selectedPriorityTemplate}
+                />
                 <input type="checkbox" checked={false} hidden {...register("checked")} />
               </div>
               <div class="flex flex-col gap-3 self-start md:flex-row">
@@ -547,7 +609,7 @@ const ProfileTasks: FunctionComponent = () => {
             </div>
             {errors.name && <p class="text-red-500">{errors.name.message}</p>}
             {errors.date && <p class="text-red-500">{errors.date.message}</p>}
-            {errors.tags && <p class="text-red-500">{errors.tags.message}</p>}
+            {errors.subject?.message && <p class="text-red-500">{errors.subject.message}</p>}
             <div className="mb-8 flex h-16 flex-col items-center gap-6 self-center md:mb-0 md:flex-row md:self-start">
               <Button
                 className="text-sm"
@@ -568,11 +630,12 @@ const ProfileTasks: FunctionComponent = () => {
         isOpen={showDeleteDialog}
         setIsOpen={setShowDeleteDialog}
         title="Удаление задачи"
-        content="Вы уверены, что хотите удалить эту задачу?"
         onConfirm={handleDeleteTask}
         confirmText="Удалить"
         cancelText="Отмена"
-      />
+      >
+        <p class="mb-6 text-sm sm:text-[1rem]">"Вы уверены, что хотите удалить эту задачу?"</p>
+      </Dialog>
       {!searchQuery && !filterTags.first && !filterTags.second && !filterTags.overdue ? (
         filteredTasks.length > 0 ? (
           <>
@@ -610,6 +673,7 @@ const ProfileTasks: FunctionComponent = () => {
                     <Task
                       name={task.name}
                       key={task.id}
+                      priority={task.priority}
                       checked={task.checked}
                       overdue={task.date < new Date()}
                       onClick={() => handleViewTask(task.id)}
@@ -626,6 +690,7 @@ const ProfileTasks: FunctionComponent = () => {
                   {groupTasksByDate.tomorrow.map((task) => (
                     <Task
                       name={task.name}
+                      priority={task.priority}
                       key={task.id}
                       checked={task.checked}
                       onClick={() => handleViewTask(task.id)}
@@ -640,6 +705,7 @@ const ProfileTasks: FunctionComponent = () => {
                   {group.tasks.map((task) => (
                     <Task
                       name={task.name}
+                      priority={task.priority}
                       key={task.id}
                       checked={task.checked}
                       onClick={() => handleViewTask(task.id)}
@@ -651,7 +717,10 @@ const ProfileTasks: FunctionComponent = () => {
             </div>
           </>
         ) : (
-          <div class="flex w-full flex-1 flex-col items-center justify-center text-2xl">Начни уже сегодня!</div>
+          <div class="my-auto flex h-full w-full flex-col items-center justify-start">
+            <img src={MainSvg} />
+            <div class="flex w-full flex-1 flex-col items-center justify-center text-2xl">Начни уже сегодня!</div>
+          </div>
         )
       ) : (
         <div class={classes.tasks_container}>
@@ -686,6 +755,7 @@ const ProfileTasks: FunctionComponent = () => {
             filteredTasks.map((task) => (
               <Task
                 name={task.name}
+                priority={task.priority}
                 key={task.id}
                 checked={task.checked}
                 overdue={task.date < new Date()}
@@ -710,28 +780,30 @@ const ProfileTasks: FunctionComponent = () => {
         >
           <PlusIcon />
         </div>
-        <div class="absolute left-0 my-auto hidden flex-row space-x-3 opacity-0 transition-opacity duration-100 group-hover:opacity-100 md:flex">
+        {tasks.length > 0 && (
-          <div
+          <div class="absolute left-0 my-auto hidden flex-row space-x-3 opacity-0 transition-opacity duration-100 group-hover:opacity-100 md:flex">
-            class="pointer-events-none flex aspect-square h-20 cursor-pointer flex-col items-center justify-center rounded-full bg-[rgba(206,232,251,0.7)] text-xl text-gray-600 shadow-[0px_4px_4px_0px_rgba(0,0,0,0.25)] group-hover:pointer-events-auto hover:bg-[rgba(206,232,251,0.9)]"
+            <div
-            onClick={(e) => {
+              class="pointer-events-none flex aspect-square h-20 cursor-pointer flex-col items-center justify-center rounded-full bg-[rgba(206,232,251,0.7)] text-xl text-gray-600 shadow-[0px_4px_4px_0px_rgba(0,0,0,0.25)] group-hover:pointer-events-auto hover:bg-[rgba(206,232,251,0.9)]"
-              e.stopPropagation();
-              if (!openSearchModal) setOpenFilterModal(false);
-              setOpenSearchModal(!openSearchModal);
-            }}
-          >
-            <MagnifyingGlassIcon class="size-12" />
-          </div>
-          <div class="pointer-events-none flex aspect-square h-20 cursor-pointer flex-col items-center justify-center rounded-full bg-[rgba(206,232,251,0.7)] text-xl text-gray-600 shadow-[0px_4px_4px_0px_rgba(0,0,0,0.25)] group-hover:pointer-events-auto hover:bg-[rgba(206,232,251,0.9)]">
-            <FunnelIcon
-              class="size-12"
               onClick={(e) => {
                 e.stopPropagation();
-                if (!openFilterModal) setOpenSearchModal(false);
+                if (!openSearchModal) setOpenFilterModal(false);
-                setOpenFilterModal(!openFilterModal);
+                setOpenSearchModal(!openSearchModal);
               }}
-            />
+            >
+              <MagnifyingGlassIcon class="size-12" />
+            </div>
+            <div class="pointer-events-none flex aspect-square h-20 cursor-pointer flex-col items-center justify-center rounded-full bg-[rgba(206,232,251,0.7)] text-xl text-gray-600 shadow-[0px_4px_4px_0px_rgba(0,0,0,0.25)] group-hover:pointer-events-auto hover:bg-[rgba(206,232,251,0.9)]">
+              <FunnelIcon
+                class="size-12"
+                onClick={(e) => {
+                  e.stopPropagation();
+                  if (!openFilterModal) setOpenSearchModal(false);
+                  setOpenFilterModal(!openFilterModal);
+                }}
+              />
+            </div>
           </div>
-        </div>
+        )}
       </div>
       {openSearchModal && (
         <div class="fixed bottom-28 z-50 w-full rounded-lg bg-white p-4 shadow-lg md:absolute md:right-[24rem] md:mx-0 md:w-80">
@@ -817,30 +889,32 @@ const ProfileTasks: FunctionComponent = () => {
                   }}
                 >
                   <BookOpenIcon class="size-5" />
-                  <span>{filterTags.first || "Предмет"}</span>
+                  <span>{subjectChoices.find((s) => s.id === filterTags.first)?.name || "Предмет"}</span>
                 </div>
                 {openFirstList && (
-                  <div class="absolute top-full right-0 z-50 w-64 rounded-lg bg-white p-2 shadow-lg md:top-0 md:right-full md:mr-2">
+                  <div class="absolute top-full right-0 z-50 max-h-[15rem] w-64 overflow-y-auto rounded-lg bg-white p-2 shadow-lg md:top-0 md:right-full md:mr-2">
-                    {example_tags.first.map((tag) => (
+                    {example_tags.first.map((tag) => {
-                      <div
+                      return (
-                        key={tag}
-                        class="group flex cursor-pointer items-center gap-2 rounded-lg px-4 py-2 hover:bg-[rgba(206,232,251,0.3)]"
-                        onClick={() => {
-                          setFilterTags({ ...filterTags, first: tag });
-                          setOpenFirstList(false);
-                        }}
-                      >
                         <div
-                          class={cn("flex h-5 w-5 items-center justify-center rounded-full border-2", {
+                          key={`subject_${tag.id}`}
-                            "border-[#FBC2C7] bg-[#FBC2C7]": filterTags.first === tag,
+                          class="group flex cursor-pointer items-center gap-2 rounded-lg px-4 py-2 hover:bg-[rgba(206,232,251,0.3)]"
-                            "border-[#D4D4D4]": filterTags.first !== tag,
+                          onClick={() => {
-                          })}
+                            setFilterTags({ ...filterTags, first: tag.id });
+                            setOpenFirstList(false);
+                          }}
                         >
-                          {filterTags.first === tag && <div class="h-2.5 w-2.5 rounded-full bg-white" />}
+                          <div
+                            class={cn("flex h-5 w-5 items-center justify-center rounded-full border-2", {
+                              "border-[#FBC2C7] bg-[#FBC2C7]": filterTags.first === tag.id,
+                              "border-[#D4D4D4]": filterTags.first !== tag.id,
+                            })}
+                          >
+                            {filterTags.first === tag.id && <div class="h-2.5 w-2.5 rounded-full bg-white" />}
+                          </div>
+                          <span class="text-sm font-medium text-[#404040]">{tag.name}</span>
                         </div>
-                        <span class="text-sm font-medium text-[#404040]">{tag}</span>
+                      );
-                      </div>
+                    })}
-                    ))}
                   </div>
                 )}
               </div>
@@ -859,28 +933,28 @@ const ProfileTasks: FunctionComponent = () => {
                   }}
                 >
                   <DocumentDuplicateIcon class="size-5" />
-                  <span>{filterTags.second || "Задача"}</span>
+                  <span>{taskTypeChoices.find((s) => s.id === filterTags.second)?.name || "Задача"}</span>
                 </div>
                 {openSecondList && (
-                  <div class="absolute top-full right-0 z-50 w-64 rounded-lg bg-white p-2 shadow-lg md:top-0 md:right-full md:mr-2">
+                  <div class="absolute top-full right-0 z-50 max-h-[15rem] w-64 overflow-y-auto rounded-lg bg-white p-2 shadow-lg md:top-0 md:right-full md:mr-2">
                     {example_tags.second.map((tag) => (
                       <div
-                        key={tag}
+                        key={`taskType_${tag.id}`}
                         class="group flex cursor-pointer items-center gap-2 rounded-lg px-4 py-2 hover:bg-[rgba(206,232,251,0.3)]"
                         onClick={() => {
-                          setFilterTags({ ...filterTags, second: tag });
+                          setFilterTags({ ...filterTags, second: tag.id });
                           setOpenSecondList(false);
                         }}
                       >
                         <div
                           class={cn("flex h-5 w-5 items-center justify-center rounded-full border-2", {
-                            "border-[#FBC2C7] bg-[#FBC2C7]": filterTags.second === tag,
+                            "border-[#FBC2C7] bg-[#FBC2C7]": filterTags.second === tag.id,
-                            "border-[#D4D4D4]": filterTags.second !== tag,
+                            "border-[#D4D4D4]": filterTags.second !== tag.id,
                           })}
                         >
-                          {filterTags.second === tag && <div class="h-2.5 w-2.5 rounded-full bg-white" />}
+                          {filterTags.second === tag.id && <div class="h-2.5 w-2.5 rounded-full bg-white" />}
                         </div>
-                        <span class="text-sm font-medium text-[#404040]">{tag}</span>
+                        <span class="text-sm font-medium text-[#404040]">{tag.name}</span>
                       </div>
                     ))}
                   </div>
@@ -891,7 +965,7 @@ const ProfileTasks: FunctionComponent = () => {
                 <button
                   class="mt-2 w-full rounded-lg bg-red-100 px-4 py-2 text-red-600 hover:bg-red-200"
                   onClick={() => {
-                    setFilterTags({ first: "", second: "", overdue: false });
+                    setFilterTags({ first: 0, second: 0, overdue: false });
                     setOpenFirstList(false);
                     setOpenSecondList(false);
                   }}