From c7856364adb387621c55a445c0bbb8935cd4203f Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Tue, 7 Jan 2025 13:20:20 -0600 Subject: [PATCH] fix: some linting --- .../src/components/Charts/ChartsControl.tsx | 32 ------ .../src/components/Charts/PlayersInPeriod.tsx | 99 ------------------- .../src/components/Charts/constants.ts | 1 - .../website/src/components/HomeHero.astro | 1 - .../Performance/PerformanceInfo.tsx | 14 +-- .../src/components/Performance/Tanks.tsx | 6 +- .../src/components/ToolOpenGraph.astro | 18 ++-- .../src/components/WargamingLoginButton.tsx | 4 +- packages/website/src/layouts/ToolLayout.astro | 9 +- .../pages/[...locale]/tools/charts/_index.tsx | 29 ------ .../[...locale]/tools/charts/index.astro | 11 --- .../docs/[directory]/[document]/_index.tsx | 4 +- .../docs/[directory]/[document]/index.astro | 2 +- .../src/pages/docs/patches/index.astro | 13 +-- 14 files changed, 36 insertions(+), 207 deletions(-) delete mode 100644 packages/website/src/components/Charts/ChartsControl.tsx delete mode 100644 packages/website/src/components/Charts/PlayersInPeriod.tsx delete mode 100644 packages/website/src/components/Charts/constants.ts delete mode 100644 packages/website/src/pages/[...locale]/tools/charts/_index.tsx delete mode 100644 packages/website/src/pages/[...locale]/tools/charts/index.astro diff --git a/packages/website/src/components/Charts/ChartsControl.tsx b/packages/website/src/components/Charts/ChartsControl.tsx deleted file mode 100644 index 8c019dd77..000000000 --- a/packages/website/src/components/Charts/ChartsControl.tsx +++ /dev/null @@ -1,32 +0,0 @@ -import { Flex, Select, Text } from '@radix-ui/themes'; -import { Charts, type ChartsPeriod } from '../../stores/charts'; - -export function ChartsControl() { - const period = Charts.use((state) => state.period); - const mutateCharts = Charts.useMutation(); - - return ( - - Player count - { - mutateCharts((draft) => { - draft.period = period as ChartsPeriod; - }); - }} - > - - - Total - Past 120 days - Past 90 days - Past 60 days - This month - This week - Yesterday - - - - ); -} diff --git a/packages/website/src/components/Charts/PlayersInPeriod.tsx b/packages/website/src/components/Charts/PlayersInPeriod.tsx deleted file mode 100644 index 7d109ca99..000000000 --- a/packages/website/src/components/Charts/PlayersInPeriod.tsx +++ /dev/null @@ -1,99 +0,0 @@ -import { - TANK_CLASSES, - TIERS, - TIER_ROMAN_NUMERALS, - TankClass, - formatCompact, -} from '@blitzkit/core'; -import strings from '@blitzkit/core/lang/en-US.json'; -import { useStore } from '@nanostores/react'; -import { Box, Flex, Heading } from '@radix-ui/themes'; -import { awaitableAverageDefinitions } from '../../core/awaitables/averageDefinitions'; -import { awaitableTankDefinitions } from '../../core/awaitables/tankDefinitions'; -import { filterTank } from '../../core/blitzkit/filterTank'; -import { useAveragesExclusionRatio } from '../../hooks/useAveragesExclusionRatio'; -import { Charts } from '../../stores/charts'; -import { $tankFilters } from '../../stores/tankFilters'; -import { ThemedBar } from '../Nivo/ThemedBar'; - -const [tankDefinitions, averageDefinitions] = await Promise.all([ - awaitableTankDefinitions, - awaitableAverageDefinitions, -]); - -const averageDefinitionsArray = Object.entries(averageDefinitions.averages); - -export function PlayersInPeriod() { - const period = Charts.use((state) => state.period); - const ratio = useAveragesExclusionRatio(); - const filters = useStore($tankFilters); - const data = TIERS.map((tier) => { - const players: Record = { - 0: 0, - 1: 0, - 2: 0, - 3: 0, - }; - - averageDefinitionsArray.forEach(([idString, entry]) => { - const id = Number(idString); - const tank = tankDefinitions.tanks[id]; - - if ( - tank === undefined || - tank.tier !== tier || - !filterTank(filters, tank) - ) { - return; - } - - players[tank.class] += entry.samples[period] * ratio; - }); - - const bar: Record = { - tier: TIER_ROMAN_NUMERALS[tier], - }; - - TANK_CLASSES.forEach((c) => { - bar[strings.common.tank_class_short[c]] = players[c]; - }); - - return bar; - }); - - return ( - - Players by tier & class - - strings.common.tank_class_short[c])} - indexBy="tier" - margin={{ right: 90, bottom: 50, left: 90 }} - axisBottom={{ - legend: 'Tier', - legendPosition: 'middle', - legendOffset: 32, - }} - axisLeft={{ - legend: 'Players', - legendPosition: 'middle', - legendOffset: -60, - format: formatCompact, - }} - legends={[ - { - dataFrom: 'keys', - anchor: 'bottom-right', - direction: 'column', - translateX: 120, - itemWidth: 100, - itemHeight: 20, - }, - ]} - valueFormat={formatCompact} - /> - - - ); -} diff --git a/packages/website/src/components/Charts/constants.ts b/packages/website/src/components/Charts/constants.ts deleted file mode 100644 index c5dc4f7c2..000000000 --- a/packages/website/src/components/Charts/constants.ts +++ /dev/null @@ -1 +0,0 @@ -export const FIRST_AVERAGES_ENTRY = 19925; diff --git a/packages/website/src/components/HomeHero.astro b/packages/website/src/components/HomeHero.astro index 424cfbe87..49cf52354 100644 --- a/packages/website/src/components/HomeHero.astro +++ b/packages/website/src/components/HomeHero.astro @@ -1,7 +1,6 @@ --- import { Code, Flex, Heading, Text } from '@radix-ui/themes'; import { resolveBranchName } from '../core/blitzkit/branches'; -import { DEFAULT_LOCALE } from '@blitzkit/core'; import { getStrings } from '../core/i18n/getStrings'; import { literals } from '../core/i18n/literals'; diff --git a/packages/website/src/components/Performance/PerformanceInfo.tsx b/packages/website/src/components/Performance/PerformanceInfo.tsx index 038a104e0..8a54752ea 100644 --- a/packages/website/src/components/Performance/PerformanceInfo.tsx +++ b/packages/website/src/components/Performance/PerformanceInfo.tsx @@ -6,6 +6,7 @@ import { awaitableDiscoveredIdsDefinitions } from '../../core/awaitables/discove import { literals } from '../../core/i18n/literals'; import { useLocale } from '../../hooks/useLocale'; import type { MaybeSkeletonComponentProps } from '../../types/maybeSkeletonComponentProps'; +import { InlineSkeleton } from '../InlineSkeleton'; const [discoveredIdsDefinitions, averageDefinitions] = await Promise.all([ awaitableDiscoveredIdsDefinitions, @@ -36,14 +37,13 @@ export function PerformanceInfo({ skeleton }: MaybeSkeletonComponentProps) { - {/* Estimated stats based on{' '} - {skeleton ? : samples} players. - Updated {skeleton ? : timeAgo} ago. */} + {skeleton && } - {literals(strings.website.tools.performance.estimation.body, [ - samples, - timeAgo, - ])} + {!skeleton && + literals(strings.website.tools.performance.estimation.body, [ + samples, + timeAgo, + ])} diff --git a/packages/website/src/components/Performance/Tanks.tsx b/packages/website/src/components/Performance/Tanks.tsx index 54df07dc5..1267e46ed 100644 --- a/packages/website/src/components/Performance/Tanks.tsx +++ b/packages/website/src/components/Performance/Tanks.tsx @@ -51,7 +51,7 @@ export function Tanks({ skeleton }: MaybeSkeletonComponentProps) { (a, b) => sort.direction * (a.mu.hits / a.mu.shots - b.mu.hits / b.mu.shots), ); - case 'capturePoints': + case 'capture_points': return averageDefinitionsArray.sort( (a, b) => sort.direction * @@ -65,14 +65,14 @@ export function Tanks({ skeleton }: MaybeSkeletonComponentProps) { (a.mu.damage_dealt / a.mu.battles - b.mu.damage_dealt / b.mu.battles), ); - case 'damageRatio': + case 'damage_ratio': return averageDefinitionsArray.sort( (a, b) => sort.direction * (a.mu.damage_dealt / a.mu.damage_received - b.mu.damage_dealt / b.mu.damage_received), ); - case 'damageTaken': + case 'damage_taken': return averageDefinitionsArray.sort( (a, b) => sort.direction * diff --git a/packages/website/src/components/ToolOpenGraph.astro b/packages/website/src/components/ToolOpenGraph.astro index 480972af7..d5fe74f1e 100644 --- a/packages/website/src/components/ToolOpenGraph.astro +++ b/packages/website/src/components/ToolOpenGraph.astro @@ -1,22 +1,20 @@ --- import { imgur } from '@blitzkit/core'; import { type Tool } from '../constants/tools'; +import { getStrings } from '../core/i18n/getStrings'; interface Props { tool: Tool; } const { tool } = Astro.props; +const { locale } = Astro.params; +const strings = getStrings(locale); +const toolStrings = + strings.website.tools[tool.id as keyof typeof strings.website.tools]; --- -{tool.title} +{toolStrings.name} - -{ - tool.pageDescription !== undefined && ( - <> - - - - ) -} + + diff --git a/packages/website/src/components/WargamingLoginButton.tsx b/packages/website/src/components/WargamingLoginButton.tsx index ececc5076..6ae1fbf07 100644 --- a/packages/website/src/components/WargamingLoginButton.tsx +++ b/packages/website/src/components/WargamingLoginButton.tsx @@ -1,9 +1,11 @@ import { assertSecret, REGIONS } from '@blitzkit/core'; -import strings from '@blitzkit/core/lang/en-US.json'; import { Button, type ButtonProps, Dialog, Flex, Link } from '@radix-ui/themes'; +import { useLocale } from '../hooks/useLocale'; import { WargamingIcon } from './WargamingIcon'; export function WargamingLoginButton({ children, ...props }: ButtonProps) { + const { strings } = useLocale(); + return ( diff --git a/packages/website/src/layouts/ToolLayout.astro b/packages/website/src/layouts/ToolLayout.astro index d86483200..2d1820d4c 100644 --- a/packages/website/src/layouts/ToolLayout.astro +++ b/packages/website/src/layouts/ToolLayout.astro @@ -3,6 +3,7 @@ import { imgur, ImgurSize } from '@blitzkit/core'; import { Box, Flex, Heading, Text } from '@radix-ui/themes'; import ToolOpenGraph from '../components/ToolOpenGraph.astro'; import { type Tool } from '../constants/tools'; +import { getStrings } from '../core/i18n/getStrings'; import BaseLayout from './BaseLayout.astro'; interface Props { @@ -10,6 +11,10 @@ interface Props { } const { tool } = Astro.props; +const { locale } = Astro.params; +const strings = getStrings(locale); +const toolStrings = + strings.website.tools[tool.id as keyof typeof strings.website.tools]; --- @@ -33,8 +38,8 @@ const { tool } = Astro.props; WebkitBackdropFilter: 'blur(4rem)', }} > - {tool?.title} - {tool?.description} + {toolStrings.name} + {toolStrings.description} diff --git a/packages/website/src/pages/[...locale]/tools/charts/_index.tsx b/packages/website/src/pages/[...locale]/tools/charts/_index.tsx deleted file mode 100644 index d0fcbf9ab..000000000 --- a/packages/website/src/pages/[...locale]/tools/charts/_index.tsx +++ /dev/null @@ -1,29 +0,0 @@ -import { Flex } from '@radix-ui/themes'; -import { ChartsControl } from '../../../../components/Charts/ChartsControl'; -import { PlayersInPeriod } from '../../../../components/Charts/PlayersInPeriod'; -import { PageWrapper } from '../../../../components/PageWrapper'; -import { FilterControl } from '../../../../components/TankSearch/components/FilterControl'; -import { Charts } from '../../../../stores/charts'; - -export function Page() { - return ( - - - - ); -} - -function Content() { - return ( - - - - - - - - - - - ); -} diff --git a/packages/website/src/pages/[...locale]/tools/charts/index.astro b/packages/website/src/pages/[...locale]/tools/charts/index.astro deleted file mode 100644 index d04592c03..000000000 --- a/packages/website/src/pages/[...locale]/tools/charts/index.astro +++ /dev/null @@ -1,11 +0,0 @@ ---- -import { chartsTool } from '../../../../constants/tools'; -import ToolLayout from '../../../../layouts/ToolLayout.astro'; -import { Page } from './_index'; - -export { getStaticPaths } from '../../index.astro'; ---- - - - - diff --git a/packages/website/src/pages/docs/[directory]/[document]/_index.tsx b/packages/website/src/pages/docs/[directory]/[document]/_index.tsx index 921bf79b2..02ef84eb8 100644 --- a/packages/website/src/pages/docs/[directory]/[document]/_index.tsx +++ b/packages/website/src/pages/docs/[directory]/[document]/_index.tsx @@ -1,5 +1,5 @@ -import { Markdown } from '../../../../../components/Markdown'; -import { PageWrapper } from '../../../../../components/PageWrapper'; +import { Markdown } from '../../../../components/Markdown'; +import { PageWrapper } from '../../../../components/PageWrapper'; interface PageProps { content: string; diff --git a/packages/website/src/pages/docs/[directory]/[document]/index.astro b/packages/website/src/pages/docs/[directory]/[document]/index.astro index 0a094ea23..c213c2d4c 100644 --- a/packages/website/src/pages/docs/[directory]/[document]/index.astro +++ b/packages/website/src/pages/docs/[directory]/[document]/index.astro @@ -1,7 +1,7 @@ --- import type { GetStaticPaths } from 'astro'; import { readFile } from 'fs/promises'; -import BaseLayout from '../../../../../layouts/BaseLayout.astro'; +import BaseLayout from '../../../../layouts/BaseLayout.astro'; import { Page } from './_index'; export const getStaticPaths = (async () => { diff --git a/packages/website/src/pages/docs/patches/index.astro b/packages/website/src/pages/docs/patches/index.astro index d43dbc586..d62a148ad 100644 --- a/packages/website/src/pages/docs/patches/index.astro +++ b/packages/website/src/pages/docs/patches/index.astro @@ -1,10 +1,9 @@ --- import { MagicWandIcon, StarFilledIcon } from '@radix-ui/react-icons'; -import { Flex, Heading } from '@radix-ui/themes'; +import { Flex, Heading, Link } from '@radix-ui/themes'; import { compareVersions } from 'compare-versions'; -import { LinkI18n } from '../../../../components/LinkI18n'; -import { PageWrapper } from '../../../../components/PageWrapper'; -import BaseLayout from '../../../../layouts/BaseLayout.astro'; +import { PageWrapper } from '../../../components/PageWrapper'; +import BaseLayout from '../../../layouts/BaseLayout.astro'; // this can't be used in template literal :( const ROOT = '../../../../../../docs/changelogs/'; @@ -17,7 +16,6 @@ const versions = Object.keys( .map((file) => file.replace(ROOT, '').replace('.md', '')) .sort(compareVersions) .reverse(); -const { locale } = Astro.params; --- BlitzKit Patches @@ -33,8 +31,7 @@ const { locale } = Astro.params; const isMajor = split[2] === 0; return ( - } {version} - + ); }) }