From 4b3d808192bc894d6f77a81d62fdee5f8ccec853 Mon Sep 17 00:00:00 2001
From: A Repko <arenrepko7@gmail.com>
Date: Sat, 28 Sep 2024 17:00:43 +0200
Subject: [PATCH 01/24] Added invite list to admin dashboard

---
 .../dashboard/components/InviteList.tsx       | 56 +++++++++++++++
 .../dashboard/components/adminPage.tsx        | 68 +++++++++----------
 CoVAR-app/src/functions/requests.tsx          | 11 +++
 langchain/requirements.txt                    |  3 +-
 server/routes/invites.js                      | 29 ++++++--
 5 files changed, 125 insertions(+), 42 deletions(-)
 create mode 100644 CoVAR-app/src/app/(pages)/dashboard/components/InviteList.tsx

diff --git a/CoVAR-app/src/app/(pages)/dashboard/components/InviteList.tsx b/CoVAR-app/src/app/(pages)/dashboard/components/InviteList.tsx
new file mode 100644
index 0000000..a5b5b0f
--- /dev/null
+++ b/CoVAR-app/src/app/(pages)/dashboard/components/InviteList.tsx
@@ -0,0 +1,56 @@
+'use client';
+import React, { useEffect, useState } from 'react';
+import { Paper, Typography, Box, CircularProgress, List, ListItem, ListItemText } from '@mui/material';
+import { fetchAllInvites } from '@/functions/requests';
+
+type Invite = {
+    invite_id: string;
+    username: string;
+    organization_name: string;
+    invite_status: string;
+};
+
+const InviteList: React.FC = () => {
+    const [invites, setInvites] = useState<Invite[]>([]);
+    const [loading, setLoading] = useState(true);
+
+    useEffect(() => {
+        const loadInvites = async () => {
+            try {
+                const token = localStorage.getItem('accessToken');
+                const invites = await fetchAllInvites(token as string);
+                setInvites(invites);
+                setLoading(false);
+            } catch (error) {
+                console.error('Error fetching invites:', error);
+                setLoading(false);
+            }
+        };
+
+        loadInvites();
+    }, []);
+
+    return (
+        <Box sx={{ padding: 2 }}>
+            <Typography variant="h6" color="text.primary">Pending Invites</Typography>
+            {loading ? (
+                <CircularProgress />
+            ) : invites.length === 0 ? (
+                <Typography>No pending invites at the moment.</Typography>
+            ) : (
+                <List>
+                    {invites.map((invite) => (
+                        <ListItem key={invite.invite_id}>
+                            <ListItemText
+                                primary={`${invite.username} - ${invite.organization_name}`}
+                                secondary={`Status: ${invite.invite_status}`}
+                            />
+                        </ListItem>
+                    ))}
+                </List>
+            )}
+        </Box>
+    );
+};
+
+export default InviteList;
diff --git a/CoVAR-app/src/app/(pages)/dashboard/components/adminPage.tsx b/CoVAR-app/src/app/(pages)/dashboard/components/adminPage.tsx
index 558ebf2..de242b9 100644
--- a/CoVAR-app/src/app/(pages)/dashboard/components/adminPage.tsx
+++ b/CoVAR-app/src/app/(pages)/dashboard/components/adminPage.tsx
@@ -10,6 +10,8 @@ import { Height } from '@mui/icons-material';
 import { mainContentStyles } from '@/styles/sidebarStyle';
 import SeverityDistribution from './severityDistribution';
 import { chartContainerStyles } from '@/styles/dashboardStyle';
