From 97b9137e9a8ee7352cdf21ef445abda789f6e20e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com> Date: Sat, 12 Oct 2024 22:07:59 -0500 Subject: [PATCH] fix: better layouts --- packages/website/src/constants/tools.ts | 4 +- .../{RootLayout.astro => BaseLayout.astro} | 0 packages/website/src/layouts/ToolLayout.astro | 80 +++++++++---------- packages/website/src/pages/404.astro | 6 +- .../src/pages/auth/[provider]/index.astro | 6 +- .../docs/[directory]/[document]/index.astro | 6 +- .../src/pages/docs/patches/index.astro | 6 +- packages/website/src/pages/index.astro | 10 +-- .../website/src/pages/legal/ccpa/index.astro | 6 +- .../website/src/pages/settings/index.astro | 6 +- .../src/pages/tools/compare/index.astro | 3 +- .../src/pages/tools/performance/index.astro | 5 +- .../src/pages/tools/session/index.astro | 3 +- .../pages/tools/tankopedia/[id]/index.astro | 6 +- .../src/pages/tools/tankopedia/index.astro | 3 +- 15 files changed, 75 insertions(+), 75 deletions(-) rename packages/website/src/layouts/{RootLayout.astro => BaseLayout.astro} (100%) diff --git a/packages/website/src/constants/tools.ts b/packages/website/src/constants/tools.ts index de058fc88..2fdcb45ac 100644 --- a/packages/website/src/constants/tools.ts +++ b/packages/website/src/constants/tools.ts @@ -114,7 +114,7 @@ export const playerStatsTool: Tool = { branches: ['main', 'dev'], }; -export const tankPerformanceTool: Tool = { +export const performanceTool: Tool = { id: 'performance', title: 'Performance', description: 'Tank performance statistics', @@ -153,7 +153,7 @@ export const homeTool: Tool = { export const TOOLS: Tool[] = [ tankopediaTool, compareTool, - tankPerformanceTool, + performanceTool, sessionTool, embedTool, // ratingTool, diff --git a/packages/website/src/layouts/RootLayout.astro b/packages/website/src/layouts/BaseLayout.astro similarity index 100% rename from packages/website/src/layouts/RootLayout.astro rename to packages/website/src/layouts/BaseLayout.astro diff --git a/packages/website/src/layouts/ToolLayout.astro b/packages/website/src/layouts/ToolLayout.astro index 1457a2ccc..696cec1d7 100644 --- a/packages/website/src/layouts/ToolLayout.astro +++ b/packages/website/src/layouts/ToolLayout.astro @@ -1,55 +1,51 @@ --- import { imgur, ImgurSize } from '@blitzkit/core'; import { Box, Flex, Heading, Text } from '@radix-ui/themes'; -import { TOOLS } from '../constants/tools'; -import RootLayout from './RootLayout.astro'; +import { type Tool } from '../constants/tools'; +import BaseLayout from './BaseLayout.astro'; -const { pathname } = Astro.url; -const pathSplit = pathname.split('/'); -const toolId = pathSplit.at(2); -const isToolRoot = pathname === `/tools/${toolId}`; -const tool = TOOLS.find((tool) => tool.id === toolId); +interface Props { + tool: Tool; +} + +const { tool } = Astro.props; --- - + + {tool.title} + + { - tool && isToolRoot && ( + tool.pageDescription !== undefined && ( <> - {tool.title} - - - {tool.pageDescription !== undefined && ( - <> - - - - )} - - - - {tool?.title} - {tool?.description} - - + + ) } + + + {tool?.title} + {tool?.description} + + + - + diff --git a/packages/website/src/pages/404.astro b/packages/website/src/pages/404.astro index 54585d1f8..e1d293513 100644 --- a/packages/website/src/pages/404.astro +++ b/packages/website/src/pages/404.astro @@ -2,10 +2,10 @@ import { DiscordLogoIcon, HomeIcon } from '@radix-ui/react-icons'; import { Button, Flex, Heading, Link, Text } from '@radix-ui/themes'; import { PageWrapper } from '../components/PageWrapper'; -import RootLayout from '../layouts/RootLayout.astro'; +import BaseLayout from '../layouts/BaseLayout.astro'; --- - + 404: page not found @@ -25,4 +25,4 @@ import RootLayout from '../layouts/RootLayout.astro'; - + diff --git a/packages/website/src/pages/auth/[provider]/index.astro b/packages/website/src/pages/auth/[provider]/index.astro index 1e374e316..6e6379f8c 100644 --- a/packages/website/src/pages/auth/[provider]/index.astro +++ b/packages/website/src/pages/auth/[provider]/index.astro @@ -2,7 +2,7 @@ import { Flex, Heading, Text } from '@radix-ui/themes'; import type { GetStaticPaths } from 'astro'; import { PageWrapper } from '../../../components/PageWrapper'; -import RootLayout from '../../../layouts/RootLayout.astro'; +import BaseLayout from '../../../layouts/BaseLayout.astro'; import { AUTH_PROVIDERS, AUTH_PROVIDER_NAMES, Authorize } from './_index'; export const getStaticPaths = (() => { @@ -12,7 +12,7 @@ export const getStaticPaths = (() => { const { provider } = Astro.params; --- - + - + diff --git a/packages/website/src/pages/docs/[directory]/[document]/index.astro b/packages/website/src/pages/docs/[directory]/[document]/index.astro index af724b463..5c130845c 100644 --- a/packages/website/src/pages/docs/[directory]/[document]/index.astro +++ b/packages/website/src/pages/docs/[directory]/[document]/index.astro @@ -1,8 +1,8 @@ --- import type { GetStaticPaths } from 'astro'; import { readFile } from 'fs/promises'; +import BaseLayout from '../../../../layouts/BaseLayout.astro'; import { Page } from './_index'; -import RootLayout from '../../../../layouts/RootLayout.astro'; export const getStaticPaths = (async () => { const ROOT = '../../../../../../../docs/'; @@ -30,6 +30,6 @@ const { content } = Astro.props; --- - + - + diff --git a/packages/website/src/pages/docs/patches/index.astro b/packages/website/src/pages/docs/patches/index.astro index cb8a1cddb..fdb7ae388 100644 --- a/packages/website/src/pages/docs/patches/index.astro +++ b/packages/website/src/pages/docs/patches/index.astro @@ -3,7 +3,7 @@ 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 RootLayout from '../../../layouts/RootLayout.astro'; +import BaseLayout from '../../../layouts/BaseLayout.astro'; // this can't be used in template literal :( const ROOT = '../../../../../../docs/changelogs/'; @@ -18,7 +18,7 @@ const versions = Object.keys( .reverse(); --- - + BlitzKit patches @@ -45,4 +45,4 @@ const versions = Object.keys( } - + diff --git a/packages/website/src/pages/index.astro b/packages/website/src/pages/index.astro index d7ea5e5e5..3d0ba976a 100644 --- a/packages/website/src/pages/index.astro +++ b/packages/website/src/pages/index.astro @@ -8,14 +8,14 @@ import { compareTool, discordTool, moreTool, + performanceTool, sessionTool, tankopediaTool, - tankPerformanceTool, } from '../constants/tools'; -import RootLayout from '../layouts/RootLayout.astro'; +import BaseLayout from '../layouts/BaseLayout.astro'; --- - + @@ -29,7 +29,7 @@ import RootLayout from '../layouts/RootLayout.astro'; {/* */} - + @@ -81,4 +81,4 @@ import RootLayout from '../layouts/RootLayout.astro';
- + diff --git a/packages/website/src/pages/legal/ccpa/index.astro b/packages/website/src/pages/legal/ccpa/index.astro index 7f711ffe4..d9660cb30 100644 --- a/packages/website/src/pages/legal/ccpa/index.astro +++ b/packages/website/src/pages/legal/ccpa/index.astro @@ -1,13 +1,13 @@ --- import { Flex, Heading, Link, Text } from '@radix-ui/themes'; import { PageWrapper } from '../../../components/PageWrapper'; -import RootLayout from '../../../layouts/RootLayout.astro'; +import BaseLayout from '../../../layouts/BaseLayout.astro'; import { Options } from './_index'; --- California Consumer Privacy Act (CCPA) - + California Consumer Privacy Act (CCPA) @@ -22,4 +22,4 @@ import { Options } from './_index'; - + diff --git a/packages/website/src/pages/settings/index.astro b/packages/website/src/pages/settings/index.astro index df82e842e..e3e75c5d4 100644 --- a/packages/website/src/pages/settings/index.astro +++ b/packages/website/src/pages/settings/index.astro @@ -1,8 +1,8 @@ --- +import BaseLayout from '../../layouts/BaseLayout.astro'; import { Page } from './_index'; -import RootLayout from '../../layouts/RootLayout.astro'; --- - + - + diff --git a/packages/website/src/pages/tools/compare/index.astro b/packages/website/src/pages/tools/compare/index.astro index e0d25903f..0c070e7d1 100644 --- a/packages/website/src/pages/tools/compare/index.astro +++ b/packages/website/src/pages/tools/compare/index.astro @@ -1,8 +1,9 @@ --- +import { compareTool } from '../../../constants/tools'; import ToolLayout from '../../../layouts/ToolLayout.astro'; import { Page } from './_index'; --- - + diff --git a/packages/website/src/pages/tools/performance/index.astro b/packages/website/src/pages/tools/performance/index.astro index 86c3199f7..07c5ded6a 100644 --- a/packages/website/src/pages/tools/performance/index.astro +++ b/packages/website/src/pages/tools/performance/index.astro @@ -1,8 +1,9 @@ --- -import { Page } from './_index'; +import { performanceTool } from '../../../constants/tools'; import ToolLayout from '../../../layouts/ToolLayout.astro'; +import { Page } from './_index'; --- - + diff --git a/packages/website/src/pages/tools/session/index.astro b/packages/website/src/pages/tools/session/index.astro index e0d25903f..cc086bdeb 100644 --- a/packages/website/src/pages/tools/session/index.astro +++ b/packages/website/src/pages/tools/session/index.astro @@ -1,8 +1,9 @@ --- +import { sessionTool } from '../../../constants/tools'; import ToolLayout from '../../../layouts/ToolLayout.astro'; import { Page } from './_index'; --- - + diff --git a/packages/website/src/pages/tools/tankopedia/[id]/index.astro b/packages/website/src/pages/tools/tankopedia/[id]/index.astro index 891219c3c..c4b7f0d48 100644 --- a/packages/website/src/pages/tools/tankopedia/[id]/index.astro +++ b/packages/website/src/pages/tools/tankopedia/[id]/index.astro @@ -2,7 +2,7 @@ import { fetchTankDefinitions, TIER_ROMAN_NUMERALS } from '@blitzkit/core'; import strings from '@blitzkit/core/lang/en-US.json'; import type { GetStaticPaths } from 'astro'; -import ToolLayout from '../../../../layouts/ToolLayout.astro'; +import BaseLayout from '../../../../layouts/BaseLayout.astro'; import { Page } from './_index'; export const getStaticPaths = (async () => { @@ -29,6 +29,6 @@ const tank = tankDefinitions.tanks[id]; {strings.common.tank_class_short[tank.class]} - + - + diff --git a/packages/website/src/pages/tools/tankopedia/index.astro b/packages/website/src/pages/tools/tankopedia/index.astro index e0d25903f..5238d6985 100644 --- a/packages/website/src/pages/tools/tankopedia/index.astro +++ b/packages/website/src/pages/tools/tankopedia/index.astro @@ -1,8 +1,9 @@ --- +import { tankopediaTool } from '../../../constants/tools'; import ToolLayout from '../../../layouts/ToolLayout.astro'; import { Page } from './_index'; --- - +