From e656b837192fa2d7d80cee4b9bc452b2907817f1 Mon Sep 17 00:00:00 2001
From: tresabhi <43380238+tresabhi@users.noreply.github.com>
Date: Thu, 15 May 2025 23:54:07 -0500
Subject: [PATCH] feat: migrate compare

---
 packages/i18n/strings/en.json                 |  2 ++
 .../website/src/components/ToolRedirect.astro | 19 +++++++++++
 .../{tools => }/compare/_index.tsx            | 34 +++++++++----------
 .../src/pages/[...locale]/compare/index.astro | 16 +++++++++
 .../src/pages/[...locale]/tools/compare.astro |  7 ++++
 .../[...locale]/tools/compare/index.astro     | 16 ---------
 6 files changed, 61 insertions(+), 33 deletions(-)
 create mode 100644 packages/website/src/components/ToolRedirect.astro
 rename packages/website/src/pages/[...locale]/{tools => }/compare/_index.tsx (78%)
 create mode 100644 packages/website/src/pages/[...locale]/compare/index.astro
 create mode 100644 packages/website/src/pages/[...locale]/tools/compare.astro
 delete mode 100644 packages/website/src/pages/[...locale]/tools/compare/index.astro

diff --git a/packages/i18n/strings/en.json b/packages/i18n/strings/en.json
index 1c1882820..f902cddbd 100644
--- a/packages/i18n/strings/en.json
+++ b/packages/i18n/strings/en.json
@@ -741,6 +741,8 @@
   },
 
   "website": {
+    "redirect": "Redirecting to %s1... Didn't happen automatically? Click here.",
+
     "settings": {
       "dev_mode": "Development mode",
       "language": "Language"
diff --git a/packages/website/src/components/ToolRedirect.astro b/packages/website/src/components/ToolRedirect.astro
new file mode 100644
index 000000000..e5c761d4c
--- /dev/null
+++ b/packages/website/src/components/ToolRedirect.astro
@@ -0,0 +1,19 @@
+---
+import { literals } from '@blitzkit/i18n';
+import { getStrings } from '../core/i18n/getStrings';
+
+export interface Props {
+  tool: string;
+}
+
+const { tool } = Astro.props;
+const { locale } = Astro.params;
+
+const strings = getStrings(locale);
+const url = `/${locale === undefined ? '' : `${locale}/`}${tool}`;
+---
+
+<meta http-equiv="refresh" content={`0; url=${url}`} />
+<a href={url}>
+  {literals(strings.website.redirect, [url])}
+</a>
diff --git a/packages/website/src/pages/[...locale]/tools/compare/_index.tsx b/packages/website/src/pages/[...locale]/compare/_index.tsx
similarity index 78%
rename from packages/website/src/pages/[...locale]/tools/compare/_index.tsx
rename to packages/website/src/pages/[...locale]/compare/_index.tsx
index 7361e0211..f39e322f0 100644
--- a/packages/website/src/pages/[...locale]/tools/compare/_index.tsx
+++ b/packages/website/src/pages/[...locale]/compare/_index.tsx
@@ -1,26 +1,26 @@
 import { createDefaultSkills } from '@blitzkit/core';
 import { Flex, Heading, Text } from '@radix-ui/themes';
 import { useEffect, useMemo, useState } from 'react';
-import { CompareTable } from '../../../../components/Compare/CompareTable';
-import { Controls } from '../../../../components/Compare/Controls';
-import { DamageWarning } from '../../../../components/DamageWarning';
-import { PageWrapper } from '../../../../components/PageWrapper';
-import { awaitableEquipmentDefinitions } from '../../../../core/awaitables/equipmentDefinitions';
-import { awaitableModelDefinitions } from '../../../../core/awaitables/modelDefinitions';
-import { awaitableProvisionDefinitions } from '../../../../core/awaitables/provisionDefinitions';
-import { awaitableSkillDefinitions } from '../../../../core/awaitables/skillDefinitions';
-import { awaitableTankDefinitions } from '../../../../core/awaitables/tankDefinitions';
-import { tankCharacteristics } from '../../../../core/blitzkit/tankCharacteristics';
-import { tankToCompareMember } from '../../../../core/blitzkit/tankToCompareMember';
+import { CompareTable } from '../../../components/Compare/CompareTable';
+import { Controls } from '../../../components/Compare/Controls';
+import { DamageWarning } from '../../../components/DamageWarning';
+import { PageWrapper } from '../../../components/PageWrapper';
+import { awaitableEquipmentDefinitions } from '../../../core/awaitables/equipmentDefinitions';
+import { awaitableModelDefinitions } from '../../../core/awaitables/modelDefinitions';
+import { awaitableProvisionDefinitions } from '../../../core/awaitables/provisionDefinitions';
+import { awaitableSkillDefinitions } from '../../../core/awaitables/skillDefinitions';
+import { awaitableTankDefinitions } from '../../../core/awaitables/tankDefinitions';
+import { tankCharacteristics } from '../../../core/blitzkit/tankCharacteristics';
+import { tankToCompareMember } from '../../../core/blitzkit/tankToCompareMember';
 import {
+  type LocaleAcceptorProps,
   LocaleProvider,
   useLocale,
-  type LocaleAcceptorProps,
-} from '../../../../hooks/useLocale';
-import { App } from '../../../../stores/app';
-import { CompareEphemeral } from '../../../../stores/compareEphemeral';
-import { ComparePersistent } from '../../../../stores/comparePersistent';
-import { TankopediaPersistent } from '../../../../stores/tankopediaPersistent';
+} from '../../../hooks/useLocale';
+import { App } from '../../../stores/app';
+import { CompareEphemeral } from '../../../stores/compareEphemeral';
+import { ComparePersistent } from '../../../stores/comparePersistent';
+import { TankopediaPersistent } from '../../../stores/tankopediaPersistent';
 
 const [
   modelDefinitions,
diff --git a/packages/website/src/pages/[...locale]/compare/index.astro b/packages/website/src/pages/[...locale]/compare/index.astro
new file mode 100644
index 000000000..0dc2a9c0d
--- /dev/null
+++ b/packages/website/src/pages/[...locale]/compare/index.astro
@@ -0,0 +1,16 @@
+---
+import ToolOpenGraph from '../../../components/ToolOpenGraph.astro';
+import { compareTool } from '../../../constants/tools';
+import BaseLayout from '../../../layouts/BaseLayout.astro';
+import { Page } from './_index';
+
+export { getStaticPaths } from '../index.astro';
+
+const { locale } = Astro.params;
+---
+
+<ToolOpenGraph tool={compareTool} />
+
+<BaseLayout noFooter>
+  <Page {locale} client:load />
+</BaseLayout>
diff --git a/packages/website/src/pages/[...locale]/tools/compare.astro b/packages/website/src/pages/[...locale]/tools/compare.astro
new file mode 100644
index 000000000..6165a704f
--- /dev/null
+++ b/packages/website/src/pages/[...locale]/tools/compare.astro
@@ -0,0 +1,7 @@
+---
+import ToolRedirect from '../../../components/ToolRedirect.astro';
+
+export { getStaticPaths } from '../index.astro';
+---
+
+<ToolRedirect tool="compare" />
diff --git a/packages/website/src/pages/[...locale]/tools/compare/index.astro b/packages/website/src/pages/[...locale]/tools/compare/index.astro
deleted file mode 100644
index 6cf98cffd..000000000
--- a/packages/website/src/pages/[...locale]/tools/compare/index.astro
+++ /dev/null
@@ -1,16 +0,0 @@
----
-import ToolOpenGraph from '../../../../components/ToolOpenGraph.astro';
-import { compareTool } from '../../../../constants/tools';
-import BaseLayout from '../../../../layouts/BaseLayout.astro';
-import { Page } from './_index';
-
-export { getStaticPaths } from '../../index.astro';
-
-const { locale } = Astro.params;
----
-
-<ToolOpenGraph tool={compareTool} />
-
-<BaseLayout noFooter>
-  <Page {locale} client:load />
-</BaseLayout>