Add maps sumary (#131)

* Adds all the maps as well as summary of the current match

* WIP Summary cards and maps data

* Finish the code changes

* Remove unnecessary thins

* Remove unnecessary thins

* Rollback typescript

* Update the installation stuff

* Fix the lock file

* Add install timeout also to windows

.github/workflows/build-cache.yaml

@@ -35,7 +35,7 @@ jobs:
             ${{ runner.os }}-build-${{ env.cache-name }}-
 
       - name: Yarn install
-        run: yarn --prefer-offline --frozen-lockfile install
+        run: yarn --prefer-offline --frozen-lockfile --network-timeout 1000000 install
       - name: Check JS build
         run: yarn build
 

.github/workflows/publish.yaml

@@ -34,7 +34,7 @@ jobs:
                 workspaces: './src-tauri -> target'
 
             - name: Yarn install FE dependencies
-              run: yarn --prefer-offline --frozen-lockfile install
+              run: yarn --prefer-offline --frozen-lockfile --network-timeout 1000000 install
 
             - name: Build it
               run: yarn build

.github/workflows/tests.yaml

@@ -29,15 +29,15 @@ jobs:
             ${{ runner.os }}-build-${{ env.cache-name }}-
 
       - name: Yarn install
-        run: yarn --prefer-offline --frozen-lockfile install
+        run: yarn --prefer-offline --frozen-lockfile --network-timeout 1000000 install
       - name: Check JS build
         run: yarn build
       - name: Run prettier
         run: |
           yarn lint:prettier
 
   test-tauri:
-    name: Test Tauri build    
+    name: Test Tauri build
     runs-on: windows-latest
 
     concurrency:
@@ -66,7 +66,7 @@ jobs:
       #   shell: pwsh
       #   # See here: https://developer.microsoft.com/en-us/microsoft-edge/webview2/
       #    # https://github.com/actions/runner-images/issues/9538
-      #   run: |          
+      #   run: |
       #     Invoke-WebRequest -Uri 'https://go.microsoft.com/fwlink/p/?LinkId=2124703' -OutFile 'setup.exe'
       #     Start-Process -FilePath setup.exe -Verb RunAs -Wait
 
@@ -79,7 +79,7 @@ jobs:
           workspaces: './src-tauri -> target'
 
       - name: Yarn install FE dependencies
-        run: yarn --prefer-offline --frozen-lockfile install
+        run: yarn --prefer-offline --frozen-lockfile --network-timeout 1000000 install
 
       - name: Build tauri App
         uses: tauri-apps/tauri-action@v0

package.json

@@ -19,7 +19,8 @@
     "tauri": "tauri",
     "prepare": "husky",
     "test:e2e": "wdio run wdio.conf.cjs",
-    "test:be": "cd src-tauri && cargo test --package coh3-stats-desktop-app --lib"
+    "test:be": "cd src-tauri && cargo test --package coh3-stats-desktop-app --lib",
+    "reinstall": "rm -rf node_modules && rm -fr dist && rm -fr src-tauri/target && yarn install"
   },
   "lint-staged": {
     "*.{js,ts,jsx,tsx,yml,css}": [
@@ -31,27 +32,27 @@
   },
   "dependencies": {
     "@emotion/react": "11.11.4",
-    "@mantine/core": "7.8.0",
-    "@mantine/hooks": "7.8.0",
-    "@mantine/notifications": "7.8.0",
+    "@mantine/core": "7.11.2",
+    "@mantine/hooks": "7.11.2",
+    "@mantine/notifications": "7.11.2",
     "@sentry/react": "7.118.0",
-    "@tabler/icons-react": "3.10.0",
+    "@tabler/icons-react": "3.11.0",
     "@tauri-apps/api": "1.5.6",
-    "axios": "1.6.8",
+    "axios": "1.7.2",
     "coh-stats-components": "github:cohstats/coh-stats-components#0.0.7",
     "coh3-data-types-library": "github:cohstats/coh3-data-types-library#0.0.2",
-    "mixpanel-browser": "2.49.0",
+    "mixpanel-browser": "2.54.1",
     "react": "18.3.1",
     "react-dom": "18.3.1",
-    "react-router-dom": "6.23.0",
+    "react-router-dom": "6.26.0",
     "tauri-plugin-fs-watch-api": "https://github.com/tauri-apps/tauri-plugin-fs-watch",
     "tauri-plugin-log-api": "https://github.com/tauri-apps/tauri-plugin-log",
     "tauri-plugin-store-api": "https://github.com/tauri-apps/tauri-plugin-store"
   },
   "devDependencies": {
     "@tauri-apps/cli": "1.5.14",
     "@types/mixpanel-browser": "2.49.0",
-    "@types/node": "^20.11.30",
+    "@types/node": "^20.14.13",
     "@types/react": "18.3.3",
     "@types/react-dom": "18.3.0",
     "@vitejs/plugin-react": "4.2.1",
@@ -61,11 +62,11 @@
     "@wdio/spec-reporter": "^7",
     "husky": "9.0.11",
     "lint-staged": "15.2.7",
-    "postcss": "8.4.38",
-    "postcss-preset-mantine": "1.14.4",
+    "postcss": "8.4.40",
+    "postcss-preset-mantine": "1.17.0",
     "postcss-simple-vars": "7.0.1",
-    "prettier": "3.2.5",
-    "typescript": "5.4.5",
+    "prettier": "3.3.3",
+    "typescript": "5.5.4",
     "vite": "5.2.11"
   }
 }

