Merge pull request #161 from COS301-SE-2024/develop

Develop deployment
COS301-SE-2024 · Sep 29, 2024 · ec037f7 · ec037f7
2 parents 6a4da6f + a348061
commit ec037f7
Show file tree

Hide file tree

Showing 36 changed files with 895 additions and 339 deletions.
diff --git 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
@@ -78,8 +78,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
@@ -91,11 +89,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/.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
@@ -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
@@ -1,7 +1,7 @@
 name: Test Codebase
 on:
   pull_request:
-    branches: [ main ]
+    branches: [ main , develop]
 
 permissions:
   contents: read

diff --git 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;
diff --git a/CoVAR-app/package-lock.json b/CoVAR-app/package-lock.json
diff --git 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
@@ -87,6 +87,7 @@ useEffect(() => {
                 throw new Error('Access token not found');
             }
             const users = await fetchUsers(accessToken);
+
             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())

diff --git 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/components/InviteList.tsx b/CoVAR-app/src/app/(pages)/dashboard/components/InviteList.tsx
@@ -0,0 +1,74 @@
+'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 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);
+                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
+                    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
+                                primary={`${invite.username} - ${invite.organization_name}`}
+                                secondary={`Status: ${invite.invite_status}`}
+                            />
+                        </ListItem>
+                    ))}
+                </List>
+            )}
+        </Box>
+    );
+};
+
+export default InviteList;