diff --git a/app/app/[locale]/(rankings)/clans/[[...clansRankingsOptions]]/ClansTable.tsx b/app/app/[locale]/(rankings)/clans/[[...clansRankingsOptions]]/ClansTable.tsx index 8d65c356..f782af72 100644 --- a/app/app/[locale]/(rankings)/clans/[[...clansRankingsOptions]]/ClansTable.tsx +++ b/app/app/[locale]/(rankings)/clans/[[...clansRankingsOptions]]/ClansTable.tsx @@ -2,6 +2,7 @@ import { type BHClan } from "db/generated/client" import { CLANS_RANKINGS_PER_PAGE } from "./constants" +import { Trans } from "@lingui/macro" import { cleanString } from "common/helpers/cleanString" import { cn } from "@/lib/utils" import { formatUnixTime } from "common/helpers/date" @@ -45,9 +46,11 @@ export const ClansTable = ({ clans, page }: ClansTableProps) => {

- {!!clan.created && clan.created > 0 - ? formatUnixTime(clan.created) - : "N/A"} + {!!clan.created && clan.created > 0 ? ( + formatUnixTime(clan.created) + ) : ( + N/A + )}

{clan.xp}

diff --git a/app/app/[locale]/(rankings)/ranked/[[...rankingsOptions]]/@ranked1v1/Rankings1v1Table.tsx b/app/app/[locale]/(rankings)/ranked/(leaderboard)/[[...rankingsOptions]]/@ranked1v1/Rankings1v1Table.tsx similarity index 100% rename from app/app/[locale]/(rankings)/ranked/[[...rankingsOptions]]/@ranked1v1/Rankings1v1Table.tsx rename to app/app/[locale]/(rankings)/ranked/(leaderboard)/[[...rankingsOptions]]/@ranked1v1/Rankings1v1Table.tsx diff --git a/app/app/[locale]/(rankings)/ranked/[[...rankingsOptions]]/@ranked1v1/page.tsx b/app/app/[locale]/(rankings)/ranked/(leaderboard)/[[...rankingsOptions]]/@ranked1v1/page.tsx similarity index 100% rename from app/app/[locale]/(rankings)/ranked/[[...rankingsOptions]]/@ranked1v1/page.tsx rename to app/app/[locale]/(rankings)/ranked/(leaderboard)/[[...rankingsOptions]]/@ranked1v1/page.tsx diff --git a/app/app/[locale]/(rankings)/ranked/[[...rankingsOptions]]/@ranked2v2/Rankings2v2Table.tsx b/app/app/[locale]/(rankings)/ranked/(leaderboard)/[[...rankingsOptions]]/@ranked2v2/Rankings2v2Table.tsx similarity index 100% rename from app/app/[locale]/(rankings)/ranked/[[...rankingsOptions]]/@ranked2v2/Rankings2v2Table.tsx rename to app/app/[locale]/(rankings)/ranked/(leaderboard)/[[...rankingsOptions]]/@ranked2v2/Rankings2v2Table.tsx diff --git a/app/app/[locale]/(rankings)/ranked/[[...rankingsOptions]]/@ranked2v2/page.tsx b/app/app/[locale]/(rankings)/ranked/(leaderboard)/[[...rankingsOptions]]/@ranked2v2/page.tsx similarity index 100% rename from app/app/[locale]/(rankings)/ranked/[[...rankingsOptions]]/@ranked2v2/page.tsx rename to app/app/[locale]/(rankings)/ranked/(leaderboard)/[[...rankingsOptions]]/@ranked2v2/page.tsx diff --git a/app/app/[locale]/(rankings)/ranked/[[...rankingsOptions]]/@rotating/RankingsRotatingTable.tsx b/app/app/[locale]/(rankings)/ranked/(leaderboard)/[[...rankingsOptions]]/@rotating/RankingsRotatingTable.tsx similarity index 100% rename from app/app/[locale]/(rankings)/ranked/[[...rankingsOptions]]/@rotating/RankingsRotatingTable.tsx rename to app/app/[locale]/(rankings)/ranked/(leaderboard)/[[...rankingsOptions]]/@rotating/RankingsRotatingTable.tsx diff --git a/app/app/[locale]/(rankings)/ranked/[[...rankingsOptions]]/@rotating/page.tsx b/app/app/[locale]/(rankings)/ranked/(leaderboard)/[[...rankingsOptions]]/@rotating/page.tsx similarity index 100% rename from app/app/[locale]/(rankings)/ranked/[[...rankingsOptions]]/@rotating/page.tsx rename to app/app/[locale]/(rankings)/ranked/(leaderboard)/[[...rankingsOptions]]/@rotating/page.tsx diff --git a/app/app/[locale]/(rankings)/ranked/[[...rankingsOptions]]/error.tsx b/app/app/[locale]/(rankings)/ranked/(leaderboard)/[[...rankingsOptions]]/error.tsx similarity index 100% rename from app/app/[locale]/(rankings)/ranked/[[...rankingsOptions]]/error.tsx rename to app/app/[locale]/(rankings)/ranked/(leaderboard)/[[...rankingsOptions]]/error.tsx diff --git a/app/app/[locale]/(rankings)/ranked/[[...rankingsOptions]]/layout.tsx b/app/app/[locale]/(rankings)/ranked/(leaderboard)/[[...rankingsOptions]]/layout.tsx similarity index 95% rename from app/app/[locale]/(rankings)/ranked/[[...rankingsOptions]]/layout.tsx rename to app/app/[locale]/(rankings)/ranked/(leaderboard)/[[...rankingsOptions]]/layout.tsx index 5223391a..18b515cd 100644 --- a/app/app/[locale]/(rankings)/ranked/[[...rankingsOptions]]/layout.tsx +++ b/app/app/[locale]/(rankings)/ranked/(leaderboard)/[[...rankingsOptions]]/layout.tsx @@ -1,4 +1,4 @@ -import { BracketSelection } from "../../BracketSelection" +import { BracketSelection } from "../../../BracketSelection" import { Paginator } from "ui/base/Paginator" import { type ReactNode } from "react" import { rankedRegionSchema, rankedRegions } from "bhapi/constants" diff --git a/app/app/[locale]/_landing/DiscordCard.tsx b/app/app/[locale]/_landing/DiscordCard.tsx index 950f3b13..2a6796a7 100644 --- a/app/app/[locale]/_landing/DiscordCard.tsx +++ b/app/app/[locale]/_landing/DiscordCard.tsx @@ -7,7 +7,7 @@ import { Trans } from "@lingui/macro" import { clamp } from "common/helpers/math" import { useEffect, useRef } from "react" -const DISCORD_MEMBERS = "3.8k+" +const DISCORD_MEMBERS = "4.5k+" export const DiscordCard = () => { const containerRef = useRef(null) @@ -73,7 +73,6 @@ export const DiscordCard = () => { containerClassName="w-20 h-20 rounded-3xl -mt-10 ml-6 border-8 border-bgVar2 overflow-hidden" /> - {/* {t`${DISCORD_MEMBERS} discord members, and growing!`} */} {DISCORD_MEMBERS} discord members, and growing! diff --git a/app/app/[locale]/_layout/ErrorDisplay.tsx b/app/app/[locale]/_layout/ErrorDisplay.tsx index 9dd5a593..a1bb0fcd 100644 --- a/app/app/[locale]/_layout/ErrorDisplay.tsx +++ b/app/app/[locale]/_layout/ErrorDisplay.tsx @@ -16,6 +16,7 @@ export const ErrorDisplay = ({ error, }: ErrorDisplayProps) => { useEffect(() => { + // eslint-disable-next-line no-console console.log("error", error) // TODO: Log the error to an error reporting service }, [error]) diff --git a/app/app/[locale]/_layout/Footer.tsx b/app/app/[locale]/_layout/Footer.tsx index a453d9da..c5463c7c 100644 --- a/app/app/[locale]/_layout/Footer.tsx +++ b/app/app/[locale]/_layout/Footer.tsx @@ -50,12 +50,14 @@ export const Footer = ({ className }: FooterProps) => { .
- Corehalla is neither associated nor endorsed by Blue Mammoth - Games and doesn't reflect the views or opinions of Blue - Mammoth Games or anyone officially involved in developing - Brawlhalla. -
- Brawlhalla and Blue Mammoth Games are trademarks of{" "} + + Corehalla is neither associated nor endorsed by Blue + Mammoth Games and doesn't reflect the views or + opinions of Blue Mammoth Games or anyone officially + involved in developing Brawlhalla. +
+ Brawlhalla and Blue Mammoth Games are trademarks of{" "} + Blue Mammoth Games diff --git a/app/app/[locale]/_layout/Header.tsx b/app/app/[locale]/_layout/Header.tsx index 92e72b9a..ee95996c 100644 --- a/app/app/[locale]/_layout/Header.tsx +++ b/app/app/[locale]/_layout/Header.tsx @@ -80,7 +80,9 @@ export const Header = ({ className }: HeaderProps) => { )} - + ) : (