Merge pull request #4 from dragoknite/merge/dev-to-main

Merge dev to main
dragoknite · Jul 12, 2023 · 1dfb7a7 · 1dfb7a7
2 parents 59e1319 + c797630
commit 1dfb7a7
Show file tree

Hide file tree

Showing 7 changed files with 1,041 additions and 271 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -13,9 +13,12 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "chart.js": "^4.3.0",
     "express": "^4.18.2",
     "react": "^18.2.0",
+    "react-chartjs-2": "^5.2.0",
     "react-dom": "^18.2.0",
+    "styled-components": "^6.0.3",
     "ts-node": "^10.9.1"
   },
   "devDependencies": {
@@ -28,6 +31,7 @@
     "@types/react-dom": "^18.2.6",
     "babel": "^6.23.0",
     "babel-loader": "^9.1.3",
+    "chartjs-plugin-gradient": "^0.6.1",
     "copy-webpack-plugin": "^11.0.0",
     "html-webpack-plugin": "^5.5.3",
     "jest": "^29.6.1",

diff --git a/src/backend/server.ts b/src/backend/server.ts
@@ -6,7 +6,6 @@ import express, {
 } from 'express';
 const app = express();
 const PORT = 3000;
-const path = require('path');
 
 // parse incoming JSON
 app.use(express.json());
@@ -15,10 +14,6 @@ app.get('/', (req: Request, res: Response) => {
   res.send('Testing Hello, World Testing');
 });
 
-app.get('/test001', (req: Request, res: Response) => {
-  res.sendFile(path.join(__dirname, '../frontend/index.html'));
-});
-
 // global error middleware
 const errorHandler: ErrorRequestHandler = (
   err: Error,