From 87955214e3bc13bfad7ec50baf98c401f029e591 Mon Sep 17 00:00:00 2001
From: tresabhi <coolabhigyaandeep07@gmail.com>
Date: Sun, 9 Jul 2023 17:37:44 +0000
Subject: [PATCH] feat: updated /today with figma

---
 src/commands/evolution.tsx                    |  2 +-
 src/commands/today.tsx                        |  2 +-
 src/components/Breakdown/components/Root.tsx  |  2 +-
 src/components/Breakdown/components/Row.tsx   | 46 ++++++++++---------
 .../Breakdown/components/RowDiscriminator.tsx |  9 +++-
 .../Breakdown/components/RowStat.tsx          | 19 ++++----
 src/renderers/today.tsx                       |  9 ++--
 7 files changed, 48 insertions(+), 41 deletions(-)

diff --git a/src/commands/evolution.tsx b/src/commands/evolution.tsx
index 4eef95ccc..d2b7d59d1 100644
--- a/src/commands/evolution.tsx
+++ b/src/commands/evolution.tsx
@@ -20,7 +20,7 @@ import { AccountInfo } from '../types/accountInfo.js';
 
 export const evolutionCommand: CommandRegistry = {
   inProduction: true,
-  inDevelopment: true,
+  inDevelopment: false,
   inPublic: true,
 
   command: addStatTypeSubCommandGroups(
diff --git a/src/commands/today.tsx b/src/commands/today.tsx
index d2a166afd..613014928 100644
--- a/src/commands/today.tsx
+++ b/src/commands/today.tsx
@@ -14,7 +14,7 @@ import { AccountInfo } from '../types/accountInfo.js';
 
 export const todayCommand: CommandRegistry = {
   inProduction: true,
-  inDevelopment: false,
+  inDevelopment: true,
   inPublic: true,
 
   command: new SlashCommandBuilder()
diff --git a/src/components/Breakdown/components/Root.tsx b/src/components/Breakdown/components/Root.tsx
index e5d06bea7..9f40d82f9 100644
--- a/src/components/Breakdown/components/Root.tsx
+++ b/src/components/Breakdown/components/Root.tsx
@@ -6,7 +6,7 @@ export interface RootProps {
 
 export function Root({ children }: RootProps) {
   return (
-    <div style={{ display: 'flex', flexDirection: 'column', gap: 16 }}>
+    <div style={{ display: 'flex', flexDirection: 'column', gap: 8 }}>
       {children}
     </div>
   );
diff --git a/src/components/Breakdown/components/Row.tsx b/src/components/Breakdown/components/Row.tsx
index f5e6c8786..31c904724 100644
--- a/src/components/Breakdown/components/Row.tsx
+++ b/src/components/Breakdown/components/Row.tsx
@@ -1,4 +1,5 @@
 import getWN8Percentile from '../../../core/blitz/getWN8Percentile.js';
+import { theme } from '../../../stitches.config.js';
 import { RowDiscriminator } from './RowDiscriminator.js';
 import { RowStat } from './RowStat.js';
 
@@ -10,14 +11,16 @@ export interface RowProps {
   careerWN8?: number;
   damage: number;
   careerDamage: number;
-  survival: number;
-  careerSurvival: number;
   battles: number;
   careerBattles: number;
   icon?: string;
+  minimized: boolean;
+  isListing: boolean;
 }
 
 export function Row({
+  isListing,
+  minimized,
   name,
   winrate,
   careerWinrate,
@@ -25,44 +28,45 @@ export function Row({
   careerWN8,
   damage,
   careerDamage,
-  survival,
-  careerSurvival,
   battles,
   careerBattles,
   icon,
 }: RowProps) {
   return (
-    <div style={{ display: 'flex', gap: 16 }}>
-      <RowDiscriminator name={name} icon={icon} />
+    <div
+      style={{
+        display: 'flex',
+        borderRadius: 4,
+        backgroundColor: isListing
+          ? theme.colors.componentInteractive
+          : theme.colors.appBackground2,
+        padding: 8,
+      }}
+    >
+      <RowDiscriminator minimized={minimized} name={name} icon={icon} />
 
       <RowStat
-        name="Winrate"
+        minimized={minimized}
+        name={`Winrate • ${(careerWinrate * 100).toFixed(2)}%`}
         value={`${(winrate * 100).toFixed(2)}%`}
-        career={`${(careerWinrate * 100).toFixed(2)}%`}
         delta={winrate - careerWinrate}
       />
       <RowStat
-        name="WN8"
+        minimized={minimized}
+        name={`WN8 • ${careerWN8 === undefined ? '--' : careerWN8.toFixed(0)}`}
         value={WN8 === undefined ? '--' : WN8.toFixed(0)}
-        career={careerWN8 === undefined ? '--' : careerWN8.toFixed(0)}
         percentile={WN8 === undefined ? undefined : getWN8Percentile(WN8)}
       />
       <RowStat
-        name="Damage"
-        value={damage.toFixed(2)}
-        career={careerDamage.toFixed(2)}
+        minimized={minimized}
+        name={`Damage • ${careerDamage.toFixed(0)}`}
+        value={damage.toFixed(0)}
         delta={damage - careerDamage}
       />
       <RowStat
-        name="Survival"
-        value={`${(survival * 100).toFixed(2)}%`}
-        career={`${(careerSurvival * 100).toFixed(2)}%`}
-        delta={survival - careerSurvival}
-      />
-      <RowStat
-        name="Battles"
+        minimized={minimized}
+        name={`Battles • ${careerBattles.toFixed(0)}`}
         value={battles.toFixed(0)}
-        career={careerBattles.toFixed(0)}
       />
     </div>
   );
diff --git a/src/components/Breakdown/components/RowDiscriminator.tsx b/src/components/Breakdown/components/RowDiscriminator.tsx
index b4c9c8f2a..d70e6fa26 100644
--- a/src/components/Breakdown/components/RowDiscriminator.tsx
+++ b/src/components/Breakdown/components/RowDiscriminator.tsx
@@ -3,9 +3,14 @@ import { theme } from '../../../stitches.config.js';
 export interface RowDiscriminatorProps {
   name: string;
   icon?: string;
+  minimized: boolean;
 }
 
-export function RowDiscriminator({ name, icon }: RowDiscriminatorProps) {
+export function RowDiscriminator({
+  name,
+  icon,
+  minimized,
+}: RowDiscriminatorProps) {
   return (
     <div
       style={{
@@ -19,7 +24,7 @@ export function RowDiscriminator({ name, icon }: RowDiscriminatorProps) {
         justifyContent: 'center',
       }}
     >
-      {icon && (
+      {!minimized && icon && (
         <img
           src={icon}
           height={0}
diff --git a/src/components/Breakdown/components/RowStat.tsx b/src/components/Breakdown/components/RowStat.tsx
index 1466ba384..c4303b3ef 100644
--- a/src/components/Breakdown/components/RowStat.tsx
+++ b/src/components/Breakdown/components/RowStat.tsx
@@ -4,18 +4,18 @@ import PercentileIndicator from '../../PercentileIndicator.js';
 
 export interface RowStatProps {
   name: string;
-  value: string;
-  career: string;
+  value: string | number;
   delta?: number;
   percentile?: Percentile;
+  minimized?: boolean;
 }
 
 export function RowStat({
   name,
   value,
-  career,
   delta,
   percentile,
+  minimized,
 }: RowStatProps) {
   return (
     <div
@@ -28,10 +28,6 @@ export function RowStat({
         flex: 1,
       }}
     >
-      <span style={{ color: theme.colors.textLowContrast, fontSize: 12 }}>
-        {career}
-      </span>
-
       <div
         style={{
           display: 'flex',
@@ -58,16 +54,17 @@ export function RowStat({
           style={{
             color: theme.colors.textHighContrast,
             fontSize: 16,
-            fontWeight: 'bold',
           }}
         >
           {value}
         </span>
       </div>
 
-      <span style={{ color: theme.colors.textLowContrast, fontSize: 12 }}>
-        {name}
-      </span>
+      {!minimized && (
+        <span style={{ color: theme.colors.textLowContrast, fontSize: 12 }}>
+          {name}
+        </span>
+      )}
     </div>
   );
 }
diff --git a/src/renderers/today.tsx b/src/renderers/today.tsx
index 5b3369714..e36dbbce6 100644
--- a/src/renderers/today.tsx
+++ b/src/renderers/today.tsx
@@ -20,6 +20,7 @@ import { AccountInfo, AllStats } from '../types/accountInfo.js';
 import { PlayerClanData } from '../types/playerClanData.js';
 import { PossiblyPromise } from '../types/possiblyPromise.js';
 
+// TODO: sort tanks by last played
 export default async function today({ server, id }: ResolvedPlayer) {
   const tankStatsOverTime = await getTankStatsDiffed(
     server,
@@ -110,12 +111,14 @@ export default async function today({ server, id }: ResolvedPlayer) {
     );
 
   const rows = await Promise.all(
-    tankStatsOverTimeEntries.map(async ([tankIdString, tankStats]) => {
-      const tankId = Number(tankIdString);
+    tankStatsOverTimeEntries.map(async ([tankIdString, tankStats], index) => {
+      const tankId = parseInt(tankIdString);
       const career = careerStats[tankId];
 
       return (
         <Breakdown.Row
+          isListing={tankId !== 0}
+          minimized={index > 4}
           key={tankId}
           name={
             tankId === 0 ? 'Total' : await resolveTankName(Number(tankIdString))
@@ -126,8 +129,6 @@ export default async function today({ server, id }: ResolvedPlayer) {
           careerWN8={isNaN(careerWN8s[tankId]) ? undefined : careerWN8s[tankId]}
           damage={tankStats.damage_dealt / tankStats.battles}
           careerDamage={career.damage_dealt / career.battles}
-          survival={tankStats.survived_battles / tankStats.battles}
-          careerSurvival={career.survived_battles / career.battles}
           battles={tankStats.battles}
           careerBattles={career.battles}
           icon={