- {Array.isArray(roleOptions) &&
+
+ {Array.isArray(roleOptions) && Array.isArray(data) &&
{
+ console.log(rowId, columnId, value)
+ setData((prev) =>
+ prev.map((row) =>
+ row.id === rowId ? { ...row, [columnId]: value } : row
+ )
+ )
+ }}
columns={[
{
- accessorKey: 'email',
+ name: 'email',
header: 'E-mail',
- cell: (info) => info.getValue(),
+ type: "string"
},
{
- accessorKey: 'login',
+ name: 'login',
header: 'Логин',
- cell: (info) => info.getValue(),
+ type: "string"
},
{
- accessorKey: 'phone',
+ name: 'phone',
header: 'Телефон',
- cell: (info) => info.getValue(),
+ type: "string"
},
{
- accessorKey: 'name',
+ name: 'name',
header: 'Имя',
- cell: (info) => info.getValue(),
+ type: "string"
},
{
- accessorKey: 'surname',
+ name: 'surname',
header: 'Фамилия',
- cell: (info) => info.getValue(),
+ type: "string"
},
{
- accessorKey: 'is_active',
+ name: 'is_active',
header: 'Активен',
- cell: (info) => info.getValue(),
+ type: "boolean"
},
{
- accessorKey: 'role_id',
+ name: 'role_id',
header: 'Роль',
- cell: (info) => info.getValue(),
+ type: "dictionary" //TODO: dictionary getter by id
}
]} />
}
-
+
)
}
\ No newline at end of file
diff --git a/client/src/pages/auth/PasswordReset.tsx b/client/src/pages/auth/PasswordReset.tsx
index 95390d1..36b66ba 100644
--- a/client/src/pages/auth/PasswordReset.tsx
+++ b/client/src/pages/auth/PasswordReset.tsx
@@ -1,8 +1,8 @@
import { useState } from 'react'
import { SubmitHandler, useForm } from 'react-hook-form';
import AuthService from '../../services/AuthService';
-import { Button, Flex, Loader, Paper, Text, TextInput, Transition } from '@mantine/core';
import { IconCheck } from '@tabler/icons-react';
+import { Button, Input, Spinner, Text } from '@fluentui/react-components';
interface PasswordResetProps {
email: string;
@@ -11,7 +11,7 @@ interface PasswordResetProps {
function PasswordReset() {
const [success, setSuccess] = useState(false)
- const { register, handleSubmit, watch, setError, formState: { errors, isSubmitting } } = useForm({
+ const { register, handleSubmit, watch, setError, formState: { isSubmitting } } = useForm({
defaultValues: {
email: ''
}
@@ -31,65 +31,81 @@ function PasswordReset() {
}
return (
-
-
-
- Восстановление пароля
-
+
+
+ Восстановление пароля
+
-