From b11bfddbd758fd347bf62f8e0526dfc3088d0599 Mon Sep 17 00:00:00 2001 From: Nikolai Date: Mon, 26 Sep 2022 15:35:56 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BC=D0=BE=D0=BA=20=D0=BF=D0=BE=D0=BB=D1=8C?= =?UTF-8?q?=D0=B7=D0=BE=D0=B2=D0=B0=D1=82=D0=B5=D0=BB=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package-lock.json | 28 +- package.json | 4 +- .../LoggedIn/Content/Users/index.tsx | 258 +++++++----------- src/api/roles.ts | 2 +- 4 files changed, 120 insertions(+), 172 deletions(-) diff --git a/package-lock.json b/package-lock.json index b4e1616..2562b25 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,8 +15,8 @@ "@mui/icons-material": "^5.10.3", "@mui/material": "^5.10.5", "@mui/styled-engine-sc": "^5.10.3", - "@mui/x-data-grid": "^5.17.3", - "@mui/x-date-pickers": "^5.0.2", + "@mui/x-data-grid": "^5.17.4", + "@mui/x-date-pickers": "^5.0.3", "@testing-library/jest-dom": "^5.16.5", "@testing-library/react": "^13.3.0", "@testing-library/user-event": "^13.5.0", @@ -3718,9 +3718,9 @@ "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==" }, "node_modules/@mui/x-data-grid": { - "version": "5.17.3", - "resolved": "https://registry.npmjs.org/@mui/x-data-grid/-/x-data-grid-5.17.3.tgz", - "integrity": "sha512-EBTD7nfV3b6Zz7X8IS0BR4x3ihzHqGAemP6Ah22N/oHTIz+HWsCMtsYWRs5SjQewVjY8JXJ3fcJJEgldOcaqqg==", + "version": "5.17.4", + "resolved": "https://registry.npmjs.org/@mui/x-data-grid/-/x-data-grid-5.17.4.tgz", + "integrity": "sha512-cxZuu65Whh1DNU9M2X5ljDOx+GAEpGeJLPnugMjhgqTOszfJZX/4kI7NftrPy051Hy0um0sv0NVTDSFXG6yixA==", "dependencies": { "@babel/runtime": "^7.18.9", "@mui/utils": "^5.10.3", @@ -3743,9 +3743,9 @@ } }, "node_modules/@mui/x-date-pickers": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/@mui/x-date-pickers/-/x-date-pickers-5.0.2.tgz", - "integrity": "sha512-O2yxax8SnUX/M1lfU8+fcBEY+PmOnl0T4onmNrnFOT/7wiry7OYQDLa48nFpBYIK8ROjfi4sPzEKiFCrcwEwjw==", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/@mui/x-date-pickers/-/x-date-pickers-5.0.3.tgz", + "integrity": "sha512-njoQvsh7WzgiHu0wGSSPnQ4emT3SDzxCpaKK9DM0jRaxyxfC2wQX431RWmouG8JjnugTltwLnPwkKjLclHQhhA==", "dependencies": { "@babel/runtime": "^7.18.9", "@date-io/core": "^2.15.0", @@ -20205,9 +20205,9 @@ } }, "@mui/x-data-grid": { - "version": "5.17.3", - "resolved": "https://registry.npmjs.org/@mui/x-data-grid/-/x-data-grid-5.17.3.tgz", - "integrity": "sha512-EBTD7nfV3b6Zz7X8IS0BR4x3ihzHqGAemP6Ah22N/oHTIz+HWsCMtsYWRs5SjQewVjY8JXJ3fcJJEgldOcaqqg==", + "version": "5.17.4", + "resolved": "https://registry.npmjs.org/@mui/x-data-grid/-/x-data-grid-5.17.4.tgz", + "integrity": "sha512-cxZuu65Whh1DNU9M2X5ljDOx+GAEpGeJLPnugMjhgqTOszfJZX/4kI7NftrPy051Hy0um0sv0NVTDSFXG6yixA==", "requires": { "@babel/runtime": "^7.18.9", "@mui/utils": "^5.10.3", @@ -20217,9 +20217,9 @@ } }, "@mui/x-date-pickers": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/@mui/x-date-pickers/-/x-date-pickers-5.0.2.tgz", - "integrity": "sha512-O2yxax8SnUX/M1lfU8+fcBEY+PmOnl0T4onmNrnFOT/7wiry7OYQDLa48nFpBYIK8ROjfi4sPzEKiFCrcwEwjw==", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/@mui/x-date-pickers/-/x-date-pickers-5.0.3.tgz", + "integrity": "sha512-njoQvsh7WzgiHu0wGSSPnQ4emT3SDzxCpaKK9DM0jRaxyxfC2wQX431RWmouG8JjnugTltwLnPwkKjLclHQhhA==", "requires": { "@babel/runtime": "^7.18.9", "@date-io/core": "^2.15.0", diff --git a/package.json b/package.json index b03290c..8e22967 100644 --- a/package.json +++ b/package.json @@ -10,8 +10,8 @@ "@mui/icons-material": "^5.10.3", "@mui/material": "^5.10.5", "@mui/styled-engine-sc": "^5.10.3", - "@mui/x-data-grid": "^5.17.3", - "@mui/x-date-pickers": "^5.0.2", + "@mui/x-data-grid": "^5.17.4", + "@mui/x-date-pickers": "^5.0.3", "@testing-library/jest-dom": "^5.16.5", "@testing-library/react": "^13.3.0", "@testing-library/user-event": "^13.5.0", diff --git a/src/Components/LoggedIn/Content/Users/index.tsx b/src/Components/LoggedIn/Content/Users/index.tsx index 2671716..ec5ba06 100644 --- a/src/Components/LoggedIn/Content/Users/index.tsx +++ b/src/Components/LoggedIn/Content/Users/index.tsx @@ -1,18 +1,21 @@ import * as React from "react"; import { useNavigate } from "react-router-dom"; import { Box, Typography, TextField, Button } from "@mui/material"; -import Table from '@mui/material/Table'; -import TableHead from '@mui/material/TableHead'; -import TableBody from '@mui/material/TableBody'; -import TableCell from '@mui/material/TableCell'; -import TableRow from '@mui/material/TableRow'; -import Radio from '@mui/material/Radio'; +import Table from "@mui/material/Table"; +import TableHead from "@mui/material/TableHead"; +import TableBody from "@mui/material/TableBody"; +import TableCell from "@mui/material/TableCell"; +import TableRow from "@mui/material/TableRow"; +import Radio from "@mui/material/Radio"; +import Skeleton from "@mui/material/Skeleton"; import { getRoles_mock, TMockData } from "../../../../api/roles"; import theme from "../../../../theme" const Users: React.FC = () => { - const [selectedValue, setSelectedValue] = React.useState('a'); + const radioboxes = [ "a", "b", "c" ]; + + const [selectedValue, setSelectedValue] = React.useState("a"); const handleChange = (event: React.ChangeEvent) => { setSelectedValue(event.target.value); }; @@ -21,11 +24,13 @@ const Users: React.FC = () => { const [data, setData] = React.useState([]); const handleChangeData = () => { - getRoles_mock().then((mockdata: TMockData) => { - setData( mockdata ) + getRoles_mock().then((mockdata) => { + setData( mockdata ); }) }; + handleChangeData(); + return ( - { - data - ? YES
- : NO
+ data.length + ? ( + + + + + + Имя + + + + + Описание + + + + + Отобразить + + + + + + + + { + data.map(function(item, i) { + return( + + + + { item.name } + + + + + { item.desc } + + + + + + + ); + }) + } + + +
+ ) : ( + + ) } - - - - - - Имя - - - - - Описание - - - - - Отобразить - - - - - - - - - - admin - - - - - Администратор сервиса - - - - - - - - - - - manager - - - - - Менеджер сервиса - - - - - - - - - - - user - - - - - Пользователь сервиса - - - - - - - -
- - { +export const getRoles_mock = ():Promise => { return new Promise((resolve) => { setTimeout(() => { resolve( MOCK_DATA_USERS );