feat: organize files

src/app/embeds/session/page.tsx

@@ -5,6 +5,7 @@ import { useEffect, useState } from 'react';
 import * as Breakdown from '../../../components/Breakdown';
 import { WARGAMING_APPLICATION_ID } from '../../../constants/wargamingApplicationID';
 import fetchBlitz from '../../../core/blitz/fetchBlitz';
+import { resetSession } from '../../../core/blitzkrieg/resetSession';
 import {
   TankDefinition,
   tankDefinitions,
@@ -13,10 +14,7 @@ import { tankAverages } from '../../../core/blitzstars/tankAverages';
 import calculateWN8 from '../../../core/statistics/calculateWN8';
 import { deltaTankStats } from '../../../core/statistics/deltaTankStats';
 import getWN8Percentile from '../../../core/statistics/getWN8Percentile';
-import mutateSession, {
+import mutateSession, { useSession } from '../../../stores/session';
-  resetSession,
-  useSession,
-} from '../../../stores/session';
 import { IndividualTankStats, TanksStats } from '../../../types/tanksStats';
 import { CustomColumnDisplay } from '../../tools/session/components/CustomColumn';
 import { Menu } from '../../tools/session/components/Menu';

src/app/tools/session/page.tsx

@@ -22,7 +22,9 @@ import { UNLOCALIZED_REGION_NAMES } from '../../../constants/regions';
 import searchPlayersAcrossRegions, {
   AccountListWithServer,
 } from '../../../core/blitz/searchPlayersAcrossRegions';
-import { resetSession, setSession, useSession } from '../../../stores/session';
+import { resetSession } from '../../../core/blitzkrieg/resetSession';
+import { setSession } from '../../../core/blitzkrieg/setSession';
+import { useSession } from '../../../stores/session';
 import SessionPage from '../../embeds/session/page';
 import { Menu } from './components/Menu';
 import * as styles from './page.css';

src/app/tools/tankopedia/[id]/components/AntagonistBar.tsx

@@ -19,7 +19,7 @@ import { pushTankopediaPath } from '../../../../../core/blitzkrieg/pushTankopedi
 import {
   SHELL_NAMES,
   TIER_ROMAN_NUMERALS,
-} from '../../../../../core/blitzkrieg/tankDefinitions';
+} from '../../../../../core/blitzkrieg/tankDefinitions/constants';
 import { mutateDuel, useDuel } from '../../../../../stores/duel';
 import {
   mutateTankopediaTemporary,

src/app/tools/tankopedia/[id]/components/Characteristics/components/Modules.tsx

@@ -1,6 +1,6 @@
 import { Flex, Heading } from '@radix-ui/themes';
 import { ModuleButton } from '../../../../../../../components/ModuleButtons/ModuleButton';
-import { TIER_ROMAN_NUMERALS } from '../../../../../../../core/blitzkrieg/tankDefinitions';
+import { TIER_ROMAN_NUMERALS } from '../../../../../../../core/blitzkrieg/tankDefinitions/constants';
 import { mutateDuel, useDuel } from '../../../../../../../stores/duel';
 import { mutateTankopediaTemporary } from '../../../../../../../stores/tankopedia';
 import { ConfigurationChildWrapper } from './ConfigurationChildWrapper';

src/app/tools/tankopedia/[id]/components/Characteristics/index.tsx

@@ -18,7 +18,7 @@ import {
   CREW_MEMBER_NAMES,
   GUN_TYPE_NAMES,
   SHELL_NAMES,
-} from '../../../../../../core/blitzkrieg/tankDefinitions';
+} from '../../../../../../core/blitzkrieg/tankDefinitions/constants';
 import { unionBoundingBox } from '../../../../../../core/blitzkrieg/unionBoundingBox';
 import { useConsumable } from '../../../../../../hooks/useConsumable';
 import { useEquipment } from '../../../../../../hooks/useEquipment';

src/app/tools/tankopedia/[id]/components/Title.tsx

@@ -1,7 +1,7 @@
 import { UpdateIcon } from '@radix-ui/react-icons';
 import { Button, Dialog, Flex, Heading } from '@radix-ui/themes';
 import { useState } from 'react';
-import { TREE_TYPE_ICONS } from '../../../../../components/Tanks';
+import { TREE_TYPE_ICONS } from '../../../../../components/Tanks/components/Item/constants';
 import { assignDuelMember } from '../../../../../core/blitzkrieg/assignDuelMember';
 import { pushTankopediaPath } from '../../../../../core/blitzkrieg/pushTankopediaPath';
 import { useDuel } from '../../../../../stores/duel';

src/app/tools/tankopedia/components/TankSearch/components/CompactSearchResultRow.tsx

@@ -1,9 +1,7 @@
 import { Button, Flex, Text } from '@radix-ui/themes';
 import { SmallTankIcon } from '../../../../../../components/SmallTankIcon';
-import {
+import { TankDefinition } from '../../../../../../core/blitzkrieg/tankDefinitions';
-  TIER_ROMAN_NUMERALS,
+import { TIER_ROMAN_NUMERALS } from '../../../../../../core/blitzkrieg/tankDefinitions/constants';
-  TankDefinition,
-} from '../../../../../../core/blitzkrieg/tankDefinitions';
 
 interface CompactSearchResultRowProps {
   tanks: TankDefinition[];

src/app/tools/tankopedia/components/TankSearch/components/Options/index.tsx

@@ -4,17 +4,18 @@ import { CaretDownIcon } from '@radix-ui/react-icons';
 import { Button, DropdownMenu, Flex } from '@radix-ui/themes';
 import { use } from 'react';
 import { Flag } from '../../../../../../../components/Flag';
+import {} from '../../../../../../../components/Tanks';
 import {
   TANK_CLASSES,
   TREE_TYPES,
   TREE_TYPE_ICONS,
   TREE_TYPE_IMAGES,
-} from '../../../../../../../components/Tanks';
+} from '../../../../../../../components/Tanks/components/Item/constants';
+import { NATIONS } from '../../../../../../../core/blitzkrieg/tankDefinitions';
 import {
-  NATIONS,
   TIERS,
   TIER_ROMAN_NUMERALS,
-} from '../../../../../../../core/blitzkrieg/tankDefinitions';
+} from '../../../../../../../core/blitzkrieg/tankDefinitions/constants';
 import mutateTankopediaPersistent, {
   TankopediaTestTankDisplay,
   useTankopediaPersistent,

src/app/tools/tankopedia/components/TankSearch/index.tsx

@@ -15,7 +15,8 @@ import {
 } from '@radix-ui/themes';
 import { go } from 'fuzzysort';
 import { use, useEffect, useMemo, useRef, useState } from 'react';
-import { TANK_CLASSES, TreeType } from '../../../../../components/Tanks';
+import { TreeType } from '../../../../../components/Tanks';
+import { TANK_CLASSES } from '../../../../../components/Tanks/components/Item/constants';
 import { resolveNearPenetration } from '../../../../../core/blitz/resolveNearPenetration';
 import { asset } from '../../../../../core/blitzkrieg/asset';
 import { modelDefinitions } from '../../../../../core/blitzkrieg/modelDefinitions';
@@ -24,13 +25,15 @@ import { resolveDpm } from '../../../../../core/blitzkrieg/resolveDpm';
 import { resolveReload } from '../../../../../core/blitzkrieg/resolveReload';
 import {
   NATIONS,
+  TankDefinition,
+  tanksDefinitionsArray,
+} from '../../../../../core/blitzkrieg/tankDefinitions';
+import {
   TANK_ICONS,
   TANK_ICONS_COLLECTOR,
   TANK_ICONS_PREMIUM,
   TIER_ROMAN_NUMERALS,
-  TankDefinition,
+} from '../../../../../core/blitzkrieg/tankDefinitions/constants';
-  tanksDefinitionsArray,
-} from '../../../../../core/blitzkrieg/tankDefinitions';
 import { tankIcon } from '../../../../../core/blitzkrieg/tankIcon';
 import { unionBoundingBox } from '../../../../../core/blitzkrieg/unionBoundingBox';
 import { theme } from '../../../../../stitches.config';

src/commands/breakdown/index.tsx

