From 5214e03bfc62d154414f01fe33cd283260e5189d Mon Sep 17 00:00:00 2001 From: cue Date: Wed, 3 Apr 2024 06:16:25 +0300 Subject: [PATCH 1/2] fix UserList :3 --- .../entities/PlayerCard/PlayerCard.tsx | 3 +-- frontend/src/components/pages/Admin/Admin.tsx | 19 +++++++++---------- 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/frontend/src/components/entities/PlayerCard/PlayerCard.tsx b/frontend/src/components/entities/PlayerCard/PlayerCard.tsx index 7952b43..ff7362c 100644 --- a/frontend/src/components/entities/PlayerCard/PlayerCard.tsx +++ b/frontend/src/components/entities/PlayerCard/PlayerCard.tsx @@ -1,6 +1,5 @@ import { useTranslation } from "react-i18next"; -import { Button } from "../../shared/ui/button"; -import { Card, CardHeader, CardTitle, CardDescription, CardContent, CardFooter } from "../../shared/ui/card" +import { Card, CardHeader, CardTitle, CardContent } from "../../shared/ui/card" import less from "./PlayerCard.module.less"; import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle, DialogTrigger } from "../../shared/ui/dialog"; import { Separator } from "../../shared/ui/separator"; diff --git a/frontend/src/components/pages/Admin/Admin.tsx b/frontend/src/components/pages/Admin/Admin.tsx index b5dc2e1..2ab0a42 100644 --- a/frontend/src/components/pages/Admin/Admin.tsx +++ b/frontend/src/components/pages/Admin/Admin.tsx @@ -1,11 +1,9 @@ -import { Button } from "../../shared/ui/button"; import { ResizableHandle, ResizablePanel, ResizablePanelGroup, } from "../../shared/ui/resizable"; import less from "./Admin.module.less"; -import PlayerCard from "../../entities/PlayerCard/PlayerCard"; import { useTranslation } from "react-i18next"; import CreateTeam from "../../widgets/CreateTeams/CreateTeams"; import { UserList } from "../AdminEventPage/AdminEventAPI"; @@ -26,14 +24,15 @@ const AdminPage = () => { var index = window.location.pathname.indexOf("/dash/admin/") + "/dash/admin/".length; var result = window.location.pathname.substring(index); - - UserList(result) - .then((data) => { - setPlayerList(data); - }) - .catch((error) => { - console.error("Возникла ошибка с получением:", error); - }); +if(Number(result) > 0){ + UserList(result) + .then((data) => { + setPlayerList(data); + }) + .catch((error) => { + console.error("Возникла ошибка с получением:", error); + }); +} }, []); return ( From 6ad542f93490b8f49372d10e5727cf93ef69de28 Mon Sep 17 00:00:00 2001 From: cue Date: Wed, 3 Apr 2024 06:21:34 +0300 Subject: [PATCH 2/2] fix link --- frontend/src/components/pages/Main/Main.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/components/pages/Main/Main.tsx b/frontend/src/components/pages/Main/Main.tsx index a912c96..b742005 100644 --- a/frontend/src/components/pages/Main/Main.tsx +++ b/frontend/src/components/pages/Main/Main.tsx @@ -113,7 +113,7 @@ const Main = () => { ))}