From 8a2e95b82ec994c6a3284402555451066e9d65cd Mon Sep 17 00:00:00 2001 From: Fovway Date: Sun, 12 Oct 2025 14:36:09 +0700 Subject: [PATCH] =?UTF-8?q?=D0=98=D0=BD=D1=82=D0=B5=D1=80=D1=84=D0=B5?= =?UTF-8?q?=D0=B9=D1=81=20=D0=BE=D0=BF=D1=82=D0=B8=D0=BC=D0=B8=D0=B7=D0=B8?= =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=20=D0=B4=D0=BB=D1=8F=20=D0=BC?= =?UTF-8?q?=D0=BE=D0=B1=D0=B8=D0=BB=D1=8C=D0=BD=D1=8B=D1=85=20=D1=83=D1=81?= =?UTF-8?q?=D1=82=D1=80=D0=BE=D0=B9=D1=81=D1=82=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/index.html | 5 +++ frontend/src/App.css | 8 ++++ frontend/src/components/AdminPage.jsx | 2 +- frontend/src/components/AdminPanel.jsx | 46 ++++++++++---------- frontend/src/components/Dashboard.jsx | 14 +++--- frontend/src/components/ManagerPage.jsx | 2 +- frontend/src/components/ManagerPanel.jsx | 46 ++++++++++---------- frontend/src/components/TimeEntriesTable.jsx | 34 ++++++++------- 8 files changed, 88 insertions(+), 69 deletions(-) diff --git a/frontend/index.html b/frontend/index.html index b49585f..901f243 100644 --- a/frontend/index.html +++ b/frontend/index.html @@ -4,10 +4,15 @@ + Неучтенное время
+ diff --git a/frontend/src/App.css b/frontend/src/App.css index f411583..07faf76 100644 --- a/frontend/src/App.css +++ b/frontend/src/App.css @@ -42,3 +42,11 @@ .read-the-docs { color: #888; } + +/* Мобильная оптимизация */ +@media (max-width: 767.98px) { + .container-fluid { + margin-top: 0 !important; + padding-top: 1rem; + } +} diff --git a/frontend/src/components/AdminPage.jsx b/frontend/src/components/AdminPage.jsx index 396a137..d9c6626 100644 --- a/frontend/src/components/AdminPage.jsx +++ b/frontend/src/components/AdminPage.jsx @@ -2,7 +2,7 @@ import AdminPanel from "./AdminPanel"; const AdminPage = () => { return ( -
+
); diff --git a/frontend/src/components/AdminPanel.jsx b/frontend/src/components/AdminPanel.jsx index 26c684e..9e98d12 100644 --- a/frontend/src/components/AdminPanel.jsx +++ b/frontend/src/components/AdminPanel.jsx @@ -154,14 +154,14 @@ const AdminPanel = () => { }; return ( -
+

Админ панель

-
- +
+ Перейти в дешборд - - +
+ + + +
))} diff --git a/frontend/src/components/Dashboard.jsx b/frontend/src/components/Dashboard.jsx index c77e5e3..4449e2a 100644 --- a/frontend/src/components/Dashboard.jsx +++ b/frontend/src/components/Dashboard.jsx @@ -100,17 +100,17 @@ const Dashboard = () => { } return ( -
-
-

Добро пожаловать, {user.username}!

-
+
+
+

Добро пожаловать, {user.username}!

+
{user.role === "admin" && ( - + Админ панель )} {user.role === "manager" && ( - + Менеджер панель )} @@ -120,7 +120,7 @@ const Dashboard = () => {
-
+
diff --git a/frontend/src/components/ManagerPage.jsx b/frontend/src/components/ManagerPage.jsx index cece1c7..90f23ad 100644 --- a/frontend/src/components/ManagerPage.jsx +++ b/frontend/src/components/ManagerPage.jsx @@ -2,7 +2,7 @@ import ManagerPanel from "./ManagerPanel"; const ManagerPage = () => { return ( -
+
); diff --git a/frontend/src/components/ManagerPanel.jsx b/frontend/src/components/ManagerPanel.jsx index 8d03511..08e2bd4 100644 --- a/frontend/src/components/ManagerPanel.jsx +++ b/frontend/src/components/ManagerPanel.jsx @@ -154,14 +154,14 @@ const ManagerPanel = () => { }; return ( -
+

Менеджер панель

-
- +
+ Перейти в дешборд - - +
+ + + +
))} diff --git a/frontend/src/components/TimeEntriesTable.jsx b/frontend/src/components/TimeEntriesTable.jsx index 2be11cb..4069b05 100644 --- a/frontend/src/components/TimeEntriesTable.jsx +++ b/frontend/src/components/TimeEntriesTable.jsx @@ -18,22 +18,24 @@ const TimeEntriesTable = ({ entries, onDelete, onEdit, isManager = false }) => { {entry.hours} {!isManager && ( - {onEdit && ( - - )} - {onDelete && ( - - )} +
+ {onEdit && ( + + )} + {onDelete && ( + + )} +
)}