Merge pull request #375 from MethSarcus/develop

Bumped versions fixed charts
MethSarcus · Sep 4, 2024 · 7b55933 · 7b55933
2 parents c3b61cb + 2f536d4
commit 7b55933
Show file tree

Hide file tree

Showing 10 changed files with 7,990 additions and 5,288 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -9,7 +9,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [16.x]
+        node-version: [20.x]
 
     steps:
       - uses: actions/checkout@v3

diff --git a/app/league/[slug]/ranks/page.tsx b/app/league/[slug]/ranks/page.tsx
@@ -2,7 +2,6 @@
 import {Box, Grid, GridItem, Heading, Skeleton} from '@chakra-ui/react'
 import React from 'react'
 import {useContext, useState} from 'react'
-import WeeklyRankingBumpChart from '../../../../components/charts/BumpChart'
 import MemberSkillScatterPlot from '../../../../components/charts/MemberSkillScatterPlot'
 import PowerRankingBumpChart from '../../../../components/charts/PowerRankingBumpChart'
 import AllPlayRankGroup from '../../../../components/groups/AllPlayRankGroup'

diff --git a/components/charts/BumpChart.tsx b/components/charts/BumpChart.tsx
diff --git a/components/charts/MemberSkillScatterPlot.tsx b/components/charts/MemberSkillScatterPlot.tsx
@@ -91,7 +91,8 @@ export default function MemberSkillScatterPlot (props: MyProps) {
 	}
 	const theme = {
 		background: isLargerThan800 ? project_colors.surface[1] : "",
-		textColor: 'white',
+		text: {fill: project_colors.textTheme.highEmphasis},
+
 	}
 
 	if (data.length <= 0) return <Spinner />

diff --git a/components/charts/bar/DraftValueBarChart.tsx b/components/charts/bar/DraftValueBarChart.tsx
@@ -15,7 +15,7 @@ interface MyProps {
 
 const theme = {
 	background: 'none',
-	textColor: 'white',
+	text: {fill: project_colors.textTheme.highEmphasis}
 }
 
 const DraftValueBarChart = (props: MyProps) => {

diff --git a/components/charts/line/LineChart.tsx b/components/charts/line/LineChart.tsx
@@ -14,7 +14,7 @@ const LeagueWeeklyPointsLineChart = (props: MyProps) => {
 	let data = formatScoresForLineChart(props.league, isOnMobile) as any
 	const theme = {
 		background: isOnMobile ? undefined : project_colors.surface[1],
-		textColor: 'white',
+		text: {fill: project_colors.textTheme.highEmphasis},
 	}
 
   const desktopMargin = {top: 20, right: 170, bottom: 50, left: 60}

diff --git a/components/charts/team_charts/RosterPlayerTrendingLineChart.tsx b/components/charts/team_charts/RosterPlayerTrendingLineChart.tsx
@@ -21,7 +21,7 @@ const RosterPlayerTrendingLineChart = (props: MyProps) => {
 	if (!props.player || !props.league || !playerScores) return <Spinner />
 	let data = formatScoresForLineChart(props.player, props.league, playerScores, playerDetails) as any
 	const theme = {
-		textColor: 'white',
+		text: {fill: project_colors.textTheme.highEmphasis},
 	}
 
 	if (data.length <= 0) return <Spinner />

diff --git a/components/groups/stats/WeeklyTeamStatGroup.tsx b/components/groups/stats/WeeklyTeamStatGroup.tsx
@@ -3,7 +3,9 @@ import {HStack} from '@chakra-ui/react'
 import League from '../../../classes/custom/League'
 import Matchup from '../../../classes/custom/Matchup'
 import {OrdinalStatInfo} from '../../../classes/custom/OrdinalStatInfo'
+import GenericStatCard from '../../cards/statcards/GenericStatCard'
 import NotableMatchupStatCard from '../../cards/statcards/NotableMatchupStatCard'
+import TeamPersonalStatCard from '../../cards/statcards/TeamPersonalStatCard'
 
 interface MyProps {
 	league?: League