fix: better layouts

This commit is contained in:
TrèsAbhi committed 2024-10-12 22:07:59 -05:00
1 parent 201f8f94a5
commit 97b9137e9a
15 files changed
+75 -75

No files matched your search

+3 -3
View File
@@ -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';
---
<RootLayout>
<BaseLayout>
<PageWrapper>
<Flex direction="column" justify="center" align="center" flexGrow="1">
<Heading>404: page not found</Heading>
@@ -25,4 +25,4 @@ import RootLayout from '../layouts/RootLayout.astro';
</Flex>
</Flex>
</PageWrapper>
</RootLayout>
</BaseLayout>
@@ -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;
---
<RootLayout>
<BaseLayout>
<PageWrapper>
<Flex
style={{ flex: 1 }}
@@ -29,4 +29,4 @@ const { provider } = Astro.params;
</PageWrapper>
<Authorize client:only="react" {provider} />
</RootLayout>
</BaseLayout>
@@ -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;
---
<!-- <title>{title}</title> -->
<RootLayout>
<BaseLayout>
<Page content={content} />
</RootLayout>
</BaseLayout>
@@ -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();
---
<RootLayout>
<BaseLayout>
<PageWrapper align="center">
<Heading mt="6" mb="4">BlitzKit patches</Heading>
@@ -45,4 +45,4 @@ const versions = Object.keys(
}
</Flex>
</PageWrapper>
</RootLayout>
</BaseLayout>
+5 -5
View File
@@ -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';
---
<RootLayout>
<BaseLayout>
<HomeHero />
<Plugs />
@@ -29,7 +29,7 @@ import RootLayout from '../layouts/RootLayout.astro';
<Flex gap="4" direction={{ initial: 'column', sm: 'row' }}>
{/* <ToolCard tool={playerStatsTool} /> */}
<ToolCard tool={compareTool} />
<ToolCard tool={tankPerformanceTool} />
<ToolCard tool={performanceTool} />
</Flex>
<Flex gap="4" direction={{ initial: 'column', sm: 'row' }}>
@@ -81,4 +81,4 @@ import RootLayout from '../layouts/RootLayout.astro';
</Flex>
<div style={{ flex: 1 }}></div>
</RootLayout>
</BaseLayout>
@@ -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';
---
<title>California Consumer Privacy Act (CCPA)</title>
<RootLayout>
<BaseLayout>
<PageWrapper justify="center">
<Flex direction="column">
<Heading mb="2">California Consumer Privacy Act (CCPA)</Heading>
@@ -22,4 +22,4 @@ import { Options } from './_index';
<Options client:load />
</PageWrapper>
</RootLayout>
</BaseLayout>
@@ -1,8 +1,8 @@
---
import BaseLayout from '../../layouts/BaseLayout.astro';
import { Page } from './_index';
import RootLayout from '../../layouts/RootLayout.astro';
---
<RootLayout>
<BaseLayout>
<Page client:load />
</RootLayout>
</BaseLayout>
@@ -1,8 +1,9 @@
---
import { compareTool } from '../../../constants/tools';
import ToolLayout from '../../../layouts/ToolLayout.astro';
import { Page } from './_index';
---
<ToolLayout>
<ToolLayout tool={compareTool}>
<Page client:load />
</ToolLayout>
@@ -1,8 +1,9 @@
---
import { Page } from './_index';
import { performanceTool } from '../../../constants/tools';
import ToolLayout from '../../../layouts/ToolLayout.astro';
import { Page } from './_index';
---
<ToolLayout>
<ToolLayout tool={performanceTool}>
<Page client:load />
</ToolLayout>
@@ -1,8 +1,9 @@
---
import { sessionTool } from '../../../constants/tools';
import ToolLayout from '../../../layouts/ToolLayout.astro';
import { Page } from './_index';
---
<ToolLayout>
<ToolLayout tool={sessionTool}>
<Page client:load />
</ToolLayout>
@@ -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]}
</title>
<ToolLayout>
<BaseLayout>
<Page id={id} client:load />
</ToolLayout>
</BaseLayout>
@@ -1,8 +1,9 @@
---
import { tankopediaTool } from '../../../constants/tools';
import ToolLayout from '../../../layouts/ToolLayout.astro';
import { Page } from './_index';
---
<ToolLayout>
<ToolLayout tool={tankopediaTool}>
<Page client:load />
</ToolLayout>