Merge branch 'DEAR-98-happiness-data' into DEAR-130-Add-Chart-to-disp…

…lay-Happiness-by-Workkind-during-Sprint # Conflicts: # app/(main)/insights/components/HappinessLineChart.tsx # app/(main)/insights/page.tsx
24FSIIT16 · Jul 29, 2024 · d540995 · d540995
2 parents 22e03e3 + b026ed9
commit d540995
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/app/(main)/insights/components/HappinessLineChart.tsx b/app/(main)/insights/components/HappinessLineChart.tsx
@@ -61,7 +61,7 @@ const HappinessLineChart: React.FC<HappinessInsightProps> = ({ happinessInsights
         >
           <XAxis
             dataKey="day"
-            tickLine={false}
+            tickLine
             axisLine={false}
             tickMargin={13}
             tickFormatter={formatXAxis}

diff --git a/app/(main)/insights/page.tsx b/app/(main)/insights/page.tsx
@@ -21,10 +21,9 @@ import Loading from '@components/Loading/Loading';
 import { Button } from '@components/ui/Buttons/Button';
 import { FileBarChart2, Printer } from 'lucide-react';
 import convertToCSV from '@/(main)/insights/utils/downloadCSV';
+import WorkkindRadarChart from '@/(main)/insights/components/WorkkindRadarChart';
 import WorkkindBarChart from './components/WorkkindBarChart';
 import HappinessLineChart from './components/HappinessLineChart';
-import WorkkindRadarChart from '@/(main)/insights/components/WorkkindRadarChart';
-import DaysTrackedRadialChart from '@/(main)/insights/components/DaysTrackedRadialChart';
 
 export interface Sprint {
   id: number;