From e11ab1ae336a8138e426b6fe591c0b31b61c1b71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com>
Date: Mon, 26 Aug 2024 22:02:29 -0500
Subject: [PATCH] Merge branch 'main' into dev-embed

---
 public/assets/versions.json                    |  2 +-
 src/app/tools/embed/[embed]/page.tsx           |  6 +++---
 src/constants/tools.tsx                        | 13 +++++++++++++
 src/core/blitzkit/tankDefinitions/index.ts     |  2 +-
 src/core/blitzkit/tankDefinitions/tankNames.ts |  6 +++---
 src/types/urlon.d.ts                           |  4 ++++
 6 files changed, 25 insertions(+), 8 deletions(-)
 create mode 100644 src/types/urlon.d.ts

diff --git a/public/assets/versions.json b/public/assets/versions.json
index 3d2b3168c..611083fc1 100644
--- a/public/assets/versions.json
+++ b/public/assets/versions.json
@@ -1 +1 @@
-["1.10.0","1.10.1","1.10.2","1.11.0","1.12.0","1.12.1","1.12.2","1.12.3","1.12.4","1.12.5","1.12.6","1.12.7","1.12.8","1.12.9","1.13.0","1.13.1","1.13.2","1.13.3","1.14.0","1.14.1","1.14.2","1.14.3","1.14.4","1.15.0","1.15.1","1.15.10","1.15.11","1.15.12","1.15.13","1.15.2","1.15.3","1.15.4","1.15.5","1.15.6","1.15.7","1.15.8","1.15.9","1.16.0","1.16.1","1.16.2","1.16.3","1.16.4","1.17.0","1.17.1","1.17.2","1.18.0","1.18.1","1.18.2","1.18.3","1.19.0","1.19.1","1.19.2","1.19.3","1.19.4","1.19.5","1.19.6","1.20.0","1.20.1","1.20.2","1.20.3","1.20.4","1.20.5","1.21.0","1.21.1","1.21.2","1.21.3","1.22.0","1.22.1","1.22.2","1.3.0","1.3.1","1.3.2","1.3.3","1.4.0","1.4.1","1.5.0","1.5.1","1.5.2","1.5.3","1.5.4","1.6.0","1.7.0","1.7.1","1.7.2","1.7.3-1.7.4","1.7.5","1.7.6","1.7.7","1.8.0","1.8.1","1.9.0","1.9.1","1.9.2","1.9.3","1.9.4","1.9.5"]
\ No newline at end of file
+["1.10.0","1.10.1","1.10.2","1.11.0","1.12.0","1.12.1","1.12.2","1.12.3","1.12.4","1.12.5","1.12.6","1.12.7","1.12.8","1.12.9","1.13.0","1.13.1","1.13.2","1.13.3","1.14.0","1.14.1","1.14.2","1.14.3","1.14.4","1.15.0","1.15.1","1.15.10","1.15.11","1.15.12","1.15.13","1.15.2","1.15.3","1.15.4","1.15.5","1.15.6","1.15.7","1.15.8","1.15.9","1.16.0","1.16.1","1.16.2","1.16.3","1.16.4","1.17.0","1.17.1","1.17.2","1.18.0","1.18.1","1.18.2","1.18.3","1.19.0","1.19.1","1.19.2","1.19.3","1.19.4","1.19.5","1.19.6","1.20.0","1.20.1","1.20.2","1.20.3","1.20.4","1.20.5","1.21.0","1.21.1","1.21.2","1.21.3","1.22.0","1.22.1","1.22.2","1.22.3","1.3.0","1.3.1","1.3.2","1.3.3","1.4.0","1.4.1","1.5.0","1.5.1","1.5.2","1.5.3","1.5.4","1.6.0","1.7.0","1.7.1","1.7.2","1.7.3-1.7.4","1.7.5","1.7.6","1.7.7","1.8.0","1.8.1","1.9.0","1.9.1","1.9.2","1.9.3","1.9.4","1.9.5"]
\ No newline at end of file
diff --git a/src/app/tools/embed/[embed]/page.tsx b/src/app/tools/embed/[embed]/page.tsx
index 46126b089..733108de9 100644
--- a/src/app/tools/embed/[embed]/page.tsx
+++ b/src/app/tools/embed/[embed]/page.tsx
@@ -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"
diff --git a/src/constants/tools.tsx b/src/constants/tools.tsx
index c70df766d..43ed5f1f2 100644
--- a/src/constants/tools.tsx
+++ b/src/constants/tools.tsx
@@ -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',
diff --git a/src/core/blitzkit/tankDefinitions/index.ts b/src/core/blitzkit/tankDefinitions/index.ts
index c92d25e1c..7c196541c 100644
--- a/src/core/blitzkit/tankDefinitions/index.ts
+++ b/src/core/blitzkit/tankDefinitions/index.ts
@@ -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];
diff --git a/src/core/blitzkit/tankDefinitions/tankNames.ts b/src/core/blitzkit/tankDefinitions/tankNames.ts
index 11af3afb8..b9aa1468a 100644
--- a/src/core/blitzkit/tankDefinitions/tankNames.ts
+++ b/src/core/blitzkit/tankDefinitions/tankNames.ts
@@ -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,
diff --git a/src/types/urlon.d.ts b/src/types/urlon.d.ts
new file mode 100644
index 000000000..d9ae460c8
--- /dev/null
+++ b/src/types/urlon.d.ts
@@ -0,0 +1,4 @@
+declare module 'urlon' {
+  function stringify(value: any): string;
+  export { stringify };
+}