Skip to content

Commit b2e4b62

Browse files
Internship Completed
1 parent 13fd76a commit b2e4b62

File tree

7 files changed

+368
-190
lines changed

7 files changed

+368
-190
lines changed

backend/config.conf

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
<<<<<<< Updated upstream
12
NGROK = https://b1c3-2401-4900-376e-7dc4-4461-d4cd-f827-2764.ngrok-free.app
3+
=======
4+
# <<<<<<< Updated upstream
5+
# NGROK = https://ec58-2406-7400-98-c555-00-104.ngrok-free.app
6+
# =======
7+
NGROK = https://1500-117-198-99-29.ngrok-free.app
8+
# >>>>>>> Stashed changes
9+
>>>>>>> Stashed changes
210
FLUTTER_WEB = http://localhost:53916
311
REACT_WEB = http://localhost:3000

frontend/setupProxy.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ module.exports = function(app) {
44
app.use(
55
'/api',
66
createProxyMiddleware({
7-
target: 'https://4583-117-198-99-29.ngrok-free.app',
7+
target: ' https://1500-117-198-99-29.ngrok-free.app',
88
changeOrigin: true,
99
})
1010
);

frontend/src/Approval.css

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,16 @@
3737
margin-bottom: 20px;
3838
}
3939

40-
.extra-events-table {
40+
.extra-events-table,
41+
.project-approvals-table {
4142
width: 100%;
4243
border-collapse: collapse;
4344
}
4445

4546
.declaration-table caption,
4647
.club-events-table caption,
47-
.extra-events-table caption {
48+
.extra-events-table caption,
49+
.project-approvals-table caption {
4850
font-weight: bold;
4951
font-size: 1.2rem;
5052
margin-bottom: 10px;
@@ -55,15 +57,18 @@
5557
.club-events-table th,
5658
.club-events-table td,
5759
.extra-events-table th,
58-
.extra-events-table td {
60+
.extra-events-table td,
61+
.project-approvals-table th,
62+
.project-approvals-table td {
5963
color: #fff;
6064
padding: 10px;
6165
text-align: left;
6266
}
6367

6468
.declaration-table th,
6569
.club-events-table th,
66-
.extra-events-table th {
70+
.extra-events-table th,
71+
.project-approvals-table th {
6772
color: black;
6873
background-color: #f5f5f5;
6974
}

0 commit comments

Comments
 (0)