Uat

.dockerignore

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

Dockerfile

@@ -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"]

Makefile

@@ -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)

assets/pingator-logo.svg

@@ -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>

package.json

@@ -1,50 +1,52 @@
 {
-  "name": "pingator",
+    "name": "pingator",
-  "version": "0.1.0",
+    "version": "0.1.0",
-  "private": true,
+    "private": true,
-  "dependencies": {
+    "dependencies": {
-    "@emotion/react": "^11.11.3",
+        "@emotion/react": "^11.11.3",
-    "@emotion/styled": "^11.11.0",
+        "@emotion/styled": "^11.11.0",
-    "@mui/icons-material": "^5.15.6",
+        "@mui/icons-material": "^5.15.6",
-    "@mui/material": "^5.15.6",
+        "@mui/material": "^5.15.6",
-    "@testing-library/jest-dom": "^5.17.0",
+        "@types/node": "^16.18.75",
-    "@testing-library/react": "^13.4.0",
+        "@types/react": "^18.2.48",
-    "@testing-library/user-event": "^13.5.0",
+        "@types/react-dom": "^18.2.18",
-    "@types/jest": "^27.5.2",
+        "axios": "^1.6.5",
-    "@types/node": "^16.18.75",
+        "react": "^18.2.0",
-    "@types/react": "^18.2.48",
+        "react-dom": "^18.2.0",
-    "@types/react-dom": "^18.2.18",
+        "react-scripts": "5.0.1",
-    "axios": "^1.6.5",
+        "typescript": "^4.9.5",
-    "react": "^18.2.0",
+        "web-vitals": "^2.1.4"
-    "react-dom": "^18.2.0",
+    },
-    "react-router-dom": "^6.21.3",
+    "scripts": {
-    "react-scripts": "5.0.1",
+        "start": "react-scripts start",
-    "sass": "^1.70.0",
+        "build": "GENERATE_SOURCEMAP=false react-scripts build",
-    "typescript": "^4.9.5",
+        "test": "react-scripts test",
-    "web-vitals": "^2.1.4"
+        "eject": "react-scripts eject"
-  },
+    },
-  "scripts": {
+    "eslintConfig": {
-    "start": "react-scripts start",
+        "extends": [
-    "build": "react-scripts build",
+            "react-app",
-    "test": "react-scripts test",
+            "react-app/jest"
-    "eject": "react-scripts eject"
+        ]
-  },
+    },
-  "eslintConfig": {
+    "browserslist": {
-    "extends": [
+        "production": [
-      "react-app",
+            ">0.2%",
-      "react-app/jest"
+            "not dead",
-    ]
+            "not op_mini all"
-  },
+        ],
-  "browserslist": {
+        "development": [
-    "production": [
+            "last 1 chrome version",
-      ">0.2%",
+            "last 1 firefox version",
-      "not dead",
+            "last 1 safari version"
-      "not op_mini all"
+        ]
-    ],
+    },
-    "development": [
+    "devDependencies": {
-      "last 1 chrome version",
+        "sass": "^1.70.0",
-      "last 1 firefox version",
+        "@testing-library/jest-dom": "^5.17.0",
-      "last 1 safari version"
+        "@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"
+    }
 }

public/index.html

@@ -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="Pingator as service checker for cloud services" />
-    <meta name="description" content="Web site created using create-react-app" />
     <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
-    <title>React App</title>
+    <title>Pingator</title>
 </head>
 
 <body>

public/manifest.json

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

public/robots.txt

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

src/App.css

@@ -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);
-  }
-}

src/App.test.tsx

@@ -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();
-});

src/App.tsx

@@ -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}>
-            <AppHeader />
+            <GlobalStateProvider>
-            <Routes>
+                <AppHeader />
-                <Route path="/" element={<Home />} />
+                <Dashboard />
-                {/* <Route path="*" element={<NotFound404 />} /> */}
+            </GlobalStateProvider>
-            </Routes>
         </ThemeProvider>
     );
 }

src/GlobalStateProvider.tsx

@@ -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;
+};

src/components/AppHeader.tsx

@@ -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">
-            <Container maxWidth={false} className="app-header">
+            <Stack direction="row" justifyContent="flex-start" alignItems="center" spacing={2}>
-                <Stack direction="row" justifyContent="flex-start" alignItems="center" spacing={2}>
+                <RadarIcon fontSize="large" className="icon" />
-                    <RadarIcon fontSize="large" className="icon" />
+                <Typography component="h1">pingator</Typography>
-                    <Typography component="h1">pingator</Typography>
+
-                </Stack>
+                <TextField
-            </Container>
+                    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>
     );
 }

src/components/Dashboard.tsx

@@ -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 { DashboardLoadError, DashboardResponseContent, EnvTab, Environment } from "types";
-import { ENVIRONMENT_TABS } from "../const";
+import { ENVIRONMENT_TABS } from "const";
-import { dashboardApi } from "../api";
+import { dashboardApi } from "api";
 import { AxiosError } from "axios";
-import LoadingError from "./LoadingError";
+import LoadingError from "components/LoadingError";
-import EnvironmentList from "./dashboard/EnvironmentList";
+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} />}
         </>

