diff --git a/README.md b/README.md index dbe88ef7c..8510694eb 100644 --- a/README.md +++ b/README.md @@ -8,16 +8,16 @@ Tools for everything World of Tanks Blitz Go to [application directory for BlitzKit](https://discord.com/application-directory/1097673957865443370) and click "Add to Server." Voila! You're ready to go. -![BlitzKit application directory](https://i.imgur.com/JlEA0J1.png) +![BlitzKit application directory](https://i.imgur.com/YWCtOuJ.png) ## Visit the website ### https://blitzkit.vercel.app/ -![BlitzKit website](https://i.imgur.com/oLVIx2n.png) +![BlitzKit website](https://i.imgur.com/bdYMUCL.png) ## Visit the documentation website ### https://tresabhi.github.io/blitzkit/ -![BlitzKit documentation website](https://i.imgur.com/TOt5fMx.png) +![BlitzKit documentation website](https://i.imgur.com/hm3KTsF.png) diff --git a/docs/public/assets/images/hero.png b/docs/public/assets/images/hero.png index 6c81c198d..722f5bf0a 100644 Binary files a/docs/public/assets/images/hero.png and b/docs/public/assets/images/hero.png differ diff --git a/scripts/applyPatches.ts b/scripts/applyPatches.ts index 2df9903ae..c56aaadbe 100644 --- a/scripts/applyPatches.ts +++ b/scripts/applyPatches.ts @@ -4,7 +4,7 @@ import { parse as parseYaml } from 'yaml'; import { readStringDVPL } from '../src/core/blitz/readStringDVPL'; import { writeDVPL } from '../src/core/blitz/writeDVPL'; import { secrets } from '../src/core/blitzkit/secrets'; -import { dvp } from '../submodules/closedkrieg/src/dvp'; +import { dvp } from '../submodules/blitzkit-closed/src/dvp'; import { DATA } from './buildAssets/constants'; const versionTextFile = await readStringDVPL(`${DATA}/version.txt.dvpl`); diff --git a/scripts/buildAssets/videos.ts b/scripts/buildAssets/videos.ts index 1832e333f..8868ab8ff 100644 --- a/scripts/buildAssets/videos.ts +++ b/scripts/buildAssets/videos.ts @@ -6,22 +6,40 @@ import { readXMLDVPL } from '../../src/core/blitz/readXMLDVPL'; import { readYAMLDVPL } from '../../src/core/blitz/readYAMLDVPL'; import { toUniqueId } from '../../src/core/blitz/toUniqueId'; import { commitAssets } from '../../src/core/blitzkit/commitAssets'; -import { - VideoDefinitions, - videoDefinitions, -} from '../../src/core/blitzkit/videos'; +import { VideoDefinitions } from '../../src/core/blitzkit/videos'; import { DATA, POI } from './constants'; import { BlitzStrings, botPattern, VehicleDefinitionList } from './definitions'; const youtubers = [ 'UCKBYXp4Xn2I2tL1UL4fpbhw', // droodles 'UCrQ-Dy8lVsm11u8pCJ8W7Tw', // fatness + 'UCxRpZqMElssTdPYDK3x7wyg', // n90 ]; export async function videos(production: boolean) { console.log('Building videos...'); - const currentVideos = await videoDefinitions; + const currentVideos = await fetch( + 'https://raw.githubusercontent.com/tresabhi/blitzkit-assets/main/definitions/videos.csv', + ) + .then((response) => response.text()) + .then((lines) => { + return lines + .split('\n') + .map((line) => { + const [idString, lastUpdatedString, ...videos] = line.split(','); + const id = Number(idString); + const lastUpdated = Number(lastUpdatedString); + return { id, lastUpdated, videos }; + }) + .reduce( + (accumulator, { id, lastUpdated, videos }) => { + accumulator[id] = { lastUpdated, videos }; + return accumulator; + }, + {}, + ); + }); const auth = await google.auth.getClient({ scopes: ['https://www.googleapis.com/auth/youtube.readonly'], }); diff --git a/src/app/tools/tankopedia/[id]/components/Videos.tsx b/src/app/tools/tankopedia/[id]/components/Videos.tsx index ef1ef93d7..cf1c7ff8c 100644 --- a/src/app/tools/tankopedia/[id]/components/Videos.tsx +++ b/src/app/tools/tankopedia/[id]/components/Videos.tsx @@ -1,5 +1,5 @@ -import { InfoCircledIcon, PlusIcon } from '@radix-ui/react-icons'; -import { Callout, Card, Flex, Heading, Link, Text } from '@radix-ui/themes'; +import { PlusIcon } from '@radix-ui/react-icons'; +import { Card, Flex, Heading, Link, Text } from '@radix-ui/themes'; import { use } from 'react'; import { videoDefinitions } from '../../../../../core/blitzkit/videos'; import { useFullScreen } from '../../../../../hooks/useFullScreen'; @@ -17,16 +17,6 @@ export function Videos() { Review videos - - - - - - Some YouTubers may not have videos on the {tank.name} leading to - off-topic videos. - - - {videos.map((video) => (