From 85491c7f22a6a2b820aeb85b7bb83b7fc0b95188 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com>
Date: Sun, 15 Sep 2024 16:20:11 -0500
Subject: [PATCH] fix: logsin

---
 .../src/core/blitzstars}/filterStats.ts             | 12 ++++++------
 .../src => bot/src/core}/blitzstars/tankAverages.ts | 10 +++-------
 packages/core/src/blitz/canSplash.ts                |  2 +-
 packages/core/src/blitzkit/asset.ts                 |  4 ++--
 packages/core/src/blitzkit/index.ts                 |  2 +-
 packages/core/src/blitzkit/withCORSProxy.ts         |  2 +-
 packages/core/src/blitzstars/index.ts               |  1 -
 packages/core/src/index.ts                          |  2 +-
 packages/core/src/patreon/patreonLoginUrl.ts        |  4 ++--
 packages/core/src/statistics/index.ts               |  1 -
 packages/website-legacy/tsconfig.json               | 12 +-----------
 packages/website/src/components/Navbar.astro        |  2 +-
 .../website/src/components/WargamingLoginButton.tsx |  2 +-
 packages/website/src/layouts/RootLayout.astro       |  5 +++--
 packages/website/src/pages/TestComponent.tsx        | 13 +++++++++++++
 packages/website/src/pages/test.astro               | 11 +++++++++++
 16 files changed, 47 insertions(+), 38 deletions(-)
 rename packages/{core/src/statistics => bot/src/core/blitzstars}/filterStats.ts (84%)
 rename packages/{core/src => bot/src/core}/blitzstars/tankAverages.ts (89%)
 delete mode 100644 packages/core/src/blitzstars/index.ts
 create mode 100644 packages/website/src/pages/TestComponent.tsx
 create mode 100644 packages/website/src/pages/test.astro

