finalize

.github/workflows/website.yaml

@@ -3,6 +3,8 @@ name: Website
 on:
   push:
 
+  pull_request:
+
   schedule:
     - cron: "0 4 * * *"
 
@@ -102,7 +104,8 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v6
         with:
-          ref: ${{ inputs.branch || 'production' }}
+          # the PR's ref, or the manual input, or production (selected when cron)
+          ref: ${{ github.event.pull_request.head.sha || inputs.branch || 'production' }}
           submodules: recursive
           token: ${{ secrets.GH_TOKEN }}
 
@@ -139,13 +142,15 @@ jobs:
 
       - name: Trigger deployment
 
-        # Deploy if:
+        # workflow should trigger if:
-        # 1. Running cron from main using content from production to target production
+        # - is by cron and is on main: triggering to production
-        # 2. Running manually and targeting non-production
+        # - is by push and is on production: triggering to production
+        # - is by manual and is on anything: triggering to anything
         if: >-
           ${{
-            github.ref == 'refs/heads/production' ||
+            (github.event_name == 'schedule' && github.ref == 'refs/heads/main')
-            (inputs.environment != '' && inputs.environment != 'production')
+            || (github.event_name == 'push' && github.ref == 'refs/heads/production')
+            || (github.event_name == 'workflow_dispatch')
           }}
 
         env:

package.json

