mirror of
https://github.com/blitzkit/blitzkit.git
synced 2026-10-24 20:19:49 +02:00
Merge branch 'main' into dev
This commit is contained in:
commit
b679393b8a
4 files changed
+13
-9
No files matched your search
Binary file not shown.
|
Before Width: | Height: | Size: 177 KiB After Width: | Height: | Size: 4.2 KiB |
@@ -28,11 +28,11 @@ import { tankModels } from './tankModels';
|
|||||||
if (!targets && !allTargets) throw new Error('No target(s) specified');
|
if (!targets && !allTargets) throw new Error('No target(s) specified');
|
||||||
|
|
||||||
const methods = [
|
const methods = [
|
||||||
definitions,
|
// definitions,
|
||||||
scratchedFlags,
|
// scratchedFlags,
|
||||||
currencies,
|
// currencies,
|
||||||
skillIcons,
|
// skillIcons,
|
||||||
circleFlags,
|
// circleFlags,
|
||||||
shellIcons,
|
shellIcons,
|
||||||
moduleIcons,
|
moduleIcons,
|
||||||
equipmentIcons,
|
equipmentIcons,
|
||||||
|
|||||||
+3
-1
@@ -6,8 +6,8 @@ import { config } from 'dotenv';
|
|||||||
import { Roboto_Flex } from 'next/font/google';
|
import { Roboto_Flex } from 'next/font/google';
|
||||||
import { usePathname } from 'next/navigation';
|
import { usePathname } from 'next/navigation';
|
||||||
import { ReactNode, useEffect, useState } from 'react';
|
import { ReactNode, useEffect, useState } from 'react';
|
||||||
import { Google } from '../components/Google';
|
|
||||||
import { Footer } from '../components/Footer';
|
import { Footer } from '../components/Footer';
|
||||||
|
import { Google } from '../components/Google';
|
||||||
import Navbar from '../components/Navbar';
|
import Navbar from '../components/Navbar';
|
||||||
import isDev from '../core/blitzkrieg/isDev';
|
import isDev from '../core/blitzkrieg/isDev';
|
||||||
import { isLocalhost } from '../core/blitzkrieg/isLocalhost';
|
import { isLocalhost } from '../core/blitzkrieg/isLocalhost';
|
||||||
@@ -50,6 +50,8 @@ export default function RootLayout({ children }: RootLayoutProps) {
|
|||||||
name="description"
|
name="description"
|
||||||
content="🎉 Tools for everything World of Tanks Blitz"
|
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 />
|
<Google />
|
||||||
</head>
|
</head>
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
'use client';
|
'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 { use } from 'react';
|
||||||
import { Flag } from '../../../../../../../components/Flag';
|
import { Flag } from '../../../../../../../components/Flag';
|
||||||
import {} from '../../../../../../../components/Tanks';
|
import {} from '../../../../../../../components/Tanks';
|
||||||
@@ -16,6 +17,7 @@ import {
|
|||||||
TIER_ROMAN_NUMERALS,
|
TIER_ROMAN_NUMERALS,
|
||||||
} from '../../../../../../../core/blitzkrieg/tankDefinitions/constants';
|
} from '../../../../../../../core/blitzkrieg/tankDefinitions/constants';
|
||||||
import mutateTankopediaPersistent, {
|
import mutateTankopediaPersistent, {
|
||||||
|
TankopediaTestTankDisplay,
|
||||||
useTankopediaPersistent,
|
useTankopediaPersistent,
|
||||||
} from '../../../../../../../stores/tankopedia';
|
} from '../../../../../../../stores/tankopedia';
|
||||||
import * as styles from './index.css';
|
import * as styles from './index.css';
|
||||||
@@ -306,7 +308,7 @@ export function Options() {
|
|||||||
))}
|
))}
|
||||||
</Flex>
|
</Flex>
|
||||||
</Flex>
|
</Flex>
|
||||||
{/* <DropdownMenu.Root>
|
<DropdownMenu.Root>
|
||||||
<DropdownMenu.Trigger>
|
<DropdownMenu.Trigger>
|
||||||
<Button variant="soft" color="gray">
|
<Button variant="soft" color="gray">
|
||||||
Test tanks
|
Test tanks
|
||||||
@@ -331,7 +333,7 @@ export function Options() {
|
|||||||
<DropdownMenu.RadioItem value="only">Only</DropdownMenu.RadioItem>
|
<DropdownMenu.RadioItem value="only">Only</DropdownMenu.RadioItem>
|
||||||
</DropdownMenu.RadioGroup>
|
</DropdownMenu.RadioGroup>
|
||||||
</DropdownMenu.Content>
|
</DropdownMenu.Content>
|
||||||
</DropdownMenu.Root> */}
|
</DropdownMenu.Root>
|
||||||
</Flex>
|
</Flex>
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
Reference in new issue
Block a user