+
-
-
-
- Discord Server
-
-
-
-
-
+
)}{" "}
{view == "achievements" && (
-
+
+
diff --git a/src/components/AfterServerView.tsx b/src/components/AfterServerView.tsx
index 4021a23..8c82c6d 100644
--- a/src/components/AfterServerView.tsx
+++ b/src/components/AfterServerView.tsx
@@ -87,6 +87,7 @@ export default function AfterServerView({ server }: { server: string }) {
getCommunityServerFavorites(server).then((c) => {
mhsf.setFavorites(c);
});
+ setView(description !== "" || discord !== "" ? "desc" : "extra");
}
fetch("https://api.minehut.com/server/" + server + "?byName=true").then(
(c) => c.json().then((n) => setServerObject(n.server))
@@ -96,7 +97,7 @@ export default function AfterServerView({ server }: { server: string }) {
});
setLoading(false);
});
- }, []);
+ }, [description, discord]);
if (loading) return <>;
return (
@@ -216,20 +217,13 @@ export default function AfterServerView({ server }: { server: string }) {
)}
{discord != "" && view == "desc" && (
- +
@@ -452,7 +446,7 @@ export default function AfterServerView({ server }: { server: string }) {
Server ID
-
+
{serverObject?._id == undefined ? (
"? (unknown)"
) : (
diff --git a/src/components/Icon.tsx b/src/components/Icon.tsx
index f1114fc..fc93891 100644
--- a/src/components/Icon.tsx
+++ b/src/components/Icon.tsx
@@ -41,62 +41,62 @@ import type { SVGProps } from "react";
* @returns A JSX element representing the colorful branding icon.
*/
export function BrandingColorfulIcon(props: SVGProps) {
- return (
-
- );
+ return (
+
+ );
}
/**
* Returns the optional Pride icon
@@ -107,71 +107,71 @@ export function BrandingColorfulIcon(props: SVGProps) {
* @returns A JSX element representing the branding icon.
*/
export function BrandingPrideIcon(props: SVGProps) {
- return (
-
- );
+ return (
+
+ );
}
/**
@@ -187,136 +187,171 @@ export function BrandingPrideIcon(props: SVGProps) {
* @returns A JSX element representing the branding icon.
*/
export function BrandingGenericIcon(props: SVGProps) {
- const { resolvedTheme } = useTheme();
+ const { resolvedTheme } = useTheme();
- if (resolvedTheme == "dark") {
- return (
-
- );
- } else {
- return (
-
- );
- }
+ if (resolvedTheme == "dark") {
+ return (
+
+ );
+ } else {
+ return (
+
+ );
+ }
+}
+
+export function BadgeOfAffiliation(props: SVGProps) {
+ return (
+
+ );
}
export const Discord = (props: SVGProps) => (
-
+
);
diff --git a/src/components/ServerList.tsx b/src/components/ServerList.tsx
index 7be0585..d4835c5 100644
--- a/src/components/ServerList.tsx
+++ b/src/components/ServerList.tsx
@@ -31,34 +31,44 @@
"use client";
import { BorderBeam } from "@/components/effects/border-beam";
import { Button } from "@/components/ui/button";
+import { AgGridReact, CustomCellRendererProps } from "ag-grid-react";
import {
- Dialog,
- DialogContent,
- DialogDescription,
- DialogHeader,
- DialogTitle,
- DialogTrigger,
+ Dialog,
+ DialogContent,
+ DialogDescription,
+ DialogHeader,
+ DialogTitle,
+ DialogTrigger,
} from "@/components/ui/dialog";
import {
- Menubar,
- MenubarCheckboxItem,
- MenubarContent,
- MenubarItem,
- MenubarMenu,
- MenubarRadioGroup,
- MenubarRadioItem,
- MenubarSeparator,
- MenubarShortcut,
- MenubarSub,
- MenubarSubContent,
- MenubarSubTrigger,
- MenubarTrigger,
+ AllCommunityModule,
+ ModuleRegistry,
+ colorSchemeDarkBlue,
+ colorSchemeDarkWarm,
+ colorSchemeLightCold,
+ colorSchemeLightWarm,
+ themeQuartz,
+} from "ag-grid-community";
+import {
+ Menubar,
+ MenubarCheckboxItem,
+ MenubarContent,
+ MenubarItem,
+ MenubarMenu,
+ MenubarRadioGroup,
+ MenubarRadioItem,
+ MenubarSeparator,
+ MenubarShortcut,
+ MenubarSub,
+ MenubarSubContent,
+ MenubarSubTrigger,
+ MenubarTrigger,
} from "@/components/ui/menubar";
import { Separator } from "@/components/ui/separator";
import {
- Tooltip,
- TooltipContent,
- TooltipTrigger,
+ Tooltip,
+ TooltipContent,
+ TooltipTrigger,
} from "@/components/ui/tooltip";
import { allCategories, allTags } from "@/config/tags";
import events from "@/lib/commandEvent";
@@ -71,15 +81,17 @@ import { cn } from "@/lib/utils";
import { SignedIn, SignedOut, useUser } from "@clerk/nextjs";
import { ChatBubbleIcon, InputIcon } from "@radix-ui/react-icons";
import {
- ArrowDownZA,
- Check,
- CircleUser,
- ImageIcon,
- Info,
- LogIn,
- Network,
- Sun,
- XIcon,
+ ArrowDownZA,
+ Check,
+ CircleUser,
+ Copy,
+ ImageIcon,
+ Info,
+ Layers,
+ LogIn,
+ Network,
+ Sun,
+ XIcon,
} from "lucide-react";
import { CommandIcon } from "lucide-react";
import { useTheme } from "next-themes";
@@ -103,1052 +115,1063 @@ import { Skeleton } from "./ui/skeleton";
import { affiliates } from "@/config/affiliates";
import { LoadingSpinner } from "./ui/loading-spinner";
import StickyTopbar from "./misc/StickyTopbar";
+import { HoverCard } from "@radix-ui/react-hover-card";
+import { HoverCardTrigger } from "./ui/hover-card";
+
+// ag-grid
+ModuleRegistry.registerModules([AllCommunityModule]);
+
+const themeLightWarm = themeQuartz.withPart(colorSchemeLightWarm);
+const themeDarkWarm = themeQuartz.withPart(colorSchemeDarkBlue);
const features = [
- {
- Icon: ChatBubbleIcon,
- name: "Add a Discord widget",
- description:
- "Show where your players talk to each-other, including an online users count.",
- href: "/docs/guides/customization",
- cta: "Learn more",
- background: ,
- className: "lg:row-start-1 lg:row-end-2 lg:col-start-2 lg:col-end-3",
- },
- {
- Icon: InputIcon,
- name: "Descriptions",
- href: "/docs/guides/customization",
- cta: "Learn more",
- description:
- "Format your descriptions using Markdown to show what your server has to offer.",
- background: ,
- className: "lg:col-start-1 lg:col-end-2 lg:row-start-1 lg:row-end-2",
- },
- {
- Icon: ImageIcon,
- name: "Banners",
- href: "/docs/guides/customization",
- cta: "Learn more",
- description:
- "Show a banner with can contain images that show on your server page.",
- background: ,
- className: "lg:col-start-3 lg:col-end-4 lg:row-start-1 lg:row-end-2",
- },
+ {
+ Icon: ChatBubbleIcon,
+ name: "Add a Discord widget",
+ description:
+ "Show where your players talk to each-other, including an online users count.",
+ href: "/docs/guides/customization",
+ cta: "Learn more",
+ background: ,
+ className: "lg:row-start-1 lg:row-end-2 lg:col-start-2 lg:col-end-3",
+ },
+ {
+ Icon: InputIcon,
+ name: "Descriptions",
+ href: "/docs/guides/customization",
+ cta: "Learn more",
+ description:
+ "Format your descriptions using Markdown to show what your server has to offer.",
+ background: ,
+ className: "lg:col-start-1 lg:col-end-2 lg:row-start-1 lg:row-end-2",
+ },
+ {
+ Icon: ImageIcon,
+ name: "Banners",
+ href: "/docs/guides/customization",
+ cta: "Learn more",
+ description:
+ "Show a banner with can contain images that show on your server page.",
+ background: ,
+ className: "lg:col-start-3 lg:col-end-4 lg:row-start-1 lg:row-end-2",
+ },
];
export default function ServerList() {
- const [loading, setLoading]: any = useState(true);
- const [randomText, setRandomText] = useState("");
- const [motdList, setMotdList] = useState({});
- const allText = [""];
- const getRandomText = () => {
- return allText[Math.floor(Math.random() * allText.length)];
- };
- const [templateFilter, setTemplateFilter] = useState(false);
- const [random, setRandom] = useState(false);
- const [serverList, setServerList] = useState(new ServersList([]));
- const [textCopied, setTextCopied] = useState(false);
- const [padding, setPadding] = useState("0");
- const bigger = async (server: OnlineServer) =>
- server.playerData.playerCount > 15;
- const smaller = async (server: OnlineServer) =>
- !server.staticInfo.alwaysOnline &&
- server.playerData.playerCount < 15 &&
- server.playerData.playerCount > 7;
- const [nameFilters, setNameFilters] = useState({});
- const [inErrState, setErrState] = useState(false);
- const [servers, setServers] = useState>([]);
- const clipboard = useClipboard();
- const router = useRouter();
- const { user, isSignedIn } = useUser();
- const [pOS, setpOS] = useState(false);
- const [ipr, setIPR] = useState("4");
- const [am, setAM] = useState(false);
- const [filters, setFilters] = useState<
- Array<(server: OnlineServer) => Promise>
- >([]);
- const [randomData, setRandomData] = useState(
- undefined
- );
- const { resolvedTheme } = useTheme();
- const [color, setColor] = useState("#ffffff");
+ const [loading, setLoading]: any = useState(true);
+ const [randomText, setRandomText] = useState("");
+ const [motdList, setMotdList] = useState({});
+ const allText = [""];
+ const getRandomText = () => {
+ return allText[Math.floor(Math.random() * allText.length)];
+ };
+ const [templateFilter, setTemplateFilter] = useState(false);
+ const [random, setRandom] = useState(false);
+ const [serverList, setServerList] = useState(new ServersList([]));
+ const [textCopied, setTextCopied] = useState(false);
+ const [padding, setPadding] = useState("0");
+ const bigger = async (server: OnlineServer) =>
+ server.playerData.playerCount > 15;
+ const smaller = async (server: OnlineServer) =>
+ !server.staticInfo.alwaysOnline &&
+ server.playerData.playerCount < 15 &&
+ server.playerData.playerCount > 7;
+ const [nameFilters, setNameFilters] = useState({});
+ const [inErrState, setErrState] = useState(false);
+ const [servers, setServers] = useState>([]);
+ const clipboard = useClipboard();
+ const router = useRouter();
+ const { user, isSignedIn } = useUser();
+ const [pOS, setpOS] = useState(false);
+ const [ipr, setIPR] = useState("4");
+ const [presentationMode, setPresentationMode] = useState<"table" | "grid">(
+ "grid",
+ );
+ const [am, setAM] = useState(false);
+ const [filters, setFilters] = useState<
+ Array<(server: OnlineServer) => Promise>
+ >([]);
+ const [randomData, setRandomData] = useState(
+ undefined,
+ );
+ const { resolvedTheme } = useTheme();
+ const [color, setColor] = useState("#ffffff");
- useEffect(() => {
- setColor(resolvedTheme === "dark" ? "#ffffff" : "#000000");
- }, [resolvedTheme]);
+ useEffect(() => {
+ setColor(resolvedTheme === "dark" ? "#ffffff" : "#000000");
+ }, [resolvedTheme]);
- useEffect(() => {
- if (isSignedIn) {
- setAM(true);
- console.log(user.publicMetadata);
+ useEffect(() => {
+ if (isSignedIn) {
+ setAM(true);
+ console.log(user.publicMetadata);
- setIPR((user.publicMetadata.ipr as string | undefined) || "4");
- setPadding((user.publicMetadata.pad as string | undefined) || "0");
- setpOS((user.publicMetadata.srv as boolean | undefined) || false);
- }
- }, [isSignedIn, user]);
+ setIPR((user.publicMetadata.ipr as string | undefined) || "4");
+ setPadding((user.publicMetadata.pad as string | undefined) || "0");
+ setpOS((user.publicMetadata.srv as boolean | undefined) || false);
+ }
+ }, [isSignedIn, user]);
- useEffectOnce(() => {
- setRandomText(getRandomText());
- serverList
- .fetchDataAndFilter()
- .then(() => {
- serverList.moveListDown();
- let stringList: Array<{ server: string; motd: string }> = [];
- let obj: any = {};
+ useEffectOnce(() => {
+ setRandomText(getRandomText());
+ serverList
+ .fetchDataAndFilter()
+ .then(() => {
+ serverList.moveListDown();
+ let stringList: Array<{ server: string; motd: string }> = [];
+ let obj: any = {};
- serverList.currentServers.forEach((b) => {
- stringList.push({ motd: b.motd, server: b.name });
- });
+ serverList.currentServers.forEach((b) => {
+ stringList.push({ motd: b.motd, server: b.name });
+ });
- serverList.getMOTDs(stringList).then((c) => {
- var updatedSL = motdList;
- c.forEach((b: { server: string; motd: string }) => {
- updatedSL[b.server] = b.motd;
- });
- setMotdList(updatedSL);
- setServers(serverList.currentServers);
- setLoading(false);
- });
- })
- .catch(() => setErrState(true));
- });
+ serverList.getMOTDs(stringList).then((c) => {
+ var updatedSL = motdList;
+ c.forEach((b: { server: string; motd: string }) => {
+ updatedSL[b.server] = b.motd;
+ });
+ setMotdList(updatedSL);
+ setServers(serverList.currentServers);
+ setLoading(false);
+ });
+ })
+ .catch(() => setErrState(true));
+ });
- const ref = useRef(null);
- const [clickedPage, setClickedPage] = useState("banners");
- const [hero, setHero] = useState(false);
- if (inErrState) {
- return (
- <>
-
+
+
+
+
+
found to be a high-quality server and should be a + good join for any player! + +
+
+ )}
{/* 1704088800000 is the Unix time (in milliseconds) of (GMT) Monday, January 1, 2024 6:00:00 AM */}
diff --git a/src/components/NewChart.tsx b/src/components/charts/NewChart.tsx
similarity index 70%
rename from src/components/NewChart.tsx
rename to src/components/charts/NewChart.tsx
index dcd75b9..7e592bb 100644
--- a/src/components/NewChart.tsx
+++ b/src/components/charts/NewChart.tsx
@@ -31,7 +31,14 @@
"use client";
import * as React from "react";
-import { CartesianGrid, Line, LineChart, XAxis, YAxis } from "recharts";
+import {
+ CartesianGrid,
+ Line,
+ LineChart,
+ XAxis,
+ YAxis,
+ ReferenceLine,
+} from "recharts";
import {
Card,
@@ -49,8 +56,16 @@ import {
import { useEffectOnce } from "@/lib/useEffectOnce";
import { ServerResponse } from "@/lib/types/mh-server";
import { getCommunityServerFavorites, getShortTermData } from "@/lib/api";
-import { Skeleton } from "./ui/skeleton";
+import { Skeleton } from "../ui/skeleton";
import FadeIn from "react-fade-in/lib/FadeIn";
+import {
+ Select,
+ SelectContent,
+ SelectGroup,
+ SelectItem,
+ SelectTrigger,
+ SelectValue,
+} from "@/components/ui/select";
const chartConfig = {
player_count: {
@@ -68,15 +83,20 @@ export function NewChart({ server }: { server: string }) {
React.useState("player_count");
const [chartData, setChartData] = React.useState([]);
+ const [allData, setAllData] = React.useState([]);
const [joins, setJoins] = React.useState(0);
const [loading, setLoading] = React.useState(true);
+ const [dataMax, setDataMax] = React.useState(0);
const [favorites, setFavorites] = React.useState(0);
+ const [filter, setFilter] = React.useState("60");
const allNums = { player_count: joins, favorites };
useEffectOnce(() => {
getShortTermData(server, ["player_count", "favorites", "date"]).then(
(c) => {
- setChartData(c);
+ setAllData(c.data);
+ setChartData(c.data.slice(-60));
+ setDataMax(c.dataMax);
getCommunityServerFavorites(server).then((b) => setFavorites(b));
fetch("https://api.minehut.com/server/" + server + "?byName=true").then(
(k) => {
@@ -90,6 +110,14 @@ export function NewChart({ server }: { server: string }) {
);
});
+ React.useEffect(() => {
+ if (filter === "all") {
+ setChartData(allData);
+ } else {
+ setChartData(allData.slice(Number(filter) * -1));
+ }
+ }, [filter, allData]);
+
if (loading)
return (
<>
@@ -105,7 +133,29 @@ export function NewChart({ server }: { server: string }) {
{chartConfig[activeChart].label} Chart for {server}
- Showing the past 30 entries.
+
+ Showing {filter !== "all" && <>the last}{" "}
+ {" "}
+ {filter === "all" && <>of the} entries.
+
-
-
- -
- Hmm. Something is wrong. Reload the page.
-
-
- );
- }
+ const ref = useRef(null);
+ const [clickedPage, setClickedPage] = useState("banners");
+ const [hero, setHero] = useState(false);
+ if (inErrState) {
+ return (
+ <>
+
+
+
+ +
+ Hmm. Something is wrong. Reload the page.
+
+
+ );
+ }
- if (loading) {
- return (
-
-
-
-
-
-
- );
- }
+ if (loading) {
+ return (
+
-
- -
-
-
-
+
+
+
+
+
+ );
+ }
- return (
-
+
+ +
+
+
+
-
+
+
+ )}
+ {presentationMode === "table" && (
+
- <>
- {(!isSignedIn || hero) && (
-
+
+
+
+
+ Servers
+
+ events.emit("search-request-event")}
+ >
+ Search Servers
+
+
+
+ {
+ setRandomData(serverList.getRandomServer());
+ setRandom(true);
+ }}
+ >
+ Pick Random Server
+
+ {
+ toast.promise(
+ new Promise((s, e) => {
+ setLoading(true);
+ serverList
+ .fetchDataAndFilter()
+ .then(() => {
+ serverList.moveListDown();
- let stringList: Array<{
- server: string;
- motd: string;
- }> = [];
- let obj: any = {};
+ let stringList: Array<{
+ server: string;
+ motd: string;
+ }> = [];
+ let obj: any = {};
- serverList.currentServers.forEach((b) => {
- stringList.push({
- motd: b.motd,
- server: b.name,
- });
- });
+ serverList.currentServers.forEach((b) => {
+ stringList.push({
+ motd: b.motd,
+ server: b.name,
+ });
+ });
- serverList.getMOTDs(stringList).then((c) => {
- var updatedSL = motdList;
- c.forEach(
- (b: { server: string; motd: string }) => {
- updatedSL[b.server] = b.motd;
- }
- );
- setMotdList(updatedSL);
- setServers(serverList.currentServers);
- setLoading(false);
- s(false);
- });
- })
- .catch(() => {
- e();
- });
- }),
- {
- success: "Succesfully refreshed servers",
- loading: "Refreshing...",
- error: "Error while refreshing",
- }
- );
- }}
- >
- Refresh
-
-
-
-
- Filter
-
- {
- toast.promise(
- new Promise((g, b) => {
- if (v == "smaller") {
- setTemplateFilter(true);
- var filt = nameFilters;
- filt["smaller-tf"] = true;
- filt["bigger-tf"] = false;
- setNameFilters(filt);
+ serverList.getMOTDs(stringList).then((c) => {
+ var updatedSL = motdList;
+ c.forEach(
+ (b: { server: string; motd: string }) => {
+ updatedSL[b.server] = b.motd;
+ },
+ );
+ setMotdList(updatedSL);
+ setServers(serverList.currentServers);
+ setLoading(false);
+ s(false);
+ });
+ })
+ .catch(() => {
+ e();
+ });
+ }),
+ {
+ success: "Succesfully refreshed servers",
+ loading: "Refreshing...",
+ error: "Error while refreshing",
+ },
+ );
+ }}
+ >
+ Refresh
+
+
+
+
+ Filter
+
+ {
+ toast.promise(
+ new Promise((g, b) => {
+ if (v == "smaller") {
+ setTemplateFilter(true);
+ var filt = nameFilters;
+ filt["smaller-tf"] = true;
+ filt["bigger-tf"] = false;
+ setNameFilters(filt);
- var filt2 = filters;
- filt2.push(smaller);
- if (filt2.includes(bigger)) {
- filt2.splice(filt2.indexOf(bigger), 1);
- }
- setFilters(filt2);
- serverList.editFilters(filters);
- serverList.fetchDataAndFilter().then(() => {
- serverList.moveListDown();
+ var filt2 = filters;
+ filt2.push(smaller);
+ if (filt2.includes(bigger)) {
+ filt2.splice(filt2.indexOf(bigger), 1);
+ }
+ setFilters(filt2);
+ serverList.editFilters(filters);
+ serverList.fetchDataAndFilter().then(() => {
+ serverList.moveListDown();
- let stringList: Array<{
- server: string;
- motd: string;
- }> = [];
- let obj: any = {};
+ let stringList: Array<{
+ server: string;
+ motd: string;
+ }> = [];
+ let obj: any = {};
- serverList.currentServers.forEach((b) => {
- stringList.push({
- motd: b.motd,
- server: b.name,
- });
- });
+ serverList.currentServers.forEach((b) => {
+ stringList.push({
+ motd: b.motd,
+ server: b.name,
+ });
+ });
- serverList.getMOTDs(stringList).then((c) => {
- var updatedSL = motdList;
- c.forEach(
- (b: { server: string; motd: string }) => {
- updatedSL[b.server] = b.motd;
- }
- );
- setMotdList(updatedSL);
- setServers(serverList.currentServers);
- g(undefined);
- });
- });
- } else if (v == "bigger") {
- setTemplateFilter(true);
- var filt = nameFilters;
- filt["smaller-tf"] = false;
- filt["bigger-tf"] = true;
- setNameFilters(filt);
- var filt2 = filters;
- filt2.push(bigger);
+ serverList.getMOTDs(stringList).then((c) => {
+ var updatedSL = motdList;
+ c.forEach(
+ (b: { server: string; motd: string }) => {
+ updatedSL[b.server] = b.motd;
+ },
+ );
+ setMotdList(updatedSL);
+ setServers(serverList.currentServers);
+ g(undefined);
+ });
+ });
+ } else if (v == "bigger") {
+ setTemplateFilter(true);
+ var filt = nameFilters;
+ filt["smaller-tf"] = false;
+ filt["bigger-tf"] = true;
+ setNameFilters(filt);
+ var filt2 = filters;
+ filt2.push(bigger);
- filt2.splice(filt2.indexOf(smaller), 1);
+ filt2.splice(filt2.indexOf(smaller), 1);
- setFilters(filt2);
- serverList.editFilters(filters);
+ setFilters(filt2);
+ serverList.editFilters(filters);
- serverList.fetchDataAndFilter().then(() => {
- serverList.moveListDown();
+ serverList.fetchDataAndFilter().then(() => {
+ serverList.moveListDown();
- let stringList: Array<{
- server: string;
- motd: string;
- }> = [];
- let obj: any = {};
+ let stringList: Array<{
+ server: string;
+ motd: string;
+ }> = [];
+ let obj: any = {};
- serverList.currentServers.forEach((b) => {
- stringList.push({
- motd: b.motd,
- server: b.name,
- });
- });
+ serverList.currentServers.forEach((b) => {
+ stringList.push({
+ motd: b.motd,
+ server: b.name,
+ });
+ });
- serverList.getMOTDs(stringList).then((c) => {
- var updatedSL = motdList;
- c.forEach(
- (b: { server: string; motd: string }) => {
- updatedSL[b.server] = b.motd;
- }
- );
- setMotdList(updatedSL);
- setServers(serverList.currentServers);
- g(undefined);
- });
- });
- } else {
- var filt = nameFilters;
- filt["smaller-tf"] = false;
- filt["bigger-tf"] = false;
- setNameFilters(filt);
- setTemplateFilter(false);
+ serverList.getMOTDs(stringList).then((c) => {
+ var updatedSL = motdList;
+ c.forEach(
+ (b: { server: string; motd: string }) => {
+ updatedSL[b.server] = b.motd;
+ },
+ );
+ setMotdList(updatedSL);
+ setServers(serverList.currentServers);
+ g(undefined);
+ });
+ });
+ } else {
+ var filt = nameFilters;
+ filt["smaller-tf"] = false;
+ filt["bigger-tf"] = false;
+ setNameFilters(filt);
+ setTemplateFilter(false);
- var filt2 = filters;
- filt2.splice(filt2.indexOf(smaller), 1);
- filt2.splice(filt2.indexOf(bigger), 1);
- setFilters(filt2);
- console.log(filters, filters.includes(smaller));
- serverList.editFilters(filters);
+ var filt2 = filters;
+ filt2.splice(filt2.indexOf(smaller), 1);
+ filt2.splice(filt2.indexOf(bigger), 1);
+ setFilters(filt2);
+ console.log(filters, filters.includes(smaller));
+ serverList.editFilters(filters);
- serverList.fetchDataAndFilter().then(() => {
- serverList.moveListDown();
+ serverList.fetchDataAndFilter().then(() => {
+ serverList.moveListDown();
- let stringList: Array<{
- server: string;
- motd: string;
- }> = [];
- let obj: any = {};
+ let stringList: Array<{
+ server: string;
+ motd: string;
+ }> = [];
+ let obj: any = {};
- serverList.currentServers.forEach((b) => {
- stringList.push({
- motd: b.motd,
- server: b.name,
- });
- });
+ serverList.currentServers.forEach((b) => {
+ stringList.push({
+ motd: b.motd,
+ server: b.name,
+ });
+ });
- serverList.getMOTDs(stringList).then((c) => {
- var updatedSL = motdList;
- c.forEach(
- (b: { server: string; motd: string }) => {
- updatedSL[b.server] = b.motd;
- }
- );
- setMotdList(updatedSL);
- setServers(serverList.currentServers);
- g(undefined);
- });
- });
- }
- }),
- {
- error: "Error while changing filters",
- loading: "Changing filters...",
- success: "Changed filters!",
- }
- );
- }}
- value={(() => {
- if (nameFilters["smaller-tf"]) {
- return "smaller";
- } else if (nameFilters["bigger-tf"]) {
- return "bigger";
- } else {
- return "none";
- }
- })()}
- >
-
-
-
-
-
- No/custom requirements
-
-
-
-
- Tags
-
-
- {allTags.map((tag) => (
-
+
+ Categories
+
+
+ {allCategories.map((categorie) => (
+ {
+ var filt = nameFilters;
+ filt["c-" + categorie.name] = b;
+ setNameFilters(filt);
+ if (b) {
+ var filt2 = filters;
+ filt2.push(categorie.condition);
+ setFilters(filt2);
+ } else {
+ var filt2 = filters;
+ filt2.splice(filt2.indexOf(categorie.condition), 1);
+ setFilters(filt2);
+ }
+ serverList.editFilters(filters);
+ serverList.fetchDataAndFilter().then(() => {
+ serverList.moveListDown();
- let stringList: Array<{
- server: string;
- motd: string;
- }> = [];
- let obj: any = {};
+ let stringList: Array<{
+ server: string;
+ motd: string;
+ }> = [];
+ let obj: any = {};
- serverList.currentServers.forEach((b) => {
- stringList.push({ motd: b.motd, server: b.name });
- });
+ serverList.currentServers.forEach((b) => {
+ stringList.push({ motd: b.motd, server: b.name });
+ });
- serverList.getMOTDs(stringList).then((c) => {
- var updatedSL = motdList;
- c.forEach((b: { server: string; motd: string }) => {
- updatedSL[b.server] = b.motd;
- });
- setMotdList(updatedSL);
- setServers(serverList.currentServers);
- });
- });
- }}
- checked={(() => {
- return nameFilters["c-" + categorie.name];
- })()}
- >
-
- {categorie.name}
-
-
- ))}
-
-
-
- View
-
-
- Grid
-
- {
- if (am)
- toast.warning(
- "These settings will not change over reloads because you have account specific options enabled",
- {
- action: {
- label: "Check settings",
- onClick: () =>
- router.push("/account/settings/options"),
- },
- }
- );
- setIPR(v);
- }}
- >
-
- 4 items per row
-
-
- 5 items per row
-
-
- 6 items per row
-
-
-
-
-
- Padding
-
- {
- if (am)
- toast.warning(
- "These settings will not change over reloads because you have account specific options enabled",
- {
- action: {
- label: "Check settings",
- onClick: () =>
- router.push("/account/settings/options"),
- },
- }
- );
- setPadding(v);
- }}
- >
- Default
- 15px
- 30px
- 40px
- 60px
- 100px
- 200px
-
-
- Only use padding on servers
-
-
-
-
- Sort
-
- {
- if (c === "favorites") router.push("/sort/favorites");
- }}
- >
-
- Players Online
-
-
- Favorites
-
-
-
-
-
-
- Show Hero
-
-
- router.push("/docs")}>
- View the docs
-
- {am && (
- router.push("/account/settings")}
- className="block"
- >
- Using saved settings in Preferences
-
- - Your using settings stored on your account, that are not - temporary. - -
- )}
-
-
-
-
-
+ serverList.getMOTDs(stringList).then((c) => {
+ var updatedSL = motdList;
+ c.forEach((b: { server: string; motd: string }) => {
+ updatedSL[b.server] = b.motd;
+ });
+ setMotdList(updatedSL);
+ setServers(serverList.currentServers);
+ });
+ });
+ }}
+ checked={(() => {
+ return nameFilters["c-" + categorie.name];
+ })()}
+ >
+
+ {categorie.name}
+
+
+ ))}
+
+
+
+ View
+
+
+ Mode
+
+
+ setPresentationMode(v as "grid" | "table")
+ }
+ >
+ Grid
+ Table
+
+
+
+
+
+ Grid
+
+
+ {
+ if (am)
+ toast.warning(
+ "These settings will not change over reloads because you have account specific options enabled",
+ {
+ action: {
+ label: "Check settings",
+ onClick: () =>
+ router.push("/account/settings/options"),
+ },
+ },
+ );
+ setIPR(v);
+ }}
+ >
+
+ 4 items per row
+
+
+ 5 items per row
+
+
+ 6 items per row
+
+
+
+
+
+ Padding
+
+ {
+ if (am)
+ toast.warning(
+ "These settings will not change over reloads because you have account specific options enabled",
+ {
+ action: {
+ label: "Check settings",
+ onClick: () =>
+ router.push("/account/settings/options"),
+ },
+ },
+ );
+ setPadding(v);
+ }}
+ >
+ Default
+ 15px
+ 30px
+ 40px
+ 60px
+ 100px
+ 200px
+
+
+ Only use padding on servers
+
+
+
+
+
+ Show Hero
+
+
+ router.push("/docs")}>
+ View the docs
+
+ {am && (
+ router.push("/account/settings")}
+ className="block"
+ >
+ Using saved settings in Preferences
+
+ + Your using settings stored on your account, that are not + temporary. + +
+ )}
+
+
+
+
+
-
-
- {
- serverList.moveListDown();
- let stringList: Array<{ server: string; motd: string }> = [];
- serverList.currentServers.forEach((b) => {
- stringList.push({ motd: b.motd, server: b.name });
- });
+
+ {presentationMode === "grid" && ( + {
+ serverList.moveListDown();
+ let stringList: Array<{ server: string; motd: string }> = [];
+ serverList.currentServers.forEach((b) => {
+ stringList.push({ motd: b.motd, server: b.name });
+ });
- serverList.getMOTDs(stringList).then((c) => {
- var updatedSL = motdList;
- c.forEach((b: { server: string; motd: string }) => {
- updatedSL[b.server] = b.motd;
- });
- setMotdList(updatedSL);
- setServers(serverList.currentServers);
- setLoading(false);
- });
- }}
- loader={
- {/** This looks stupid, but its the only way that works */}
-
- );
+ )} */}
+
-
- <>
- Meet MHSF,
the modern - server finder - -
-
+ +
+ the modern - server finder - -
- MHSF is the next generation server list for Minehut, with
- interactive filters,
{" "}
- intuitive keyboard shortcuts, and everything between.
-
+
-
-
-
-
- Servers
-
- events.emit("search-request-event")}
- >
- Search Servers
-
-
-
- {
- setRandomData(serverList.getRandomServer());
- setRandom(true);
- }}
- >
- Pick Random Server
-
- {
- toast.promise(
- new Promise((s, e) => {
- setLoading(true);
- serverList
- .fetchDataAndFilter()
- .then(() => {
- serverList.moveListDown();
+
+ )}
+
+ <>
+ {(!isSignedIn || hero) && (
+
- -
-
+
+ <>
+ Meet MHSF,
the modern + server finder + +
+
-
-
-
-
-
-
-
-
-
+ + For server owners + +
+
+
+ {features.map((feature, idx) => (
+
-
- )}
- the modern + server finder + +
+ MHSF is the next generation server list for Minehut, with
+ interactive filters,
{" "}
+ intuitive keyboard shortcuts, and everything between.
+
-
+
+ + For players + +
+
+
- - For server owners - -
-
-
- {features.map((feature, idx) => (
-
+
+
+
-
+
+
+
+
+
+
+
+
+
-
- - For players - -
-
-
+
+
-
+ 
- 
-
-
-
- -
- - For players - -
-
-
- Find what you want now, not later -
-
- Use interactive filters and customization modes to find the
- server of your choice
-
in less than 10 minutes.
-
-
-
-
+
+
+
+
+
+ +
+ + For players + +
+
+
+ Find what you want now, not later +
+
+ Use interactive filters and customization modes to find the
+ server of your choice
+
in less than 10 minutes.
+
+
+
+
-
-
- - - For server owners - -
-
-
- Make your server stand out -
-- Servers can have custom banners, Discord widgets, color schemes, - and descriptions, making your server stand out with information - that can be shown to players. -
-+ + For server owners + +
+
+
+ Make your server stand out +
++ Servers can have custom banners, Discord widgets, color schemes, + and descriptions, making your server stand out with information + that can be shown to players. +
+- -
-
-
- {serverList.currentServers[0] != undefined
- ? serverList.currentServers[0].name
- : "None"}{" "}
- {serverList.currentServers[0] != undefined && (
-
-
-
- = 3200
- ? "bg-clip-text text-transparent bg-gradient-to-r from-cyan-500 to-blue-500"
- : ""
- }
- >
- Servers online{" "}
-
- }
- className="relative z-0"
- desc={
-
-
-
-
-
- The server amount is over 3.2k, meaning that new servers
- have to go into a queue before being able to be online.{" "}
-
- (the server count isn't entirely accurate, so sometimes - you might not go into a queue even when the server count - is at 3.2k) -
-
- )}
-
- }
- icon={Network}
- >
- {serverList.getExtraData().total_servers >= 3200 && (
- = 3200
- ? "bg-clip-text text-transparent bg-gradient-to-r from-cyan-500 to-blue-500 "
- : ""
- }
- >
- {serverList.getExtraData().total_servers.toString()}
-
- {serverList.getExtraData().total_servers >= 3200 && (
- - (the server count isn't entirely accurate, so sometimes - you might not go into a queue even when the server count - is at 3.2k) -
-
+ +
+
+
+ {serverList.currentServers[0] != undefined
+ ? serverList.currentServers[0].name
+ : "None"}{" "}
+ {serverList.currentServers[0] != undefined && (
+
+
+
+ = 3200
+ ? "bg-clip-text text-transparent bg-gradient-to-r from-cyan-500 to-blue-500"
+ : ""
+ }
+ >
+ Servers online{" "}
+
+ }
+ className="relative z-0"
+ desc={
+
+
+
+
+
+ The server amount is over 3.2k, meaning that new servers
+ have to go into a queue before being able to be online.{" "}
+
+ (the server count isn't entirely accurate, so sometimes + you might not go into a queue even when the server count + is at 3.2k) +
+
+ )}
+
+ }
+ icon={Network}
+ >
+ {serverList.getExtraData().total_servers >= 3200 && (
+ = 3200
+ ? "bg-clip-text text-transparent bg-gradient-to-r from-cyan-500 to-blue-500 "
+ : ""
+ }
+ >
+ {serverList.getExtraData().total_servers.toString()}
+
+ {serverList.getExtraData().total_servers >= 3200 && (
+ + (the server count isn't entirely accurate, so sometimes + you might not go into a queue even when the server count + is at 3.2k) +
+
- Only allow smaller servers
-
- - Only allow servers that have the player range 7-15, - and cannot
- be Always Online. - -
- - - Only allow servers that have the player range 7-15, - and cannot
- be Always Online. - -
- Only allow bigger servers
-
- - Only allow servers with more than 15 players. - -
- - - Only allow servers with more than 15 players. - -
- {tag.docsName && tag.__filter == undefined && (
- {
- return nameFilters["t-" + tag.docsName];
- })()}
- onCheckedChange={async (b) => {
- var filt = nameFilters;
- filt["t-" + tag.docsName] = b;
- setNameFilters(filt);
- if (b) {
- var filt2 = filters;
- filt2.push(tag.condition);
- setFilters(filt2);
- } else {
- var filt2 = filters;
- filt2.splice(filt2.indexOf(tag.condition), 1);
- setFilters(filt2);
- }
- serverList.editFilters(filters);
- serverList.fetchDataAndFilter().then(() => {
- serverList.moveListDown();
+ serverList.getMOTDs(stringList).then((c) => {
+ var updatedSL = motdList;
+ c.forEach(
+ (b: { server: string; motd: string }) => {
+ updatedSL[b.server] = b.motd;
+ },
+ );
+ setMotdList(updatedSL);
+ setServers(serverList.currentServers);
+ g(undefined);
+ });
+ });
+ }
+ }),
+ {
+ error: "Error while changing filters",
+ loading: "Changing filters...",
+ success: "Changed filters!",
+ },
+ );
+ }}
+ value={(() => {
+ if (nameFilters["smaller-tf"]) {
+ return "smaller";
+ } else if (nameFilters["bigger-tf"]) {
+ return "bigger";
+ } else {
+ return "none";
+ }
+ })()}
+ >
+
+
+
+
+
+ No/custom requirements
+
+
+
+
+ Tags
+
+
+ {allTags.map((tag) => (
+
-
- Categories
-
-
- {allCategories.map((categorie) => (
- {
- var filt = nameFilters;
- filt["c-" + categorie.name] = b;
- setNameFilters(filt);
- if (b) {
- var filt2 = filters;
- filt2.push(categorie.condition);
- setFilters(filt2);
- } else {
- var filt2 = filters;
- filt2.splice(filt2.indexOf(categorie.condition), 1);
- setFilters(filt2);
- }
- serverList.editFilters(filters);
- serverList.fetchDataAndFilter().then(() => {
- serverList.moveListDown();
+ serverList.getMOTDs(stringList).then((c) => {
+ var updatedSL = motdList;
+ c.forEach(
+ (b: { server: string; motd: string }) => {
+ updatedSL[b.server] = b.motd;
+ },
+ );
+ setMotdList(updatedSL);
+ setServers(serverList.currentServers);
+ });
+ });
+ }}
+ >
+
+ {tag.docsName}
+
+
+ )}
+
+ ))}
+
+ Only allow smaller servers
+
+ + Only allow servers that have the player range 7-15, + and cannot
+ be Always Online. + +
+ + + Only allow servers that have the player range 7-15, + and cannot
+ be Always Online. + +
+ Only allow bigger servers
+
+ + Only allow servers with more than 15 players. + +
+ + + Only allow servers with more than 15 players. + +
+ {tag.docsName && tag.__filter == undefined && (
+ {
+ return nameFilters["t-" + tag.docsName];
+ })()}
+ onCheckedChange={async (b) => {
+ var filt = nameFilters;
+ filt["t-" + tag.docsName] = b;
+ setNameFilters(filt);
+ if (b) {
+ var filt2 = filters;
+ filt2.push(tag.condition);
+ setFilters(filt2);
+ } else {
+ var filt2 = filters;
+ filt2.splice(filt2.indexOf(tag.condition), 1);
+ setFilters(filt2);
+ }
+ serverList.editFilters(filters);
+ serverList.fetchDataAndFilter().then(() => {
+ serverList.moveListDown();
- let stringList: Array<{
- server: string;
- motd: string;
- }> = [];
- let obj: any = {};
+ let stringList: Array<{
+ server: string;
+ motd: string;
+ }> = [];
+ let obj: any = {};
- serverList.currentServers.forEach((b) => {
- stringList.push({
- motd: b.motd,
- server: b.name,
- });
- });
+ serverList.currentServers.forEach((b) => {
+ stringList.push({
+ motd: b.motd,
+ server: b.name,
+ });
+ });
- serverList.getMOTDs(stringList).then((c) => {
- var updatedSL = motdList;
- c.forEach(
- (b: { server: string; motd: string }) => {
- updatedSL[b.server] = b.motd;
- }
- );
- setMotdList(updatedSL);
- setServers(serverList.currentServers);
- });
- });
- }}
- >
-
- {tag.docsName}
-
-
- )}
-
- ))}
- - - Your using settings stored on your account, that are not - temporary. - -
+ + Your using settings stored on your account, that are not + temporary. + +
-
+ {presentationMode === "grid" && ( +
- {servers.map((b: any, i: number) => (
- <>
+ serverList.getMOTDs(stringList).then((c) => {
+ var updatedSL = motdList;
+ c.forEach((b: { server: string; motd: string }) => {
+ updatedSL[b.server] = b.motd;
+ });
+ setMotdList(updatedSL);
+ setServers(serverList.currentServers);
+ setLoading(false);
+ });
+ }}
+ loader={
+ {/** This looks stupid, but its the only way that works */}
+
-
-
-
+ {servers.map((b: any, i: number) => (
+ <>
+ {/* <>
{i === Number(ipr) && affiliates.length != 0 && (
-
))}
- )}
-
+ {
+ return (
+ <>
+
+
+
+
+ {c.data?.name}
+
+
+
+ {c.data?.name}
+
+
+ );
+ },
+ },
+ {
+ field: "playerData.playerCount",
+ headerName: "Players",
+ cellRenderer: (params: CustomCellRendererProps) => {
+ return (
+
+ {c.data?.author}
+ {c.data?.author}
+
+
+ );
+ },
+ },
+ {
+ headerName: "Tags",
+ valueGetter: (p) => (
+
+ )}
+
+
+ );
+}
+
+export function TagCR(params: CustomCellRendererProps) {
+ return {params.value};
}
export function TagShower(props: {
- server: OnlineServer;
- className?: string;
- unclickable?: boolean;
+ server: OnlineServer;
+ className?: string;
+ unclickable?: boolean;
}) {
- const [loading, setLoading] = useState(true);
- const [compatiableTags, setCompatiableTags] = useState<
- Array<{
- name: string;
- docsName?: string;
- tooltip: string;
- htmlDocs: string;
- role:
- | "default"
- | "destructive"
- | "outline"
- | "secondary"
- | "red"
- | "orange"
- | "yellow"
- | "green"
- | "lime"
- | "blue"
- | "teal"
- | "cyan"
- | "violet"
- | "indigo"
- | "purple"
- | "fuchsia"
- | "pink";
- }>
- >([]);
+ const [loading, setLoading] = useState(true);
+ const [compatiableTags, setCompatiableTags] = useState<
+ Array<{
+ name: string;
+ docsName?: string;
+ tooltip: string;
+ htmlDocs: string;
+ role:
+ | "default"
+ | "destructive"
+ | "outline"
+ | "secondary"
+ | "red"
+ | "orange"
+ | "yellow"
+ | "green"
+ | "lime"
+ | "blue"
+ | "teal"
+ | "cyan"
+ | "violet"
+ | "indigo"
+ | "purple"
+ | "fuchsia"
+ | "pink";
+ }>
+ >([]);
- useEffectOnce(() => {
- if (loading) {
- allTags.forEach((tag) => {
- tag.condition(props.server).then((b) => {
- if (b && tag.primary) {
- tag.name(props.server).then((n) => {
- compatiableTags.push({
- name: n,
- docsName: tag.docsName,
- tooltip: tag.tooltipDesc,
- htmlDocs: tag.htmlDocs,
- role: tag.role == undefined ? "secondary" : tag.role,
- });
- setLoading(false);
- });
- }
- });
- });
- }
- });
+ useEffectOnce(() => {
+ if (loading) {
+ allTags.forEach((tag) => {
+ tag.condition(props.server).then((b) => {
+ if (b && tag.primary) {
+ tag.name(props.server).then((n) => {
+ compatiableTags.push({
+ name: n,
+ docsName: tag.docsName,
+ tooltip: tag.tooltipDesc,
+ htmlDocs: tag.htmlDocs,
+ role: tag.role == undefined ? "secondary" : tag.role,
+ });
+ setLoading(false);
+ });
+ }
+ });
+ });
+ }
+ });
- if (loading) {
- return <>;
- }
+ if (loading) {
+ return <>;
+ }
- return (
-
+ {params.value == 0 ? (
+
+ ) : (
+
+ )}{" "}
+ {params.value}
+
+ );
+ },
+ },
+ {
+ headerName: "Owner",
+ valueGetter: (p) => p.data?.author ?? "--",
+ cellRenderer: (c: CustomCellRendererProps) => {
+ if (c.data.author === "--") {
+ return <>--;
+ }
+
+ return (
+ <>
+
+
+
+
+
+
+
+
+
+ Open up the server page to see more information
+ about the server
+
+
+
+ );
+ },
+ },
+ ]}
+ pagination={true}
+ paginationPageSize={50}
+ paginationPageSizeSelector={[10, 25, 50, 100]}
+ theme={resolvedTheme === "dark" ? themeDarkWarm : themeLightWarm}
+ defaultColDef={{
+ flex: 1,
+ }}
+ />
+
- {compatiableTags.map((t) => (
- <>
- {props.unclickable && (
-
- {t.name}
-
- )}
- {!props.unclickable && (
-
- )}
-
- ))}
-
- );
+ return (
+
+ {compatiableTags.map((t, i) => (
+
+ {props.unclickable && (
+
+ {t.name}
+
+ )}
+ {!props.unclickable && (
+
+ )}
+
+ ))}
+
+ );
}
diff --git a/src/components/ServerView.tsx b/src/components/ServerView.tsx
index f78fa0a..f305283 100644
--- a/src/components/ServerView.tsx
+++ b/src/components/ServerView.tsx
@@ -58,8 +58,9 @@ import IconDisplay from "./IconDisplay";
import { useClerk, useUser } from "@clerk/nextjs";
import { LoaderIcon } from "react-hot-toast";
import { Separator } from "./ui/separator";
-import { convert } from "@/components/NewChart";
+import { convert } from "@/components/charts/NewChart";
import { LoadingSpinner } from "./ui/loading-spinner";
+import { BadgeOfAffiliation } from "./Icon";
export default function ServerView(props: { server: string }) {
const [single, setSingle] = useState(new ServerSingle(props.server));
@@ -169,6 +170,22 @@ export default function ServerView(props: { server: string }) {
/>
)}
{props.server}
+ {props.server === "CoreBoxx" && (
+ found to be a high-quality server and should be a + good join for any player! + +
{["player_count", "favorites"].map((key) => {
@@ -149,9 +199,7 @@ export function NewChart({ server }: { server: string }) {
tickMargin={8}
minTickGap={32}
tickFormatter={(value) => {
- return new Date(value).toLocaleTimeString("en-US", {
- timeStyle: "short",
- });
+ return `${new Date(value).getMonth() + 1}/${new Date(value).getDate()}`;
}}
/>
{
- return new Date(value).toLocaleTimeString("en-US", {
+ return `${new Date(value).toLocaleDateString("en-US", {
+ day: "numeric",
+ month: "short",
+ })} ${new Date(value).toLocaleTimeString("en-US", {
timeStyle: "short",
- });
+ })}`;
}}
/>
}
/>
+ {activeChart === "player_count" && (
+
+ >([]);
+ const [loading, setLoading] = useState(true);
+
+ useEffect(() => {
+ getRelativeServerData(server).then((d) => {
+ const newv: Array<{ relativePercentage: number; date: string }> = [];
+
+ d.forEach((c) =>
+ newv.push({
+ relativePercentage: c.relativePrecentage * 100,
+ date: c.date,
+ })
+ );
+ setChartData(newv);
+ setLoading(false);
+ });
+ }, [server]);
+
+ if (loading)
+ return (
+ <>
+
+
+ Relative percentage of {server}
+
+ Shows the last 30 entries.{" "}
+
+
+
+
+ This is the percentage of players on your server
+ compared to the entire Minehut network.
+
+
+
+
+
+
+
+
+ `${new Date(value).toLocaleTimeString("en-US", {
+ timeStyle: "short",
+ })}`
+ }
+ />
+ `${value}%`}
+ />
+ {
+ return `${new Date(value).toLocaleDateString("en-US", {
+ day: "numeric",
+ month: "short",
+ })} ${new Date(value).toLocaleTimeString("en-US", {
+ timeStyle: "short",
+ })}`;
+ }}
+ />
+ }
+ />
+
+
+
+
+ );
+}
diff --git a/src/components/misc/AffiliatePopup.tsx b/src/components/misc/AffiliatePopup.tsx
new file mode 100644
index 0000000..e72a776
--- /dev/null
+++ b/src/components/misc/AffiliatePopup.tsx
@@ -0,0 +1,94 @@
+/*
+ * MHSF, Minehut Server List
+ * All external content is rather licensed under the ECA Agreement
+ * located here: https://mhsf.app/docs/legal/external-content-agreement
+ *
+ * All code under MHSF is licensed under the MIT License
+ * by open source contributors
+ *
+ * Copyright (c) 2024 dvelo
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+import {
+ DialogDescription,
+ DialogHeader,
+ DialogTitle,
+ DialogTrigger,
+} from "@/components/ui/dialog";
+import { useState } from "react";
+import useClipboard from "@/lib/useClipboard";
+import { Button } from "../ui/button";
+import { Check } from "lucide-react";
+
+export default function AffiliatePopup() {
+ const [textCopied, setTextCopied] = useState(false);
+ const clipboard = useClipboard();
+
+ return (
+
+ CoreBoxx
+
+ We won't claim to be a "unique server" or any of that. But we do aim to
+ give you the highest quality BoxPvP! Here's what we have:
- 50 + progression mines over 11 worlds, plus many more for events and other + items
- Balanced gear sets - just because someone is a bit ahead + of you doesn't mean you deserve to die in one shot
- We're + non-P2W, and we mean it! All perks are for convenience or benefit + everyone online!
- A rapidly-growing, tight-knit community with + events and giveaways
- Quests and storyline in development, in + case mining gets boring
+
+
+
+
+
+
+
+
+
+
+ );
+}
diff --git a/src/components/misc/StickyTopbar.tsx b/src/components/misc/StickyTopbar.tsx
index b3e788f..2898c10 100644
--- a/src/components/misc/StickyTopbar.tsx
+++ b/src/components/misc/StickyTopbar.tsx
@@ -61,7 +61,7 @@ export default function StickyTopbar({
return (
@@ -69,7 +68,7 @@ const DialogContent = React.forwardRef<
ref={ref}
className={cn(
"fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border bg-background p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg",
- className,
+ className
)}
{...props}
>
@@ -90,7 +89,7 @@ const DialogHeader = ({
@@ -104,7 +103,7 @@ const DialogFooter = ({
@@ -119,7 +118,7 @@ const DialogTitle = React.forwardRef<
ref={ref}
className={cn(
"text-lg font-semibold leading-none tracking-tight",
- className,
+ className
)}
{...props}
/>
diff --git a/src/config/banners.tsx b/src/config/banners.tsx
index a096f10..c1864f4 100644
--- a/src/config/banners.tsx
+++ b/src/config/banners.tsx
@@ -1,41 +1,104 @@
+import GradientBanner from "@/components/effects/gradient-banner";
+import MainBanner from "@/components/feat/MainBanner";
+import { Button } from "@/components/ui/button";
+import Link from "next/link";
+import { useState, useEffect } from "react";
+import { DialogContent, Dialog } from "@/components/ui/dialog";
+import AffiliatePopup from "@/components/misc/AffiliatePopup";
+import { Gradient } from "stripe-gradient";
+
export const defaultBanners: {
bannerSpace: number;
bannerContent: React.ReactNode;
}[] = [
- // The sponsor banner ALWAYS has to be first.
- // {
- // bannerSpace: 2,
- // bannerContent: (
- //
- // {" "}
- //
- // ??? — an official affiliate of MHSF{" "}
- //
- // Lorem ipsum odor amet, consectetuer adipiscing elit. — check it out - //
- //
- // ),
- // },
+ // The affilation banner ALWAYS has to be first.
+ {
+ bannerSpace: 2,
+ bannerContent: (
+ <>
+
- // Your not in production!{" "}
- //
- //
- //
- //
- // ),
- // };
+ if (process.env.NEXT_PUBLIC_VERCEL_ENV !== "production")
+ return {
+ bannerSpace: 1,
+ bannerContent: (
+
+ Your not in production!{" "}
+
+
+
+
+ ),
+ };
return undefined;
},
];
diff --git a/src/lib/api.ts b/src/lib/api.ts
index 49f4e8f..966cf20 100644
--- a/src/lib/api.ts
+++ b/src/lib/api.ts
@@ -38,452 +38,464 @@
import { Achievement } from "./types/achievement";
const connector = (
- endpoint: string,
- options: { version: number; starting?: string },
+ endpoint: string,
+ options: { version: number; starting?: string }
) =>
- `${options.starting == undefined ? "/" : `${options.starting}/`}api/v${options.version}${endpoint}`;
+ `${options.starting == undefined ? "/" : `${options.starting}/`}api/v${options.version}${endpoint}`;
async function apiConstructor(
- connector: string,
- requestInit: RequestInit,
- modifier: (data: any) => K,
+ connector: string,
+ requestInit: RequestInit,
+ modifier: (data: any) => K
): Promise {
- try {
- const response = await fetch(connector, requestInit);
+ try {
+ const response = await fetch(connector, requestInit);
- if (response.status >= 400) {
- throw Error("Error while running API");
- }
- return modifier(await response.json());
- } catch {
- throw Error("Error while running API");
- }
+ if (response.status >= 400) {
+ throw Error("Error while running API");
+ }
+ return modifier(await response.json());
+ } catch {
+ throw Error("Error while running API");
+ }
}
export async function getMOTDFromServer(
- list: Array<{ server: string; motd: string }>,
+ list: Array<{ server: string; motd: string }>
): Promise> {
- const result = await fetch(
- process.env.NEXT_PUBLIC_ALTERNATE_MOTD_ENDPOINT ??
- connector("/motd", { version: 1 }),
- {
- body: JSON.stringify({ motd: list }),
- method: "POST",
- headers: {
- "Content-Type": "application/json",
- },
- },
- );
+ const result = await fetch(
+ process.env.NEXT_PUBLIC_ALTERNATE_MOTD_ENDPOINT ??
+ connector("/motd", { version: 1 }),
+ {
+ body: JSON.stringify({ motd: list }),
+ method: "POST",
+ headers: {
+ "Content-Type": "application/json",
+ },
+ }
+ );
- let json = await result.json();
- return json.result;
+ let json = await result.json();
+ return json.result;
+}
+
+export async function getRelativeServerData(
+ server: string
+): Promise> {
+ const result = await fetch(
+ connector("/history/" + server + "/get-relative-data", { version: 0 })
+ );
+
+ const json = await result.json();
+ return json.data;
}
export async function getCommunityServerFavorites(
- server: string,
+ server: string
): Promise {
- const result = await fetch(
- connector(`/favorites/${server}/community-favorites`, { version: 0 }),
- {
- method: "POST",
- headers: {
- "Content-Type": "application/json",
- },
- },
- );
+ const result = await fetch(
+ connector(`/favorites/${server}/community-favorites`, { version: 0 }),
+ {
+ method: "POST",
+ headers: {
+ "Content-Type": "application/json",
+ },
+ }
+ );
- let json = await result.json();
- return json.result;
+ let json = await result.json();
+ return json.result;
}
/** requires authentication */
export async function favoriteServer(server: string) {
- try {
- await fetch(
- connector(`/favorites/${server}/favorite-server`, { version: 0 }),
- {
- method: "POST",
- headers: {
- "Content-Type": "application/json",
- },
- },
- );
- } catch {
- throw Error("Not authenticated with a user.");
- }
+ try {
+ await fetch(
+ connector(`/favorites/${server}/favorite-server`, { version: 0 }),
+ {
+ method: "POST",
+ headers: {
+ "Content-Type": "application/json",
+ },
+ }
+ );
+ } catch {
+ throw Error("Not authenticated with a user.");
+ }
}
/** requires authentication */
export async function isFavorited(server: string): Promise {
- try {
- const response = await fetch(
- connector(`/favorites/${server}/favorited`, { version: 0 }),
- {
- method: "POST",
- headers: {
- "Content-Type": "application/json",
- },
- },
- );
+ try {
+ const response = await fetch(
+ connector(`/favorites/${server}/favorited`, { version: 0 }),
+ {
+ method: "POST",
+ headers: {
+ "Content-Type": "application/json",
+ },
+ }
+ );
- return (await response.json()).result;
- } catch {
- throw Error("Not authenticated with a user.");
- }
+ return (await response.json()).result;
+ } catch {
+ throw Error("Not authenticated with a user.");
+ }
}
/** requires authentication */
export async function getAccountFavorites(): Promise> {
- try {
- const response = await fetch(
- connector(`/favorites/account-favorites`, { version: 0 }),
- {
- method: "POST",
- headers: {
- "Content-Type": "application/json",
- },
- },
- );
+ try {
+ const response = await fetch(
+ connector(`/favorites/account-favorites`, { version: 0 }),
+ {
+ method: "POST",
+ headers: {
+ "Content-Type": "application/json",
+ },
+ }
+ );
- return (await response.json()).result;
- } catch {
- throw Error("Not authenticated with a user.");
- }
+ return (await response.json()).result;
+ } catch {
+ throw Error("Not authenticated with a user.");
+ }
}
/**
* currently not used in frontend yet
*/
export async function getHistoricalData(
- server: string,
- scopes: Array<"player_count" | "favorites" | "server" | "time">,
+ server: string,
+ scopes: Array<"player_count" | "favorites" | "server" | "time">
): Promise<
- Array<{
- player_count?: number;
- favorites?: number;
- server?: string;
- time?: number;
- }>
+ Array<{
+ player_count?: number;
+ favorites?: number;
+ server?: string;
+ time?: number;
+ }>
> {
- const response = await fetch(
- connector(`/history/${server}/get-historical-data`, { version: 0 }),
- {
- method: "POST",
- body: JSON.stringify({ scopes }),
- headers: {
- "Content-Type": "application/json",
- },
- },
- );
+ const response = await fetch(
+ connector(`/history/${server}/get-historical-data`, { version: 0 }),
+ {
+ method: "POST",
+ body: JSON.stringify({ scopes }),
+ headers: {
+ "Content-Type": "application/json",
+ },
+ }
+ );
- return (await response.json()).data;
+ return (await response.json()).data;
}
export async function getShortTermData(
- server: string,
- scopes: Array<"player_count" | "favorites" | "server" | "date">,
-): Promise<
- Array<{
- player_count?: number;
- favorites?: number;
- server?: string;
- time?: number;
- }>
-> {
- const response = await fetch(
- connector(`/history/${server}/get-short-term-data`, { version: 0 }),
- {
- method: "POST",
- body: JSON.stringify({ scopes }),
- headers: {
- "Content-Type": "application/json",
- },
- },
- );
+ server: string,
+ scopes: Array<"player_count" | "favorites" | "server" | "date">
+): Promise<{
+ data: Array<{
+ player_count?: number;
+ favorites?: number;
+ server?: string;
+ time?: number;
+ }>;
+ dataMax: number;
+}> {
+ const response = await fetch(
+ connector(`/history/${server}/get-short-term-data`, { version: 0 }),
+ {
+ method: "POST",
+ body: JSON.stringify({ scopes }),
+ headers: {
+ "Content-Type": "application/json",
+ },
+ }
+ );
- return (await response.json()).data;
+ return await response.json();
}
export async function getMetaShortTerm(
- scopes: Array<"total_players" | "total_servers" | "date">,
+ scopes: Array<"total_players" | "total_servers" | "date">
): Promise<
- Array<{
- total_players?: number;
- total_servers?: number;
- unix?: number;
- }>
+ Array<{
+ total_players?: number;
+ total_servers?: number;
+ unix?: number;
+ }>
> {
- const response = await fetch(
- connector(`/history/meta-short-term-data`, { version: 0 }),
- {
- method: "POST",
- body: JSON.stringify({ scopes }),
- headers: {
- "Content-Type": "application/json",
- },
- },
- );
+ const response = await fetch(
+ connector(`/history/meta-short-term-data`, { version: 0 }),
+ {
+ method: "POST",
+ body: JSON.stringify({ scopes }),
+ headers: {
+ "Content-Type": "application/json",
+ },
+ }
+ );
- return (await response.json()).data;
+ return (await response.json()).data;
}
/** requires authentication */
export async function linkMCAccount(code: string): Promise {
- try {
- const response = await fetch(
- connector(`/account-linking/claim-account-code`, { version: 0 }),
- {
- method: "POST",
- headers: {
- "Content-Type": "application/json",
- },
- body: JSON.stringify({ code }),
- },
- );
+ try {
+ const response = await fetch(
+ connector(`/account-linking/claim-account-code`, { version: 0 }),
+ {
+ method: "POST",
+ headers: {
+ "Content-Type": "application/json",
+ },
+ body: JSON.stringify({ code }),
+ }
+ );
- if (response.status == 400) {
- return undefined;
- }
+ if (response.status == 400) {
+ return undefined;
+ }
- return (await response.json()).player;
- } catch {
- throw Error("Incorrect code");
- }
+ return (await response.json()).player;
+ } catch {
+ throw Error("Incorrect code");
+ }
}
/** requires authentication */
export async function unlinkMCAccount(): Promise {
- try {
- const response = await fetch(
- connector(`/account-linking/unlink-account`, { version: 0 }),
- {
- method: "POST",
- headers: {
- "Content-Type": "application/json",
- },
- },
- );
+ try {
+ const response = await fetch(
+ connector(`/account-linking/unlink-account`, { version: 0 }),
+ {
+ method: "POST",
+ headers: {
+ "Content-Type": "application/json",
+ },
+ }
+ );
- return true;
- } catch {
- throw Error(
- "Not authenticated with a user or user already linked account.",
- );
- }
+ return true;
+ } catch {
+ throw Error(
+ "Not authenticated with a user or user already linked account."
+ );
+ }
}
export async function serverOwned(server: string): Promise {
- try {
- const response = await fetch(
- connector(`/account-linking/is-owned`, { version: 0 }),
- {
- method: "POST",
- headers: {
- "Content-Type": "application/json",
- },
- body: JSON.stringify({ server }),
- },
- );
+ try {
+ const response = await fetch(
+ connector(`/account-linking/is-owned`, { version: 0 }),
+ {
+ method: "POST",
+ headers: {
+ "Content-Type": "application/json",
+ },
+ body: JSON.stringify({ server }),
+ }
+ );
- return (await response.json()).owned;
- } catch {
- throw Error("Error while running API");
- }
+ return (await response.json()).owned;
+ } catch {
+ throw Error("Error while running API");
+ }
}
/** requires authentication */
export async function userOwnedServer(server: string): Promise {
- try {
- const response = await fetch(
- connector(`/account-linking/owned-user`, { version: 0 }),
- {
- method: "POST",
- headers: {
- "Content-Type": "application/json",
- },
- body: JSON.stringify({ server }),
- },
- );
+ try {
+ const response = await fetch(
+ connector(`/account-linking/owned-user`, { version: 0 }),
+ {
+ method: "POST",
+ headers: {
+ "Content-Type": "application/json",
+ },
+ body: JSON.stringify({ server }),
+ }
+ );
- return (await response.json()).result;
- } catch {
- throw Error("Error while running API");
- }
+ return (await response.json()).result;
+ } catch {
+ throw Error("Error while running API");
+ }
}
/** requires authentication */
export async function ownServer(server: string): Promise {
- try {
- const response = await fetch(
- connector(`/account-linking/own-server`, { version: 0 }),
- {
- method: "POST",
- headers: {
- "Content-Type": "application/json",
- },
- body: JSON.stringify({ server }),
- },
- );
+ try {
+ const response = await fetch(
+ connector(`/account-linking/own-server`, { version: 0 }),
+ {
+ method: "POST",
+ headers: {
+ "Content-Type": "application/json",
+ },
+ body: JSON.stringify({ server }),
+ }
+ );
- if (response.status >= 400) {
- return false;
- }
+ if (response.status >= 400) {
+ return false;
+ }
- return true;
- } catch {
- throw Error("Error while running API");
- }
+ return true;
+ } catch {
+ throw Error("Error while running API");
+ }
}
/** requires authentication */
export async function unownServer(server: string): Promise {
- try {
- const response = await fetch(
- connector(`/account-linking/unown-server`, { version: 0 }),
- {
- method: "POST",
- headers: {
- "Content-Type": "application/json",
- },
- body: JSON.stringify({ server }),
- },
- );
+ try {
+ const response = await fetch(
+ connector(`/account-linking/unown-server`, { version: 0 }),
+ {
+ method: "POST",
+ headers: {
+ "Content-Type": "application/json",
+ },
+ body: JSON.stringify({ server }),
+ }
+ );
- if (response.status == 400) {
- return false;
- }
+ if (response.status == 400) {
+ return false;
+ }
- return true;
- } catch {
- throw Error("Error while running API");
- }
+ return true;
+ } catch {
+ throw Error("Error while running API");
+ }
}
/** requires authentication */
export async function setCustomization(
- server: string,
- customization: any,
+ server: string,
+ customization: any
): Promise {
- try {
- const response = await fetch(
- connector(`/customization/${server}/set`, { version: 0 }),
- {
- method: "POST",
- headers: {
- "Content-Type": "application/json",
- },
- body: JSON.stringify({ customization }),
- },
- );
+ try {
+ const response = await fetch(
+ connector(`/customization/${server}/set`, { version: 0 }),
+ {
+ method: "POST",
+ headers: {
+ "Content-Type": "application/json",
+ },
+ body: JSON.stringify({ customization }),
+ }
+ );
- if (response.status == 400) {
- throw Error("Error while running API");
- return false;
- }
+ if (response.status == 400) {
+ throw Error("Error while running API");
+ return false;
+ }
- return true;
- } catch {
- throw Error("Error while running API");
- }
+ return true;
+ } catch {
+ throw Error("Error while running API");
+ }
}
export async function getCustomization(server: string): Promise {
- try {
- const response = await fetch(
- connector(`/customization/${server}/get`, { version: 0 }),
- {
- method: "POST",
- headers: {
- "Content-Type": "application/json",
- },
- },
- );
+ try {
+ const response = await fetch(
+ connector(`/customization/${server}/get`, { version: 0 }),
+ {
+ method: "POST",
+ headers: {
+ "Content-Type": "application/json",
+ },
+ }
+ );
- if (response.status == 400) {
- return false;
- }
+ if (response.status == 400) {
+ return false;
+ }
- return (await response.json()).results;
- } catch {
- throw Error("Error while running API");
- }
+ return (await response.json()).results;
+ } catch {
+ throw Error("Error while running API");
+ }
}
export async function sortedFavorites(): Promise<
- Array<{ server: string; favorites: number }> | boolean
+ Array<{ server: string; favorites: number }> | boolean
> {
- try {
- const response = await fetch(
- connector(`/sorting/favorites`, { version: 0 }),
- {
- method: "POST",
- headers: {
- "Content-Type": "application/json",
- },
- },
- );
+ try {
+ const response = await fetch(
+ connector(`/sorting/favorites`, { version: 0 }),
+ {
+ method: "POST",
+ headers: {
+ "Content-Type": "application/json",
+ },
+ }
+ );
- if (response.status == 400) {
- return false;
- }
+ if (response.status == 400) {
+ return false;
+ }
- return (await response.json()).results;
- } catch {
- throw Error("Error while running API");
- }
+ return (await response.json()).results;
+ } catch {
+ throw Error("Error while running API");
+ }
}
export async function reportServer(
- server: string,
- reason: string,
+ server: string,
+ reason: string
): Promise {
- try {
- const response = await fetch(connector(`/report-server`, { version: 1 }), {
- method: "POST",
- headers: {
- "Content-Type": "application/json",
- },
- body: JSON.stringify({ server, reason }),
- });
+ try {
+ const response = await fetch(connector(`/report-server`, { version: 1 }), {
+ method: "POST",
+ headers: {
+ "Content-Type": "application/json",
+ },
+ body: JSON.stringify({ server, reason }),
+ });
- if (response.status == 400) {
- return false;
- }
+ if (response.status == 400) {
+ return false;
+ }
- return true;
- } catch {
- throw Error("Error while running API");
- }
+ return true;
+ } catch {
+ throw Error("Error while running API");
+ }
}
export async function setAccountSL(
- data: number | boolean | null,
- type: "srv" | "ipr" | "pad",
+ data: number | boolean | null,
+ type: "srv" | "ipr" | "pad"
): Promise {
- try {
- const response = await fetch(
- connector(`/account-sl/change`, { version: 0 }),
- {
- method: "POST",
- headers: {
- "Content-Type": "application/json",
- },
- body: JSON.stringify({ data, type }),
- },
- );
+ try {
+ const response = await fetch(
+ connector(`/account-sl/change`, { version: 0 }),
+ {
+ method: "POST",
+ headers: {
+ "Content-Type": "application/json",
+ },
+ body: JSON.stringify({ data, type }),
+ }
+ );
- if (response.status === 400) {
- return false;
- }
+ if (response.status === 400) {
+ return false;
+ }
- return true;
- } catch {
- throw Error("Error while running API");
- }
+ return true;
+ } catch {
+ throw Error("Error while running API");
+ }
}
export const getAchievements = async (server: string) =>
- apiConstructor<{ _id: string; name: string; achievements: Achievement[] }[]>(
- connector(`/achievements/${server}`, { version: 0 }),
- {},
- (data) => data.result,
- );
+ apiConstructor<{ _id: string; name: string; achievements: Achievement[] }[]>(
+ connector(`/achievements/${server}`, { version: 0 }),
+ {},
+ (data) => data.result
+ );
diff --git a/src/components/misc/AffilatePopup.tsx b/src/lib/hooks/use-server-exists.tsx
similarity index 74%
rename from src/components/misc/AffilatePopup.tsx
rename to src/lib/hooks/use-server-exists.tsx
index c54e8c9..bd385a4 100644
--- a/src/components/misc/AffilatePopup.tsx
+++ b/src/lib/hooks/use-server-exists.tsx
@@ -27,3 +27,24 @@
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
* OTHER DEALINGS IN THE SOFTWARE.
*/
+
+import { useEffect, useState } from "react";
+
+export function useServerExists(server: string) {
+ const [serverExists, setServerExists] = useState(true);
+ const [loading, setLoading] = useState(true);
+
+ useEffect(() => {
+ fetch("https://api.minehut.com/server/" + server + "?byName=true")
+ .then((c) => c.json())
+ .then((d) => {
+ setServerExists(d.server != null);
+ setLoading(false);
+ });
+ });
+
+ return {
+ serverExists,
+ loading,
+ };
+}
diff --git a/src/lib/list.ts b/src/lib/list.ts
index 8be16ea..714972a 100644
--- a/src/lib/list.ts
+++ b/src/lib/list.ts
@@ -5,7 +5,7 @@ import MiniMessage from "minimessage-js";
var numberOfItemsInView = 20;
export default class ServersList {
- private servers: Array = [];
+ servers: Array = [];
currentServers: Array = [];
private filters: Array<(server: OnlineServer) => Promise> = [];
extraData: any = { total_players: 0, total_servers: 0 };
diff --git a/src/pages/api/v0/history/[server]/get-relative-data.ts b/src/pages/api/v0/history/[server]/get-relative-data.ts
new file mode 100644
index 0000000..64d3447
--- /dev/null
+++ b/src/pages/api/v0/history/[server]/get-relative-data.ts
@@ -0,0 +1,97 @@
+/*
+ * MHSF, Minehut Server List
+ * All external content is rather licensed under the ECA Agreement
+ * located here: https://mhsf.app/docs/legal/external-content-agreement
+ *
+ * All code under MHSF is licensed under the MIT License
+ * by open source contributors
+ *
+ * Copyright (c) 2024 dvelo
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ *//*
+ * MHSF, Minehut Server List
+ * All external content is rather licensed under the ECA Agreement
+ * located here: https://list.mlnehut.com/docs/legal/external-content-agreement
+ *
+ * All code under MHSF is licensed under the MIT License
+ * by open source contributors
+ *
+ * Copyright (c) 2024 dvelo
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to
+ * deal in the Software without restriction, including without limitation the
+ * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ * sell copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+import { MongoClient } from "mongodb";
+import { NextApiRequest, NextApiResponse } from "next";
+
+export default async function handler(
+ req: NextApiRequest,
+ res: NextApiResponse
+) {
+ const client = new MongoClient(process.env.MONGO_DB as string);
+ const db = client.db("mhsf").collection("history");
+ const mh = client.db("mhsf").collection("mh");
+ const server = req.query.server as string;
+
+ const allData = await db.find({ server }).toArray();
+ const data: any[] = [];
+ if (server === "peww") console.log(allData.slice(-30));
+
+ for (const d of allData.slice(-30)) {
+ const dateOfEntry = new Date(d.date);
+ const result = await mh
+ .find({
+ date: {
+ $gte: new Date(dateOfEntry.getTime() - 1000 * 60 * 60),
+ $lt: new Date(dateOfEntry.getTime() + 1000 * 60 * 60),
+ },
+ })
+ .toArray();
+
+ if (result.length > 0) {
+ const resultedData = result[0];
+ data.push({
+ relativePrecentage: d.player_count / resultedData.total_players,
+ date: dateOfEntry,
+ });
+ }
+ }
+
+ client.close();
+ res.send({ data });
+}
diff --git a/src/pages/api/v0/history/[server]/get-short-term-data.ts b/src/pages/api/v0/history/[server]/get-short-term-data.ts
index a52b753..9d81cae 100644
--- a/src/pages/api/v0/history/[server]/get-short-term-data.ts
+++ b/src/pages/api/v0/history/[server]/get-short-term-data.ts
@@ -38,11 +38,16 @@ export default async function handler(
const client = new MongoClient(process.env.MONGO_DB as string);
const db = client.db("mhsf").collection("history");
const server = req.query.server as string;
+ let dataMax = 0;
const scopes: Array = checkForInfoOrLeave(res, req.body.scopes);
const allData = await db.find({ server }).toArray();
const data: any[] = [];
+ dataMax = (
+ await db.find({ server }).sort({ player_count: -1 }).limit(1).toArray()
+ )[0].player_count;
+
allData.forEach((d) => {
const result: any = {};
scopes.forEach((b) => {
@@ -52,7 +57,7 @@ export default async function handler(
});
client.close();
- res.send({ data });
+ res.send({ data, dataMax });
}
function checkForInfoOrLeave(res: NextApiResponse, info: any) {
diff --git a/yarn.lock b/yarn.lock
index fbc1388..5ab260d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2639,6 +2639,26 @@ acorn@^8.9.0:
resolved "https://registry.npmjs.org/acorn/-/acorn-8.11.3.tgz"
integrity sha512-Y9rRfJG5jcKOE0CLisYbojUjIrIEE7AGMzA/Sm4BslANhbS+cDMpgBdcPT91oJ7OuJ9hYJBx59RjbhxVnrF8Xg==
+ag-charts-types@11.0.3:
+ version "11.0.3"
+ resolved "https://registry.yarnpkg.com/ag-charts-types/-/ag-charts-types-11.0.3.tgz#a4aa4825b298014c1323a1e5832dec0ef4e5e135"
+ integrity sha512-q7O2viQXPyO014QVH7KjFCUmQ/NvMBx9ReZtramQ44u+/aAa0ttLi/coK+V0Hse4/MG1eB/2XhgymdooQ0Kalg==
+
+ag-grid-community@33.0.3:
+ version "33.0.3"
+ resolved "https://registry.yarnpkg.com/ag-grid-community/-/ag-grid-community-33.0.3.tgz#51511d5b048eedf24b3de596967e74a3272bfe88"
+ integrity sha512-HZeVmVieZ5Gm9j09Itecqm+OIX8X6cU4TJToUbsXv3DxdO9SK5/s8aAJAwBHtNRXOhHrhqQYwrY2yc3OtzWwcQ==
+ dependencies:
+ ag-charts-types "11.0.3"
+
+ag-grid-react@^33.0.3:
+ version "33.0.3"
+ resolved "https://registry.yarnpkg.com/ag-grid-react/-/ag-grid-react-33.0.3.tgz#24f0c65ba48363e53db915aab13bb537b8e35025"
+ integrity sha512-6IcraSVqsUG/hzTeZ0D0dtddAcZKcWdN75ek/O+lCA6r22abJPe33nHBYVezkTV8k6D3JhA24mlTwduzn0GZLQ==
+ dependencies:
+ ag-grid-community "33.0.3"
+ prop-types "^15.8.1"
+
ajv@^6.12.4:
version "6.12.6"
resolved "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz"
+ compared to the entire Minehut network.
+
Server players / Minehut players
+ - 50 + progression mines over 11 worlds, plus many more for events and other + items
- Balanced gear sets - just because someone is a bit ahead + of you doesn't mean you deserve to die in one shot
- We're + non-P2W, and we mean it! All perks are for convenience or benefit + everyone online!
- A rapidly-growing, tight-knit community with + events and giveaways
- Quests and storyline in development, in + case mining gets boring
+
+
+ CoreBoxx.minehut.gg{" "}
+
+
+ CoreBoxx is an official affiliate of MHSF. This server was found to be
+ a high-quality server and should be a good join for any player!
+
+ - // Lorem ipsum odor amet, consectetuer adipiscing elit. — check it out - //
setOpen(true)} className="cursor-pointer">
+
+
+ CoreBoxx — an official affiliate of MHSF{" "}
+
+ Season 3 is out the doors for the best box server on Minehut +
+
+
+
+ );
+}
+
export const bannerHooks: (() =>
| { bannerSpace: number; bannerContent: React.ReactNode }
| undefined)[] = [
() => {
- // if (process.env.NEXT_PUBLIC_VERCEL_ENV !== "production")
- // return {
- // bannerSpace: 1,
- // bannerContent: (
- // + Season 3 is out the doors for the best box server on Minehut +