@@ -0,0 +1,71 @@
+import { getBlitzStarsLinkButton } from '../../core/blitzstars/getBlitzStarsLinkButton';
+import addPeriodicFilterOptions from '../../core/discord/addPeriodicFilterOptions';
+import addUsernameChoices from '../../core/discord/addUsernameChoices';
+import autocompleteTanks from '../../core/discord/autocompleteTanks';
+import autocompleteUsername from '../../core/discord/autocompleteUsername';
+import { buttonRefresh } from '../../core/discord/buttonRefresh';
+import commandToURL from '../../core/discord/commandToURL';
+import { createLocalizedCommand } from '../../core/discord/createLocalizedCommand';
+import { getCustomPeriodParams } from '../../core/discord/getCustomPeriodParams';
+import { getFiltersFromButton } from '../../core/discord/getFiltersFromButton';
+import { getFiltersFromCommand } from '../../core/discord/getFiltersFromCommand';
+import resolvePeriodFromButton from '../../core/discord/resolvePeriodFromButton';
+import resolvePeriodFromCommand from '../../core/discord/resolvePeriodFromCommand';
+import resolvePlayerFromButton from '../../core/discord/resolvePlayerFromButton';
+import resolvePlayerFromCommand from '../../core/discord/resolvePlayerFromCommand';
+import { CommandRegistry } from '../../events/interactionCreate';
+import { renderBreakdown } from './render';
+
+export const breakdownCommand = new Promise<CommandRegistry>(
+  async (resolve) => {
+    resolve({
+      inProduction: true,
+      inPublic: true,
+
+      command: await addPeriodicFilterOptions(
+        createLocalizedCommand('breakdown'),
+        (option) => option.addStringOption(addUsernameChoices),
+      ),
+
+      async handler(interaction) {
+        const player = await resolvePlayerFromCommand(interaction);
+        const period = resolvePeriodFromCommand(player.region, interaction);
+        const filters = await getFiltersFromCommand(interaction);
+        const path = commandToURL(interaction, {
+          ...player,
+          ...getCustomPeriodParams(interaction),
+          ...filters,
+        });
+
+        return [
+          ...(await renderBreakdown(
+            player,
+            period,
+            filters,
+            interaction.locale,
+          )),
+          buttonRefresh(interaction, path),
+          await getBlitzStarsLinkButton(player.region, player.id),
+        ];
+      },
+
+      autocomplete: (interaction) => {
+        autocompleteUsername(interaction);
+        autocompleteTanks(interaction);
+      },
+
+      async button(interaction) {
+        const player = await resolvePlayerFromButton(interaction);
+        const period = resolvePeriodFromButton(player.region, interaction);
+        const filters = getFiltersFromButton(interaction);
+
+        return await renderBreakdown(
+          player,
+          period,
+          filters,
+          interaction.locale,
+        );
+      },
+    });
+  },
+);

src/commands/breakdown/render.tsx

@@ -1,43 +1,25 @@
 import { Locale } from 'discord.js';
 import { chunk } from 'lodash';
-import * as Breakdown from '../components/Breakdown';
+import * as Breakdown from '../../components/Breakdown';
-import CommandWrapper from '../components/CommandWrapper';
+import CommandWrapper from '../../components/CommandWrapper';
-import NoData from '../components/NoData';
+import NoData from '../../components/NoData';
-import TitleBar from '../components/TitleBar';
+import TitleBar from '../../components/TitleBar';
-import { AllStats, getAccountInfo } from '../core/blitz/getAccountInfo';
+import { AllStats, getAccountInfo } from '../../core/blitz/getAccountInfo';
-import { getClanAccountInfo } from '../core/blitz/getClanAccountInfo';
+import { getClanAccountInfo } from '../../core/blitz/getClanAccountInfo';
-import getTankStats from '../core/blitz/getTankStats';
+import getTankStats from '../../core/blitz/getTankStats';
-import { filtersToDescription } from '../core/blitzkrieg/filtersToDescription';
+import { filtersToDescription } from '../../core/blitzkrieg/filtersToDescription';
 import {
   TankDefinition,
   tankDefinitions,
-} from '../core/blitzkrieg/tankDefinitions';
+} from '../../core/blitzkrieg/tankDefinitions';
-import { getBlitzStarsLinkButton } from '../core/blitzstars/getBlitzStarsLinkButton';
+import getStatsInPeriod from '../../core/blitzstars/getStatsInPeriod';
-import getStatsInPeriod from '../core/blitzstars/getStatsInPeriod';
+import { tankAverages } from '../../core/blitzstars/tankAverages';
-import { tankAverages } from '../core/blitzstars/tankAverages';
+import { ResolvedPeriod } from '../../core/discord/resolvePeriodFromCommand';
-import addPeriodicFilterOptions from '../core/discord/addPeriodicFilterOptions';
+import { ResolvedPlayer } from '../../core/discord/resolvePlayerFromCommand';
-import addUsernameChoices from '../core/discord/addUsernameChoices';
+import { translator } from '../../core/localization/translator';
-import autocompleteTanks from '../core/discord/autocompleteTanks';
+import calculateWN8 from '../../core/statistics/calculateWN8';
-import autocompleteUsername from '../core/discord/autocompleteUsername';
+import { StatFilters, filterStats } from '../../core/statistics/filterStats';
-import { buttonRefresh } from '../core/discord/buttonRefresh';
+import getWN8Percentile from '../../core/statistics/getWN8Percentile';
-import commandToURL from '../core/discord/commandToURL';
-import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';
-import { getCustomPeriodParams } from '../core/discord/getCustomPeriodParams';
-import { getFiltersFromButton } from '../core/discord/getFiltersFromButton';
-import { getFiltersFromCommand } from '../core/discord/getFiltersFromCommand';
-import resolvePeriodFromButton from '../core/discord/resolvePeriodFromButton';
-import resolvePeriodFromCommand, {
-  ResolvedPeriod,
-} from '../core/discord/resolvePeriodFromCommand';
-import resolvePlayerFromButton from '../core/discord/resolvePlayerFromButton';
-import resolvePlayerFromCommand, {
-  ResolvedPlayer,
-} from '../core/discord/resolvePlayerFromCommand';
-import { translator } from '../core/localization/translator';
-import calculateWN8 from '../core/statistics/calculateWN8';
-import { StatFilters, filterStats } from '../core/statistics/filterStats';
-import getWN8Percentile from '../core/statistics/getWN8Percentile';
-import { CommandRegistry } from '../events/interactionCreate';
 
 const ROWS_PER_PAGE = 8;
 const MAX_PAGES = 9;
@@ -296,57 +278,3 @@ export async function renderBreakdown(
     ];
   }
 }
-
-export const breakdownCommand = new Promise<CommandRegistry>(
-  async (resolve) => {
-    resolve({
-      inProduction: true,
-      inPublic: true,
-
-      command: await addPeriodicFilterOptions(
-        createLocalizedCommand('breakdown'),
-        (option) => option.addStringOption(addUsernameChoices),
-      ),
-
-      async handler(interaction) {
-        const player = await resolvePlayerFromCommand(interaction);
-        const period = resolvePeriodFromCommand(player.region, interaction);
-        const filters = await getFiltersFromCommand(interaction);
-        const path = commandToURL(interaction, {
-          ...player,
-          ...getCustomPeriodParams(interaction),
-          ...filters,
-        });
-
-        return [
-          ...(await renderBreakdown(
-            player,
-            period,
-            filters,
-            interaction.locale,
-          )),
-          buttonRefresh(interaction, path),
-          await getBlitzStarsLinkButton(player.region, player.id),
-        ];
-      },
-
-      autocomplete: (interaction) => {
-        autocompleteUsername(interaction);
-        autocompleteTanks(interaction);
-      },
-
-      async button(interaction) {
-        const player = await resolvePlayerFromButton(interaction);
-        const period = resolvePeriodFromButton(player.region, interaction);
-        const filters = getFiltersFromButton(interaction);
-
-        return await renderBreakdown(
-          player,
-          period,
-          filters,
-          interaction.locale,
-        );
-      },
-    });
-  },
-);

src/commands/evolution.tsx

@@ -1,6 +1,7 @@
 import { Locale, SlashCommandSubcommandGroupBuilder } from 'discord.js';
 import CommandWrapper from '../components/CommandWrapper';
 import * as Graph from '../components/Graph';
+import { LineColor } from '../components/Graph/components/Line/constants';
 import NoData from '../components/NoData';
 import TitleBar from '../components/TitleBar';
 import { getAccountInfo } from '../core/blitz/getAccountInfo';
