From 6bd8b7d42f1a1256be3553f3891ca0bcd9615187 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com> Date: Wed, 3 Apr 2024 19:27:24 -0500 Subject: [PATCH 1/7] feat: page descriptions --- src/app/tools/layout.tsx | 9 ++++++++- src/constants/tools.ts | 19 +++++++------------ 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/src/app/tools/layout.tsx b/src/app/tools/layout.tsx index dc25ac5b0..e8f8e7e44 100644 --- a/src/app/tools/layout.tsx +++ b/src/app/tools/layout.tsx @@ -19,7 +19,14 @@ export default function ToolsLayout({ children }: ToolsLayoutProps) { return ( <> - {tool && {tool.title}} + {tool && ( + <> + {tool.title} + {tool.pageDescription !== undefined && ( + + )} + + )} {pathSplit.length === 3 && (
Date: Wed, 3 Apr 2024 19:28:25 -0500 Subject: [PATCH 2/7] fix: build db --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index cd7c34829..41346061c 100644 --- a/package.json +++ b/package.json @@ -5,8 +5,9 @@ "main": "src/server.ts", "type": "module", "scripts": { + "build:db": "prisma generate", "build:bot": "vite-node --script scripts/build --production", - "build:website": "next build && next-sitemap --config next-sitemap.config.cjs", + "build:website": "build:db && next build && next-sitemap --config next-sitemap.config.cjs", "build:docs": "vitepress build docs", "build:ratingleaderboard": "vite-node --script scripts/buildRatingLeaderboard", "build:assets": "vite-node --max_old_space_size=16384 --script scripts/buildAssets/index", From 367bd1386b660557ab5047e5b44786eda88f1ea4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com> Date: Wed, 3 Apr 2024 19:31:10 -0500 Subject: [PATCH 3/7] fix: build db 2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 41346061c..a631a8b62 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "scripts": { "build:db": "prisma generate", "build:bot": "vite-node --script scripts/build --production", - "build:website": "build:db && next build && next-sitemap --config next-sitemap.config.cjs", + "build:website": "prisma generate && next build && next-sitemap --config next-sitemap.config.cjs", "build:docs": "vitepress build docs", "build:ratingleaderboard": "vite-node --script scripts/buildRatingLeaderboard", "build:assets": "vite-node --max_old_space_size=16384 --script scripts/buildAssets/index", From 26a5fdea0e75a596bd1d6407cec2358f11055e83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com> Date: Wed, 3 Apr 2024 19:34:32 -0500 Subject: [PATCH 4/7] fix: remove title from svg --- src/icons/Patreon.tsx | 1 - 1 file changed, 1 deletion(-) diff --git a/src/icons/Patreon.tsx b/src/icons/Patreon.tsx index 6c1017400..63ceaf3de 100644 --- a/src/icons/Patreon.tsx +++ b/src/icons/Patreon.tsx @@ -3,7 +3,6 @@ import { ComponentProps } from 'react'; export function PatreonIcon(props: ComponentProps<'svg'>) { return ( - Patreon logo Date: Wed, 3 Apr 2024 19:48:28 -0500 Subject: [PATCH 5/7] feat: preview image --- .../tankopedia/[id]/components/Title.tsx | 2 -- src/app/tools/tankopedia/[id]/layout.tsx | 30 +++++++++++++++++++ 2 files changed, 30 insertions(+), 2 deletions(-) create mode 100644 src/app/tools/tankopedia/[id]/layout.tsx diff --git a/src/app/tools/tankopedia/[id]/components/Title.tsx b/src/app/tools/tankopedia/[id]/components/Title.tsx index 6e22a1b3f..41e47a1b4 100644 --- a/src/app/tools/tankopedia/[id]/components/Title.tsx +++ b/src/app/tools/tankopedia/[id]/components/Title.tsx @@ -13,8 +13,6 @@ export function Title() { return ( <> - {protagonist.tank.name} - + {tank.name} + + + + {children} + + ); +} From 68d3fe6805f2f9653361fdf491a169c1a6ac8f17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com> Date: Wed, 3 Apr 2024 21:56:20 -0500 Subject: [PATCH 6/7] feat: sitemap --- .gitignore | 2 +- package.json | 4 ++-- scripts/sitemap.ts | 14 ++++++++++++++ yarn.lock | 24 ++---------------------- 4 files changed, 19 insertions(+), 25 deletions(-) create mode 100644 scripts/sitemap.ts diff --git a/.gitignore b/.gitignore index 44d74892e..f1770efc3 100644 --- a/.gitignore +++ b/.gitignore @@ -18,5 +18,5 @@ temp/ /.VSCodeCounter /.yarn depots -public/sitemap*.xml +public/sitemap* public/robots.txt \ No newline at end of file diff --git a/package.json b/package.json index a631a8b62..9087a4d97 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,8 @@ "scripts": { "build:db": "prisma generate", "build:bot": "vite-node --script scripts/build --production", - "build:website": "prisma generate && next build && next-sitemap --config next-sitemap.config.cjs", + "build:website": "yarn build:db && next build && yarn build:sitemap", + "build:sitemap": "vite-node scripts/sitemap", "build:docs": "vitepress build docs", "build:ratingleaderboard": "vite-node --script scripts/buildRatingLeaderboard", "build:assets": "vite-node --max_old_space_size=16384 --script scripts/buildAssets/index", @@ -57,7 +58,6 @@ "lz4js": "^0.2.0", "markdown-escape": "^2.0.0", "next": "^14.1.0", - "next-sitemap": "^4.2.3", "parse-dds": "^1.2.1", "postprocessing": "^6.34.1", "react": "^18.2.0", diff --git a/scripts/sitemap.ts b/scripts/sitemap.ts new file mode 100644 index 000000000..8ebab4be4 --- /dev/null +++ b/scripts/sitemap.ts @@ -0,0 +1,14 @@ +import { writeFile } from 'fs/promises'; +import { tankDefinitions } from '../src/core/blitzkrieg/tankDefinitions'; + +console.log('Building sitemap...'); + +const awaitedTankDefinitions = await tankDefinitions; +const values = Object.values(awaitedTankDefinitions); +const sitemap = values + .map((tank) => `https://blitz-krieg.vercel.app/tools/tankopedia/${tank.id}`) + .join('\n'); + +await writeFile('public/sitemap.txt', sitemap); + +console.log(`Built sitemap for ${values.length} tanks`); diff --git a/yarn.lock b/yarn.lock index 59a1ff1d8..a30a989ad 100644 --- a/yarn.lock +++ b/yarn.lock @@ -339,11 +339,6 @@ "@babel/helper-validator-identifier" "^7.22.20" to-fast-properties "^2.0.0" -"@corex/deepmerge@^4.0.43": - version "4.0.43" - resolved "https://registry.yarnpkg.com/@corex/deepmerge/-/deepmerge-4.0.43.tgz#9bd42559ebb41cc5a7fb7cfeea5f231c20977dca" - integrity sha512-N8uEMrMPL0cu/bdboEWpQYb/0i2K5Qn8eCsxzOmxSggJbbQte7ljMRoXm917AbntqTGOzdTu+vP3KOOzoC70HQ== - "@discordjs/builders@^1.7.0": version "1.7.0" resolved "https://registry.yarnpkg.com/@discordjs/builders/-/builders-1.7.0.tgz#e2478c7e55b0f4c40837edb8f102bce977323a37" @@ -790,11 +785,6 @@ resolved "https://registry.yarnpkg.com/@next/env/-/env-14.1.0.tgz#43d92ebb53bc0ae43dcc64fb4d418f8f17d7a341" integrity sha512-Py8zIo+02ht82brwwhTg36iogzFqGLPXlRGKQw5s+qP/kMNc4MAyDeEwBKDijk6zTIbegEgu8Qy7C1LboslQAw== -"@next/env@^13.4.3": - version "13.5.6" - resolved "https://registry.yarnpkg.com/@next/env/-/env-13.5.6.tgz#c1148e2e1aa166614f05161ee8f77ded467062bc" - integrity sha512-Yac/bV5sBGkkEXmAX5FWPS9Mmo2rthrOPRQQNfycJPkjUAUclomCPH7QFVCDQ4Mp2k2K1SSM6m0zrxYrOwtFQw== - "@next/swc-darwin-arm64@14.1.0": version "14.1.0" resolved "https://registry.yarnpkg.com/@next/swc-darwin-arm64/-/swc-darwin-arm64-14.1.0.tgz#70a57c87ab1ae5aa963a3ba0f4e59e18f4ecea39" @@ -3470,7 +3460,7 @@ fast-deep-equal@^2.0.1: resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-2.0.1.tgz#7b05218ddf9667bf7f370bf7fdb2cb15fdd0aa49" integrity sha512-bCK/2Z4zLidyB4ReuIsvALH6w31YfAQDmXMqMx6FyfHqvBxtjC0eRumeSu4Bs3XtXwpyIywtSTrVT99BxY1f9w== -fast-glob@3.3.2, fast-glob@^3.2.12, fast-glob@^3.3.2: +fast-glob@3.3.2, fast-glob@^3.3.2: version "3.3.2" resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.3.2.tgz#a904501e57cfdd2ffcded45e99a54fef55e46129" integrity sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow== @@ -4295,7 +4285,7 @@ minimatch@^9.0.0, minimatch@^9.0.1: dependencies: brace-expansion "^2.0.1" -minimist@1.2.8, minimist@^1.2.5, minimist@^1.2.8: +minimist@1.2.8, minimist@^1.2.5: version "1.2.8" resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.8.tgz#c1a464e7693302e082a075cee0c057741ac4772c" integrity sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA== @@ -4371,16 +4361,6 @@ negotiator@0.6.3: resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd" integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg== -next-sitemap@^4.2.3: - version "4.2.3" - resolved "https://registry.yarnpkg.com/next-sitemap/-/next-sitemap-4.2.3.tgz#5db3f650351a51e84b9fd6b58c5af2f9257b5058" - integrity sha512-vjdCxeDuWDzldhCnyFCQipw5bfpl4HmZA7uoo3GAaYGjGgfL4Cxb1CiztPuWGmS+auYs7/8OekRS8C2cjdAsjQ== - dependencies: - "@corex/deepmerge" "^4.0.43" - "@next/env" "^13.4.3" - fast-glob "^3.2.12" - minimist "^1.2.8" - next@^14.1.0: version "14.1.0" resolved "https://registry.yarnpkg.com/next/-/next-14.1.0.tgz#b31c0261ff9caa6b4a17c5af019ed77387174b69" From dd19d5b9795a22f1c4309e97fec9dcfb30c03e8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com> Date: Wed, 3 Apr 2024 21:57:39 -0500 Subject: [PATCH 7/7] feat: gen prisma (#105) --- .github/workflows/ci-build-bot.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci-build-bot.yml b/.github/workflows/ci-build-bot.yml index fe8e15b2d..07fd07f77 100644 --- a/.github/workflows/ci-build-bot.yml +++ b/.github/workflows/ci-build-bot.yml @@ -33,6 +33,9 @@ jobs: - name: Install dependencies run: yarn + - name: Build Prisma + run: yarn prisma generate + - name: Build run: yarn build:bot --production