add server page and update player page
Some checks failed
Deploy App / docker (ubuntu-latest) (push) Failing after 47s

This commit is contained in:
Lee 2024-04-14 21:56:07 +01:00
parent 094a6c697e
commit 2597c51863
9 changed files with 118 additions and 34 deletions

@ -14,7 +14,7 @@
"class-variance-authority": "^0.7.0", "class-variance-authority": "^0.7.0",
"clsx": "^2.1.0", "clsx": "^2.1.0",
"lucide-react": "^0.368.0", "lucide-react": "^0.368.0",
"mcutils-library": "^1.0.1", "mcutils-library": "^1.0.2",
"next": "14.2.1", "next": "14.2.1",
"next-themes": "^0.3.0", "next-themes": "^0.3.0",
"react": "^18", "react": "^18",

@ -21,8 +21,8 @@ dependencies:
specifier: ^0.368.0 specifier: ^0.368.0
version: 0.368.0(react@18.2.0) version: 0.368.0(react@18.2.0)
mcutils-library: mcutils-library:
specifier: ^1.0.1 specifier: ^1.0.2
version: 1.0.1(@babel/core@7.24.4)(@types/node@20.12.7) version: 1.0.2(@babel/core@7.24.4)(@types/node@20.12.7)
next: next:
specifier: 14.2.1 specifier: 14.2.1
version: 14.2.1(@babel/core@7.24.4)(react-dom@18.2.0)(react@18.2.0) version: 14.2.1(@babel/core@7.24.4)(react-dom@18.2.0)(react@18.2.0)
@ -3516,8 +3516,8 @@ packages:
tmpl: 1.0.5 tmpl: 1.0.5
dev: false dev: false
/mcutils-library@1.0.1(@babel/core@7.24.4)(@types/node@20.12.7): /mcutils-library@1.0.2(@babel/core@7.24.4)(@types/node@20.12.7):
resolution: {integrity: sha512-ar1nlplgGjIk+b69wxVYNmHs7NIU/pJtDGiHIAH9sCE2Tn/twzpPWlFYASh/jejYkhf6/FZQSAJP1WytUnR6lw==} resolution: {integrity: sha512-Yl9w3H4FqDmhki32HGvR1jDLzhSJqaWuBiUqYom+5IZk6sLh5j6yfRVFvwHTOLfx/Ee43FWFBXeM+9TQoTUC4Q==}
dependencies: dependencies:
axios: 1.6.8 axios: 1.6.8
jest: 29.7.0(@types/node@20.12.7)(ts-node@10.9.2) jest: 29.7.0(@types/node@20.12.7)(ts-node@10.9.2)

@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 394 80"><path fill="#000" d="M262 0h68.5v12.7h-27.2v66.6h-13.6V12.7H262V0ZM149 0v12.7H94v20.4h44.3v12.6H94v21h55v12.6H80.5V0h68.7zm34.3 0h-17.8l63.8 79.4h17.9l-32-39.7 32-39.6h-17.9l-23 28.6-23-28.6zm18.3 56.7-9-11-27.1 33.7h17.8l18.3-22.7z"/><path fill="#000" d="M81 79.3 17 0H0v79.3h13.6V17l50.2 62.3H81Zm252.6-.4c-1 0-1.8-.4-2.5-1s-1.1-1.6-1.1-2.6.3-1.8 1-2.5 1.6-1 2.6-1 1.8.3 2.5 1a3.4 3.4 0 0 1 .6 4.3 3.7 3.7 0 0 1-3 1.8zm23.2-33.5h6v23.3c0 2.1-.4 4-1.3 5.5a9.1 9.1 0 0 1-3.8 3.5c-1.6.8-3.5 1.3-5.7 1.3-2 0-3.7-.4-5.3-1s-2.8-1.8-3.7-3.2c-.9-1.3-1.4-3-1.4-5h6c.1.8.3 1.6.7 2.2s1 1.2 1.6 1.5c.7.4 1.5.5 2.4.5 1 0 1.8-.2 2.4-.6a4 4 0 0 0 1.6-1.8c.3-.8.5-1.8.5-3V45.5zm30.9 9.1a4.4 4.4 0 0 0-2-3.3 7.5 7.5 0 0 0-4.3-1.1c-1.3 0-2.4.2-3.3.5-.9.4-1.6 1-2 1.6a3.5 3.5 0 0 0-.3 4c.3.5.7.9 1.3 1.2l1.8 1 2 .5 3.2.8c1.3.3 2.5.7 3.7 1.2a13 13 0 0 1 3.2 1.8 8.1 8.1 0 0 1 3 6.5c0 2-.5 3.7-1.5 5.1a10 10 0 0 1-4.4 3.5c-1.8.8-4.1 1.2-6.8 1.2-2.6 0-4.9-.4-6.8-1.2-2-.8-3.4-2-4.5-3.5a10 10 0 0 1-1.7-5.6h6a5 5 0 0 0 3.5 4.6c1 .4 2.2.6 3.4.6 1.3 0 2.5-.2 3.5-.6 1-.4 1.8-1 2.4-1.7a4 4 0 0 0 .8-2.4c0-.9-.2-1.6-.7-2.2a11 11 0 0 0-2.1-1.4l-3.2-1-3.8-1c-2.8-.7-5-1.7-6.6-3.2a7.2 7.2 0 0 1-2.4-5.7 8 8 0 0 1 1.7-5 10 10 0 0 1 4.3-3.5c2-.8 4-1.2 6.4-1.2 2.3 0 4.4.4 6.2 1.2 1.8.8 3.2 2 4.3 3.4 1 1.4 1.5 3 1.5 5h-5.8z"/></svg>