src/components/EnvTabsSwitcher.tsx

@@ -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 { ENVIRONMENT_TABS } from "const";
-import { EnvTab } from "../types";
+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 className="env-tab-switcher">
-            <Box sx={{ borderBottom: 1, borderColor: "divider" }}>
+            <Tabs value={selected} onChange={handleChange}>
-                <Tabs value={selected} onChange={handleChange}>
+                {tabs}
-                    {tabs}
+            </Tabs>
-                </Tabs>
-            </Box>
         </Box>
     );
 }

src/components/LoadingError.tsx

@@ -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">
+        <Paper className="loading-error-container">
-            <AlertTitle>{error.message}</AlertTitle>
+            <Alert className="loading-error-alert" severity="error">
-            <p>URL: {error.url}</p>
+                <AlertTitle className="loading-error-alert-title">{error.message}</AlertTitle>
-        </Alert>
+                <p>URL: {error.url}</p>
+            </Alert>
+        </Paper>
     );
 }

src/components/dashboard/EnvironmentList.tsx

@@ -1,24 +1,49 @@
 import React from "react";
-import { Environment } from "../../types";
+import { Environment } from "types";
-import TenantList from "./TenantList";
+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">
+                <Container maxWidth={false} className="main-container">
-                    <Typography component="span" variant={"h5"} key={env.name} sx={{ marginRight: "1rem" }}>
+                    <Typography variant={"h2"} key={env.name} className="environment-name">
-                        environment:
+                        {env.name}
                     </Typography>
-                    {env.name}
+                    <TenantList tenants={env.tenants} />
-                </Typography>
+                </Container>
-                <TenantList tenants={env.tenants} />
             </Box>
         );
     });

src/components/dashboard/ServiceCard.tsx

@@ -1,11 +1,10 @@
 import React, { ReactElement } from "react";
-import { Service, Node, StatusPerTenant } from "../../types";
+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 Tooltip from "@mui/material/Tooltip";
-import Chip from "@mui/material/Chip";
 import Box from "@mui/material/Box";
 import Link from "@mui/material/Link";
 import Avatar from "@mui/material/Avatar";
@@ -22,24 +21,6 @@ function normalizeServiceName(name: string): string {
         .replace(/\b\w/g, (s) => s.toUpperCase());
 }
 
-interface TenantsStatusTooltipProps {
-    tenantsStatus: StatusPerTenant;
-}
-
-function TenantsStatusTooltip({ tenantsStatus }: TenantsStatusTooltipProps) {
-    const statusItems = Object.entries(tenantsStatus).map(([key, value]) => {
-        console.log(`key: ${key}, value: ${value}`);
-        return null;
-    });
-
-    return (
-        <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>
-    );
-}
-
 function getNodeNameElement(node: Node): React.ReactElement {
     let statusMessage;
     const statusOk = node.health_check_status?.status_ok;
@@ -69,7 +50,11 @@ function TenantsStatus({ statusPerTenant }: TenantsStatusProps) {
 
     for (const [tenantId, statusOk] of Object.entries(statusPerTenant)) {
         statuses.push(
-            <Typography component="div" className={`tenant-status ${statusOk ? "status-ok" : "status-error"}`}>
+            <Typography
+                key={tenantId}
+                component="div"
+                className={`tenant-status ${statusOk ? "status-ok" : "status-error"}`}
+            >
                 {tenantId}
             </Typography>
         );
@@ -93,11 +78,22 @@ function ServiceNode({ node }: ServiceNodePropps) {
     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>
+        );
+    }
     return (
         <Stack direction="row" className={`service-node ${statusOk ? "status-ok" : "status-error"}`}>
             <Box>{getNodeNameElement(node)}</Box>
             <Box className="node-details">
-                <Typography className="version">{node.app_details?.app_version || "no version"}</Typography>
+                {version}
+                {templateName}
                 <Link href={node.url} target="_blank">
                     {nodeUrl}
                 </Link>

src/components/dashboard/ServiceList.tsx

@@ -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>
     );

src/components/dashboard/TenantList.tsx

@@ -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">

src/const.ts

@@ -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",
+    },
 ];

src/index.css

@@ -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;
-}

src/index.tsx

@@ -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 />
-            <App />
-        </Router>{" "}
     </React.StrictMode>
 );

src/logo.svg

@@ -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>

src/react-app-env.d.ts

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

src/routes/Home.tsx

@@ -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>
-    );
-}

src/scss/_app-header.scss

@@ -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;
+    }
 }

src/scss/_env-tabs-switcher.scss

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

src/scss/_environment-list.scss

@@ -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%);
+        }
+    }
+}

src/scss/_loading-error-alert.scss

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

src/scss/_service-card.scss

@@ -1,14 +1,11 @@
 @use "sass:color";
-
+@import "vars";
-$color-ok: #1dad24;
-$color-warning: #ed6c02;
-$color-danger: #d32f2f;
 
 .service-card {
     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;

src/scss/_service-list.scss

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

src/scss/_tenant-list.scss

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

src/scss/_vars.scss

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

src/scss/styles.scss

@@ -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";

src/setupTests.ts

@@ -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';

src/theme.ts

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

tsconfig.json

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