format: address linting issues

pennlabs · Jan 28, 2024 · a471c98 · a471c98
1 parent c97c8aa
commit a471c98
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 12 deletions.
diff --git a/frontend/components/analytics/AnalyticsCard.tsx b/frontend/components/analytics/AnalyticsCard.tsx
@@ -163,8 +163,8 @@ const AnalyticsCardContent = ({
     total += x.vote_count
   })
   const targetPopulationsData = data?.poll_statistics || []
-  const schoolVotes = {}
-  const yearVotes = {}
+  const schoolVotes: { [key: string]: number } = {}
+  const yearVotes: { [key: string]: number } = {}
 
   targetPopulationsData.forEach((item) => {
     if (item.breakdown && item.breakdown.SCHOOL) {
@@ -179,7 +179,7 @@ const AnalyticsCardContent = ({
     }
     if (item.breakdown && item.breakdown.YEAR) {
       const years = item.breakdown.YEAR
-      Object.keys(year).forEach((year) => {
+      Object.keys(years).forEach((year) => {
         if (yearVotes[year]) {
           yearVotes[year] += years[year]
         } else {
@@ -204,7 +204,7 @@ const AnalyticsCardContent = ({
             display: 'flex',
             justifyContent: 'center',
             fontSize: '1rem',
-            fontWeight: '500',
+            fontWeight: 500,
           }}
         >
           Coming Soon!

diff --git a/frontend/components/analytics/PieChartComponent.tsx b/frontend/components/analytics/PieChartComponent.tsx
@@ -10,7 +10,17 @@ const PieChartNumberWrapper = s.div`
   margin-bottom: 5px;
 `
 
-const SimplePieChart = ({ schoolData, yearData, mode, uniqueVotes }) => {
+const SimplePieChart = ({
+  schoolData,
+  yearData,
+  mode,
+  uniqueVotes,
+}: {
+  schoolData: { [key: string]: number }
+  yearData: { [key: string]: number }
+  mode: string
+  uniqueVotes: number
+}) => {
   const dataToUse = mode === 'school' ? schoolData : yearData
   const COLORS = mode === 'school' ? SCHOOL_COLORS : YEAR_COLORS
   const formattedData = Object.keys(dataToUse).map((school) => ({
@@ -46,10 +56,12 @@ const SimplePieChart = ({ schoolData, yearData, mode, uniqueVotes }) => {
           outerRadius={125}
           innerRadius={60}
         >
-          {formattedData.map((entry: string, index: number) => {
+          {formattedData.map(({ name, value }) => {
             return (
-              // eslint-disable-next-line react/no-array-index-key
-              <Cell key={`cell-${index}`} fill={COLORS[entry.name]} />
+              <Cell
+                key={`cell-${value}`}
+                fill={COLORS[name as keyof typeof COLORS]}
+              />
             )
           })}
         </Pie>

diff --git a/frontend/components/analytics/VotesBreakdownComponent.tsx b/frontend/components/analytics/VotesBreakdownComponent.tsx
@@ -5,6 +5,10 @@ export default function VotesBreakdownComponent({
   schoolData,
   yearData,
   mode,
+}: {
+  schoolData: { [key: string]: number }
+  yearData: { [key: string]: number }
+  mode: string
 }) {
   const schoolNames = Object.keys(schoolData)
   const yearNames = Object.keys(yearData)
@@ -28,10 +32,18 @@ export default function VotesBreakdownComponent({
     <div>
       {mode === 'school'
         ? schoolNames.map((name: string) => (
-            <Row color={SCHOOL_COLORS[name]} text={name} key={name} />
+            <Row
+              color={SCHOOL_COLORS[name as keyof typeof SCHOOL_COLORS]}
+              text={name}
+              key={name}
+            />
           ))
         : yearNames.map((name: string) => (
-            <Row color={YEAR_COLORS[name]} text={name} key={name} />
+            <Row
+              color={YEAR_COLORS[name as keyof typeof YEAR_COLORS]}
+              text={name}
+              key={name}
+            />
           ))}
     </div>
   )

diff --git a/frontend/hooks/useAnalytics.ts b/frontend/hooks/useAnalytics.ts
@@ -3,13 +3,18 @@ import { useEffect, useState } from 'react'
 import { doApiRequest } from '@/utils/fetch'
 
 interface OptionStatsType {
-  breakdown: { [key: string]: number }
+  breakdown: { [key: string]: { [key: string]: number } }
   option: string
 }
 
+interface TimeSeriesDataType {
+  date: string
+  votes: number
+}
+
 interface AnalyticsDataType {
   poll_statistics: OptionStatsType[]
-  time_series: number[]
+  time_series: TimeSeriesDataType[]
 }
 
 interface OptionDataType {