From 359dfcd1024017083c03845b99ae97d3119df92c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com> Date: Thu, 8 Jan 2026 20:06:14 -0600 Subject: [PATCH] feat: move some --- packages/website-ue/src/core/api/abstract.ts | 3 -- .../pages/{ => [...locale]}/api/index.astro | 2 +- .../{ => [...locale]}/avatars/index.astro | 4 +-- .../{ => [...locale]}/backgrounds/index.astro | 4 +-- .../src/pages/{ => [...locale]}/index.astro | 0 .../{ => [...locale]}/tanks/[slug]/_index.tsx | 19 +++++----- .../tanks/[slug]/index.astro | 4 +-- .../pages/{ => [...locale]}/tanks/index.astro | 4 +-- .../src/pages/styles/colors/[accent].css.ts | 35 ------------------- 9 files changed, 20 insertions(+), 55 deletions(-) rename packages/website-ue/src/pages/{ => [...locale]}/api/index.astro (95%) rename packages/website-ue/src/pages/{ => [...locale]}/avatars/index.astro (90%) rename packages/website-ue/src/pages/{ => [...locale]}/backgrounds/index.astro (89%) rename packages/website-ue/src/pages/{ => [...locale]}/index.astro (100%) rename packages/website-ue/src/pages/{ => [...locale]}/tanks/[slug]/_index.tsx (91%) rename packages/website-ue/src/pages/{ => [...locale]}/tanks/[slug]/index.astro (79%) rename packages/website-ue/src/pages/{ => [...locale]}/tanks/index.astro (73%) delete mode 100644 packages/website-ue/src/pages/styles/colors/[accent].css.ts diff --git a/packages/website-ue/src/core/api/abstract.ts b/packages/website-ue/src/core/api/abstract.ts index af8a2f6e1..831941a02 100644 --- a/packages/website-ue/src/core/api/abstract.ts +++ b/packages/website-ue/src/core/api/abstract.ts @@ -1,7 +1,4 @@ import type { CatalogItemAccessor } from "@blitzkit/closed"; -import type { Tank } from "../../protos/tank"; -import type { TankList } from "../../protos/tank_list"; -import type { Tanks } from "../../protos/tanks"; export abstract class AbstractAPI { abstract tanks(): Promise; diff --git a/packages/website-ue/src/pages/api/index.astro b/packages/website-ue/src/pages/[...locale]/api/index.astro similarity index 95% rename from packages/website-ue/src/pages/api/index.astro rename to packages/website-ue/src/pages/[...locale]/api/index.astro index 8ecaa28f6..726a63652 100644 --- a/packages/website-ue/src/pages/api/index.astro +++ b/packages/website-ue/src/pages/[...locale]/api/index.astro @@ -6,7 +6,7 @@ import { forEachChild, isFunctionDeclaration, } from "typescript"; -import BaseLayout from "../../layouts/BaseLayout.astro"; +import BaseLayout from "../../../layouts/BaseLayout.astro"; const root = `/src/pages/api`; const globbed = import.meta.glob("/src/pages/api/**/*.ts", { diff --git a/packages/website-ue/src/pages/avatars/index.astro b/packages/website-ue/src/pages/[...locale]/avatars/index.astro similarity index 90% rename from packages/website-ue/src/pages/avatars/index.astro rename to packages/website-ue/src/pages/[...locale]/avatars/index.astro index ae715cd78..eaab02441 100644 --- a/packages/website-ue/src/pages/avatars/index.astro +++ b/packages/website-ue/src/pages/[...locale]/avatars/index.astro @@ -1,8 +1,8 @@ --- import { ProfileAvatarComponent_Category } from "@protos/blitz_static_profile_avatar_component"; import { Grade } from "@protos/blitz_static_standard_grades_enum"; -import { api } from "../../core/api/dynamic"; -import BaseLayout from "../../layouts/BaseLayout.astro"; +import { api } from "../../../core/api/dynamic"; +import BaseLayout from "../../../layouts/BaseLayout.astro"; const avatars = await api.avatars(); --- diff --git a/packages/website-ue/src/pages/backgrounds/index.astro b/packages/website-ue/src/pages/[...locale]/backgrounds/index.astro similarity index 89% rename from packages/website-ue/src/pages/backgrounds/index.astro rename to packages/website-ue/src/pages/[...locale]/backgrounds/index.astro index 9857f716c..39636c6ef 100644 --- a/packages/website-ue/src/pages/backgrounds/index.astro +++ b/packages/website-ue/src/pages/[...locale]/backgrounds/index.astro @@ -1,7 +1,7 @@ --- import { Grade } from "@protos/blitz_static_standard_grades_enum"; -import { api } from "../../core/api/dynamic"; -import BaseLayout from "../../layouts/BaseLayout.astro"; +import { api } from "../../../core/api/dynamic"; +import BaseLayout from "../../../layouts/BaseLayout.astro"; const backgrounds = await api.backgrounds(); --- diff --git a/packages/website-ue/src/pages/index.astro b/packages/website-ue/src/pages/[...locale]/index.astro similarity index 100% rename from packages/website-ue/src/pages/index.astro rename to packages/website-ue/src/pages/[...locale]/index.astro diff --git a/packages/website-ue/src/pages/tanks/[slug]/_index.tsx b/packages/website-ue/src/pages/[...locale]/tanks/[slug]/_index.tsx similarity index 91% rename from packages/website-ue/src/pages/tanks/[slug]/_index.tsx rename to packages/website-ue/src/pages/[...locale]/tanks/[slug]/_index.tsx index 668e98959..cb285affe 100644 --- a/packages/website-ue/src/pages/tanks/[slug]/_index.tsx +++ b/packages/website-ue/src/pages/[...locale]/tanks/[slug]/_index.tsx @@ -1,13 +1,16 @@ import { times } from "lodash-es"; import { Suspense, useMemo } from "react"; -import { TankopediaCharacteristic } from "../../../components/TankopediaCharacteristic"; -import { TankopediaToy } from "../../../components/TankopediaToy"; -import { api } from "../../../core/api/dynamic"; -import { characteristicsOrder } from "../../../core/tankopedia/characteristicsOrder"; -import { computeCharacteristics } from "../../../core/tankopedia/computeCharacteristics"; -import { TerrainHardness } from "../../../core/tankopedia/tankState"; -import { useAwait } from "../../../hooks/useAwait"; -import { Tankopedia, TankopediaCompare } from "../../../stores/tankopedia"; +import { TankopediaCharacteristic } from "../../../../components/TankopediaCharacteristic"; +import { TankopediaToy } from "../../../../components/TankopediaToy"; +import { api } from "../../../../core/api/dynamic"; +import { characteristicsOrder } from "../../../../core/tankopedia/characteristicsOrder"; +import { computeCharacteristics } from "../../../../core/tankopedia/computeCharacteristics"; +import type { TerrainHardness } from "../../../../core/tankopedia/tankState"; +import { useAwait } from "../../../../hooks/useAwait"; +import { + Tankopedia, + type TankopediaCompare, +} from "../../../../stores/tankopedia"; export function Page({ id }: { id: string }) { return ( diff --git a/packages/website-ue/src/pages/tanks/[slug]/index.astro b/packages/website-ue/src/pages/[...locale]/tanks/[slug]/index.astro similarity index 79% rename from packages/website-ue/src/pages/tanks/[slug]/index.astro rename to packages/website-ue/src/pages/[...locale]/tanks/[slug]/index.astro index f657bf588..b03a86cd0 100644 --- a/packages/website-ue/src/pages/tanks/[slug]/index.astro +++ b/packages/website-ue/src/pages/[...locale]/tanks/[slug]/index.astro @@ -1,8 +1,8 @@ --- import "@radix-ui/colors/violet-dark.css"; import type { GetStaticPaths } from "astro"; -import { api } from "../../../core/api/dynamic"; -import BaseLayout from "../../../layouts/BaseLayout.astro"; +import { api } from "../../../../core/api/dynamic"; +import BaseLayout from "../../../../layouts/BaseLayout.astro"; import { Page } from "./_index"; export const getStaticPaths = (async () => { diff --git a/packages/website-ue/src/pages/tanks/index.astro b/packages/website-ue/src/pages/[...locale]/tanks/index.astro similarity index 73% rename from packages/website-ue/src/pages/tanks/index.astro rename to packages/website-ue/src/pages/[...locale]/tanks/index.astro index fe7888999..4a4611f84 100644 --- a/packages/website-ue/src/pages/tanks/index.astro +++ b/packages/website-ue/src/pages/[...locale]/tanks/index.astro @@ -1,7 +1,7 @@ --- import "@radix-ui/colors/violet-dark.css"; -import { api } from "../../core/api/dynamic"; -import BaseLayout from "../../layouts/BaseLayout.astro"; +import { api } from "../../../core/api/dynamic"; +import BaseLayout from "../../../layouts/BaseLayout.astro"; const tankList = await api.tankList(); --- diff --git a/packages/website-ue/src/pages/styles/colors/[accent].css.ts b/packages/website-ue/src/pages/styles/colors/[accent].css.ts deleted file mode 100644 index d95e23120..000000000 --- a/packages/website-ue/src/pages/styles/colors/[accent].css.ts +++ /dev/null @@ -1,35 +0,0 @@ -import * as colors from "@radix-ui/colors"; -import type { APIContext, GetStaticPaths } from "astro"; - -const ignoreEndings = ["A", "P3", "Dark", "DarkA", "DarkP3"] as const; - -const filtered = Object.keys(colors).filter( - (name) => - !ignoreEndings.some((ending) => name.endsWith(ending)) && - name !== "__esModule" -); - -export const getStaticPaths = (() => { - return filtered.map((accent) => ({ - params: { accent }, - })); -}) satisfies GetStaticPaths; - -export type Color = Exclude< - keyof typeof colors, - `${string}${(typeof ignoreEndings)[number]}` | "__esModule" ->; - -export async function GET({ params }: APIContext<{}, { accent: Color }>) { - const palette = colors[`${params.accent}Dark`]; - let content = ":root{"; - - for (const key in palette) { - const dashedKey = key.replace(/([a-zA-Z])(\d+)/, "$1-$2"); - content += `--${dashedKey}:${palette[key as keyof typeof palette]};`; - } - - content += "}"; - - return new Response(content); -}