Merge branch 'main' into dev

scripts/buildAssets/index.ts

@@ -28,11 +28,11 @@ import { tankModels } from './tankModels';
 if (!targets && !allTargets) throw new Error('No target(s) specified');
 
 const methods = [
-  definitions,
-  scratchedFlags,
-  currencies,
-  skillIcons,
-  circleFlags,
+  // definitions,
+  // scratchedFlags,
+  // currencies,
+  // skillIcons,
+  // circleFlags,
   shellIcons,
   moduleIcons,
   equipmentIcons,

src/app/layout.tsx

@@ -6,8 +6,8 @@ import { config } from 'dotenv';
 import { Roboto_Flex } from 'next/font/google';
 import { usePathname } from 'next/navigation';
 import { ReactNode, useEffect, useState } from 'react';
-import { Google } from '../components/Google';
 import { Footer } from '../components/Footer';
+import { Google } from '../components/Google';
 import Navbar from '../components/Navbar';
 import isDev from '../core/blitzkrieg/isDev';
 import { isLocalhost } from '../core/blitzkrieg/isLocalhost';
@@ -50,6 +50,8 @@ export default function RootLayout({ children }: RootLayoutProps) {
           name="description"
           content="🎉 Tools for everything World of Tanks Blitz"
         />
+        <meta property="og:site_name" content="Blitzkrieg" />
+        <link rel="icon" type="image/x-icon" href="/favicon.ico" />
 
         <Google />
       </head>

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

@@ -1,6 +1,7 @@
 'use client';
 
-import { Button, Flex } from '@radix-ui/themes';
+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';
@@ -16,6 +17,7 @@ import {
   TIER_ROMAN_NUMERALS,
 } from '../../../../../../../core/blitzkrieg/tankDefinitions/constants';
 import mutateTankopediaPersistent, {
+  TankopediaTestTankDisplay,
   useTankopediaPersistent,
 } from '../../../../../../../stores/tankopedia';
 import * as styles from './index.css';
@@ -306,7 +308,7 @@ export function Options() {
           ))}
         </Flex>
       </Flex>
-      {/* <DropdownMenu.Root>
+      <DropdownMenu.Root>
         <DropdownMenu.Trigger>
           <Button variant="soft" color="gray">
             Test tanks
@@ -331,7 +333,7 @@ export function Options() {
             <DropdownMenu.RadioItem value="only">Only</DropdownMenu.RadioItem>
           </DropdownMenu.RadioGroup>
         </DropdownMenu.Content>
-      </DropdownMenu.Root> */}
+      </DropdownMenu.Root>
     </Flex>
   );
 }