--

src/api/roles.ts

@@ -21,6 +21,8 @@ export const MOCK_DATA_USERS = [
 
 export type TMockData = typeof MOCK_DATA_USERS;
 
+export type UsersType = { login: string; email: string; phoneNumber: string; isDeleted: boolean; createdAt: string }[];
+
 export const getRoles_mock = (): Promise<TMockData> => {
   return new Promise((resolve) => {
     setTimeout(() => {

src/index.tsx

@@ -7,8 +7,6 @@ import { ThemeProvider } from "@mui/material/styles";
 
 import { SnackbarProvider } from "notistack";
 
-import theme from "./theme";
-
 import PublicRoute from "@kitUI/publicRoute";
 import PrivateRoute from "@kitUI/privateRoute";
 
@@ -26,6 +24,7 @@ import PromocodeManagement from "@pages/dashboard/Content/PromocodeManagement";
 import { SettingRoles } from "@pages/Setting/SettingRoles";
 import Support from "@pages/dashboard/Content/Support/Support";
 
+import theme from "./theme";
 import "./index.css";
 
 const componentsArray = [

src/pages/Setting/ConditionalRender.tsx

@@ -3,6 +3,7 @@ import React, { useEffect, useState } from "react";
 
 type ConditionalRenderProps = {
   isLoading: boolean;
+  role: string;
   childrenUser?: JSX.Element;
   childrenAdmin?: JSX.Element;
   childrenManager?: JSX.Element;
@@ -10,25 +11,26 @@ type ConditionalRenderProps = {
 
 const ConditionalRender = ({
   isLoading,
+  role,
   childrenUser,
   childrenAdmin,
   childrenManager,
 }: ConditionalRenderProps): JSX.Element => {
-  const [role, setRole] = useState<string>("");
+  // const [role, setRole] = useState<string>("");
 
-  useEffect(() => {
+  // useEffect(() => {
-    const axiosAccount = async () => {
+  //   const axiosAccount = async () => {
-      try {
+  //     try {
-        const { data } = await axios.get("https://admin.pena.digital/user/643e23f3dba63ba17272664d");
+  //       const { data } = await axios.get("https://admin.pena.digital/user/643e23f3dba63ba17272664d");
-        setRole(data.role);
+  //       setRole(data.role);
-      } catch (error) {
+  //     } catch (error) {
-        console.error("Ошибка при получение роли пользавателя");
+  //       console.error("Ошибка при получение роли пользавателя");
-      }
+  //     }
-    };
+  //   };
-    axiosAccount();
+  //   axiosAccount();
-  }, [role]);
+  // }, [role]);
 
-  if (isLoading) {
+  if (!isLoading) {
     if (role === "admin") {
       return childrenAdmin ? childrenAdmin : <div>Администратор</div>;
     }

src/pages/dashboard/Content/Users.tsx

@@ -14,9 +14,13 @@ import AccordionDetails from "@mui/material/AccordionDetails";
 import ExpandMoreIcon from "@mui/icons-material/ExpandMore";
 import ClearIcon from "@mui/icons-material/Clear";
 import { getRoles_mock, TMockData } from "../../../api/roles";
+
+import type { UsersType } from "../../../api/roles";
+
 import theme from "../../../theme";
 import axios from "axios";
 import {authStore} from "@stores/auth";
+import ConditionalRender from "@root/pages/Setting/ConditionalRender";
 
 const Users: React.FC = () => {
     const { makeRequest } = authStore();
@@ -26,11 +30,14 @@ const Users: React.FC = () => {
         bearer: true,
         contentType: true,
     })
-  const radioboxes = ["a", "b", "c"];
+  const radioboxes = ["admin", "manager", "user"];
 
-  const [selectedValue, setSelectedValue] = React.useState("a");
+  const [selectedValue, setSelectedValue] = React.useState("admin");
   const handleChange = (event: React.ChangeEvent<HTMLInputElement>) => {
     setSelectedValue(event.target.value);
+
+    if (selectedValue === "manager") {
+    }
   };
 
   const navigate = useNavigate();
@@ -65,18 +72,36 @@ const Users: React.FC = () => {
   handleChangeData();
 
   const [roles, setRoles] = React.useState<TMockData>([]);
+  const [users, setUsers] = React.useState<UsersType>();
+  const [manager, setManager] = React.useState<UsersType>();
 
   React.useEffect(() => {
     const axiosRoles = async () => {
-      const response = await axios({
+      const { data } = await axios({
         method: "get",
         url: "https://admin.pena.digital/strator/role/",
       });
-      return response;
+      setRoles(data);
     };
-    axiosRoles().then((result) => {
+    const gettingRegisteredUsers = async () => {
-      setRoles(result.data);
+      const { data } = await axios({
+        method: "get",
+        url: "https://hub.pena.digital/user/",
       });
+      setUsers(data);
+    };
+
+    const gettingListManagers = async () => {
+      const { data } = await axios({
+        method: "get",
+        url: "https://admin.pena.digital/user/",
+      });
+      setManager(data);
+    };
+
+    gettingListManagers();
+    gettingRegisteredUsers();
+    axiosRoles();
   }, []);
 
   return (
@@ -390,72 +415,192 @@ const Users: React.FC = () => {
                   color: theme.palette.secondary.main,
                 }}
               >
-                ID
+                login
+              </Typography>
+            </TableCell>
+
+            <TableCell sx={{ textAlign: "center" }}>
+              <Typography
+                variant="h4"
+                sx={{
+                  color: theme.palette.secondary.main,
+                }}
+              >
+                email
+              </Typography>
+            </TableCell>
+            <TableCell sx={{ textAlign: "center" }}>
+              <Typography
+                variant="h4"
+                sx={{
+                  color: theme.palette.secondary.main,
+                }}
+              >
+                phoneNumber
+              </Typography>
+            </TableCell>
+            <TableCell sx={{ textAlign: "center" }}>
+              <Typography
+                variant="h4"
+                sx={{
+                  color: theme.palette.secondary.main,
+                }}
+              >
+                isDeleted
+              </Typography>
+            </TableCell>
+            <TableCell sx={{ textAlign: "center" }}>
+              <Typography
+                variant="h4"
+                sx={{
+                  color: theme.palette.secondary.main,
+                }}
+              >
+                createdAt
               </Typography>
             </TableCell>
           </TableRow>
         </TableHead>
 
         <TableBody>
+          <ConditionalRender
+            isLoading={false}
+            role={selectedValue}
+            childrenManager={
+              <>
+                {manager &&
+                  manager.map(({ login, email, phoneNumber, isDeleted, createdAt }) => (
                     <TableRow
+                      key={createdAt}
                       sx={{
                         borderBottom: "2px solid",
                         borderColor: theme.palette.grayLight.main,
                         height: "100px",
-              cursor: "pointer",
                       }}
-            onClick={() => navigate("/modalUser")}
                     >
                       <TableCell sx={{ textAlign: "center" }}>
                         <Typography
+                          variant="h4"
                           sx={{
                             color: theme.palette.secondary.main,
                           }}
                         >
-                1
+                          {login}
+                        </Typography>
+                      </TableCell>
+
+                      <TableCell sx={{ textAlign: "center" }}>
+                        <Typography
+                          variant="h4"
+                          sx={{
+                            color: theme.palette.secondary.main,
+                          }}
+                        >
+                          {email}
+                        </Typography>
+                      </TableCell>
+                      <TableCell sx={{ textAlign: "center" }}>
+                        <Typography
+                          variant="h4"
+                          sx={{
+                            color: theme.palette.secondary.main,
+                          }}
+                        >
+                          {phoneNumber}
+                        </Typography>
+                      </TableCell>
+                      <TableCell sx={{ textAlign: "center" }}>
+                        <Typography
+                          variant="h4"
+                          sx={{
+                            color: theme.palette.secondary.main,
+                          }}
+                        >
+                          {isDeleted ? "true" : "false"}
+                        </Typography>
+                      </TableCell>
+                      <TableCell sx={{ textAlign: "center" }}>
+                        <Typography
+                          variant="h4"
+                          sx={{
+                            color: theme.palette.secondary.main,
+                          }}
+                        >
+                          {createdAt}
                         </Typography>
                       </TableCell>
                     </TableRow>
-
+                  ))}
+              </>
+            }
+            childrenUser={
+              <>
+                {users &&
+                  users.map(({ login, email, phoneNumber, isDeleted, createdAt }) => (
                     <TableRow
+                      key={createdAt}
                       sx={{
                         borderBottom: "2px solid",
                         borderColor: theme.palette.grayLight.main,
                         height: "100px",
-              cursor: "pointer",
                       }}
-            onClick={() => navigate("/modalUser")}
                     >
                       <TableCell sx={{ textAlign: "center" }}>
                         <Typography
+                          variant="h4"
                           sx={{
                             color: theme.palette.secondary.main,
                           }}
                         >
-                2
+                          {login}
                         </Typography>
                       </TableCell>
-          </TableRow>
 
-          <TableRow
-            sx={{
-              borderBottom: "1px solid",
-              border: theme.palette.secondary.main,
-              height: "100px",
-              cursor: "pointer",
-            }}
-            onClick={() => navigate("/modalUser")}
-          >
                       <TableCell sx={{ textAlign: "center" }}>
                         <Typography
+                          variant="h4"
                           sx={{
                             color: theme.palette.secondary.main,
                           }}
                         >
-                3
+                          {email}
+                        </Typography>
+                      </TableCell>
+                      <TableCell sx={{ textAlign: "center" }}>
+                        <Typography
+                          variant="h4"
+                          sx={{
+                            color: theme.palette.secondary.main,
+                          }}
+                        >
+                          {phoneNumber}
+                        </Typography>
+                      </TableCell>
+                      <TableCell sx={{ textAlign: "center" }}>
+                        <Typography
+                          variant="h4"
+                          sx={{
+                            color: theme.palette.secondary.main,
+                          }}
+                        >
+                          {isDeleted ? "true" : "false"}
+                        </Typography>
+                      </TableCell>
+                      <TableCell sx={{ textAlign: "center" }}>
+                        <Typography
+                          variant="h4"
+                          sx={{
+                            color: theme.palette.secondary.main,
+                          }}
+                        >
+                          {createdAt}
                         </Typography>
                       </TableCell>
                     </TableRow>
+                  ))}
+              </>
+            }
+          />
         </TableBody>
       </Table>
     </React.Fragment>