diff --git a/.vscode/settings.json b/.vscode/settings.json index 7504271aa..328a0297e 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -229,6 +229,7 @@ "unpickled", "unranked", "Unregistering", + "unreviewed", "unrotate", "unwrapper", "userns", diff --git a/packages/i18n/strings/en.json b/packages/i18n/strings/en.json index 0dceab60a..c6b649720 100644 --- a/packages/i18n/strings/en.json +++ b/packages/i18n/strings/en.json @@ -25,6 +25,83 @@ "clear": "Clear" }, + "embed": { + "coming_soon": "More embeds coming soon.", + "suggest": "Suggest ideas.", + "preview": { + "title": "Example preview", + "upload": "Upload test background" + }, + "configuration": { + "import": { + "title": "Import", + "description": "Paste your current URL if you have one already to import your settings", + "hint": "Paste URL...", + "apply": "Apply", + "applied": "Applied!", + "idiot_title": "Invalid URL", + "idiot_description": "Try pasting the URL that BlitzKit previously generated, you silly goose!", + "idiot_button": "Okay, my bad" + }, + "export": { + "title": "Export", + "description": "Copy all properties for you streaming software", + "generate": { + "button": "Generate URL", + "title": "Generate URL", + "subtitle": "Search an account to track", + "cancel": "Cancel", + "success": { + "title": "Copy URL", + "info": "Generated the URL for {name}. The embed will start tracking as soon as the URL is pasted. Reset at any time by right-clicking on PC or long-pressing on mobile and then selecting \"Reset\".", + "back": "Back", + "copy": "Copy URL" + } + }, + "css": "Copy CSS", + "width": "Copy Width", + "height": "Copy Height", + "framerate": "Copy Framerate" + }, + "customize": { + "title": "Customize", + "reset": "Reset", + "description": "Bells and whistles of your embed" + } + }, + "types": { + "breakdown": { + "name": "Breakdown", + "reset": "Reset", + "options": { + "width": "Width", + "height": "Height", + "show_total": "Show total", + "list_gap": "List gap", + "list_max_tanks": "Max tanks", + "card_radius": "Card radius", + "card_header_background_color": "Card header background color", + "card_header_padding": "Card header padding", + "card_title": "Card title", + "card_title_type_color": "Card title type color", + "card_title_class_icon": "Card title class icon", + "card_body_background_color": "Card body background color", + "card_body_padding": "Card body padding", + "column_gap": "Column gap", + "column_value": "Column value", + "column_label": "Column label", + "column_1": "Column 1", + "column_2": "Column 2", + "column_3": "Column 3", + "column_4": "Column 4", + "column_1_custom_label": "Column 1 label", + "column_2_custom_label": "Column 2 label", + "column_3_custom_label": "Column 3 label" + } + } + } + }, + "compare": { "no_tanks": { "title": "No tanks to compare", diff --git a/packages/website/astro.config.ts b/packages/website/astro.config.ts index 7e06c8bd1..058c3c329 100644 --- a/packages/website/astro.config.ts +++ b/packages/website/astro.config.ts @@ -16,7 +16,7 @@ export default defineConfig({ outDir: "../../dist/website", prefetch: { defaultStrategy: "hover", prefetchAll: true }, - build: { concurrency: 4 }, + build: { concurrency: 4, inlineStylesheets: "never" }, integrations: [ favicons({ diff --git a/packages/website/public/assets/images/backgrounds/embed-default.webp b/packages/website/public/media/embed-default.webp similarity index 100% rename from packages/website/public/assets/images/backgrounds/embed-default.webp rename to packages/website/public/media/embed-default.webp diff --git a/packages/website/src/components/Badge/index.module.css b/packages/website/src/components/Badge/index.module.css new file mode 100644 index 000000000..89c5f0e29 --- /dev/null +++ b/packages/website/src/components/Badge/index.module.css @@ -0,0 +1,50 @@ +.badge { + display: inline-flex; + align-items: center; + flex-shrink: 0; + gap: var(--space-2); + + box-sizing: border-box; + border-radius: var(--radius-max); + outline-offset: calc(-1 * var(--space-1)); + + font-weight: var(--weight-medium); + line-height: 1; + white-space: nowrap; + + &[data-size="minor"] { + padding: var(--space-2) var(--space-3); + font-size: var(--font-size-minor); + } + + &[data-size="regular"] { + padding: var(--space-3) var(--space-4); + font-size: var(--font-size-regular); + } + + &[data-variant="solid"] { + background-color: var(--accent-8); + color: var(--white-a12); + } + + &[data-variant="soft"] { + background-color: var(--accent-a3); + color: var(--accent-a11); + } + + &[data-variant="surface"] { + background-color: var(--accent-a2); + outline: var(--space-1) solid var(--accent-5); + color: var(--accent-a11); + } + + &[data-variant="outline"] { + outline: var(--space-1) solid var(--accent-5); + color: var(--accent-a11); + } + + svg { + width: 1em; + height: 1em; + } +} diff --git a/packages/website/src/components/Badge/index.tsx b/packages/website/src/components/Badge/index.tsx new file mode 100644 index 000000000..0d51646fc --- /dev/null +++ b/packages/website/src/components/Badge/index.tsx @@ -0,0 +1,28 @@ +import type { ComponentProps } from "react"; +import { classNames } from "../../ui/classNames"; +import type { Color } from "../../ui/color"; +import styles from "./index.module.css"; + +export interface BadgeProps extends ComponentProps<"span"> { + color?: Color; + variant?: "solid" | "soft" | "surface" | "outline"; + size?: "minor" | "regular"; +} + +export function Badge({ + className, + color, + variant = "soft", + size = "minor", + ...props +}: BadgeProps) { + return ( + + ); +} diff --git a/packages/website/src/components/BaseStyles.astro b/packages/website/src/components/BaseStyles.astro index 6fd35b30f..126b61735 100644 --- a/packages/website/src/components/BaseStyles.astro +++ b/packages/website/src/components/BaseStyles.astro @@ -1,21 +1,27 @@ --- import "@fontsource-variable/jetbrains-mono"; import "@fontsource-variable/roboto-flex"; +import { spaces, weights } from "../config/styles"; + +let styles = ""; + +styles += ":root{"; + +spaces.forEach((space, index) => { + styles += `--space-${index}:${space}rem;`; +}); + +for (const weight in weights) { + styles += `--weight-${weight}:${weights[weight as keyof typeof weights]};`; +} + +styles += "}"; --- + + diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/components.astro b/packages/website/src/pages/[...chunk_default]/[...locale]/components.astro new file mode 100644 index 000000000..b552b76c9 --- /dev/null +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/components.astro @@ -0,0 +1,137 @@ +--- +import { CheckIcon, StarFilledIcon } from "@radix-ui/react-icons"; +import { Badge } from "../../../components/Badge"; +import ColorScale from "../../../components/ColorScale.astro"; +import BaseLayout from "../../../layouts/BaseLayout.astro"; +import type { Color } from "../../../ui/color"; + +export { getStaticPaths } from "./index.astro"; + +const { locale } = Astro.props; + +const variants = ["solid", "soft", "surface", "outline"] as const; +const sizes = ["minor", "regular"] as const; +const colors = [undefined, "gray", "red", "amber", "green"] as const; +const iconLayouts = ["leading", "trailing", "both", "icon only"] as const; +const extraColors = ["red", "amber", "green"] satisfies Color[]; +--- + + + { + extraColors.map((color) => ( + <> + + + + )) + } + +
+

Badge

+ + { + sizes.map((size) => ( +
+

size="{size}"

+ + + + + + ))} + + + + + {colors.map((color) => ( + + + {variants.map((variant) => ( + + ))} + + ))} + +
+ {variants.map((variant) => ( + {variant}
{color ?? "accent"} + + Badge + +
+
+ )) + } + + { + sizes.map((size) => ( +
+

size="{size}" with icons

+ + + + + + ))} + + + + + {variants.map((variant) => ( + + + + + + + + + + + + ))} + +
+ {iconLayouts.map((layout) => ( + {layout}
{variant} + + + Badge + + + + Badge + + + + + + Badge + + + + + + +
+
+ )) + } +
+
+ + diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/docs/[directory]/[document]/_index.astro b/packages/website/src/pages/[...chunk_default]/[...locale]/docs/[directory]/[document]/_index.astro index 9c00a0faa..d556ceaa8 100644 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/docs/[directory]/[document]/_index.astro +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/docs/[directory]/[document]/_index.astro @@ -1,5 +1,4 @@ --- -import { AstroSeo } from "@astrolib/seo"; import { readFile } from "fs/promises"; import { mixStaticPaths } from "../../../../../../core/blitzkit/mixStaticPaths"; import BaseLayout from "../../../../../../layouts/BaseLayout.astro"; @@ -29,23 +28,8 @@ export const getStaticPaths = mixStaticPaths(_getStaticPaths, async () => { }); const { content, locale } = Astro.props; - -const title = content.split("\n")[0].replace("# ", ""); --- - - diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/docs/patches/_index.astro b/packages/website/src/pages/[...chunk_default]/[...locale]/docs/patches/_index.astro index 43631f651..5081674a9 100644 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/docs/patches/_index.astro +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/docs/patches/_index.astro @@ -1,10 +1,8 @@ --- -import { AstroSeo } from "@astrolib/seo"; import { MagicWandIcon, StarFilledIcon } from "@radix-ui/react-icons"; import { Flex, Heading, Link } from "@radix-ui/themes"; import { compareVersions } from "compare-versions"; import { PageWrapper } from "../../../../../components/PageWrapper"; -import { getStrings } from "../../../../../core/i18n/getStrings"; import BaseLayout from "../../../../../layouts/BaseLayout.astro"; export { getStaticPaths } from "../../index.astro"; @@ -13,7 +11,6 @@ export { getStaticPaths } from "../../index.astro"; const ROOT = "../../../../../../../../docs/changelogs/"; const { locale } = Astro.props; -const strings = getStrings(locale); const versions = Object.keys( import.meta.glob("../../../../../../../../docs/changelogs/*.md", { eager: true, @@ -24,19 +21,6 @@ const versions = Object.keys( .reverse(); --- - - BlitzKit patches diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/embed/[embed]/_index.astro b/packages/website/src/pages/[...chunk_default]/[...locale]/embed/[embed]/_index.astro deleted file mode 100644 index 9bb51e3e7..000000000 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/embed/[embed]/_index.astro +++ /dev/null @@ -1,56 +0,0 @@ ---- -import { AstroSeo } from "@astrolib/seo"; -import { capitalize } from "lodash-es"; -import { embedConfigurations } from "../../../../../constants/embeds"; -import { mixStaticPaths } from "../../../../../core/blitzkit/mixStaticPaths"; -import BaseLayout from "../../../../../layouts/BaseLayout.astro"; -import { getStaticPaths as _getStaticPaths } from "../index.astro"; -import { Page } from "./_index"; - -export const getStaticPaths = mixStaticPaths(_getStaticPaths, async () => { - return Object.keys(embedConfigurations).map((embed) => ({ - params: { embed: embed as keyof typeof embedConfigurations }, - })); -}); - -const name = capitalize(Astro.params.embed); -const title = `BlitzKit - ${name} embed`; -const description = `BlitzKit ${name} embeds for streaming World of Tanks Blitz with extreme customization`; -const { locale } = Astro.props; ---- - - - - - - - - diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/embed/[embed]/_index.module.css b/packages/website/src/pages/[...chunk_default]/[...locale]/embed/[embed]/_index.module.css new file mode 100644 index 000000000..c93458422 --- /dev/null +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/embed/[embed]/_index.module.css @@ -0,0 +1,111 @@ +.page { + display: flex; + gap: var(--space-4); + + box-sizing: border-box; + padding: var(--space-4); + padding-left: 0; + + @media screen and (max-width: 80rem) { + padding-left: var(--space-4); + } + + width: 100%; + margin: 0 auto; +} + +.sidebar { + height: 100%; + max-width: 20rem; +} + +.controls { + display: flex; + flex-direction: column; + gap: var(--space-3); +} + +.description { + margin-bottom: var(--space-3); +} + +.exports { + display: flex; + flex-wrap: wrap; + gap: var(--space-3); + + margin-bottom: var(--space-4); +} + +.customize { + display: flex; + align-items: center; + gap: var(--space-3); +} + +.option { + display: flex; + flex-direction: column; + gap: var(--space-2); + + .control { + flex: 1; + + display: flex; + align-items: center; + gap: var(--space-3); + } + + &[data-one-liner="true"] { + flex-direction: row; + justify-content: space-between; + align-items: center; + gap: var(--space-3); + + .control { + justify-content: flex-end; + } + } + + &[data-pad="true"] { + padding-bottom: var(--space-4); + } +} + +.stage { + flex: 1; + + position: sticky; + top: var(--space-4); + + height: calc(100dvh - 2 * var(--space-4)); +} + +.window { + display: flex; + flex-direction: column; + + height: 100%; + overflow: hidden; + + border-radius: var(--space-3); + box-shadow: var(--shadow-subtle); +} + +.toolbar { + display: flex; + justify-content: space-between; + align-items: center; + + padding: var(--space-3); + padding-left: var(--space-4); + + background-color: var(--gray-2); +} + +.preview { + flex: 1; + + position: relative; + overflow: hidden; +} diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/embed/[embed]/_index.tsx b/packages/website/src/pages/[...chunk_default]/[...locale]/embed/[embed]/_index.tsx index 416514749..831f78370 100644 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/embed/[embed]/_index.tsx +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/embed/[embed]/_index.tsx @@ -6,8 +6,8 @@ import { TimerIcon, WidthIcon, } from "@radix-ui/react-icons"; -import { Box, Button, Flex, Heading, ScrollArea, Text } from "@radix-ui/themes"; import { useEffect, useRef, useState, type ReactNode } from "react"; +import { Button } from "../../../../../components/Button"; import { CopyButton } from "../../../../../components/CopyButton"; import { Boolean } from "../../../../../components/Embeds/Boolean"; import { Color } from "../../../../../components/Embeds/Color"; @@ -21,19 +21,25 @@ import { Size } from "../../../../../components/Embeds/Size"; import { SizeWithout0 } from "../../../../../components/Embeds/SizeWithout0"; import { Slider } from "../../../../../components/Embeds/Slider"; import { TextController } from "../../../../../components/Embeds/TextController"; -import { PageWrapper } from "../../../../../components/PageWrapper"; +import { Heading } from "../../../../../components/Heading"; +import { IconButton } from "../../../../../components/IconButton"; +import { + Scroller, + ScrollerOrientation, +} from "../../../../../components/Scroller"; +import { Text } from "../../../../../components/Text"; import { embedConfigurations, extractEmbedConfigDefaults, } from "../../../../../constants/embeds"; -import { NAVBAR_HEIGHT } from "../../../../../constants/navbar"; import { LocaleProvider, - useLocale, type LocaleAcceptorProps, } from "../../../../../hooks/useLocale"; +import { useStrings } from "../../../../../hooks/useStrings"; import { EmbedState, type EmbedConfig } from "../../../../../stores/embedState"; import { EmbedItemType } from "../../../../../stores/embedState/constants"; +import styles from "./_index.module.css"; export interface EmbedPreviewControllerProps { configKey: string; @@ -58,10 +64,10 @@ export function Page({ embed, locale }: PageProps & LocaleAcceptorProps) { function Content({ embed }: PageProps) { const config = embedConfigurations[embed] as EmbedConfig; const [backgroundImage, setBackgroundImage] = useState( - "/assets/images/backgrounds/embed-default.webp", + "/media/embed-default.webp", ); const fileInput = useRef(null!); - const { strings } = useLocale(); + const strings = useStrings(); useEffect(() => { fileInput.current = document.createElement("input"); @@ -76,213 +82,179 @@ function Content({ embed }: PageProps) { }, []); return ( - - - - - +
+
+
+
+ {strings.embed.preview.title} - - {strings.website.tools.embed.configuration.export.title} - - - {strings.website.tools.embed.configuration.export.description} - + +
- - - - - "body { margin: 0; background-color: transparent; overflow: hidden; }" - } - > - - {strings.website.tools.embed.configuration.export.css} - - `${EmbedState.state.width}`} - > - - {strings.website.tools.embed.configuration.export.width} - - `${EmbedState.state.height}`} - > - - {strings.website.tools.embed.configuration.export.height} - - "1"}> - - {strings.website.tools.embed.configuration.export.framerate} - - - - - - {strings.website.tools.embed.configuration.customize.title} - - - - - {strings.website.tools.embed.configuration.customize.description} - - - {Object.keys(config).map((configKey) => { - const item = config[configKey]; - let control: ReactNode; - let oneLiner = false; - - switch (item.type) { - case EmbedItemType.Boolean: { - control = ; - oneLiner = true; - break; - } - - case EmbedItemType.Color: { - control = ; - break; - } - - case EmbedItemType.Radius: { - control = ; - oneLiner = true; - break; - } - - case EmbedItemType.Size: { - control = ; - oneLiner = true; - break; - } - - case EmbedItemType.SizeWithout0: { - control = ; - oneLiner = true; - break; - } - - case EmbedItemType.Slider: { - control = ; - oneLiner = true; - break; - } - - case EmbedItemType.String: { - control = ; - break; - } - - case EmbedItemType.RichText: { - control = ; - break; - } - - case EmbedItemType.Enum: { - control = ; - oneLiner = true; - break; - } - } - - return ( - - - { - ( - strings.website.tools.embed.types[embed] - .options as Record - )[configKey] - } - - - {control} - - - ); - })} - - - - - - +
+
+
+ + +
+ + + + {strings.embed.configuration.export.title} + + + {strings.embed.configuration.export.description} + + +
+ + + + "body { margin: 0; background-color: transparent; overflow: hidden; }" + } + > + + {strings.embed.configuration.export.css} + + `${EmbedState.state.width}`} + > + + {strings.embed.configuration.export.width} + + `${EmbedState.state.height}`} + > + + {strings.embed.configuration.export.height} + + "1"}> + + {strings.embed.configuration.export.framerate} + +
+ +
+ + {strings.embed.configuration.customize.title} + + { + EmbedState.set(EmbedState.initial); }} > - - {strings.website.tools.embed.preview.title} - + + +
+ + {strings.embed.configuration.customize.description} + - - - - - - - - - - + + { + ( + strings.embed.types[embed].options as Record< + string, + string + > + )[configKey] + } + +
{control}
+
+ ); + })} + +
+ ); } diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/embed/[embed]/host/_index.astro b/packages/website/src/pages/[...chunk_default]/[...locale]/embed/[embed]/host/_index.astro deleted file mode 100644 index 73f575172..000000000 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/embed/[embed]/host/_index.astro +++ /dev/null @@ -1,13 +0,0 @@ ---- -import EmbedLayout from "../../../../../../layouts/EmbedLayout.astro"; -import type { getStaticPaths } from "../index.astro"; -import { Page } from "./_index"; - -export { getStaticPaths } from "../index.astro"; - -const { locale } = Astro.props; ---- - - - - diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/embed/[embed]/host/_index.module.css b/packages/website/src/pages/[...chunk_default]/[...locale]/embed/[embed]/host/_index.module.css new file mode 100644 index 000000000..02413fca1 --- /dev/null +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/embed/[embed]/host/_index.module.css @@ -0,0 +1,3 @@ +.embed { + overflow: hidden; +} diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/embed/[embed]/host/_index.tsx b/packages/website/src/pages/[...chunk_default]/[...locale]/embed/[embed]/host/_index.tsx index 3c8269285..7e5afa0f7 100644 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/embed/[embed]/host/_index.tsx +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/embed/[embed]/host/_index.tsx @@ -1,7 +1,5 @@ -import { Box } from "@radix-ui/themes"; import { useMemo } from "react"; import { parse } from "urlon"; -import { BlitzKitTheme } from "../../../../../../components/BlitzKitTheme"; import { embedConfigurations, embedRenderers, @@ -17,6 +15,7 @@ import { type ExtractEmbedConfigTypes, } from "../../../../../../stores/embedState"; import { useEmbedStateCurry } from "../../../../../../stores/embedState/utilities"; +import styles from "./_index.module.css"; interface PageProps { embed: keyof typeof embedConfigurations; @@ -51,10 +50,11 @@ function Content({ embed }: PageProps) { const height = useEmbedState("height"); return ( - - - - - +
+ +
); } diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/embed/[embed]/host/index.astro b/packages/website/src/pages/[...chunk_default]/[...locale]/embed/[embed]/host/index.astro new file mode 100644 index 000000000..a453cde72 --- /dev/null +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/embed/[embed]/host/index.astro @@ -0,0 +1,15 @@ +--- +import ColorScale from "../../../../../../components/ColorScale.astro"; +import EmbedLayout from "../../../../../../layouts/EmbedLayout.astro"; +import { Page } from "./_index"; + +export { getStaticPaths } from "../index.astro"; + +const { locale, embed } = Astro.props; +--- + + + + + + diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/embed/[embed]/index.astro b/packages/website/src/pages/[...chunk_default]/[...locale]/embed/[embed]/index.astro new file mode 100644 index 000000000..a09978580 --- /dev/null +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/embed/[embed]/index.astro @@ -0,0 +1,22 @@ +--- +import { mixStaticPaths } from "../../../../../astro/mixStaticPaths"; +import { embedConfigurations } from "../../../../../constants/embeds"; +import BaseLayout from "../../../../../layouts/BaseLayout.astro"; +import { getStaticPaths as _getStaticPaths } from "../index.astro"; +import { Page } from "./_index"; + +export const getStaticPaths = mixStaticPaths(_getStaticPaths, async () => { + return ( + Object.keys(embedConfigurations) as (keyof typeof embedConfigurations)[] + ).map((embed) => ({ + params: { embed }, + props: { embed }, + })); +}); + +const { locale, embed } = Astro.props; +--- + + + + diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/embed/_index.astro b/packages/website/src/pages/[...chunk_default]/[...locale]/embed/_index.astro deleted file mode 100644 index 674665781..000000000 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/embed/_index.astro +++ /dev/null @@ -1,13 +0,0 @@ ---- -import { tools } from "../../../../constants/tools"; -import ToolLayout from "../../../../layouts/ToolLayout.astro"; -import { Page } from "./_index"; - -export { getStaticPaths } from "../index.astro"; - -const { locale } = Astro.props; ---- - - - - diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/embed/_index.module.css b/packages/website/src/pages/[...chunk_default]/[...locale]/embed/_index.module.css new file mode 100644 index 000000000..2f64364c2 --- /dev/null +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/embed/_index.module.css @@ -0,0 +1,49 @@ +.content { + display: flex; + flex-direction: column; + gap: var(--space-6); +} + +.intro { + margin-top: var(--space-3); +} + +.embeds { + display: flex; + flex-wrap: wrap; + justify-content: center; +} + +.embed { + display: block; + width: fit-content; + height: fit-content; +} + +.card { + display: flex; + flex-direction: column; + overflow: hidden; + + border-radius: var(--space-4); + background-color: var(--gray-2); + box-shadow: var(--shadow-subtle); +} + +.title { + display: flex; + justify-content: center; + padding: var(--space-3); +} + +.preview { + position: relative; + overflow: hidden; + + width: 20rem; + height: 20rem; + + background-image: url(/media/embed-default.webp); + background-size: cover; + background-position: center; +} diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/embed/_index.tsx b/packages/website/src/pages/[...chunk_default]/[...locale]/embed/_index.tsx index 54a307810..72fd656f1 100644 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/embed/_index.tsx +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/embed/_index.tsx @@ -1,14 +1,16 @@ -import { Box, Flex, Link, Text } from "@radix-ui/themes"; import { PreviewWrapper } from "../../../../components/Embeds/PreviewWrapper"; +import { Link } from "../../../../components/Link"; import { LinkI18n } from "../../../../components/LinkI18n"; -import { PageWrapper } from "../../../../components/PageWrapper"; +import { Text } from "../../../../components/Text"; +import { discordLink } from "../../../../config/socials"; import { embedConfigurations } from "../../../../constants/embeds"; -import { Var } from "../../../../core/radix/var"; import { type LocaleAcceptorProps, LocaleProvider, useLocale, } from "../../../../hooks/useLocale"; +import { useStrings } from "../../../../hooks/useStrings"; +import styles from "./_index.module.css"; export function Page({ locale }: LocaleAcceptorProps) { return ( @@ -19,74 +21,50 @@ export function Page({ locale }: LocaleAcceptorProps) { } function Content() { - const { locale, strings } = useLocale(); + const locale = useLocale(); + const strings = useStrings(); return ( - - - {strings.website.tools.embed.coming_soon}{" "} - - {strings.website.tools.embed.suggest} +
+ + {strings.embed.coming_soon}{" "} + + {strings.embed.suggest} - +
{Object.keys(embedConfigurations).map((embed) => ( - - +
+
{ - strings.website.tools.embed.types[ - embed as keyof typeof strings.website.tools.embed.types + strings.embed.types[ + embed as keyof typeof strings.embed.types ].name } - +
- +
- - +
+
))} - - +
+
); } diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/embed/index.astro b/packages/website/src/pages/[...chunk_default]/[...locale]/embed/index.astro new file mode 100644 index 000000000..48d9a7d99 --- /dev/null +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/embed/index.astro @@ -0,0 +1,16 @@ +--- +import ToolBanner from "../../../../components/ToolBanner.astro"; +import { tools } from "../../../../constants/tools"; +import BaseLayout from "../../../../layouts/BaseLayout.astro"; +import { Page } from "./_index"; + +export { getStaticPaths } from "../index.astro"; + +const { locale } = Astro.props; +--- + + + + + + diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/guesser/_index.module.css b/packages/website/src/pages/[...chunk_default]/[...locale]/guesser/_index.module.css index 657bd6875..544da6160 100644 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/guesser/_index.module.css +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/guesser/_index.module.css @@ -1,4 +1,5 @@ .content { - flex: 1; + position: relative; + height: 100dvh; background-color: black; } diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/guesser/index.astro b/packages/website/src/pages/[...chunk_default]/[...locale]/guesser/index.astro index ff7e08e35..371bb91e2 100644 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/guesser/index.astro +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/guesser/index.astro @@ -6,6 +6,8 @@ import { Page } from "./_index"; export { getStaticPaths } from "../index.astro"; const { locale } = Astro.props; + +// TODO: the tank search popup is complete unreviewed AI slop, write a proper system for it manually --- diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/index.astro b/packages/website/src/pages/[...chunk_default]/[...locale]/index.astro index 09a4e002f..8907d7b58 100644 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/index.astro +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/index.astro @@ -1,8 +1,6 @@ --- -import { AstroSeo } from "@astrolib/seo"; import { assertSecret } from "@blitzkit/core"; import locales from "@blitzkit/i18n/locales.json"; -import { api } from "../../../api/dynamic"; import { mixStaticPaths } from "../../../astro/mixStaticPaths"; import { AesonPlug } from "../../../components/AesonPlug"; import HelpTranslate from "../../../components/HelpTranslate.astro"; @@ -20,7 +18,6 @@ const MAX_TOOLS_PER_ROW = 2; const environment = assertSecret(import.meta.env.PUBLIC_ENVIRONMENT); const { locale } = Astro.props; -const strings = await api.strings(locale); const rows: Tool[][] = []; for (const id in tools) { @@ -49,19 +46,6 @@ export const getStaticPaths = mixStaticPaths(_getStaticPaths, () => { }); --- - - diff --git a/packages/website/src/pages/[...chunk_default]/[...locale]/settings/_index.astro b/packages/website/src/pages/[...chunk_default]/[...locale]/settings/_index.astro index f82a650b5..5c4c9d25c 100644 --- a/packages/website/src/pages/[...chunk_default]/[...locale]/settings/_index.astro +++ b/packages/website/src/pages/[...chunk_default]/[...locale]/settings/_index.astro @@ -1,21 +1,12 @@ --- -import { AstroSeo } from "@astrolib/seo"; -import { getStrings } from "../../../../core/i18n/getStrings"; import BaseLayout from "../../../../layouts/BaseLayout.astro"; import { Page } from "./_index"; export { getStaticPaths } from "../index.astro"; const { locale } = Astro.props; - -const strings = getStrings(locale); --- - - diff --git a/packages/website/src/pages/[...chunk_default]/_404.astro b/packages/website/src/pages/[...chunk_default]/_404.astro index c252cd803..de0712305 100644 --- a/packages/website/src/pages/[...chunk_default]/_404.astro +++ b/packages/website/src/pages/[...chunk_default]/_404.astro @@ -3,6 +3,7 @@ import { DiscordLogoIcon, HomeIcon } from "@radix-ui/react-icons"; import { Button, Flex, Heading, Link, Text } from "@radix-ui/themes"; import { LinkI18n } from "../../components/LinkI18n"; import { PageWrapper } from "../../components/PageWrapper"; +import { discordLink } from "../../config/socials"; import BaseLayout from "../../layouts/BaseLayout.astro"; export { getStaticPaths } from "./_index"; @@ -18,12 +19,14 @@ const { locale } = Astro.props; - + diff --git a/packages/website/src/stores/embedState/constants.ts b/packages/website/src/stores/embedState/constants.ts index 95ea7b555..12142ea00 100644 --- a/packages/website/src/stores/embedState/constants.ts +++ b/packages/website/src/stores/embedState/constants.ts @@ -1,4 +1,4 @@ -import type { EmbedConfigItem } from '.'; +import type { EmbedConfigItem } from "."; export enum EmbedItemType { Radius, @@ -12,16 +12,14 @@ export enum EmbedItemType { Enum, } -export const radixGrays = [ - 'gray', - 'mauve', - 'slate', - 'sage', - 'olive', - 'sand', +export const grays = [ + "gray", + "mauve", + "slate", + "sage", + "olive", + "sand", ] as const; -export const radixTextWeights = ['light', 'regular', 'medium', 'bold'] as const; - export type EmbedConfigItemType = EmbedConfigItem & { type: Type }; diff --git a/packages/website/src/stores/embedState/index.ts b/packages/website/src/stores/embedState/index.ts index 60ab337a6..ba07c56c5 100644 --- a/packages/website/src/stores/embedState/index.ts +++ b/packages/website/src/stores/embedState/index.ts @@ -1,25 +1,26 @@ -import * as radixColors from "@radix-ui/colors"; import { Soapstone } from "soapstone"; +import type { Color } from "../../ui/color"; +import type { + Radius, + Space, + SpaceWithout0, + Weight, +} from "../../types/styles"; import { type EmbedConfigItemType, EmbedItemType, - radixGrays, - radixTextWeights, + grays, } from "./constants"; -export type RadixSize = `${0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9}`; -export type RadixSizeWithout0 = Exclude; -export type RadixRadius = `${1 | 2 | 3 | 4}` | "full"; -export type RadixTextWeight = (typeof radixTextWeights)[number]; -export type RadixColorCompound = { - base: RadixColor; - variant: RadixColorVariant; +export type ColorCompound = { + base: Color; + variant: ColorVariant; }; -export type RadixTextColor = - | Exclude +export type TextColor = + | Exclude | "gray" | undefined; -export type RadixColorVariantRaw = `${ +export type ColorStep = `${ | 1 | 2 | 3 @@ -32,12 +33,8 @@ export type RadixColorVariantRaw = `${ | 10 | 11 | 12}`; -export type RadixColorVariant = `${"" | "a"}${RadixColorVariantRaw}`; -export type RadixColor = Exclude< - keyof typeof radixColors, - `${string}${"A" | "P3" | "Dark"}` ->; -export type RadixColorGrays = (typeof radixGrays)[number]; +export type ColorVariant = `${"" | "a"}${ColorStep}`; +export type Gray = (typeof grays)[number]; export type ExtractEmbedConfigTypes = { [Key in keyof Config]: ({ @@ -67,15 +64,15 @@ export type EmbedConfigItem = ( } | { type: EmbedItemType.Radius; - default: RadixRadius; + default: Radius; } | { type: EmbedItemType.Size; - default: RadixSize; + default: Space; } | { type: EmbedItemType.SizeWithout0; - default: RadixSizeWithout0; + default: SpaceWithout0; } | { type: EmbedItemType.Color; @@ -85,8 +82,8 @@ export type EmbedConfigItem = ( type: EmbedItemType.RichText; default: { color: string; - size: RadixSizeWithout0; - weight: RadixTextWeight; + size: SpaceWithout0; + weight: Weight; }; } | { diff --git a/packages/website/src/stores/embedState/tokens.ts b/packages/website/src/stores/embedState/tokens.ts new file mode 100644 index 000000000..a7d62bee8 --- /dev/null +++ b/packages/website/src/stores/embedState/tokens.ts @@ -0,0 +1,25 @@ +import type { CSSProperties } from "react"; +import type { Radius, Space, SpaceWithout0, Weight } from "../../types/styles"; + +export interface EmbedRichText { + color: string; + size: SpaceWithout0; + weight: Weight; +} + +export function embedSpace(size: Space) { + return `var(--space-${size})`; +} + +export function embedRadius(radius: Radius) { + if (radius === "full") return "var(--radius-max)"; + return embedSpace(radius); +} + +export function embedText({ color, size, weight }: EmbedRichText) { + return { + color, + fontSize: embedSpace(size), + fontWeight: `var(--weight-${weight})`, + } satisfies CSSProperties; +} diff --git a/packages/website/src/stores/embedState/utilities.ts b/packages/website/src/stores/embedState/utilities.ts index 1889e8819..523df3b21 100644 --- a/packages/website/src/stores/embedState/utilities.ts +++ b/packages/website/src/stores/embedState/utilities.ts @@ -1,10 +1,10 @@ -import type { TextProps } from "@radix-ui/themes"; import { EmbedState, type EmbedConfig, type ExtractEmbedConfigTypes } from "."; import { breakdownConfig, extractEmbedConfigDefaults, } from "../../constants/embeds"; import type { EmbedConfigItemType, EmbedItemType } from "./constants"; +import { embedText } from "./tokens"; export function useEmbedStateCurry() { // TODO: find a way to initialize with the correct state preset @@ -23,14 +23,11 @@ export function useEmbedStateCurry() { : never; }[keyof Config], >(key: Key) { - const { color, ...state } = useEmbedState( + const state = useEmbedState( key, ) as EmbedConfigItemType["default"]; - return { - style: { color }, - ...state, - } satisfies TextProps; + return embedText(state); } return { useEmbedState, useRichText }; diff --git a/packages/website/src/types/space.ts b/packages/website/src/types/space.ts deleted file mode 100644 index 6b34b0d32..000000000 --- a/packages/website/src/types/space.ts +++ /dev/null @@ -1 +0,0 @@ -export type Space = `${0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9}`; diff --git a/packages/website/src/types/styles.ts b/packages/website/src/types/styles.ts new file mode 100644 index 000000000..8c181e184 --- /dev/null +++ b/packages/website/src/types/styles.ts @@ -0,0 +1,8 @@ +import type { weights } from "../config/styles"; + +export type Space = `${0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9}`; +export type SpaceWithout0 = Exclude; + +export type Radius = Space | "full"; + +export type Weight = keyof typeof weights;