Merge branch 'main' into dev-embed

This commit is contained in:
TrèsAbhi committed 2024-08-26 22:02:29 -05:00
1 parent e99b125517
commit e11ab1ae33
6 files changed
+25 -8

No files matched your search

+3 -3
View File
@@ -14,7 +14,6 @@ import { capitalize, startCase } from 'lodash';
import { ReactNode, useEffect, useRef, useState } from 'react';
import { stringify } from 'urlon';
import { CopyButton } from '../../../../components/CopyButton';
import { NAVBAR_HEIGHT } from '../../../../components/Navbar';
import PageWrapper from '../../../../components/PageWrapper';
import { imgur } from '../../../../core/blitzkit/imgur';
import * as App from '../../../../stores/app';
@@ -237,8 +236,9 @@ export default function Page({
p="4"
flexGrow="1"
position="sticky"
top={`${NAVBAR_HEIGHT}px`}
height={`calc(100vh - ${NAVBAR_HEIGHT}px)`}
// TODO: re-implement this sticky preview
// top={`${NAVBAR_HEIGHT}px`}
// height={`calc(100vh - ${NAVBAR_HEIGHT}px)`}
>
<Flex
direction="column"
+13
View File
@@ -119,6 +119,19 @@ export const tankPerformanceTool: Tool = {
image: 'vOKFB03',
};
export const embedTool: Tool = {
id: 'embed',
title: 'Embed',
description: 'Embeds for streaming',
pageDescription:
'Create embeds for streaming World of Tanks Blitz with extreme customization',
button: {
text: 'Create',
color: 'red',
},
image: 'Q0faRYg',
};
export const homeTool: Tool = {
id: '',
title: 'Home',
+1 -1
View File
@@ -173,7 +173,7 @@ export const tankDefinitions = fetchCdonLz4<TankDefinitions>(
asset('definitions/tanks.cdon.lz4'),
);
export const tanksDefinitionsArray = tankDefinitions.then((tanks) =>
export const tankDefinitionsArray = tankDefinitions.then((tanks) =>
Object.values(tanks),
);
export type Tier = (typeof TIERS)[number];
@@ -1,14 +1,14 @@
import { deburr } from 'lodash';
import { tanksDefinitionsArray } from '.';
import { tankDefinitionsArray } from '.';
import { camouflageDefinitions } from '../camouflageDefinitions';
export const tankNames = Promise.all([
tanksDefinitionsArray,
tankDefinitionsArray,
camouflageDefinitions,
]).then(([tanks, camouflages]) =>
Promise.all(
tanks.map(async (tank, index) => {
const { id } = (await tanksDefinitionsArray)[index];
const { id } = (await tankDefinitionsArray)[index];
return {
id,
+4
View File
@@ -0,0 +1,4 @@
declare module 'urlon' {
function stringify(value: any): string;
export { stringify };
}