Internship Completed

2020-HelloWorld · Jul 28, 2023 · b2e4b62 · b2e4b62
1 parent 13fd76a
commit b2e4b62
Show file tree

Hide file tree

Showing 7 changed files with 368 additions and 190 deletions.
diff --git a/backend/config.conf b/backend/config.conf
@@ -1,3 +1,11 @@
+<<<<<<< Updated upstream
 NGROK =  https://b1c3-2401-4900-376e-7dc4-4461-d4cd-f827-2764.ngrok-free.app 
+=======
+# <<<<<<< Updated upstream
+# NGROK =  https://ec58-2406-7400-98-c555-00-104.ngrok-free.app
+# =======
+NGROK = https://1500-117-198-99-29.ngrok-free.app
+# >>>>>>> Stashed changes
+>>>>>>> Stashed changes
 FLUTTER_WEB = http://localhost:53916
 REACT_WEB = http://localhost:3000
diff --git a/frontend/setupProxy.js b/frontend/setupProxy.js
@@ -4,7 +4,7 @@ module.exports = function(app) {
   app.use(
     '/api',
     createProxyMiddleware({
-      target: 'https://4583-117-198-99-29.ngrok-free.app',
+      target: ' https://1500-117-198-99-29.ngrok-free.app',
       changeOrigin: true,
     })
   );

diff --git a/frontend/src/Approval.css b/frontend/src/Approval.css
@@ -37,14 +37,16 @@
     margin-bottom: 20px;
   }
 
-  .extra-events-table {
+  .extra-events-table,
+  .project-approvals-table {
     width: 100%;
     border-collapse: collapse;
   }
 
   .declaration-table caption,
   .club-events-table caption,
-  .extra-events-table caption {
+  .extra-events-table caption,
+  .project-approvals-table caption {
     font-weight: bold;
     font-size: 1.2rem;
     margin-bottom: 10px;
@@ -55,15 +57,18 @@
   .club-events-table th,
   .club-events-table td,
   .extra-events-table th,
-  .extra-events-table td {
+  .extra-events-table td,
+  .project-approvals-table th,
+  .project-approvals-table td {
     color: #fff;
     padding: 10px;
     text-align: left;
   }
 
   .declaration-table th,
   .club-events-table th,
-  .extra-events-table th {
+  .extra-events-table th,
+  .project-approvals-table th {
     color: black;
     background-color: #f5f5f5;
   }