feat: separator

This commit is contained in:
TrèsAbhi committed 2024-05-03 19:03:25 -05:00
1 parent 551e562109
commit 9ecf9ed406
9 files changed
+99 -59

No files matched your search

+1 -1
View File
@@ -542,7 +542,7 @@ export async function definitions(production: boolean) {
tankDefinitions[tankId] = { tankDefinitions[tankId] = {
id: tankId, id: tankId,
description: description:
wargamingTankopedia.data[tank.id]?.description ?? undefined, wargamingTankopedia.data[tankId]?.description ?? undefined,
fixedCamouflage: fixedCamouflage ? true : undefined, fixedCamouflage: fixedCamouflage ? true : undefined,
crew, crew,
weight: tankDefinition.root.hull.weight, weight: tankDefinition.root.hull.weight,
@@ -1,4 +1,5 @@
import { Flex, Heading } from '@radix-ui/themes'; import { Flex, Heading } from '@radix-ui/themes';
import PageWrapper from '../../../../../../components/PageWrapper';
import { useWideFormat } from '../../../../../../hooks/useWideFormat'; import { useWideFormat } from '../../../../../../hooks/useWideFormat';
import { Characteristics } from '../Characteristics'; import { Characteristics } from '../Characteristics';
import { Consumables } from '../Characteristics/components/Consumables'; import { Consumables } from '../Characteristics/components/Consumables';
@@ -12,9 +13,9 @@ export function CharacteristicsSection() {
const wideFormat = useWideFormat(720); const wideFormat = useWideFormat(720);
return ( return (
<Flex justify="center" mt="4" direction={wideFormat ? 'row' : 'column'}> <PageWrapper>
<Flex gap="4"> <Flex gap="4" style={{ width: '100%' }}>
<Flex style={{ flex: 1, maxWidth: 320 }} direction="column" gap="4"> <Flex style={{ flex: 1 }} direction="column" gap="4">
<Heading>Configure</Heading> <Heading>Configure</Heading>
<Modules /> <Modules />
<Equipment /> <Equipment />
@@ -24,11 +25,11 @@ export function CharacteristicsSection() {
<Miscellaneous /> <Miscellaneous />
</Flex> </Flex>
<Flex direction="column" gap="4"> <Flex style={{ flex: 1 }} direction="column" gap="4">
<Heading>Characteristics</Heading> <Heading>Characteristics</Heading>
<Characteristics /> <Characteristics />
</Flex> </Flex>
</Flex> </Flex>
</Flex> </PageWrapper>
); );
} }
@@ -36,8 +36,13 @@ export function HeroSection() {
flex: 1, flex: 1,
}} }}
> >
<Flex gap={wideFormat ? '4' : '2'} direction="column"> <Flex
<Heading size={wideFormat ? '9' : '8'}>{tank.name}</Heading> gap={wideFormat ? '4' : '2'}
direction="column"
ml="8"
align={wideFormat ? undefined : 'center'}
>
<Heading size="9">{tank.name}</Heading>
<Text color="gray"> <Text color="gray">
Tier {TIER_ROMAN_NUMERALS[tank.tier]}{' '} Tier {TIER_ROMAN_NUMERALS[tank.tier]}{' '}
{ {
@@ -0,0 +1,16 @@
import { Heading, Text } from '@radix-ui/themes';
import PageWrapper from '../../../../../../components/PageWrapper';
import { useDuel } from '../../../../../../stores/duel';
export function HistoricalSection() {
const tank = useDuel((state) => state.protagonist!.tank);
if (!tank.description) return null;
return (
<PageWrapper>
<Heading>History of the {tank.name}</Heading>
<Text>{tank.description}</Text>
</PageWrapper>
);
}
@@ -0,0 +1,26 @@
import { Flex, Link, Text } from '@radix-ui/themes';
import PageWrapper from '../../../../../../components/PageWrapper';
import { PatreonIcon } from '../../../../../../icons/Patreon';
export function TankopediaPlug() {
return (
<PageWrapper>
<Flex justify="center">
<Text>
Liking BlitzKit? Consider donating on{' '}
<Link href="https://www.patreon.com/tresabhi" target="_blank">
<PatreonIcon
style={{
width: '1em',
height: '1em',
transform: 'translateY(12.5%)',
}}
/>{' '}
Patreon
</Link>
.
</Text>
</Flex>
</PageWrapper>
);
}
@@ -0,0 +1,10 @@
import { Separator } from '@radix-ui/themes';
import PageWrapper from '../../../../../components/PageWrapper';
export function TankopediaSeparator() {
return (
<PageWrapper>
<Separator mt="4" style={{ width: '100%' }} />
</PageWrapper>
);
}
@@ -1,6 +1,6 @@
import { PlusIcon } from '@radix-ui/react-icons'; import { Flex, Heading, Link, Separator } from '@radix-ui/themes';
import { Card, Flex, Heading, Link, Text } from '@radix-ui/themes';
import { use } from 'react'; import { use } from 'react';
import PageWrapper from '../../../../../components/PageWrapper';
import { videoDefinitions } from '../../../../../core/blitzkit/videos'; import { videoDefinitions } from '../../../../../core/blitzkit/videos';
import { useFullScreen } from '../../../../../hooks/useFullScreen'; import { useFullScreen } from '../../../../../hooks/useFullScreen';
import { useDuel } from '../../../../../stores/duel'; import { useDuel } from '../../../../../stores/duel';
@@ -11,54 +11,34 @@ export function Videos() {
const awaitedVideoDefinitions = use(videoDefinitions); const awaitedVideoDefinitions = use(videoDefinitions);
const videos = awaitedVideoDefinitions[tank.id]?.videos ?? []; const videos = awaitedVideoDefinitions[tank.id]?.videos ?? [];
if (isFullScreen) return null; if (isFullScreen || videos.length === 0) return null;
return ( return (
<Flex direction="column" gap="4" mt="4" align="start"> <PageWrapper>
<Heading size="6">Review videos</Heading>
<Flex gap="3" wrap="wrap"> <Flex direction="column" gap="4" mt="4" align="start">
{videos.map((video) => ( <Heading size="6">Review videos</Heading>
<Link
key={video}
href={`https://www.youtube.com/watch?v=${video}`}
target="_blank"
>
<img
src={`https://i.ytimg.com/vi/${video}/hqdefault.jpg`}
style={{
aspectRatio: '16 / 9',
objectFit: 'cover',
height: 128,
borderRadius: 8,
}}
/>
</Link>
))}
<Link href="https://discord.gg/nDt7AjGJQH" target="_blank"> <Flex gap="3" wrap="wrap">
<Card {videos.map((video) => (
style={{ <Link
aspectRatio: '16 / 9', key={video}
height: 128, href={`https://www.youtube.com/watch?v=${video}`}
}} target="_blank"
>
<Flex
align="center"
justify="center"
gap="1"
style={{
width: '100%',
height: '100%',
}}
> >
<Text color="purple"> <img
{videos.length === 0 ? 'Suggest' : 'Suggest more'} <PlusIcon /> src={`https://i.ytimg.com/vi/${video}/hqdefault.jpg`}
</Text> style={{
</Flex> aspectRatio: '16 / 9',
</Card> objectFit: 'cover',
</Link> height: 128,
borderRadius: 8,
}}
/>
</Link>
))}
</Flex>
</Flex> </Flex>
</Flex> </PageWrapper>
); );
} }
+8 -2
View File
@@ -3,16 +3,18 @@
import { useEffect } from 'react'; import { useEffect } from 'react';
import PageWrapper from '../../../../components/PageWrapper'; import PageWrapper from '../../../../components/PageWrapper';
import { assignDuelMember } from '../../../../core/blitzkit/assignDuelMember'; import { assignDuelMember } from '../../../../core/blitzkit/assignDuelMember';
import { useWideFormat } from '../../../../hooks/useWideFormat';
import { mutateDuel, useDuel } from '../../../../stores/duel'; import { mutateDuel, useDuel } from '../../../../stores/duel';
import { mutateTankopediaTemporary } from '../../../../stores/tankopedia'; import { mutateTankopediaTemporary } from '../../../../stores/tankopedia';
import { CharacteristicsSection } from './components/Model/CharacteristicsSection'; import { CharacteristicsSection } from './components/Model/CharacteristicsSection';
import { HeroSection } from './components/Model/HeroSection'; import { HeroSection } from './components/Model/HeroSection';
import { HistoricalSection } from './components/Model/HistoricalSection';
import { TankopediaPlug } from './components/Model/TankopediaPlug';
import { TankopediaSeparator } from './components/TankopediaSeparator';
import { Videos } from './components/Videos';
export default function Page({ params }: { params: { id: string } }) { export default function Page({ params }: { params: { id: string } }) {
const initialId = parseInt(params.id); const initialId = parseInt(params.id);
const assigned = useDuel((state) => state.assigned); const assigned = useDuel((state) => state.assigned);
const wideFormat = useWideFormat();
useEffect(() => { useEffect(() => {
assignDuelMember('both', initialId); assignDuelMember('both', initialId);
@@ -60,7 +62,11 @@ export default function Page({ params }: { params: { id: string } }) {
{assigned && ( {assigned && (
<> <>
<HeroSection /> <HeroSection />
<TankopediaPlug />
<CharacteristicsSection /> <CharacteristicsSection />
<TankopediaSeparator />
<Videos />
<HistoricalSection />
</> </>
)} )}
</PageWrapper> </PageWrapper>
@@ -148,10 +148,6 @@ export const tankDefinitions = fetchCdonLz4<TankDefinitions>(
asset('definitions/tanks.cdon.lz4'), asset('definitions/tanks.cdon.lz4'),
); );
// export const tankDefinitions = readFile('test.tanks.cdon.lz4').then((data) =>
// superDecompress<TankDefinitions>(data.buffer),
// );
const entries = new Promise<TankDefinition[]>(async (resolve) => { const entries = new Promise<TankDefinition[]>(async (resolve) => {
resolve(Object.entries(await tankDefinitions).map(([, entry]) => entry)); resolve(Object.entries(await tankDefinitions).map(([, entry]) => entry));
}); });