Fixed things and added tokens finally
This commit is contained in:
@@ -65,7 +65,7 @@ export default function Sidebar({ level, ign, player, guild }: SidebarProps) {
|
||||
</p>
|
||||
<p>
|
||||
<span className="font-bold">{"Challenges Completed: "}</span>
|
||||
<span>{formatNumber(getTotalChallenges(player.challenges.all_time))}</span>
|
||||
<span>{formatNumber(getTotalChallenges(player.challenges))}</span>
|
||||
</p>
|
||||
</div>
|
||||
<Separator className="my-4" />
|
||||
@@ -155,11 +155,11 @@ export default function Sidebar({ level, ign, player, guild }: SidebarProps) {
|
||||
<h1 className="text-xl font-bold underline">Social Links</h1>
|
||||
<div className="flex gap-2">
|
||||
<SocialIcons
|
||||
discord={player.socialMedia.links.DISCORD}
|
||||
twitch={player.socialMedia.links.TWITCH}
|
||||
youtube={player.socialMedia.links.YOUTUBE}
|
||||
twitter={player.socialMedia.links.TWITCH}
|
||||
hypixel={player.socialMedia.links.HYPIXEL}
|
||||
discord={player?.socialMedia?.links?.DISCORD}
|
||||
twitch={player?.socialMedia?.links?.TWITCH}
|
||||
youtube={player?.socialMedia?.links?.YOUTUBE}
|
||||
twitter={player?.socialMedia?.links?.TWITCH}
|
||||
hypixel={player?.socialMedia?.links?.HYPIXEL}
|
||||
/>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -9,7 +9,13 @@ import { FiTwitter } from "react-icons/fi"
|
||||
import { toast } from "sonner"
|
||||
|
||||
export default function SocialIcons(
|
||||
{ discord, twitch, youtube, twitter, hypixel }: { discord?: string, twitch?: string, youtube?: string, twitter?: string, hypixel?: string }
|
||||
{ discord, twitch, youtube, twitter, hypixel }: {
|
||||
discord?: string
|
||||
twitch?: string
|
||||
youtube?: string
|
||||
twitter?: string
|
||||
hypixel?: string
|
||||
}
|
||||
) {
|
||||
return (
|
||||
<>
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
import { getBedwarsStar, getTextColor } from "@/lib/hypixel/bedwars"
|
||||
import { getBedwarsStar, getPrestigeName, getTextColor } from "@/lib/hypixel/bedwars"
|
||||
import { getBWLevelForExp } from "@/lib/hypixel/bedwarsLevel"
|
||||
import { bedwarsLevelColors } from "@/lib/hypixelFormatters"
|
||||
import { cn } from "@/lib/utils"
|
||||
import Multicolored from "../../_components/Multicolored"
|
||||
|
||||
export function BedwarsLevel({ xp }: { xp: number }) {
|
||||
@@ -15,10 +16,68 @@ export function BedwarsLevel({ xp }: { xp: number }) {
|
||||
export function BedwarsProgress({ level, percent }: { level: number, percent: number }) {
|
||||
return (
|
||||
<div className="flex items-center mb-10">
|
||||
<div className={`mr-2 text-mc-${getTextColor(level)}`}>{level}</div>
|
||||
<div className={`h-5 bg-mc-${getTextColor(level)} rounded-l-md`} style={{ width: `${percent}%` }}></div>
|
||||
<LevelNumber level={level} className="mr-2" />
|
||||
<Progress level={level} percent={percent} />
|
||||
<div className="flex-1 h-5 rounded-r-md bg-background"></div>
|
||||
<div className={`ml-2 text-mc-${getTextColor(level)}`}>{level + 1}</div>
|
||||
<LevelNumber level={level + 1} className="ml-2" />
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
export function BedWarsPrestige({ level }: { level: number }) {
|
||||
if (level >= 1000 && level < 2000) {
|
||||
return (
|
||||
<span
|
||||
style={{
|
||||
backgroundImage: "linear-gradient(to left,#a0a,#f5f,#5ff,#5f5,#ff5,#fa0,#f55)",
|
||||
WebkitBackgroundClip: "text",
|
||||
color: "transparent"
|
||||
}}
|
||||
>
|
||||
{`${getPrestigeName(level)} ${getBedwarsStar(level)}`}
|
||||
</span>
|
||||
)
|
||||
}
|
||||
|
||||
return (
|
||||
<span className={`text-mc-${getTextColor(level)}`}>
|
||||
{`${getPrestigeName(level)} ${getBedwarsStar(level)}`}
|
||||
</span>
|
||||
)
|
||||
}
|
||||
|
||||
function LevelNumber({ level, className }: { level: number, className?: string }) {
|
||||
if (level >= 1000 && level < 2000) {
|
||||
return (
|
||||
<div
|
||||
className={className}
|
||||
style={{
|
||||
backgroundImage: "linear-gradient(to left,#a0a,#f5f,#5ff,#5f5,#ff5,#fa0,#f55)",
|
||||
WebkitBackgroundClip: "text",
|
||||
color: "transparent"
|
||||
}}
|
||||
>
|
||||
{level}
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
return <div className={cn(`text-mc-${getTextColor(level)}`, className)}>{level}</div>
|
||||
}
|
||||
|
||||
function Progress({ level, percent }: { level: number, percent: number }) {
|
||||
if (level >= 1000 && level < 2000) {
|
||||
return (
|
||||
<div
|
||||
className="h-5 rounded-l-md"
|
||||
style={{
|
||||
width: `${percent}%`,
|
||||
background: "repeating-linear-gradient(to right,#f55,#fa0,#ff5,#5f5,#5ff,#f5f,#a0a,#f55 16rem)"
|
||||
}}
|
||||
>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
||||
return <div className={`h-5 bg-mc-${getTextColor(level)} rounded-l-md`} style={{ width: `${percent}%` }}></div>
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
|
||||
import { Card, CardContent } from "@/components/ui/card"
|
||||
import { Collapsible, CollapsibleContent, CollapsibleTrigger } from "@/components/ui/collapsible"
|
||||
import { getBedwarsStar, getPrestigeName, getTextColor } from "@/lib/hypixel/bedwars"
|
||||
import { formatNumber } from "@/lib/formatters"
|
||||
import { getBWLevelForExp, getTotalExpForLevel } from "@/lib/hypixel/bedwarsLevel"
|
||||
import { getProgress } from "@/lib/hypixel/general"
|
||||
import { Player } from "@/lib/schema/player"
|
||||
@@ -10,7 +10,7 @@ import { Separator } from "@radix-ui/react-separator"
|
||||
import { ChevronDown, ChevronUp, Menu } from "lucide-react"
|
||||
import { useEffect, useRef, useState } from "react"
|
||||
import CollapsedStats from "../../_components/CollapsedStats"
|
||||
import { BedwarsLevel, BedwarsProgress } from "./bedwars-components"
|
||||
import { BedwarsLevel, BedWarsPrestige, BedwarsProgress } from "./bedwars-components"
|
||||
|
||||
export default function BedwarsStats({ stats }: { stats: Player["player"]["stats"]["Bedwars"] }) {
|
||||
const ref = useRef<HTMLDivElement>(null)
|
||||
@@ -105,13 +105,11 @@ export default function BedwarsStats({ stats }: { stats: Player["player"]["stats
|
||||
</p>
|
||||
<p>
|
||||
<span className="font-bold">{"Prestige: "}</span>
|
||||
<span className={`text-mc-${getTextColor(level)}`}>
|
||||
{`${getPrestigeName(level)} ${getBedwarsStar(level)}`}
|
||||
</span>
|
||||
<BedWarsPrestige level={level} />
|
||||
</p>
|
||||
<p>
|
||||
<span className="font-bold">{"Tokens: "}</span>
|
||||
<span className="text-mc-dark-green">{}</span>
|
||||
<span className="text-mc-dark-green">{formatNumber(stats.coins)}</span>
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user