Skip to content

Commit 3b325e5

Browse files
Merged with development
1 parent 47d1773 commit 3b325e5

4 files changed

Lines changed: 80 additions & 338 deletions

File tree

package-lock.json

Lines changed: 64 additions & 29 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
"dependencies": {
1010
"@babel/runtime": "^7.27.6",
1111
"@babel/runtime-corejs3": "^7.27.6",
12-
"@changey/react-leaflet-markercluster": "^4.0.0-rc1",
1312
"@date-io/dayjs": "^3.2.0",
1413
"@emotion/react": "^11.8.1",
1514
"@emotion/styled": "^11.14.0",
@@ -72,6 +71,7 @@
7271
"rc-slider": "^11.1.8",
7372
"react": "^18.3.1",
7473
"react-autosuggest": "^10.1.0",
74+
"react-beautiful-dnd": "^13.1.1",
7575
"react-bootstrap": "^1.0.1",
7676
"react-chartjs-2": "^5.3.0",
7777
"react-circular-progressbar": "^2.1.0",
@@ -81,13 +81,14 @@
8181
"react-dom": "^18.3.1",
8282
"react-icons": "^4.12.0",
8383
"react-leaflet": "4.2.1",
84+
"react-leaflet-cluster": "^3.1.1",
8485
"react-multi-select-component": "^4.0.2",
8586
"react-phone-input-2": "^2.14.0",
8687
"react-redux": "^7.2.0",
8788
"react-router": "^5.3.4",
8889
"react-router-dom": "^5.2.0",
8990
"react-router-hash-link": "^2.3.1",
90-
"react-select": "^5.7.2",
91+
"react-select": "^5.10.1",
9192
"react-spinners": "^0.15.0",
9293
"react-sticky": "^6.0.3",
9394
"react-table": "^7.8.0",
@@ -105,6 +106,7 @@
105106
"redux-concatenate-reducers": "^1.0.0",
106107
"redux-persist": "^5.10.0",
107108
"redux-thunk": "^2.4.2",
109+
"reselect": "^5.1.1",
108110
"semver": "^7.7.2",
109111
"stream-browserify": "^3.0.0",
110112
"tinymce": "^7.2.0",

src/components/Reports/Reports.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,7 @@ class ReportsPage extends Component {
544544
</div>
545545
</h2>
546546
<div>
547-
<p className={textColor}>Select a Category</p>
547+
<p >Select a Category</p>
548548
</div>
549549
<div className='report-container-data'>
550550
<div className='data-container' style={this.state.showCharts ? {width: '50%'} : {width: '100%'}}>

0 commit comments

Comments
 (0)