Merge branch 'main' of https://github.com/GSA/notifications-admin into 1484-dashboard-visualizations

# Conflicts:
#	app/main/views/dashboard.py
#	app/templates/views/dashboard/dashboard.html
#	package-lock.json
#	package.json
This commit is contained in:
Jonathan Bobel
2024-07-04 13:07:35 -04:00
22 changed files with 298 additions and 257 deletions

View File

@@ -25,27 +25,26 @@
"graceful-fs": "^4.2.11"
},
"dependencies": {
"@uswds/uswds": "^3.4.1",
"@uswds/uswds": "^3.8.1",
"cbor-js": "0.1.0",
"chart.js": "^4.4.2",
"chart.js": "^4.4.3",
"d3": "^7.9.0",
"govuk_frontend_toolkit": "8.1.0",
"govuk-frontend": "2.13.0",
"hogan": "1.0.2",
"jquery": "3.7.1",
"morphdom": "2.6.1",
"morphdom": "2.7.2",
"python": "^0.0.4",
"query-command-supported": "1.0.0",
"sass-embedded": "^1.69.5",
"sass-embedded": "^1.77.5",
"socket.io-client": "^4.2.0",
"textarea-caret": "3.1.0",
"timeago": "1.6.7"
},
"devDependencies": {
"@babel/core": "^7.24.7",
"@babel/preset-env": "^7.24.7",
"@babel/core": "7.24.7",
"@babel/preset-env": "7.24.7",
"@uswds/compile": "^1.1.0",
"babel-jest": "^29.7.0",
"better-npm-audit": "^3.7.3",
"gulp": "^4.0.2",
"gulp-add-src": "^1.0.0",
@@ -53,15 +52,14 @@
"gulp-better-rollup": "4.0.1",
"gulp-clean-css": "4.3.0",
"gulp-concat": "2.6.1",
"gulp-css-url-adjuster": "0.2.3",
"gulp-include": "2.4.1",
"gulp-jshint": "2.1.0",
"gulp-prettyerror": "2.0.0",
"gulp-uglify": "3.0.2",
"jest": "^29.7.0",
"jest": "29.7.0",
"jest-each": "^29.2.1",
"jest-environment-jsdom": "^29.2.2",
"jshint": "2.13.5",
"jshint": "2.13.6",
"jshint-stylish": "2.2.1",
"rollup": "1.32.1",
"rollup-plugin-commonjs": "10.1.0",