From 0c0d8cfdb3221df5643f07f9a218420409260d82 Mon Sep 17 00:00:00 2001 From: igorrCarvalho Date: Tue, 22 Aug 2023 14:33:06 -0300 Subject: [PATCH 1/4] Feat: Add button on admin page to return to main page --- src/frontend/src/components/headerComponent/index.tsx | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/src/frontend/src/components/headerComponent/index.tsx b/src/frontend/src/components/headerComponent/index.tsx index a9c91ebea..57e2f0f3e 100644 --- a/src/frontend/src/components/headerComponent/index.tsx +++ b/src/frontend/src/components/headerComponent/index.tsx @@ -27,6 +27,17 @@ export default function Header(): JSX.Element { ⛓️ + {location.pathname === "/admin" && ( + + )} {autoLogin === false && ( diff --git a/src/frontend/src/icons/Airbyte/airbyte.svg b/src/frontend/src/icons/Airbyte/airbyte.svg index eefa1bceb..a7275179d 100644 --- a/src/frontend/src/icons/Airbyte/airbyte.svg +++ b/src/frontend/src/icons/Airbyte/airbyte.svg @@ -1,22 +1,22 @@ - - - - - - + + + + + + diff --git a/src/frontend/src/pages/AdminPage/index.tsx b/src/frontend/src/pages/AdminPage/index.tsx index 334aca90c..64b766416 100644 --- a/src/frontend/src/pages/AdminPage/index.tsx +++ b/src/frontend/src/pages/AdminPage/index.tsx @@ -26,6 +26,7 @@ import { import ConfirmationModal from "../../modals/ConfirmationModal"; import UserManagementModal from "../../modals/UserManagementModal"; import { UserInputType } from "../../types/components"; +import Header from "../../components/headerComponent"; export default function AdminPage() { const [inputValue, setInputValue] = useState(""); @@ -183,6 +184,7 @@ export default function AdminPage() { return ( <> +
{userData && (
From bba4d4b0166b63870c1d8cb3d39574e0fb4805da Mon Sep 17 00:00:00 2001 From: anovazzi1 Date: Tue, 22 Aug 2023 16:51:34 -0300 Subject: [PATCH 4/4] update gitattributes --- .gitattributes | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index b69d73e97..6b24f77b9 100644 --- a/.gitattributes +++ b/.gitattributes @@ -17,4 +17,8 @@ # Denote all files that are truly binary and should not be modified. *.png binary -*.jpg binary \ No newline at end of file +*.jpg binary +*.mp4 binary +*.svg binary +*.ico binary +*.gif binary \ No newline at end of file