From 2d524cd273f93cd277051b9b68cc9905446d4128 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com> Date: Sun, 5 Jan 2025 09:14:29 -0600 Subject: [PATCH 1/6] Update Crowdin configuration file --- crowdin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crowdin.yml b/crowdin.yml index 7d2ed5d7a..c329bb496 100644 --- a/crowdin.yml +++ b/crowdin.yml @@ -1,3 +1,3 @@ files: - - source: /packages/core/lang/en-US.json + - source: /packages/core/lang/en.json translation: /%original_path%/%locale%.json From 12e89a6b6592245aeaf1fe30d0e36db58edd776b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com> Date: Sun, 5 Jan 2025 11:39:25 -0600 Subject: [PATCH 2/6] Update credits.md --- docs/about/credits.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/about/credits.md b/docs/about/credits.md index 801f272d8..65a110602 100644 --- a/docs/about/credits.md +++ b/docs/about/credits.md @@ -12,7 +12,7 @@ BlitzKit is a one man band **TrèsAbhi** but I am far from solo. | Game file layout | Aeson | | 3-caliber rule edge cases | Minitelrose, ChickenMan7777 | | Embed UX | \_34, HisRoyalFatness, Synx | -| Tankopedia pre-release testing | [OPTML], Aeson, \_34 | +| Tankopedia pre-release testing | [OPTML], Aeson, \_34, xkdkw | | Website advertisement platform | Aeson | | Compare pre-release testing | [OPTML] | | Redacted | GonnaHetzMe | From e0dda567f4ac52ff92bb64ae7a598760a457d7b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com> Date: Tue, 7 Jan 2025 23:16:07 -0600 Subject: [PATCH 3/6] Update credits.md --- docs/about/credits.md | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/about/credits.md b/docs/about/credits.md index 65a110602..a031d21c9 100644 --- a/docs/about/credits.md +++ b/docs/about/credits.md @@ -5,6 +5,7 @@ BlitzKit is a one man band **TrèsAbhi** but I am far from solo. | Role | People | | ------------------------------ | ------------------------------ | | Bot verification | S0AP | +| General testing | Prince_NA | | Bot advertisement platform | S0AP | | Bot rendering pipeline | Vovko | | Game asset decompression | Maddox | From 3d41c56c731ad374edd390f8056dede1ffa7bf89 Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Fri, 10 Jan 2025 10:10:59 -0600 Subject: [PATCH 4/6] fix: use en --- packages/website/src/components/Charts/PlayersInPeriod.tsx | 2 +- packages/website/src/components/Embeds/GenerateURL.tsx | 2 +- packages/website/src/components/Embeds/breakdown.tsx | 2 +- .../components/Characteristics/components/Heading.tsx | 2 +- .../website/src/components/Tankopedia/MetaSection/index.tsx | 2 +- packages/website/src/components/TanksEmbed.tsx | 2 +- packages/website/src/components/WargamingLoginButton.tsx | 2 +- packages/website/src/pages/tools/session/_index.tsx | 2 +- packages/website/src/pages/tools/tankopedia/[id]/index.astro | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/website/src/components/Charts/PlayersInPeriod.tsx b/packages/website/src/components/Charts/PlayersInPeriod.tsx index 7d109ca99..0eb390da3 100644 --- a/packages/website/src/components/Charts/PlayersInPeriod.tsx +++ b/packages/website/src/components/Charts/PlayersInPeriod.tsx @@ -5,7 +5,7 @@ import { TankClass, formatCompact, } from '@blitzkit/core'; -import strings from '@blitzkit/core/lang/en-US.json'; +import strings from '@blitzkit/core/lang/en.json'; import { useStore } from '@nanostores/react'; import { Box, Flex, Heading } from '@radix-ui/themes'; import { awaitableAverageDefinitions } from '../../core/awaitables/averageDefinitions'; diff --git a/packages/website/src/components/Embeds/GenerateURL.tsx b/packages/website/src/components/Embeds/GenerateURL.tsx index cf01f1a82..9d1d31c8f 100644 --- a/packages/website/src/components/Embeds/GenerateURL.tsx +++ b/packages/website/src/components/Embeds/GenerateURL.tsx @@ -3,7 +3,7 @@ import { type AccountListItem, type AccountListWithServer, } from '@blitzkit/core'; -import strings from '@blitzkit/core/lang/en-US.json'; +import strings from '@blitzkit/core/lang/en.json'; import { CaretLeftIcon, Link2Icon, PersonIcon } from '@radix-ui/react-icons'; import { Badge, diff --git a/packages/website/src/components/Embeds/breakdown.tsx b/packages/website/src/components/Embeds/breakdown.tsx index dd77ea942..279a3dad4 100644 --- a/packages/website/src/components/Embeds/breakdown.tsx +++ b/packages/website/src/components/Embeds/breakdown.tsx @@ -8,7 +8,7 @@ import { sumCompositeStats, type IndividualTankStats, } from '@blitzkit/core'; -import strings from '@blitzkit/core/lang/en-US.json'; +import strings from '@blitzkit/core/lang/en.json'; import { ReloadIcon } from '@radix-ui/react-icons'; import { ContextMenu } from '@radix-ui/themes'; import { useEffect, useMemo, useState } from 'react'; diff --git a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/Heading.tsx b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/Heading.tsx index b9da3251d..11647d39d 100644 --- a/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/Heading.tsx +++ b/packages/website/src/components/Tankopedia/CharacteristicsSection/components/Characteristics/components/Heading.tsx @@ -1,5 +1,5 @@ import { TIER_ROMAN_NUMERALS } from '@blitzkit/core'; -import strings from '@blitzkit/core/lang/en-US.json'; +import strings from '@blitzkit/core/lang/en.json'; import { Flex, Heading, SegmentedControl, Text } from '@radix-ui/themes'; import { Duel } from '../../../../../../stores/duel'; import { diff --git a/packages/website/src/components/Tankopedia/MetaSection/index.tsx b/packages/website/src/components/Tankopedia/MetaSection/index.tsx index 47c8f984a..c1032dab5 100644 --- a/packages/website/src/components/Tankopedia/MetaSection/index.tsx +++ b/packages/website/src/components/Tankopedia/MetaSection/index.tsx @@ -5,7 +5,7 @@ import { TankType, TIER_ROMAN_NUMERALS, } from '@blitzkit/core'; -import strings from '@blitzkit/core/lang/en-US.json'; +import strings from '@blitzkit/core/lang/en.json'; import { ChevronLeftIcon, MixIcon, UpdateIcon } from '@radix-ui/react-icons'; import { Button, Code, Dialog, Flex, Link } from '@radix-ui/themes'; import { useState } from 'react'; diff --git a/packages/website/src/components/TanksEmbed.tsx b/packages/website/src/components/TanksEmbed.tsx index 2da57e7f0..3d969047c 100644 --- a/packages/website/src/components/TanksEmbed.tsx +++ b/packages/website/src/components/TanksEmbed.tsx @@ -6,7 +6,7 @@ import { type CompositeStats, type CompositeStatsKey, } from '@blitzkit/core'; -import strings from '@blitzkit/core/lang/en-US.json'; +import strings from '@blitzkit/core/lang/en.json'; import { amberDark, blueDark } from '@radix-ui/colors'; import { Flex, Text, type FlexProps } from '@radix-ui/themes'; import { times } from 'lodash-es'; diff --git a/packages/website/src/components/WargamingLoginButton.tsx b/packages/website/src/components/WargamingLoginButton.tsx index ececc5076..0fa10edc4 100644 --- a/packages/website/src/components/WargamingLoginButton.tsx +++ b/packages/website/src/components/WargamingLoginButton.tsx @@ -1,5 +1,5 @@ import { assertSecret, REGIONS } from '@blitzkit/core'; -import strings from '@blitzkit/core/lang/en-US.json'; +import strings from '@blitzkit/core/lang/en.json'; import { Button, type ButtonProps, Dialog, Flex, Link } from '@radix-ui/themes'; import { WargamingIcon } from './WargamingIcon'; diff --git a/packages/website/src/pages/tools/session/_index.tsx b/packages/website/src/pages/tools/session/_index.tsx index 0068dff49..70f81f265 100644 --- a/packages/website/src/pages/tools/session/_index.tsx +++ b/packages/website/src/pages/tools/session/_index.tsx @@ -13,7 +13,7 @@ import { type IndividualAccountInfo, type IndividualTankStats, } from '@blitzkit/core'; -import strings from '@blitzkit/core/lang/en-US.json'; +import strings from '@blitzkit/core/lang/en.json'; import { ArrowDownIcon, MagnifyingGlassIcon, diff --git a/packages/website/src/pages/tools/tankopedia/[id]/index.astro b/packages/website/src/pages/tools/tankopedia/[id]/index.astro index 39f89b505..d37161a4f 100644 --- a/packages/website/src/pages/tools/tankopedia/[id]/index.astro +++ b/packages/website/src/pages/tools/tankopedia/[id]/index.astro @@ -10,7 +10,7 @@ import { fetchTankDefinitions, TIER_ROMAN_NUMERALS, } from '@blitzkit/core'; -import strings from '@blitzkit/core/lang/en-US.json'; +import strings from '@blitzkit/core/lang/en.json'; import type { GetStaticPaths } from 'astro'; import { tankCharacteristics } from '../../../../core/blitzkit/tankCharacteristics'; import BaseLayout from '../../../../layouts/BaseLayout.astro'; From 4c0c10e39e81dd93c37e1108791e7a85cc6a9899 Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Fri, 10 Jan 2025 10:12:31 -0600 Subject: [PATCH 5/6] feat: hide hot tanks --- packages/website/src/pages/index.astro | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/packages/website/src/pages/index.astro b/packages/website/src/pages/index.astro index 88acb981e..9aaa64b02 100644 --- a/packages/website/src/pages/index.astro +++ b/packages/website/src/pages/index.astro @@ -39,7 +39,11 @@ const branch = assertSecret(import.meta.env.PUBLIC_ASSET_BRANCH); - + { + (branch === 'main' || import.meta.env.MODE === 'development') && ( + + ) + } {/* */} From 6ccffa0458cefcae7e46829db6b08049155d206e Mon Sep 17 00:00:00 2001 From: tresabhi <43380238+tresabhi@users.noreply.github.com> Date: Fri, 10 Jan 2025 10:38:02 -0600 Subject: [PATCH 6/6] feat: enable vercel --- .github/workflows/website.yml | 27 +-------------------------- vercel.json | 5 ----- 2 files changed, 1 insertion(+), 31 deletions(-) delete mode 100644 vercel.json diff --git a/.github/workflows/website.yml b/.github/workflows/website.yml index 9d1915491..c7e02863f 100644 --- a/.github/workflows/website.yml +++ b/.github/workflows/website.yml @@ -2,6 +2,7 @@ name: Website on: push: + branches: main workflow_dispatch: schedule: @@ -52,8 +53,6 @@ jobs: path: dist/website deploy-github-pages: - if: github.ref == 'refs/heads/main' - name: Deploy to GitHub Pages runs-on: ubuntu-latest needs: build @@ -65,27 +64,3 @@ jobs: - name: Deploy to GitHub Pages id: deployment uses: actions/deploy-pages@v4 - - deploy-vercel: - name: Deploy to Vercel - needs: build - runs-on: ubuntu-latest - environment: - name: Preview - - steps: - # vercel begs for the .git dir so here it is my guy - - uses: actions/checkout@v4 - - - name: Download artifact - uses: actions/download-artifact@v4 - with: - path: ./dist/website - - - uses: amondnet/vercel-action@v25 - with: - vercel-token: ${{ secrets.VERCEL_TOKEN }} - github-token: ${{ secrets.GITHUB_TOKEN }} - vercel-org-id: ${{ secrets.VERCEL_ORG_ID}} - vercel-project-id: ${{ secrets.VERCEL_PROJECT_ID }} - working-directory: ./dist/website diff --git a/vercel.json b/vercel.json deleted file mode 100644 index 80e57248a..000000000 --- a/vercel.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "github": { - "enabled": false - } -}