diff --git a/packages/core/src/statistics/filterStats.ts b/packages/bot/src/core/blitzstars/filterStats.ts
similarity index 84%
rename from packages/core/src/statistics/filterStats.ts
rename to packages/bot/src/core/blitzstars/filterStats.ts
index 8904d544e..cddd3764c 100644
--- a/packages/core/src/statistics/filterStats.ts
+++ b/packages/bot/src/core/blitzstars/filterStats.ts
@@ -1,9 +1,9 @@
-import { SupplementaryStats } from '../blitz/getAccountInfo';
-import { tankDefinitions, TreeType } from '../blitzkit/tankDefinitions';
-import { blitzStarsTankAverages } from '../blitzstars/tankAverages';
-import { calculateWN8 } from './calculateWN8';
-import { BlitzStats } from './compositeStats';
-import { sumAllStats } from './sumAllStats';
+import { blitzStarsTankAverages } from './tankAverages';
+import { SupplementaryStats } from '@blitzkit/core/src/blitz/getAccountInfo';
+import { tankDefinitions, TreeType } from '@blitzkit/core/src/blitzkit/tankDefinitions';
+import { calculateWN8 } from '@blitzkit/core/src/statistics/calculateWN8';
+import { BlitzStats } from '@blitzkit/core/src/statistics/compositeStats';
+import { sumAllStats } from '@blitzkit/core/src/statistics/sumAllStats';
 
 export interface StatFilters {
   nation?: string;
diff --git a/packages/core/src/blitzstars/tankAverages.ts b/packages/bot/src/core/blitzstars/tankAverages.ts
similarity index 89%
rename from packages/core/src/blitzstars/tankAverages.ts
rename to packages/bot/src/core/blitzstars/tankAverages.ts
index ab4ec6512..66c6edd36 100644
--- a/packages/core/src/blitzstars/tankAverages.ts
+++ b/packages/bot/src/core/blitzstars/tankAverages.ts
@@ -1,5 +1,5 @@
-import { BlitzStats, tankDefinitions } from '@blitzkit/core';
-import { context } from '../blitzkit/context';
+import { BlitzStats } from '@blitzkit/core';
+import { context } from '@blitzkit/core/src/blitzkit/context';
 
 interface SpecialStats {
   winrate: number;
@@ -79,14 +79,10 @@ export interface IndividualTankAverage {
   last_update: number;
 }
 
-tankDefinitions;
-
 export type BlitzStarsTankAverages = Record<number, IndividualTankAverage>;
 
 export const blitzStarsTankAverages = fetch(
-  context === 'website'
-    ? '/api/tank-averages'
-    : 'https://www.blitzstars.com/api/tankaverages.json',
+  'https://www.blitzstars.com/api/tankaverages.json',
 )
   .then((response) => response.json())
   .then((json) => {
diff --git a/packages/core/src/blitz/canSplash.ts b/packages/core/src/blitz/canSplash.ts
index 14e7c2e34..d9b4a8c5b 100644
--- a/packages/core/src/blitz/canSplash.ts
+++ b/packages/core/src/blitz/canSplash.ts
@@ -1,4 +1,4 @@
-import { ShellDefinition, ShellType } from '@blitzkit/core';
+import { type ShellDefinition, ShellType } from '@blitzkit/core';
 
 export function canSplash(type: ShellDefinition['type']): type is ShellType.HE {
   return type === ShellType.HE;
diff --git a/packages/core/src/blitzkit/asset.ts b/packages/core/src/blitzkit/asset.ts
index 7a288b465..f749f347f 100644
--- a/packages/core/src/blitzkit/asset.ts
+++ b/packages/core/src/blitzkit/asset.ts
@@ -2,6 +2,6 @@ import { assertSecret } from './assertSecret';
 
 export function asset(path: string) {
   return `https://raw.githubusercontent.com/${assertSecret(
-    process.env.PUBLIC_ASSET_REPO,
-  )}/${assertSecret(process.env.PUBLIC_ASSET_BRANCH)}/${path}`;
+    import.meta.env.PUBLIC_ASSET_REPO,
+  )}/${assertSecret(import.meta.env.PUBLIC_ASSET_BRANCH)}/${path}`;
 }
diff --git a/packages/core/src/blitzkit/index.ts b/packages/core/src/blitzkit/index.ts
index b994b5c4f..21a33644a 100644
--- a/packages/core/src/blitzkit/index.ts
+++ b/packages/core/src/blitzkit/index.ts
@@ -38,7 +38,7 @@ export * from './gameDefinitions';
 // export * from './sum';
 export * from './superCompress';
 export * from './superDecompress';
-// export * from './tankDefinitions';
+export * from './tankDefinitions';
 // export * from './tankIcon';
 // export * from './tankNames';
 // export * from './unionBoundingBox';
diff --git a/packages/core/src/blitzkit/withCORSProxy.ts b/packages/core/src/blitzkit/withCORSProxy.ts
index b9051d11c..cce2d45ad 100644
--- a/packages/core/src/blitzkit/withCORSProxy.ts
+++ b/packages/core/src/blitzkit/withCORSProxy.ts
@@ -1,4 +1,4 @@
-import { context } from '@blitzkit/core';
+import { context } from './context';
 
 export function withCORSProxy(url: string) {
   return context === 'website'
diff --git a/packages/core/src/blitzstars/index.ts b/packages/core/src/blitzstars/index.ts
deleted file mode 100644
index 3ffa9db92..000000000
--- a/packages/core/src/blitzstars/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './tankAverages';
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index 43e808fdd..51d950bbe 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -6,6 +6,6 @@ export * from './imgur';
 // export * from './math';
 export * from './patreon';
 // export * from './protobuf';
-// export * from './statistics';
+export * from './statistics';
 // export * from './streams';
 // export * from './types';
diff --git a/packages/core/src/patreon/patreonLoginUrl.ts b/packages/core/src/patreon/patreonLoginUrl.ts
index 3341bdab4..104b8537f 100644
--- a/packages/core/src/patreon/patreonLoginUrl.ts
+++ b/packages/core/src/patreon/patreonLoginUrl.ts
@@ -3,8 +3,8 @@ import { assertSecret } from '../blitzkit/assertSecret';
 export function patreonLoginUrl() {
   const params = new URLSearchParams({
     response_type: 'code',
-    client_id: assertSecret(process.env.PUBLIC_PATREON_CLIENT_ID),
-    redirect_uri: assertSecret(process.env.PUBLIC_PATREON_REDIRECT_URI),
+    client_id: assertSecret(import.meta.env.PUBLIC_PATREON_CLIENT_ID),
+    redirect_uri: assertSecret(import.meta.env.PUBLIC_PATREON_REDIRECT_URI),
     scope: 'identity',
   });
 
diff --git a/packages/core/src/statistics/index.ts b/packages/core/src/statistics/index.ts
index e12a978b1..81288f813 100644
--- a/packages/core/src/statistics/index.ts
+++ b/packages/core/src/statistics/index.ts
@@ -2,7 +2,6 @@ export * from './calculateWN8';
 export * from './compositeStats';
 export * from './deltaBkrlBlitzStats';
 export * from './deltaTankStats';
-export * from './filterStats';
 export * from './getBkniPercentile';
 export * from './getTierWeights';
 export * from './getWN8Percentile';
diff --git a/packages/website-legacy/tsconfig.json b/packages/website-legacy/tsconfig.json
index baabeb9b6..6e8705550 100644
--- a/packages/website-legacy/tsconfig.json
+++ b/packages/website-legacy/tsconfig.json
@@ -7,15 +7,5 @@
       }
     ]
   },
-  "include": [
-    "src/**/*",
-    ".next/types/**/*.ts",
-    "../../dist/website/types/**/*.ts",
-    "dist/website/types/**/*.ts",
-    "../website/src/components/ToolCard.tsx",
-    "../website/src/constants/tools.tsx",
-    "../website/src/components/Plugs.tsx",
-    "../website/src/constants/embeds.ts",
-    "../website/src/types"
-  ]
+  "include": ["src/**/*", ".next/types/**/*.ts"]
 }
diff --git a/packages/website/src/components/Navbar.astro b/packages/website/src/components/Navbar.astro
index b374cdf38..ad7fe80a6 100644
--- a/packages/website/src/components/Navbar.astro
+++ b/packages/website/src/components/Navbar.astro
@@ -198,7 +198,7 @@ const isBranchNamed =
             <GearIcon />
           </Link>
 
-          <NavbarAccount client:idle />
+          <NavbarAccount client:load />
         </Flex>
       </Flex>
     </Flex>
diff --git a/packages/website/src/components/WargamingLoginButton.tsx b/packages/website/src/components/WargamingLoginButton.tsx
index 703b75234..ececc5076 100644
--- a/packages/website/src/components/WargamingLoginButton.tsx
+++ b/packages/website/src/components/WargamingLoginButton.tsx
@@ -28,7 +28,7 @@ export function WargamingLoginButton({ children, ...props }: ButtonProps) {
                 href={
                   typeof window !== 'undefined'
                     ? `https://api.worldoftanks.${region}/wot/auth/login/?application_id=${assertSecret(
-                        process.env.PUBLIC_WARGAMING_APPLICATION_ID,
+                        import.meta.env.PUBLIC_WARGAMING_APPLICATION_ID,
                       )}&redirect_uri=${encodeURIComponent(
                         `${location.origin}/auth/wargaming?return=${location.origin}${location.pathname}`,
                       )}`
diff --git a/packages/website/src/layouts/RootLayout.astro b/packages/website/src/layouts/RootLayout.astro
index 7ad160d55..413d33778 100644
--- a/packages/website/src/layouts/RootLayout.astro
+++ b/packages/website/src/layouts/RootLayout.astro
@@ -1,6 +1,5 @@
 ---
 import { Flex, Theme } from '@radix-ui/themes';
-import '@radix-ui/themes/styles.css';
 import Footer from '../components/Footer.astro';
 import Navbar from '../components/Navbar.astro';
 import Party3 from '../components/Party3.astro';
@@ -9,7 +8,9 @@ const { pathname } = Astro.url;
 const isRoot = pathname === '/';
 ---
 
-<style>
+<style is:global>
+  @import '@radix-ui/themes/styles.css';
+
   body {
     margin: 0;
   }
diff --git a/packages/website/src/pages/TestComponent.tsx b/packages/website/src/pages/TestComponent.tsx
new file mode 100644
index 000000000..028e69a36
--- /dev/null
+++ b/packages/website/src/pages/TestComponent.tsx
@@ -0,0 +1,13 @@
+import { Button, Popover } from '@radix-ui/themes';
+
+export function TestComponent() {
+  return (
+    <Popover.Root>
+      <Popover.Trigger>
+        <Button>Radix UI</Button>
+      </Popover.Trigger>
+
+      <Popover.Content>Content</Popover.Content>
+    </Popover.Root>
+  );
+}
diff --git a/packages/website/src/pages/test.astro b/packages/website/src/pages/test.astro
new file mode 100644
index 000000000..4c1dd641e
--- /dev/null
+++ b/packages/website/src/pages/test.astro
@@ -0,0 +1,11 @@
+---
+import { Theme } from '@radix-ui/themes';
+import '@radix-ui/themes/styles.css';
+import { TestComponent } from './TestComponent';
+---
+
+Minimal!
+
+<Theme>
+  <TestComponent client:only="react" />
+</Theme>