From fa72e8efabd1c106678ec63ae4cfdec094b1ef78 Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Fri, 22 Nov 2024 10:50:35 -0600 Subject: [PATCH] feat: promote aeson --- packages/website/src/components/AesonPlug.tsx | 32 +++++++++++++++++++ .../components/Tankopedia/CalloutsSection.tsx | 8 ++++- packages/website/src/constants/tools.ts | 8 ++--- .../website/src/core/blitzkit/branches.ts | 11 ++++--- packages/website/src/pages/index.astro | 12 +++++++ 5 files changed, 62 insertions(+), 9 deletions(-) create mode 100644 packages/website/src/components/AesonPlug.tsx diff --git a/packages/website/src/components/AesonPlug.tsx b/packages/website/src/components/AesonPlug.tsx new file mode 100644 index 000000000..a6b5b0883 --- /dev/null +++ b/packages/website/src/components/AesonPlug.tsx @@ -0,0 +1,32 @@ +import { imgur } from '@blitzkit/core'; +import { Flex, Heading, Link, Text } from '@radix-ui/themes'; +import { Var } from '../core/radix/var'; + +export function AesonPlug() { + return ( + + + + + + Preview brought to you by WoT Blitz News + What the hell do I put here haha + + + + ); +} diff --git a/packages/website/src/components/Tankopedia/CalloutsSection.tsx b/packages/website/src/components/Tankopedia/CalloutsSection.tsx index 06e7b9e83..23ab22735 100644 --- a/packages/website/src/components/Tankopedia/CalloutsSection.tsx +++ b/packages/website/src/components/Tankopedia/CalloutsSection.tsx @@ -1,15 +1,19 @@ +import { assertSecret } from '@blitzkit/core'; import { MinusCircledIcon } from '@radix-ui/react-icons'; import { Callout, Flex } from '@radix-ui/themes'; import { uniq } from 'lodash-es'; import { useEffect } from 'react'; import { Duel } from '../../stores/duel'; import { TankopediaPersistent } from '../../stores/tankopediaPersistent'; +import { AesonPlug } from '../AesonPlug'; import { ExperimentIcon } from '../ExperimentIcon'; import { MAX_RECENTLY_VIEWED } from '../TankSearch/constants'; export function CalloutsSection() { const tank = Duel.use((state) => state.protagonist.tank); const mutateTankopediaPersistent = TankopediaPersistent.useMutation(); + const promoteAeson = + assertSecret(import.meta.env.PUBLIC_ASSET_BRANCH) === 'preview'; useEffect(() => { mutateTankopediaPersistent((draft) => { @@ -20,10 +24,12 @@ export function CalloutsSection() { }); }, [tank]); - if (!tank.testing && !tank.deprecated) return null; + if (!tank.testing && !tank.deprecated && !promoteAeson) return null; return ( + + {tank.deprecated && ( diff --git a/packages/website/src/constants/tools.ts b/packages/website/src/constants/tools.ts index c7b8dec06..60d13a548 100644 --- a/packages/website/src/constants/tools.ts +++ b/packages/website/src/constants/tools.ts @@ -30,7 +30,7 @@ export const tankopediaTool: Tool = { color: 'purple', }, significant: true, - branches: ['main', 'dev', 'opentest'], + branches: ['main', 'dev', 'opentest', 'preview'], }; // export const ratingTool: Tool = { @@ -58,7 +58,7 @@ export const compareTool: Tool = { text: 'Compare tanks', color: 'crimson', }, - branches: ['main', 'dev', 'opentest'], + branches: ['main', 'dev', 'opentest', 'preview'], }; export const sessionTool: Tool = { @@ -138,7 +138,7 @@ export const embedTool: Tool = { color: 'red', }, image: 'Q0faRYg', - branches: ['main', 'dev', 'opentest'], + branches: ['main', 'dev'], }; export const homeTool: Tool = { @@ -173,7 +173,7 @@ export const tierListTool: Tool = { color: 'orange', }, image: 'oKKc8Xv', - branches: ['main', 'dev'], + branches: ['main', 'dev', 'opentest', 'preview'], }; export const TOOLS: Tool[] = [ diff --git a/packages/website/src/core/blitzkit/branches.ts b/packages/website/src/core/blitzkit/branches.ts index be699edc5..2480ca795 100644 --- a/packages/website/src/core/blitzkit/branches.ts +++ b/packages/website/src/core/blitzkit/branches.ts @@ -3,14 +3,17 @@ import { assertSecret } from '@blitzkit/core'; const BRANCH_NAMES: Record = { dev: 'beta', opentest: 'opentest', + preview: 'preview', }; export function resolveBranchName() { - if (assertSecret(import.meta.env.MODE) === 'development') { + const secret = assertSecret(import.meta.env.PUBLIC_ASSET_BRANCH); + if ( + assertSecret(import.meta.env.MODE) === 'development' && + secret === 'dev' + ) { return 'dev'; } else { - return BRANCH_NAMES[assertSecret(import.meta.env.PUBLIC_ASSET_BRANCH)] as - | string - | undefined; + return BRANCH_NAMES[secret] as string | undefined; } } diff --git a/packages/website/src/pages/index.astro b/packages/website/src/pages/index.astro index 66c213f42..72d5b5de0 100644 --- a/packages/website/src/pages/index.astro +++ b/packages/website/src/pages/index.astro @@ -1,5 +1,7 @@ --- +import { assertSecret } from '@blitzkit/core'; import { Flex, Heading } from '@radix-ui/themes'; +import { AesonPlug } from '../components/AesonPlug'; import HomeHero from '../components/HomeHero.astro'; import { HomePageHotTanks } from '../components/HomePageHotTanks'; import { Plugs } from '../components/Plugs.tsx'; @@ -16,6 +18,8 @@ import { tierListTool, } from '../constants/tools'; import BaseLayout from '../layouts/BaseLayout.astro'; + +const branch = assertSecret(import.meta.env.PUBLIC_ASSET_BRANCH); --- @@ -23,6 +27,14 @@ import BaseLayout from '../layouts/BaseLayout.astro'; + { + branch === 'preview' && ( + + + + ) + } +