+import InviteList from './InviteList'; // Import the new component
+
 
 type User = {
     user_id: string;
@@ -160,49 +162,47 @@ const AdminPage: React.FC = () => {
         { name: 'Clients', value: userMetrics.clients },
       ];
 
-    return (
-
-            <Box sx={mainContentStyles}>
-                <Box sx = {{marginBottom : '2vh'}}>
-                    <Typography variant="h5" color="text.primary">
-                        User Metrics
-                    </Typography>
-                </Box>
-
-
-                <Paper sx={{ padding: 2 }}>
-                    <Typography>Total Users: {userMetrics.total}</Typography>
-                    <Typography>Admins: {userMetrics.admins}</Typography>
-                    <Typography>VAs: {userMetrics.vas}</Typography>
-                    <Typography>Clients: {userMetrics.clients}</Typography>
-                    <Paper sx={chartContainerStyles}>
+      return (
+        <Box sx={mainContentStyles}>
+            <Box sx={{ marginBottom: '2vh' }}>
+                <Typography variant="h5" color="text.primary">
+                    User Metrics
+                </Typography>
+            </Box>
+
+            <Paper sx={{ padding: 2 }}>
+                <Typography>Total Users: {userMetrics.total}</Typography>
+                <Typography>Admins: {userMetrics.admins}</Typography>
+                <Typography>VAs: {userMetrics.vas}</Typography>
+                <Typography>Clients: {userMetrics.clients}</Typography>
+
+                <Box sx={{ display: 'flex', justifyContent: 'space-between', marginTop: 2 }}>
+                    <Paper sx={{ ...chartContainerStyles, width: '48%' }}>
                         <Typography variant="h6">Role Distribution</Typography>
                         <SeverityDistribution data={roleData} />
                     </Paper>
-                </Paper>
-
-
-
-                    <Box sx = {{marginBottom : '2vh', marginTop : '2vh'}}>
-                        <Typography variant="h5" color="text.primary">
-                            Unauthorised Users (Last Week)
-                        </Typography>                    
-                    </Box>
 
+                    <Paper sx={{ ...chartContainerStyles, width: '48%' }}>
+                        <InviteList />
+                    </Paper>
+                </Box>
+            </Paper>
 
+            <Box sx={{ marginBottom: '2vh', marginTop: '2vh' }}>
+                <Typography variant="h5" color="text.primary">
+                    Unauthorised Users (Last Week)
+                </Typography>
+            </Box>
 
             {loading ? (
                 <CircularProgress />
             ) : (
-
-                    <DataGrid
-                        rows={users}
-                        columns={columns}
-                        getRowId={(row) => row.user_id}
-                        sx = {{...dataGridStyles, 
-                            height : '50vh'
-                        }}
-                    />
+                <DataGrid
+                    rows={users}
+                    columns={columns}
+                    getRowId={(row) => row.user_id}
+                    sx={{ ...dataGridStyles, height: '50vh' }}
+                />
             )}
 
             <ConfirmAuthorizeDialog
diff --git a/CoVAR-app/src/functions/requests.tsx b/CoVAR-app/src/functions/requests.tsx
index b22a167..e845a92 100644
--- a/CoVAR-app/src/functions/requests.tsx
+++ b/CoVAR-app/src/functions/requests.tsx
@@ -733,3 +733,14 @@ export const getOwner = async (orgId: string, accessToken: string) => {
     };
     return await handleRequest(request);
 };
+
+
+// Function to fetch all invites
+export const fetchAllInvites = async (accessToken: string) => {
+    const request = {
+        method: 'get',
+        url: `/api/invites`,
+        headers: { Authorization: `Bearer ${accessToken}` },
+    };
+    return await handleRequest(request);
+};
diff --git a/langchain/requirements.txt b/langchain/requirements.txt
index 486b3b5..a92d38e 100644
--- a/langchain/requirements.txt
+++ b/langchain/requirements.txt
@@ -9,4 +9,5 @@ requests
 python-dotenv
 openai
 PyJWT
-cryptography
\ No newline at end of file
+cryptography
+gunicorn
\ No newline at end of file
diff --git a/server/routes/invites.js b/server/routes/invites.js
index 1a65236..39cd5a3 100644
--- a/server/routes/invites.js
+++ b/server/routes/invites.js
@@ -1,12 +1,9 @@
 const express = require('express');
-
-const { authenticateToken} = require('../lib/securityFunctions');
-
+const { authenticateToken } = require('../lib/securityFunctions');
 const pgClient = require('../lib/postgres');
-
 const router = express.Router();
 
-// Fetch invites for a user
+// Fetch invites for a specific user
 router.get('/invites/:username', authenticateToken, async (req, res) => {
     const { username } = req.params;
 
@@ -19,7 +16,7 @@ router.get('/invites/:username', authenticateToken, async (req, res) => {
 
         const userId = userResult.rows[0].user_id;
 
-        // Fetch invites for the user
+        // Fetch pending invites for the user
         const invitesQuery = `
             SELECT i.invite_id, o.name as organization_name, i.invite_status 
             FROM organization_invites i
@@ -82,5 +79,23 @@ router.patch('/invites/:inviteId/reject', authenticateToken, async (req, res) =>
     }
 });
 
+// Fetch all invites
+router.get('/invites', authenticateToken, async (req, res) => {
+    try {
+        const invitesQuery = `
+            SELECT i.invite_id, u.username, o.name as organization_name, i.invite_status 
+            FROM organization_invites i
+            JOIN organizations o ON i.organization_id = o.organization_id
+            JOIN users u ON i.user_id = u.user_id
+        `;
+        const invitesResult = await pgClient.query(invitesQuery);
+
+        res.json(invitesResult.rows);
+    } catch (err) {
+        console.error(err.message);
+        res.status(500).send('Server Error');
+    }
+});
+
 
-module.exports = router;
\ No newline at end of file
+module.exports = router;

From 8f6be7c11aa0f005fdc341985635cea3a4f815bb Mon Sep 17 00:00:00 2001
From: Alec Watson <alecwatson15@gmail.com>
Date: Sat, 28 Sep 2024 18:25:13 +0200
Subject: [PATCH 02/24] Fix for lounge middleware and production changes

---
 .github/workflows/deploy.yml              |   4 -
 CoVAR-app/src/app/(pages)/lounge/page.tsx | 100 +++++++++++-----------
 docker-compose.prod.yml                   |  22 +----
 langchain/__pycache__/app.cpython-39.pyc  | Bin 1407 -> 7217 bytes
 langchain/requirements.txt                |   3 +-
 5 files changed, 54 insertions(+), 75 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 1e921cc..1aad67e 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -77,8 +77,6 @@ jobs:
 
     - name: Create Pem Files
       run: |
-        echo ${{ secrets.PUBLIC }} > langchain/public.pem
-        echo ${{ secrets.PRIVATE }} > langchain/private.pem
         echo ${{ secrets.PUBLIC }} > server/public.pem
         echo ${{ secrets.PRIVATE }} > server/private.pem
         echo ${{ secrets.REFRESH_PUBLIC }} > server/refreshPublic.pem
@@ -90,11 +88,9 @@ jobs:
         docker build -t 211125691345.dkr.ecr.eu-west-2.amazonaws.com/covar_api:latest ./server
         docker build -t 211125691345.dkr.ecr.eu-west-2.amazonaws.com/covar_client:latest ./CoVAR-app
         docker build -t 211125691345.dkr.ecr.eu-west-2.amazonaws.com/covar_nginx:latest ./nginx
-        docker build -t 211125691345.dkr.ecr.eu-west-2.amazonaws.com/covar_langchain:latest ./langchain
         docker push 211125691345.dkr.ecr.eu-west-2.amazonaws.com/covar_api:latest
         docker push 211125691345.dkr.ecr.eu-west-2.amazonaws.com/covar_client:latest
         docker push 211125691345.dkr.ecr.eu-west-2.amazonaws.com/covar_nginx:latest
-        docker push 211125691345.dkr.ecr.eu-west-2.amazonaws.com/covar_langchain:latest
   
   deploy-containers:
     runs-on: ubuntu-latest
diff --git a/CoVAR-app/src/app/(pages)/lounge/page.tsx b/CoVAR-app/src/app/(pages)/lounge/page.tsx
index b8a5b03..ed66803 100644
--- a/CoVAR-app/src/app/(pages)/lounge/page.tsx
+++ b/CoVAR-app/src/app/(pages)/lounge/page.tsx
@@ -8,12 +8,17 @@ import { useRouter } from 'next/navigation';
 import { doSignOut } from '../../../functions/firebase/auth';
 import axios from 'axios';
 
-
-
 const Lounge: React.FC = () => {
     const router = useRouter();
     const pollingRef = useRef<NodeJS.Timeout | null>(null);
 
+    // Clear the cookie on component mount
+    useEffect(() => {
+        console.log("chicken");
+        // Clear the accessToken cookie
+        document.cookie = 'accessToken=; expires=Thu, 01 Jan 1970 00:00:00 UTC; path=/;';
+    }, []);
+
     const handleSignOut = async () => {
         try {
             await doSignOut();
@@ -23,59 +28,56 @@ const Lounge: React.FC = () => {
         }
     };
 
-// Function to get the current user and check their role
-const checkUserStatus = useCallback(async () => {
-    try {
-        const response = await axios.post(
-            '/api/getUser',
-            { accessToken: localStorage.getItem('accessToken') },
-            { headers: { Authorization: `Bearer ${localStorage.getItem('accessToken')}` } }
-        );
-
-        const {role} = response.data;
-        console.log("Role:", role);
-
-        if (role !== 'unauthorised') {
-            router.replace('/dashboard'); 
-        }
-
-    } catch (error) {
-        console.error('Error fetching user status:', error);
-    }
-}, [router]);
-
-// Start polling every 5 seconds
-const startPolling = useCallback(() => {
-    if (!pollingRef.current) {
-        pollingRef.current = setInterval(() => {
-            checkUserStatus(); 
-        }, 5000); 
-    }
-}, [checkUserStatus]);
+    // Function to get the current user and check their role
+    const checkUserStatus = useCallback(async () => {
+        try {
+            const response = await axios.post(
+                '/api/getUser',
+                { accessToken: localStorage.getItem('accessToken') },
+                { headers: { Authorization: `Bearer ${localStorage.getItem('accessToken')}` } }
+            );
 
+            const { role } = response.data;
+            console.log("Role:", role);
 
+            if (role !== 'unauthorised') {
+                router.replace('/dashboard'); 
+            }
 
-const stopPolling = useCallback(() => {
-    if (pollingRef.current) {
-        clearInterval(pollingRef.current);
-        pollingRef.current = null;
-    }
-}, []);
+        } catch (error) {
+            console.error('Error fetching user status:', error);
+        }
+    }, [router]);
+
+    // Start polling every 5 seconds
+    const startPolling = useCallback(() => {
+        if (!pollingRef.current) {
+            pollingRef.current = setInterval(() => {
+                checkUserStatus(); 
+            }, 5000); 
+        }
+    }, [checkUserStatus]);
 
+    const stopPolling = useCallback(() => {
+        if (pollingRef.current) {
+            clearInterval(pollingRef.current);
+            pollingRef.current = null;
+        }
+    }, []);
 
-useEffect(() => {
-    startPolling();
+    useEffect(() => {
+        startPolling();
 
-    return () => {
-        stopPolling(); 
-    };
-}, [startPolling, stopPolling]);
+        return () => {
+            stopPolling(); 
+        };
+    }, [startPolling, stopPolling]);
 
     return (
         <Box sx={loungeContainerStyles}>
             <Box sx={loungeBoxStyles}>
                 <Card sx={{ backgroundColor: 'background.paper', padding: 4, borderRadius: 2, borderStyle: 'solid', borderWidth: 1, borderColor: 'divider', display: 'flex', flexDirection: 'column', alignItems: 'center' }}>
-                    <br></br>
+                    <br />
                     <LockOutlinedIcon sx={iconStyles} />
                     <Typography variant="h1" sx={brandTextStyles}>
                         CoVAR
@@ -86,14 +88,14 @@ useEffect(() => {
                     <Typography variant="body1" sx={loungeTextStyles}>
                         Please wait here until an administrator verifies your account.
                     </Typography>
-                    <br></br>
-                    <br></br>
+                    <br />
+                    <br />
                     <Box sx={{ display: 'flex', justifyContent: 'center', marginTop: 2 }}>
                         <CircularProgress color="primary" />
                     </Box>
-                    <br></br>
-                    <br></br>
-                    <br></br>
+                    <br />
+                    <br />
+                    <br />
                     <Button
                         variant="contained"
                         color="primary"
diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml
index 83e2d59..286c7eb 100644
--- a/docker-compose.prod.yml
+++ b/docker-compose.prod.yml
@@ -1,6 +1,6 @@
 services:
   postgres:
-    image: 'postgres:latest'
+    image: 'postgres:16'
     environment:
       - POSTGRES_PASSWORD=${PG_PASSWORD}
       - POSTGRES_USER=${PG_USER}
@@ -43,26 +43,6 @@ services:
       - NEXT_PUBLIC_APP_ID=${NEXT_PUBLIC_APP_ID}
       - NEXT_PUBLIC_MEASUREMENT_ID=${NEXT_PUBLIC_MEASUREMENT_ID}
 
-  langchain:
-    image: 211125691345.dkr.ecr.eu-west-2.amazonaws.com/covar_langchain:latest
-    environment:
-      - PG_USER=${PG_USER}
-      - PG_HOST=${PG_HOST}
-      - PG_DATABASE=${PG_DATABASE}
-      - PG_PASSWORD=${PG_PASSWORD}
-      - PG_PORT=${PG_PORT}
-      - FLASK_ENV=development
-      - MODEL_TYPE=${MODEL_TYPE}
-      - OPENAI_MODEL_NAME=${OPENAI_MODEL_NAME}
-      - API_KEY=${API_KEY}
-    ports:
-      - "6000:6000"
-    volumes:
-      - /app/node_modules
-      - ./langchain:/app
-    depends_on:
-      - postgres
-
 volumes:
   postgres_data:
     driver: local
\ No newline at end of file
diff --git a/langchain/__pycache__/app.cpython-39.pyc b/langchain/__pycache__/app.cpython-39.pyc
index 1ca8cb4030317c6fb3807324e6b3519212be1391..051a9ba9345157d8c17500d5900d7959c4e2a3ae 100644
GIT binary patch
literal 7217
zcmcIpO>7)TdhPD{?->qfDE?ETTCy#hUYQap@5W)2wPlOaYAsWWs93AE>`8N~NH*Ei
zJzHHvnd2TGR+}IfAr4|7husAzAPC?b_qfO@hdu2v2!cN3k{se7NPr+f03H^3Uv<xD
zhRSY$EHcBXuCD)|uikrK(HR>vHGKa3-~Vg-FJIHNf25b;59PjtU-%!orZJ7_p4QTB
zy=B-&D`RJLN;AA{D`)3aJmckC1-qc)S+CeC*(DXvd1k9@msLFPRa#^ASgUGR)qBAk
zx5v>=!K>Ld^{m@<^_;LL)bo^mitBvxiEdAI|Cmp+A}cYIm7iw*WY(VHGe@(}G<)s=
zTF7cy?FmNZ*H*Ofr<XNdeIFu3t;+vUYyO2=|2$G_fsOGwR$$dXH0HD)X>9x_nJ2og
zJ<$A5vKl}Ag?@NB>4Pt@8s)J1Bg3Av=O1eRRg^e`5_`I4FX~$NJjzV)#UE)uF@{S%
z&>mvs_Top2zL`8PYnL^4icS7dv(K_AHjSsnX4ovA=hz&Z$MZa&+IxvDu+uv_JM+|F
zi|p(VHLTCeD%~2SpJV4$`YS5^r9t}3>=l)Mflsmv`^Fc#_&1bzmA%SdV@vGyr?j($
zO>OBLUz0T~W#Zfo&k6VAg5clp@KDBuy)f|I?ZYKKo_KH9k#|MVYRmh))%G08k!n)v
z9nW)G&fu-h{cE@IHcfdqgJ8$wH@VM+Bi#dz93w7!fx{Xskla6r%iFHsf7$4o?ar3x
zHkaGH73-p#>&Wdl-a=zV?l%MG`a9inTet`4or-k7ad-U#YuojBXi=M-Sz)Ky<YBno
z@w~%j>#l0e+UJLB*4K-eWH+<CyxhIiuV(pyw6=qe&rsImPROn1E^qEza+j-it+pd~
zmzRu<jqdEa5P?wrU>sJzi8ZT<Q#1G&h!ydB55KUDpnE~$L`ATx#3H1=XGEIJFax`q
zd7A0zk^Vs2giRwSdw3(UG?ryKS7-TcBM-|-b8}>6^hItVX%S_L{W7p8lw2xpbZhr`
zlVi1+C4+tLuUT>K-sb8zzqO>>rsM4d!j-$NFwSwBQMZ1d3R$~OXz@?muHfwJKgE=~
z<G1_+$8!gbxPOM!rF@*j4)`+8>^+uoo^k98kJEi?V5RM;^`w<ecgJ^RM{u=pc0FxQ
z^`??w3OO}Edn{>&HPq`@nwZAQ9hWaT?Kb_E+lR4vzy(aPfnLwh+SU+gx?xoH2|ce@
z^%{O+7HLh&=zlVZ<nUA5aTO7!GsD$;n$-5NDbipWmZeR=hU6lBuu0iSf1>vciL}UI
z`5)sjV`&Q;aj_F};X5sEmn4ozgI+}y4Z}!FgSG9BrzVdr`0j)IYu1t>rcfv@q!V4r
ziwSzqE4$`#->PW=MIAY6Dk4h_XX32tg&GhG6wvA<!3<(?QH=x(18~<uh4p$-El5!p
zXOT8yq15JJNiN`p>6pHD1UrnhX9gy%9T^dp32&KRCdx#{wt>lKHo6OswqARC?GgKI
z<>HmzqvfT~5T-9%$CZz6-ECaEe*ND1=H|y3v>|w0pu_EWUYrR#TT9uv(%f}iztL7W
zVw-Nef%7G?pmD}+hw*p|XMEe`EG=<zqGkT66i!n%Q1}wfl}?&wWHS|`YKT`6Z_@ee
ze`xdb_^Hi5jYy<l*FK);VP;2kCJkm_hT8YD5uKaNhOkiPYdX!?On@LzuE{Zzyx?KS
zlj0TR#D?2GIjoA{t`9p<<61+Zkb2b&+5>SBvF^;JmLq{I3<oo4wKx_<x`7|Y*}Hc(
z?^ACrE_VYKHmPF&Ll#22sm32;Tx7II2GgIxfFn)JV;;bfXL|U$%#tCyFj|(Q-9k=|
z<)7)SFsEU6^Qk!(B10CR7~&I|#q5i7U=uu1hU%d8674s70Q15UvMOFy@ticHEHPUD
z8D+(nQ7-%o)pJGlJVvc_|3Q{z<q29w*|EJUt6~KCD9^_C4e@s>r8cL@@kUM7pJ=^;
z{~_|~$op40!6t|ipBhMg2dPtvvliJj)jH6@UlW7+)bjLIO`amoe5#{HRZg<GD4!hR
zALw$5#{0<V6?-Mbb1H83%51(@k<&*rQ3b0w7L7%PceP$MsvgZo#mHm}KgN3Y#^qcz
zzBeD0o*2CvW_UWP(F{|ZUI5?!t*-Uz;QP0v$<9Re0dSl?I`a$&tyU#XS8KDlZ9IT6
zLIt4S=k?9>sZ;=2-`S0L>{<slAl$C9jpM?*+!0(@VjL#WT^h+uaNTl4tL26v(Gi%*
zP2gG(G9K%eAT$tU&2e@3*fmz-lPRmmSKbZeF1YXc>1?c6j?YGuRxOOkB6Xlx;tMn$
zn;+b{zJ9xL|KZ*BI3Ixg9XBpqyL+qg{`x~CC~a_DR*x&oD{F6U9iQ8kvb}cc(rysS
zWfnB|xmX6F5UhG@D=TkadGjj}1E7F=c5w@w+~^1|&hPM+>$`FF=AAn?Z?8AfE{@G4
z{S9EsSGxE%&3&>@T&fLA9=7?K<$MWfFs=0SVaFp$vgLZNJhWEUtj|X0-m`v1(bbbh
zS9^n!gUG|6qgKkXnul9lguK}S<sMpLn>SrhD&}q7-{nvnw4STh!O&=2Xqm^mZgUre
ze88<O4r)%p!`eEuZrxSeg582?Yy%4e5t3RtOp3d{MF11{7g3Y!qUDHvkPx`N9l%ny
zyhEjJLNM4!w-8H%;osU$TBN~|5PGrjMJwbUZ%UON_&gmk*&{a9VmxdLw@reN#tisu
z2R^Ac>oJsvb$(>^-&i?M)_Wpx^*nT$=LL^3cr<YsbZ`<N(4a^CouRSb*|`1Ca)$;?
zimpHCi~X+Ce#yvxeY@{--nKwk&-=o9`b{_FYRA&{uyNsT(D5*|WQD-mj|0I*hU{2A
zf9$zf91O?*)iZ!JSf!KtCIzpP{Z1=&MCUo!S9?fD0Rr|vao&~|1<_hu*yYf>B8)RT
zT*hW79U((nU8Nb~T-b(XD-jW!E)W6*{3eIq>a;x`XGz#6I-^A063fI!5XJ>aa#tYl
zE!BzBc9kM2P$42UL5v%lA39zqk#&l71?h=+Y#X%Rkg0bN=hgVRBEYzSRfOD^acTY2
zCWmDNeq16h=UYy5KQ1Xr+2EfxmnPz}0~~B5^Gj6IDW(0~rUJ%B!p3nH9O^t@y4X~w
zy+Nm4!9ZL;p(X%)6(|meF|-giR_qrFtlGl`R!LYTu1=g!BukuAFrl_7u0Y&4UVk_`
zKPd~Q(_@Pg!=(QX)+)S@Kr<?&TcKc!hN({)dA)*fQGIKMp_{r136Z2!@m7JHfY8aH
zR3>YhdNGsL4c+)<F;DV`^e^Pz7TWF3Uh4S6f@7dJM&v~WMF;XCO63I!i*O#gSm|WQ
ziA*XDl;nWifMWt_phG}_5J9g7B!eE_RyFd9>XI5cR!|Obv6q$kqe7Ggt>(IaBa5<>
ziUV`6%u1;^Fd+cGl$272IH)wnWL1fSdyoMY<o%T#XJf3&#+5j@iqslX|DM&U&Vep|
zF{n#z)FBLNBqmZ}P-m0Rg+Y{4lwXXBM-yx+f;WJXmE@_Yv^N=LK=`K2vFWHZpmc-H
zP~MOLn1TQ}fB+~f0gz*}QF%}r(n1LUTER43t;*bx04RT6RssOefdH7_NQl0+5m;o|
zfSSaI6W_u<C3b#=V&9}4w(fO&LPBe>(Num&S~}#cjo|Dk#r4b+Bn3o&k);$R+yspK
z05PEZFi{->=0VyZWxzkwEBMHjBuN}giVk=N><8!strNV5E>05CeEbD12hlANbar;7
z75D`3NKKju!w#?(6x44l@j*v=R>QiNuu1~$g!l@9&l7@=V*GO;CPAZ^B*pY0lm~^l
zGF0~gj+Jx?Wz_-DCj(D8EG3eSK>n|Ns6oEak@zjzLqb>a+Z2$yAby7e@=nF?Qt&nf
z?@(}!f_Eu+kAjyG9M63~bfDNF0YoAtxF>6tf+caCO0FYVnpIRGZc_qzec~ns<R&H1
zPpB<^kAeXSh!5y>g90_iI}{s5e{q-6?omL#jo74s@J#$Z1s@_<s)&aaSG@KS#U4@c
zF$JGcU{gR^O*AMV))Rj~fkVLw_jYz*<0p{xk5D+I)zOT+k=1J%g`gAzqGq$^Fopt2
ztN59Op&5!*fv1GNDQ+^f(yd&QK^uqWJ<`D=SV<aufR+D}V&!vJ3=#~E7|W=Wo=qJv
zLP|YcQ#lDT7Sfy?E5bD+?0eBQ^CcW^W~Qzg%B1+)cg@PIqFl3V_@!!jO!cW+hAUDX
zcF|-xb%AodJo3h)Tpy)atyhqhBRD_6zGC<1vMR?@RIcsSSsf!QMI|-?jQypglv6<E
ziN+~82~;-y?;&qeIcL*yiY_nN3~<?m(^g`$D*Zcbj_N6=?dqTfYH1GGJk93W0<hVH
z(>4R=D#h9#=;VUI9V<uWqghsta0Q0(Rg{ZW>5m<*Sp}|H9!Ncg6<Cba3Jkes{{&>l
zrL%I)&PLTiy}oNkJC&xZwX=qhx%zokAv2x>WInec=&~V!=fz*|hbiYvTqa|Bsqcl1
z)<|>>l%fDbC)mD1tq;64b;<=neRp=)DIsX>yI$Q&AOGp<r+ZS!tXbW^{*AHUBHSmy
zhIn)dsNtgp5c=dmU?>Xc!=R7x#6<+J4#r5A!vx<bPPp6*gi50#&4VzsLZkrWmDWZv
zNNFKe<rFQKe<P5jb9)jA6VWVgP?iEg1&80E*IN|Oy`lIn1@BX!5L4a4DX{$i!^v^+
zfcjH6d*7p&g3XsHb^!sT`#`V$U(vGwNNa#Se}?u#LTxQu(FrU8g^BbuCJ8tRHUWzy
zIIGAX1y2*;nF`PpJgX#L`{21vV=XosExJBvbPJc4)z@v~dh$NqUy`dIXWQ84ILG)_
zXJ_d(JGV{$Y!L9uwS=c=PwWNH@plrlS5}hf?r<4NQn?v+?Rkmhc0oBNBgyI(LeZ8z
z{k-&!`d>t2hps4;A7kf}|3M7V-vo_D@t7h)#ewJ2+0m_UqY-CtAsuJwro%4ce-I7&
z_d}e8Z_30Z)u!8N#jkPw2C^U(ZqPp%luwuNq#`+Ga&$SH5HeAzor5HTq#_M3h>(O@
z*o^4-L!7AC5ethIzX}hh<MD5UkF=1CdlI{sd_jTzuTjhxpuG#~cUrj#<VsZaMWa|Q
S7Vyi%y;#TZ3Vv^!`hNo$R$kHo

literal 1407
zcmah}&5s*36t_K}nS5+mRY0k<8ZMwzBD<^Z0Y!+fsw)oAmS&|Da~Vy>PBO`SVLPQ6
zCS1yOCGH4md*qDxXME*^xc0;ao+sHh;(|wh^XB>4zu)`tMBT23VEpy_Z_}3+LVxIw
z{Q)-gDNIp<poroWWjMeY2}ouH2G%x`nwb??jc%lN<^)coo2eVP471jA9C*xIw5dhy
z8K%w^p)PIxh``=qE$S@^Phq`F+q6Tww0EV?HOFXh@F$?6fuXGPG!jeYaQ5wr38|cg
zDDq^w9$<BNe;&!lyvRy<!Ll-qBm=9bt&h?)%A$u=>zJ?dQ0k55<45BQSa&ie=LHq9
z2Dlk6C^{YYVTxNAAqfFL$3TW`ki^%dMlbLNS4YygHmLzRsmZnV0%7fGYR^lQpPNV;
z3wz<LD~vV}N_7`jt=jk*{X(>lbg5091Wu;zlw2YkeFJIS7(W=}-TMTcpy~_RqAhAr
z?}}{98rSCMXk*pZwWrgRU_iHNx3(AU1aBNb=+(|1!a?02T%s`oKAoTNy0>F<0>1tK
zu-Se8A14Z@4c>TIb)Ky9JjrLi&S`b_wXR80<o@?fbwJyApXK5^#{Dmud|&u-p5#kk
zNLKojb@Lup@6M$xN5{wWLdYR4;w9t5B$tfmQ93$3J-c^S9gZ1)n#9acgbx+eh}GMB
zw!Dxx_K~kF#(BZ354KhJ#p}I$etyCIB#+{l36V@vmb`>ASM8=z?hQ{zA5I2DSy@3@
zs@zE=Sh(V8;NHYl9bH0SX+Cn!{5UET8Kr(P_0M^f$LtejO7=`vx4+T{0MOGSj+)GH
zCRV8gmiAVw-h80hHZDt@$p&)d54y@KIpl%sn-_Ga(Adzq+rC!ruK$HHW=sZs9woqV
zTJTWFNUntP*t3|G8c_uOC)>;N;KsyFIFj2Sl&z^j#yk3>^~z)5D)$wbT{f3WgNhOk
zWC}B`uZObYd6eY53wqGr#uL&cmcJr?8*G2KkE62Gb6Bon`|j@P+a>OTK*Yr+_6&kO
z?BWhS#6A2TA)vXqXWIXmW)CcVnEVcSD>n=?zzf65IT<!jQoe=I1^gFG-95@I3oeyK
z*<>{v^prK#KMPJ^FE_N%aR+zOD4#XN!?@sVxQ$K>!L&<u|FuWaG(?jtez4<^M;Qx4
wWk6iY;>8MDwV`J~fKA+c;+<yCM^MyN%07k`L!uAj7Q_fq5|{L_cjV%K0dxe2NdN!<

diff --git a/langchain/requirements.txt b/langchain/requirements.txt
index 486b3b5..be669a0 100644
--- a/langchain/requirements.txt
+++ b/langchain/requirements.txt
@@ -9,4 +9,5 @@ requests
 python-dotenv
 openai
 PyJWT
-cryptography
\ No newline at end of file
+cryptography
+gunicorn 
\ No newline at end of file

From 741167c2ef2d117a8cffe314c2365a31da8b3e88 Mon Sep 17 00:00:00 2001
From: Alec Watson <alecwatson15@gmail.com>
Date: Sat, 28 Sep 2024 18:32:26 +0200
Subject: [PATCH 03/24] Change to URL to langchain

---
 server/routes/chain.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/routes/chain.js b/server/routes/chain.js
index 5b149a4..e58ad65 100644
--- a/server/routes/chain.js
+++ b/server/routes/chain.js
@@ -26,7 +26,7 @@ router.post('/unmatchedRecommendations', authenticateToken, async (req, res) =>
 
     try {
         const token = req.headers.authorization;
-        const response = await axios.post('http://langchain:6000/unmatchedRecomendations',
+        const response = await axios.post('http://13.60.34.133/topVulChain',
             { chain_prompt_1 },
             { headers: { Authorization: token } }
         );
@@ -79,7 +79,7 @@ router.post('/matchedRecommendations', authenticateToken, async (req, res) => {
 
     try {
         const token = req.headers.authorization;
-        const response = await axios.post('http://langchain:6000/matchedRecommendations',
+        const response = await axios.post('http://13.60.34.133/topVulChain',
             { chain_prompt_1, chain_prompt_2 },
             { headers: { Authorization: token } }
         );
@@ -129,7 +129,7 @@ router.post('/topVulChain', authenticateToken, async (req, res) => {
     try {
         // Carry JWT through to chain server
         const token = req.headers.authorization;
-        const response = await axios.post('http://langchain:6000/topVulChain', { chain_prompt }, { headers: { Authorization: token } });
+        const response = await axios.post('http://13.60.34.133/topVulChain', { chain_prompt }, { headers: { Authorization: token } });
 
         res.status(200).json(response.data);
     } catch (error) {

From dd71b5f9eb3863ccc0ecc64344da7f8748e52e65 Mon Sep 17 00:00:00 2001
From: JBlixems <jfmalan123@gmail.com>
Date: Sun, 29 Sep 2024 11:07:16 +0200
Subject: [PATCH 04/24] Remove all console logs

---
 CoVAR-app/next.config.mjs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/CoVAR-app/next.config.mjs b/CoVAR-app/next.config.mjs
index 4678774..3fc817b 100644
--- a/CoVAR-app/next.config.mjs
+++ b/CoVAR-app/next.config.mjs
@@ -1,4 +1,9 @@
 /** @type {import('next').NextConfig} */
-const nextConfig = {};
+const nextConfig = {
+    compiler: {
+        // Remove all console logs
+        removeConsole: true
+  }
+};
 
 export default nextConfig;

From 9eeb2574ac00b077dc7e085a1e976d76915d5264 Mon Sep 17 00:00:00 2001
From: Alec Watson <alecwatson15@gmail.com>
Date: Sun, 29 Sep 2024 11:25:21 +0200
Subject: [PATCH 05/24] Changes to table styling

---
 CoVAR-app/src/app/(pages)/reports/page.tsx | 106 ++++++++++++---------
 1 file changed, 61 insertions(+), 45 deletions(-)

diff --git a/CoVAR-app/src/app/(pages)/reports/page.tsx b/CoVAR-app/src/app/(pages)/reports/page.tsx
index f134053..d9bf6b1 100644
--- a/CoVAR-app/src/app/(pages)/reports/page.tsx
+++ b/CoVAR-app/src/app/(pages)/reports/page.tsx
@@ -1,10 +1,11 @@
 'use client';
 import React, { useEffect, useState } from 'react';
 import { CircularProgress, Box, Table, TableBody, TableCell, TableContainer, TableHead, TableRow, Paper, Typography, Button } from '@mui/material';
-import { populateReportsTable, fetchExecReport, fetchTechReport } from '@/functions/requests'; // Assume fetchTechReport is a new function in your requests file
+import { populateReportsTable, fetchExecReport, fetchTechReport } from '@/functions/requests'; 
 import DownloadIcon from '@mui/icons-material/Download';
 import { mainContentStyles } from '@/styles/evaluateStyle';
-import {headingBoxStyles} from '../../../styles/organisationStyle';
+import { useTheme } from '@mui/material/styles'; // Import useTheme
+
 type Report = {
     report_id: string;
     created_at: string;
@@ -14,14 +15,15 @@ type Report = {
 };
 
 const ReportsPage = () => {
-    const [reports, setReports] = useState<Report[]>([]); // State to store reports data
-    const [loading, setLoading] = useState<boolean>(true); // State to handle loading
+    const [reports, setReports] = useState<Report[]>([]); 
+    const [loading, setLoading] = useState<boolean>(true); 
+    const theme = useTheme(); 
 
     useEffect(() => {
         const fetchReports = async () => {
             try {
                 const response = await populateReportsTable();
-                console.log('API Response.data:', response.reports); // Add this line to log the API response
+                console.log('API Response.data:', response.reports);
                 if (response.reports) {
                     setReports(response.reports);
                 }
@@ -56,23 +58,17 @@ const ReportsPage = () => {
 
     const handleFetchExecReport = async (reportId: string) => {
         try {
-            const blob = await fetchExecReport(reportId); // Fetch the PDF blob for executive report
+            const blob = await fetchExecReport(reportId); 
 
-            // Create a URL for the blob
             const url = window.URL.createObjectURL(new Blob([blob]));
 
-            // Create a link element
             const link = document.createElement('a');
             link.href = url;
-            link.setAttribute('download', `executive_report_${reportId}.pdf`); // Set the file name
+            link.setAttribute('download', `executive_report_${reportId}.pdf`);
 
-            // Append the link to the document body
             document.body.appendChild(link);
-
-            // Programmatically click the link to trigger the download
             link.click();
 
-            // Clean up by removing the link and revoking the object URL
             link.parentNode?.removeChild(link);
             window.URL.revokeObjectURL(url);
 
@@ -83,23 +79,17 @@ const ReportsPage = () => {
 
     const handleFetchTechReport = async (reportId: string) => {
         try {
-            const blob = await fetchTechReport(reportId); // Fetch the PDF blob for technical report
+            const blob = await fetchTechReport(reportId); 
 
-            // Create a URL for the blob
             const url = window.URL.createObjectURL(new Blob([blob]));
 
-            // Create a link element
             const link = document.createElement('a');
             link.href = url;
-            link.setAttribute('download', `technical_report_${reportId}.pdf`); // Set the file name
+            link.setAttribute('download', `technical_report_${reportId}.pdf`);
 
-            // Append the link to the document body
             document.body.appendChild(link);
-
-            // Programmatically click the link to trigger the download
             link.click();
 
-            // Clean up by removing the link and revoking the object URL
             link.parentNode?.removeChild(link);
             window.URL.revokeObjectURL(url);
 
@@ -108,6 +98,9 @@ const ReportsPage = () => {
         }
     };
 
+    // Determine header background color based on light/dark mode
+    const tableHeaderBackground = theme.palette.mode === 'light' ? '#b0b0b0' : theme.palette.background.paper;
+
     return (
         <Box sx={{ ...mainContentStyles, padding: 3, width: '100%' }}>
             <Typography variant="h4" sx={{ marginBottom: 2, color: 'text.primary' }}>
@@ -115,41 +108,65 @@ const ReportsPage = () => {
             </Typography>
             <TableContainer component={Paper} sx={{ ...mainContentStyles, border: '1px solid #ccc', maxHeight: '80vh', overflowY: 'auto' }}>
                 <Table stickyHeader>
-                    <TableHead sx={{ backgroundColor: '#52796F' }}>
-                        <TableRow>
-                            <TableCell sx={{ color: 'text.primary', fontWeight: 'bold' }}>Report ID</TableCell>
-                            <TableCell sx={{ color: 'text.primary', fontWeight: 'bold' }}>Date Created</TableCell>
-                            <TableCell sx={{ color: 'text.primary', fontWeight: 'bold' }}>Critical Count</TableCell>
-                            <TableCell sx={{ color: 'text.primary', fontWeight: 'bold' }}>Medium Count</TableCell>
-                            <TableCell sx={{ color: 'text.primary', fontWeight: 'bold' }}>Low Count</TableCell>
-                            <TableCell sx={{ color: 'text.primary', fontWeight: 'bold' }}>Actions</TableCell>
+                    <TableHead sx={{ backgroundColor: tableHeaderBackground }}> {/* Darker shade for light mode */}
+                        <TableRow sx={{ backgroundColor: tableHeaderBackground }}>
+                            <TableCell sx={{ backgroundColor: tableHeaderBackground,color: 'text.primary', fontWeight: 'bold' }}>Report ID</TableCell>
+                            <TableCell sx={{ backgroundColor: tableHeaderBackground,color: 'text.primary', fontWeight: 'bold' }}>Date Created</TableCell>
+                            <TableCell sx={{ backgroundColor: tableHeaderBackground,color: 'error.main', fontWeight: 'bold' }}>Critical Count</TableCell>
+                            <TableCell sx={{ backgroundColor: tableHeaderBackground,color: 'orange', fontWeight: 'bold' }}>Medium Count</TableCell>
+                            <TableCell sx={{ backgroundColor: tableHeaderBackground,color: 'success.main' , fontWeight: 'bold' }}>Low Count</TableCell>
+                            <TableCell sx={{ backgroundColor: tableHeaderBackground,color: 'text.primary', fontWeight: 'bold' }}>Technical Report</TableCell>
+                            <TableCell sx={{ backgroundColor: tableHeaderBackground,color: 'text.primary', fontWeight: 'bold' }}>Executive Report</TableCell>
                         </TableRow>
                     </TableHead>
                     <TableBody>
                         {reports.map((report) => (
                             <TableRow key={report.report_id}>
-                                <TableCell>{report.report_id}</TableCell>
-                                <TableCell>{new Date(report.created_at).toLocaleString()}</TableCell>
-                                <TableCell>{report.criticalCount}</TableCell>
-                                <TableCell>{report.mediumCount}</TableCell>
-                                <TableCell>{report.lowCount}</TableCell>
-                                <TableCell>
+                                <TableCell sx={{ backgroundColor: tableHeaderBackground}}>{report.report_id}</TableCell>
+                                <TableCell sx={{ backgroundColor: tableHeaderBackground}}>{new Date(report.created_at).toLocaleString()}</TableCell>
+                                <TableCell sx={{ backgroundColor: tableHeaderBackground, color: report.criticalCount > 0 ? 'error.main' : 'inherit' }}>
+                                    {report.criticalCount}
+                                </TableCell>
+                                <TableCell sx={{ backgroundColor: tableHeaderBackground,color: report.mediumCount > 0 ? 'orange' : 'inherit' }}>
+                                    {report.mediumCount}
+                                </TableCell>
+                                <TableCell sx={{ backgroundColor: tableHeaderBackground, color: report.lowCount > 0 ?  'success.main'  : 'inherit' }}>
+                                    {report.lowCount}
+                                </TableCell>
+
+                                <TableCell sx={{ backgroundColor: tableHeaderBackground}}>
                                     <Button
                                         variant="contained"
-                                        color="primary"
-                                        onClick={() => handleFetchExecReport(report.report_id)}
-                                        startIcon={<DownloadIcon />} // Icon for Executive Report
+                                        color="secondary"
+                                        onClick={() => handleFetchTechReport(report.report_id)}
+                                        startIcon={<DownloadIcon />} 
+                                        sx={{
+                                            color: '#fff',
+                                            fontWeight: 'bold',
+                                            '&:hover': {
+                                                backgroundColor: '#01579b',
+                                            },
+                                        }}
                                     >
-                                        Download Executive Report
+                                        Download
                                     </Button>
+                                </TableCell>
+
+                                <TableCell sx={{ backgroundColor: tableHeaderBackground}}>
                                     <Button
                                         variant="contained"
-                                        color="secondary"
-                                        onClick={() => handleFetchTechReport(report.report_id)}
-                                        startIcon={<DownloadIcon />} // Icon for Technical Report
-                                        sx={{ marginLeft: 2 }}
+                                        color="primary"
+                                        onClick={() => handleFetchExecReport(report.report_id)}
+                                        startIcon={<DownloadIcon />} 
+                                        sx={{
+                                            color: '#fff',
+                                            fontWeight: 'bold',
+                                            '&:hover': {
+                                                backgroundColor: '#01579b',
+                                            },
+                                        }}
                                     >
-                                        Download Technical Report
+                                        Download
                                     </Button>
                                 </TableCell>
                             </TableRow>
@@ -159,7 +176,6 @@ const ReportsPage = () => {
             </TableContainer>
         </Box>
     );
-    
 };
 
 export default ReportsPage;

From 0a466223becf252dfe64f48b58b3830b17cb2738 Mon Sep 17 00:00:00 2001
From: Alec Watson <alecwatson15@gmail.com>
Date: Sun, 29 Sep 2024 11:32:13 +0200
Subject: [PATCH 06/24] Styling changes

---
 CoVAR-app/src/app/(pages)/reports/page.tsx | 53 +++++++---------------
 1 file changed, 17 insertions(+), 36 deletions(-)

diff --git a/CoVAR-app/src/app/(pages)/reports/page.tsx b/CoVAR-app/src/app/(pages)/reports/page.tsx
index d9bf6b1..0c99455 100644
--- a/CoVAR-app/src/app/(pages)/reports/page.tsx
+++ b/CoVAR-app/src/app/(pages)/reports/page.tsx
@@ -4,7 +4,7 @@ import { CircularProgress, Box, Table, TableBody, TableCell, TableContainer, Tab
 import { populateReportsTable, fetchExecReport, fetchTechReport } from '@/functions/requests'; 
 import DownloadIcon from '@mui/icons-material/Download';
 import { mainContentStyles } from '@/styles/evaluateStyle';
-import { useTheme } from '@mui/material/styles'; // Import useTheme
+import { useTheme } from '@mui/material/styles';
 
 type Report = {
     report_id: string;
@@ -23,7 +23,6 @@ const ReportsPage = () => {
         const fetchReports = async () => {
             try {
                 const response = await populateReportsTable();
-                console.log('API Response.data:', response.reports);
                 if (response.reports) {
                     setReports(response.reports);
                 }
@@ -59,19 +58,14 @@ const ReportsPage = () => {
     const handleFetchExecReport = async (reportId: string) => {
         try {
             const blob = await fetchExecReport(reportId); 
-
             const url = window.URL.createObjectURL(new Blob([blob]));
-
             const link = document.createElement('a');
             link.href = url;
             link.setAttribute('download', `executive_report_${reportId}.pdf`);
-
             document.body.appendChild(link);
             link.click();
-
             link.parentNode?.removeChild(link);
             window.URL.revokeObjectURL(url);
-
         } catch (error) {
             console.error('Error fetching executive report:', error);
         }
@@ -80,19 +74,14 @@ const ReportsPage = () => {
     const handleFetchTechReport = async (reportId: string) => {
         try {
             const blob = await fetchTechReport(reportId); 
-
             const url = window.URL.createObjectURL(new Blob([blob]));
-
             const link = document.createElement('a');
             link.href = url;
             link.setAttribute('download', `technical_report_${reportId}.pdf`);
-
             document.body.appendChild(link);
             link.click();
-
             link.parentNode?.removeChild(link);
             window.URL.revokeObjectURL(url);
-
         } catch (error) {
             console.error('Error fetching technical report:', error);
         }
@@ -108,33 +97,26 @@ const ReportsPage = () => {
             </Typography>
             <TableContainer component={Paper} sx={{ ...mainContentStyles, border: '1px solid #ccc', maxHeight: '80vh', overflowY: 'auto' }}>
                 <Table stickyHeader>
-                    <TableHead sx={{ backgroundColor: tableHeaderBackground }}> {/* Darker shade for light mode */}
-                        <TableRow sx={{ backgroundColor: tableHeaderBackground }}>
-                            <TableCell sx={{ backgroundColor: tableHeaderBackground,color: 'text.primary', fontWeight: 'bold' }}>Report ID</TableCell>
-                            <TableCell sx={{ backgroundColor: tableHeaderBackground,color: 'text.primary', fontWeight: 'bold' }}>Date Created</TableCell>
-                            <TableCell sx={{ backgroundColor: tableHeaderBackground,color: 'error.main', fontWeight: 'bold' }}>Critical Count</TableCell>
-                            <TableCell sx={{ backgroundColor: tableHeaderBackground,color: 'orange', fontWeight: 'bold' }}>Medium Count</TableCell>
-                            <TableCell sx={{ backgroundColor: tableHeaderBackground,color: 'success.main' , fontWeight: 'bold' }}>Low Count</TableCell>
-                            <TableCell sx={{ backgroundColor: tableHeaderBackground,color: 'text.primary', fontWeight: 'bold' }}>Technical Report</TableCell>
-                            <TableCell sx={{ backgroundColor: tableHeaderBackground,color: 'text.primary', fontWeight: 'bold' }}>Executive Report</TableCell>
+                    <TableHead sx={{ backgroundColor: tableHeaderBackground }}>
+                        <TableRow>
+                            <TableCell sx={{ backgroundColor: tableHeaderBackground, color: 'text.primary', fontWeight: 'bold' }}>Report ID</TableCell>
+                            <TableCell sx={{ backgroundColor: tableHeaderBackground, color: 'text.primary', fontWeight: 'bold' }}>Date Created</TableCell>
+                            <TableCell sx={{ backgroundColor: tableHeaderBackground, color: 'error.main', fontWeight: 'bold' }}>Critical Count</TableCell>
+                            <TableCell sx={{ backgroundColor: tableHeaderBackground, color: 'orange', fontWeight: 'bold' }}>Medium Count</TableCell>
+                            <TableCell sx={{ backgroundColor: tableHeaderBackground, color: 'success.main', fontWeight: 'bold' }}>Low Count</TableCell>
+                            <TableCell sx={{ backgroundColor: tableHeaderBackground, color: 'text.primary', fontWeight: 'bold' }}>Technical Report</TableCell>
+                            <TableCell sx={{ backgroundColor: tableHeaderBackground, color: 'text.primary', fontWeight: 'bold' }}>Executive Report</TableCell>
                         </TableRow>
                     </TableHead>
                     <TableBody>
                         {reports.map((report) => (
                             <TableRow key={report.report_id}>
-                                <TableCell sx={{ backgroundColor: tableHeaderBackground}}>{report.report_id}</TableCell>
-                                <TableCell sx={{ backgroundColor: tableHeaderBackground}}>{new Date(report.created_at).toLocaleString()}</TableCell>
-                                <TableCell sx={{ backgroundColor: tableHeaderBackground, color: report.criticalCount > 0 ? 'error.main' : 'inherit' }}>
-                                    {report.criticalCount}
-                                </TableCell>
-                                <TableCell sx={{ backgroundColor: tableHeaderBackground,color: report.mediumCount > 0 ? 'orange' : 'inherit' }}>
-                                    {report.mediumCount}
-                                </TableCell>
-                                <TableCell sx={{ backgroundColor: tableHeaderBackground, color: report.lowCount > 0 ?  'success.main'  : 'inherit' }}>
-                                    {report.lowCount}
-                                </TableCell>
-
-                                <TableCell sx={{ backgroundColor: tableHeaderBackground}}>
+                                <TableCell>{report.report_id}</TableCell>
+                                <TableCell>{new Date(report.created_at).toLocaleString()}</TableCell>
+                                <TableCell sx={{ color: report.criticalCount > 0 ? 'error.main' : 'inherit' }}>{report.criticalCount}</TableCell>
+                                <TableCell sx={{ color: report.mediumCount > 0 ? 'orange' : 'inherit' }}>{report.mediumCount}</TableCell>
+                                <TableCell sx={{ color: report.lowCount > 0 ? 'success.main' : 'inherit' }}>{report.lowCount}</TableCell>
+                                <TableCell>
                                     <Button
                                         variant="contained"
                                         color="secondary"
@@ -151,8 +133,7 @@ const ReportsPage = () => {
                                         Download
                                     </Button>
                                 </TableCell>
-
-                                <TableCell sx={{ backgroundColor: tableHeaderBackground}}>
+                                <TableCell>
                                     <Button
                                         variant="contained"
                                         color="primary"

From a1bed144533ba83dc434362999d596086d28070e Mon Sep 17 00:00:00 2001
From: Alec Watson <alecwatson15@gmail.com>
Date: Sun, 29 Sep 2024 11:36:24 +0200
Subject: [PATCH 07/24] addition of testing to other branches again

---
 .github/workflows/build.yml  | 2 +-
 .github/workflows/deploy.yml | 2 +-
 .github/workflows/e2e.yml    | 2 +-
 .github/workflows/lint.yml   | 2 +-
 .github/workflows/test.yml   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 416637e..4d02dbb 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,7 +1,7 @@
 name: Build Codebase
 on:
   pull_request:
-    branches: [ main ]
+    branches: [ main , develop]
 
 permissions:
   contents: read
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index c8af2ed..48b4cf9 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -1,7 +1,7 @@
 name: Deploy Codebase
 on:
   push:
-    branches: [ main ]
+    branches: [ main , develop]
 
 jobs:
   publish-containers:
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index b85ea23..881bfe8 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -1,7 +1,7 @@
 name: Cypress E2E Tests
 on:
   pull_request:
-    branches: [ main ]
+    branches: [ main , develop]
 
 jobs:
   e2e-tests:
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 847c699..53a1d30 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -1,7 +1,7 @@
 name: Lint Codebase
 on:
   pull_request:
-    branches: [ main ]
+    branches: [ main , develop]
 
 permissions:
   contents: read
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e74dc65..59ab13d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -1,7 +1,7 @@
 name: Test Codebase
 on:
   pull_request:
-    branches: [ main ]
+    branches: [ main , develop]
 
 permissions:
   contents: read

From bc38a8521a5844ac9667d213ece830a69b8b5be3 Mon Sep 17 00:00:00 2001
From: Alec Watson <alecwatson15@gmail.com>
Date: Sun, 29 Sep 2024 11:37:25 +0200
Subject: [PATCH 08/24] opps are everywhere

---
 .github/workflows/deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 48b4cf9..c8af2ed 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -1,7 +1,7 @@
 name: Deploy Codebase
 on:
   push:
-    branches: [ main , develop]
+    branches: [ main ]
 
 jobs:
   publish-containers:

From 1b33a1b5c37ea573c91193bf6bc62257d5e1338d Mon Sep 17 00:00:00 2001
From: A Repko <arenrepko7@gmail.com>
Date: Sun, 29 Sep 2024 11:43:04 +0200
Subject: [PATCH 09/24] Fixed assigning clients in orgs to a VA

---
 CoVAR-app/package-lock.json                               | 8 +++++++-
 CoVAR-app/package.json                                    | 3 ++-
 .../src/app/(pages)/adminTools/components/userList.tsx    | 7 ++++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/CoVAR-app/package-lock.json b/CoVAR-app/package-lock.json
index cbc45fb..43e1253 100644
--- a/CoVAR-app/package-lock.json
+++ b/CoVAR-app/package-lock.json
@@ -18,9 +18,10 @@
                 "axios-mock-adapter": "^1.22.0",
                 "echarts": "^5.5.1",
                 "firebase": "^10.12.2",
-                "marked": "^14.1.2",
                 "i": "^0.3.7",
+                "marked": "^14.1.2",
                 "moment": "^2.30.1",
+                "mui": "^0.0.1",
                 "next": "14.2.13",
                 "react": "^18",
                 "react-dom": "^18",
@@ -10649,6 +10650,11 @@
             "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
             "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
         },
+        "node_modules/mui": {
+            "version": "0.0.1",
+            "resolved": "https://registry.npmjs.org/mui/-/mui-0.0.1.tgz",
+            "integrity": "sha512-iB9zfxsJBcMkZ/SY6X+HGSPr4fftCZIQ76ZMH8iSMfVkidVzRtZlLW2gbWXUe+IMcj8JLv1p+dGKvPVlgtiocA=="
+        },
         "node_modules/nanoid": {
             "version": "3.3.7",
             "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
diff --git a/CoVAR-app/package.json b/CoVAR-app/package.json
index 1ebf7fe..ee08348 100644
--- a/CoVAR-app/package.json
+++ b/CoVAR-app/package.json
@@ -20,9 +20,10 @@
         "axios-mock-adapter": "^1.22.0",
         "echarts": "^5.5.1",
         "firebase": "^10.12.2",
-        "marked": "^14.1.2",
         "i": "^0.3.7",
+        "marked": "^14.1.2",
         "moment": "^2.30.1",
+        "mui": "^0.0.1",
         "next": "14.2.13",
         "react": "^18",
         "react-dom": "^18",
diff --git a/CoVAR-app/src/app/(pages)/adminTools/components/userList.tsx b/CoVAR-app/src/app/(pages)/adminTools/components/userList.tsx
index 2d5a0c1..ba04144 100644
--- a/CoVAR-app/src/app/(pages)/adminTools/components/userList.tsx
+++ b/CoVAR-app/src/app/(pages)/adminTools/components/userList.tsx
@@ -87,6 +87,7 @@ useEffect(() => {
                 throw new Error('Access token not found');
             }
             const users = await fetchUsers(accessToken);
+            console.log(users);
             setUsers(users);
             setLoading(false);
         } catch (error: any) {
@@ -311,8 +312,12 @@ const handleConfirmUnassignVA = async () => {
     };
 
     const filteredUsers = users.filter(user =>
-        user.username.toLowerCase().includes(searchTerm.toLowerCase()) && user.role !== 'va'
+        user.username.toLowerCase().includes(searchTerm.toLowerCase()) &&
+        user.role !== 'va' &&
+        user.organization == null ||
+        user.organization == ""
     );
+    
 
     const filteredOrganizations = organizations.filter(org =>
         org.name.toLowerCase().includes(searchTerm.toLowerCase())

From ee0549e7cbe77d47be73f98cc8b9a3e0b49ae108 Mon Sep 17 00:00:00 2001
From: A Repko <arenrepko7@gmail.com>
Date: Sun, 29 Sep 2024 11:48:08 +0200
Subject: [PATCH 10/24] removal of log

---
 CoVAR-app/src/app/(pages)/adminTools/components/userList.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CoVAR-app/src/app/(pages)/adminTools/components/userList.tsx b/CoVAR-app/src/app/(pages)/adminTools/components/userList.tsx
index ba04144..ffc1116 100644
--- a/CoVAR-app/src/app/(pages)/adminTools/components/userList.tsx
+++ b/CoVAR-app/src/app/(pages)/adminTools/components/userList.tsx
@@ -87,7 +87,7 @@ useEffect(() => {
                 throw new Error('Access token not found');
             }
             const users = await fetchUsers(accessToken);
-            console.log(users);
+
             setUsers(users);
             setLoading(false);
         } catch (error: any) {

From e435de4dad076466895ec874f9f7c8d558d607c2 Mon Sep 17 00:00:00 2001
From: Alec Watson <alecwatson15@gmail.com>
Date: Sun, 29 Sep 2024 12:50:12 +0200
Subject: [PATCH 11/24] Change the chain urls

---
 server/routes/chain.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/routes/chain.js b/server/routes/chain.js
index e58ad65..1191662 100644
--- a/server/routes/chain.js
+++ b/server/routes/chain.js
@@ -26,7 +26,7 @@ router.post('/unmatchedRecommendations', authenticateToken, async (req, res) =>
 
     try {
         const token = req.headers.authorization;
-        const response = await axios.post('http://13.60.34.133/topVulChain',
+        const response = await axios.post('http://13.60.34.133/unmatchedRecomendations',
             { chain_prompt_1 },
             { headers: { Authorization: token } }
         );
@@ -79,7 +79,7 @@ router.post('/matchedRecommendations', authenticateToken, async (req, res) => {
 
     try {
         const token = req.headers.authorization;
-        const response = await axios.post('http://13.60.34.133/topVulChain',
+        const response = await axios.post('http://13.60.34.133/matchedRecommendations',
             { chain_prompt_1, chain_prompt_2 },
             { headers: { Authorization: token } }
         );

From 97ae3b808d699b736de4b625661caf3b699da145 Mon Sep 17 00:00:00 2001
From: daniel-geerdink <dangeerdink@gmail.com>
Date: Sun, 29 Sep 2024 13:28:26 +0200
Subject: [PATCH 12/24] Updated the help page for the Organisation page, the
 Admin Dashboard and the VA Dashboard

---
 CoVAR-app/package-lock.json                   |   2 +-
 CoVAR-app/package.json                        |   2 +-
 CoVAR-app/src/app/(pages)/help/helpDialog.tsx | 121 ++++++++++++++++--
 3 files changed, 114 insertions(+), 11 deletions(-)

diff --git a/CoVAR-app/package-lock.json b/CoVAR-app/package-lock.json
index cbc45fb..5d6a073 100644
--- a/CoVAR-app/package-lock.json
+++ b/CoVAR-app/package-lock.json
@@ -18,8 +18,8 @@
                 "axios-mock-adapter": "^1.22.0",
                 "echarts": "^5.5.1",
                 "firebase": "^10.12.2",
-                "marked": "^14.1.2",
                 "i": "^0.3.7",
+                "marked": "^14.1.2",
                 "moment": "^2.30.1",
                 "next": "14.2.13",
                 "react": "^18",
diff --git a/CoVAR-app/package.json b/CoVAR-app/package.json
index 1ebf7fe..e6b3fd5 100644
--- a/CoVAR-app/package.json
+++ b/CoVAR-app/package.json
@@ -20,8 +20,8 @@
         "axios-mock-adapter": "^1.22.0",
         "echarts": "^5.5.1",
         "firebase": "^10.12.2",
-        "marked": "^14.1.2",
         "i": "^0.3.7",
+        "marked": "^14.1.2",
         "moment": "^2.30.1",
         "next": "14.2.13",
         "react": "^18",
diff --git a/CoVAR-app/src/app/(pages)/help/helpDialog.tsx b/CoVAR-app/src/app/(pages)/help/helpDialog.tsx
index b717e94..22b1b17 100644
--- a/CoVAR-app/src/app/(pages)/help/helpDialog.tsx
+++ b/CoVAR-app/src/app/(pages)/help/helpDialog.tsx
@@ -1,8 +1,9 @@
 // HelpDialog.tsx
 'use client'
-import React from 'react';
+import { useCallback, useEffect, useState } from 'react';
 import { Dialog, DialogTitle, DialogContent, DialogActions, Button, Typography } from '@mui/material';
-import { usePathname } from 'next/navigation'; 
+import { usePathname, useRouter } from 'next/navigation'; 
+import { getUserRole } from '../../../functions/requests';
 
 interface HelpDialogProps {
   open: boolean;
@@ -15,6 +16,34 @@ type HelpContent = {
 
 const HelpDialog: React.FC<HelpDialogProps> = ({ open, onClose }) => {
   const pathname = usePathname(); 
+  const router = useRouter();
+  const [role, setRole] = useState<string | null>(null);
+  const [loading, setLoading] = useState(true); 
+
+  const redirectToLogin = useCallback(() => {
+    router.replace('/login');
+  }, [router]);
+  
+  const fetchUserRole = useCallback(async () => {
+    try {
+      const accessToken = localStorage.getItem('accessToken');
+      if (accessToken) {
+        const data = await getUserRole(accessToken);
+        setRole(data.role);
+        console.log(data.role);
+      }
+    } catch (error:any) {
+      if (error.response?.status === 403) {
+        redirectToLogin();
+      }
+    } finally {
+      setLoading(false);
+    }
+  }, [redirectToLogin]); 
+
+  useEffect(() => {
+    fetchUserRole();
+  }, [fetchUserRole]);
 
   const helpContent: HelpContent = {
     '/dashboard': (
@@ -22,9 +51,54 @@ const HelpDialog: React.FC<HelpDialogProps> = ({ open, onClose }) => {
         <Typography variant="h4" gutterBottom>
           Dashboard
         </Typography>
-        <Typography variant="body1" paragraph>
-          The Dashboard page displays various charts and lists to provide an overview of important data.
-        </Typography>
+        {role === 'admin' && (
+          <>
+            <Typography variant="body1" paragraph>
+              The Admin Dashboard enables administrators to effectively manage users and monitor system activity. Key features include:
+            </Typography>
+            <Typography variant="body1" paragraph>
+              <strong>User Metrics:</strong> Provides an overview of total users, including admins, vulnerability assessors (VAs), and clients.
+            </Typography>
+            <Typography variant="body1" paragraph>
+              <strong>Role Distribution:</strong> Insights into the distribution of user roles for better management.
+            </Typography>
+            <Typography variant="body1" paragraph>
+              <strong>Pending Invites:</strong> Lists user invitations along with their current status (accepted, rejected, or pending).
+            </Typography>
+            <Typography variant="body1" paragraph>
+              <strong>Unauthorised Users (Last Week):</strong> Displays a list of unauthorised users who attempted access in the past week, including their details and actions, as well as the ability to Authorise them.
+            </Typography>
+            <Typography variant="body1" paragraph>
+              Overall, the Admin Dashboard is a vital tool for user management and monitoring system security.
+            </Typography>
+          </>
+        )}
+        {role === 'va' && (
+          <>
+            <Typography variant="body1" paragraph>
+              The VA Dashboard enables vulnerability assessors to efficiently manage assigned clients and organisations. Key features include:
+            </Typography>
+            <Typography variant="body1" paragraph>
+              <strong>Report Metrics:</strong> A graphical representation of the number of reports associated with each client and organisation, allowing assessors to track progress and performance.
+            </Typography>
+            <Typography variant="body1" paragraph>
+            <strong>Assigned Clients and Organisations:</strong> View a list of clients and organisations assigned to the assessor. 
+            Each entry includes the date and time of the last report submitted, ensuring assessors stay updated on recent activities. 
+            Additionally, assessors have the option to evaluate each their clients.
+          </Typography>
+
+            <Typography variant="body1" paragraph>
+              Overall, the VA Dashboard is a critical tool for assessing and managing vulnerability reports for clients effectively.
+            </Typography>
+          </>
+        )}
+        {role === 'client' && (
+          <>
+            <Typography variant="body1" paragraph>
+              The Client Dashboard provides insights into your assessments and ongoing activities. Key features include:
+            </Typography>
+          </>
+        )}
       </>
     ),
     '/evaluate': (
@@ -33,9 +107,35 @@ const HelpDialog: React.FC<HelpDialogProps> = ({ open, onClose }) => {
           Evaluate
         </Typography>
         <Typography variant="body1" paragraph>
-          The Evaluate page allows users to upload a vulnerability assessment in PDF or CSV format.
-          Users can select a file from their local machine, view the selected file name, and submit the file for evaluation.
+          The Evaluate page is designed for vulnerability assessors to upload and manage vulnerability assessment reports for users or organisations. Key features include:
         </Typography>
+        <Typography variant="body1" paragraph>
+          <strong>Report Upload:</strong> Vulnerability assessors can upload assessment files in CSV, <code>.nessus</code>, or XML formats.
+          <br />
+          Assessors can select reports generated by Greenbone or Nessus from their local machine to submit for evaluation.
+        </Typography>
+        <Typography variant="body1" paragraph>
+          <strong>File Management:</strong> Uploaded files are listed, allowing assessors to:
+          <ul style={{ paddingLeft: '2vw' }}> 
+            <li><strong>Download Files:</strong> Retrieve uploaded reports for review.</li>
+            <li><strong>Delete Files:</strong> Remove unnecessary or incorrect files.</li>
+            <li><strong>Add to Report:</strong> Select up to two reports for inclusion in the client’s final assessment.</li>
+          </ul>
+        </Typography>
+        <Typography variant="body1" paragraph>
+          <strong>Report Preview:</strong> A preview of the selected reports is displayed on the right-hand side, showing what will be included in the evaluation.
+        </Typography>
+        <Typography variant="body1" paragraph>
+          <strong>Next Steps:</strong> After uploading and selecting reports, assessors proceed to the Conflict Resolution page. This page identifies conflicts between the two uploaded reports and provides several options:
+          <ul style={{ paddingLeft: '2vw' }}> 
+            <li><strong>Manual Resolution:</strong> The assessor can manually resolve each conflict and choose which details to include in the final client assessment.</li>
+            <li><strong>AI Conflict Resolution:</strong> The assessor can choose to let AI automatically resolve the conflicts based on predefined logic and assessment criteria.</li>
+          </ul>
+        </Typography>
+        <Typography variant="body1" paragraph>
+          The Evaluate page provides a streamlined process for uploading reports and preparing client assessments, with flexible options for handling conflicts either manually or with AI assistance.
+        </Typography>
+
       </>
     ),
     '/organisation': (
@@ -44,9 +144,12 @@ const HelpDialog: React.FC<HelpDialogProps> = ({ open, onClose }) => {
           Organisation
         </Typography>
         <Typography variant="body1" paragraph>
-          The Organisation page allows users to manage their organisation, including adding and removing members,
-          changing the organisation name, and disbanding the organisation.
+          The Organisation page enables users to create, join, and manage their organisation efficiently. Organisation owners 
+          can invite and remove members, update the organisation&#39;s name, and disband the organisation when needed. 
+          Members have the ability to view details of other organisation members and leave the organisation at their discretion.
         </Typography>
+
+
       </>
     ),
     '/adminTools': (

From 590334d1487fbc12ec39cfb8a375517b6de495ee Mon Sep 17 00:00:00 2001
From: A Repko <arenrepko7@gmail.com>
Date: Sun, 29 Sep 2024 13:32:46 +0200
Subject: [PATCH 13/24] Fixed dashboard layout, fixed overflowing invites,
 matching colours on dashboard

---
 .../dashboard/components/InviteList.tsx       | 24 ++++-
 .../(pages)/dashboard/components/filters.tsx  |  2 +-
 .../dashboard/components/lineChart.tsx        | 15 ++-
 .../dashboard/components/reportsList.tsx      | 94 ++++++++++++-------
 .../components/severityDistribution.tsx       |  2 +-
 CoVAR-app/src/app/(pages)/dashboard/page.tsx  |  4 +-
 CoVAR-app/src/functions/requests.tsx          |  1 +
 7 files changed, 93 insertions(+), 49 deletions(-)

diff --git a/CoVAR-app/src/app/(pages)/dashboard/components/InviteList.tsx b/CoVAR-app/src/app/(pages)/dashboard/components/InviteList.tsx
index a5b5b0f..6d4a8ab 100644
--- a/CoVAR-app/src/app/(pages)/dashboard/components/InviteList.tsx
+++ b/CoVAR-app/src/app/(pages)/dashboard/components/InviteList.tsx
@@ -18,8 +18,9 @@ const InviteList: React.FC = () => {
         const loadInvites = async () => {
             try {
                 const token = localStorage.getItem('accessToken');
-                const invites = await fetchAllInvites(token as string);
-                setInvites(invites);
+                const allInvites = await fetchAllInvites(token as string);
+                const pendingInvites = allInvites.filter((invite: Invite) => invite.invite_status === 'pending'); // Filter pending invites
+                setInvites(pendingInvites);
                 setLoading(false);
             } catch (error) {
                 console.error('Error fetching invites:', error);
@@ -38,7 +39,24 @@ const InviteList: React.FC = () => {
             ) : invites.length === 0 ? (
                 <Typography>No pending invites at the moment.</Typography>
             ) : (
-                <List>
+                <List
+                    sx={{
+                        maxHeight: '300px', // Adjust maxHeight as needed
+                        overflowY: 'auto',   // Enable vertical scroll when needed
+                        '&::-webkit-scrollbar': {
+                            width: '0.2vw', 
+                        },
+                        '&::-webkit-scrollbar-thumb': {
+                            backgroundColor: 'gray', 
+                            borderRadius: '0.4vw',
+                        },
+                        '&::-webkit-scrollbar-track': {
+                            backgroundColor: 'transparent', 
+                        },
+                        scrollbarWidth: 'thin', 
+                        scrollbarColor: 'gray transparent', 
+                    }}
+                >
                     {invites.map((invite) => (
                         <ListItem key={invite.invite_id}>
                             <ListItemText
diff --git a/CoVAR-app/src/app/(pages)/dashboard/components/filters.tsx b/CoVAR-app/src/app/(pages)/dashboard/components/filters.tsx
index 947b26b..e967841 100644
--- a/CoVAR-app/src/app/(pages)/dashboard/components/filters.tsx
+++ b/CoVAR-app/src/app/(pages)/dashboard/components/filters.tsx
@@ -19,7 +19,7 @@ const Filters: React.FC<FiltersProps> = ({ selectedSeverity, handleSeverityChang
                     onChange={handleSeverityChange}
                 >
                     <MenuItem value="">All Severities</MenuItem>
-                    <MenuItem value="Critical">Critical</MenuItem>
+                    <MenuItem value="High">High</MenuItem>
                     <MenuItem value="Medium">Medium</MenuItem>
                     <MenuItem value="Low">Low</MenuItem>
                 </Select>
diff --git a/CoVAR-app/src/app/(pages)/dashboard/components/lineChart.tsx b/CoVAR-app/src/app/(pages)/dashboard/components/lineChart.tsx
index a3f17e7..d7573e6 100644
--- a/CoVAR-app/src/app/(pages)/dashboard/components/lineChart.tsx
+++ b/CoVAR-app/src/app/(pages)/dashboard/components/lineChart.tsx
@@ -7,28 +7,28 @@ interface VulnerabilityLineChartProps {
 }
 
 const VulnerabilityLineChart: React.FC<VulnerabilityLineChartProps> = ({ responseData }) => {
-  const [data, setData] = useState<{ name: string; critical: number; high: number; medium: number; low: number }[]>([]);
+  const [data, setData] = useState<{ name: string; high: number; medium: number; low: number }[]>([]);
 
   useEffect(() => {
-    const lineChartData: { name: string; critical: number; high: number; medium: number; low: number }[] = [];
+    const lineChartData: { name: string; high: number; medium: number; low: number }[] = [];
   
     const reversedResponseData = [...responseData].reverse(); // Clone and reverse the data
   
     for (let i = 0; i < reversedResponseData.length; i++) {
       const report = reversedResponseData[i];
       const vulnerabilities = report.content.finalReport; 
-      const critical = vulnerabilities.filter((vuln: any) => vuln.Severity === 'Critical').length;
       const high = vulnerabilities.filter((vuln: any) => vuln.Severity === 'High').length;
       const medium = vulnerabilities.filter((vuln: any) => vuln.Severity === 'Medium').length;
       const low = vulnerabilities.filter((vuln: any) => vuln.Severity === 'Low').length;
   
-      lineChartData.push({ name: `Report ${i + 1}`, critical, high, medium, low });
+      lineChartData.push({ name: `Report ${i + 1}`, high, medium, low });
     }
   
     setData(lineChartData);
   }, [responseData]);
   
 
+  
   return (
     <ResponsiveContainer width="100%" height={400}>
       <LineChart data={data} margin={{ top: 20, right: 30, left: 20, bottom: 5 }}>
@@ -37,10 +37,9 @@ const VulnerabilityLineChart: React.FC<VulnerabilityLineChartProps> = ({ respons
         <YAxis label={{ value: 'Number of vulnerabilities', angle: -90, position: 'insideLeft' }} />
         <Tooltip />
         <Legend />
-        <Line type="monotone" dataKey="critical" stroke="#ff0000" name="Critical" />
-        <Line type="monotone" dataKey="high" stroke="#ffa500" name="High" />
-        <Line type="monotone" dataKey="medium" stroke="#82ca9d" name="Medium" />
-        <Line type="monotone" dataKey="low" stroke="#8884d8" name="Low" />
+        <Line type="monotone" dataKey="high" stroke="#ff8c00" name="High" />
+        <Line type="monotone" dataKey="medium" stroke="#ffd700" name="Medium" />
+        <Line type="monotone" dataKey="low" stroke="#32cd32" name="Low" />
       </LineChart>
     </ResponsiveContainer>
   );
diff --git a/CoVAR-app/src/app/(pages)/dashboard/components/reportsList.tsx b/CoVAR-app/src/app/(pages)/dashboard/components/reportsList.tsx
index 0a9e352..2a5c5ab 100644
--- a/CoVAR-app/src/app/(pages)/dashboard/components/reportsList.tsx
+++ b/CoVAR-app/src/app/(pages)/dashboard/components/reportsList.tsx
@@ -1,6 +1,6 @@
 'use client'
 import React from 'react';
-import { List, ListItem, ListItemText, Paper, Typography, RadioGroup, FormControlLabel, Radio, Box } from '@mui/material';
+import { List, ListItem, ListItemText, Typography, RadioGroup, FormControlLabel, Radio, Box } from '@mui/material';
 import { VulnerabilityReport } from '../page';
 
 interface ReportsListProps {
@@ -10,7 +10,6 @@ interface ReportsListProps {
 }
 
 const severityColors: { [key: string]: { border: string; background: string } } = {
-    Critical: { border: '#ff0000', background: 'rgba(255, 0, 0, 0.1)' },  // Red
     High: { border: '#ff8c00', background: 'rgba(255, 140, 0, 0.1)' },   // Dark Orange
     Medium: { border: '#ffd700', background: 'rgba(255, 215, 0, 0.1)' }, // Gold
     Low: { border: '#32cd32', background: 'rgba(50, 205, 50, 0.1)' },    // Lime Green
@@ -18,14 +17,24 @@ const severityColors: { [key: string]: { border: string; background: string } }
 
 const ReportsList: React.FC<ReportsListProps> = ({ reports, selectedSeverity, handleSeverityChange }) => {
     return (
-        <Box sx={{ maxHeight: '400px', overflowY: 'auto', margin: '16px 0', width : '100%', overflowX : 'hidden', padding : '10px' }}>
+        <Box sx={{ width: '100%', overflowX: 'hidden', padding: '10px' }}>
+            {/* Filter radio buttons (stick to the top) */}
+            <Box
+                sx={{
+                    position: 'sticky',
+                    top: 0,
+                    zIndex: 1,
+                    paddingBottom: '8px',
+                    marginBottom: '16px',
+                }}
+            >
                 <RadioGroup
                     row
                     value={selectedSeverity}
                     onChange={handleSeverityChange}
                     sx={{ justifyContent: 'center' }}
                 >
-                    {Object.keys(severityColors).map(severity => (
+                    {Object.keys(severityColors).map((severity) => (
                         <FormControlLabel
                             key={severity}
                             value={severity}
@@ -33,37 +42,56 @@ const ReportsList: React.FC<ReportsListProps> = ({ reports, selectedSeverity, ha
                             label={<Typography sx={{ color: severityColors[severity].border }}>{severity}</Typography>}
                         />
                     ))}
-                    <FormControlLabel
-                        value=""
-                        control={<Radio />}
-                        label="All"
-                    />
+                    <FormControlLabel value="" control={<Radio />} label="All" />
                 </RadioGroup>
+            </Box>
 
-            {reports.length === 0 ? (
-                <Typography variant="body1" sx={{ padding: '16px', textAlign: 'center' }}>
-                    No reports
-                </Typography>
-            ) : (
-                <List>
-                    {reports.map((report, index) => (
-                        <ListItem
-                            key={index}
-                            sx={{
-                                border: `2px solid ${severityColors[report.Severity]?.border || 'inherit'}`,
-                                backgroundColor: severityColors[report.Severity]?.background || 'inherit',
-                                margin: '4px',
-                                borderRadius: '4px'
-                            }}
-                        >
-                            <ListItemText
-                                primary={`${report.nvtName} (${report.Severity})`}
-                                secondary={`IP: ${report.IP}, Port: ${report.Port}, CVSS: ${report.CVSS}`}
-                            />
-                        </ListItem>
-                    ))}
-                </List>
-            )}
+            {/* Vulnerabilities list */}
+            <Box 
+            sx={{ 
+                height: '400px', 
+                overflowY: 'auto', 
+                overflowX: 'hidden',
+                '&::-webkit-scrollbar': {
+                    width: '0.2vw', 
+                },
+                '&::-webkit-scrollbar-thumb': {
+                    backgroundColor: 'gray', 
+                    borderRadius: '0.4vw',
+                },
+                '&::-webkit-scrollbar-track': {
+                    backgroundColor: 'transparent', 
+                },
+                scrollbarWidth: 'thin', 
+                scrollbarColor: 'gray transparent', 
+             }}>
+                {reports.length === 0 ? (
+                    <Typography variant="body1" sx={{ padding: '16px', textAlign: 'center' }}>
+                        No Vulnerabilities
+                    </Typography>
+                ) : (
+                    <List sx={{ height: '100%' }}>
+                        {reports.map((report, index) => (
+                            <ListItem
+                                key={index}
+                                sx={{
+                                    border: `2px solid ${severityColors[report.Severity]?.border || 'inherit'}`,
+                                    backgroundColor: severityColors[report.Severity]?.background || 'inherit',
+                                    margin: '6px',
+                                    borderRadius: '4px',
+                                    width: '98%',
+                                    maxWidth : '98%',
+                                }}
+                            >
+                                <ListItemText
+                                    primary={`${report.nvtName} (${report.Severity})`}
+                                    secondary={`IP: ${report.IP}, Port: ${report.Port}, CVSS: ${report.CVSS}`}
+                                />
+                            </ListItem>
+                        ))}
+                    </List>
+                )}
+            </Box>
         </Box>
     );
 };
diff --git a/CoVAR-app/src/app/(pages)/dashboard/components/severityDistribution.tsx b/CoVAR-app/src/app/(pages)/dashboard/components/severityDistribution.tsx
index f3ee6ef..12d39a4 100644
--- a/CoVAR-app/src/app/(pages)/dashboard/components/severityDistribution.tsx
+++ b/CoVAR-app/src/app/(pages)/dashboard/components/severityDistribution.tsx
@@ -2,7 +2,7 @@
 import React from 'react';
 import { PieChart, Pie, Cell, Tooltip, ResponsiveContainer, Legend } from 'recharts';
 
-const COLOURS = ['#ff0000', '#ffa500', '#82ca9d', '#8884d8'];
+const COLOURS = ['#ff8c00', '#ffd700', '#32cd32'];
 
 interface SeverityDistributionProps {
     data: { name: string; value: number }[];
diff --git a/CoVAR-app/src/app/(pages)/dashboard/page.tsx b/CoVAR-app/src/app/(pages)/dashboard/page.tsx
index 48ffa2c..ad832d6 100644
--- a/CoVAR-app/src/app/(pages)/dashboard/page.tsx
+++ b/CoVAR-app/src/app/(pages)/dashboard/page.tsx
@@ -9,7 +9,6 @@ import ReportsList from './components/reportsList';
 import TopVulnerabilities from './components/topVulnerabilities';
 import { fetchLastReportDates, getAllReports, getUserRole, fetchClientsAssigned, fetchOrganisationsAssigned } from '@/functions/requests';
 import { useRouter } from 'next/navigation';
-import axios from 'axios';
 import { evaluateLaunchStyles } from '../../../styles/evaluateStyle';
 import { fetchReportsPerClient } from '@/functions/requests';
 import ReportsPerClient from './components/reportsPerClient';
@@ -148,7 +147,6 @@ const Dashboard: React.FC = () => {
 
     const calculateSeverityDistribution = (reports: VulnerabilityReport[]) => {
         const distribution: { [key: string]: number } = {
-            Critical: 0,
             High: 0,
             Medium: 0,
             Low: 0
@@ -156,7 +154,7 @@ const Dashboard: React.FC = () => {
 
         reports.forEach(vulnerability => {
             const severity = vulnerability.Severity;
-            if (severity === 'Critical' || severity === 'High' || severity === 'Medium' || severity === 'Low') {
+            if (severity === 'High' || severity === 'Medium' || severity === 'Low') {
                 distribution[severity]++;
             }
         });
diff --git a/CoVAR-app/src/functions/requests.tsx b/CoVAR-app/src/functions/requests.tsx
index e845a92..34f71c7 100644
--- a/CoVAR-app/src/functions/requests.tsx
+++ b/CoVAR-app/src/functions/requests.tsx
@@ -77,6 +77,7 @@ const retryRequestWithNewToken = async (originalRequest: AxiosRequestConfig) =>
 
 const handleRequest = async (request: AxiosRequestConfig) => {
     try {
+        console.log(request);
         const response = await axios(request);
 
         // Check if the URL ends with 'change_name', 'delete', or 'remove_user'

From aea85a5afbe81b49bbec3931ea237833744dcfc0 Mon Sep 17 00:00:00 2001
From: Alec Watson <alecwatson15@gmail.com>
Date: Sun, 29 Sep 2024 13:34:38 +0200
Subject: [PATCH 14/24] change to coloumn name

---
 CoVAR-app/src/app/(pages)/reports/page.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CoVAR-app/src/app/(pages)/reports/page.tsx b/CoVAR-app/src/app/(pages)/reports/page.tsx
index f134053..de0e272 100644
--- a/CoVAR-app/src/app/(pages)/reports/page.tsx
+++ b/CoVAR-app/src/app/(pages)/reports/page.tsx
@@ -119,7 +119,7 @@ const ReportsPage = () => {
                         <TableRow>
                             <TableCell sx={{ color: 'text.primary', fontWeight: 'bold' }}>Report ID</TableCell>
                             <TableCell sx={{ color: 'text.primary', fontWeight: 'bold' }}>Date Created</TableCell>
-                            <TableCell sx={{ color: 'text.primary', fontWeight: 'bold' }}>Critical Count</TableCell>
+                            <TableCell sx={{ color: 'text.primary', fontWeight: 'bold' }}>High Count</TableCell>
                             <TableCell sx={{ color: 'text.primary', fontWeight: 'bold' }}>Medium Count</TableCell>
                             <TableCell sx={{ color: 'text.primary', fontWeight: 'bold' }}>Low Count</TableCell>
                             <TableCell sx={{ color: 'text.primary', fontWeight: 'bold' }}>Actions</TableCell>

From ad9844fa6d6044f5bdcd7323d67cb80f2450a98e Mon Sep 17 00:00:00 2001
From: daniel-geerdink <dangeerdink@gmail.com>
Date: Sun, 29 Sep 2024 13:52:16 +0200
Subject: [PATCH 15/24] Updated reports for the Client Dashboard and the
 Reports page

---
 CoVAR-app/src/app/(pages)/help/helpDialog.tsx | 33 ++++++++++++++++++-
 1 file changed, 32 insertions(+), 1 deletion(-)

diff --git a/CoVAR-app/src/app/(pages)/help/helpDialog.tsx b/CoVAR-app/src/app/(pages)/help/helpDialog.tsx
index 22b1b17..7047477 100644
--- a/CoVAR-app/src/app/(pages)/help/helpDialog.tsx
+++ b/CoVAR-app/src/app/(pages)/help/helpDialog.tsx
@@ -94,8 +94,20 @@ const HelpDialog: React.FC<HelpDialogProps> = ({ open, onClose }) => {
         )}
         {role === 'client' && (
           <>
+             <Typography variant="body1" paragraph>
+              The Client Dashboard provides a comprehensive view of your system&#39;s security posture by summarising vulnerabilities and their severities. Key features include:
+            </Typography>
+            <Typography variant="body1" paragraph>
+              <strong>Severity Distribution:</strong> At a glance, the dashboard displays the distribution of vulnerabilities across different severity levels: Critical, High, Medium, and Low. This visual representation allows you to quickly assess the overall risk landscape and prioritise remediation efforts accordingly.
+            </Typography>
+            <Typography variant="body1" paragraph>
+              <strong>Vulnerabilities Over Time:</strong> The Vulnerabilities Over Time graph illustrates the trend of vulnerabilities across reports, enabling you to track improvements or identify recurring issues over specific periods. Each report is clearly labelled, allowing you to correlate vulnerability changes with remediation activities or changes in your environment.
+            </Typography>
+            <Typography variant="body1" paragraph>
+              <strong>Top Vulnerabilities:</strong> The dashboard highlights the most critical vulnerabilities impacting your systems. By focusing on these top vulnerabilities, you can take immediate action to enhance your security measures.
+            </Typography>
             <Typography variant="body1" paragraph>
-              The Client Dashboard provides insights into your assessments and ongoing activities. Key features include:
+              <strong>Filter by Severity:</strong> To streamline your review process, you can filter vulnerabilities based on their severity. This feature allows you to customise your view and concentrate on the vulnerabilities that matter most to your organisation, ensuring that your security efforts are targeted and efficient.
             </Typography>
           </>
         )}
@@ -152,6 +164,25 @@ const HelpDialog: React.FC<HelpDialogProps> = ({ open, onClose }) => {
 
       </>
     ),
+    '/reports': (
+        <>
+          <Typography variant="h4" gutterBottom>
+            Reports
+          </Typography>
+          <Typography variant="body1" paragraph>
+            The Reports page provides an overview of all vulnerability assessment reports generated for your systems. Each report includes essential information to help you understand your security posture. Key features include:
+          </Typography>
+          <Typography variant="body1" paragraph>
+            <strong>Report Overview:</strong> Each report is displayed in a table format, showing key details such as the Report ID, Date Created, and the counts of vulnerabilities categorised by severity (Critical, Medium, Low). This allows you to quickly assess the status of each report at a glance.
+          </Typography>
+          <Typography variant="body1" paragraph>
+            <strong>Actions:</strong> For each report, you have the option to download both the Technical Report and the Executive Report. The Technical Report provides detailed findings and recommendations, while the Executive Report summarises the key risks and necessary actions for stakeholders.
+          </Typography>
+          <Typography variant="body1" paragraph>
+            By regularly reviewing your reports, you can ensure that you stay informed about your organisation&#39;s vulnerabilities and take proactive measures to enhance your security posture.
+          </Typography>
+        </>
+      ),
     '/adminTools': (
       <>
         <Typography variant="h4" gutterBottom>

From 33bf0286e123b4eef5c67af9c68c9afd6fe98ae9 Mon Sep 17 00:00:00 2001
From: daniel-geerdink <dangeerdink@gmail.com>
Date: Sun, 29 Sep 2024 14:01:05 +0200
Subject: [PATCH 16/24] Added help for the Vendor Graph page

---
 CoVAR-app/src/app/(pages)/help/helpDialog.tsx | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/CoVAR-app/src/app/(pages)/help/helpDialog.tsx b/CoVAR-app/src/app/(pages)/help/helpDialog.tsx
index 7047477..b5c0395 100644
--- a/CoVAR-app/src/app/(pages)/help/helpDialog.tsx
+++ b/CoVAR-app/src/app/(pages)/help/helpDialog.tsx
@@ -150,6 +150,30 @@ const HelpDialog: React.FC<HelpDialogProps> = ({ open, onClose }) => {
 
       </>
     ),
+    '/vendorGraph': (
+      <>
+        <Typography variant="h4" gutterBottom>
+          Vendor Graph
+        </Typography>
+        <Typography variant="body1" paragraph>
+          The Vendor Graph page provides a visual representation of vulnerabilities associated with various software vendors and their respective fixes. This page allows you to explore how many vulnerabilities are tied to each vendor and version, as well as the specific CVEs related to them.
+          Key Features Include:
+        </Typography>
+        <Typography variant="body1" paragraph>
+          <strong>Select Report:</strong> Use the dropdown menu to choose a specific report date. The data visualisation will update accordingly, allowing you to track changes over time.
+        </Typography>
+        <Typography variant="body1" paragraph>
+          <strong>Vendor Fixes Visualisation:</strong> The tree graph displays the vendors and the versions of their software that have vulnerabilities. Each node represents a vendor, with child nodes representing specific versions and further branching into the related CVEs.
+        </Typography>
+        <Typography variant="body1" paragraph>
+          Clicking on a CVE node will redirect you to its detailed page on the CVE Details website, providing you with comprehensive information about the vulnerability.
+        </Typography>
+        <Typography variant="body1" paragraph>
+          By reviewing the vendor graph, you can gain insights into the vulnerabilities affecting your systems and make informed decisions about necessary updates or patches.
+        </Typography>
+      </>
+    ),
+
     '/organisation': (
       <>
         <Typography variant="h4" gutterBottom>

From 2d984c96cf9357cccd46ebb87091aa84537155c6 Mon Sep 17 00:00:00 2001
From: A Repko <arenrepko7@gmail.com>
Date: Sun, 29 Sep 2024 15:36:41 +0200
Subject: [PATCH 17/24] fixed format

---
 .../dashboard/components/adminPage.tsx        | 35 ++++++++++++++++---
 1 file changed, 30 insertions(+), 5 deletions(-)

diff --git a/CoVAR-app/src/app/(pages)/dashboard/components/adminPage.tsx b/CoVAR-app/src/app/(pages)/dashboard/components/adminPage.tsx
index de242b9..b11e086 100644
--- a/CoVAR-app/src/app/(pages)/dashboard/components/adminPage.tsx
+++ b/CoVAR-app/src/app/(pages)/dashboard/components/adminPage.tsx
@@ -44,10 +44,15 @@ const AdminPage: React.FC = () => {
                 const users: User[] = await fetchUsers(token as string);
                 const oneWeekAgo = moment().subtract(7, 'days').startOf('day'); // Get the exact start of the day for one week ago
     
-                // Filter unauthorized users created within the last week
-                const unauthorizedUsers = users.filter((user: User) =>
-                    user.role === 'unauthorised' && moment(user.created_at).isAfter(oneWeekAgo)
-                );
+                // Filter unauthorized users created within the last week and format the created_at field
+                const unauthorizedUsers = users
+                    .filter((user: User) =>
+                        user.role === 'unauthorised' && moment(user.created_at).isAfter(oneWeekAgo)
+                    )
+                    .map((user: User) => ({
+                        ...user,
+                        created_at: formatDate(user.created_at) // Format created_at
+                    }));
     
                 const metrics = {
                     total: users.length,
@@ -56,7 +61,7 @@ const AdminPage: React.FC = () => {
                     clients: users.filter((user: User) => user.role === 'client').length
                 };
     
-                setUsers(unauthorizedUsers);
+                setUsers(unauthorizedUsers); // Set formatted users
                 setUserMetrics(metrics);
                 setLoading(false);
             } catch (error) {
@@ -69,6 +74,26 @@ const AdminPage: React.FC = () => {
     }, []);
     
 
+    const formatDate = (dateString: string) => {
+        if (!dateString) return 'No report';
+        const date = new Date(dateString);
+        
+        const formattedDate = date.toLocaleDateString('en-GB', {
+            day: '2-digit',
+            month: '2-digit',
+            year: 'numeric'
+        });
+        
+        const formattedTime = date.toLocaleTimeString('en-GB', {
+            hour: '2-digit',
+            minute: '2-digit',
+            second: '2-digit'
+        });
+
+        return `${formattedDate} ${formattedTime}`;
+    };
+    
+
     const handleAuthorizeDialogOpen = (username: string) => {
         setUsername(username);
         setOpenDialog(true);

From 3cb28b2836c781a7ff5e010dd665573a499f187a Mon Sep 17 00:00:00 2001
From: eshper <edwardharveyza@gmail.com>
Date: Sun, 29 Sep 2024 16:36:25 +0200
Subject: [PATCH 18/24] Added loading screens

---
 CoVAR-app/src/app/(pages)/adminTools/page.tsx | 43 ++++++++-
 CoVAR-app/src/app/(pages)/dashboard/page.tsx  | 88 +++++++++++--------
 CoVAR-app/src/app/(pages)/evaluate/page.tsx   | 30 +++++--
 .../src/app/(pages)/organisation/page.tsx     | 21 +++--
 CoVAR-app/src/styles/evaluateStyle.tsx        |  8 ++
 CoVAR-app/src/styles/organisationStyle.tsx    |  8 ++
 6 files changed, 145 insertions(+), 53 deletions(-)

diff --git a/CoVAR-app/src/app/(pages)/adminTools/page.tsx b/CoVAR-app/src/app/(pages)/adminTools/page.tsx
index 2025a06..ca978b9 100644
--- a/CoVAR-app/src/app/(pages)/adminTools/page.tsx
+++ b/CoVAR-app/src/app/(pages)/adminTools/page.tsx
@@ -1,14 +1,49 @@
 'use client'
-import React from 'react';
+import React, { useEffect, useState } from 'react';
 import { Box } from '@mui/material';
 import { mainContentStyles } from '../../../styles/sidebarStyle';
 import UserList from './components/userList';
+import { Loader } from '@/styles/conflictStyle';
+import { boxStyles } from '@/styles/evaluateStyle';
 
 const AdminTools: React.FC = () => {
-  return (
-      <Box sx={mainContentStyles}>
-        <UserList />
+  
+  const [loading, setLoading] = useState(true); 
+
+ 
+  useEffect(() => {
+    const timer = setTimeout(() => {
+      setLoading(false);
+    }, 1000);
+    return () => clearTimeout(timer); 
+  }, []);
+
+
+  if (loading) {
+    return (
+      <Box
+        sx={{
+          ...boxStyles,
+          position: 'absolute',
+          top: '50%',
+          left: '50%',
+          transform: 'translate(-50%, -50%)',
+          display: 'flex',
+          justifyContent: 'center',
+          alignItems: 'center',
+          width: '100%',
+          height: '100%',
+        }}
+      >
+        <Loader />
       </Box>
+    );
+  }
+
+  return (
+    <Box sx={mainContentStyles}>
+      <UserList />
+    </Box>
   );
 };
 
diff --git a/CoVAR-app/src/app/(pages)/dashboard/page.tsx b/CoVAR-app/src/app/(pages)/dashboard/page.tsx
index ad832d6..dea07ab 100644
--- a/CoVAR-app/src/app/(pages)/dashboard/page.tsx
+++ b/CoVAR-app/src/app/(pages)/dashboard/page.tsx
@@ -9,10 +9,11 @@ import ReportsList from './components/reportsList';
 import TopVulnerabilities from './components/topVulnerabilities';
 import { fetchLastReportDates, getAllReports, getUserRole, fetchClientsAssigned, fetchOrganisationsAssigned } from '@/functions/requests';
 import { useRouter } from 'next/navigation';
-import { evaluateLaunchStyles } from '../../../styles/evaluateStyle';
+import { boxStyles, evaluateLaunchStyles } from '../../../styles/evaluateStyle';
 import { fetchReportsPerClient } from '@/functions/requests';
 import ReportsPerClient from './components/reportsPerClient';
 import AdminPage from './components/adminPage';
+import { Loader } from '@/styles/conflictStyle';
 
 interface VulnerabilityReport {
     IP: string;
@@ -131,7 +132,7 @@ const Dashboard: React.FC = () => {
             console.log(clients);
             console.log(orgs);
             console.log('Report Dates:', reportDates);
-    
+
             setUsers(clients);
             setOrganizations(orgs);
             setLastReportDatesClients(reportDates.clients);
@@ -142,8 +143,8 @@ const Dashboard: React.FC = () => {
             setLoading(false);
         }
     };
-    
-    
+
+
 
     const calculateSeverityDistribution = (reports: VulnerabilityReport[]) => {
         const distribution: { [key: string]: number } = {
@@ -193,13 +194,13 @@ const Dashboard: React.FC = () => {
     const formatDate = (dateString: string) => {
         if (!dateString) return 'No report';
         const date = new Date(dateString);
-        
+
         const formattedDate = date.toLocaleDateString('en-GB', {
             day: '2-digit',
             month: '2-digit',
             year: 'numeric'
         });
-        
+
         const formattedTime = date.toLocaleTimeString('en-GB', {
             hour: '2-digit',
             minute: '2-digit',
@@ -240,8 +241,21 @@ const Dashboard: React.FC = () => {
 
     if (role === null) {
         return (
-            <Box sx={mainContentStyles}>
-                <Typography variant="h6">Loading...</Typography>
+            <Box
+                sx={{
+                    ...boxStyles,
+                    position: 'absolute',
+                    top: '50%',
+                    left: '50%',
+                    transform: 'translate(-50%, -50%)',
+                    display: 'flex',
+                    justifyContent: 'center',
+                    alignItems: 'center',
+                    width: '100%',
+                    height: '100%',
+                }}
+            >
+                <Loader />
             </Box>
         );
     }
@@ -306,34 +320,34 @@ const Dashboard: React.FC = () => {
                     {users.length === 0 && organizations.length === 0 ? (
                         <Typography>No assigned clients or organisations found.</Typography>
                     ) : (
-                    <List>
-                        {users.map((user) => (
-                            <ListItem key={user.user_id} sx={{ marginBottom: 1, padding: 1, borderRadius: 1, boxShadow: 1 }}>
-                                <ListItemText
-                                    primary={`User: ${user.username}`}
-                                    secondary={`Last Report: ${formatDate(lastReportDatesClients.find(c => c.client_name === user.username)?.last_report_date as string) || 'No report'}`}
-                                />
-                                <ListItemSecondaryAction>
-                                    <Button variant="contained" onClick={() => handleUserButtonClick(user)}>
-                                        Evaluate
-                                    </Button>
-                                </ListItemSecondaryAction>
-                            </ListItem>
-                        ))}
-                        {organizations.map((org) => (
-                            <ListItem key={org.organization_id} sx={{ marginBottom: 1, padding: 1, borderRadius: 1, boxShadow: 1 }}>
-                                <ListItemText
-                                    primary={`Organisation: ${org.name}`}
-                                    secondary={`Last Report: ${formatDate(lastReportDatesOrgs.find(o => o.organization_name === org.name)?.last_report_date as string) || 'No report' }`}
-                                />
-                                <ListItemSecondaryAction>
-                                    <Button variant="contained" onClick={() => handleOrganizationButtonClick(org)}>
-                                        Evaluate
-                                    </Button>
-                                </ListItemSecondaryAction>
-                            </ListItem>
-                        ))}
-                    </List>
+                        <List>
+                            {users.map((user) => (
+                                <ListItem key={user.user_id} sx={{ marginBottom: 1, padding: 1, borderRadius: 1, boxShadow: 1 }}>
+                                    <ListItemText
+                                        primary={`User: ${user.username}`}
+                                        secondary={`Last Report: ${formatDate(lastReportDatesClients.find(c => c.client_name === user.username)?.last_report_date as string) || 'No report'}`}
+                                    />
+                                    <ListItemSecondaryAction>
+                                        <Button variant="contained" onClick={() => handleUserButtonClick(user)}>
+                                            Evaluate
+                                        </Button>
+                                    </ListItemSecondaryAction>
+                                </ListItem>
+                            ))}
+                            {organizations.map((org) => (
+                                <ListItem key={org.organization_id} sx={{ marginBottom: 1, padding: 1, borderRadius: 1, boxShadow: 1 }}>
+                                    <ListItemText
+                                        primary={`Organisation: ${org.name}`}
+                                        secondary={`Last Report: ${formatDate(lastReportDatesOrgs.find(o => o.organization_name === org.name)?.last_report_date as string) || 'No report'}`}
+                                    />
+                                    <ListItemSecondaryAction>
+                                        <Button variant="contained" onClick={() => handleOrganizationButtonClick(org)}>
+                                            Evaluate
+                                        </Button>
+                                    </ListItemSecondaryAction>
+                                </ListItem>
+                            ))}
+                        </List>
                     )}
                 </Paper>
             </Box>
@@ -347,7 +361,7 @@ const Dashboard: React.FC = () => {
             </Box>
         );
     }
-    
+
 
     return null;
 };
diff --git a/CoVAR-app/src/app/(pages)/evaluate/page.tsx b/CoVAR-app/src/app/(pages)/evaluate/page.tsx
index e6c7b7b..b075178 100644
--- a/CoVAR-app/src/app/(pages)/evaluate/page.tsx
+++ b/CoVAR-app/src/app/(pages)/evaluate/page.tsx
@@ -2,9 +2,10 @@
 
 import React, { useEffect, useState } from 'react';
 import { Box, Button, Typography, List, ListItem, ListItemText, ListItemSecondaryAction, Paper } from '@mui/material';
-import { evaluateLaunchStyles, headingBoxStyles } from '../../../styles/evaluateStyle';
+import { boxStyles, evaluateLaunchStyles, headingBoxStyles } from '../../../styles/evaluateStyle';
 import axios from 'axios';
 import { useRouter } from 'next/navigation';
+import { Loader } from '@/styles/conflictStyle';
 
 interface User {
   user_id: number;
@@ -79,7 +80,7 @@ const Evaluate: React.FC = () => {
           Assigned Clients and Organisations
         </Typography>
       </Box>
-  
+
       {/* Container for scrolling */}
       <Box
         sx={{
@@ -101,11 +102,26 @@ const Evaluate: React.FC = () => {
       >
         {/* Loading condition */}
         {loading ? (
-          <Typography>Loading...</Typography>
+          <Box
+            sx={{
+              ...boxStyles,
+              position: 'absolute',
+              top: '50%',
+              left: '50%',
+              transform: 'translate(-50%, -50%)',
+              display: 'flex',
+              justifyContent: 'center',
+              alignItems: 'center',
+              width: '100%',
+              height: '100%',
+            }}
+          >
+            <Loader />
+          </Box>
         ) : users.length === 0 && organizations.length === 0 ? (
           <Paper elevation={3} sx={{ marginBottom: 3, padding: 2 }}>
-          <Typography>No assigned clients or organisations found.</Typography>
-        </Paper>
+            <Typography>No assigned clients or organisations found.</Typography>
+          </Paper>
         ) : (
           <List>
             {/* Each user wrapped in a standalone Paper component */}
@@ -128,7 +144,7 @@ const Evaluate: React.FC = () => {
                 </ListItem>
               </Paper>
             ))}
-  
+
             {/* Each organization wrapped in a standalone Paper component */}
             {organizations.map(org => (
               <Paper
@@ -154,7 +170,7 @@ const Evaluate: React.FC = () => {
       </Box>
     </Box>
   );
-  
+
 };
 
 export default Evaluate;
\ No newline at end of file
diff --git a/CoVAR-app/src/app/(pages)/organisation/page.tsx b/CoVAR-app/src/app/(pages)/organisation/page.tsx
index 3a83ff1..c82d892 100644
--- a/CoVAR-app/src/app/(pages)/organisation/page.tsx
+++ b/CoVAR-app/src/app/(pages)/organisation/page.tsx
@@ -4,11 +4,12 @@ import { Button, Card, CardContent, CircularProgress, TextField, Typography, Ico
 import { Box } from '@mui/system';
 import { DataGrid, GridColDef, GridRenderCellParams, GridAlignment } from '@mui/x-data-grid';
 import { getUserRole, fetchUsersByOrg, removeUser, deleteOrganisation, createOrganisation, changeOrganisationName, leaveOrganisation, inviteMember, fetchInvites, acceptInvite, rejectInvite, getOwner } from '../../../functions/requests';
-import { buttonStyles, cardStyles, headingBoxStyles, mainContentStyles, textFieldStyles } from '../../../styles/organisationStyle';
+import { boxStylesOrg, buttonStyles, cardStyles, headingBoxStyles, mainContentStyles, textFieldStyles } from '../../../styles/organisationStyle';
 import { useRouter } from 'next/navigation';
 import AcceptIcon from '@mui/icons-material/Check'; 
 import RejectIcon from '@mui/icons-material/Close';
 import { useTheme } from '@mui/material/styles';
+import { Loader } from '@/styles/conflictStyle';
 
 type User = {
     id: string;
@@ -460,10 +461,20 @@ const Organisation = () => {
 
     if (loading) {
         return (
-            <Box sx={mainContentStyles}>
-                <Box sx={{ display: 'flex', justifyContent: 'center', alignItems: 'center', height: '100vh' }}>
-                    <CircularProgress />
-                </Box>
+            <Box sx={{
+                ...boxStylesOrg,
+                position: 'absolute',
+                top: '50%',
+                left: '50%',
+                transform: 'translate(-50%, -50%)',
+                display: 'flex',
+                justifyContent: 'center',
+                alignItems: 'center',
+                width: '100%',
+                height: '100%',
+
+            }}>
+                <Loader />
             </Box>
         );
     }
diff --git a/CoVAR-app/src/styles/evaluateStyle.tsx b/CoVAR-app/src/styles/evaluateStyle.tsx
index 2ee7990..f2e4737 100644
--- a/CoVAR-app/src/styles/evaluateStyle.tsx
+++ b/CoVAR-app/src/styles/evaluateStyle.tsx
@@ -54,6 +54,14 @@ export const mainContentStyles: SxProps<Theme> = {
   color: (theme) => theme.palette.text.primary,
 };
 
+
+export const boxStyles: SxProps<Theme> = {
+
+  backgroundColor: (theme) => theme.palette.background.default,
+  color: (theme) => theme.palette.text.primary,
+
+};
+
 export const evaluateLaunchStyles: SxProps<Theme> = (theme) => ({
   flexGrow: 1,
   backgroundColor: theme.palette.background.default,
diff --git a/CoVAR-app/src/styles/organisationStyle.tsx b/CoVAR-app/src/styles/organisationStyle.tsx
index 9cd31c3..461f03b 100644
--- a/CoVAR-app/src/styles/organisationStyle.tsx
+++ b/CoVAR-app/src/styles/organisationStyle.tsx
@@ -12,6 +12,14 @@ export const mainContentStyles: SxProps<Theme> = {
     overflow: 'hidden',
 };
 
+
+export const boxStylesOrg: SxProps<Theme> = {
+
+    backgroundColor: (theme) => theme.palette.background.default,
+    color: (theme) => theme.palette.text.primary,
+  
+  };
+
 export const cardStyles: SxProps<Theme> = {
     width: 450,
     height: 250,

From 14eecaeb9a53007adf9f2667ca6573dc5dc1fcbf Mon Sep 17 00:00:00 2001
From: Alec Watson <alecwatson15@gmail.com>
Date: Sun, 29 Sep 2024 17:09:55 +0200
Subject: [PATCH 19/24] Changes to overflow of pdf

---
 server/routes/reports.js | 118 ++++++++++++++++++++++++++++++++-------
 1 file changed, 99 insertions(+), 19 deletions(-)

diff --git a/server/routes/reports.js b/server/routes/reports.js
index 8a350d5..25994a7 100644
--- a/server/routes/reports.js
+++ b/server/routes/reports.js
@@ -523,7 +523,8 @@ router.get('/reports/executive/:report_id', authenticateToken, async (req, res)
             }
             doc.addPage(); 
             addHeader();    
-        };
+            doc.y = 50; // Reset the vertical position to the top of the page
+        }
 
         // Add the first content page
         addNewPage();
@@ -544,7 +545,7 @@ router.get('/reports/executive/:report_id', authenticateToken, async (req, res)
             { align: 'left', indent: 20, paragraphIndent: 20 } // Apply indent and paragraphIndent to wrap the text correctly
         );
         doc.fontSize(12).text(
-            'network devices. Greenbone Vulnerability Manager is used for all Andile Solutions vulnerability ', 
+            'network devices.', 
             { align: 'left', indent: 20, paragraphIndent: 20 } // Apply indent and paragraphIndent to wrap the text correctly
         );
         doc.fontSize(12).text(
@@ -605,12 +606,20 @@ router.get('/reports/executive/:report_id', authenticateToken, async (req, res)
         doc.text((ReportscriticalCount + ReportsmediumCount + ReportslowCount).toString(), tableLeft + columnWidths[0] + cellPadding, totalRowY + cellPadding, { width: columnWidths[1], align: 'center' });
         doc.text((uniqueCriticalHostsCount + uniqueMediumHostsCount + uniqueLowHostsCount).toString(), tableLeft + columnWidths[0] + columnWidths[1] + cellPadding, totalRowY + cellPadding, { width: columnWidths[2], align: 'center' });
 
-        // Add any other content here...
+        const checkPageOverflow = (requiredSpace) => {
+            const currentY = doc.y;
+            const pageHeight = doc.page.height;
+            
+            // Check if there's enough space remaining for the required space
+            if (currentY + requiredSpace > pageHeight - 100) {  // Leave some space for footer
+                addNewPage();
+            }
+        };
         addFooter();
         doc.moveDown();
         doc.fontSize(16).text('Vulnerability Distribution', { align: 'center' });
         doc.moveDown(2);
-
+        checkPageOverflow(300); // Adjust the required space for your chart size
         doc.image(pieChartBuffer, {
             fit: [500, 300],
             align: 'center',
@@ -619,6 +628,7 @@ router.get('/reports/executive/:report_id', authenticateToken, async (req, res)
         doc.moveDown(17);
         // Add the trend graph
         // addNewPage();
+        checkPageOverflow(300); // Adjust for the trend graph size
         doc.fontSize(16).text('Trend Graph', { align: 'center' });
         doc.moveDown(1);
 
@@ -629,6 +639,7 @@ router.get('/reports/executive/:report_id', authenticateToken, async (req, res)
             valign: 'center'
         });
         addFooter();
+        checkPageOverflow(300); // Adjust for the trend graph size
         doc.fontSize(16).text('Vulnerabilities Detail Table', { align: 'center' });
         doc.moveDown();
         let vulnerabilityTableData = Array.from(aggregatedVulnerabilities.values()).map(entry => {
@@ -780,7 +791,6 @@ router.get('/reports/executive/:report_id', authenticateToken, async (req, res)
         };
 
         const image = await chartJSNodeCanvas.renderToBuffer(tableconfiguration);
-
         // Add the table to the PDF
         doc.image(image, {
             fit: [500, 300],
@@ -801,6 +811,54 @@ router.get('/reports/tech/:report_id', authenticateToken, async (req, res) => {
     try {
         const { report_id } = req.params;
 
+        const ipToInteger = (ip) => {
+            return ip.split('.').reduce((acc, octet) => (acc << 8) + parseInt(octet), 0);
+        };
+
+        const integerToIp = (int) => {
+            return [
+                (int >>> 24) & 255,
+                (int >>> 16) & 255,
+                (int >>> 8) & 255,
+                int & 255
+            ].join('.');
+        };
+        const calculateIpRange = (hosts) => {
+            // Convert IPs to integers
+            const ipIntegers = hosts.map(ip => ipToInteger(ip));
+            
+            // Sort IPs in ascending order
+            ipIntegers.sort((a, b) => a - b);
+            
+            // Get the smallest and largest IPs
+            const smallestIp = integerToIp(ipIntegers[0]);
+            const largestIp = integerToIp(ipIntegers[ipIntegers.length - 1]);
+            
+            // Return the IP range
+            return `${smallestIp}-${largestIp}`;
+        };
+        const truncateIPsToRange = (hosts) => {
+            // Convert the IP addresses into a form like '10.242.111.111-10.243.000.000'
+            return hosts
+                .map(ip => {
+                    const parts = ip.split('.');
+                    if (parts.length === 4) {
+                        // Return the IP address range based on the first two octets, with the remaining octets in range format
+                        return `${parts[0]}.${parts[1]}.111.111-${parts[0]}.${parts[1]}.000.000`;
+                    }
+                    return ip; // In case the IP format is not as expected, return it unchanged
+                })
+                // Sort the IPs in descending order
+                .sort((a, b) => {
+                    const ipA = a.split('.').map(Number);
+                    const ipB = b.split('.').map(Number);
+                    // Compare from largest octet to smallest
+                    for (let i = 0; i < 4; i++) {
+                        if (ipA[i] !== ipB[i]) return ipB[i] - ipA[i];
+                    }
+                    return 0;
+                });
+        };
         // Fetch the report data by ID
         const reportResult = await pgClient.query(
             'SELECT report_id, created_at, content FROM reports WHERE report_id = $1',
@@ -901,7 +959,7 @@ router.get('/reports/tech/:report_id', authenticateToken, async (req, res) => {
             { align: 'left', indent: 20, paragraphIndent: 20 } // Apply indent and paragraphIndent to wrap the text correctly
         );
         doc.fontSize(12).text(
-            'network devices. Greenbone Vulnerability Manager is used for all Andile Solutions vulnerability ', 
+            'network devices. ', 
             { align: 'left', indent: 20, paragraphIndent: 20 } // Apply indent and paragraphIndent to wrap the text correctly
         );
         doc.fontSize(12).text(
@@ -909,7 +967,7 @@ router.get('/reports/tech/:report_id', authenticateToken, async (req, res) => {
             { align: 'left', indent: 20, paragraphIndent: 20 } // Apply indent and paragraphIndent to wrap the text correctly
         );
         doc.moveDown();
-
+        addNewPage();
         // Updated Table of Contents
         doc.fontSize(14).text('Table of Contents', { align: 'left', indent: 20 }); // Move Table of Contents slightly to the right
         doc.moveDown(0.5);
@@ -931,14 +989,30 @@ router.get('/reports/tech/:report_id', authenticateToken, async (req, res) => {
         doc.text('Hosts', tableLeft + columnWidths[0] + columnWidths[1] + columnWidths[2] + cellPadding, tableTop + cellPadding, { width: columnWidths[3], align: 'center' });
 
         doc.fillColor('black');
-
-        // Updated drawRow function to include the 4th column "Hosts"
+        const checkPageOverflow = (rowHeight) => {
+            if (doc.y + rowHeight > doc.page.height - 100) {  // Reserve space for footer
+                addNewPage();
+                doc.y = 50;  
+            }
+        };
         const drawRow = (y, index, vulnerability, cvss, hosts) => {
             const textOptions = { width: columnWidths[1] - 2 * cellPadding, align: 'left' };
-            
-            // Calculate the height needed for the vulnerability text
+            const cvssOptions = { width: columnWidths[2] - 2 * cellPadding, align: 'center' };
+            const hostsOptions = { width: columnWidths[3] - 2 * cellPadding, align: 'center' };
+        
+            // Calculate the IP range instead of listing individual IPs
+            const hostsRange = calculateIpRange(hosts);
+        
+            // Calculate the height needed for the vulnerability, CVSS score, and hosts text
             const vulnerabilityHeight = doc.heightOfString(vulnerability, textOptions);
-            const rowHeightAdjusted = Math.max(vulnerabilityHeight + 2 * cellPadding, rowHeight);  // Ensure the row height is at least the default rowHeight
+            const cvssHeight = doc.heightOfString(cvss, cvssOptions);
+            const hostsHeight = doc.heightOfString(hostsRange, hostsOptions);
+        
+            // Determine the maximum height of the row based on the largest content
+            const rowHeightAdjusted = Math.max(vulnerabilityHeight, cvssHeight, hostsHeight) + 2 * cellPadding;
+        
+            // Check if there is enough space for the next row, and add a new page if needed
+            checkPageOverflow(rowHeightAdjusted);
         
             // Draw table cells
             doc.rect(tableLeft, y, columnWidths[0], rowHeightAdjusted).stroke();
@@ -949,8 +1023,8 @@ router.get('/reports/tech/:report_id', authenticateToken, async (req, res) => {
             // Write text inside the cells
             doc.text(index.toString(), tableLeft + cellPadding, y + cellPadding, { width: columnWidths[0], align: 'center' });
             doc.text(vulnerability, tableLeft + columnWidths[0] + cellPadding, y + cellPadding, textOptions);
-            doc.text(cvss, tableLeft + columnWidths[0] + columnWidths[1] + cellPadding, y + cellPadding, { width: columnWidths[2], align: 'center' });
-            doc.text(hosts.join(', '), tableLeft + columnWidths[0] + columnWidths[1] + columnWidths[2] + cellPadding, y + cellPadding, { width: columnWidths[3], align: 'center' });
+            doc.text(cvss, tableLeft + columnWidths[0] + columnWidths[1] + cellPadding, y + cellPadding, cvssOptions);
+            doc.text(hostsRange, tableLeft + columnWidths[0] + columnWidths[1] + columnWidths[2] + cellPadding, y + cellPadding, hostsOptions);
         
             // Return the adjusted row height for positioning the next row
             return rowHeightAdjusted;
@@ -978,11 +1052,17 @@ router.get('/reports/tech/:report_id', authenticateToken, async (req, res) => {
            
             let currentY = tableTop + rowHeight;  // Initial Y position for the first row
 
-            // Draw rows dynamically
-            reportTOCResult.rows.forEach((row, index) => {
-                const adjustedRowHeight = drawRow(currentY, index + 1, row.nvt_name, row.cvss_score, row.hosts);
-                currentY += adjustedRowHeight;  // Move Y position for the next row
-            });
+        // Draw rows dynamically
+        reportTOCResult.rows.forEach((row, index) => {
+            const adjustedRowHeight = drawRow(currentY, index + 1, row.nvt_name, row.cvss_score, row.hosts);
+            currentY += adjustedRowHeight;  // Move Y position for the next row
+            
+            // Check for page overflow and reset currentY if necessary
+            if (currentY + adjustedRowHeight > doc.page.height - 100) {  // If we need to add a new page
+                addNewPage();
+                currentY = 50;  // Reset currentY to start from the top of the new page
+            }
+        });
 
         } catch (error) {
             console.error("Error fetching report TOC:", error);

From c7c870371ab79d41379a6d90910ffdc318184e85 Mon Sep 17 00:00:00 2001
From: Alec Watson <alecwatson15@gmail.com>
Date: Sun, 29 Sep 2024 17:11:10 +0200
Subject: [PATCH 20/24] Spacing adjustment

---
 server/routes/reports.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/routes/reports.js b/server/routes/reports.js
index 25994a7..641f5bd 100644
--- a/server/routes/reports.js
+++ b/server/routes/reports.js
@@ -609,7 +609,7 @@ router.get('/reports/executive/:report_id', authenticateToken, async (req, res)
         const checkPageOverflow = (requiredSpace) => {
             const currentY = doc.y;
             const pageHeight = doc.page.height;
-            
+            doc.moveDown(5);
             // Check if there's enough space remaining for the required space
             if (currentY + requiredSpace > pageHeight - 100) {  // Leave some space for footer
                 addNewPage();

From 9b062d7dbb225bb288734490172b1460a9b4719d Mon Sep 17 00:00:00 2001
From: Alec Watson <alecwatson15@gmail.com>
Date: Sun, 29 Sep 2024 18:11:39 +0200
Subject: [PATCH 21/24] Fix to VA dashboard in case of org

---
 server/lib/serverHelperFunctions.js |   3 +-
 server/routes/reports.js            | 144 ++++++++++++++++++----------
 2 files changed, 95 insertions(+), 52 deletions(-)

diff --git a/server/lib/serverHelperFunctions.js b/server/lib/serverHelperFunctions.js
index 11ab8d4..7d6ea8e 100644
--- a/server/lib/serverHelperFunctions.js
+++ b/server/lib/serverHelperFunctions.js
@@ -46,5 +46,6 @@ async function getAllReportIds(pgClient, UserId) {
 module.exports = {
     isOwner,
     isAdmin,
-    getAllReportIds
+    getAllReportIds,
+    getOrganizationId
 };
\ No newline at end of file
diff --git a/server/routes/reports.js b/server/routes/reports.js
index 641f5bd..1dbdf9a 100644
--- a/server/routes/reports.js
+++ b/server/routes/reports.js
@@ -109,53 +109,95 @@ router.post('/reports/getReports', authenticateToken, async (req, res) => {
 router.post('/reports/getReportsPerClient', authenticateToken, async (req, res) => {
     try {
         const user = req.user; // Get the logged-in VA user
-
-        // Query to get the clients assigned to the logged-in VA
-        const assignedClientsQuery = `
-            SELECT u.user_id, u.username 
+        
+        // Query to get assigned organizations and clients for the VA
+        const assignedEntitiesQuery = `
+            SELECT a.organization, a.client
             FROM assignment a
-            INNER JOIN users u ON a.client = u.user_id
             WHERE a.va = $1
         `;
-        const assignedClientsResult = await pgClient.query(assignedClientsQuery, [user.user_id]);
+        
+        const assignedEntitiesResult = await pgClient.query(assignedEntitiesQuery, [user.user_id]);
 
-        if (assignedClientsResult.rows.length === 0) {
-            return res.status(404).json({ error: 'No assigned clients found' });
+        // Check if any clients or organizations are assigned to this VA
+        if (assignedEntitiesResult.rows.length === 0) {
+            return res.status(404).json({ error: 'No assigned clients or organizations found' });
         }
 
-        const assignedClients = assignedClientsResult.rows;
+        const assignedEntities = assignedEntitiesResult.rows;
 
-        // Initialize an array to store the number of reports per client
+        // Initialize array to store reports per client or organization
         const reportsPerClient = [];
 
-        // Loop through each assigned client and get the number of reports for each
-        for (let client of assignedClients) {
-            const clientReportsQuery = `
-                SELECT COUNT(ur.report_id) AS report_count
-                FROM user_reports ur
-                WHERE ur.user_id = $1
-            `;
-            const clientReportsResult = await pgClient.query(clientReportsQuery, [client.user_id]);
-
-            const reportCount = clientReportsResult.rows[0]?.report_count || 0;
-
-            // Push the result into the reportsPerClient array
-            reportsPerClient.push({
-                client_id: client.user_id,
-                client_name: client.username,
-                report_count: reportCount
-            });
+        // Loop through each assigned entity and get the number of reports for each organization or client
+        for (let entity of assignedEntities) {
+            if (entity.organization) {
+                // Query to get the organization name from the organizations table
+                const orgNameQuery = `
+                    SELECT name
+                    FROM organizations
+                    WHERE organization_id = $1
+                `;
+                const orgNameResult = await pgClient.query(orgNameQuery, [entity.organization]);
+
+                const orgName = orgNameResult.rows[0]?.name || `Organization ${entity.organization}`;
+
+                // Query to get the count of reports for the assigned organization
+                const orgReportsQuery = `
+                    SELECT COUNT(report_id) AS report_count
+                    FROM organization_reports
+                    WHERE organization_id = $1
+                `;
+                const orgReportsResult = await pgClient.query(orgReportsQuery, [entity.organization]);
+
+                const orgReportCount = orgReportsResult.rows[0]?.report_count || 0;
+
+                // Push the organization report count only if it's greater than 0
+                if (orgReportCount > 0) {
+                    reportsPerClient.push({
+                        client_id: entity.organization, // Using organization ID as client_id
+                        client_name: orgName, // Using the organization name from the query
+                        report_count: orgReportCount
+                    });
+                }
+            }
+
+            if (entity.client) {
+                // Query to get the count of reports for the assigned client
+                const clientReportsQuery = `
+                    SELECT u.username, COUNT(ur.report_id) AS report_count
+                    FROM user_reports ur
+                    INNER JOIN users u ON ur.user_id = u.user_id
+                    WHERE ur.user_id = $1
+                    GROUP BY u.username
+                `;
+                const clientReportsResult = await pgClient.query(clientReportsQuery, [entity.client]);
+
+                const clientReportCount = clientReportsResult.rows[0]?.report_count || 0;
+                const clientName = clientReportsResult.rows[0]?.username || 'Unknown Client';
+
+                // Push the client report count only if it's greater than 0
+                if (clientReportCount > 0) {
+                    reportsPerClient.push({
+                        client_id: entity.client, // Using client ID as client_id
+                        client_name: clientName, // Using client's username
+                        report_count: clientReportCount
+                    });
+                }
+            }
         }
 
         // Send the results as the response
         return res.status(200).json(reportsPerClient);
+
     } catch (err) {
-        console.error('Error fetching reports per client:', err);
-        return res.status(500).json({ error: 'An error occurred while fetching reports per client' });
+        console.error('Error fetching reports per entity:', err);
+        return res.status(500).json({ error: 'An error occurred while fetching reports per entity' });
     }
 });
 
 
+
 const width = 800; // Width of the canvas
 const height = 600; // Height of the canvas
 const chartJSNodeCanvas = new ChartJSNodeCanvas({ width, height });
@@ -837,28 +879,28 @@ router.get('/reports/tech/:report_id', authenticateToken, async (req, res) => {
             // Return the IP range
             return `${smallestIp}-${largestIp}`;
         };
-        const truncateIPsToRange = (hosts) => {
-            // Convert the IP addresses into a form like '10.242.111.111-10.243.000.000'
-            return hosts
-                .map(ip => {
-                    const parts = ip.split('.');
-                    if (parts.length === 4) {
-                        // Return the IP address range based on the first two octets, with the remaining octets in range format
-                        return `${parts[0]}.${parts[1]}.111.111-${parts[0]}.${parts[1]}.000.000`;
-                    }
-                    return ip; // In case the IP format is not as expected, return it unchanged
-                })
-                // Sort the IPs in descending order
-                .sort((a, b) => {
-                    const ipA = a.split('.').map(Number);
-                    const ipB = b.split('.').map(Number);
-                    // Compare from largest octet to smallest
-                    for (let i = 0; i < 4; i++) {
-                        if (ipA[i] !== ipB[i]) return ipB[i] - ipA[i];
-                    }
-                    return 0;
-                });
-        };
+        // const truncateIPsToRange = (hosts) => {
+        //     // Convert the IP addresses into a form like '10.242.111.111-10.243.000.000'
+        //     return hosts
+        //         .map(ip => {
+        //             const parts = ip.split('.');
+        //             if (parts.length === 4) {
+        //                 // Return the IP address range based on the first two octets, with the remaining octets in range format
+        //                 return `${parts[0]}.${parts[1]}.111.111-${parts[0]}.${parts[1]}.000.000`;
+        //             }
+        //             return ip; // In case the IP format is not as expected, return it unchanged
+        //         })
+        //         // Sort the IPs in descending order
+        //         .sort((a, b) => {
+        //             const ipA = a.split('.').map(Number);
+        //             const ipB = b.split('.').map(Number);
+        //             // Compare from largest octet to smallest
+        //             for (let i = 0; i < 4; i++) {
+        //                 if (ipA[i] !== ipB[i]) return ipB[i] - ipA[i];
+        //             }
+        //             return 0;
+        //         });
+        // };
         // Fetch the report data by ID
         const reportResult = await pgClient.query(
             'SELECT report_id, created_at, content FROM reports WHERE report_id = $1',

From 36284e29f67d53f2e88f841c61ff1cb10b3649e0 Mon Sep 17 00:00:00 2001
From: Alec Watson <alecwatson15@gmail.com>
Date: Sun, 29 Sep 2024 18:18:53 +0200
Subject: [PATCH 22/24] removing un-used function

---
 server/routes/reports.js | 24 +-----------------------
 1 file changed, 1 insertion(+), 23 deletions(-)

diff --git a/server/routes/reports.js b/server/routes/reports.js
index 1dbdf9a..3e95cc3 100644
--- a/server/routes/reports.js
+++ b/server/routes/reports.js
@@ -879,28 +879,6 @@ router.get('/reports/tech/:report_id', authenticateToken, async (req, res) => {
             // Return the IP range
             return `${smallestIp}-${largestIp}`;
         };
-        // const truncateIPsToRange = (hosts) => {
-        //     // Convert the IP addresses into a form like '10.242.111.111-10.243.000.000'
-        //     return hosts
-        //         .map(ip => {
-        //             const parts = ip.split('.');
-        //             if (parts.length === 4) {
-        //                 // Return the IP address range based on the first two octets, with the remaining octets in range format
-        //                 return `${parts[0]}.${parts[1]}.111.111-${parts[0]}.${parts[1]}.000.000`;
-        //             }
-        //             return ip; // In case the IP format is not as expected, return it unchanged
-        //         })
-        //         // Sort the IPs in descending order
-        //         .sort((a, b) => {
-        //             const ipA = a.split('.').map(Number);
-        //             const ipB = b.split('.').map(Number);
-        //             // Compare from largest octet to smallest
-        //             for (let i = 0; i < 4; i++) {
-        //                 if (ipA[i] !== ipB[i]) return ipB[i] - ipA[i];
-        //             }
-        //             return 0;
-        //         });
-        // };
         // Fetch the report data by ID
         const reportResult = await pgClient.query(
             'SELECT report_id, created_at, content FROM reports WHERE report_id = $1',
@@ -996,7 +974,7 @@ router.get('/reports/tech/:report_id', authenticateToken, async (req, res) => {
 
        // Vulnerability Manager Section
        doc.fontSize(18).fillColor('black').text('Vulnerability Manager', { align: 'left', indent: 20 }); // Move slightly to the right with indent
-        doc.fontSize(12).text(
+        doc.fontSize(12).text(-
             'Greenbone Vulnerability Manager is proprietary software used to perform vulnerability scans on ', 
             { align: 'left', indent: 20, paragraphIndent: 20 } // Apply indent and paragraphIndent to wrap the text correctly
         );

From 8e1cd0dad1d72910aca63788954d0cd2013e517f Mon Sep 17 00:00:00 2001
From: A Repko <arenrepko7@gmail.com>
Date: Sun, 29 Sep 2024 18:40:29 +0200
Subject: [PATCH 23/24] Fixed reports with orgs with spaces

---
 CoVAR-app/src/app/(pages)/dashboard/page.tsx  | 10 ++++++----
 .../evaluate/conflicts/[name]/page.tsx        | 17 ++++++++++++++++-
 .../organization/[organization]/page.tsx      | 19 +++++++++++++++++--
 .../(pages)/evaluate/user/[username]/page.tsx | 19 ++++++++++++++++++-
 CoVAR-app/src/functions/requests.tsx          |  4 ++--
 server/routes/uploads.js                      |  1 +
 6 files changed, 60 insertions(+), 10 deletions(-)

diff --git a/CoVAR-app/src/app/(pages)/dashboard/page.tsx b/CoVAR-app/src/app/(pages)/dashboard/page.tsx
index ad832d6..9b9f0fc 100644
--- a/CoVAR-app/src/app/(pages)/dashboard/page.tsx
+++ b/CoVAR-app/src/app/(pages)/dashboard/page.tsx
@@ -302,13 +302,13 @@ const Dashboard: React.FC = () => {
                         <ReportsPerClient reportsPerClient={reportsPerClient} />
                     )}
                 </Paper>
-                <Paper elevation={3} sx={{ padding: 2, marginBottom: 2 }}>
                     {users.length === 0 && organizations.length === 0 ? (
                         <Typography>No assigned clients or organisations found.</Typography>
                     ) : (
                     <List>
                         {users.map((user) => (
-                            <ListItem key={user.user_id} sx={{ marginBottom: 1, padding: 1, borderRadius: 1, boxShadow: 1 }}>
+                            <Paper sx={{ padding: 1, marginBottom: 2 }}>
+                            <ListItem key={user.user_id} sx={{ marginBottom: 1, padding: 1, borderRadius: 1 }}>
                                 <ListItemText
                                     primary={`User: ${user.username}`}
                                     secondary={`Last Report: ${formatDate(lastReportDatesClients.find(c => c.client_name === user.username)?.last_report_date as string) || 'No report'}`}
@@ -319,9 +319,11 @@ const Dashboard: React.FC = () => {
                                     </Button>
                                 </ListItemSecondaryAction>
                             </ListItem>
+                            </Paper>
                         ))}
                         {organizations.map((org) => (
-                            <ListItem key={org.organization_id} sx={{ marginBottom: 1, padding: 1, borderRadius: 1, boxShadow: 1 }}>
+                            <Paper sx={{ padding: 1, marginBottom: 2 }}>
+                            <ListItem key={org.organization_id} sx={{ marginBottom: 1, padding: 1, borderRadius: 1}}>
                                 <ListItemText
                                     primary={`Organisation: ${org.name}`}
                                     secondary={`Last Report: ${formatDate(lastReportDatesOrgs.find(o => o.organization_name === org.name)?.last_report_date as string) || 'No report' }`}
@@ -332,10 +334,10 @@ const Dashboard: React.FC = () => {
                                     </Button>
                                 </ListItemSecondaryAction>
                             </ListItem>
+                            </Paper>
                         ))}
                     </List>
                     )}
-                </Paper>
             </Box>
         );
     }
diff --git a/CoVAR-app/src/app/(pages)/evaluate/conflicts/[name]/page.tsx b/CoVAR-app/src/app/(pages)/evaluate/conflicts/[name]/page.tsx
index 37bb746..53dc88f 100644
--- a/CoVAR-app/src/app/(pages)/evaluate/conflicts/[name]/page.tsx
+++ b/CoVAR-app/src/app/(pages)/evaluate/conflicts/[name]/page.tsx
@@ -745,6 +745,7 @@ const UserConflicts = () => {
                 alignItems: 'center',
                 width: '100%',
                 height: '100%',
+                
 
             }}>
                 <Loader />
@@ -756,7 +757,21 @@ const UserConflicts = () => {
 
     return (
 
-        <ReportsContainer sx={mainContentStyles} id="reportsContainer">
+        <ReportsContainer sx={{... mainContentStyles, 
+            overflowY: 'auto',
+            '&::-webkit-scrollbar': {
+                width: '0.2vw', 
+            },
+            '&::-webkit-scrollbar-thumb': {
+                backgroundColor: 'gray', 
+                borderRadius: '0.4vw',
+            },
+            '&::-webkit-scrollbar-track': {
+                backgroundColor: 'transparent', 
+            },
+            scrollbarWidth: 'thin', 
+            scrollbarColor: 'gray transparent', 
+        }} id="reportsContainer">
             {matchedReports.length > 0 && (
                 <Box>
                     {renderedMatchedReports}
diff --git a/CoVAR-app/src/app/(pages)/evaluate/organization/[organization]/page.tsx b/CoVAR-app/src/app/(pages)/evaluate/organization/[organization]/page.tsx
index ab045cd..526b2f3 100644
--- a/CoVAR-app/src/app/(pages)/evaluate/organization/[organization]/page.tsx
+++ b/CoVAR-app/src/app/(pages)/evaluate/organization/[organization]/page.tsx
@@ -47,7 +47,7 @@ const OrganizationEvaluation: React.FC = () => {
   }, [router]);
 
   const pathname = usePathname();
-  const organizationName = pathname.split('/').pop();
+  const organizationName = decodeURIComponent(pathname.split('/').pop() || '');
 
   const [uploads, setUploads] = useState<FileUpload[]>([]);
   const [reportIds, setReportIds] = useState<number[]>([]);
@@ -238,7 +238,22 @@ const OrganizationEvaluation: React.FC = () => {
           </Paper>
         </Grid>
         <Grid item xs={6}>
-          <Paper sx={{ overflowY: 'scroll', height: 'calc(80vh + 16px)' }}>
+          <Paper sx={{ 
+            overflowY: 'scroll', 
+            height: 'calc(80vh + 16px)',
+            '&::-webkit-scrollbar': {
+                width: '0.2vw', 
+            },
+            '&::-webkit-scrollbar-thumb': {
+                backgroundColor: 'gray', 
+                borderRadius: '0.4vw',
+            },
+            '&::-webkit-scrollbar-track': {
+                backgroundColor: 'transparent', 
+            },
+            scrollbarWidth: 'thin', 
+            scrollbarColor: 'gray transparent', 
+            }}>
 
             <ReportPreview reports={reports.slice(0, 3)} reportIds={reportIds} client={organizationName ?? ''} reportNames={reportNames} />
 
diff --git a/CoVAR-app/src/app/(pages)/evaluate/user/[username]/page.tsx b/CoVAR-app/src/app/(pages)/evaluate/user/[username]/page.tsx
index 20c39cb..8892d90 100644
--- a/CoVAR-app/src/app/(pages)/evaluate/user/[username]/page.tsx
+++ b/CoVAR-app/src/app/(pages)/evaluate/user/[username]/page.tsx
@@ -222,7 +222,24 @@ const UserEvaluation: React.FC = () => {
           </Paper>
         </Grid>
         <Grid item xs={6}>
-          <Paper sx={{ overflowY: 'scroll', height: 'calc(80vh + 16px)' }}>
+          <Paper sx={{ 
+            overflowY: 'scroll', 
+            height: 'calc(80vh + 16px)',
+            '&::-webkit-scrollbar': {
+                width: '0.2vw', 
+            },
+            '&::-webkit-scrollbar-thumb': {
+                backgroundColor: 'gray', 
+                borderRadius: '0.4vw',
+            },
+            '&::-webkit-scrollbar-track': {
+                backgroundColor: 'transparent', 
+            },
+            scrollbarWidth: 'thin', 
+            scrollbarColor: 'gray transparent', 
+
+
+          }}>
 
             <ReportPreview reports={reports} reportIds={reportIds} client={username ?? ''} reportNames={reportNames} />
 
diff --git a/CoVAR-app/src/functions/requests.tsx b/CoVAR-app/src/functions/requests.tsx
index 34f71c7..45b823c 100644
--- a/CoVAR-app/src/functions/requests.tsx
+++ b/CoVAR-app/src/functions/requests.tsx
@@ -518,8 +518,8 @@ export const fetchAndMatchReports = async (reportIds: number[]) => {
 export const generateReportRequest = async (finalReport: any[], name: string | undefined, type: string | null) => {
     try {
         const token = localStorage.getItem('accessToken');
-
-
+        name = decodeURIComponent(name || '');
+        console.log(name)
         const request: AxiosRequestConfig = {
             method: 'post',
             url: '/api/uploads/generateReport',
diff --git a/server/routes/uploads.js b/server/routes/uploads.js
index 0e9e023..d88c5d2 100644
--- a/server/routes/uploads.js
+++ b/server/routes/uploads.js
@@ -390,6 +390,7 @@ router.get('/uploads/client/:clientName', authenticateToken, async (req, res) =>
 // Endpoint to generate report
 router.post('/uploads/generateReport', authenticateToken, async (req, res) => {
     const { finalReport, name, type } = req.body;
+    console.log("finalReport:",finalReport, "name:", name, "type:", type);
 
     if (!finalReport || finalReport.length === 0) {
         return res.status(400).json({ error: 'Reports or report IDs are missing' });

From 85a4b07da1820b1371a00bfb0a4bc94fb39e781b Mon Sep 17 00:00:00 2001
From: A Repko <arenrepko7@gmail.com>
Date: Sun, 29 Sep 2024 18:52:33 +0200
Subject: [PATCH 24/24] h

---
 CoVAR-app/src/app/(pages)/dashboard/page.tsx | 50 ++++++++++----------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/CoVAR-app/src/app/(pages)/dashboard/page.tsx b/CoVAR-app/src/app/(pages)/dashboard/page.tsx
index 9b9f0fc..48098cb 100644
--- a/CoVAR-app/src/app/(pages)/dashboard/page.tsx
+++ b/CoVAR-app/src/app/(pages)/dashboard/page.tsx
@@ -305,35 +305,35 @@ const Dashboard: React.FC = () => {
                     {users.length === 0 && organizations.length === 0 ? (
                         <Typography>No assigned clients or organisations found.</Typography>
                     ) : (
-                    <List>
+                        <List>
                         {users.map((user) => (
-                            <Paper sx={{ padding: 1, marginBottom: 2 }}>
-                            <ListItem key={user.user_id} sx={{ marginBottom: 1, padding: 1, borderRadius: 1 }}>
-                                <ListItemText
-                                    primary={`User: ${user.username}`}
-                                    secondary={`Last Report: ${formatDate(lastReportDatesClients.find(c => c.client_name === user.username)?.last_report_date as string) || 'No report'}`}
-                                />
-                                <ListItemSecondaryAction>
-                                    <Button variant="contained" onClick={() => handleUserButtonClick(user)}>
-                                        Evaluate
-                                    </Button>
-                                </ListItemSecondaryAction>
-                            </ListItem>
+                            <Paper key={user.user_id} sx={{ padding: 1, marginBottom: 2 }}>
+                                <ListItem key={user.user_id} sx={{ marginBottom: 1, padding: 1, borderRadius: 1 }}>
+                                    <ListItemText
+                                        primary={`User: ${user.username}`}
+                                        secondary={`Last Report: ${formatDate(lastReportDatesClients.find(c => c.client_name === user.username)?.last_report_date as string) || 'No report'}`}
+                                    />
+                                    <ListItemSecondaryAction>
+                                        <Button variant="contained" onClick={() => handleUserButtonClick(user)}>
+                                            Evaluate
+                                        </Button>
+                                    </ListItemSecondaryAction>
+                                </ListItem>
                             </Paper>
                         ))}
                         {organizations.map((org) => (
-                            <Paper sx={{ padding: 1, marginBottom: 2 }}>
-                            <ListItem key={org.organization_id} sx={{ marginBottom: 1, padding: 1, borderRadius: 1}}>
-                                <ListItemText
-                                    primary={`Organisation: ${org.name}`}
-                                    secondary={`Last Report: ${formatDate(lastReportDatesOrgs.find(o => o.organization_name === org.name)?.last_report_date as string) || 'No report' }`}
-                                />
-                                <ListItemSecondaryAction>
-                                    <Button variant="contained" onClick={() => handleOrganizationButtonClick(org)}>
-                                        Evaluate
-                                    </Button>
-                                </ListItemSecondaryAction>
-                            </ListItem>
+                            <Paper key={org.organization_id} sx={{ padding: 1, marginBottom: 2 }}>
+                                <ListItem key={org.organization_id} sx={{ marginBottom: 1, padding: 1, borderRadius: 1 }}>
+                                    <ListItemText
+                                        primary={`Organisation: ${org.name}`}
+                                        secondary={`Last Report: ${formatDate(lastReportDatesOrgs.find(o => o.organization_name === org.name)?.last_report_date as string) || 'No report' }`}
+                                    />
+                                    <ListItemSecondaryAction>
+                                        <Button variant="contained" onClick={() => handleOrganizationButtonClick(org)}>
+                                            Evaluate
+                                        </Button>
+                                    </ListItemSecondaryAction>
+                                </ListItem>
                             </Paper>
                         ))}
                     </List>