From 08df0001ed487152f22d76e976768d7e5371b0e9 Mon Sep 17 00:00:00 2001
From: tresabhi <43380238+tresabhi@users.noreply.github.com>
Date: Tue, 17 Nov 2026 23:48:31 -0600
Subject: [PATCH] i got ideas
---
packages/i18n/strings/en.json | 24 ++
.../src/components/BlitzkitButtonGrayIcon.tsx | 40 --
packages/website/src/components/Navbar.astro | 359 ++++++++----------
.../src/components/Scroller/index.module.css | 3 +
.../components/SmartCanvas/index.module.css | 12 +-
.../src/components/SmartCanvas/index.tsx | 3 +-
.../website/src/components/SystemTheme.astro | 12 +
.../TankopediaSandbox/index.module.css | 19 +-
.../components/TankopediaSandbox/index.tsx | 55 +--
packages/website/src/constants/tools.ts | 6 +-
packages/website/src/layouts/BaseLayout.astro | 53 +--
.../[...locale]/index2.astro | 18 +
.../tanks/[slug]/_index.module.css | 2 +-
.../[...locale]/tanks/[slug]/_index.tsx | 108 +++---
14 files changed, 350 insertions(+), 364 deletions(-)
delete mode 100644 packages/website/src/components/BlitzkitButtonGrayIcon.tsx
create mode 100644 packages/website/src/components/SystemTheme.astro
create mode 100644 packages/website/src/pages/[...chunk_default]/[...locale]/index2.astro
diff --git a/packages/i18n/strings/en.json b/packages/i18n/strings/en.json
index 139cc1704..e356be747 100644
--- a/packages/i18n/strings/en.json
+++ b/packages/i18n/strings/en.json
@@ -1,4 +1,8 @@
{
+ "navbar": {
+ "settings": "Settings"
+ },
+
"guesser": {
"help": {
"title": "Partially reveal tank?",
@@ -449,6 +453,26 @@
"name": "Settings",
"slogan": "",
"action": ""
+ },
+ "tier_list": {
+ "name": "Tier list",
+ "slogan": "Rank tanks your way",
+ "action": "Make a list"
+ },
+ "embed": {
+ "name": "Embed",
+ "slogan": "Stream overlays and widgets",
+ "action": "Customize"
+ },
+ "more": {
+ "name": "More",
+ "slogan": "Suggest a tool on Discord",
+ "action": "Join Discord"
+ },
+ "credits": {
+ "name": "Credits",
+ "slogan": "",
+ "action": ""
}
},
diff --git a/packages/website/src/components/BlitzkitButtonGrayIcon.tsx b/packages/website/src/components/BlitzkitButtonGrayIcon.tsx
deleted file mode 100644
index a9e7b07f3..000000000
--- a/packages/website/src/components/BlitzkitButtonGrayIcon.tsx
+++ /dev/null
@@ -1,40 +0,0 @@
-import type { ComponentProps } from 'react';
-
-export function BlitzkitButtonGrayIcon(props: ComponentProps<'svg'>) {
- return (
-
- );
-}
diff --git a/packages/website/src/components/Navbar.astro b/packages/website/src/components/Navbar.astro
index ece7cba64..03d02c2f0 100644
--- a/packages/website/src/components/Navbar.astro
+++ b/packages/website/src/components/Navbar.astro
@@ -1,226 +1,183 @@
---
-import {
- Cross1Icon,
- DiscordLogoIcon,
- GearIcon,
- HamburgerMenuIcon,
-} from "@radix-ui/react-icons";
-import { Box, Code, Flex, Grid, IconButton, Link } from "@radix-ui/themes";
-import { resolveBranchName } from "../core/blitzkit/branches";
-import { getStrings } from "../core/i18n/getStrings";
-import { Var } from "../core/radix/var";
-import { LinkI18n } from "./LinkI18n";
+import { GearIcon } from "@radix-ui/react-icons";
+import { api } from "../api/dynamic";
import { tools } from "../constants/tools";
-import { NavbarAccount } from "./NavbarAccount";
+import type { LocaleAcceptorProps } from "../hooks/useLocale";
+import { Logo } from "../icons/Logo";
+import { LinkI18nWrapper } from "./LinkI18nWrapper";
+import { Text } from "./Text";
-export interface Props {
- integrated?: boolean;
- locale: string;
-}
+type Props = LocaleAcceptorProps;
-const { integrated = false } = Astro.props;
-const toolsFiltered = Object.entries(tools).filter(([, tool]) => !tool.href);
const { locale } = Astro.props;
-const branchName = resolveBranchName(locale);
-const isBranchNamed = branchName !== undefined;
-const strings = getStrings(locale);
+
+const strings = await api.strings(locale);
+
+const filtered = Object.values(tools).filter(
+ (tool) => !tool.href && (tool.navbar ?? true),
+);
---
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {
- toolsFiltered.map(([id, tool]) => {
- const toolStrings =
- strings.website.tools[
- (tool.strings ?? id) as keyof typeof strings.website.tools
- ];
-
- return (
-
-
-
- {toolStrings.name}
-
-
-
- );
- })
- }
-
-
-
-
-
-
+
+
+
+ {strings.navbar.settings}
+
+
+
+
diff --git a/packages/website/src/components/Scroller/index.module.css b/packages/website/src/components/Scroller/index.module.css
index edb530823..39bd8fe1c 100644
--- a/packages/website/src/components/Scroller/index.module.css
+++ b/packages/website/src/components/Scroller/index.module.css
@@ -107,6 +107,9 @@
}
.bar {
+ /* TODO: temporarily hidden */
+ display: none !important;
+
position: absolute;
opacity: 0;
diff --git a/packages/website/src/components/SmartCanvas/index.module.css b/packages/website/src/components/SmartCanvas/index.module.css
index 92c88e259..0889bcba9 100644
--- a/packages/website/src/components/SmartCanvas/index.module.css
+++ b/packages/website/src/components/SmartCanvas/index.module.css
@@ -1,4 +1,10 @@
-.canvas {
- position: absolute;
- inset: 0;
+.aligner {
+ position: relative;
+ width: 100%;
+ height: 100%;
+
+ .canvas {
+ position: absolute;
+ inset: 0;
+ }
}
diff --git a/packages/website/src/components/SmartCanvas/index.tsx b/packages/website/src/components/SmartCanvas/index.tsx
index 1d1afe769..3363a41ad 100644
--- a/packages/website/src/components/SmartCanvas/index.tsx
+++ b/packages/website/src/components/SmartCanvas/index.tsx
@@ -1,6 +1,7 @@
import { Canvas, type CanvasProps } from "@react-three/fiber";
import { useRef } from "react";
import { useOnScreen } from "../../hooks/useOnScreen";
+import { classNames } from "../../ui/classNames";
import styles from "./index.module.css";
export function SmartCanvas({ className, ...props }: CanvasProps) {
@@ -8,7 +9,7 @@ export function SmartCanvas({ className, ...props }: CanvasProps) {
const onScreen = useOnScreen(canvas);
return (
-
+