Compare commits

...

17 Commits

Author SHA1 Message Date
168fcad308 Uat 2024-01-29 08:18:21 +01:00
b5c3a9e046 Tweaks 2024-01-29 08:10:11 +01:00
664c4906e3 Cleanup 2024-01-28 22:51:48 +01:00
27173ec985 Optimize app build 2024-01-28 22:25:31 +01:00
ffbcd89093 Cleanup 2024-01-28 22:10:47 +01:00
6588f2aa68 Cleanup and statics 2024-01-28 21:58:24 +01:00
8a97b3daf6 Create docker 2024-01-28 21:49:03 +01:00
5a43ce875f Service filters 2024-01-28 21:11:30 +01:00
b4e0f1a7f8 Absolute imports 2024-01-28 12:58:53 +01:00
f6b1dc6562 Loading alert styling 2024-01-28 12:46:55 +01:00
0c86009271 Nicer colors 2024-01-28 12:33:00 +01:00
03bba20b50 Nicer colors 2024-01-28 12:26:29 +01:00
b1f7d8196a Global search filter 2024-01-28 10:35:01 +01:00
858f42c39b Merge branch 'service-card-restructure' 2024-01-27 22:45:26 +01:00
fadeead858 Finish service card 2024-01-27 22:41:15 +01:00
58b67da193 Better layout 2024-01-26 23:39:26 +01:00
94ee8da3bd Service card 2024-01-26 23:09:05 +01:00
43 changed files with 19070 additions and 18817 deletions

3
.dockerignore Normal file
View File

@ -0,0 +1,3 @@
**/node_modules
**/build
**/Dockerfile

25
Dockerfile Normal file
View File

@ -0,0 +1,25 @@
# stage 1: build node frontend
FROM node:21 as node-builder
WORKDIR /node-builder
COPY ./public ./public
COPY ./src ./src
COPY ./package.json .
COPY ./package-lock.json .
COPY ./tsconfig.json .
RUN \
npm install && \
npm run build
FROM busybox:1.36-musl
RUN adduser -D pingator
USER pingator
WORKDIR /www
COPY --from=node-builder /node-builder/build /www
# Run BusyBox httpd
CMD ["busybox", "httpd", "-f", "-v", "-h", "/www", "-p", "3000"]

View File

@ -1,6 +1,27 @@
CONTAINER_NAME=pingator
IMAGE_NAME=pingator
EXTERNAL_PORT=8080
run:
@npm start
.PHONY:build
build:
- @rm -rf build
@npm run build
docker-build:
- @docker image rm $(IMAGE_NAME)
@docker \
build \
--progress plain \
--tag $(IMAGE_NAME) \
.
docker-run:
@docker \
run \
--publish $(EXTERNAL_PORT):3000 \
--name=$(CONTAINER_NAME) \
--detach \
$(IMAGE_NAME)

BIN
assets/pingator-logo.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

40
assets/pingator-logo.svg Normal file
View File

@ -0,0 +1,40 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
class="MuiSvgIcon-root MuiSvgIcon-fontSizeLarge icon css-tzssek-MuiSvgIcon-root"
focusable="false"
aria-hidden="true"
viewBox="0 0 24 24"
data-testid="RadarIcon"
version="1.1"
id="svg1"
sodipodi:docname="pingator-logo.svg"
inkscape:version="1.3.2 (091e20ef0f, 2023-11-25, custom)"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns="http://www.w3.org/2000/svg"
xmlns:svg="http://www.w3.org/2000/svg">
<defs
id="defs1" />
<sodipodi:namedview
id="namedview1"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:showpageshadow="2"
inkscape:pageopacity="0.0"
inkscape:pagecheckerboard="0"
inkscape:deskcolor="#d1d1d1"
inkscape:zoom="36.423461"
inkscape:cx="10.981933"
inkscape:cy="16.967086"
inkscape:window-width="3840"
inkscape:window-height="2100"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="1"
inkscape:current-layer="svg1" />
<path
d="M19.74 18.33C21.15 16.6 22 14.4 22 12c0-5.52-4.48-10-10-10S2 6.48 2 12s4.48 10 10 10c2.4 0 4.6-.85 6.33-2.26.27-.22.53-.46.78-.71.03-.03.05-.06.07-.08.2-.2.39-.41.56-.62M12 20c-4.41 0-8-3.59-8-8s3.59-8 8-8 8 3.59 8 8c0 1.85-.63 3.54-1.69 4.9l-1.43-1.43c.69-.98 1.1-2.17 1.1-3.46 0-3.31-2.69-6-6-6s-6 2.69-6 6 2.69 6 6 6c1.3 0 2.51-.42 3.49-1.13l1.42 1.42C15.54 19.37 13.85 20 12 20m1.92-7.49c.17-.66.02-1.38-.49-1.9l-.02-.02c-.77-.77-2-.78-2.78-.04-.01.01-.03.02-.05.04-.78.78-.78 2.05 0 2.83l.02.02c.52.51 1.25.67 1.91.49l1.51 1.51c-.6.36-1.29.58-2.04.58-2.21 0-4-1.79-4-4s1.79-4 4-4 4 1.79 4 4c0 .73-.21 1.41-.56 2z"
id="path1"
style="fill:#08ab08;fill-opacity:1" />
</svg>

After

Width:  |  Height:  |  Size: 1.8 KiB

147
package-lock.json generated
View File

