Merge pull request #18 from GridProtectionAlliance/TDAP-27

Tdap 27
GridProtectionAlliance · Jul 12, 2024 · 029873b · 029873b
2 parents ecb78b6 + 270e698
commit 029873b
Show file tree

Hide file tree

Showing 4 changed files with 354 additions and 9 deletions.
diff --git a/TrenDAP/package.json b/TrenDAP/package.json
@@ -7,13 +7,15 @@
   "scripts": {
     "build": "npm prune && npm install && webpack --mode=development",
     "watch": "webpack --watch --color --mode=development",
-    "update": "npx npm-check-updates"
+    "update": "npx npm-check-updates",
+    "lint": "eslint . --ext .ts,.tsx"
   },
   "author": "Grid Protection Alliance",
   "license": "MIT",
   "devDependencies": {
     "@types/d3": "7.1.0",
     "@types/jquery": "3.5.14",
+    "@types/leaflet": "^1.9.12",
     "@types/lodash": "4.14.179",
     "@types/moment": "2.13.0",
     "@types/node": "17.0.21",
@@ -26,6 +28,7 @@
     "css-loader": "6.7.1",
     "css-modules-typescript-loader": "4.0.1",
     "esbuild-loader": "2.18.0",
+    "eslint": "^8.57.0",
     "fork-ts-checker-webpack-plugin": "7.2.1",
     "html-webpack-plugin": "5.5.0",
     "mini-css-extract-plugin": "2.6.0",
@@ -56,12 +59,16 @@
     "@gpa-gemstone/react-interactive": "1.0.118",
     "@gpa-gemstone/react-table": "1.2.44",
     "@reduxjs/toolkit": "1.8.3",
+    "@typescript-eslint/eslint-plugin": "^7.13.0",
+    "@typescript-eslint/parser": "^7.13.0",
     "bootstrap": "4.6.1",
     "bootstrap-switch-button-react": "1.2.0",
     "d3": "7.3.0",
     "history": "5.3.0",
     "inline-source-map": "0.6.2",
     "jquery": "3.6.0",
+    "leaflet": "^1.9.4",
+    "leaflet-heatmap": "^1.0.0",
     "lodash": "4.17.21",
     "moment": "2.29.1",
     "moment-timezone": "0.5.34",

diff --git a/TrenDAP/webpack.config.js b/TrenDAP/webpack.config.js
@@ -29,6 +29,7 @@ module.exports = env => {
             // Add '.ts' and '.tsx' as resolvable extensions.
             extensions: [".webpack.js", ".web.js", ".ts", ".tsx", ".js", ".css"],
             alias: {
+                leaflet_css: __dirname + "/node_modules/leaflet/dist/leaflet.css"
             }
         },
         module: {
@@ -41,7 +42,7 @@ module.exports = env => {
                         { loader: "sass-loader" },  // to convert SASS to CSS
                         // NOTE: The first build after adding/removing/renaming CSS classes fails, since the newly generated .d.ts typescript module is picked up only later
                     ]
-                }, 
+                },
 
                 // All files with a '.ts' or '.tsx' extension will be handled by 'ts-loader'.
                 {
@@ -54,7 +55,7 @@ module.exports = env => {
                     include: /\./,
                     use: ['style-loader', 'css-loader'],
                 },
-                { test: /\.(woff|woff2|ttf|eot|svg|png|gif)(\?v=[0-9]\.[0-9]\.[0-9])?$/, loader: "url-loader", options: {limit: 100000} },
+                { test: /\.(woff|woff2|ttf|eot|svg|png|gif)(\?v=[0-9]\.[0-9]\.[0-9])?$/, loader: "url-loader", options: { limit: 100000 } },
 
             ]
         },