Merge remote-tracking branch 'origin/summary-stats' into feat/chart-e…

…nhancements
districtr · Nov 16, 2024 · e2ece7e · e2ece7e
2 parents c5eacec + e707a66
commit e2ece7e
Show file tree

Hide file tree

Showing 31 changed files with 1,437 additions and 160 deletions.
diff --git a/app/package-lock.json b/app/package-lock.json
diff --git a/app/package.json b/app/package.json
@@ -21,6 +21,7 @@
     "@turf/bbox": "^7.1.0",
     "@turf/helpers": "^7.1.0",
     "axios": "^1.7.2",
+    "d3-scale-chromatic": "^3.1.0",
     "idb-keyval": "^6.2.1",
     "lodash": "^4.17.21",
     "maplibre-gl": "^4.4.1",
@@ -37,6 +38,7 @@
     "@flydotio/dockerfile": "^0.5.8",
     "@testing-library/jest-dom": "^6.4.6",
     "@testing-library/react": "^16.0.0",
+    "@types/d3-scale-chromatic": "^3.0.3",
     "@types/lodash": "^4.17.5",
     "@types/node": "^20",
     "@types/react": "^18",
@@ -50,4 +52,4 @@
     "tailwindcss": "^3.4.1",
     "typescript": "^5"
   }
-}
+}
diff --git a/app/src/app/components/sidebar/DataPanels.tsx b/app/src/app/components/sidebar/DataPanels.tsx
@@ -1,11 +1,7 @@
-import {Box, Flex, Heading} from '@radix-ui/themes';
-import {MapModeSelector} from './MapModeSelector';
-import {ColorPicker} from './ColorPicker';
-import {ResetMapButton} from './ResetMapButton';
-import {GerryDBViewSelector} from './GerryDBViewSelector';
+import {Box} from '@radix-ui/themes';
+import Evaluation from '@components/sidebar/Evaluation';
 import {HorizontalBar} from './charts/HorizontalBarChart';
-import {useMapStore} from '@/app/store/mapStore';
-import {Tabs, Text} from '@radix-ui/themes';
+import {Tabs} from '@radix-ui/themes';
 import Layers from './Layers';
 import React from 'react';
 
@@ -35,7 +31,7 @@ const defaultPanels: DataPanelSpec[] = [
   {
     title: 'evaluation',
     label: 'Evaluation',
-    content: <Text size="2"> Unimplemented </Text>,
+    content: <Evaluation />,
   },
 ];