diff --git a/src/components/Badge.tsx b/src/components/Badge.tsx index f044e9e..dc9d0f7 100644 --- a/src/components/Badge.tsx +++ b/src/components/Badge.tsx @@ -1,6 +1,6 @@ function Badge({ count }: { count: number }) { return ( -
+
{count}
); diff --git a/src/components/DesktopCard.tsx b/src/components/DesktopCard.tsx index d33be81..03f17f9 100644 --- a/src/components/DesktopCard.tsx +++ b/src/components/DesktopCard.tsx @@ -1,12 +1,13 @@ import { useMutation, useQueryClient } from "@tanstack/react-query"; -import Button from "./Button"; -import MoreIcon from "./icons/MoreIcon"; import api from "../utils/api"; -import PlusIcon from "./icons/PlusIcon"; import { IServer } from "../types/IServer"; import useModalStore from "../stores/useModalStore"; import CreateSessionModal from "./modals/CreateSessionModal"; -import SettingIcon from "./icons/SettingIcon"; +import NewButton from "./NewButton"; +import FlashIcon from "./icons/FlashIcon"; +import CogIcon from "./icons/CogIcon"; +import ChevronLeftIcon from "./icons/ChevronLeftIcon"; +import PlusIcon from "./icons/PlusIcon"; interface IDesktopCardProps { server: IServer; @@ -46,84 +47,55 @@ export default function DesktopCard({ server }: IDesktopCardProps) { return (
- - - + + + + +
-

{server.name}

+

+ {server.name} +

{server.location}

- {/* */}
-
-
- {/*
- {server.sessions?.[0]?.status === "started" && ( -
- )} -

- {server.sessions?.[0]?.status === "started" - ? "Сеанс запущен" - : "Свободен"} -

-
*/} - {server.sessions?.[0]?.status === "started" && ( - <> -

- {server.sessions?.[0]?.client?.fullname} -

-

- {server.sessions?.[0]?.app?.name} -

- - )} -
- {/*

0 мин

*/} -
-
+
{server.sessions?.[0]?.status === "started" ? (
- {/* */} - + + + +

Идёт сеанс

+ + + +
) : ( - + )}
diff --git a/src/components/icons/ChevronLeftIcon.tsx b/src/components/icons/ChevronLeftIcon.tsx new file mode 100644 index 0000000..c5f0092 --- /dev/null +++ b/src/components/icons/ChevronLeftIcon.tsx @@ -0,0 +1,21 @@ +function ChevronLeftIcon() { + return ( + + + + ); +} + +export default ChevronLeftIcon; diff --git a/src/components/icons/CogIcon.tsx b/src/components/icons/CogIcon.tsx index 7317584..d0bc1b9 100644 --- a/src/components/icons/CogIcon.tsx +++ b/src/components/icons/CogIcon.tsx @@ -1,23 +1,17 @@ function CogIcon() { return ( - + ); diff --git a/src/components/icons/FlashIcon.tsx b/src/components/icons/FlashIcon.tsx new file mode 100644 index 0000000..bfa2724 --- /dev/null +++ b/src/components/icons/FlashIcon.tsx @@ -0,0 +1,18 @@ +function FlashIcon() { + return ( + + + + ); +} + +export default FlashIcon; diff --git a/src/components/icons/SettingIcon.tsx b/src/components/icons/SettingIcon.tsx deleted file mode 100644 index a8b124c..0000000 --- a/src/components/icons/SettingIcon.tsx +++ /dev/null @@ -1,20 +0,0 @@ -function SettingIcon() { - return ( - - - - - ); -} - -export default SettingIcon; diff --git a/src/index.css b/src/index.css index 50b6f82..8b6ec71 100644 --- a/src/index.css +++ b/src/index.css @@ -3,7 +3,7 @@ body { font-family: "TTHovesPro", sans-serif; - background-color: #f2f0fe; + background-color: #ffffff; color: #141414; } diff --git a/src/pages/DashboardPage.tsx b/src/pages/DashboardPage.tsx index ec26c97..838c4ba 100644 --- a/src/pages/DashboardPage.tsx +++ b/src/pages/DashboardPage.tsx @@ -5,7 +5,6 @@ import { IServer } from "../types/IServer"; import DesktopCard from "../components/DesktopCard"; import Badge from "../components/Badge"; - function DashboardPage() { const { data: me } = useQuery({ queryKey: ["me"], @@ -33,9 +32,9 @@ function DashboardPage() { // } return ( -
+
-
+
{/*
-
...
); - } export default DashboardPage;