diff --git a/packages/website/src/pages/[...locale]/tools/guess/components/Background/index.css b/packages/website/src/components/GuessBackground/index.css similarity index 100% rename from packages/website/src/pages/[...locale]/tools/guess/components/Background/index.css rename to packages/website/src/components/GuessBackground/index.css diff --git a/packages/website/src/pages/[...locale]/tools/guess/components/Background/index.tsx b/packages/website/src/components/GuessBackground/index.tsx similarity index 78% rename from packages/website/src/pages/[...locale]/tools/guess/components/Background/index.tsx rename to packages/website/src/components/GuessBackground/index.tsx index fadef8605..cfda8a652 100644 --- a/packages/website/src/pages/[...locale]/tools/guess/components/Background/index.tsx +++ b/packages/website/src/components/GuessBackground/index.tsx @@ -1,12 +1,12 @@ import { Box } from '@radix-ui/themes'; import { useEffect } from 'react'; -import { awaitableModelDefinitions } from '../../../../../../core/awaitables/modelDefinitions'; -import { awaitableProvisionDefinitions } from '../../../../../../core/awaitables/provisionDefinitions'; -import { tankToDuelMember } from '../../../../../../core/blitzkit/tankToDuelMember'; -import { Var } from '../../../../../../core/radix/var'; -import { Duel } from '../../../../../../stores/duel'; -import { GuessEphemeral } from '../../../../../../stores/guessEphemeral'; -import { TankopediaEphemeral } from '../../../../../../stores/tankopediaEphemeral'; +import { awaitableModelDefinitions } from '../../core/awaitables/modelDefinitions'; +import { awaitableProvisionDefinitions } from '../../core/awaitables/provisionDefinitions'; +import { tankToDuelMember } from '../../core/blitzkit/tankToDuelMember'; +import { Var } from '../../core/radix/var'; +import { Duel } from '../../stores/duel'; +import { GuessEphemeral } from '../../stores/guessEphemeral'; +import { TankopediaEphemeral } from '../../stores/tankopediaEphemeral'; import './index.css'; const [modelDefinitions, provisionDefinitions] = await Promise.all([ @@ -14,7 +14,7 @@ const [modelDefinitions, provisionDefinitions] = await Promise.all([ awaitableProvisionDefinitions, ]); -export function Background() { +export function GuessBackground() { const guessState = GuessEphemeral.use((state) => state.guessState); const tank = GuessEphemeral.use((state) => state.tank); const mutateDuel = Duel.useMutation(); diff --git a/packages/website/src/pages/[...locale]/tools/guess/components/GuessRenderer.tsx b/packages/website/src/components/GuessRenderer.tsx similarity index 60% rename from packages/website/src/pages/[...locale]/tools/guess/components/GuessRenderer.tsx rename to packages/website/src/components/GuessRenderer.tsx index 296124613..16403e519 100644 --- a/packages/website/src/pages/[...locale]/tools/guess/components/GuessRenderer.tsx +++ b/packages/website/src/components/GuessRenderer.tsx @@ -1,9 +1,9 @@ import { Canvas } from '@react-three/fiber'; -import { Controls } from '../../../../../components/Tankopedia/HeroSection/components/TankSandbox/components/Control'; -import { Lighting } from '../../../../../components/Tankopedia/HeroSection/components/TankSandbox/components/Lighting'; -import { TankModel } from '../../../../../components/Tankopedia/HeroSection/components/TankSandbox/components/TankModel'; -import { GuessEphemeral } from '../../../../../stores/guessEphemeral'; -import { TankopediaDisplay } from '../../../../../stores/tankopediaPersistent/constants'; +import { GuessEphemeral } from '../stores/guessEphemeral'; +import { TankopediaDisplay } from '../stores/tankopediaPersistent/constants'; +import { Controls } from './Tankopedia/HeroSection/components/TankSandbox/components/Control'; +import { Lighting } from './Tankopedia/HeroSection/components/TankSandbox/components/Lighting'; +import { TankModel } from './Tankopedia/HeroSection/components/TankSandbox/components/TankModel'; const BRIGHTNESS = 2 ** -5; const CONTRAST = 2 ** 2; diff --git a/packages/website/src/pages/[...locale]/tools/guess/components/GuessRendererLoader.tsx b/packages/website/src/components/GuessRendererLoader.tsx similarity index 100% rename from packages/website/src/pages/[...locale]/tools/guess/components/GuessRendererLoader.tsx rename to packages/website/src/components/GuessRendererLoader.tsx diff --git a/packages/website/src/pages/[...locale]/tools/guess/components/Guesser.tsx b/packages/website/src/components/Guesser.tsx similarity index 92% rename from packages/website/src/pages/[...locale]/tools/guess/components/Guesser.tsx rename to packages/website/src/components/Guesser.tsx index 5c3997b57..c6cec76c0 100644 --- a/packages/website/src/pages/[...locale]/tools/guess/components/Guesser.tsx +++ b/packages/website/src/components/Guesser.tsx @@ -21,12 +21,12 @@ import { import fuzzysort from 'fuzzysort'; import { debounce } from 'lodash-es'; import { useCallback, useEffect, useRef, useState } from 'react'; -import { classIcons } from '../../../../../components/ClassIcon'; -import { SearchResults } from '../../../../../components/SearchResults'; -import { awaitableTankDefinitions } from '../../../../../core/awaitables/tankDefinitions'; -import { awaitableTankNames } from '../../../../../core/awaitables/tankNames'; -import { useLocale } from '../../../../../hooks/useLocale'; -import { GuessEphemeral } from '../../../../../stores/guessEphemeral'; +import { awaitableTankDefinitions } from '../core/awaitables/tankDefinitions'; +import { awaitableTankNames } from '../core/awaitables/tankNames'; +import { useLocale } from '../hooks/useLocale'; +import { GuessEphemeral } from '../stores/guessEphemeral'; +import { classIcons } from './ClassIcon'; +import { SearchResults } from './SearchResults'; const { go } = fuzzysort; diff --git a/packages/website/src/pages/[...locale]/tools/guess/_index.tsx b/packages/website/src/pages/[...locale]/tools/guess/_index.tsx index 47778fb66..246eba066 100644 --- a/packages/website/src/pages/[...locale]/tools/guess/_index.tsx +++ b/packages/website/src/pages/[...locale]/tools/guess/_index.tsx @@ -1,5 +1,9 @@ import { Box, Flex, Heading } from '@radix-ui/themes'; import { Suspense } from 'react'; +import { GuessBackground } from '../../../../components/GuessBackground'; +import { Guesser } from '../../../../components/Guesser'; +import { GuessRenderer } from '../../../../components/GuessRenderer'; +import { GuessRendererLoader } from '../../../../components/GuessRendererLoader'; import { awaitableModelDefinitions } from '../../../../core/awaitables/modelDefinitions'; import { awaitableProvisionDefinitions } from '../../../../core/awaitables/provisionDefinitions'; import { awaitableTankDefinitions } from '../../../../core/awaitables/tankDefinitions'; @@ -12,10 +16,6 @@ import { import { Duel } from '../../../../stores/duel'; import { GuessEphemeral } from '../../../../stores/guessEphemeral'; import { TankopediaEphemeral } from '../../../../stores/tankopediaEphemeral'; -import { Background } from './components/Background'; -import { Guesser } from './components/Guesser'; -import { GuessRenderer } from './components/GuessRenderer'; -import { GuessRendererLoader } from './components/GuessRendererLoader'; const [tankDefinitions, modelDefinitions, provisionDefinitions] = await Promise.all([ @@ -60,7 +60,7 @@ function Content() { return ( - +