diff --git a/src/commands/inactive.tsx b/src/commands/inactive.tsx index 89bcb0d42..b5687f3b6 100644 --- a/src/commands/inactive.tsx +++ b/src/commands/inactive.tsx @@ -1,7 +1,7 @@ import { SlashCommandBuilder } from 'discord.js'; import GenericStats from '../components/GenericStats/index.js'; import NoData, { NoDataType } from '../components/NoData.js'; -import PoweredByWargaming from '../components/PoweredByWargaming.js'; +import PoweredBy, { PoweredByType } from '../components/PoweredBy.js'; import TitleBar from '../components/TitleBar.js'; import Wrapper from '../components/Wrapper.js'; import { BLITZ_SERVERS } from '../constants/servers.js'; @@ -79,7 +79,7 @@ export default { {!hasInactiveMembers && } {hasInactiveMembers && } - + ); }, diff --git a/src/commands/ownedtanks.tsx b/src/commands/ownedtanks.tsx index 843eafa08..a7d9ffd59 100644 --- a/src/commands/ownedtanks.tsx +++ b/src/commands/ownedtanks.tsx @@ -1,6 +1,6 @@ import { SlashCommandBuilder } from 'discord.js'; import NoData, { NoDataType } from '../components/NoData.js'; -import PoweredByWargaming from '../components/PoweredByWargaming.js'; +import PoweredBy, { PoweredByType } from '../components/PoweredBy.js'; import * as Tanks from '../components/Tanks/index.js'; import TitleBar from '../components/TitleBar.js'; import Wrapper from '../components/Wrapper.js'; @@ -115,7 +115,7 @@ export default { )} - + ); }, diff --git a/src/commands/stats.tsx b/src/commands/stats.tsx index e0f85a615..2bff4e4e7 100644 --- a/src/commands/stats.tsx +++ b/src/commands/stats.tsx @@ -5,7 +5,6 @@ import { Period } from '../core/discord/addPeriodSubCommands.js'; import addStatTypeSubCommandGroups from '../core/discord/addStatTypeSubCommandGroups.js'; import autocompleteTanks from '../core/discord/autocompleteTanks.js'; import autocompleteUsername from '../core/discord/autocompleteUsername.js'; -import interactionToURL from '../core/discord/interactionToURL.js'; import linkButton from '../core/discord/linkButton.js'; import primaryButton from '../core/discord/primaryButton.js'; import resolvePeriodFromButton from '../core/discord/resolvePeriodFromButton.js'; @@ -14,7 +13,7 @@ import resolvePlayerFromButton from '../core/discord/resolvePlayerFromButton.js' import resolvePlayerFromCommand from '../core/discord/resolvePlayerFromCommand.js'; import { CommandRegistry } from '../events/interactionCreate/index.js'; import stats from '../renderers/stats.js'; -import statsfull, { StatType } from '../renderers/statsfull.js'; +import { StatType } from '../renderers/statsfull.js'; export default { inProduction: true, @@ -42,7 +41,7 @@ export default { player.server }&id=${player.id}&tankId=${tankId}&start=${start ?? 0}&end=${end ?? 0}`; - interactionToURL(interaction); + // interactionToURL(interaction); return [ await stats(commandGroup, period, player, tankId), @@ -63,7 +62,7 @@ export default { const period = resolvePeriodFromButton(interaction); const player = await resolvePlayerFromButton(interaction); - return await statsfull( + return await stats( commandGroup, period, player, diff --git a/src/components/PoweredBy.tsx b/src/components/PoweredBy.tsx new file mode 100644 index 000000000..aeedde2b6 --- /dev/null +++ b/src/components/PoweredBy.tsx @@ -0,0 +1,38 @@ +import { ReactNode } from 'react'; +import { theme } from '../stitches.config.js'; + +export enum PoweredByType { + BlitzStars, + Wargaming, +} + +export interface PoweredByProps { + type: PoweredByType; + footer?: ReactNode; +} + +const POWERED_BY_IMAGES: Record = { + [PoweredByType.BlitzStars]: + 'https://www.blitzstars.com/assets/images/4b4cb591.TankyMcPewpew.png', + [PoweredByType.Wargaming]: 'https://i.imgur.com/jADGWm0.png', +}; + +const POWERED_BY_NAMES: Record = { + [PoweredByType.BlitzStars]: 'BlitzStars', + [PoweredByType.Wargaming]: 'Wargaming', +}; + +export default function PoweredBy({ type, footer }: PoweredByProps) { + return ( +
+
{footer}
+ +
+ + + Powered by {POWERED_BY_NAMES[type]} + +
+
+ ); +} diff --git a/src/components/PoweredByBlitzStars.tsx b/src/components/PoweredByBlitzStars.tsx deleted file mode 100644 index a1bc33308..000000000 --- a/src/components/PoweredByBlitzStars.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import { theme } from '../stitches.config.js'; - -export default function PoweredByBlitzStars() { - return ( -
- - - Powered by BlitzStars - -
- ); -} diff --git a/src/components/PoweredByWargaming.tsx b/src/components/PoweredByWargaming.tsx deleted file mode 100644 index e18ad7e7f..000000000 --- a/src/components/PoweredByWargaming.tsx +++ /dev/null @@ -1,15 +0,0 @@ -import { theme } from '../stitches.config.js'; - -export default function PoweredByWargaming() { - return ( -
- - - Powered by Wargaming - -
- ); -} diff --git a/src/renderers/evolution.tsx b/src/renderers/evolution.tsx index 7048ed115..e89f218b5 100644 --- a/src/renderers/evolution.tsx +++ b/src/renderers/evolution.tsx @@ -1,6 +1,6 @@ import * as Graph from '../components/Graph/index.js'; import NoData, { NoDataType } from '../components/NoData.js'; -import PoweredByBlitzStars from '../components/PoweredByBlitzStars.js'; +import PoweredBy, { PoweredByType } from '../components/PoweredBy.js'; import TitleBar from '../components/TitleBar.js'; import Wrapper from '../components/Wrapper.js'; import { BLITZ_SERVERS } from '../constants/servers.js'; @@ -128,7 +128,7 @@ export default async function evolution( )} - + ); } diff --git a/src/renderers/stats.tsx b/src/renderers/stats.tsx index aec9de200..c09056f69 100644 --- a/src/renderers/stats.tsx +++ b/src/renderers/stats.tsx @@ -1,6 +1,6 @@ import AllStatsOverview from '../components/AllStatsOverview/index.js'; import NoData, { NoDataType } from '../components/NoData.js'; -import PoweredByBlitzStars from '../components/PoweredByBlitzStars.js'; +import PoweredBy, { PoweredByType } from '../components/PoweredBy.js'; import { TierWeightsRecord } from '../components/TierWeights.js'; import TitleBar from '../components/TitleBar.js'; import Wrapper from '../components/Wrapper.js'; @@ -143,7 +143,7 @@ export default async function stats( /> )} - + ); } diff --git a/src/renderers/statsfull.tsx b/src/renderers/statsfull.tsx index 33fa798de..68c77fba6 100644 --- a/src/renderers/statsfull.tsx +++ b/src/renderers/statsfull.tsx @@ -1,6 +1,6 @@ import GenericAllStats from '../components/GenericAllStats.js'; import NoData, { NoDataType } from '../components/NoData.js'; -import PoweredByBlitzStars from '../components/PoweredByBlitzStars.js'; +import PoweredBy, { PoweredByType } from '../components/PoweredBy.js'; import TierWeights, { TierWeightsRecord } from '../components/TierWeights.js'; import TitleBar from '../components/TitleBar.js'; import Wrapper from '../components/Wrapper.js'; @@ -146,7 +146,7 @@ export default async function statsfull( /> )} - + ); } diff --git a/src/renderers/today.tsx b/src/renderers/today.tsx index a880edffc..021274e04 100644 --- a/src/renderers/today.tsx +++ b/src/renderers/today.tsx @@ -1,6 +1,6 @@ import * as Breakdown from '../components/Breakdown/index.js'; import NoData, { NoDataType } from '../components/NoData.js'; -import PoweredByBlitzStars from '../components/PoweredByBlitzStars.js'; +import PoweredBy, { PoweredByType } from '../components/PoweredBy.js'; import TitleBar from '../components/TitleBar.js'; import Wrapper from '../components/Wrapper.js'; import { BLITZ_SERVERS } from '../constants/servers.js'; @@ -156,7 +156,7 @@ export default async function today({ server, id }: ResolvedPlayer) { {rows.length === 0 && } {rows.length > 0 && {rows}} - + ); }