From 31fcfbc75f5902aaa5080ddd73bd44a8ff82ee4d Mon Sep 17 00:00:00 2001 From: daniel-geerdink Date: Sun, 11 Aug 2024 18:11:19 +0200 Subject: [PATCH 1/6] Centered an error message --- .../src/app/(pages)/organisation/page.tsx | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/CoVAR-app/src/app/(pages)/organisation/page.tsx b/CoVAR-app/src/app/(pages)/organisation/page.tsx index e53ed39..6ec257e 100644 --- a/CoVAR-app/src/app/(pages)/organisation/page.tsx +++ b/CoVAR-app/src/app/(pages)/organisation/page.tsx @@ -315,20 +315,20 @@ const Organisation = () => { Create Organisation {createOrgErrorMessage && ( - - {createOrgErrorMessage} - + + + {createOrgErrorMessage} + + )} + From 7afb7cc9d341f9d8e148a897391d68b198579dad Mon Sep 17 00:00:00 2001 From: daniel-geerdink Date: Sun, 11 Aug 2024 18:54:31 +0200 Subject: [PATCH 2/6] Changed light/dark mode to be toggled by a switch --- CoVAR-app/src/app/sidebar.tsx | 41 ++++++++++++++------ CoVAR-app/src/styles/customThemeProvider.tsx | 24 ++++++++++-- CoVAR-app/src/styles/sidebarStyle.tsx | 1 - 3 files changed, 50 insertions(+), 16 deletions(-) diff --git a/CoVAR-app/src/app/sidebar.tsx b/CoVAR-app/src/app/sidebar.tsx index 15ce5af..98af2a1 100644 --- a/CoVAR-app/src/app/sidebar.tsx +++ b/CoVAR-app/src/app/sidebar.tsx @@ -10,7 +10,7 @@ import SettingsIcon from '@mui/icons-material/Settings'; import { Box, Button, List, ListItem, ListItemIcon, ListItemText, Typography, useTheme } from '@mui/material'; import React, { useCallback, useContext, useEffect, useState } from 'react'; -import { ThemeContext } from '../styles/customThemeProvider'; +import { useThemeContext } from '../styles/customThemeProvider'; import { iconStyles, logoStyles, logoutButtonStyles, sidebarItemStyles, sidebarStyles } from '../styles/sidebarStyle'; import HelpOutlineIcon from '@mui/icons-material/HelpOutline'; import { useRouter, usePathname } from 'next/navigation'; @@ -18,6 +18,9 @@ import Link from 'next/link'; import { getUserRole } from '@/functions/requests'; import { doSignOut } from '../functions/firebase/auth'; import HelpDialog from './(pages)/help/helpDialog'; +import { Switch } from '@mui/material'; +import LightMode from '@mui/icons-material/LightMode'; +import DarkMode from '@mui/icons-material/DarkMode'; const Sidebar: React.FC = () => { const router = useRouter(); @@ -74,21 +77,34 @@ const Sidebar: React.FC = () => { } }; + const ThemeToggleButton: React.FC = () => { - const { toggleTheme } = useContext(ThemeContext); + const { toggleTheme, isDarkMode } = useThemeContext(); return ( - + + {isDarkMode ? ( + + ) : ( + + )} + + ); }; + + const isActive = (path: string) => location === path; return ( - CoVAR + CoVAR @@ -132,7 +148,7 @@ const Sidebar: React.FC = () => { )} - + {/* { - + */} { - + {/* { - + */} {role === "admin" && ( { + + + - + ); }; diff --git a/CoVAR-app/src/styles/customThemeProvider.tsx b/CoVAR-app/src/styles/customThemeProvider.tsx index b659c01..8541637 100644 --- a/CoVAR-app/src/styles/customThemeProvider.tsx +++ b/CoVAR-app/src/styles/customThemeProvider.tsx @@ -1,9 +1,16 @@ 'use client' -import React, { createContext, useState, useMemo, ReactNode } from 'react'; +import React, { createContext, useState, useMemo, ReactNode, useContext } from 'react'; import { ThemeProvider } from '@mui/material/styles'; import { lightTheme, darkTheme } from './themes'; -const ThemeContext = createContext({ toggleTheme: () => {} }); +// Define a type for the ThemeContext +interface ThemeContextType { + toggleTheme: () => void; + isDarkMode: boolean; +} + +// Create the context with the defined type +const ThemeContext = createContext(undefined); const CustomThemeProvider: React.FC<{ children: ReactNode }> = ({ children }) => { const [isDarkMode, setIsDarkMode] = useState(() => { @@ -25,7 +32,7 @@ const CustomThemeProvider: React.FC<{ children: ReactNode }> = ({ children }) => const theme = useMemo(() => (isDarkMode ? darkTheme : lightTheme), [isDarkMode]); return ( - + {children} @@ -33,4 +40,13 @@ const CustomThemeProvider: React.FC<{ children: ReactNode }> = ({ children }) => ); }; -export { CustomThemeProvider, ThemeContext }; +// Create a custom hook for using the ThemeContext +const useThemeContext = () => { + const context = useContext(ThemeContext); + if (!context) { + throw new Error('useThemeContext must be used within a CustomThemeProvider'); + } + return context; +}; + +export { CustomThemeProvider, useThemeContext }; // Export the hook as well diff --git a/CoVAR-app/src/styles/sidebarStyle.tsx b/CoVAR-app/src/styles/sidebarStyle.tsx index 614d5c6..1bd4e10 100644 --- a/CoVAR-app/src/styles/sidebarStyle.tsx +++ b/CoVAR-app/src/styles/sidebarStyle.tsx @@ -42,7 +42,6 @@ export const logoStyles: SxProps = (theme) => ({ }); export const logoutButtonStyles: SxProps = (theme) => ({ - marginTop: 'auto', marginBottom: theme.spacing(2), width: '90%', backgroundColor: theme.palette.primary.main, From 04c1eaed2c37cdcccb16fad25f72c0ab3e20d08a Mon Sep 17 00:00:00 2001 From: daniel-geerdink Date: Sun, 11 Aug 2024 18:56:07 +0200 Subject: [PATCH 3/6] Changed the website icon to be a lock --- CoVAR-app/src/app/favicon.ico | Bin 25931 -> 96734 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/CoVAR-app/src/app/favicon.ico b/CoVAR-app/src/app/favicon.ico index 718d6fea4835ec2d246af9800eddb7ffb276240c..933c33795f850685ae8a0d5139e860ed8ce3e34b 100644 GIT binary patch literal 96734 zcmeI*&#L4^6vy%07jWs?rJDg=xe&y~2nwPgx)2wFxKc!LH*X^IG=dx7s_oys6wK5; zQ#q+rok}X-k)BNcbXDq{Pb!skx?Prs`+u+hUhaQ?u>AMxVR?U9mJjc**Z0>)4^PYQ z|6Kn0<6-&tz2)(xdHs3$*^3)5Vt@e*U;qOczyJm?fB_6(00S7n00uCC0SsUO0~o*n z1~7mD3}65Q7{CAqFn|FJU;qOczyJm?fB_6(00S7n00uCC0SsUO0~o*n1~7mD3}65Q z7{CAq)(w31#mBdAzy9R*{STkse*Wdz->bP=Yp>iXHd|uJw$E)UhB|iF;(hh?iV=RE`|-v^=g6xY^0psqbA0ki+U`s-(^vy*K5LBq>x{`6<20W!9gCbZ z>z(P|BK?`q+7<7?wj3wm%;&6S%&%A$&Ttmt9%neina@DPu@aGsnd^wi(F}FWY#^d- zGZ=_yLqslSt|KBxGt@D&frz%vU?8Fm5xJPTj))x1P{+&$BHA{CfrvIlEthvw?`V&0rv+4H3EU z){(xOtLF#xOtiiqqnDm7*R!ifd?qs@M>EvnHPCxI8S{LHNbZjGY~~CGBHGZ~&szC1 zQ}dktQNGs@k)s*vSaZ;O{hnv+k6>*E0}*ZL?Wk0~`m()k96e^+yZ={tf5}15b>8vV zS{_D!|8#BtSpW1)Z%<35vRi(iTj$t{MBkE2ksJY46%6mcQ+< zWTEFe&pixpu15aWk#`@jzFkjCrLuJ&tYz#=b@g1=vJEqr)iVdBvRgV+S*5yquAA9L z%eM8*L8+nzLmtW-hB_q31fT1Ku7d&umO>>uIS}_MXoH@|=vkSDWt(^Y-ym zve0{7i)+r2V>87ESGKD>F1;<4%HR9BlZ=h*%W&p1CUYeR5$pDh(?;H(O|i+3Tjp(h zDPAL|Tdk=dJAyIA3|F?RJT4=By;-;Sb9EWhwr{?7{#aiZR9+j%-ilTPv&iRnDU#lVudT)RUQ{B zb}aMT%j3zs?G96ZQ&y~SWxLAbV#SVSetUU5nYZ0x%5Tbw6|QVod0ed6vCMBTk0jdhf{J+Bt)z(mtkV%dg~RPg{@p+Wrnn4r^s=>c=p)&segib137r=iX#Yu}N`a+Qys4A3Aog zYEG_nZ&5K|EY`+U?Xl?@w~su}sBX_b*0!Jb#rX5&5N9#DnAtqeFcje%XE?)||DIq( ztf-^@n4~|ej~(v(vBQ}^R=BE<70&8ohdY1laORH{uIgijv-;TK&L2CEvzGtgldZY& zd>)|Bm$sJ6_I@KRVx=6dSsUrh^W6uW#hR&c=lP6X+tifZ;yp*-zZPx0LK&X^LjB!{ zSa_ci9(f#$h|3x4^g0{yT#f2nJEv>?$j|xDnDY_)?ES9Ph%uVy8bHoQ90MbAb@n^#oA=T2FRc)s2{{*Shwj!UNXwv{u_ zt9Sn)W8VH%=S;?C^*JALym+rWWwEC<@A*>uG2+@}L~drQ)6<`&ZCYDXKeok~`m%^~ z_-r{oLVLF4S>9S*>&c7CN`^gC`m%GKFLU3X9Ov7}XI_qHerq3=>TTuQvyW`k$Fuhy ze9C#6D);iXHZGT~YVT_2PGKKYM~>(=vUvX-W@pz)i|Z7NGsy}Z|vsT^xs z+jmCBkGlNFKnoL=lRe8Allk*^ChJGCratmav14Di9TP{e#<_A^&dzFl?|7~DT&X?` zW7ja2j*Z&uP>fy6N%FF1n(jx`+VQ-PJ`9)1Xb*4lrRzzRo$6tVIT=XaYOfV!OYhZv zSA1d0)2}3R8n>r=vT~$zrKZW0*6GDPeO!55u?Px# literal 25931 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 LrJugUA?W`A8`#=m From d9f004b765443487003a4689535457bc70c03a35 Mon Sep 17 00:00:00 2001 From: eshper Date: Sun, 11 Aug 2024 19:12:04 +0200 Subject: [PATCH 4/6] Fixed bugs for single upload and triple upload, as well as some styling --- .../evaluate/components/reportPreview.tsx | 6 +- .../evaluate/conflicts/[name]/page.tsx | 24 +++--- .../organization/[organization]/page.tsx | 39 ++++++--- .../(pages)/evaluate/user/[username]/page.tsx | 25 +++++- CoVAR-app/src/app/(pages)/reports/page.tsx | 84 +++++++++++-------- docker-compose.prod.yml | 1 + server/routes/conflicts.js | 15 +++- 7 files changed, 126 insertions(+), 68 deletions(-) diff --git a/CoVAR-app/src/app/(pages)/evaluate/components/reportPreview.tsx b/CoVAR-app/src/app/(pages)/evaluate/components/reportPreview.tsx index 66b4be5..e0c7e26 100644 --- a/CoVAR-app/src/app/(pages)/evaluate/components/reportPreview.tsx +++ b/CoVAR-app/src/app/(pages)/evaluate/components/reportPreview.tsx @@ -22,10 +22,10 @@ const styles = { const ReportCard = ({ report, index }: { report: any[], index: number }) => { - + return ( - + {report.map((item, idx) => ( @@ -69,7 +69,7 @@ const ReportPreview = ({ reports, reportIds, client }: { reports: any[][], repor if (!reports || reports.length === 0) { return No reports to display; } - + // const generateReport = async () => { // try { // const token = localStorage.getItem('accessToken'); 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 196d47b..65525fc 100644 --- a/CoVAR-app/src/app/(pages)/evaluate/conflicts/[name]/page.tsx +++ b/CoVAR-app/src/app/(pages)/evaluate/conflicts/[name]/page.tsx @@ -96,7 +96,7 @@ const UserConflicts = () => { const [snackbarOpen, setSnackbarOpen] = useState(false); const fetchUploadIDsForReport = async () => { - + try { if (name && type === 'client') { const data = await fetchUploadsClient(name); @@ -189,7 +189,7 @@ const UserConflicts = () => { } setFinalReport(updatedReport); - console.log('Final Report:', updatedReport); + // console.log('Final Report:', updatedReport); }; const handleCloseSnackbar = () => { @@ -213,18 +213,18 @@ const UserConflicts = () => { if (loading) { return ( - 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 d9ded80..4e94d75 100644 --- a/CoVAR-app/src/app/(pages)/evaluate/organization/[organization]/page.tsx +++ b/CoVAR-app/src/app/(pages)/evaluate/organization/[organization]/page.tsx @@ -1,7 +1,7 @@ 'use client'; import React, { useState, useEffect, useCallback } from 'react'; -import { Box, Typography, Paper, Container, List, ListItem, ListItemText, Button, Grid } from '@mui/material'; -import { usePathname, useRouter } from 'next/navigation'; +import { Box, Typography, Paper, Container, List, ListItem, ListItemText, Button, Grid, Snackbar } from '@mui/material'; +import { usePathname, useRouter } from 'next/navigation'; import { mainContentStyles } from '../../../../../styles/evaluateStyle'; import FileUpload from '../../components/fileUpload'; import { handleDownloadFile } from '../../../../../functions/requests'; @@ -31,6 +31,7 @@ const OrganizationEvaluation: React.FC = () => { const [uploads, setUploads] = useState([]); const [reportIds, setReportIds] = useState([]); const [reports, setReports] = useState([]); + const [snackbarOpen, setSnackbarOpen] = useState(false); useEffect(() => { const fetchInitialUploads = async () => { @@ -41,9 +42,9 @@ const OrganizationEvaluation: React.FC = () => { const inReportIds = data.filter((upload: FileUpload) => upload.in_report).map((upload: FileUpload) => upload.upload_id); setReportIds(inReportIds); } - } catch (error:any) { + } catch (error: any) { //console.error('Error fetching uploads:', error); - if(error.response?.status === 403) { + if (error.response?.status === 403) { redirectToLogin(); } } @@ -75,9 +76,9 @@ const OrganizationEvaluation: React.FC = () => { const inReportIds = data.filter((upload: FileUpload) => upload.in_report).map((upload: FileUpload) => upload.upload_id); setReportIds(inReportIds); } - } catch (error:any) { + } catch (error: any) { //console.error('Error fetching uploads:', error); - if(error.response?.status === 403) { + if (error.response?.status === 403) { redirectToLogin(); } } @@ -88,9 +89,9 @@ const OrganizationEvaluation: React.FC = () => { await handleRemoveFile(upload_id); setUploads(uploads.filter(upload => upload.upload_id !== upload_id)); setReportIds(reportIds.filter(id => id !== upload_id)); - } catch (error:any) { + } catch (error: any) { //console.error('Error removing upload:', error); - if(error.response?.status === 403) { + if (error.response?.status === 403) { redirectToLogin(); } } @@ -102,15 +103,33 @@ const OrganizationEvaluation: React.FC = () => { if (reportIds.includes(upload_id)) { setReportIds(reportIds.filter(id => id !== upload_id)); } else { - setReportIds([...reportIds, upload_id]); + if (reportIds.length < 2) { + setReportIds([...reportIds, upload_id]); + } else { + setSnackbarOpen(true); + } } } catch (error) { console.error('Error updating report status:', error); } }; - + const handleCloseSnackbar = () => { + setSnackbarOpen(false); + }; return ( + + 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 a5ae2b1..84a4909 100644 --- a/CoVAR-app/src/app/(pages)/evaluate/user/[username]/page.tsx +++ b/CoVAR-app/src/app/(pages)/evaluate/user/[username]/page.tsx @@ -1,6 +1,6 @@ 'use client'; import React, { useState, useEffect, useCallback } from 'react'; -import { Box, Typography, Paper, Container, List, ListItem, ListItemText, Button, Grid } from '@mui/material'; +import { Box, Typography, Paper, Container, List, ListItem, ListItemText, Button, Grid, Snackbar } from '@mui/material'; import { usePathname } from 'next/navigation'; import { mainContentStyles } from '../../../../../styles/evaluateStyle'; import FileUpload from '../../components/fileUpload'; @@ -31,6 +31,7 @@ const UserEvaluation: React.FC = () => { const [uploads, setUploads] = useState([]); const [reportIds, setReportIds] = useState([]); const [reports, setReports] = useState([]); + const [snackbarOpen, setSnackbarOpen] = useState(false); useEffect(() => { const fetchInitialUploads = async () => { @@ -102,16 +103,34 @@ const UserEvaluation: React.FC = () => { if (reportIds.includes(upload_id)) { setReportIds(reportIds.filter(id => id !== upload_id)); } else { - setReportIds([...reportIds, upload_id]); + if (reportIds.length < 2) { + setReportIds([...reportIds, upload_id]); + } else { + setSnackbarOpen(true); + } } } catch (error) { console.error('Error updating report status:', error); } }; - + const handleCloseSnackbar = () => { + setSnackbarOpen(false); + }; return ( + + diff --git a/CoVAR-app/src/app/(pages)/reports/page.tsx b/CoVAR-app/src/app/(pages)/reports/page.tsx index cd9ef2e..9fe53bd 100644 --- a/CoVAR-app/src/app/(pages)/reports/page.tsx +++ b/CoVAR-app/src/app/(pages)/reports/page.tsx @@ -37,41 +37,53 @@ const ReportsPage = () => { if (loading) { return ( - + ); } const handleFetchExecReport = async (reportId: string) => { - try { - const blob = await fetchExecReport(reportId); // Fetch the PDF blob - - // 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 - - // 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); - - } catch (error) { - console.error('Error fetching executive report:', error); - } - }; + try { + const blob = await fetchExecReport(reportId); // Fetch the PDF blob + + // 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 + + // 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); + + } catch (error) { + console.error('Error fetching executive report:', error); + } + }; return ( - + Reports @@ -84,7 +96,7 @@ const ReportsPage = () => { Critical Count Medium Count Low Count - Actions + Actions @@ -96,14 +108,14 @@ const ReportsPage = () => { {report.mediumCount} {report.lowCount} - + diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index 3a59d76..91c78f9 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -9,6 +9,7 @@ services: - "5555:5432" volumes: - postgres_data:/var/lib/postgresql/data + - ./schema.sql:/docker-entrypoint-initdb.d/schema.sql nginx: image: 211125691345.dkr.ecr.eu-west-2.amazonaws.com/covar_nginx:latest diff --git a/server/routes/conflicts.js b/server/routes/conflicts.js index e761843..940c73f 100644 --- a/server/routes/conflicts.js +++ b/server/routes/conflicts.js @@ -8,7 +8,7 @@ function matchSentences(list1, list2) { list1 = list1.filter((item, index, self) => index === self.findIndex((t) => (t.nvtName === item.nvtName && t.port === item.port))); list2 = list2.filter((item, index, self) => index === self.findIndex((t) => (t.nvtName === item.nvtName && t.port === item.port))); - + const matches = []; const unmatchedList1 = []; const unmatchedList2 = [...list2]; @@ -44,12 +44,19 @@ function matchSentences(list1, list2) { router.post('/conflicts/match', authenticateToken, async (req, res) => { const { listUploads } = req.body; - - if (!listUploads || listUploads.length !== 2) { + + if (!listUploads || listUploads.length === 0 || listUploads.length > 2) { return res.status(400).json({ error: 'Invalid request data' }); } - + + // If only one list is provided + if (listUploads.length === 1) { + const list1 = listUploads[0]; + return res.json({ matches: [], unmatchedList1: list1, unmatchedList2: [] }); + } + const [list1, list2] = listUploads; + const { matches, unmatchedList1, unmatchedList2 } = matchSentences(list1, list2); res.json({ matches, unmatchedList1, unmatchedList2 }); }); From 0d2ebe7724e44a603a2c1b44828a7e809283444b Mon Sep 17 00:00:00 2001 From: A Repko Date: Sun, 11 Aug 2024 19:17:05 +0200 Subject: [PATCH 5/6] Fixed all of the dashboard layout problems --- .../app/(pages)/dashboard/components/reportsList.tsx | 10 +++------- .../dashboard/components/topVulnerabilities.tsx | 9 ++++----- CoVAR-app/src/app/(pages)/dashboard/page.tsx | 8 +++++++- CoVAR-app/src/styles/dashboardStyle.tsx | 1 + 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/CoVAR-app/src/app/(pages)/dashboard/components/reportsList.tsx b/CoVAR-app/src/app/(pages)/dashboard/components/reportsList.tsx index f06c67e..0a9e352 100644 --- a/CoVAR-app/src/app/(pages)/dashboard/components/reportsList.tsx +++ b/CoVAR-app/src/app/(pages)/dashboard/components/reportsList.tsx @@ -18,11 +18,7 @@ const severityColors: { [key: string]: { border: string; background: string } } const ReportsList: React.FC = ({ reports, selectedSeverity, handleSeverityChange }) => { return ( - - - - Filter by Severity - + = ({ reports, selectedSeverity, ha label="All" /> - + {reports.length === 0 ? ( No reports @@ -68,7 +64,7 @@ const ReportsList: React.FC = ({ reports, selectedSeverity, ha ))} )} - + ); }; diff --git a/CoVAR-app/src/app/(pages)/dashboard/components/topVulnerabilities.tsx b/CoVAR-app/src/app/(pages)/dashboard/components/topVulnerabilities.tsx index 278dfd9..eb764b5 100644 --- a/CoVAR-app/src/app/(pages)/dashboard/components/topVulnerabilities.tsx +++ b/CoVAR-app/src/app/(pages)/dashboard/components/topVulnerabilities.tsx @@ -2,6 +2,7 @@ import React from 'react'; import { Box, Typography, Paper, List, ListItem, ListItemText } from '@mui/material'; import { VulnerabilityReport } from '../page'; +import { ResponsiveContainer } from 'recharts'; interface TopVulnerabilitiesProps { vulnerabilities: VulnerabilityReport[]; @@ -9,9 +10,7 @@ interface TopVulnerabilitiesProps { const TopVulnerabilities: React.FC = ({ vulnerabilities }) => { return ( - - - Top Vulnerabilities + {vulnerabilities.map((vulnerability, index) => ( @@ -22,8 +21,8 @@ const TopVulnerabilities: React.FC = ({ vulnerabilities ))} - - + + ); }; diff --git a/CoVAR-app/src/app/(pages)/dashboard/page.tsx b/CoVAR-app/src/app/(pages)/dashboard/page.tsx index 0f42b7d..3ade802 100644 --- a/CoVAR-app/src/app/(pages)/dashboard/page.tsx +++ b/CoVAR-app/src/app/(pages)/dashboard/page.tsx @@ -128,14 +128,20 @@ const Dashboard: React.FC = () => { - + + Top Vulnerabilities + + + + Filter by Severity + )} diff --git a/CoVAR-app/src/styles/dashboardStyle.tsx b/CoVAR-app/src/styles/dashboardStyle.tsx index 789ff5e..75b95e1 100644 --- a/CoVAR-app/src/styles/dashboardStyle.tsx +++ b/CoVAR-app/src/styles/dashboardStyle.tsx @@ -10,6 +10,7 @@ export const chartContainerStyles: SxProps = (theme) => ({ justifyContent: 'center', alignItems: 'center', flex: 1, + height: '100%', '& .recharts-wrapper': { fill: 'none', }, From 0f8dce918c461e11dba3881baa2f4fa13908dc83 Mon Sep 17 00:00:00 2001 From: JBlixems Date: Sun, 11 Aug 2024 19:31:32 +0200 Subject: [PATCH 6/6] Update readme --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 2188094..54cdef4 100644 --- a/README.md +++ b/README.md @@ -43,6 +43,9 @@ The CoVAR project by BlueVision ITM aims to develop a comprehensive vulnerabilit * [Architectural Structural Design](https://docs.google.com/document/d/1rhLhNdHQONaVFSU4WyOLPm6ZoKlxLMqk/edit?usp=sharing&ouid=112929114105055327648&rtpof=true&sd=true) * [Coding and Testing Standards](https://docs.google.com/document/d/19x0yDaAYaYr555nFialOXTFLBrfKUHfo8NFclaq-4Zg/edit?usp=sharing) * [Project Board](https://github.com/orgs/COS301-SE-2024/projects/94) +* [User Manual](https://docs.google.com/document/d/1H26oOpBHo4t9EL1G9kraeXB6f_Abepx8sn1_zJdNeCU/edit?usp=sharing) +* [Technical Installation](https://docs.google.com/document/d/1dU5z7HhWsoiKwqF611Anz3zIODVH_MwI2TRsUfeYXCE) + ## Team Profiles | | | | | |