+
{user.avatar ? (
void handleAddSkill()}
submitDisabled={!skillName.trim() || skillsSaving}
inputDisabled={skillsSaving}
diff --git a/frontend/src/app/users/[id]/page.tsx b/frontend/src/app/users/[id]/page.tsx
index 928b65a5..c091cf97 100644
--- a/frontend/src/app/users/[id]/page.tsx
+++ b/frontend/src/app/users/[id]/page.tsx
@@ -27,7 +27,6 @@ import {
import { useUser } from "@/contexts/UserContext";
import { useUserDetailPage } from "@/hooks/useUserDetailPage";
import { apiClient } from "@/lib/api";
-import { resolveMediaUrl } from "@/lib/url";
import {
formatBirthdayWithYear,
formatProfileDate,
@@ -120,10 +119,10 @@ export default function UserDetailPage() {
}>;
if (!mounted) return;
setAvailableSkills(response);
- } catch (error: any) {
+ } catch (error: unknown) {
if (!mounted) return;
setSkillsError(
- String(error?.message || "Не удалось загрузить список навыков"),
+ String((error as Error)?.message || "Не удалось загрузить список навыков"),
);
} finally {
if (mounted) {
@@ -265,9 +264,9 @@ export default function UserDetailPage() {
}
setSkillName("");
- } catch (error: any) {
+ } catch (error: unknown) {
setSkillsError(
- String(error?.message || "Не удалось добавить навык"),
+ String((error as Error)?.message || "Не удалось добавить навык"),
);
} finally {
setSkillsSaving(false);
diff --git a/frontend/src/components/users/EditUserProfileModal.tsx b/frontend/src/components/users/EditUserProfileModal.tsx
index 4271ab79..bc9c1e2a 100644
--- a/frontend/src/components/users/EditUserProfileModal.tsx
+++ b/frontend/src/components/users/EditUserProfileModal.tsx
@@ -1,9 +1,14 @@
"use client";
+import Image from "next/image";
import type { ChangeEvent } from "react";
+
import { Modal } from "@/components/ui";
+import type {
+ UserProfileEditForm,
+ UserProfileTextField,
+} from "@/lib/users/userDetailUtils";
import type { User } from "@/types/api";
-import type { UserProfileEditForm, UserProfileTextField } from "@/lib/users/userDetailUtils";
type EditUserProfileModalProps = {
actionLoading: string | null;
@@ -19,6 +24,44 @@ type EditUserProfileModalProps = {
person: User | null;
};
+type TextFieldProps = {
+ id: string;
+ label: string;
+ onChange: (value: string) => void;
+ placeholder?: string;
+ required?: boolean;
+ type?: "email" | "tel" | "text";
+ value: string;
+};
+
+function TextField({
+ id,
+ label,
+ onChange,
+ placeholder,
+ required = false,
+ type = "text",
+ value,
+}: TextFieldProps) {
+ return (
+
+ );
+}
+
export default function EditUserProfileModal({
actionLoading,
avatarFailed,
@@ -32,23 +75,30 @@ export default function EditUserProfileModal({
onTextFieldChange,
person,
}: EditUserProfileModalProps) {
+ const isSaving = actionLoading === "edit";
+
const footerContent = (
);
@@ -59,36 +109,49 @@ export default function EditUserProfileModal({
onClose={onClose}
title="Редактировать профиль"
size="lg"
- closeOnEsc={actionLoading !== "edit"}
+ closeOnEsc={!isSaving}
footer={footerContent}
>
- {person && (
+ {person ? (
-
-
-
-
+
+
+
-
+
-
{form.avatarPreview ? (
- // eslint-disable-next-line @next/next/no-img-element
- 
) : avatarUrl && !avatarFailed ? (
- // eslint-disable-next-line @next/next/no-img-element
- 
) : (
- {initials}
+
+ {initials}
+
)}
- - Максимальный размер: 5MB. Форматы: JPG, PNG, GIF -
-
-
-
-
+
+
-
+ onTextFieldChange("lastName", event.target.value)}
+ onChange={(value) => onTextFieldChange("lastName", value)}
placeholder="Иванов"
- className="w-full rounded-lg border border-gray-300 px-4 py-2 text-sm focus:border-sky-500 focus:outline-none focus:ring-2 focus:ring-sky-500/20"
- maxLength={150}
/>
-
-
-
-
- onTextFieldChange("firstName", event.target.value)}
+ onChange={(value) => onTextFieldChange("firstName", value)}
placeholder="Иван"
- className="w-full rounded-lg border border-gray-300 px-4 py-2 text-sm focus:border-sky-500 focus:outline-none focus:ring-2 focus:ring-sky-500/20"
- maxLength={150}
/>
-
-
-
-
- onTextFieldChange("patronymic", event.target.value)}
+ onChange={(value) => onTextFieldChange("patronymic", value)}
placeholder="Иванович"
- className="w-full rounded-lg border border-gray-300 px-4 py-2 text-sm focus:border-sky-500 focus:outline-none focus:ring-2 focus:ring-sky-500/20"
- maxLength={150}
/>
-
-
);
@@ -54,56 +59,62 @@ export default function EmployeeActionModal({
onClose={onClose}
title={form.editingId ? "Редактировать событие" : "Кадровое событие"}
size="sm"
- closeOnEsc={actionLoading !== "action"}
+ closeOnEsc={!isSaving}
footer={footerContent}
>
-
-
+
+
-
+ onTextFieldChange("email", event.target.value)}
+ onChange={(value) => onTextFieldChange("email", value)}
placeholder="ivan@example.com"
- className="w-full rounded-lg border border-gray-300 px-4 py-2 text-sm focus:border-sky-500 focus:outline-none focus:ring-2 focus:ring-sky-500/20"
/>
-
-
-
-
- onTextFieldChange("phone", event.target.value)}
+ onChange={(value) => onTextFieldChange("phone", value)}
placeholder="+7 999 123-45-67"
- className="w-full rounded-lg border border-gray-300 px-4 py-2 text-sm focus:border-sky-500 focus:outline-none focus:ring-2 focus:ring-sky-500/20"
/>
-
-
- )}
+ ) : null}
);
-}
\ No newline at end of file
+}
diff --git a/frontend/src/components/users/EmployeeActionModal.tsx b/frontend/src/components/users/EmployeeActionModal.tsx
index 1a3a3cc3..2dba57a1 100644
--- a/frontend/src/components/users/EmployeeActionModal.tsx
+++ b/frontend/src/components/users/EmployeeActionModal.tsx
@@ -1,7 +1,10 @@
"use client";
import { Modal } from "@/components/ui";
-import type { EmployeeActionField, EmployeeActionForm } from "@/lib/users/userDetailUtils";
+import type {
+ EmployeeActionField,
+ EmployeeActionForm,
+} from "@/lib/users/userDetailUtils";
type EmployeeActionOption = {
value: string;
@@ -27,23 +30,25 @@ export default function EmployeeActionModal({
onFieldChange,
onSave,
}: EmployeeActionModalProps) {
+ const isSaving = actionLoading === "action";
+
const footerContent = (
-
-
+
+
+ onTextFieldChange("telegram", event.target.value)}
+ onChange={(value) => onTextFieldChange("telegram", value)}
placeholder="@username"
- className="w-full rounded-lg border border-gray-300 px-4 py-2 text-sm focus:border-sky-500 focus:outline-none focus:ring-2 focus:ring-sky-500/20"
/>
-
-
-
-
- onTextFieldChange("whatsapp", event.target.value)}
+ onChange={(value) => onTextFieldChange("whatsapp", value)}
placeholder="+7 999 123-45-67"
- className="w-full rounded-lg border border-gray-300 px-4 py-2 text-sm focus:border-sky-500 focus:outline-none focus:ring-2 focus:ring-sky-500/20"
/>
-
-
-
-
- onTextFieldChange("wechat", event.target.value)}
+ onChange={(value) => onTextFieldChange("wechat", value)}
placeholder="username"
- className="w-full rounded-lg border border-gray-300 px-4 py-2 text-sm focus:border-sky-500 focus:outline-none focus:ring-2 focus:ring-sky-500/20"
/>
-
-
-
+
-
-
+
-
-