darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2025-12-09 14:45:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1544-data-viz-total-message-allowance' into 1484-dashboard-visualizations

Browse Source 
# Conflicts:
#	app/assets/sass/uswds/_data-visualization.scss
#	app/assets/sass/uswds/styles.scss
#	app/templates/views/dashboard/dashboard.html
#	app/templates/views/dashboard/template-statistics.html
#	gulpfile.js
#	package-lock.json
This commit is contained in:
Jonathan Bobel
2024-07-17 11:23:53 -04:00
parent d301502957 7f288598ba
commit ba2b5fea37
15 changed files with 935 additions and 1127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gulpfile.js
View File

@@ -101,7 +101,6 @@ const javascripts = () => {
paths.npm + 'textarea-caret/index.js',
paths.npm + 'cbor-js/cbor.js',
paths.npm + 'socket.io-client/dist/socket.io.min.js',
paths.npm + 'chart.js/dist/chart.umd.js',
paths.npm + 'd3/dist/d3.min.js'
]));
@@ -131,9 +130,8 @@ const javascripts = () => {
paths.src + 'javascripts/date.js',
paths.src + 'javascripts/loginAlert.js',
paths.src + 'javascripts/dataVisualization.js',
paths.src + 'javascripts/dashboardVisualization.js',
paths.src + 'javascripts/dashboardViz.js',
paths.src + 'javascripts/main.js',
paths.src + 'javascripts/sampleChartDashboard.js',
])
.pipe(plugins.prettyerror())
.pipe(plugins.babel({