@@ -93,7 +94,7 @@ async function render(
           xMaxLabel={new Date(maxTime * 1000).toLocaleDateString(locale)}
         >
           {Graph.Line({
-            color: Graph.LineColor.Red,
+            color: LineColor.Red,
             plot: plot,
             minY,
             maxY,

src/commands/ownedTanks.tsx

@@ -7,12 +7,11 @@ import { getClanAccountInfo } from '../core/blitz/getClanAccountInfo';
 import getTankStats from '../core/blitz/getTankStats';
 import { emblemIdToURL } from '../core/blitzkrieg/emblemIdToURL';
 import {
-  TIER_ROMAN_NUMERALS,
   TankDefinition,
   Tier,
   tankDefinitions,
 } from '../core/blitzkrieg/tankDefinitions';
-import { tankIcon } from '../core/blitzkrieg/tankIcon';
+import { TIER_ROMAN_NUMERALS } from '../core/blitzkrieg/tankDefinitions/constants';
 import addTierChoices from '../core/discord/addTierChoices';
 import addUsernameChoices from '../core/discord/addUsernameChoices';
 import autocompleteUsername from '../core/discord/autocompleteUsername';
@@ -100,7 +99,6 @@ export const ownedTanksCommand = new Promise<CommandRegistry>((resolve) => {
                               key={tank.id}
                               name={tank.name}
                               tankType={tank.class}
-                              image={tankIcon(tank.id)}
                               treeType={tank.treeType}
                             />
                           )),
@@ -113,7 +111,6 @@ export const ownedTanksCommand = new Promise<CommandRegistry>((resolve) => {
                               key={tank.id}
                               name={tank.name}
                               tankType={tank.class}
-                              image={tankIcon(tank.id)}
                               treeType={tank.treeType}
                             />
                           )),

src/commands/searchPlayers.ts

@@ -3,10 +3,8 @@ import markdownEscape from 'markdown-escape';
 import { Region } from '../constants/regions';
 import { WARGAMING_APPLICATION_ID } from '../constants/wargamingApplicationID';
 import fetchBlitz from '../core/blitz/fetchBlitz';
-import {
+import { AccountList } from '../core/blitz/searchPlayersAcrossRegions';
-  AccountList,
+import { usernamePattern } from '../core/blitz/searchPlayersAcrossRegions/constants';
-  usernamePattern,
-} from '../core/blitz/searchPlayersAcrossRegions';
 import addRegionChoices from '../core/discord/addRegionChoices';
 import addUsernameChoices from '../core/discord/addUsernameChoices';
 import { createLocalizedCommand } from '../core/discord/createLocalizedCommand';

src/commands/today.ts

@@ -15,7 +15,7 @@ import resolvePeriodFromCommand from '../core/discord/resolvePeriodFromCommand';
 import resolvePlayerFromButton from '../core/discord/resolvePlayerFromButton';
 import resolvePlayerFromCommand from '../core/discord/resolvePlayerFromCommand';
 import { CommandRegistry } from '../events/interactionCreate';
-import { renderBreakdown } from './breakdown';
+import { renderBreakdown } from './breakdown/render';
 
 export const todayCommand = new Promise<CommandRegistry>(async (resolve) => {
   const nations = await NATIONS;

src/components/AllStatsOverview/components/WN8Display/index.tsx

@@ -3,7 +3,7 @@ import { Percentile } from '../../../../constants/percentiles';
 import { translator } from '../../../../core/localization/translator';
 import getWN8Percentile from '../../../../core/statistics/getWN8Percentile';
 import { theme } from '../../../../stitches.config';
-import { PERCENTILE_COLORS } from '../../../PercentileIndicator';
+import { PERCENTILE_COLORS } from '../../../PercentileIndicator/constants';
 import { Glow } from './components/Glow';
 
 export interface WN8DisplayProps {

src/components/Armor/components/CoreArmorSceneComponent/index.tsx

@@ -1,12 +1,6 @@
 import { useFrame } from '@react-three/fiber';
 import { useEffect } from 'react';
-import {
+import { MeshBasicMaterial, Object3D, ShaderMaterial, Vector2 } from 'three';
-  MeshBasicMaterial,
-  Object3D,
-  ShaderMaterial,
-  Vector2,
-  WebGLRenderTarget,
-} from 'three';
 import { degToRad } from 'three/src/math/MathUtils';
 import { canSplash } from '../../../../core/blitz/canSplash';
 import { isExplosive } from '../../../../core/blitz/isExplosive';
@@ -21,8 +15,7 @@ import {
 } from '../../../../stores/tankopedia';
 import fragmentShader from './shaders/fragment.glsl';
 import vertexShader from './shaders/vertex.glsl';
-
+import { spacedArmorRenderTarget } from './target';
-export const spacedArmorRenderTarget = new WebGLRenderTarget();
 
 interface CoreArmorSceneComponentProps {
   thickness: number;

src/components/Armor/components/CoreArmorSceneComponent/target.tsx

@@ -0,0 +1,3 @@
+import { WebGLRenderTarget } from 'three';
+
+export const spacedArmorRenderTarget = new WebGLRenderTarget();

src/components/Armor/index.tsx

@@ -2,7 +2,7 @@ import { createPortal, useFrame } from '@react-three/fiber';
 import { memo, useState } from 'react';
 import { DepthTexture, Scene, Vector2 } from 'three';
 import { CoreArmorScene } from './components/CoreArmorScene';
-import { spacedArmorRenderTarget } from './components/CoreArmorSceneComponent';
+import { spacedArmorRenderTarget } from './components/CoreArmorSceneComponent/target';
 import { SpacedArmorScene } from './components/SpacedArmorScene';
 
 export const Armor = memo(() => {

src/components/Breakdown/components/Root.tsx

@@ -1,6 +1,6 @@
 import { ReactNode } from 'react';
 
-export interface RootProps {
+interface RootProps {
   children: ReactNode;
 }
 

src/components/Breakdown/components/Row.tsx

@@ -5,7 +5,8 @@ import {
   GrayColor,
   PALETTES,
 } from '../../../constants/radixColors';
-import { TREE_TYPE_ICONS, TankClass, TreeType } from '../../Tanks';
+import { TankClass, TreeType } from '../../Tanks';
+import { TREE_TYPE_ICONS } from '../../Tanks/components/Item/constants';
 import { RowStat } from './RowStat';
 
 export interface RowStatItem {

src/components/Breakdown/components/RowStat.tsx

@@ -7,7 +7,7 @@ import {
 } from '../../../constants/radixColors';
 import PercentileIndicator from '../../PercentileIndicator';
 
-export interface RowStatProps {
+interface RowStatProps {
   name: string;
   value?: string | number;
   delta?: number;

src/components/GenericAllStats/components/Card.tsx

@@ -2,13 +2,13 @@ import { Percentile } from '../../../constants/percentiles';
 import { theme } from '../../../stitches.config';
 import PercentileIndicator from '../../PercentileIndicator';
 
-export interface CardItem {
+interface CardItem {
   label: string;
   value: string | number | undefined;
   percentile?: Percentile;
 }
 
-export interface CardProps {
+interface CardProps {
   items: CardItem[];
   title: string;
 }

src/components/GenericAllStats/components/Root.tsx

@@ -1,4 +1,4 @@
-export interface RootProps {
+interface RootProps {
   children: React.ReactNode;
 }
 

src/components/GenericAllStats/components/Row.tsx

@@ -1,4 +1,4 @@
-export interface RowProps {
+interface RowProps {
   children: React.ReactNode;
 }
 

src/components/GenericAllStats/index.tsx

@@ -7,7 +7,7 @@ import { Card } from './components/Card';
 import { Root } from './components/Root';
 import { Row } from './components/Row';
 
-export interface GenericAllStatsProps {
+interface GenericAllStatsProps {
   stats: AllStats;
   supplementaryStats?: SupplementaryStats;
   locale: Locale;

src/components/GenericStats/components/GenericStatsColumn.tsx

@@ -1,8 +1,8 @@
-import { Stat } from '..';
+import { GenericStat } from '..';
 import GenericStatsRow from './GenericStatsRow';
 
-export interface GenericStatsColumnProps {
+interface GenericStatsColumnProps {
-  stats: Stat[];
+  stats: GenericStat[];
 }
 
 export default function GenericStatsColumn({ stats }: GenericStatsColumnProps) {

src/components/GenericStats/components/GenericStatsRow.tsx

@@ -1,9 +1,9 @@
-import { Stat } from '..';
+import { GenericStat } from '..';
 import { theme } from '../../../stitches.config';
 import PercentileIndicator from '../../PercentileIndicator';
 
-export interface GenericStatsRowProps {
+interface GenericStatsRowProps {
-  stat: Stat;
+  stat: GenericStat;
 }
 
 export default function GenericStatsRow({ stat }: GenericStatsRowProps) {

src/components/GenericStats/index.tsx

@@ -1,12 +1,12 @@
 import { Percentile } from '../../constants/percentiles';
 import GenericStatsColumn from './components/GenericStatsColumn';
 
-export type Stat =
+export type GenericStat =
   | [string, string | number | undefined]
   | [string, string | number | undefined, Percentile | undefined];
 
 export interface GenericStatsProps {
-  stats: Stat[];
+  stats: GenericStat[];
   columnCount?: number;
 }
 
@@ -16,7 +16,7 @@ export default function GenericStats({
 }: GenericStatsProps) {
   const filteredStats = stats.filter(([, value]) => value !== undefined);
   const itemsPerRow = Math.ceil(filteredStats.length / columnCount);
-  const columns: Stat[][] = [];
+  const columns: GenericStat[][] = [];
 
   filteredStats.forEach((stat, index) => {
     const column = Math.floor(index / itemsPerRow);

src/components/Graph/components/Line/constants.ts

@@ -0,0 +1,11 @@
+export enum LineColor {
+  Red,
+  Green,
+  Blue,
+  White,
+}
+export enum LineStyle {
+  Solid,
+  Dashes,
+  DashesAndDots,
+}

src/components/Graph/components/Line/index.tsx

@@ -1,12 +1,6 @@
 import { blue, green, red, slateDark } from '@radix-ui/colors';
-import { GRAPH_HEIGHT, GRAPH_WIDTH } from './Root';
+import { GRAPH_HEIGHT, GRAPH_WIDTH } from '../Root/constants';
-
+import { LineColor, LineStyle } from './constants';
-export enum LineColor {
-  Red,
-  Green,
-  Blue,
-  White,
-}
 
 const LINE_COLORS = {
   [LineColor.Red]: red.red9,
@@ -15,12 +9,6 @@ const LINE_COLORS = {
   [LineColor.White]: slateDark.slate11,
 };
 
-export enum LineStyle {
-  Solid,
-  Dashes,
-  DashesAndDots,
-}
-
 const LINE_STYLES = {
   [LineStyle.Solid]: undefined,
   [LineStyle.Dashes]: '8, 8',
@@ -28,9 +16,9 @@ const LINE_STYLES = {
 };
 
 export type PlotItem = [number, number];
-export type Plot = PlotItem[];
+type Plot = PlotItem[];
 
-export interface LineProps {
+interface LineProps {
   plot: Plot;
   minY?: number;
   maxY?: number;

src/components/Graph/components/Margin/constants.ts

@@ -0,0 +1,4 @@
+export enum MarginOrientation {
+  Vertical,
+  Horizontal,
+}

src/components/Graph/components/Margin/index.tsx

@@ -1,13 +1,9 @@
 import { times } from 'lodash';
-import { theme } from '../../../stitches.config';
+import { theme } from '../../../../stitches.config';
-import { MarginInputProps } from './Root';
+import { MarginInputProps } from '../Root';
+import { MarginOrientation } from './constants';
 
-export enum MarginOrientation {
+interface MarginProps extends MarginInputProps {
-  Vertical,
-  Horizontal,
-}
-
-export interface MarginProps extends MarginInputProps {
   verticalSeparations: number;
   orientation?: MarginOrientation;
 }

src/components/Graph/components/Root/constants.ts

@@ -0,0 +1,2 @@
+export const GRAPH_WIDTH = 384;
+export const GRAPH_HEIGHT = 320;

src/components/Graph/components/Root/index.tsx

@@ -1,10 +1,9 @@
 import { times } from 'lodash';
 import { ReactNode } from 'react';
-import { theme } from '../../../stitches.config';
+import { theme } from '../../../../stitches.config';
-import { Margin, MarginOrientation } from './Margin';
+import { Margin } from '../Margin';
-
+import { MarginOrientation } from '../Margin/constants';
-export const GRAPH_WIDTH = 384;
+import { GRAPH_HEIGHT, GRAPH_WIDTH } from './constants';
-export const GRAPH_HEIGHT = 320;
 
 export interface MarginInputProps {
   min: number;
@@ -13,7 +12,7 @@ export interface MarginInputProps {
   precision?: number;
 }
 
-export interface RootProps {
+interface RootProps {
   children: ReactNode;
   verticalMargin?: MarginInputProps;
   horizontalMargin?: MarginInputProps;

src/components/Leaderboard/components/Gap.tsx

@@ -1,6 +1,6 @@
 import { theme } from '../../../stitches.config';
 
-export interface GapProps {
+interface GapProps {
   message: string;
 }
 

src/components/Leaderboard/components/Item.tsx

@@ -2,7 +2,7 @@ import { ComponentProps } from 'react';
 import { RatingsReward } from '../../../commands/ratings';
 import { theme } from '../../../stitches.config';
 
-export interface ItemProps extends ComponentProps<'div'> {
+interface ItemProps extends ComponentProps<'div'> {
   position: number;
   deltaPosition?: number;
   score?: number;

src/components/Leaderboard/components/Root.tsx

@@ -1,6 +1,6 @@
 import { ReactNode } from 'react';
 
-export interface RootProps {
+interface RootProps {
   children: ReactNode;
 }
 

src/components/Navbar/index.tsx

@@ -1,8 +1,8 @@
 import { DiscordLogoIcon } from '@radix-ui/react-icons';
 import { Flex, Text, Theme } from '@radix-ui/themes';
 import Link from 'next/link';
-import { theme } from '../../stitches.config';
 import { BlitzkriegWormWide } from '../../icons/BlitzkriegWormWide';
+import { theme } from '../../stitches.config';
 
 export default function Navbar() {
   return (

src/components/NoData/constants.ts

@@ -0,0 +1,5 @@
+export enum NoDataType {
+  BattlesInPeriod,
+  PlayersInPeriod,
+  TanksFound,
+}

src/components/NoData/index.tsx

@@ -1,14 +1,8 @@
 import { Locale } from 'discord.js';
-import { translator } from '../core/localization/translator';
+import { translator } from '../../core/localization/translator';
-import { theme } from '../stitches.config';
+import { theme } from '../../stitches.config';
 
-export enum NoDataType {
+interface NoDataProps {
-  BattlesInPeriod,
-  PlayersInPeriod,
-  TanksFound,
-}
-
-export interface NoDataProps {
   type: 'battles_in_period' | 'players_in_period' | 'tanks_found';
   locale: Locale;
 }

src/components/PercentileIndicator/constants.ts

@@ -10,11 +10,7 @@ import {
   slate,
   teal,
 } from '@radix-ui/colors';
-import { Percentile } from '../constants/percentiles';
+import { Percentile } from '../../constants/percentiles';
-
-export interface PercentileIndicatorProps {
-  percentile: Percentile;
-}
 
 export const PERCENTILE_COLORS = {
   [Percentile.VeryBad]: slate.slate9,
@@ -28,18 +24,3 @@ export const PERCENTILE_COLORS = {
   [Percentile.Unicum]: pink.pink9,
   [Percentile.SuperUnicum]: purple.purple9,
 };
-
-export default function PercentileIndicator({
-  percentile,
-}: PercentileIndicatorProps) {
-  return (
-    <div
-      style={{
-        width: 8,
-        height: 8,
-        borderRadius: 4,
-        backgroundColor: PERCENTILE_COLORS[percentile],
-      }}
-    />
-  );
-}

src/components/PercentileIndicator/index.tsx

@@ -0,0 +1,21 @@
+import { Percentile } from '../../constants/percentiles';
+import { PERCENTILE_COLORS } from './constants';
+
+interface PercentileIndicatorProps {
+  percentile: Percentile;
+}
+
+export default function PercentileIndicator({
+  percentile,
+}: PercentileIndicatorProps) {
+  return (
+    <div
+      style={{
+        width: 8,
+        height: 8,
+        borderRadius: 4,
+        backgroundColor: PERCENTILE_COLORS[percentile],
+      }}
+    />
+  );
+}

src/components/Tanks/components/Column.tsx

@@ -1,6 +1,6 @@
 import { ReactNode } from 'react';
 
-export interface ColumnProps {
+interface ColumnProps {
   children: ReactNode;
 }
 

src/components/Tanks/components/Item/constants.ts

@@ -0,0 +1,31 @@
+import { TankClass, TreeType } from '.';
+import {
+  TANK_ICONS,
+  TANK_ICONS_COLLECTOR,
+  TANK_ICONS_PREMIUM,
+} from '../../../../core/blitzkrieg/tankDefinitions/constants';
+
+export const TREE_TYPES = ['researchable', 'premium', 'collector'] as const; // BIG TODO: REMOVE THIS AFTER LOCALIZATION
+
+export const TANK_CLASSES = [
+  'lightTank',
+  'mediumTank',
+  'heavyTank',
+  'AT-SPG',
+] as const;
+
+export const TREE_TYPE_NAMES: Record<TreeType, string> = {
+  researchable: 'Tech tree',
+  premium: 'Premium',
+  collector: 'Collector',
+};
+export const TREE_TYPE_IMAGES: Record<TreeType, string> = {
+  researchable: 'https://i.imgur.com/pJxO2XY.png',
+  premium: 'https://i.imgur.com/mZzSwOU.png',
+  collector: 'https://i.imgur.com/7A0RsG5.png',
+};
+export const TREE_TYPE_ICONS: Record<TreeType, Record<TankClass, string>> = {
+  researchable: TANK_ICONS,
+  premium: TANK_ICONS_PREMIUM,
+  collector: TANK_ICONS_COLLECTOR,
+};

src/components/Tanks/components/Item/index.tsx

@@ -1,37 +1,10 @@
-import {
+import { theme } from '../../../../stitches.config';
-  TANK_ICONS,
+import { TANK_CLASSES, TREE_TYPES, TREE_TYPE_ICONS } from './constants';
-  TANK_ICONS_COLLECTOR,
-  TANK_ICONS_PREMIUM,
-} from '../../../core/blitzkrieg/tankDefinitions';
-import { theme } from '../../../stitches.config';
-
-export const TANK_CLASSES = [
-  'lightTank',
-  'mediumTank',
-  'heavyTank',
-  'AT-SPG',
-] as const;
-
-export const TREE_TYPES = ['researchable', 'premium', 'collector'] as const;
 
 export type TankClass = (typeof TANK_CLASSES)[number];
 export type TreeType = (typeof TREE_TYPES)[number];
 
-// BIG TODO: REMOVE THIS AFTER LOCALIZATION
-export const TREE_TYPE_NAMES: Record<TreeType, string> = {
-  researchable: 'Tech tree',
-  premium: 'Premium',
-  collector: 'Collector',
-};
-
-export const TREE_TYPE_IMAGES: Record<TreeType, string> = {
-  researchable: 'https://i.imgur.com/pJxO2XY.png',
-  premium: 'https://i.imgur.com/mZzSwOU.png',
-  collector: 'https://i.imgur.com/7A0RsG5.png',
-};
-
 export interface ItemProps {
-  image?: string;
   tankType?: TankClass;
   name: string;
   treeType: TreeType;
@@ -43,13 +16,7 @@ const TREE_TYPE_COLOR = {
   collector: '_blue',
 } as const;
 
-export const TREE_TYPE_ICONS: Record<TreeType, Record<TankClass, string>> = {
+export function Item({ tankType, name, treeType }: ItemProps) {
-  researchable: TANK_ICONS,
-  premium: TANK_ICONS_PREMIUM,
-  collector: TANK_ICONS_COLLECTOR,
-};
-
-export function Item({ image, tankType, name, treeType }: ItemProps) {
   return (
     <div
       style={{

src/components/Tanks/components/Root.tsx

@@ -1,6 +1,6 @@
 import { ReactNode } from 'react';
 
-export interface RootProps {
+interface RootProps {
   children: ReactNode;
 }
 

src/components/Tanks/components/Row.tsx

@@ -1,6 +1,6 @@
 import { ReactNode } from 'react';
 
-export interface RowProps {
+interface RowProps {
   children: ReactNode;
 }
 

src/components/Tanks/components/Title.tsx

@@ -1,6 +1,6 @@
 import { theme } from '../../../stitches.config';
 
-export interface TitleProps {
+interface TitleProps {
   children: string;
 }
 

src/components/TierWeights.tsx

@@ -3,7 +3,7 @@ import { theme } from '../stitches.config';
 
 export type TierWeightsRecord = Partial<Record<Tier, number>>;
 
-export interface TierWeightsProps {
+interface TierWeightsProps {
   weights: TierWeightsRecord;
 }
 

src/components/TitleBar.tsx

@@ -1,6 +1,6 @@
 import { theme } from '../stitches.config';
 
-export interface TitleBarProps {
+interface TitleBarProps {
   title: string;
   image?: string;
   description?: string;

src/core/blitz/encyclopediaInfo.ts

@@ -1,15 +0,0 @@
-import { WARGAMING_APPLICATION_ID } from '../../constants/wargamingApplicationID';
-import fetchBlitz from './fetchBlitz';
-
-export interface EncyclopediaInfo {
-  achievement_sections: Record<string, { name: string; order: number }>;
-  tanks_updated_at: number;
-  languages: Record<string, string>;
-  vehicle_types: Record<string, string>;
-  vehicle_nations: Record<string, string>;
-  game_version: string;
-}
-
-export const encyclopediaInfo = fetchBlitz<EncyclopediaInfo>(
-  `https://api.wotblitz.com/wotb/encyclopedia/info/?application_id=${WARGAMING_APPLICATION_ID}`,
-);

src/core/blitz/extractArmor.ts

@@ -6,13 +6,9 @@ import { VertexAttribute } from '../streams/scpg';
 import {
   vertexAttributeGLTFName,
   vertexAttributeGltfVectorSizes,
-} from './extractModel';
+} from './extractModel/constants';
 import { readDVPLFile } from './readDVPLFile';
 
-Buffer.prototype.toJSON = function () {
-  return [...(this as Buffer)].map((int) => int.toString(16)).join('');
-};
-
 export async function extractArmor(data: string, fileName: string) {
   const sc2Path = `${data}/3d/Tanks/CollisionMeshes/${fileName}.sc2.dvpl`;
   const scgPath = `${data}/3d/Tanks/CollisionMeshes/${fileName}.scg.dvpl`;

src/core/blitz/extractModel/constants.ts

@@ -0,0 +1,19 @@
+import { vertexAttributeVectorSizes } from '../../streams/scg';
+import { VertexAttribute } from '../../streams/scpg';
+
+export const vertexAttributeGLTFName: Partial<Record<VertexAttribute, string>> =
+  {
+    [VertexAttribute.VERTEX]: 'POSITION',
+    [VertexAttribute.NORMAL]: 'NORMAL',
+    [VertexAttribute.TEXCOORD0]: 'TEXCOORD_0',
+    [VertexAttribute.TEXCOORD1]: 'TEXCOORD_0',
+    [VertexAttribute.TEXCOORD2]: 'TEXCOORD_0',
+    [VertexAttribute.TEXCOORD3]: 'TEXCOORD_0',
+    [VertexAttribute.TANGENT]: 'TANGENT',
+    [VertexAttribute.JOINTINDEX]: 'JOINT_0',
+    [VertexAttribute.JOINTWEIGHT]: 'WEIGHT_0',
+  };
+export const vertexAttributeGltfVectorSizes = {
+  ...vertexAttributeVectorSizes,
+  [VertexAttribute.TANGENT]: 4,
+} as const;

src/core/blitz/extractModel/index.ts

@@ -8,33 +8,18 @@ import {
   Vector3Tuple,
   Vector4Tuple,
 } from 'three';
-import { TextureMutation, readTexture } from '../blitzkrieg/readTexture';
+import { readTexture } from '../../blitzkrieg/readTexture';
-import { Hierarchy, Sc2ReadStream, Textures } from '../streams/sc2';
+import { TextureMutation } from '../../blitzkrieg/readTexture/constants';
-import { ScgReadStream, vertexAttributeVectorSizes } from '../streams/scg';
+import { Hierarchy, Sc2ReadStream, Textures } from '../../streams/sc2';
-import { VertexAttribute } from '../streams/scpg';
+import { ScgReadStream } from '../../streams/scg';
-import { readDVPLFile } from './readDVPLFile';
+import { VertexAttribute } from '../../streams/scpg';
+import { readDVPLFile } from '../readDVPLFile';
+import {
+  vertexAttributeGLTFName,
+  vertexAttributeGltfVectorSizes,
+} from './constants';
 
 const ERROR_ON_UNKNOWN_COMPONENT = false;
-const MAX_FLOAT32 = 2 ** 127 * (2 - 2 ** -23);
-
-export const vertexAttributeGLTFName: Partial<Record<VertexAttribute, string>> =
-  {
-    [VertexAttribute.VERTEX]: 'POSITION',
-    [VertexAttribute.NORMAL]: 'NORMAL',
-    [VertexAttribute.TEXCOORD0]: 'TEXCOORD_0',
-    [VertexAttribute.TEXCOORD1]: 'TEXCOORD_0',
-    [VertexAttribute.TEXCOORD2]: 'TEXCOORD_0',
-    [VertexAttribute.TEXCOORD3]: 'TEXCOORD_0',
-    [VertexAttribute.TANGENT]: 'TANGENT',
-    [VertexAttribute.JOINTINDEX]: 'JOINT_0',
-    [VertexAttribute.JOINTWEIGHT]: 'WEIGHT_0',
-  };
-
-export const vertexAttributeGltfVectorSizes = {
-  ...vertexAttributeVectorSizes,
-
-  [VertexAttribute.TANGENT]: 4,
-} as const;
 
 const omitMeshNames = {
   start: ['chassis_chassis_', 'chassis_track_crash_', 'HP_'],

src/core/blitz/fetchBlitz.ts

@@ -1,4 +1,4 @@
-export type BlitzResponse<Data extends object> =
+type BlitzResponse<Data extends object> =
   | {
       status: 'error';
       error: { field: string; message: string; code: 402; value: null };

src/core/blitz/getClanAccountInfo.ts

@@ -4,7 +4,7 @@ import fetchBlitz from './fetchBlitz';
 import { normalizeExtra } from './normalizeExtra';
 import { normalizeIds } from './normalizeIds';
 
-export type IndividualClanAccountInfo = {
+type IndividualClanAccountInfo = {
   account_id: number;
   joined_at: number;
   clan_id: number;
@@ -21,7 +21,7 @@ export type IndividualClanAccountInfo = {
   };
 } | null;
 
-export interface ClanAccountInfo {
+interface ClanAccountInfo {
   [accountId: number]: IndividualClanAccountInfo;
 }
 

src/core/blitz/getClanInfo.ts

@@ -3,7 +3,7 @@ import { WARGAMING_APPLICATION_ID } from '../../constants/wargamingApplicationID
 import fetchBlitz from './fetchBlitz';
 import { normalizeIds } from './normalizeIds';
 
-export interface IndividualClanInfo {
+interface IndividualClanInfo {
   recruiting_options: {
     vehicles_level: number;
     wins_ratio: number;
@@ -32,7 +32,7 @@ export interface IndividualClanInfo {
   description: string;
 }
 
-export interface ClanInfo {
+interface ClanInfo {
   [clanId: number]: IndividualClanInfo;
 }
 

src/core/blitz/searchClansAcrossRegions.ts

@@ -1,12 +1,8 @@
 import { Region } from '../../constants/regions';
 import { WARGAMING_APPLICATION_ID } from '../../constants/wargamingApplicationID';
-import { Clan, ClanList } from '../../types/clanList';
+import { ClanList } from '../../types/clanList';
 import fetchBlitz from './fetchBlitz';
 
-export type ClanListWithRegion = (Clan & {
-  region: 'com' | 'eu' | 'asia';
-})[];
-
 export default async function searchClansAcrossRegions(
   search: string,
   limit = 25,

src/core/blitz/searchPlayersAcrossRegions/constants.ts

@@ -0,0 +1,2 @@
+export const usernamePattern = /^[a-zA-Z0-9_]{3,24}$/;
+export const usernamePatternWithoutPosition = /[a-zA-Z0-9_]{3,24}/;

src/core/blitz/searchPlayersAcrossRegions/index.ts

@@ -1,6 +1,7 @@
-import { Region } from '../../constants/regions';
+import { Region } from '../../../constants/regions';
-import { WARGAMING_APPLICATION_ID } from '../../constants/wargamingApplicationID';
+import { WARGAMING_APPLICATION_ID } from '../../../constants/wargamingApplicationID';
-import fetchBlitz from './fetchBlitz';
+import fetchBlitz from '../fetchBlitz';
+import { usernamePattern } from './constants';
 
 export interface AccountListItem {
   nickname: string;
@@ -11,9 +12,6 @@ export type AccountListWithServer = (AccountListItem & {
   region: Region;
 })[];
 
-export const usernamePattern = /^[a-zA-Z0-9_]{3,24}$/;
-export const usernamePatternWithoutPosition = /[a-zA-Z0-9_]{3,24}/;
-
 export default async function searchPlayersAcrossRegions(
   search: string,
   limit = 25,

src/core/blitzkrieg/assignDuelMember.ts

@@ -1,9 +1,6 @@
 import { degToRad } from 'three/src/math/MathUtils';
-import {
+import { DuelMember, mutateDuel } from '../../stores/duel';
-  DuelMember,
+import { genericDefaultEquipmentMatrix } from '../../stores/duel/constants';
-  genericDefaultEquipmentMatrix,
-  mutateDuel,
-} from '../../stores/duel';
 import { availableProvisions } from './availableProvisions';
 import { modelDefinitions } from './modelDefinitions';
 import { provisionDefinitions } from './provisionDefinitions';

src/core/blitzkrieg/discordBlitz.ts

@@ -1,7 +1,5 @@
-import { PrismaClient } from '@prisma/client';
 import { Region } from '../../constants/regions';
-
+import { discordBlitzDB } from './discordBlitzDB';
-export const discordBlitzDB = new PrismaClient();
 
 export function linkBlitzAndDiscord(
   discord: number,

src/core/blitzkrieg/discordBlitzDB.ts

@@ -0,0 +1,3 @@
+import { PrismaClient } from '@prisma/client';
+
+export const discordBlitzDB = new PrismaClient();

src/core/blitzkrieg/filtersToDescription.ts

@@ -1,7 +1,8 @@
 import { Locale } from 'discord.js';
 import { translator } from '../localization/translator';
 import { StatFilters } from '../statistics/filterStats';
-import { TIER_ROMAN_NUMERALS, Tier, tankDefinitions } from './tankDefinitions';
+import { Tier, tankDefinitions } from './tankDefinitions';
+import { TIER_ROMAN_NUMERALS } from './tankDefinitions/constants';
 
 export async function filtersToDescription(
   { nation, tier, tankType, treeType, tank }: StatFilters,

src/core/blitzkrieg/getArchivedRatingsMidnightLeaderboard.ts

@@ -1,8 +1,6 @@
 import { BlitzkriegRatingsLeaderboard } from '../../../scripts/buildRatingsLeaderboard';
 import { Region } from '../../constants/regions';
 
-export const DATABASE_REPO = { owner: 'tresabhi', repo: 'blitzkrieg-assets' };
-
 const MIDNIGHT_LEADERBOARD_CACHE: Record<
   Region,
   Record<number, BlitzkriegRatingsLeaderboard>

src/core/blitzkrieg/getTankHistories.ts

@@ -7,7 +7,7 @@ import {
   getHistoriesDefaultOptions,
 } from '../../types/histories';
 import getTankStats from '../blitz/getTankStats';
-import { emptyAllStats } from '../blitzstars/getStatsInPeriod';
+import { emptyAllStats } from '../blitzstars/getStatsInPeriod/constants';
 
 export interface TankHistory extends History {
   tank_id: number;
@@ -27,7 +27,7 @@ export interface GetTankHistoriesOptions extends GetHistoriesOptions {
   tankId?: number;
 }
 
-export const getTankHistoriesDefaultOptions: GetTankHistoriesOptions = {
+const getTankHistoriesDefaultOptions: GetTankHistoriesOptions = {
   ...getHistoriesDefaultOptions,
   tankId: undefined,
 };

src/core/blitzkrieg/getTimeDaysAgo.ts

@@ -1,6 +1,6 @@
 import { Region } from '../../constants/regions';
 
-export const TIME_ZONE_MAPPINGS: Record<Region, number> = {
+const TIME_ZONE_MAPPINGS: Record<Region, number> = {
   com: -5, // Central North American Time
   eu: +1, // Central European Time
   asia: +7, // Central Asia Standard Time

src/core/blitzkrieg/processes.ts

@@ -1,5 +1,5 @@
 import { client } from '../discord/client';
-import { discordBlitzDB } from './discordBlitz';
+import { discordBlitzDB } from './discordBlitzDB';
 
 const EXIT_EVENTS = [
   'beforeExit',

src/core/blitzkrieg/readTexture/constants.ts

@@ -0,0 +1,6 @@
+export enum TextureMutation {
+  Normal,
+  RoughnessMetallicness,
+  BaseColor,
+  Miscellaneous,
+}

src/core/blitzkrieg/readTexture/index.ts

@@ -1,16 +1,10 @@
 import { existsSync } from 'fs';
 import sharp from 'sharp';
 import { Vector3Tuple } from 'three';
-import { readDVPLFile } from '../blitz/readDVPLFile';
+import { readDVPLFile } from '../../blitz/readDVPLFile';
-import { DdsReadStream } from '../streams/dds';
+import { DdsReadStream } from '../../streams/dds';
-import { PvrReadStream } from '../streams/pvr';
+import { PvrReadStream } from '../../streams/pvr';
-
+import { TextureMutation } from './constants';
-export enum TextureMutation {
-  Normal,
-  RoughnessMetallicness,
-  BaseColor,
-  Miscellaneous,
-}
 
 type ReadTextureOptions =
   | {

src/core/blitzkrieg/resetSession.ts

@@ -0,0 +1,8 @@
+import { useSession } from '../../stores/session';
+import { setSession } from './setSession';
+
+export function resetSession() {
+  const session = useSession.getState();
+  if (!session.isTracking) return;
+  setSession(session.region, session.id, session.nickname);
+}

src/core/blitzkrieg/secrets.ts

@@ -2,7 +2,7 @@ import { config } from 'dotenv';
 
 config();
 
-export const SECRET_KEYS = [
+const SECRET_KEYS = [
   'DISCORD_TOKEN',
   'GH_TOKEN',
   'DISCORD_BLITZ_DB',

src/core/blitzkrieg/setSession.ts

@@ -0,0 +1,30 @@
+import { Region } from '../../constants/regions';
+import { WARGAMING_APPLICATION_ID } from '../../constants/wargamingApplicationID';
+import { useSession } from '../../stores/session';
+import { NormalizedTankStats, TanksStats } from '../../types/tanksStats';
+import fetchBlitz from '../blitz/fetchBlitz';
+
+export async function setSession(region: Region, id: number, nickname: string) {
+  // TODO: generalize this function and also check for more of these kind
+  const rawTankStats = (
+    await fetchBlitz<TanksStats>(
+      `https://api.wotblitz.${region}/wotb/tanks/stats/?application_id=${WARGAMING_APPLICATION_ID}&account_id=${id}`,
+    )
+  )[id];
+  const tankStats = rawTankStats.reduce<NormalizedTankStats>(
+    (accumulator, tank) => ({
+      ...accumulator,
+      [tank.tank_id]: tank,
+    }),
+    {},
+  );
+
+  useSession.setState({
+    isTracking: true,
+    id,
+    region,
+    nickname,
+    tankStats,
+    time: Date.now(),
+  });
+}

src/core/blitzkrieg/tankDefinitions/constants.ts

@@ -0,0 +1,52 @@
+import { CrewMember, GunDefinition, ShellType, Tier } from '.';
+import { TankClass } from '../../../components/Tanks';
+
+export const SHELL_NAMES: Record<ShellType, string> = {
+  ap: 'AP',
+  ap_cr: 'APCR',
+  hc: 'HEAT',
+  he: 'HE',
+};
+export const CREW_MEMBER_NAMES: Record<CrewMember, string> = {
+  commander: 'Commander',
+  radioman: 'Radioman',
+  gunner: 'Gunner',
+  driver: 'Driver',
+  loader: 'Loader',
+};
+export const GUN_TYPE_NAMES: Record<GunDefinition['type'], string> = {
+  regular: 'Regular',
+  autoLoader: 'Auto loader',
+  autoReloader: 'Auto reloader',
+};
+export const TANK_ICONS: Record<TankClass, string> = {
+  'AT-SPG': 'https://i.imgur.com/BIHSEH0.png',
+  lightTank: 'https://i.imgur.com/CSNha5V.png',
+  mediumTank: 'https://i.imgur.com/wvf3ltm.png',
+  heavyTank: 'https://i.imgur.com/ECeqlZa.png',
+};
+export const TANK_ICONS_PREMIUM: Record<TankClass, string> = {
+  'AT-SPG': 'https://i.imgur.com/TCu3EdR.png',
+  lightTank: 'https://i.imgur.com/zdkpTRb.png',
+  mediumTank: 'https://i.imgur.com/3z7eHX6.png',
+  heavyTank: 'https://i.imgur.com/P3vbmyA.png',
+};
+export const TANK_ICONS_COLLECTOR: Record<TankClass, string> = {
+  'AT-SPG': 'https://i.imgur.com/WTjeirB.png',
+  lightTank: 'https://i.imgur.com/EwhtKkU.png',
+  mediumTank: 'https://i.imgur.com/u8YDMBh.png',
+  heavyTank: 'https://i.imgur.com/8xRf3nc.png',
+};
+export const TIERS = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10] as const;
+export const TIER_ROMAN_NUMERALS: Record<Tier, string> = {
+  1: 'I',
+  2: 'II',
+  3: 'III',
+  4: 'IV',
+  5: 'V',
+  6: 'VI',
+  7: 'VII',
+  8: 'VIII',
+  9: 'IX',
+  10: 'X',
+};

src/core/blitzkrieg/tankDefinitions/index.ts

@@ -1,18 +1,12 @@
 import { deburr } from 'lodash';
 import { Vector2Tuple } from 'three';
-import { TankClass, TreeType } from '../../components/Tanks';
+import { TankClass, TreeType } from '../../../components/Tanks';
-import { asset } from './asset';
+import { asset } from '../asset';
-import { fetchCdonLz4 } from './fetchCdonLz4';
+import { fetchCdonLz4 } from '../fetchCdonLz4';
+import { TIERS } from './constants';
 
 export type ShellType = 'ap' | 'ap_cr' | 'hc' | 'he';
 
-export const SHELL_NAMES: Record<ShellType, string> = {
-  ap: 'AP',
-  ap_cr: 'APCR',
-  hc: 'HEAT',
-  he: 'HE',
-};
-
 export type CrewMember =
   | 'commander'
   | 'radioman'
@@ -20,13 +14,6 @@ export type CrewMember =
   | 'driver'
   | 'loader';
 export type TankDefinitions = Record<number, TankDefinition>;
-export const CREW_MEMBER_NAMES: Record<CrewMember, string> = {
-  commander: 'Commander',
-  radioman: 'Radioman',
-  gunner: 'Gunner',
-  driver: 'Driver',
-  loader: 'Loader',
-};
 export interface Crew {
   type: CrewMember;
   count?: number;
@@ -148,12 +135,6 @@ export type ShellDefinition = {
   explosionRadius?: number;
 };
 
-export const GUN_TYPE_NAMES: Record<GunDefinition['type'], string> = {
-  regular: 'Regular',
-  autoLoader: 'Auto loader',
-  autoReloader: 'Auto reloader',
-};
-
 export const tankDefinitions = fetchCdonLz4<TankDefinitions>(
   asset('definitions/tanks.cdon.lz4'),
 );
@@ -180,44 +161,8 @@ export const tankNames = tanksDefinitionsArray.then((tanks) =>
   ),
 );
 
-export const TANK_ICONS: Record<TankClass, string> = {
-  'AT-SPG': 'https://i.imgur.com/BIHSEH0.png',
-  lightTank: 'https://i.imgur.com/CSNha5V.png',
-  mediumTank: 'https://i.imgur.com/wvf3ltm.png',
-  heavyTank: 'https://i.imgur.com/ECeqlZa.png',
-};
-
-export const TANK_ICONS_PREMIUM: Record<TankClass, string> = {
-  'AT-SPG': 'https://i.imgur.com/TCu3EdR.png',
-  lightTank: 'https://i.imgur.com/zdkpTRb.png',
-  mediumTank: 'https://i.imgur.com/3z7eHX6.png',
-  heavyTank: 'https://i.imgur.com/P3vbmyA.png',
-};
-
-export const TANK_ICONS_COLLECTOR: Record<TankClass, string> = {
-  'AT-SPG': 'https://i.imgur.com/WTjeirB.png',
-  lightTank: 'https://i.imgur.com/EwhtKkU.png',
-  mediumTank: 'https://i.imgur.com/u8YDMBh.png',
-  heavyTank: 'https://i.imgur.com/8xRf3nc.png',
-};
-
-export const TIERS = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10] as const;
-
 export type Tier = (typeof TIERS)[number];
 
-export const TIER_ROMAN_NUMERALS: Record<Tier, string> = {
-  1: 'I',
-  2: 'II',
-  3: 'III',
-  4: 'IV',
-  5: 'V',
-  6: 'VI',
-  7: 'VII',
-  8: 'VIII',
-  9: 'IX',
-  10: 'X',
-};
-
 export const NATIONS = tanksDefinitionsArray.then((tanks) => {
   const nations = Array.from(
     new Set<string>(Object.values(tanks).map((tank) => tank.nation)),

src/core/blitzstars/getPlayerHistories.ts

@@ -7,7 +7,7 @@ import {
 } from '../../types/histories';
 import { getAccountInfo } from '../blitz/getAccountInfo';
 import { PlayerStats } from './getPlayerStats';
-import { emptyAllStats } from './getStatsInPeriod';
+import { emptyAllStats } from './getStatsInPeriod/constants';
 
 export default async function getPlayerHistories(
   server: Region,

src/core/blitzstars/getPlayerStats.ts

@@ -1,7 +1,7 @@
 import { Region } from '../../constants/regions';
 import { AllStats } from '../blitz/getAccountInfo';
 
-export interface IndividualPlayerStats {
+interface IndividualPlayerStats {
   clan: { clan_id: number; name: string; tag: string };
   statistics: {
     all: AllStats;

src/core/blitzstars/getStatsInPeriod/constants.ts

@@ -0,0 +1,21 @@
+import { AllStats } from '../../blitz/getAccountInfo';
+
+export const emptyAllStats: AllStats = {
+  battles: 0,
+  capture_points: 0,
+  damage_dealt: 0,
+  damage_received: 0,
+  dropped_capture_points: 0,
+  frags: 0,
+  frags8p: 0,
+  hits: 0,
+  losses: 0,
+  max_frags: 0,
+  max_xp: 0,
+  shots: 0,
+  spotted: 0,
+  survived_battles: 0,
+  xp: 0,
+  win_and_survived: 0,
+  wins: 0,
+};

src/core/blitzstars/getStatsInPeriod/index.ts

@@ -1,32 +1,13 @@
 import { Locale } from 'discord.js';
-import { Region } from '../../constants/regions';
+import { Region } from '../../../constants/regions';
-import { AllStats } from '../blitz/getAccountInfo';
+import { AllStats } from '../../blitz/getAccountInfo';
 import getTankHistories, {
   TankHistories,
   TankHistoryRaw,
-} from '../blitzkrieg/getTankHistories';
+} from '../../blitzkrieg/getTankHistories';
+import { emptyAllStats } from './constants';
 
-export const emptyAllStats: AllStats = {
+const emptyTankHistoryNode: TankHistoryRaw = {
-  battles: 0,
-  capture_points: 0,
-  damage_dealt: 0,
-  damage_received: 0,
-  dropped_capture_points: 0,
-  frags: 0,
-  frags8p: 0,
-  hits: 0,
-  losses: 0,
-  max_frags: 0,
-  max_xp: 0,
-  shots: 0,
-  spotted: 0,
-  survived_battles: 0,
-  xp: 0,
-  win_and_survived: 0,
-  wins: 0,
-};
-
-export const emptyTankHistoryNode: TankHistoryRaw = {
   account_id: 0,
   battle_life_time: 0,
   last_battle_time: 0,

src/core/blitzstars/tankAverages.ts

@@ -2,7 +2,7 @@ import { AllStats } from '../blitz/getAccountInfo';
 import { context } from '../blitzkrieg/context';
 import { tankDefinitions } from '../blitzkrieg/tankDefinitions';
 
-export interface SpecialStats {
+interface SpecialStats {
   winrate: number;
   damageRatio: number;
   kdr: number;

src/core/discord/addFilterOptions.ts

@@ -4,7 +4,10 @@ import {
   SlashCommandBuilder,
   SlashCommandSubcommandBuilder,
 } from 'discord.js';
-import { TANK_CLASSES, TREE_TYPES } from '../../components/Tanks';
+import {
+  TANK_CLASSES,
+  TREE_TYPES,
+} from '../../components/Tanks/components/Item/constants';
 import { translator } from '../localization/translator';
 import addTankChoices from './addTankChoices';
 import addTierChoices from './addTierChoices';

src/core/discord/autocompleteClan/constants.ts

@@ -0,0 +1,2 @@
+export const DISCORD_CHOICES_MAX_NAME_SIZE = 25;
+export const OVERFLOW_SUFFIX = '…';

src/core/discord/autocompleteClan/index.ts

@@ -3,11 +3,9 @@ import {
   AutocompleteInteraction,
   CacheType,
 } from 'discord.js';
-import searchClansAcrossRegions from '../blitz/searchClansAcrossRegions';
+import searchClansAcrossRegions from '../../blitz/searchClansAcrossRegions';
-import { translator } from '../localization/translator';
+import { translator } from '../../localization/translator';
-
+import { DISCORD_CHOICES_MAX_NAME_SIZE, OVERFLOW_SUFFIX } from './constants';
-export const DISCORD_CHOICES_MAX_NAME_SIZE = 25;
-export const OVERFLOW_SUFFIX = '…';
 
 export default async function autocompleteClan(
   interaction: AutocompleteInteraction<CacheType>,

src/core/discord/autocompleteTanks.ts

@@ -8,7 +8,7 @@ import { tankNames } from '../blitzkrieg/tankDefinitions';
 import {
   DISCORD_CHOICES_MAX_NAME_SIZE,
   OVERFLOW_SUFFIX,
-} from './autocompleteClan';
+} from './autocompleteClan/constants';
 
 export default async function autocompleteTanks(
   interaction: AutocompleteInteraction<CacheType>,

src/core/discord/autocompleteUsername.ts

@@ -8,7 +8,7 @@ import { translator } from '../localization/translator';
 import {
   DISCORD_CHOICES_MAX_NAME_SIZE,
   OVERFLOW_SUFFIX,
-} from './autocompleteClan';
+} from './autocompleteClan/constants';
 
 export default async function autocompleteUsername(
   interaction: AutocompleteInteraction<CacheType>,

src/core/discord/getPeriodOptionName.ts

@@ -0,0 +1,10 @@
+import { Locale } from 'discord.js';
+import { translator } from '../localization/translator';
+import { PeriodSize } from './addPeriodSubCommands';
+
+export function getPeriodOptionName(period: PeriodSize, locale: Locale) {
+  const { translate } = translator(locale);
+  if (period === 'career') return translate('bot.common.periods.career');
+  if (period === 'today') return translate('bot.common.periods.today');
+  return translate('bot.common.periods.days', [period]);
+}

src/core/discord/localizationObject.ts

@@ -1,5 +1,5 @@
 import { Locale } from 'discord.js';
-import { SUPPORTED_LOCALES } from '../localization/strings';
+import { SUPPORTED_LOCALES } from '../localization/strings/constants';
 import { translator } from '../localization/translator';
 
 export function localizationObject(path: string, literals?: string[]) {

src/core/discord/resolveClanFromCommand.ts

@@ -4,7 +4,7 @@ import { Region } from '../../constants/regions';
 import { UserError } from '../../hooks/userError';
 import searchClansAcrossRegions from '../blitz/searchClansAcrossRegions';
 import { translator } from '../localization/translator';
-import { serverAndIdPattern } from './resolvePlayerFromCommand';
+import { serverAndIdPattern } from './resolvePlayerFromCommand/constants';
 
 export default async function resolveClanFromCommand(
   interaction: ChatInputCommandInteraction,

src/core/discord/resolvePeriodFromButton.ts

@@ -4,10 +4,8 @@ import getPeriodNow from '../blitzkrieg/getPeriodNow';
 import getPeriodStart from '../blitzkrieg/getPeriodStart';
 import getTimeDaysAgo from '../blitzkrieg/getTimeDaysAgo';
 import { PeriodType } from './addPeriodSubCommands';
-import {
+import { getPeriodOptionName } from './getPeriodOptionName';
-  ResolvedPeriod,
+import { ResolvedPeriod } from './resolvePeriodFromCommand';
-  getPeriodOptionName,
-} from './resolvePeriodFromCommand';
 
 export default function resolvePeriodFromButton(
   region: Region,

src/core/discord/resolvePeriodFromCommand.ts

@@ -1,17 +1,11 @@
-import { CacheType, ChatInputCommandInteraction, Locale } from 'discord.js';
+import { CacheType, ChatInputCommandInteraction } from 'discord.js';
 import { Region } from '../../constants/regions';
 import getPeriodNow from '../blitzkrieg/getPeriodNow';
 import getPeriodStart from '../blitzkrieg/getPeriodStart';
 import getTimeDaysAgo from '../blitzkrieg/getTimeDaysAgo';
 import { translator } from '../localization/translator';
-import { PeriodSize, PeriodType } from './addPeriodSubCommands';
+import { PeriodType } from './addPeriodSubCommands';
-
+import { getPeriodOptionName } from './getPeriodOptionName';
-export function getPeriodOptionName(period: PeriodSize, locale: Locale) {
-  const { translate } = translator(locale);
-  if (period === 'career') return translate('bot.common.periods.career');
-  if (period === 'today') return translate('bot.common.periods.today');
-  return translate('bot.common.periods.days', [period]);
-}
 
 export interface ResolvedPeriod {
   name: string;

src/core/discord/resolvePlayerFromCommand/constants.ts

@@ -0,0 +1 @@
+export const serverAndIdPattern = /(com|eu|asia)\/[0-9]+/;

src/core/discord/resolvePlayerFromCommand/index.ts

@@ -1,12 +1,11 @@
 import { CacheType, ChatInputCommandInteraction } from 'discord.js';
 import markdownEscape from 'markdown-escape';
-import { Region } from '../../constants/regions';
+import { Region } from '../../../constants/regions';
-import { UserError } from '../../hooks/userError';
+import { UserError } from '../../../hooks/userError';
-import searchPlayersAcrossRegions from '../blitz/searchPlayersAcrossRegions';
+import searchPlayersAcrossRegions from '../../blitz/searchPlayersAcrossRegions';
-import { getBlitzFromDiscord } from '../blitzkrieg/discordBlitz';
+import { getBlitzFromDiscord } from '../../blitzkrieg/discordBlitz';
-import { translator } from '../localization/translator';
+import { translator } from '../../localization/translator';
-
+import { serverAndIdPattern } from './constants';
-export const serverAndIdPattern = /(com|eu|asia)\/[0-9]+/;
 
 export interface ResolvedPlayer {
   region: Region;

src/core/localization/strings/constants.ts

@@ -0,0 +1,3 @@
+import { Locale } from 'discord.js';
+
+export const SUPPORTED_LOCALES: Locale[] = [Locale.EnglishUS, Locale.SpanishES];

src/core/localization/strings/index.ts

@@ -1,6 +1,5 @@
 import { Locale } from 'discord.js';
-
+import { SUPPORTED_LOCALES } from './constants';
-export const SUPPORTED_LOCALES: Locale[] = [Locale.EnglishUS, Locale.SpanishES];
 
 export type TranslationFragmentTree = {
   [key: string]: TranslationFragment;

src/core/localization/translator.ts

@@ -1,5 +1,6 @@
 import { Locale } from 'discord.js';
-import { SUPPORTED_LOCALES, translations } from './strings';
+import { translations } from './strings';
+import { SUPPORTED_LOCALES } from './strings/constants';
 
 export function translator(localeRaw: Locale) {
   const locale = SUPPORTED_LOCALES.includes(localeRaw)

src/core/statistics/getWN8Percentile.ts

@@ -1,6 +1,6 @@
 import { Percentile } from '../../constants/percentiles';
 
-export const WN8_PERCENTILES: [number, Percentile][] = [
+const WN8_PERCENTILES: [number, Percentile][] = [
   [0, Percentile.VeryBad],
   [300, Percentile.Bad],
   [450, Percentile.BelowAverage],

src/core/statistics/sumStats.ts

@@ -1,5 +1,5 @@
 import { AllStats } from '../blitz/getAccountInfo';
-import { emptyAllStats } from '../blitzstars/getStatsInPeriod';
+import { emptyAllStats } from '../blitzstars/getStatsInPeriod/constants';
 
 export default function sumStats(allStatsCollection: AllStats[]) {
   return allStatsCollection.reduce((accumulated, current) => {

src/events/guildMemberAdd.ts

@@ -1,7 +1,7 @@
 import { AttachmentBuilder, GuildMember, TextChannel } from 'discord.js';
 import discord from '../../discord.json' assert { type: 'json' };
 
-export default async function (member: GuildMember) {
+export default async function guildMemberAdd(member: GuildMember) {
   if (member.guild.id === discord.sklld_guild_id) {
     await (
       member.guild.channels.cache.get(

src/stores/duel/constants.ts

@@ -0,0 +1,7 @@
+import { EquipmentMatrix } from '.';
+
+export const genericDefaultEquipmentMatrix: EquipmentMatrix = [
+  [-1, 1, -1],
+  [0, 0, 0],
+  [0, 0, 0],
+];