From 7cc086b9999115e821f6d6522fabf609d90fe69f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tr=C3=A8sAbhi?= <43380238+tresabhi@users.noreply.github.com>
Date: Tue, 25 Jun 2024 19:58:29 -0500
Subject: [PATCH] feat: ads :(

---
 .../tankopedia/components/TankCardWrapper.tsx |  1 +
 .../components/TankSearch/index.tsx           | 21 ++++++++++++-------
 src/app/tools/tankopedia/page.tsx             |  2 ++
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/app/tools/tankopedia/components/TankCardWrapper.tsx b/src/app/tools/tankopedia/components/TankCardWrapper.tsx
index 67fc8940d..183dfa993 100644
--- a/src/app/tools/tankopedia/components/TankCardWrapper.tsx
+++ b/src/app/tools/tankopedia/components/TankCardWrapper.tsx
@@ -5,6 +5,7 @@ export function TankCardWrapper(props: GridProps) {
     <Grid
       py="4"
       columns="repeat(auto-fill, minmax(100px, 1fr))"
+      flow="dense"
       gap="2"
       gapY="6"
       {...props}
diff --git a/src/app/tools/tankopedia/components/TankSearch/index.tsx b/src/app/tools/tankopedia/components/TankSearch/index.tsx
index 56a333d2e..0fda77707 100644
--- a/src/app/tools/tankopedia/components/TankSearch/index.tsx
+++ b/src/app/tools/tankopedia/components/TankSearch/index.tsx
@@ -1,7 +1,8 @@
-import { Callout, Flex, Link, Text } from '@radix-ui/themes';
+import { Callout, Flex, FlexProps, Link, Text } from '@radix-ui/themes';
 import { go } from 'fuzzysort';
 import { times } from 'lodash';
 import { memo, use, useMemo } from 'react';
+import { AdMidSectionResponsive } from '../../../../../components/AdMidSectionResponsive';
 import { ExperimentIcon } from '../../../../../components/ExperimentIcon';
 import { TANK_CLASSES } from '../../../../../components/Tanks/components/Item/constants';
 import { resolveNearPenetration } from '../../../../../core/blitz/resolveNearPenetration';
@@ -28,14 +29,14 @@ import { TankCard } from '../TankCard';
 import { TankCardWrapper } from '../TankCardWrapper';
 import { treeTypeOrder } from './constants';
 
-interface TankSearchProps {
+type TankSearchProps = FlexProps & {
   compact?: boolean;
   onSelect?: (tank: TankDefinition) => void;
   onSelectAll?: (tanks: TankDefinition[]) => void;
-}
+};
 
 export const TankSearch = memo<TankSearchProps>(
-  ({ compact, onSelect, onSelectAll }) => {
+  ({ compact, onSelect, onSelectAll, ...props }) => {
     const awaitedGameDefinitions = use(gameDefinitions);
     const awaitedModelDefinitions = use(modelDefinitions);
     const awaitedTankDefinitions = use(tankDefinitions);
@@ -52,6 +53,7 @@ export const TankSearch = memo<TankSearchProps>(
         switch (filters.sort.by) {
           case 'meta.none':
             sorted = filtered
+              .sort((a, b) => b.tier - a.tier)
               .sort(
                 (a, b) =>
                   treeTypeOrder.indexOf(b.treeType) -
@@ -355,7 +357,7 @@ export const TankSearch = memo<TankSearchProps>(
     }, [filters]);
 
     return (
-      <Flex direction="column" gap="4" flexGrow="1">
+      <Flex direction="column" gap="4" flexGrow="1" {...props}>
         <SearchBar topResult={tanks?.[0]} />
 
         {!filters.search && !filters.searching && (
@@ -410,8 +412,13 @@ export const TankSearch = memo<TankSearchProps>(
           <>
             {tanks.length > 0 && (
               <TankCardWrapper>
-                {tanks.map((tank) => (
-                  <TankCard onSelect={onSelect} key={tank.id} tank={tank} />
+                {tanks.map((tank, index) => (
+                  <>
+                    <TankCard onSelect={onSelect} key={tank.id} tank={tank} />
+                    {(index + 16) % 32 === 0 && index !== tanks.length - 1 && (
+                      <AdMidSectionResponsive gridColumn="1 / -1" />
+                    )}
+                  </>
                 ))}
               </TankCardWrapper>
             )}
diff --git a/src/app/tools/tankopedia/page.tsx b/src/app/tools/tankopedia/page.tsx
index cd052867f..16f578dc9 100644
--- a/src/app/tools/tankopedia/page.tsx
+++ b/src/app/tools/tankopedia/page.tsx
@@ -1,5 +1,6 @@
 'use client';
 
+import { AdMidSectionResponsive } from '../../../components/AdMidSectionResponsive';
 import PageWrapper from '../../../components/PageWrapper';
 import { TankSearch } from './components/TankSearch';
 
@@ -7,6 +8,7 @@ export default function Page() {
   return (
     <PageWrapper color="purple" size={1028}>
       <TankSearch />
+      <AdMidSectionResponsive />
     </PageWrapper>
   );
 }