Skip to content
This repository was archived by the owner on Apr 5, 2024. It is now read-only.

Commit f5aaf6d

Browse files
GimleuxGimleux
authored
Merge pull request #3 from FileFighter/feature/bootstrap-test
Feature/bootstrap test
2 parents ddd30a1 + 71822a1 commit f5aaf6d

File tree

6 files changed

+252
-28
lines changed

6 files changed

+252
-28
lines changed

‎webapp_frontend/package-lock.json‎

Lines changed: 198 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎webapp_frontend/package.json‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,19 @@
66
"@testing-library/jest-dom": "^4.2.4",
77
"@testing-library/react": "^9.5.0",
88
"@testing-library/user-event": "^7.2.1",
9+
"@types/bootstrap": "^5.0.0",
910
"@types/jest": "^24.9.1",
1011
"@types/node": "^12.12.64",
1112
"@types/react": "^16.9.51",
13+
"@types/react-bootstrap": "^0.32.24",
1214
"@types/react-dom": "^16.9.8",
1315
"axios": "^0.20.0",
16+
"bootstrap": "^4.5.3",
1417
"react": "^16.13.1",
18+
"react-bootstrap": "^1.4.0",
1519
"react-dom": "^16.13.1",
1620
"react-scripts": "3.4.3",
17-
"typescript": "^3.7.5"
21+
"typescript": "^3.8.3"
1822
},
1923
"scripts": {
2024
"start": "react-scripts start",

‎webapp_frontend/public/index.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
Learn how to configure a non-root public URL by running `npm run build`.
2626
-->
2727
<title>React App</title>
28+
<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css" integrity="sha384-JcKb8q3iqJ61gNV9KGb8thSsNjpSL0n8PARn9HuZOnIxN0hoP+VmmDGMN5t9UJ0Z" crossorigin="anonymous">
2829
</head>
2930
<body>
3031
<noscript>You need to enable JavaScript to run this app.</noscript>

‎webapp_frontend/src/api.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ function setBackendPort():Promise<string>{
1919
}
2020

2121
interface BackendHealthData {
22-
uptimeInSeconds: number
22+
uptimeInSeconds: number;
23+
userCount: number
2324
}
2425

2526
function callBackendHealth():Promise<BackendHealthData>{

‎webapp_frontend/src/assets/images/logos/logo.png‎

8.02 KB
Loading

0 commit comments

Comments
 (0)