diff --git a/src/frontend/src/components/headerComponent/index.tsx b/src/frontend/src/components/headerComponent/index.tsx
index c74cdaa76..039b8895c 100644
--- a/src/frontend/src/components/headerComponent/index.tsx
+++ b/src/frontend/src/components/headerComponent/index.tsx
@@ -33,14 +33,14 @@ export default function Header(): JSX.Element {
)}
{!autoLogin && location.pathname !== `/flow/${tabId}` && (
{
- logout();
- navigate("/login");
- }}
- className="text-sm font-medium text-muted-foreground transition-colors hover:text-primary cursor-pointer mx-5"
- >
- Sign out
-
+ onClick={() => {
+ logout();
+ navigate("/login");
+ }}
+ className="mx-5 cursor-pointer text-sm font-medium text-muted-foreground transition-colors hover:text-primary"
+ >
+ Sign out
+
)}
{location.pathname === "/admin" && (
@@ -48,7 +48,7 @@ export default function Header(): JSX.Element {
onClick={() => {
navigate("/");
}}
- className="text-sm font-medium text-muted-foreground transition-colors hover:text-primary cursor-pointer"
+ className="cursor-pointer text-sm font-medium text-muted-foreground transition-colors hover:text-primary"
>
Home
@@ -59,11 +59,11 @@ export default function Header(): JSX.Element {
location.pathname !== "/admin" &&
location.pathname !== `/flow/${tabId}` && (
navigate("/admin")}
- >
- Admin page
-
+ className="cursor-pointer text-sm font-medium text-muted-foreground transition-colors hover:text-primary"
+ onClick={() => navigate("/admin")}
+ >
+ Admin page
+
)}
diff --git a/src/frontend/src/pages/AdminPage/index.tsx b/src/frontend/src/pages/AdminPage/index.tsx
index fc963fee8..08e83f700 100644
--- a/src/frontend/src/pages/AdminPage/index.tsx
+++ b/src/frontend/src/pages/AdminPage/index.tsx
@@ -4,6 +4,7 @@ import { useContext, useEffect, useRef, useState } from "react";
import PaginatorComponent from "../../components/PaginatorComponent";
import ShadTooltip from "../../components/ShadTooltipComponent";
import IconComponent from "../../components/genericIconComponent";
+import Header from "../../components/headerComponent";
import { Button } from "../../components/ui/button";
import { Checkbox } from "../../components/ui/checkbox";
import { Input } from "../../components/ui/input";
@@ -25,9 +26,8 @@ import {
} from "../../controllers/API";
import ConfirmationModal from "../../modals/ConfirmationModal";
import UserManagementModal from "../../modals/UserManagementModal";
-import { UserInputType } from "../../types/components";
-import Header from "../../components/headerComponent";
import { Users } from "../../types/api";
+import { UserInputType } from "../../types/components";
export default function AdminPage() {
const [inputValue, setInputValue] = useState("");
@@ -89,7 +89,7 @@ export default function AdminPage() {
if (input === "") {
setFilterUserList(userList.current);
} else {
- const filteredList = userList.current.filter((user:Users) =>
+ const filteredList = userList.current.filter((user: Users) =>
user.username.toLowerCase().includes(input.toLowerCase())
);
setFilterUserList(filteredList);
@@ -183,249 +183,254 @@ export default function AdminPage() {
return (
<>
-
-
- {userData && (
-
-
-
-
-
-
-
- Welcome back!
-
-
- Navigate through this section to efficiently oversee all
- application users. From here, you can seamlessly manage
- user accounts.
-
+
+
+ {userData && (
+
+
+
+
+
+
+
+ Welcome back!
+
+
+ Navigate through this section to efficiently oversee all
+ application users. From here, you can seamlessly manage
+ user accounts.
+
+
+
-
-
- {userList.current.length === 0 && !loadingUsers && (
+ {userList.current.length === 0 && !loadingUsers && (
+ <>
+
+
There's no users registered :)
+
+ >
+ )}
<>
-
There's no users registered :)
-
- >
- )}
- <>
-
-
-
- {
- handleNewUser(user);
- }}
- >
-
-
-
-
- {loadingUsers && (
-
- Loading...
-
- )}
-
-
-
-
- Id
- Username
- Active
- Superuser
- Created At
- Updated At
-
-
-
- {!loadingUsers && (
-
- {filterUserList.map((user:UserInputType, index) => (
-
-
-
-
- {user.id}
-
-
-
-
-
-
- {user.username}
-
-
-
-
- {
- handleDisableUser(
- user.is_active,
- user.id,
- user
- );
- }}
- >
-
-
-
-
- {
- handleSuperUserEdit(
- user.is_superuser,
- user.id,
- user
- );
- }}
- >
-
-
-
-
- {
- new Date(user.create_at!)
- .toISOString()
- .split("T")[0]
- }
-
-
- {
- new Date(user.updated_at!)
- .toISOString()
- .split("T")[0]
- }
-
-
-
-
{
- handleEditUser(user.id, editUser);
- }}
- >
-
-
+ {loadingUsers && (
+
+ Loading...
+
+ )}
+
+
+
+
+ Id
+ Username
+ Active
+ Superuser
+ Created At
+ Updated At
+
+
+
+ {!loadingUsers && (
+
+ {filterUserList.map(
+ (user: UserInputType, index) => (
+
+
+
+
+ {user.id}
+
-
-
- {
- handleDeleteUser(user);
- }}
- >
-
-
+
+
+
+
+ {user.username}
+
-
-
-
-
- ))}
-
- )}
-
-
+
+
+ {
+ handleDisableUser(
+ user.is_active,
+ user.id,
+ user
+ );
+ }}
+ >
+
+
+
+
+ {
+ handleSuperUserEdit(
+ user.is_superuser,
+ user.id,
+ user
+ );
+ }}
+ >
+
+
+
+
+ {
+ new Date(user.create_at!)
+ .toISOString()
+ .split("T")[0]
+ }
+
+
+ {
+ new Date(user.updated_at!)
+ .toISOString()
+ .split("T")[0]
+ }
+
+
+
+
{
+ handleEditUser(user.id, editUser);
+ }}
+ >
+
+
+
+
-
{
- handleChangePagination(pageSize, pageIndex);
- }}
- >
- >
+
{
+ handleDeleteUser(user);
+ }}
+ >
+
+
+
+
+
+
+
+ )
+ )}
+
+ )}
+
+
+
+
{
+ handleChangePagination(pageSize, pageIndex);
+ }}
+ >
+ >
+
-
- )}
+ )}
>
);
diff --git a/src/frontend/src/pages/FlowPage/components/PageComponent/index.tsx b/src/frontend/src/pages/FlowPage/components/PageComponent/index.tsx
index 74a211c33..64f7de21e 100644
--- a/src/frontend/src/pages/FlowPage/components/PageComponent/index.tsx
+++ b/src/frontend/src/pages/FlowPage/components/PageComponent/index.tsx
@@ -431,7 +431,7 @@ export default function Page({
zoomOnScroll={!view}
zoomOnPinch={!view}
panOnDrag={!view}
- proOptions={{hideAttribution: true}}
+ proOptions={{ hideAttribution: true }}
>
{!view && (