From c852da10418cbeb21fceda4b93339b2c82ea9838 Mon Sep 17 00:00:00 2001
From: Callum Forrester <callum.forrester@diamond.ac.uk>
Date: Tue, 16 Apr 2024 12:18:54 +0100
Subject: [PATCH] Display logs in a table

---
 src/App.tsx            | 31 ++++++++++++++++++++++++++++---
 src/components/Box.tsx | 38 ++++++++++++++++++--------------------
 2 files changed, 46 insertions(+), 23 deletions(-)

diff --git a/src/App.tsx b/src/App.tsx
index d3020f3..42518ab 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -3,9 +3,17 @@ import { useEffect, useState } from "react";
 import { theme } from "./theme";
 import BoxBasic from "./components/Box";
 
+import Table from '@mui/material/Table';
+import TableBody from '@mui/material/TableBody';
+import TableCell from '@mui/material/TableCell';
+import TableContainer from '@mui/material/TableContainer';
+import TableRow from '@mui/material/TableRow';
+import Paper from '@mui/material/Paper';
+
+
 function App() {
 
-  const [logMessage, setLog] = useState<string[]>([]);
+  const [logs, setLogs] = useState<string[]>([]);
   useEffect(() => {
     async function fetchData(
       url: string,
@@ -37,7 +45,7 @@ function App() {
         // Parsing the response as JSON
         const logdata = await response.json();
         const message = getMessage(logdata) || ["No logs found"];
-        setLog(message);
+        setLogs(message);
       } catch (error) {
         console.error("Error fetching data:", error);
         throw error;
@@ -108,7 +116,24 @@ function App() {
   return (
     <ThemeProvider theme={theme}>
       <h1>Athena Logpanel </h1>
-      <BoxBasic content={<p> {logMessage} </p>}></BoxBasic>
+      <BoxBasic>
+        <TableContainer component={Paper}>
+          <Table sx={{ minWidth: 650 }} aria-label="simple table">
+            <TableBody>
+              {logs.map((log) => (
+                <TableRow
+                  key={log}
+                  sx={{ '&:last-child td, &:last-child th': { border: 0 } }}
+                >
+                  <TableCell component="th" scope="row">
+                    {log}
+                  </TableCell>
+                </TableRow>
+              ))}
+            </TableBody>
+          </Table>
+        </TableContainer>
+      </BoxBasic>
     </ThemeProvider>
   );
 }
diff --git a/src/components/Box.tsx b/src/components/Box.tsx
index 4ea74ba..179ef6d 100644
--- a/src/components/Box.tsx
+++ b/src/components/Box.tsx
@@ -1,26 +1,24 @@
 import * as React from 'react';
 import Box from '@mui/material/Box';
 
-// Define the potential types for the Box
-type Content = string| JSX.Element | number | (() => React.ReactNode);
-interface BoxProps<T> {
-    content:T;
+interface BoxProps {
+  children?: React.ReactNode;
+}
+
+const BoxBasic = (props: BoxProps) => {
+  return (
+    <Box component="section" sx={{ 
+      margin: "1vw",
+      padding: "1vw", 
+      border: '6px solid grey', 
+      width: "95vw", 
+      height: "80vh",
+      overflowY: "scroll",
+      whiteSpace: "wrap"
+       }}>
+       {props.children}
+    </Box>
+  );
 }
-// FC React functional component.
-const BoxBasic:React.FC<BoxProps<Content>> = ({content}) =>{
-    return (
-      <Box component="section" sx={{ 
-        margin: "1vw",
-        padding: "1vw", 
-        border: '6px solid grey', 
-        width: "95vw", 
-        height: "80vh",
-        overflowY: "scroll",
-        whiteSpace: "wrap"
-         }}>
-         {typeof content === 'function' ? content() : content}
-      </Box>
-    );
-  }
 
 export default BoxBasic;