Added drag and drop

This commit is contained in:
2025-09-16 13:11:59 +02:00
parent ff7df6a309
commit 4417485c93
4 changed files with 167 additions and 20 deletions

View File

@@ -4,6 +4,9 @@
"": { "": {
"name": "stats-hypixel", "name": "stats-hypixel",
"dependencies": { "dependencies": {
"@dnd-kit/core": "^6.3.1",
"@dnd-kit/sortable": "^10.0.0",
"@dnd-kit/utilities": "^3.2.2",
"@radix-ui/react-accordion": "^1.2.12", "@radix-ui/react-accordion": "^1.2.12",
"@radix-ui/react-collapsible": "^1.1.12", "@radix-ui/react-collapsible": "^1.1.12",
"@radix-ui/react-separator": "^1.1.7", "@radix-ui/react-separator": "^1.1.7",
@@ -13,6 +16,7 @@
"class-variance-authority": "^0.7.1", "class-variance-authority": "^0.7.1",
"clsx": "^2.1.1", "clsx": "^2.1.1",
"geist": "^1.4.2", "geist": "^1.4.2",
"js-cookie": "^3.0.5",
"lucide-react": "^0.528.0", "lucide-react": "^0.528.0",
"motion": "^12.23.12", "motion": "^12.23.12",
"next": "15.5.2", "next": "15.5.2",
@@ -30,6 +34,7 @@
"@eslint/eslintrc": "^3", "@eslint/eslintrc": "^3",
"@next/eslint-plugin-next": "15.5.2", "@next/eslint-plugin-next": "15.5.2",
"@tailwindcss/postcss": "^4", "@tailwindcss/postcss": "^4",
"@types/js-cookie": "^3.0.6",
"@types/node": "^20", "@types/node": "^20",
"@types/react": "19.1.12", "@types/react": "19.1.12",
"@types/react-dom": "19.1.9", "@types/react-dom": "19.1.9",
@@ -62,6 +67,14 @@
"@designbycode/tailwindcss-text-stroke": ["@designbycode/tailwindcss-text-stroke@1.3.0", "", { "peerDependencies": { "tailwindcss": ">=3.0.0 || >=3.0.0-alpha.1" } }, "sha512-EyZi2EDv+/v55JF7OFrPUUJHr0r/C9bZtvhWNpamMj5MjAEMqBMhcO1ZW9aXAD2viszgtlnYLIta80NJtsuy6w=="], "@designbycode/tailwindcss-text-stroke": ["@designbycode/tailwindcss-text-stroke@1.3.0", "", { "peerDependencies": { "tailwindcss": ">=3.0.0 || >=3.0.0-alpha.1" } }, "sha512-EyZi2EDv+/v55JF7OFrPUUJHr0r/C9bZtvhWNpamMj5MjAEMqBMhcO1ZW9aXAD2viszgtlnYLIta80NJtsuy6w=="],
"@dnd-kit/accessibility": ["@dnd-kit/accessibility@3.1.1", "", { "dependencies": { "tslib": "^2.0.0" }, "peerDependencies": { "react": ">=16.8.0" } }, "sha512-2P+YgaXF+gRsIihwwY1gCsQSYnu9Zyj2py8kY5fFvUM1qm2WA2u639R6YNVfU4GWr+ZM5mqEsfHZZLoRONbemw=="],
"@dnd-kit/core": ["@dnd-kit/core@6.3.1", "", { "dependencies": { "@dnd-kit/accessibility": "^3.1.1", "@dnd-kit/utilities": "^3.2.2", "tslib": "^2.0.0" }, "peerDependencies": { "react": ">=16.8.0", "react-dom": ">=16.8.0" } }, "sha512-xkGBRQQab4RLwgXxoqETICr6S5JlogafbhNsidmrkVv2YRs5MLwpjoF2qpiGjQt8S9AoxtIV603s0GIUpY5eYQ=="],
"@dnd-kit/sortable": ["@dnd-kit/sortable@10.0.0", "", { "dependencies": { "@dnd-kit/utilities": "^3.2.2", "tslib": "^2.0.0" }, "peerDependencies": { "@dnd-kit/core": "^6.3.0", "react": ">=16.8.0" } }, "sha512-+xqhmIIzvAYMGfBYYnbKuNicfSsk4RksY2XdmJhT+HAC01nix6fHCztU68jooFiMUB01Ky3F0FyOvhG/BZrWkg=="],
"@dnd-kit/utilities": ["@dnd-kit/utilities@3.2.2", "", { "dependencies": { "tslib": "^2.0.0" }, "peerDependencies": { "react": ">=16.8.0" } }, "sha512-+MKAJEOfaBe5SmV6t34p80MMKhjvUz0vRrvVJbPT0WElzaOJ/1xs+D+KDv+tD/NE5ujfrChEcshd4fLn0wpiqg=="],
"@dprint/darwin-arm64": ["@dprint/darwin-arm64@0.50.1", "", { "os": "darwin", "cpu": "arm64" }, "sha512-NNKf3dxXn567pd/hpCVLHLbC0dI7s3YvQnUEwjRTOAQVMp6O7/ME+Tg1RPGsDP1IB+Y2fIYSM4qmG02zQrqjAQ=="], "@dprint/darwin-arm64": ["@dprint/darwin-arm64@0.50.1", "", { "os": "darwin", "cpu": "arm64" }, "sha512-NNKf3dxXn567pd/hpCVLHLbC0dI7s3YvQnUEwjRTOAQVMp6O7/ME+Tg1RPGsDP1IB+Y2fIYSM4qmG02zQrqjAQ=="],
"@dprint/darwin-x64": ["@dprint/darwin-x64@0.50.1", "", { "os": "darwin", "cpu": "x64" }, "sha512-PcY75U3UC/0CLOxWzE0zZJZ2PxzUM5AX2baYL1ovgDGCfqO1H0hINiyxfx/8ncGgPojWBkLs+zrcFiGnXx7BQg=="], "@dprint/darwin-x64": ["@dprint/darwin-x64@0.50.1", "", { "os": "darwin", "cpu": "x64" }, "sha512-PcY75U3UC/0CLOxWzE0zZJZ2PxzUM5AX2baYL1ovgDGCfqO1H0hINiyxfx/8ncGgPojWBkLs+zrcFiGnXx7BQg=="],
@@ -278,6 +291,8 @@
"@types/estree": ["@types/estree@1.0.8", "", {}, "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w=="], "@types/estree": ["@types/estree@1.0.8", "", {}, "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w=="],
"@types/js-cookie": ["@types/js-cookie@3.0.6", "", {}, "sha512-wkw9yd1kEXOPnvEeEV1Go1MmxtBJL0RR79aOTAApecWFVu7w0NNXNqhcWgvw2YgZDYadliXkl14pa3WXw5jlCQ=="],
"@types/json-schema": ["@types/json-schema@7.0.15", "", {}, "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA=="], "@types/json-schema": ["@types/json-schema@7.0.15", "", {}, "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA=="],
"@types/json5": ["@types/json5@0.0.29", "", {}, "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ=="], "@types/json5": ["@types/json5@0.0.29", "", {}, "sha512-dRLjCWHYg4oaA77cxO64oO+7JwCwnIzkZPdrrC71jQmQtlhM556pwKo5bUzqvZndkVbeFLIIi+9TC40JNF5hNQ=="],
@@ -644,6 +659,8 @@
"jiti": ["jiti@2.5.1", "", { "bin": { "jiti": "lib/jiti-cli.mjs" } }, "sha512-twQoecYPiVA5K/h6SxtORw/Bs3ar+mLUtoPSc7iMXzQzK8d7eJ/R09wmTwAjiamETn1cXYPGfNnu7DMoHgu12w=="], "jiti": ["jiti@2.5.1", "", { "bin": { "jiti": "lib/jiti-cli.mjs" } }, "sha512-twQoecYPiVA5K/h6SxtORw/Bs3ar+mLUtoPSc7iMXzQzK8d7eJ/R09wmTwAjiamETn1cXYPGfNnu7DMoHgu12w=="],
"js-cookie": ["js-cookie@3.0.5", "", {}, "sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw=="],
"js-tokens": ["js-tokens@4.0.0", "", {}, "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="], "js-tokens": ["js-tokens@4.0.0", "", {}, "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="],
"js-yaml": ["js-yaml@4.1.0", "", { "dependencies": { "argparse": "^2.0.1" }, "bin": { "js-yaml": "bin/js-yaml.js" } }, "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA=="], "js-yaml": ["js-yaml@4.1.0", "", { "dependencies": { "argparse": "^2.0.1" }, "bin": { "js-yaml": "bin/js-yaml.js" } }, "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA=="],

View File

@@ -13,6 +13,9 @@
"fmt": "dprint fmt src/**/*.ts src/**/*.tsx" "fmt": "dprint fmt src/**/*.ts src/**/*.tsx"
}, },
"dependencies": { "dependencies": {
"@dnd-kit/core": "^6.3.1",
"@dnd-kit/sortable": "^10.0.0",
"@dnd-kit/utilities": "^3.2.2",
"@radix-ui/react-accordion": "^1.2.12", "@radix-ui/react-accordion": "^1.2.12",
"@radix-ui/react-collapsible": "^1.1.12", "@radix-ui/react-collapsible": "^1.1.12",
"@radix-ui/react-separator": "^1.1.7", "@radix-ui/react-separator": "^1.1.7",
@@ -22,6 +25,7 @@
"class-variance-authority": "^0.7.1", "class-variance-authority": "^0.7.1",
"clsx": "^2.1.1", "clsx": "^2.1.1",
"geist": "^1.4.2", "geist": "^1.4.2",
"js-cookie": "^3.0.5",
"lucide-react": "^0.528.0", "lucide-react": "^0.528.0",
"motion": "^12.23.12", "motion": "^12.23.12",
"next": "15.5.2", "next": "15.5.2",
@@ -39,6 +43,7 @@
"@eslint/eslintrc": "^3", "@eslint/eslintrc": "^3",
"@next/eslint-plugin-next": "15.5.2", "@next/eslint-plugin-next": "15.5.2",
"@tailwindcss/postcss": "^4", "@tailwindcss/postcss": "^4",
"@types/js-cookie": "^3.0.6",
"@types/node": "^20", "@types/node": "^20",
"@types/react": "19.1.12", "@types/react": "19.1.12",
"@types/react-dom": "19.1.9", "@types/react-dom": "19.1.9",

View File

@@ -1,7 +1,14 @@
"use client" "use client"
import { Accordion } from "@/components/ui/accordion" import { Accordion } from "@/components/ui/accordion"
import { closestCenter, DndContext, DragEndEvent, KeyboardSensor, PointerSensor, useSensor, useSensors } from "@dnd-kit/core"
import { arrayMove, SortableContext, sortableKeyboardCoordinates, verticalListSortingStrategy } from "@dnd-kit/sortable"
import { useSortable } from "@dnd-kit/sortable"
import { CSS } from "@dnd-kit/utilities"
import Cookies from "js-cookie"
import { GripVertical } from "lucide-react"
import { usePathname } from "next/navigation" import { usePathname } from "next/navigation"
import { useEffect, useState } from "react"
import { Player } from "@/lib/schema/player" import { Player } from "@/lib/schema/player"
import ArcadeStats from "./_stats/arcade/arcade" import ArcadeStats from "./_stats/arcade/arcade"
@@ -18,6 +25,41 @@ import TNTGamesStats from "./_stats/tnt-games/tnt-games"
import UHCStats from "./_stats/uhc/uhc" import UHCStats from "./_stats/uhc/uhc"
import WoolGamesStats from "./_stats/woolgames/woolgames" import WoolGamesStats from "./_stats/woolgames/woolgames"
interface SortableStatItemProps {
id: string
children: React.ReactNode
}
function SortableStatItem({ id, children }: SortableStatItemProps) {
const {
attributes,
listeners,
setNodeRef,
transform,
transition,
isDragging
} = useSortable({ id })
const style = {
transform: CSS.Transform.toString(transform),
transition,
opacity: isDragging ? 0.5 : 1
}
return (
<div ref={setNodeRef} style={style} className="relative group">
<div
{...attributes}
{...listeners}
className="absolute -left-6 top-1/2 z-10 p-1 opacity-0 transition-opacity -translate-y-1/2 group-hover:opacity-50 hover:opacity-100 cursor-grab active:cursor-grabbing"
>
<GripVertical className="size-4 text-muted-foreground" />
</div>
{children}
</div>
)
}
export function PlayerPageLoadText() { export function PlayerPageLoadText() {
const path = usePathname() const path = usePathname()
@@ -25,28 +67,105 @@ export function PlayerPageLoadText() {
} }
export default function PlayerStats( export default function PlayerStats(
{ stats, achievements }: { stats: NonNullable<Player["player"]["stats"]>, achievements: Player["player"]["achievements"] } { stats, achievements, layout }: {
stats: NonNullable<Player["player"]["stats"]>
achievements: Player["player"]["achievements"]
layout: string[] | undefined
}
) { ) {
return ( const statsComponents = {
<div className="mx-auto w-full lg:mx-0 lg:w-3/4 max-w-120 md:max-w-7/10"> "bedwars": <BedwarsStats stats={stats.Bedwars} />,
<Accordion type="multiple" className="space-y-4"> "skywars": (
<BedwarsStats stats={stats.Bedwars} />
<SkyWarsStats <SkyWarsStats
stats={stats.SkyWars} stats={stats.SkyWars}
achievements_skywars_opal_obsession={achievements?.["skywars_opal_obsession"] ?? 0} achievements_skywars_opal_obsession={achievements?.["skywars_opal_obsession"] ?? 0}
/> />
<DuelsStats stats={stats.Duels} /> ),
<MurderMysteryStats stats={stats.MurderMystery} /> "duels": <DuelsStats stats={stats.Duels} />,
<BuildBattleStats stats={stats.BuildBattle} /> "murder-mystery": <MurderMysteryStats stats={stats.MurderMystery} />,
<UHCStats stats={stats.UHC} /> "build-battle": <BuildBattleStats stats={stats.BuildBattle} />,
<PitStats stats={stats.Pit} /> "uhc": <UHCStats stats={stats.UHC} />,
<TNTGamesStats stats={stats.TNTGames} /> "pit": <PitStats stats={stats.Pit} />,
<MegaWallsStats stats={stats.MegaWalls} /> "tnt-games": <TNTGamesStats stats={stats.TNTGames} />,
<CopsAndCrimsStats stats={stats.CopsAndCrims} /> "megawalls": <MegaWallsStats stats={stats.MegaWalls} />,
<WoolGamesStats stats={stats.WoolGames} /> "copsandcrims": <CopsAndCrimsStats stats={stats.CopsAndCrims} />,
<BlitzStats stats={stats.Blitz} /> "woolgames": <WoolGamesStats stats={stats.WoolGames} />,
<ArcadeStats stats={stats.Arcade} /> "blitz": <BlitzStats stats={stats.Blitz} />,
"arcade": <ArcadeStats stats={stats.Arcade} />
} as const
const defaultOrder = Object.keys(statsComponents).sort()
const orderToUse = layout || defaultOrder
const [statsOrder, setStatsOrder] = useState<string[]>(layout || defaultOrder)
const [isClient, setIsClient] = useState(false)
const sensors = useSensors(
useSensor(PointerSensor),
useSensor(KeyboardSensor, {
coordinateGetter: sortableKeyboardCoordinates
})
)
function updateStatsOrder(arr: string[]) {
Cookies.set("player-stats-order", JSON.stringify(arr), {
secure: process.env.NODE_ENV === "production",
sameSite: "lax",
expires: 365
})
}
function handleDragEnd(event: DragEndEvent) {
const { active, over } = event
if (over && active.id !== over.id) {
const oldIndex = statsOrder.indexOf(active.id as string)
const newIndex = statsOrder.indexOf(over.id as string)
const newOrder = arrayMove(statsOrder, oldIndex, newIndex)
setStatsOrder(newOrder)
updateStatsOrder(newOrder)
}
}
useEffect(() => {
setIsClient(true)
if (layout && layout.length > 0) {
setStatsOrder(layout)
}
}, [layout])
if (!isClient) {
return (
<div className="mx-auto w-full lg:mx-0 lg:w-3/4 max-w-120 md:max-w-7/10">
<Accordion type="multiple" className="space-y-4">
{orderToUse.map((statKey) => (
<div key={statKey}>
{statsComponents[statKey as keyof typeof statsComponents]}
</div>
))}
</Accordion> </Accordion>
</div> </div>
) )
} }
return (
<div className="mx-auto w-full lg:mx-0 lg:w-3/4 max-w-120 md:max-w-7/10">
<DndContext
sensors={sensors}
collisionDetection={closestCenter}
onDragEnd={handleDragEnd}
>
<SortableContext items={statsOrder} strategy={verticalListSortingStrategy}>
<Accordion type="multiple" className="space-y-4">
{statsOrder.map((statKey) => (
<SortableStatItem key={statKey} id={statKey}>
{statsComponents[statKey as keyof typeof statsComponents]}
</SortableStatItem>
))}
</Accordion>
</SortableContext>
</DndContext>
</div>
)
}

View File

@@ -8,7 +8,9 @@ import { getPlayer } from "@/lib/hypixel/api/player"
import { getExactLevel } from "@/lib/hypixel/general/level" import { getExactLevel } from "@/lib/hypixel/general/level"
import { Loader2Icon, ShieldAlert } from "lucide-react" import { Loader2Icon, ShieldAlert } from "lucide-react"
import { Metadata } from "next" import { Metadata } from "next"
import { cookies } from "next/headers"
import { Suspense } from "react" import { Suspense } from "react"
import z from "zod"
import PlayerStats, { PlayerPageLoadText } from "./_client" import PlayerStats, { PlayerPageLoadText } from "./_client"
import Sidebar from "./_components/Sidebar" import Sidebar from "./_components/Sidebar"
@@ -46,6 +48,7 @@ export default function PlayerPage({ params }: PageProps<"/player/[ign]">) {
async function SuspendedPage({ params }: Pick<PageProps<"/player/[ign]">, "params">) { async function SuspendedPage({ params }: Pick<PageProps<"/player/[ign]">, "params">) {
const { ign: pign } = await params const { ign: pign } = await params
const c = await cookies()
const mc = await getUuid(pign) const mc = await getUuid(pign)
if (!mc) { if (!mc) {
@@ -70,6 +73,9 @@ async function SuspendedPage({ params }: Pick<PageProps<"/player/[ign]">, "param
const guild = await getGuild(mc.id) const guild = await getGuild(mc.id)
const level = getExactLevel(player.networkExp) const level = getExactLevel(player.networkExp)
const schema = z.array(z.string())
const { data: layout } = schema.safeParse(JSON.parse(c.get("stats-order")?.value ?? "null"))
return ( return (
<div className="flex flex-col items-center pb-5"> <div className="flex flex-col items-center pb-5">
<DisplayName <DisplayName
@@ -101,7 +107,7 @@ async function SuspendedPage({ params }: Pick<PageProps<"/player/[ign]">, "param
session={session} session={session}
/> />
{player.stats !== undefined ? {player.stats !== undefined ?
<PlayerStats stats={player.stats} achievements={player.achievements} /> : <PlayerStats stats={player.stats} achievements={player.achievements} layout={layout} /> :
( (
<div className="w-3/4"> <div className="w-3/4">
<Card> <Card>