@@ -1,6 +1,6 @@
 {
   "name": "blitzkit",
-  "version": "1.32.0",
+  "version": "1.33.0-beta.1",
   "license": "BlitzKit License",
   "private": true,
   "scripts": {

packages/i18n/strings/en.json

@@ -44,7 +44,7 @@
 
     "branches": {
       "beta": "Beta",
-      "development": "Development",
+      "development": "Post Malone Edition",
       "opentest": "OpenTest",
       "preview": "Preview",
       "production": "Production"
@@ -992,7 +992,7 @@
 
     "footer": {
       "motto": "Everything World of Tanks Blitz",
-      "copyright": "Unaffiliated with Wargaming or any service",
+      "association": "An Open Collective Project",
 
       "about": {
         "title": "About",

packages/website/src/components/Beg/index.module.css

@@ -0,0 +1,36 @@
+.outer {
+  padding: 0 var(--space-4);
+  margin-top: var(--space-3);
+
+  img {
+    width: 1.25em;
+    height: 1.25em;
+
+    border-radius: 50%;
+  }
+
+  .center {
+    position: relative;
+
+    background: linear-gradient(var(--pink-3), var(--purple-2));
+    box-shadow: var(--shadow-3);
+
+    max-width: 40rem;
+
+    padding: var(--space-5);
+    border-radius: var(--radius-4);
+
+    .important {
+      position: absolute;
+
+      top: 0;
+      left: 50%;
+
+      transform: translate(-50%, -50%);
+
+      background-color: inherit;
+
+      padding: var(--space-3);
+    }
+  }
+}

packages/website/src/components/Beg/index.tsx

@@ -0,0 +1,48 @@
+import { HeartFilledIcon } from "@radix-ui/react-icons";
+import { Button, Em, Flex, Strong, Text } from "@radix-ui/themes";
+import { donationTiers } from "../../config/donations";
+import styles from "./index.module.css";
+
+export function Beg() {
+  return (
+    <Flex align="center" gap="4" direction="column" className={styles.outer}>
+      <Text size="3" className={styles.important}>
+        <Flex gap="2" align="center">
+          <img src="https://github.com/tresabhi.png" />
+          <Em>We need your attention</Em>
+        </Flex>
+      </Text>
+
+      <Flex direction="column" className={styles.center} gap="4">
+        <Flex direction="column" gap="3">
+          <Text color="tomato">
+            We can no longer keep BlitzKit sustainable for <Strong>free</Strong>
+            .
+          </Text>
+
+          <Text>
+            We want to add tank modules, player statistics, rebalancing patch
+            notes, bring back the Discord bot, and more.
+          </Text>
+
+          <Text>
+            But paying out of pocket makes that impossible. We are an earnest
+            non-profit, so consider donating to make the above possible. 100% of
+            your money goes back into BlitzKit.
+          </Text>
+        </Flex>
+
+        <Flex gap="3">
+          {donationTiers.map(({ name, value, link }) => (
+            <a target="_blank" key={name} href={link}>
+              <Button size="3" color="crimson">
+                {value === null && <HeartFilledIcon />}
+                {value === null ? "Custom" : `$${value}`}
+              </Button>
+            </a>
+          ))}
+        </Flex>
+      </Flex>
+    </Flex>
+  );
+}

packages/website/src/components/Footer.astro

@@ -43,9 +43,9 @@ const strings = getStrings(locale);
       }}
     >
       <Heading>BlitzKit</Heading>
-      <Text color="gray">{strings.website.footer.motto}</Text>
+      <Text size="2" color="gray">{strings.website.footer.motto}</Text>
-      <Text size="1" color="gray">
+      <Text size="2" color="gray">
-        {strings.website.footer.copyright}
+        {strings.website.footer.association}
       </Text>
 
       <Box mt="2">

packages/website/src/config/donations.ts

@@ -0,0 +1,23 @@
+// TODO: source this from the open collective api, if even possible
+export const donationTiers = [
+  {
+    name: "The Backer",
+    value: 5,
+    link: "https://opencollective.com/blitzkit/contribute/backers-106312/checkout",
+  },
+  {
+    name: "The Engineer",
+    value: 10,
+    link: "https://opencollective.com/blitzkit/contribute/the-engineer-107057/checkout",
+  },
+  {
+    name: "The Patron",
+    value: 25,
+    link: "https://opencollective.com/blitzkit/contribute/the-patron-107056/checkout",
+  },
+  {
+    name: "The Sponsor",
+    value: null,
+    link: "https://opencollective.com/blitzkit/donate",
+  },
+];

packages/website/src/pages/[...chunk_api]/tanks/[id]/skins/[skin].glb.ts

@@ -16,12 +16,15 @@ import { ALL_EXTENSIONS } from "@gltf-transform/extensions";
 import { dedup, mergeDocuments, unpartition } from "@gltf-transform/functions";
 import type { APIContext } from "astro";
 import type { Vector3Tuple, Vector4Tuple } from "three";
-import { SKIN_NUMBER } from "../../../../constants/skinNumber";
+import { SKIN_NUMBER } from "../../../../../constants/skinNumber";
-import { api } from "../../../../core/blitzkit/api";
+import { api } from "../../../../../core/blitzkit/api";
-import { mixStaticPaths } from "../../../../core/blitzkit/mixStaticPaths";
+import { mixStaticPaths } from "../../../../../core/blitzkit/mixStaticPaths";
-import { vfs } from "../../../../core/blitzkit/vfs";
+import { vfs } from "../../../../../core/blitzkit/vfs";
-import { getStaticPaths as _getStaticPaths } from "../../../[...chunk_api]/_index";
+import {
-import { extractMaterials, extractModel } from "../model.glb";
+  extractMaterials,
+  extractModel,
+} from "../../../../[...chunk_models_tanks]/[id]/model.glb";
+import { getStaticPaths as _getStaticPaths } from "../_index";
 
 const SKIN_NUMBER_SLOTS = 5;
 const DIGIT_COLUMNS = 5;

packages/website/src/pages/[...chunk_default]/[...locale]/index.astro

@@ -5,7 +5,7 @@ import locales from "@blitzkit/i18n/locales.json";
 import { literals } from "@blitzkit/i18n/src/literals";
 import { Box, Flex, Link } from "@radix-ui/themes";
 import { AesonPlug } from "../../../components/AesonPlug";
-import { Countdown } from "../../../components/Countdown";
+import { Beg } from "../../../components/Beg";
 import HomeHero from "../../../components/HomeHero.astro";
 import { Plugs } from "../../../components/Plugs";
 import ToolCard from "../../../components/ToolCard.astro";
@@ -66,7 +66,7 @@ export const getStaticPaths = mixStaticPaths(_getStaticPaths, () => {
 <BaseLayout {locale}>
   <HomeHero />
 
-  <Countdown client:load />
+  <Beg />
 
   {
     locale !== locales.default && (