src-tauri/src/parse_log_file.rs

@@ -313,7 +313,8 @@ fn get_team_data(players: Vec<PlayerData>) -> TeamData {
     let mut mixed = false;
     let mut last = TeamSide::Mixed;
     for player in &players {
-        if player.faction == "german" || player.faction == "west_german" {
+        // For some reason the logs now produce faction as germans instead of german
+        if  player.faction == "germans" || player.faction == "german" || player.faction == "west_german" {
             if last == TeamSide::Allies {
                 mixed = true;
                 break;

src/Providers.tsx

@@ -1,6 +1,7 @@
 import { MantineProvider, localStorageColorSchemeManager } from "@mantine/core"
 import { GameDataProvider } from "./game-data-provider/GameDataProvider"
 import { Notifications } from "@mantine/notifications"
+import { MapStatsProvider } from "./map-stats-provider"
 
 interface ProvidersProps {
   children?: React.ReactNode
@@ -21,7 +22,9 @@ export const Providers: React.FC<ProvidersProps> = ({ children }) => {
         // withNormalizeCSS
       >
         <Notifications />
-        <GameDataProvider>{children}</GameDataProvider>
+        <MapStatsProvider>
+          <GameDataProvider>{children}</GameDataProvider>
+        </MapStatsProvider>
       </MantineProvider>
     </>
   )

src/components/MapCard.tsx

@@ -1,10 +1,13 @@
-import { Card, Title, Image, Space, Center, Flex } from "@mantine/core"
-import { getMapName, getMapUrl } from "../utils/utils"
-import { GameData, MapViewSettings } from "../game-data-provider/GameData"
+import { Card, Title, Image, Paper } from "@mantine/core"
+import { getMapName, getMapsUrlOnCDN } from "../utils/utils"
+import {
+  GameDataTypes,
+  MapViewSettings,
+} from "../game-data-provider/GameData-types"
 import { useMapViewSettings } from "../game-data-provider/configValues"
 
 interface MapCardProps {
-  gameData: GameData
+  gameData: GameDataTypes
 }
 
 const MapCard: React.FC<MapCardProps> = ({ gameData }) => {
@@ -13,25 +16,24 @@ const MapCard: React.FC<MapCardProps> = ({ gameData }) => {
   if (!gameData) return null
 
   return (
-    <Card padding={"md"} w="300" h="320" withBorder shadow="xs">
-      <Title order={4}>Map - {getMapName(gameData.gameData.map)}</Title>
-      <Card.Section w="280" h="280" p="xs">
-        <Image
-          p="xs"
-          w="auto"
-          h="100%"
-          fit="contain"
-          fallbackSrc={
-            getMapUrl(gameData.gameData.map, "none") || "icons/placeholder.svg"
-          }
-          src={getMapUrl(
-            gameData.gameData.map,
-            mapViewSettings as MapViewSettings
-          )}
-          alt="Map"
-        />
-      </Card.Section>
-    </Card>
+    <Paper pl={"xs"} w="auto" h="320">
+      <Title order={3}>Map - {getMapName(gameData.gameData.map)}</Title>
+      <Image
+        p="xs"
+        w="auto"
+        h="270"
+        // fit="contain"
+        fallbackSrc={
+          getMapsUrlOnCDN(gameData.gameData.map, "none") ||
+          "icons/placeholder.svg"
+        }
+        src={getMapsUrlOnCDN(
+          gameData.gameData.map,
+          mapViewSettings as MapViewSettings
+        )}
+        alt={gameData.gameData.map}
+      />
+    </Paper>
   )
 }
 

src/components/PlayerCard.tsx

@@ -9,7 +9,7 @@ import {
   Grid,
 } from "@mantine/core"
 import React from "react"
-import { FullPlayerData } from "../game-data-provider/GameData"
+import { FullPlayerData } from "../game-data-provider/GameData-types"
 import { PlayerELO } from "./PlayerELO"
 import { PlayerLosses } from "./PlayerLosses"
 import { PlayerRank } from "./PlayerRank"
@@ -54,15 +54,15 @@ export const PlayerCard: React.FC<PlayerCardProps> = ({
             </Tooltip>
           </Grid.Col>
           <Grid.Col span="auto">
-            <Stack align="stretch">
+            <Stack align="stretch" gap={"xs"}>
               <Group justify={"space-between"}>
                 <Group>
                   {!ai ? (
                     <Tooltip label={countryName}>
                       <Image
                         src={"/flags/4x3/" + country + ".svg"}
                         alt={country}
-                        w={35}
+                        w={30}
                       />
                     </Tooltip>
                   ) : null}