From 250b61b68d762ee02ca18a374b968cd892aea6ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com> Date: Sun, 8 Sep 2024 21:29:18 -0500 Subject: [PATCH] fix: some static shit --- .vscode/settings.json | 3 +- bun.lockb | Bin 282031 -> 282063 bytes package.json | 3 +- .../docs/[directory]/[document]/layout.tsx | 59 +++++++----------- .../src/app/tools/embed/[embed]/host/page.tsx | 8 ++- .../website/src/components/Navbar/index.tsx | 5 +- packages/website/src/constants/tools.tsx | 3 +- packages/website/tsconfig.json | 3 +- 8 files changed, 38 insertions(+), 46 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 5b01a0358..1c67db08c 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -200,5 +200,6 @@ "deno.enable": false, "deno.unstable": false, "cSpell.enableFiletypes": ["glsl", "proto3"], - "typescript.tsdk": "node_modules\\typescript\\lib" + "typescript.tsdk": "node_modules\\typescript\\lib", + "liveServer.settings.multiRootWorkspaceName": "blitzkit" } diff --git a/bun.lockb b/bun.lockb index f554250ad2bb08e73ac210300f6db3bb5555ebab..f9555e289a32129d6e236ca1e06516b45212c695 100644 GIT binary patch delta 15882 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 hzUpMLSzYy=Uac?kFxnC0;=4xc!2 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 response.json() as Promise<{ name: string }[]>) - .then((directories) => - Promise.all( - directories - .filter( - (directory) => - !['.vitepress', 'public', 'index.md'].includes(directory.name), - ) - .map((directory) => - fetch( - `https://api.github.com/repos/tresabhi/blitzkit/contents/docs/${directory.name}?ref=${assertSecret( - process.env.NEXT_PUBLIC_ASSET_BRANCH, - )}`, - ) - .then( - (response) => response.json() as Promise<{ name: string }[]>, - ) - .then((docs) => - docs - .map((document) => { - console.log(`${directory.name}/${document.name}`); - return document; - }) - .map((document) => ({ - document: document.name.split('.').slice(0, -1).join('.'), - directory: directory.name, - })), - ), + return await readdir('../../docs').then((directories) => + Promise.all( + directories + .filter( + (directory) => + !['.vitepress', 'public'].includes(directory) && + !directory.endsWith('.md'), + ) + .map((directory) => + readdir(`../../docs/${directory}`).then((files) => + Promise.all( + files + .filter((file) => file.endsWith('.md')) + .map((file) => ({ + directory, + document: file.replace(/\.md$/, ''), + })), + ), ), - ), - ) - .then((docs) => docs.flat()); + ), + ).then((directories) => directories.flat()), + ); } export default function Layout({ children }: { children: React.ReactNode }) { diff --git a/packages/website/src/app/tools/embed/[embed]/host/page.tsx b/packages/website/src/app/tools/embed/[embed]/host/page.tsx index 35eb18234..c30994249 100644 --- a/packages/website/src/app/tools/embed/[embed]/host/page.tsx +++ b/packages/website/src/app/tools/embed/[embed]/host/page.tsx @@ -1,6 +1,7 @@ 'use client'; import { Code, Heading } from '@radix-ui/themes'; +import { useSearchParams } from 'next/navigation'; import { useMemo } from 'react'; import { PageWrapper } from '../../../../../components/PageWrapper'; import * as EmbedState from '../../../../../stores/embedState'; @@ -13,16 +14,17 @@ export interface EmbedPreviewControllerProps { export default function Page({ params, - searchParams, }: { params: { embed: keyof typeof configurations }; - searchParams: { state: string }; }) { + const searchParams = useSearchParams(); + // TODO: check for this? idk lol + const stateParam = searchParams.get('state')!; const config = configurations[params.embed]; const initialState = useMemo( () => ({ ...extractEmbedConfigDefaults(config), - ...(JSON.parse(searchParams.state) as EmbedState.EmbedState), + ...(JSON.parse(stateParam) as EmbedState.EmbedState), }), [params.embed], ); diff --git a/packages/website/src/components/Navbar/index.tsx b/packages/website/src/components/Navbar/index.tsx index 537f7c875..003058c28 100644 --- a/packages/website/src/components/Navbar/index.tsx +++ b/packages/website/src/components/Navbar/index.tsx @@ -44,7 +44,8 @@ export function Navbar() { const pathname = usePathname(); const logins = App.use((state) => state.logins); const mutateApp = App.useMutation(); - const tools = [homeTool, ...TOOLS]; + const toolsFiltered = TOOLS.filter((tool) => !('href' in tool)); + const tools = [homeTool, ...toolsFiltered]; const isBranchNamed = process.env.NEXT_PUBLIC_ASSET_BRANCH && BRANCH_NAMES[process.env.NEXT_PUBLIC_ASSET_BRANCH]; @@ -99,7 +100,7 @@ export function Navbar() { justify="center" className={styles.tools} > - {TOOLS.map((tool, index) => { + {toolsFiltered.map((tool, index) => { const unavailableOnBranch = tool.branches?.every( (branch) => branch !== diff --git a/packages/website/src/constants/tools.tsx b/packages/website/src/constants/tools.tsx index 42143f4a1..150274549 100644 --- a/packages/website/src/constants/tools.tsx +++ b/packages/website/src/constants/tools.tsx @@ -139,6 +139,7 @@ export const embedTool: Tool = { }, image: 'Q0faRYg', branches: ['main', 'dev', 'opentest'], + href: '', }; export const homeTool: Tool = { @@ -154,6 +155,6 @@ export const TOOLS: Tool[] = [ compareTool, tankPerformanceTool, sessionTool, - // embedTool, + embedTool, ratingTool, ]; diff --git a/packages/website/tsconfig.json b/packages/website/tsconfig.json index 485b9f36c..b85067d35 100644 --- a/packages/website/tsconfig.json +++ b/packages/website/tsconfig.json @@ -10,6 +10,7 @@ "include": [ "src/**/*", ".next/types/**/*.ts", - "../../dist/website/types/**/*.ts" + "../../dist/website/types/**/*.ts", + "dist/website/types/**/*.ts" ] }