popovspiridon99/tests
1
0
Fork 0
forked from VinokurovVE/tests
Code Issues Pull Requests Projects Releases Wiki Activity

Cleanup, shared create modal

Browse Source
This commit is contained in:
cracklesparkle
2024-07-22 16:42:17 +09:00
parent e1f9dc762c
commit 0ac0534486
11 changed files with 157 additions and 480 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
frontend_reactjs/src/pages/Roles.tsx
View File

@ -2,13 +2,20 @@ import { useState } from 'react'
import { Box, Button, CircularProgress } from '@mui/material'
import { DataGrid, GridColDef } from '@mui/x-data-grid'
import { useRoles } from '../hooks/swrHooks'
import CreateRoleModal from '../components/modals/CreateRoleModal'
import { CreateField } from '../interfaces/create'
import ModalCreate from '../components/modals/ModalCreate'
import RoleService from '../services/RoleService'
export default function Roles() {
const { roles, isError, isLoading } = useRoles()
const [open, setOpen] = useState(false)
const createFields: CreateField[] = [
{ key: 'name', headerName: 'Название', type: 'string', required: true, defaultValue: '' },
{ key: 'description', headerName: 'Описание', type: 'string', required: false, defaultValue: '' },
]
const columns: GridColDef[] = [
{ field: 'id', headerName: 'ID', type: "number", width: 70 },
{ field: 'name', headerName: 'Название', width: 90, editable: true },
@ -30,9 +37,12 @@ export default function Roles() {
Добавить роль
</Button>
<CreateRoleModal
<ModalCreate
open={open}
setOpen={setOpen}
fields={createFields}
submitHandler={RoleService.createRole}
title="Создание роли"
/>
<DataGrid

6
frontend_reactjs/src/pages/Settings.tsx
View File

@ -3,7 +3,6 @@ import { DataGrid, GridColDef } from "@mui/x-data-grid"
import { useRoles, useUsers } from "../hooks/swrHooks"
import { IRole } from "../interfaces/role"
import { useState } from "react"
import CreateUserModal from "../components/modals/CreateUserModal"
export default function Settings() {
const { users, isError, isLoading } = useUsers()
@ -50,11 +49,6 @@ export default function Settings() {
Добавить пользователя
</Button>
<CreateUserModal
open={open}
setOpen={setOpen}
/>
<DataGrid
autoHeight
style={{ width: "100%" }}

18
frontend_reactjs/src/pages/Users.tsx
View File

@ -3,7 +3,9 @@ import { DataGrid, GridColDef } from "@mui/x-data-grid"
import { useRoles, useUsers } from "../hooks/swrHooks"
import { IRole } from "../interfaces/role"
import { useState } from "react"
import CreateUserModal from "../components/modals/CreateUserModal"
import { CreateField } from "../interfaces/create"
import ModalCreate from "../components/modals/ModalCreate"
import UserService from "../services/UserService"
export default function Users() {
const { users, isError, isLoading } = useUsers()
@ -12,6 +14,15 @@ export default function Users() {
const [open, setOpen] = useState(false)
const createFields: CreateField[] = [
{ key: 'email', headerName: 'E-mail', type: 'string', required: true, defaultValue: '' },
{ key: 'login', headerName: 'Логин', type: 'string', required: true, defaultValue: '' },
{ key: 'phone', headerName: 'Телефон', type: 'string', required: false, defaultValue: '' },
{ key: 'name', headerName: 'Имя', type: 'string', required: true, defaultValue: '' },
{ key: 'surname', headerName: 'Фамилия', type: 'string', required: true, defaultValue: '' },
{ key: 'password', headerName: 'Пароль', type: 'string', required: true, defaultValue: '' },
]
const columns: GridColDef[] = [
{ field: 'id', headerName: 'ID', type: "number", width: 70 },
{ field: 'email', headerName: 'Email', width: 130, editable: true },
@ -45,9 +56,12 @@ export default function Users() {
Добавить пользователя
</Button>
<CreateUserModal
<ModalCreate
open={open}
setOpen={setOpen}
fields={createFields}
submitHandler={UserService.createUser}
title="Создание пользователя"
/>
<DataGrid