From f34eb48d1eb875c8f05e61ee24cf93e4a865f082 Mon Sep 17 00:00:00 2001 From: Sushan Yadav Date: Wed, 28 Feb 2024 17:35:02 +0545 Subject: [PATCH] feat: add layout --- .../src/pages/org-slug/projects/Id.tsx | 151 ++++++------------ .../pages/org-slug/projects/id/Overview.tsx | 2 +- 2 files changed, 54 insertions(+), 99 deletions(-) diff --git a/packages/frontend/src/pages/org-slug/projects/Id.tsx b/packages/frontend/src/pages/org-slug/projects/Id.tsx index 92250632..8b164852 100644 --- a/packages/frontend/src/pages/org-slug/projects/Id.tsx +++ b/packages/frontend/src/pages/org-slug/projects/Id.tsx @@ -3,23 +3,23 @@ import { Link, Outlet, useLocation, - // useNavigate, + useNavigate, useParams, } from 'react-router-dom'; import { Project as ProjectType } from 'gql-client'; -import { Tab, Tabs, TabsBody, TabsHeader } from '@material-tailwind/react'; - import { useGQLClient } from '../../../context/GQLClientContext'; import { useOctokit } from '../../../context/OctokitContext'; import { Button } from 'components/shared/Button'; import { ChevronLeft } from 'components/shared/CustomIcon'; import { WavyBorder } from 'components/shared/WavyBorder'; +import { Heading } from 'components/shared/Heading'; +import { Tabs } from 'components/shared/Tabs'; const Id = () => { const { id } = useParams(); const { octokit } = useOctokit(); - // const navigate = useNavigate(); + const navigate = useNavigate(); const client = useGQLClient(); const location = useLocation(); @@ -64,106 +64,61 @@ const Id = () => {
{project ? ( <> -
-
- {/*
- - - {project?.name} - - +
+
- - -
*/} - - {/* */} -
- - - - - Overview - - - - - Deployments - - - - - Database - - - - - Integrations - - - - - Settings - - - - + variant="tertiary" + className="rounded-full h-11 w-11 p-0" + aria-label="Go back" + leftIcon={} + onClick={() => navigate(-1)} + /> + + {project?.name} + +
+
+ + + + +
+
+ +
+ + + + Overview + + + Deployments + + + Database + + + Integrations + + + Settings + + + {/* Not wrapping in Tab.Content because we are using Outlet */} +
- +
) : ( -

Project not found

+
+ + Project not found. + +
)}
); diff --git a/packages/frontend/src/pages/org-slug/projects/id/Overview.tsx b/packages/frontend/src/pages/org-slug/projects/id/Overview.tsx index 15aa4e73..e4c93a8b 100644 --- a/packages/frontend/src/pages/org-slug/projects/id/Overview.tsx +++ b/packages/frontend/src/pages/org-slug/projects/id/Overview.tsx @@ -115,7 +115,7 @@ const OverviewTabPanel = () => { }, [project]); return ( -
+