@ -12,21 +12,23 @@
"@emotion/styled": "^11.11.0",
"@mui/icons-material": "^5.15.6",
"@mui/material": "^5.15.6",
"@testing-library/jest-dom": "^5.17.0",
"@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^13.5.0",
"@types/jest": "^27.5.2",
"@types/node": "^16.18.75",
"@types/react": "^18.2.48",
"@types/react-dom": "^18.2.18",
"axios": "^1.6.5",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-router-dom": "^6.21.3",
"react-scripts": "5.0.1",
"sass": "^1.70.0",
"typescript": "^4.9.5",
"web-vitals": "^2.1.4"
},
"devDependencies": {
"@babel/plugin-proposal-private-property-in-object": "^7.21.11",
"@testing-library/jest-dom": "^5.17.0",
"@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^13.5.0",
"@types/jest": "^27.5.2",
"sass": "^1.70.0"
}
},
"node_modules/@aashutoshrathi/word-wrap": {
@ -40,7 +42,8 @@
"node_modules/@adobe/css-tools": {
"version": "4.3.2",
"resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.3.2.tgz",
"integrity": "sha512-DA5a1C0gD/pLOvhv33YMrbf2FK3oUzwNl9oOJqE4XVjuEtt6XIakRcsd7eLiOSPkp1kTRQGICTA8cKra/vFbjw=="
"integrity": "sha512-DA5a1C0gD/pLOvhv33YMrbf2FK3oUzwNl9oOJqE4XVjuEtt6XIakRcsd7eLiOSPkp1kTRQGICTA8cKra/vFbjw==",
"dev": true
},
"node_modules/@alloc/quick-lru": {
"version": "5.2.0",
@ -655,9 +658,17 @@
}
},
"node_modules/@babel/plugin-proposal-private-property-in-object": {
"version": "7.21.0-placeholder-for-preset-env.2",
"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz",
"integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==",
"version": "7.21.11",
"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.11.tgz",
"integrity": "sha512-0QZ8qP/3RLDVBwBFoWAwCtgcDZJVwA5LUJRZU8x2YFfKNuFq161wK3cuGrALu5yiPu+vzwTAg/sMWVNeWeNyaw==",
"deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-private-property-in-object instead.",
"dev": true,
"dependencies": {
"@babel/helper-annotate-as-pure": "^7.18.6",
"@babel/helper-create-class-features-plugin": "^7.21.0",
"@babel/helper-plugin-utils": "^7.20.2",
"@babel/plugin-syntax-private-property-in-object": "^7.14.5"
},
"engines": {
"node": ">=6.9.0"
},
@ -1900,6 +1911,17 @@
"@babel/core": "^7.0.0-0"
}
},
"node_modules/@babel/preset-env/node_modules/@babel/plugin-proposal-private-property-in-object": {
"version": "7.21.0-placeholder-for-preset-env.2",
"resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz",
"integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==",
"engines": {
"node": ">=6.9.0"
},
"peerDependencies": {
"@babel/core": "^7.0.0-0"
}
},
"node_modules/@babel/preset-env/node_modules/semver": {
"version": "6.3.1",
"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
@ -3800,14 +3822,6 @@
"url": "https://opencollective.com/popperjs"
}
},
"node_modules/@remix-run/router": {
"version": "1.14.2",
"resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.14.2.tgz",
"integrity": "sha512-ACXpdMM9hmKZww21yEqWwiLws/UPLhNKvimN8RrYSqPSvB3ov7sLvAcfvaxePeLvccTQKGdkDIhLYApZVDFuKg==",
"engines": {
"node": ">=14.0.0"
}
},
"node_modules/@rollup/plugin-babel": {
"version": "5.3.1",
"resolved": "https://registry.npmjs.org/@rollup/plugin-babel/-/plugin-babel-5.3.1.tgz",
@ -4130,6 +4144,7 @@
"version": "9.3.4",
"resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-9.3.4.tgz",
"integrity": "sha512-FlS4ZWlp97iiNWig0Muq8p+3rVDjRiYE+YKGbAqXOu9nwJFFOdL00kFpz42M+4huzYi86vAK1sOOfyOG45muIQ==",
"dev": true,
"peer": true,
"dependencies": {
"@babel/code-frame": "^7.10.4",
@ -4149,6 +4164,7 @@
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"dev": true,
"peer": true,
"dependencies": {
"color-convert": "^2.0.1"
@ -4164,6 +4180,7 @@
"version": "5.1.3",
"resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz",
"integrity": "sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==",
"dev": true,
"peer": true,
"dependencies": {
"deep-equal": "^2.0.5"
@ -4173,6 +4190,7 @@
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
"dev": true,
"peer": true,
"dependencies": {
"ansi-styles": "^4.1.0",
@ -4189,6 +4207,7 @@
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"dev": true,
"peer": true,
"dependencies": {
"color-name": "~1.1.4"
@ -4201,12 +4220,14 @@
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
"dev": true,
"peer": true
},
"node_modules/@testing-library/dom/node_modules/has-flag": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
"dev": true,
"peer": true,
"engines": {
"node": ">=8"
@ -4216,6 +4237,7 @@
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
"dev": true,
"peer": true,
"dependencies": {
"has-flag": "^4.0.0"
@ -4228,6 +4250,7 @@
"version": "5.17.0",
"resolved": "https://registry.npmjs.org/@testing-library/jest-dom/-/jest-dom-5.17.0.tgz",
"integrity": "sha512-ynmNeT7asXyH3aSVv4vvX4Rb+0qjOhdNHnO/3vuZNqPmhDpV/+rCSGwQ7bLcmU2cJ4dvoheIO85LQj0IbJHEtg==",
"dev": true,
"dependencies": {
"@adobe/css-tools": "^4.0.1",
"@babel/runtime": "^7.9.2",
@ -4249,6 +4272,7 @@
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"dev": true,
"dependencies": {
"color-convert": "^2.0.1"
},
@ -4263,6 +4287,7 @@
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
"integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
"dev": true,
"dependencies": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
@ -4275,6 +4300,7 @@
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"dev": true,
"dependencies": {
"color-name": "~1.1.4"
},
@ -4285,12 +4311,14 @@
"node_modules/@testing-library/jest-dom/node_modules/color-name": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
"dev": true
},
"node_modules/@testing-library/jest-dom/node_modules/has-flag": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
"dev": true,
"engines": {
"node": ">=8"
}
@ -4299,6 +4327,7 @@
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
"dev": true,
"dependencies": {
"has-flag": "^4.0.0"
},
@ -4310,6 +4339,7 @@
"version": "13.4.0",
"resolved": "https://registry.npmjs.org/@testing-library/react/-/react-13.4.0.tgz",
"integrity": "sha512-sXOGON+WNTh3MLE9rve97ftaZukN3oNf2KjDy7YTx6hcTO2uuLHuCGynMDhFwGw/jYf4OJ2Qk0i4i79qMNNkyw==",
"dev": true,
"dependencies": {
"@babel/runtime": "^7.12.5",
"@testing-library/dom": "^8.5.0",
@ -4327,6 +4357,7 @@
"version": "8.20.1",
"resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-8.20.1.tgz",
"integrity": "sha512-/DiOQ5xBxgdYRC8LNk7U+RWat0S3qRLeIw3ZIkMQ9kkVlRmwD/Eg8k8CqIpD6GW7u20JIUOfMKbxtiLutpjQ4g==",
"dev": true,
"dependencies": {
"@babel/code-frame": "^7.10.4",
"@babel/runtime": "^7.12.5",
@ -4345,6 +4376,7 @@
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"dev": true,
"dependencies": {
"color-convert": "^2.0.1"
},
@ -4359,6 +4391,7 @@
"version": "5.1.3",
"resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.1.3.tgz",
"integrity": "sha512-R5iJ5lkuHybztUfuOAznmboyjWq8O6sqNqtK7CLOqdydi54VNbORp49mb14KbWgG1QD3JFO9hJdZ+y4KutfdOQ==",
"dev": true,
"dependencies": {
"deep-equal": "^2.0.5"
}
@ -4367,6 +4400,7 @@
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
"dev": true,
"dependencies": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
@ -4382,6 +4416,7 @@
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"dev": true,
"dependencies": {
"color-name": "~1.1.4"
},
@ -4392,12 +4427,14 @@
"node_modules/@testing-library/react/node_modules/color-name": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
"dev": true
},
"node_modules/@testing-library/react/node_modules/has-flag": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
"dev": true,
"engines": {
"node": ">=8"
}
@ -4406,6 +4443,7 @@
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
"dev": true,
"dependencies": {
"has-flag": "^4.0.0"
},
@ -4417,6 +4455,7 @@
"version": "13.5.0",
"resolved": "https://registry.npmjs.org/@testing-library/user-event/-/user-event-13.5.0.tgz",
"integrity": "sha512-5Kwtbo3Y/NowpkbRuSepbyMFkZmHgD+vPzYB/RJ4oxt5Gj/avFFBYjhw27cqSVPVw/3a67NK1PbiIr9k4Gwmdg==",
"dev": true,
"dependencies": {
"@babel/runtime": "^7.12.5"
},
@ -4447,7 +4486,8 @@
"node_modules/@types/aria-query": {
"version": "5.0.4",
"resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.4.tgz",
"integrity": "sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw=="
"integrity": "sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==",
"dev": true
},
"node_modules/@types/babel__core": {
"version": "7.20.5",
@ -4616,6 +4656,7 @@
"version": "27.5.2",
"resolved": "https://registry.npmjs.org/@types/jest/-/jest-27.5.2.tgz",
"integrity": "sha512-mpT8LJJ4CMeeahobofYWIjFo0xonRS/HfxnVEPMPFSQdGUt1uHCnoPT7Zhb+sjDU2wz0oKV0OLUR0WzrHNgfeA==",
"dev": true,
"dependencies": {
"jest-matcher-utils": "^27.0.0",
"pretty-format": "^27.0.0"
@ -4772,6 +4813,7 @@
"version": "5.14.9",
"resolved": "https://registry.npmjs.org/@types/testing-library__jest-dom/-/testing-library__jest-dom-5.14.9.tgz",
"integrity": "sha512-FSYhIjFlfOpGSRyVoMBMuS3ws5ehFQODymf3vlI7U1K8c7PHwWwFY7VREfmsuzHSOnoKs/9/Y983ayOs7eRzqw==",
"dev": true,
"dependencies": {
"@types/jest": "*"
}
@ -6883,7 +6925,8 @@
"node_modules/css.escape": {
"version": "1.5.1",
"resolved": "https://registry.npmjs.org/css.escape/-/css.escape-1.5.1.tgz",
"integrity": "sha512-YUifsXXuknHlUsmlgyY0PKzgPOr7/FjCePfHNt0jxm83wHZi44VDMQ7/fGNkjY3/jV1MC+1CmZbaHzugyeRtpg=="
"integrity": "sha512-YUifsXXuknHlUsmlgyY0PKzgPOr7/FjCePfHNt0jxm83wHZi44VDMQ7/fGNkjY3/jV1MC+1CmZbaHzugyeRtpg==",
"dev": true
},
"node_modules/cssdb": {
"version": "7.10.0",
@ -7094,6 +7137,7 @@
"version": "2.2.3",
"resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-2.2.3.tgz",
"integrity": "sha512-ZIwpnevOurS8bpT4192sqAowWM76JDKSHYzMLty3BZGSswgq6pBaH3DhCSW5xVAZICZyKdOBPjwww5wfgT/6PA==",
"dev": true,
"dependencies": {
"array-buffer-byte-length": "^1.0.0",
"call-bind": "^1.0.5",
@ -7311,7 +7355,8 @@
"node_modules/dom-accessibility-api": {
"version": "0.5.16",
"resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz",
"integrity": "sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg=="
"integrity": "sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==",
"dev": true
},
"node_modules/dom-converter": {
"version": "0.2.0",
@ -7586,6 +7631,7 @@
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/es-get-iterator/-/es-get-iterator-1.1.3.tgz",
"integrity": "sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==",
"dev": true,
"dependencies": {
"call-bind": "^1.0.2",
"get-intrinsic": "^1.1.3",
@ -8993,19 +9039,6 @@
"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
"integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
},
"node_modules/fsevents": {
"version": "2.3.3",
"resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
"integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
"hasInstallScript": true,
"optional": true,
"os": [
"darwin"
],
"engines": {
"node": "^8.16.0 || ^10.6.0 || >=11.0.0"
}
},
"node_modules/function-bind": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
@ -9662,7 +9695,8 @@
"node_modules/immutable": {
"version": "4.3.4",
"resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.4.tgz",
"integrity": "sha512-fsXeu4J4i6WNWSikpI88v/PcVflZz+6kMhUfIwc5SY+poQRPnaf5V7qds6SUyUN3cVxEzuCab7QIoLOQ+DQ1wA=="
"integrity": "sha512-fsXeu4J4i6WNWSikpI88v/PcVflZz+6kMhUfIwc5SY+poQRPnaf5V7qds6SUyUN3cVxEzuCab7QIoLOQ+DQ1wA==",
"devOptional": true
},
"node_modules/import-fresh": {
"version": "3.3.0",
@ -9717,6 +9751,7 @@
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
"integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
"dev": true,
"engines": {
"node": ">=8"
}
@ -9765,6 +9800,7 @@
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz",
"integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==",
"dev": true,
"dependencies": {
"call-bind": "^1.0.2",
"has-tostringtag": "^1.0.0"
@ -12648,6 +12684,7 @@
"version": "1.5.0",
"resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.5.0.tgz",
"integrity": "sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==",
"dev": true,
"bin": {
"lz-string": "bin/bin.js"
}
@ -12794,6 +12831,7 @@
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
"integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
"dev": true,
"engines": {
"node": ">=4"
}
@ -13084,6 +13122,7 @@
"version": "1.1.5",
"resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz",
"integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==",
"dev": true,
"dependencies": {
"call-bind": "^1.0.2",
"define-properties": "^1.1.3"
@ -15225,36 +15264,6 @@
"node": ">=0.10.0"
}
},
"node_modules/react-router": {
"version": "6.21.3",
"resolved": "https://registry.npmjs.org/react-router/-/react-router-6.21.3.tgz",
"integrity": "sha512-a0H638ZXULv1OdkmiK6s6itNhoy33ywxmUFT/xtSoVyf9VnC7n7+VT4LjVzdIHSaF5TIh9ylUgxMXksHTgGrKg==",
"dependencies": {
"@remix-run/router": "1.14.2"
},
"engines": {
"node": ">=14.0.0"
},
"peerDependencies": {
"react": ">=16.8"
}
},
"node_modules/react-router-dom": {
"version": "6.21.3",
"resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-6.21.3.tgz",
"integrity": "sha512-kNzubk7n4YHSrErzjLK72j0B5i969GsuCGazRl3G6j1zqZBLjuSlYBdVdkDOgzGdPIffUOc9nmgiadTEVoq91g==",
"dependencies": {
"@remix-run/router": "1.14.2",
"react-router": "6.21.3"
},
"engines": {
"node": ">=14.0.0"
},
"peerDependencies": {
"react": ">=16.8",
"react-dom": ">=16.8"
}
},
"node_modules/react-scripts": {
"version": "5.0.1",
"resolved": "https://registry.npmjs.org/react-scripts/-/react-scripts-5.0.1.tgz",
@ -15389,6 +15398,7 @@
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/redent/-/redent-3.0.0.tgz",
"integrity": "sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==",
"dev": true,
"dependencies": {
"indent-string": "^4.0.0",
"strip-indent": "^3.0.0"
@ -15834,6 +15844,7 @@
"version": "1.70.0",
"resolved": "https://registry.npmjs.org/sass/-/sass-1.70.0.tgz",
"integrity": "sha512-uUxNQ3zAHeAx5nRFskBnrWzDUJrrvpCPD5FNAoRvTi0WwremlheES3tg+56PaVtCs5QDRX5CBLxxKMDJMEa1WQ==",
"devOptional": true,
"dependencies": {
"chokidar": ">=3.0.0 <4.0.0",
"immutable": "^4.0.0",
@ -16437,6 +16448,7 @@
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.0.0.tgz",
"integrity": "sha512-iCGQj+0l0HOdZ2AEeBADlsRC+vsnDsZsbdSiH1yNSjcfKM7fdpCMfqAL/dwF5BLiw/XhRft/Wax6zQbhq2BcjQ==",
"dev": true,
"dependencies": {
"internal-slot": "^1.0.4"
},
@ -16631,6 +16643,7 @@
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-3.0.0.tgz",
"integrity": "sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==",
"dev": true,
"dependencies": {
"min-indent": "^1.0.0"
},

View File

@ -7,25 +7,19 @@
"@emotion/styled": "^11.11.0",
"@mui/icons-material": "^5.15.6",
"@mui/material": "^5.15.6",
"@testing-library/jest-dom": "^5.17.0",
"@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^13.5.0",
"@types/jest": "^27.5.2",
"@types/node": "^16.18.75",
"@types/react": "^18.2.48",
"@types/react-dom": "^18.2.18",
"axios": "^1.6.5",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-router-dom": "^6.21.3",
"react-scripts": "5.0.1",
"sass": "^1.70.0",
"typescript": "^4.9.5",
"web-vitals": "^2.1.4"
},
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"build": "GENERATE_SOURCEMAP=false react-scripts build",
"test": "react-scripts test",
"eject": "react-scripts eject"
},
@ -46,5 +40,13 @@
"last 1 firefox version",
"last 1 safari version"
]
},
"devDependencies": {
"sass": "^1.70.0",
"@testing-library/jest-dom": "^5.17.0",
"@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^13.5.0",
"@types/jest": "^27.5.2",
"@babel/plugin-proposal-private-property-in-object": "^7.21.11"
}
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.8 KiB

BIN
public/favicon.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.4 KiB

View File

@ -3,12 +3,11 @@
<head>
<meta charset="utf-8" />
<link rel="icon" href="%PUBLIC_URL%/favicon.ico" />
<link rel="icon" href="%PUBLIC_URL%/favicon.png" />
<meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#000000" />
<meta name="description" content="Web site created using create-react-app" />
<meta name="description" content="Pingator as service checker for cloud services" />
<link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
<title>React App</title>
<title>Pingator</title>
</head>
<body>

View File

@ -1,10 +1,10 @@
{
"short_name": "React App",
"name": "Create React App Sample",
"short_name": "Pingator",
"name": "Pingator",
"icons": [
{
"src": "favicon.ico",
"sizes": "64x64 32x32 24x24 16x16",
"src": "favicon.png",
"sizes": "64x64",
"type": "image/x-icon"
}
],

View File

@ -1,3 +1,3 @@
# https://www.robotstxt.org/robotstxt.html
User-agent: *
Disallow:
Disallow: *

View File

@ -1,38 +0,0 @@
.App {
text-align: center;
}
.App-logo {
height: 40vmin;
pointer-events: none;
}
@media (prefers-reduced-motion: no-preference) {
.App-logo {
animation: App-logo-spin infinite 20s linear;
}
}
.App-header {
background-color: #282c34;
min-height: 100vh;
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
font-size: calc(10px + 2vmin);
color: white;
}
.App-link {
color: #61dafb;
}
@keyframes App-logo-spin {
from {
transform: rotate(0deg);
}
to {
transform: rotate(360deg);
}
}

View File

@ -1,9 +0,0 @@
import React from 'react';
import { render, screen } from '@testing-library/react';
import App from './App';
test('renders learn react link', () => {
render(<App />);
const linkElement = screen.getByText(/learn react/i);
expect(linkElement).toBeInTheDocument();
});

View File

@ -1,18 +1,17 @@
import React from "react";
import { ThemeProvider } from "@mui/material";
import { theme } from "./theme";
import { Routes, Route } from "react-router-dom";
import AppHeader from "./components/AppHeader";
import Home from "./routes/Home";
import ThemeProvider from "@mui/material/styles/ThemeProvider";
import { GlobalStateProvider } from "./GlobalStateProvider";
import Dashboard from "components/Dashboard";
function App() {
return (
<ThemeProvider theme={theme}>
<GlobalStateProvider>
<AppHeader />
<Routes>
<Route path="/" element={<Home />} />
{/* <Route path="*" element={<NotFound404 />} /> */}
</Routes>
<Dashboard />
</GlobalStateProvider>
</ThemeProvider>
);
}

View File

@ -0,0 +1,32 @@
import React, { Dispatch, SetStateAction, createContext, useContext, useState } from "react";
// how to: Typesafe Global State with TypeScript, React & React Context
// https://jamiehaywood.medium.com/typesafe-global-state-with-typescript-react-react-context-c2df743f3ce
interface GlobalState {
searchFilter: string;
}
export const GlobalStateContext = createContext({
state: {} as Partial<GlobalState>,
setState: {} as Dispatch<SetStateAction<Partial<GlobalState>>>,
});
export const GlobalStateProvider = ({
children,
value = {} as GlobalState,
}: {
children: React.ReactNode;
value?: Partial<GlobalState>;
}) => {
const [state, setState] = useState(value);
return <GlobalStateContext.Provider value={{ state, setState }}>{children}</GlobalStateContext.Provider>;
};
export const useGlobalState = () => {
const context = useContext(GlobalStateContext);
if (!context) {
throw new Error("useGlobalState must be used within a GlobalStateContext");
}
return context;
};

View File

@ -1,17 +1,57 @@
import React from "react";
import { Container, Typography } from "@mui/material";
import Stack from "@mui/material/Stack";
import RadarIcon from "@mui/icons-material/Radar";
import Container from "@mui/material/Container";
import Typography from "@mui/material/Typography";
import TextField from "@mui/material/TextField";
import InputAdornment from "@mui/material/InputAdornment";
import IconButton from "@mui/material/IconButton";
import CancelIcon from "@mui/icons-material/Cancel";
import { useGlobalState } from "GlobalStateProvider";
export default function AppHeader() {
const [searchValue, setSearchValue] = React.useState("");
const { setState: setGlobalState } = useGlobalState();
const handleSearchInputChange = (event: React.ChangeEvent<HTMLTextAreaElement | HTMLInputElement>) => {
const searchFilter = event.currentTarget.value;
setGlobalState({
searchFilter,
});
setSearchValue(event.currentTarget.value);
};
const handleClearSearchInputClick = () => {
setSearchValue("");
setGlobalState({
searchFilter: "",
});
};
return (
<>
<Container maxWidth={false} className="app-header">
<Stack direction="row" justifyContent="flex-start" alignItems="center" spacing={2}>
<RadarIcon fontSize="large" className="icon" />
<Typography component="h1">pingator</Typography>
<TextField
className="search-input"
type="text"
sx={{ backgroundColor: "white", marginLeft: "auto" }}
label="Search"
variant="filled"
onChange={handleSearchInputChange}
value={searchValue}
InputProps={{
endAdornment: (
<InputAdornment position="end">
<IconButton size="small" onClick={handleClearSearchInputClick}>
<CancelIcon />
</IconButton>
</InputAdornment>
),
}}
/>
</Stack>
</Container>
</>
);
}

View File

@ -1,12 +1,12 @@
import React from "react";
import EnvTabsContainer from "./EnvTabsContainer";
import EnvTabsSwitcher from "./EnvTabsSwitcher";
import LoadingIndicator from "./LoadingIndicator";
import { DashboardLoadError, DashboardResponseContent, EnvTab, Environment } from "../types";
import { ENVIRONMENT_TABS } from "../const";
import { dashboardApi } from "../api";
import { DashboardLoadError, DashboardResponseContent, EnvTab, Environment } from "types";
import { ENVIRONMENT_TABS } from "const";
import { dashboardApi } from "api";
import { AxiosError } from "axios";
import LoadingError from "./LoadingError";
import EnvironmentList from "./dashboard/EnvironmentList";
import LoadingError from "components/LoadingError";
import EnvironmentList from "components/dashboard/EnvironmentList";
export default function Dashboard() {
const defaultEnv = ENVIRONMENT_TABS[0];
@ -25,12 +25,11 @@ export default function Dashboard() {
};
const loadEnv = (envTab: EnvTab) => {
console.log("loading env:", envTab);
setLoadingErr(null);
setLoadingEnv(true);
dashboardApi
.getFake(envTab.dashboardEndpoint)
.get(envTab.dashboardEndpoint)
.then((response) => {
return response.data.content;
})
@ -52,7 +51,7 @@ export default function Dashboard() {
return (
<>
<LoadingIndicator active={loadingEnv} />
<EnvTabsContainer selectedEnv={selectedEnv} onSelect={onSelectEnvTab} />
<EnvTabsSwitcher selectedEnv={selectedEnv} onSelect={onSelectEnvTab} />
{loadingErr && <LoadingError error={loadingErr} />}
{activeEnvironments && <EnvironmentList environments={activeEnvironments} />}
</>

View File

@ -2,19 +2,19 @@ import React from "react";
import Tabs from "@mui/material/Tabs";
import Tab from "@mui/material/Tab";
import Box from "@mui/material/Box";
import { ENVIRONMENT_TABS } from "../const";
import { EnvTab } from "../types";
import { ENVIRONMENT_TABS } from "const";
import { EnvTab } from "types";
interface OnSelectTab {
(tab: EnvTab): void;
}
interface EnvTabsContainerProps {
interface EnvTabsSwitcherProps {
selectedEnv: EnvTab;
onSelect: OnSelectTab;
}
export default function EnvTabsContainer({ selectedEnv, onSelect }: EnvTabsContainerProps) {
export default function EnvTabsSwitcher({ selectedEnv, onSelect }: EnvTabsSwitcherProps) {
const [selected, setSelected] = React.useState(selectedEnv);
const handleChange = (event: React.SyntheticEvent, newValue: EnvTab) => {
@ -27,12 +27,10 @@ export default function EnvTabsContainer({ selectedEnv, onSelect }: EnvTabsConta
});
return (
<Box sx={{ width: "100%", marginBottom: "2rem" }}>
<Box sx={{ borderBottom: 1, borderColor: "divider" }}>
<Box className="env-tab-switcher">
<Tabs value={selected} onChange={handleChange}>
{tabs}
</Tabs>
</Box>
</Box>
);
}

View File

@ -1,7 +1,8 @@
import React from "react";
import { DashboardLoadError } from "../types";
import { DashboardLoadError } from "types";
import Alert from "@mui/material/Alert";
import AlertTitle from "@mui/material/AlertTitle";
import Paper from "@mui/material/Paper";
interface LoadingErrorProps {
error: DashboardLoadError;
@ -9,9 +10,11 @@ interface LoadingErrorProps {
export default function LoadingError({ error }: LoadingErrorProps) {
return (
<Alert severity="error">
<AlertTitle>{error.message}</AlertTitle>
<Paper className="loading-error-container">
<Alert className="loading-error-alert" severity="error">
<AlertTitle className="loading-error-alert-title">{error.message}</AlertTitle>
<p>URL: {error.url}</p>
</Alert>
</Paper>
);
}

View File

@ -1,24 +1,49 @@
import React from "react";
import { Environment } from "../../types";
import TenantList from "./TenantList";
import { Environment } from "types";
import TenantList, { tenantHasServices } from "components/dashboard/TenantList";
import Typography from "@mui/material/Typography";
import Box from "@mui/material/Box";
import Container from "@mui/material/Container";
import { useGlobalState } from "GlobalStateProvider";
function environmentHasTenants(env: Environment): boolean {
return env.tenants.filter((tenant) => tenantHasServices(tenant)).length > 0;
}
interface EnvironmentListProps {
environments: Environment[];
}
export default function EnvironmentList({ environments }: EnvironmentListProps) {
const envItems = environments.map((env) => {
let filteredEnvironments: Environment[] = [];
const { state } = useGlobalState();
// deep clone array
filteredEnvironments = JSON.parse(JSON.stringify(environments));
// filter services
filteredEnvironments.forEach((env) => {
env.tenants.forEach((tenant) => {
tenant.services = tenant.services.filter(
(service) =>
!state.searchFilter ||
service.name.toLocaleLowerCase().includes(state.searchFilter.toLocaleLowerCase())
);
});
});
// remove empty environments
filteredEnvironments = filteredEnvironments.filter((env) => environmentHasTenants(env));
const envItems = filteredEnvironments.map((env) => {
return (
<Box className="environment" key={env.name} sx={{ marginBottom: "2rem" }}>
<Typography variant={"h2"} key={env.name} className="title">
<Typography component="span" variant={"h5"} key={env.name} sx={{ marginRight: "1rem" }}>
environment:
</Typography>
<Container maxWidth={false} className="main-container">
<Typography variant={"h2"} key={env.name} className="environment-name">
{env.name}
</Typography>
<TenantList tenants={env.tenants} />
</Container>
</Box>
);
});

View File

@ -1,15 +1,13 @@
import React from "react";
import { Service, Node, StatusPerTenant } from "../../types";
import React, { ReactElement } from "react";
import { Service, Node, StatusPerTenant } from "types";
import Typography from "@mui/material/Typography";
import Card from "@mui/material/Card";
import CardContent from "@mui/material/CardContent";
import Stack from "@mui/material/Stack";
import IconButton from "@mui/material/IconButton";
import LaunchIcon from "@mui/icons-material/Launch";
import Tooltip from "@mui/material/Tooltip";
import Chip from "@mui/material/Chip";
import Grid from "@mui/material/Unstable_Grid2";
import Box from "@mui/material/Box";
import Link from "@mui/material/Link";
import Avatar from "@mui/material/Avatar";
interface ServiceCardProps {
service: Service;
@ -23,71 +21,85 @@ function normalizeServiceName(name: string): string {
.replace(/\b\w/g, (s) => s.toUpperCase());
}
function TenantsStatusTooltip(tenantsStatus: StatusPerTenant) {}
function getNodeNameElement(node: Node): React.ReactElement {
let statusMessage;
const statusOk = node.health_check_status?.status_ok;
if (statusOk) {
statusMessage = `Node ${node.name} is healthy`;
} else {
statusMessage = node.health_check_status?.message;
}
return (
<Tooltip title={statusMessage}>
<Avatar variant="square" className="node-name">
{node.name}
</Avatar>
</Tooltip>
);
}
interface TenantsStatusProps {
statusPerTenant: StatusPerTenant | null;
}
function TenantsStatus({ statusPerTenant }: TenantsStatusProps) {
if (!statusPerTenant) return <></>;
let statuses: ReactElement[] = [];
for (const [tenantId, statusOk] of Object.entries(statusPerTenant)) {
statuses.push(
<Typography
key={tenantId}
component="div"
className={`tenant-status ${statusOk ? "status-ok" : "status-error"}`}
>
{tenantId}
</Typography>
);
}
return (
<Stack direction="row" spacing={1} className="tenants-status-container">
<Typography component="div" className="tenants-status-title">
Tenants
</Typography>
{statuses}
</Stack>
);
}
interface ServiceNodePropps {
node: Node;
}
function ServiceNode({ node }: ServiceNodePropps) {
const nodeName = node.health_check_status?.status_ok ? (
<Tooltip title={`Node ${node.name} is healthy`}>
<Chip label={node.name} color="success" className="node-name" />
</Tooltip>
) : (
<Tooltip title={node.health_check_status?.message}>
<Chip label={node.name} color="error" className="node-name" />
</Tooltip>
const nodeUrl = node.url.replace("http://", "").replace("https://", "");
const statusOk = node.health_check_status?.status_ok;
const version = <Typography className="version">{node.app_details?.app_version || "no version"}</Typography>;
let templateName = null;
if (node.app_details?.template_name && node.app_details?.template_version) {
templateName = (
<Typography className="template">
{node.app_details?.template_name} {node.app_details?.template_version}
</Typography>
);
let tenantsHealth: boolean[] = [];
if (node.health_check_status?.status_per_tenant) {
tenantsHealth = Object.values(node.health_check_status?.status_per_tenant);
}
let tenantsStatus = null;
if (tenantsHealth.length > 0) {
const okValues = tenantsHealth.filter((t) => t === true);
switch (okValues.length) {
case 0:
tenantsStatus = (
<Tooltip
title={
<Box className="tenants-status-tooltip">
<Typography color="inherit">Tooltip with HTML</Typography>
<em>{"And here's"}</em> <b>{"some"}</b> <u>{"amazing content"}</u>.{" "}
{"It's very engaging. Right?"}
</Box>
}
>
<Chip label="tenants" color="error" className="node-name" />
</Tooltip>
);
break;
case tenantsHealth.length:
tenantsStatus = <Chip label="tenants" color="success" className="node-name" />;
break;
default:
tenantsStatus = <Chip label="tenants" color="warning" className="node-name" />;
}
}
return (
<Grid container spacing={2} className="service-node" sx={{ alignItems: "center" }}>
<Grid xs={2}>{nodeName}</Grid>
<Grid xs={6}>
<Typography className="version">{node.app_details?.app_version || "no version"}</Typography>
</Grid>
<Grid xs={4} sx={{ textAlign: "right" }} className="status">
<Tooltip title={node.url}>
<IconButton target="_blank" href={node.url} className="docs-url">
<LaunchIcon />
</IconButton>
</Tooltip>
{tenantsStatus}
</Grid>
</Grid>
<Stack direction="row" className={`service-node ${statusOk ? "status-ok" : "status-error"}`}>
<Box>{getNodeNameElement(node)}</Box>
<Box className="node-details">
{version}
{templateName}
<Link href={node.url} target="_blank">
{nodeUrl}
</Link>
<TenantsStatus statusPerTenant={node.health_check_status?.status_per_tenant} />
</Box>
</Stack>
);
}

View File

@ -1,5 +1,5 @@
import React from "react";
import { Service } from "../../types";
import { Service } from "types";
import Grid from "@mui/material/Unstable_Grid2";
import ServiceCard from "./ServiceCard";
@ -17,7 +17,7 @@ export default function ServiceList({ services }: ServiceListProps) {
});
return (
<Grid container rowSpacing={2} columnSpacing={2} className="service-list" sx={{ marginBottom: "1rem" }}>
<Grid container rowSpacing={2} columnSpacing={2} className="service-list">
{serviceItems}
</Grid>
);

View File

@ -1,5 +1,5 @@
import React from "react";
import { Tenant } from "../../types";
import { Tenant } from "types";
import Box from "@mui/material/Box";
import Typography from "@mui/material/Typography";
import ServiceList from "./ServiceList";
@ -8,8 +8,14 @@ interface TenantListProps {
tenants: Tenant[];
}
export function tenantHasServices(tenant: Tenant): boolean {
return tenant.services.length > 0;
}
export default function TenantList({ tenants }: TenantListProps) {
const tenantItems = tenants.map((tenant) => {
if (!tenantHasServices(tenant)) return null;
const tenantName = tenant.name !== "default" ? `Tenant: ${tenant.name}` : "Multitenant";
return (
<Box key={tenant.name} className="tenant">

View File

@ -11,4 +11,9 @@ export const ENVIRONMENT_TABS: EnvTab[] = [
id: "qa",
dashboardEndpoint: "https://intis-service-checker.qa.televendcloud.com/api/checker/v1/dashboard",
},
{
title: "UAT",
id: "uat",
dashboardEndpoint: "https://intis-service-checker.uat.televendcloud.com/api/checker/v1/dashboard",
},
];

View File

@ -1,13 +0,0 @@
body {
margin: 0;
font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', 'Roboto', 'Oxygen',
'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
}
code {
font-family: source-code-pro, Menlo, Monaco, Consolas, 'Courier New',
monospace;
}

View File

@ -1,14 +1,11 @@
import React from "react";
import ReactDOM from "react-dom/client";
import { BrowserRouter as Router } from "react-router-dom";
import App from "./App";
import "./scss/styles.scss";
const root = ReactDOM.createRoot(document.getElementById("root") as HTMLElement);
root.render(
<React.StrictMode>
<Router>
<App />
</Router>{" "}
</React.StrictMode>
);

View File

@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 841.9 595.3"><g fill="#61DAFB"><path d="M666.3 296.5c0-32.5-40.7-63.3-103.1-82.4 14.4-63.6 8-114.2-20.2-130.4-6.5-3.8-14.1-5.6-22.4-5.6v22.3c4.6 0 8.3.9 11.4 2.6 13.6 7.8 19.5 37.5 14.9 75.7-1.1 9.4-2.9 19.3-5.1 29.4-19.6-4.8-41-8.5-63.5-10.9-13.5-18.5-27.5-35.3-41.6-50 32.6-30.3 63.2-46.9 84-46.9V78c-27.5 0-63.5 19.6-99.9 53.6-36.4-33.8-72.4-53.2-99.9-53.2v22.3c20.7 0 51.4 16.5 84 46.6-14 14.7-28 31.4-41.3 49.9-22.6 2.4-44 6.1-63.6 11-2.3-10-4-19.7-5.2-29-4.7-38.2 1.1-67.9 14.6-75.8 3-1.8 6.9-2.6 11.5-2.6V78.5c-8.4 0-16 1.8-22.6 5.6-28.1 16.2-34.4 66.7-19.9 130.1-62.2 19.2-102.7 49.9-102.7 82.3 0 32.5 40.7 63.3 103.1 82.4-14.4 63.6-8 114.2 20.2 130.4 6.5 3.8 14.1 5.6 22.5 5.6 27.5 0 63.5-19.6 99.9-53.6 36.4 33.8 72.4 53.2 99.9 53.2 8.4 0 16-1.8 22.6-5.6 28.1-16.2 34.4-66.7 19.9-130.1 62-19.1 102.5-49.9 102.5-82.3zm-130.2-66.7c-3.7 12.9-8.3 26.2-13.5 39.5-4.1-8-8.4-16-13.1-24-4.6-8-9.5-15.8-14.4-23.4 14.2 2.1 27.9 4.7 41 7.9zm-45.8 106.5c-7.8 13.5-15.8 26.3-24.1 38.2-14.9 1.3-30 2-45.2 2-15.1 0-30.2-.7-45-1.9-8.3-11.9-16.4-24.6-24.2-38-7.6-13.1-14.5-26.4-20.8-39.8 6.2-13.4 13.2-26.8 20.7-39.9 7.8-13.5 15.8-26.3 24.1-38.2 14.9-1.3 30-2 45.2-2 15.1 0 30.2.7 45 1.9 8.3 11.9 16.4 24.6 24.2 38 7.6 13.1 14.5 26.4 20.8 39.8-6.3 13.4-13.2 26.8-20.7 39.9zm32.3-13c5.4 13.4 10 26.8 13.8 39.8-13.1 3.2-26.9 5.9-41.2 8 4.9-7.7 9.8-15.6 14.4-23.7 4.6-8 8.9-16.1 13-24.1zM421.2 430c-9.3-9.6-18.6-20.3-27.8-32 9 .4 18.2.7 27.5.7 9.4 0 18.7-.2 27.8-.7-9 11.7-18.3 22.4-27.5 32zm-74.4-58.9c-14.2-2.1-27.9-4.7-41-7.9 3.7-12.9 8.3-26.2 13.5-39.5 4.1 8 8.4 16 13.1 24 4.7 8 9.5 15.8 14.4 23.4zM420.7 163c9.3 9.6 18.6 20.3 27.8 32-9-.4-18.2-.7-27.5-.7-9.4 0-18.7.2-27.8.7 9-11.7 18.3-22.4 27.5-32zm-74 58.9c-4.9 7.7-9.8 15.6-14.4 23.7-4.6 8-8.9 16-13 24-5.4-13.4-10-26.8-13.8-39.8 13.1-3.1 26.9-5.8 41.2-7.9zm-90.5 125.2c-35.4-15.1-58.3-34.9-58.3-50.6 0-15.7 22.9-35.6 58.3-50.6 8.6-3.7 18-7 27.7-10.1 5.7 19.6 13.2 40 22.5 60.9-9.2 20.8-16.6 41.1-22.2 60.6-9.9-3.1-19.3-6.5-28-10.2zM310 490c-13.6-7.8-19.5-37.5-14.9-75.7 1.1-9.4 2.9-19.3 5.1-29.4 19.6 4.8 41 8.5 63.5 10.9 13.5 18.5 27.5 35.3 41.6 50-32.6 30.3-63.2 46.9-84 46.9-4.5-.1-8.3-1-11.3-2.7zm237.2-76.2c4.7 38.2-1.1 67.9-14.6 75.8-3 1.8-6.9 2.6-11.5 2.6-20.7 0-51.4-16.5-84-46.6 14-14.7 28-31.4 41.3-49.9 22.6-2.4 44-6.1 63.6-11 2.3 10.1 4.1 19.8 5.2 29.1zm38.5-66.7c-8.6 3.7-18 7-27.7 10.1-5.7-19.6-13.2-40-22.5-60.9 9.2-20.8 16.6-41.1 22.2-60.6 9.9 3.1 19.3 6.5 28.1 10.2 35.4 15.1 58.3 34.9 58.3 50.6-.1 15.7-23 35.6-58.4 50.6zM320.8 78.4z"/><circle cx="420.9" cy="296.5" r="45.7"/><path d="M520.5 78.1z"/></g></svg>

Before

Width:  |  Height:  |  Size: 2.6 KiB

View File

@ -1 +0,0 @@
/// <reference types="react-scripts" />

View File

@ -1,11 +0,0 @@
import React from "react";
import Container from "@mui/material/Container";
import Dashboard from "../components/Dashboard";
export default function Home() {
return (
<Container maxWidth={false} className="main-container">
<Dashboard />
</Container>
);
}

View File

@ -1,5 +1,7 @@
@import "vars";
.app-header {
background-color: #15232d;
background-color: $header-background;
color: whitesmoke;
padding: 1rem 0 1rem 0;
box-shadow: 0px 5px 11px 0px rgba(0, 0, 0, 0.31);
@ -20,4 +22,9 @@
}
}
}
.search-input {
background-color: whitesmoke;
margin-left: auto;
}
}

View File

@ -0,0 +1,6 @@
@import "vars";
.env-tab-switcher {
width: 100%;
border-bottom: 1px solid lighten($header-background, 60%);
}

View File

@ -0,0 +1,19 @@
@import "vars";
.environment-list {
.environment {
background-color: lighten($header-background, 75%);
margin-bottom: 3rem;
padding-top: 2rem;
padding-bottom: 2rem;
&:last-child {
margin-bottom: 0;
}
.environment-name {
margin-bottom: 1rem;
color: lighten($header-background, 30%);
}
}
}

View File

@ -0,0 +1,10 @@
.loading-error-container {
margin: 2rem auto;
max-width: 600px;
.loading-error-alert-title {
font-weight: bold;
}
p {
margin-bottom: 0;
}
}

View File

@ -1,12 +1,11 @@
$color-ok: #27cb30;
$color-warning: #ed6c02;
$color-danger: #d32f2f;
@use "sass:color";
@import "vars";
.service-card {
width: 400px;
width: 450px;
.service-title-container {
color: white;
background-color: #15232d;
background-color: lighten($header-background, 20%);
padding: 0.5rem 1rem;
justify-content: space-between;
align-items: center;
@ -29,21 +28,67 @@ $color-danger: #d32f2f;
}
.service-node {
align-items: center;
gap: 0.5rem;
.node-name {
font-weight: bold;
border-radius: 10px;
}
.status {
display: flex;
align-items: center;
.docs-url {
margin-left: auto;
}
.status-icon {
margin-left: 0.5rem;
}
}
}
}
.MuiTooltip-tooltip .tenants-status-tooltip {
.node-details {
border-left: 4px solid #c1c1c1;
padding-left: 0.5rem;
.version {
font-weight: bold;
}
.tenants-status-container {
align-items: center;
margin-top: 0.5rem;
flex-flow: wrap;
.tenants-status-title {
font-weight: bold;
}
.tenant-status {
color: white;
padding: 0.2rem 0.5rem;
border-radius: 10px;
&.status-ok {
background-color: color.change($color-ok, $alpha: 0.6);
}
&.status-error {
background-color: color.change($color-danger, $alpha: 0.6);
}
}
}
}
&.status-ok {
.node-name {
background-color: $color-ok;
}
.node-details {
border-left-color: color.change($color-ok, $alpha: 0.6);
}
}
&.status-error {
.node-name {
background-color: $color-danger;
}
.node-details {
border-left-color: color.change($color-danger, $alpha: 0.6);
}
}
a {
font-family: Verdana, Geneva, Tahoma, sans-serif;
}
}
.MuiCardContent-root {
padding-bottom: 16px !important;
}
}

View File

@ -0,0 +1,2 @@
.service-list {
}

View File

@ -0,0 +1,11 @@
.tenant-list {
.tenant {
margin-bottom: 2rem !important;
&:last-child {
margin-bottom: 0 !important;
}
.tenant-name {
}
}
}

5
src/scss/_vars.scss Normal file
View File

@ -0,0 +1,5 @@
$header-background: #15232d;
$color-ok: #1dad24;
$color-warning: #ed6c02;
$color-danger: #d32f2f;

View File

@ -1,4 +1,10 @@
@import "vars";
@import "common";
@import "app-header";
@import "linear-progress";
@import "loading-error-alert";
@import "env-tabs-switcher";
@import "environment-list";
@import "tenant-list";
@import "service-list";
@import "service-card";

View File

@ -1,5 +0,0 @@
// jest-dom adds custom jest matchers for asserting on DOM nodes.
// allows you to do things like:
// expect(element).toHaveTextContent(/react/i)
// learn more: https://github.com/testing-library/jest-dom
import '@testing-library/jest-dom';

View File

@ -1,4 +1,4 @@
import { createTheme } from "@mui/material";
import createTheme from "@mui/material/styles/createTheme";
const PRIMARY_COLOR = "#0d6efd";
const SECONDARY_COLOR = "#6c757d";

View File

@ -6,7 +6,7 @@ export type EnvTab = {
export type StatusPerTenant = { [tenantId: string]: boolean };
type HealthCheckStatus = {
export type HealthCheckStatus = {
status_ok: boolean;
message: string;
status_per_tenant: StatusPerTenant | null;

View File

@ -1,5 +1,6 @@
{
"compilerOptions": {
"baseUrl": "src",
"target": "es5",
"lib": [
"dom",