Bugged Array

7Cav · Sep 11, 2023 · 5112564 · 5112564
1 parent 92fab35
commit 5112564
Show file tree

Hide file tree

Showing 6 changed files with 283 additions and 49 deletions.
diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -6,11 +6,12 @@
     "@testing-library/jest-dom": "^5.16.1",
     "@testing-library/react": "^12.1.2",
     "@testing-library/user-event": "^13.5.0",
+    "apexcharts": "^3.42.0",
     "express": "^4.17.2",
     "react": "^17.0.2",
+    "react-apexcharts": "^1.4.1",
     "react-collapsible": "^2.8.4",
     "react-dom": "^17.0.2",
-    "react-minimal-pie-chart": "^8.4.0",
     "react-scripts": "5.0.0",
     "web-vitals": "^2.1.4"
   },

diff --git a/client/src/App.js b/client/src/App.js
@@ -1,11 +1,11 @@
-import React, { useEffect, useState } from "react";
+import React, { useEffect, useState} from "react";
 import "./App.css";
 import Collapsible from "react-collapsible";
 import lists from "./modules/Generic/BilletBank";
 import MilpacParse from "./modules/Generic/MilpacParse";
 import StrengthCount from "./modules/Generic/StrengthCount";
 import ErrorMessage from "./errorMessage";
-import { PieChart } from 'react-minimal-pie-chart';
+import Piechart from "./modules/Generic/Piechart"
 const CLIENT_TOKEN = process.env.REACT_APP_CLIENT_TOKEN;
 const combatApiUrl = process.env.REACT_APP_COMBAT_API_URL;
 const reserveApiUrl = process.env.REACT_APP_RESERVE_API_URL;
@@ -77,8 +77,6 @@ function MilpacRequest() {
 
   var piechartArray = [];
 
-  var testnumber = 500
-
   var milpacArray = [];
   milpacArray.push({
     combat: milpacList,
@@ -510,15 +508,15 @@ function MilpacRequest() {
                     subSubtitle={"Charlie Co"}
                   />
                 </div>
-                <div className="OneSevenBreakdown">
-                <PieChart
-                 data={[
-                    { title: 'One', value: 2, color: '#E38627' },
-                    { title: 'Two', value: 3, color: '#C13C37' },
-                    { title: 'Three', value: 3, color: '#6A2135' },
-                  ]}
-                />
-                </div>
+                 {/*<div className="OneSevenBreakdown">
+                  <Piechart
+                  piechartArray = {piechartArray}
+                  useSelector0={false}
+                  useSelector2={true}
+                  useSelector4={true}
+                  useSelector6={true}
+                  />
+                  </div> */}
                 <div className="TwoSevenStrength">
                   <StrengthCount
                     piechartArray={piechartArray}