Before

Width:  |  Height:  |  Size: 1.3 KiB

@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 283 64"><path fill="black" d="M141 16c-11 0-19 7-19 18s9 18 20 18c7 0 13-3 16-7l-7-5c-2 3-6 4-9 4-5 0-9-3-10-7h28v-3c0-11-8-18-19-18zm-9 15c1-4 4-7 9-7s8 3 9 7h-18zm117-15c-11 0-19 7-19 18s9 18 20 18c6 0 12-3 16-7l-8-5c-2 3-5 4-8 4-5 0-9-3-11-7h28l1-3c0-11-8-18-19-18zm-10 15c2-4 5-7 10-7s8 3 9 7h-19zm-39 3c0 6 4 10 10 10 4 0 7-2 9-5l8 5c-3 5-9 8-17 8-11 0-19-7-19-18s8-18 19-18c8 0 14 3 17 8l-8 5c-2-3-5-5-9-5-6 0-10 4-10 10zm83-29v46h-9V5h9zM37 0l37 64H0L37 0zm92 5-27 48L74 5h10l18 30 17-30h10zm59 12v10l-3-1c-6 0-10 4-10 10v15h-9V17h9v9c0-5 6-9 13-9z"/></svg>

Before

Width:  |  Height:  |  Size: 629 B

