diff --git a/src/App.css b/src/App.css index 9db7ca1..77f482a 100644 --- a/src/App.css +++ b/src/App.css @@ -1,5 +1,4 @@ #root { - max-width: 1280px; padding: 2rem; } diff --git a/src/App.jsx b/src/App.jsx index e3ad0bf..3497465 100644 --- a/src/App.jsx +++ b/src/App.jsx @@ -5,6 +5,8 @@ import InfoTable from './components/InfoTable' import AutoTargetTable from './components/AutoTarget'; import BuildStatusTable from './components/BuildStatusTable'; import BuildEngineeringDashboard from './components/BuildEngineeringDashboard'; +import DashboardGrid from './components/DashboardGrid'; +import BottomGrid from './components/BottomGrid'; const scheduleHeaders = [ { key: "schedule", header: "Schedule" }, @@ -56,9 +58,11 @@ function App() {
{/* */} - - - +
+ + +
+
) diff --git a/src/components/AppHeader.jsx b/src/components/AppHeader.jsx index 553ffa2..4931111 100644 --- a/src/components/AppHeader.jsx +++ b/src/components/AppHeader.jsx @@ -14,12 +14,12 @@ const AppHeader = () => { Home - + {/* Notification Docs - + */} diff --git a/src/components/AutoTarget.jsx b/src/components/AutoTarget.jsx index 89f7c01..5d9a74f 100644 --- a/src/components/AutoTarget.jsx +++ b/src/components/AutoTarget.jsx @@ -17,6 +17,7 @@ import { } from "@carbon/react"; import { Play, Renew, Calendar } from "@carbon/icons-react"; + const initialRows = [ { id: 1, @@ -68,8 +69,7 @@ const AutoTargetTable = () => { }; return ( -
-

Auto Target - Status: OFF

+
{() => ( @@ -141,21 +141,22 @@ const AutoTargetTable = () => { Ready to Target {row.readyToTarget} - - {row.id === 2 && ( - - )} - + ))} + + + + + + )} diff --git a/src/components/BottomGrid.jsx b/src/components/BottomGrid.jsx new file mode 100644 index 0000000..4015560 --- /dev/null +++ b/src/components/BottomGrid.jsx @@ -0,0 +1,106 @@ +/* eslint-disable no-unused-vars */ +import React from 'react'; +import { Button, TextInput } from '@carbon/react'; +import { Play } from "@carbon/icons-react"; + +const buildIds = ['905', '855']; + +const tables = [ + { + title: 'Build Basics', + hasInput: true, + autoStatuses: ['OFF', 'OFF'], + }, + { + title: 'Test Record Verification', + hasInput: false, + autoStatuses: ['OFF', 'OFF'], + }, + { + title: 'Ifix Enable', + hasInput: true, + autoStatuses: ['OFF', 'OFF'], + }, + { + title: 'APAR List Integration', + hasInput: true, + autoStatuses: ['OFF', 'OFF'], + }, + { + title: 'Ship the Published Builds', + hasInput: false, + autoStatuses: ['OFF', 'ON'], + }, + { + title: 'PKG Build', + hasInput: true, + autoStatuses: ['OFF', 'ON'], + }, +]; + +const BottomGrid = () => { + return ( +
+ {tables.map((table, index) => ( +
+ + + + + + + + + + {buildIds.map((id, idx) => ( + + + + + + ))} + +
{table.title}ManualAuto
+
+ {id} + {table.hasInput && ( + + )} +
+
+ + Status: {table.autoStatuses[idx]}
+
+ ))} +
+ ); +}; + +export default BottomGrid; diff --git a/src/components/BuildStatusTable.jsx b/src/components/BuildStatusTable.jsx index e96a2b0..8891193 100644 --- a/src/components/BuildStatusTable.jsx +++ b/src/components/BuildStatusTable.jsx @@ -72,10 +72,9 @@ const BuildStatusTable = () => { }; return ( -
-

Build Status Table

+
- + {() => ( diff --git a/src/components/InfoTable.jsx b/src/components/InfoTable.jsx index 41dd23f..f2a8edb 100644 --- a/src/components/InfoTable.jsx +++ b/src/components/InfoTable.jsx @@ -16,35 +16,38 @@ import { const InfoTable = ({ headers, rows, title, renderers = {} }) => { return ( - - {({ rows, headers, getHeaderProps }) => ( - -
- - - {headers.map((header) => ( - - {header.header} - - ))} - - - - {rows.map((row) => ( - - {row.cells.map((cell) => ( - - {renderers[cell.info.header] ? renderers[cell.info.header](row) : cell.value} - +
+ + {({ rows, headers, getHeaderProps }) => ( + +
+ + + {headers.map((header) => ( + + {header.header} + ))} - ))} - -
- - )} -
- ) + + + {rows.map((row) => ( + + {row.cells.map((cell) => ( + + {renderers[cell.info.header] ? renderers[cell.info.header](row) : cell.value} + + ))} + + ))} + + + + )} +
+
+ + ) }