From 65483bf6e069417ee909733020662e5b6ccedf16 Mon Sep 17 00:00:00 2001 From: Fishandchips321 Date: Mon, 23 Feb 2026 15:06:47 +0000 Subject: [PATCH 1/2] added simple makefile --- Makefile | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 Makefile diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..3179e9e --- /dev/null +++ b/Makefile @@ -0,0 +1,5 @@ +build: + docker build -t foxgirlriley/jellyglass:latest . + +run: build + docker run -p 5000:5000 foxgirlriley/jellyglass:latest \ No newline at end of file From 6e29418ba961758a1f24daca62af1f88b4a14ee1 Mon Sep 17 00:00:00 2001 From: Fishandchips321 Date: Mon, 23 Feb 2026 15:06:58 +0000 Subject: [PATCH 2/2] added loading spinner and error message --- .../src/Components/ServerList/ServerList.tsx | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/frontend/src/Components/ServerList/ServerList.tsx b/frontend/src/Components/ServerList/ServerList.tsx index 2b61520..4d46f88 100644 --- a/frontend/src/Components/ServerList/ServerList.tsx +++ b/frontend/src/Components/ServerList/ServerList.tsx @@ -1,9 +1,10 @@ import { useEffect, useState } from "react"; import ServerCard from "./ServerCard/ServerCard"; import { getServerList, type Server } from "../../Lib/Servers"; +import { Spinner } from "react-bootstrap"; const ServerList = () => { - const [servers, setServers] = useState>([]); + const [servers, setServers] = useState | undefined>(); useEffect(() => { getServerList().then(serverList => { @@ -13,9 +14,16 @@ const ServerList = () => { return (
- {servers.map(server => { - return () - })} + {servers ? + servers.length > 0 ? + servers.map(server => { + return () + }) + : +

No servers found

+ : + + }
) }