@ -4,7 +4,7 @@ export default function Player() {
return ( return (
<div className="h-full flex flex-col items-center"> <div className="h-full flex flex-col items-center">
<div className="mb-4 text-center"> <div className="mb-4 text-center">
<h1 className="text-xl">Search for a Player</h1> <h1 className="text-xl">Lookup a Player</h1>
<p>You can enter a players uuid or username to get information about the player.</p> <p>You can enter a players uuid or username to get information about the player.</p>
</div> </div>
<PlayerSearch /> <PlayerSearch />

13
src/app/server/page.tsx Normal file

@ -0,0 +1,13 @@
import ServerSearch from "@/components/server-search";
export default function Player() {
return (
<div className="h-full flex flex-col items-center">
<div className="mb-4 text-center">
<h1 className="text-xl">Lookup a Server</h1>
<p>You can enter a server ip or domain to get information about the server.</p>
</div>
<ServerSearch />
</div>
);
}

@ -9,6 +9,7 @@ type Page = {
const pages: Page[] = [ const pages: Page[] = [
{ title: "Home", url: "/" }, { title: "Home", url: "/" },
{ title: "Player", url: "/player" }, { title: "Player", url: "/player" },
{ title: "Server", url: "/server" },
]; ];
export default function NavBar() { export default function NavBar() {

@ -12,7 +12,7 @@ export default function PlayerSearch() {
const [playerId, setPlayerId] = useState<string | null>(null); const [playerId, setPlayerId] = useState<string | null>(null);
const [player, setPlayer] = useState<any | null>(null); const [player, setPlayer] = useState<any | null>(null);
const handleSearch = () => { const handleLookup = () => {
if (playerId === null || playerId.length <= 0) { if (playerId === null || playerId.length <= 0) {
toast.error("Please enter a player ID"); toast.error("Please enter a player ID");
return; return;
@ -29,7 +29,7 @@ export default function PlayerSearch() {
const handleKeyDown = (e: any) => { const handleKeyDown = (e: any) => {
if (e.key === "Enter") { if (e.key === "Enter") {
handleSearch(); handleLookup();
} }
}; };
@ -42,33 +42,31 @@ export default function PlayerSearch() {
onChange={(e) => setPlayerId(e.target.value)} onChange={(e) => setPlayerId(e.target.value)}
onKeyDown={handleKeyDown} onKeyDown={handleKeyDown}
/> />
<Button onClick={() => handleSearch()}>Search</Button> <Button onClick={() => handleLookup()}>Lookup</Button>
</div> </div>
{player && ( {player && (
<div className="bg-secondary rounded-lg p-2 min-w-[600px] max-w-full"> <div className="bg-secondary rounded-lg p-4 min-w-[600px] max-w-full flex flex-row gap-2">
<div className="flex gap-4 p-2"> <Image src={player.skin.parts.head} alt="The player's Head" width={150} height={150} />
<Image src={player.skin.parts.head} alt="The player's Head" width={150} height={150} /> <div className="flex flex-col gap-1 mt-2">
<div className="flex flex-col gap-1 mt-2"> <p>
<p> Unique ID: <span className="font-bold">{player.uniqueId}</span>
Unique ID: <span className="font-bold">{player.uniqueId}</span> </p>
</p> <p>
<p> Name: <span className="font-bold">{player.username}</span>
Name: <span className="font-bold">{player.username}</span> </p>
</p> <div className="mt-2">
<div className="mt-2"> <p>Skin Parts</p>
<p>Skin Parts</p> <div className="flex gap-2">
<div className="flex gap-2"> {Object.keys(player.skin.parts).map((part: any, index: number) => {
{Object.keys(player.skin.parts).map((part: any, index: number) => { return (
return ( <p key={index}>
<p key={index}> <Link className="text-primary" href={player.skin.parts[part]} target="_blank">
<Link className="text-primary" href={player.skin.parts[part]} target="_blank"> {part}
{part} </Link>
</Link> </p>
</p> );
); })}
})}
</div>
</div> </div>
</div> </div>
</div> </div>

@ -0,0 +1,74 @@
"use client";
import { cn } from "@/common/utils";
import mcUtils from "mcutils-library";
import JavaMinecraftServer from "mcutils-library/dist/types/server/javaServer";
import { ServerPlatform } from "mcutils-library/dist/types/server/platform";
import Image from "next/image";
import { useState } from "react";
import { toast } from "react-toastify";
import { Button } from "./ui/button";
import { Input } from "./ui/input";
export default function ServerSearch() {
const [serverHostname, setServerHostname] = useState<string | null>(null);
const [server, setServer] = useState<JavaMinecraftServer | null>(null);
const handleLookup = () => {
if (serverHostname === null || serverHostname.length <= 0) {
toast.error("Please enter a server hostname");
return;
}
mcUtils.server
.getServer(ServerPlatform.Java, serverHostname)
.then((response) => {
setServer(response.server as JavaMinecraftServer);
})
.catch(() => {
toast.error("Server not found");
});
};
const handleKeyDown = (e: any) => {
if (e.key === "Enter") {
handleLookup();
}
};
return (
<div className="flex flex-col items-center gap-8">
<div className="flex items-center gap-2">
<Input
className="w-[200px]"
placeholder="Server Domain or IP"
onChange={(e) => setServerHostname(e.target.value)}
onKeyDown={handleKeyDown}
/>
<Button onClick={() => handleLookup()}>Lookup</Button>
</div>
{server && (
<div className="bg-secondary rounded-lg p-4 min-w-[460px] max-w-full flex flex-col gap-2">
<div className="flex flex-row gap-3 items-center">
<Image src={server.favicon.url} alt="The server's Icon" width={64} height={64} />
<div className={cn("flex flex-col gap-2")}>
{server.motd.html.map((line, index) => {
return <div key={index} dangerouslySetInnerHTML={{ __html: line }} />;
})}
</div>
</div>
<div className="flex flex-col gap-1">
<div>
<span className="font-bold">Host:</span> {server.hostname}
</div>
<div>
<span className="font-bold">Players:</span> {server.players.online}/{server.players.max}
</div>
</div>
</div>
)}
</div>
);
}