Commit Graph

5720 Commits

Author SHA1 Message Date
Jonathan Bobel
74f4d730a8 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
2024-07-04 13:07:35 -04:00
Carlo Costino
ffd935c4b6 Merge pull request #1629 from GSA/1256-bug-tour-steps-needs-to-be-adjusted-for-the-new-preview-page
made changes/fixes to tour flow
2024-07-03 14:37:07 -04:00
Carlo Costino
28efb2716b Merge pull request #1618 from GSA/1612-add-in-new-endpoint-for-weekly-by-user_id
1612 add in new endpoint for week stats by user
2024-07-03 14:21:49 -04:00
Beverly Nguyen
b8a4303a97 Merge branch 'main' into 1256-bug-tour-steps-needs-to-be-adjusted-for-the-new-preview-page 2024-07-02 16:02:29 -07:00
Jonathan Bobel
0a17aaad0d Merge branch 'main' of https://github.com/GSA/notifications-admin into 1484-dashboard-visualizations 2024-06-27 11:03:27 -04:00
Jonathan Bobel
149c23b721 Updates to the tests, committing as they currently run but I need to work on the coverage 2024-06-27 11:01:31 -04:00
Andrew Shumway
f218c01244 Remove commented out code 2024-06-26 08:34:05 -06:00
Beverly Nguyen
44baaf665a fixed testing 2024-06-24 15:33:48 -07:00
Andrew Shumway
7027cae3de pull main 2024-06-24 10:45:33 -06:00
Andrew Shumway
a9e4df0591 Todays data is only todays 2024-06-24 10:44:19 -06:00
Beverly Nguyen
5e98ec396e made changes/fixes to tour flow 2024-06-19 13:59:39 -07:00
Jonathan Bobel
edbbb7289f Responsive updates 2024-06-18 08:23:50 -04:00
Beverly Nguyen
30a3c9ce73 merge main 2024-06-17 17:39:57 -07:00
Beverly Nguyen
71901f4912 comment out mychart 2024-06-17 17:34:37 -07:00
Jonathan Bobel
c5a467c417 tooltip adjustments 2024-06-17 13:57:54 -04:00
Jonathan Bobel
cef5f921c2 Merge branch 'main' of https://github.com/GSA/notifications-admin into 1484-dashboard-visualizations 2024-06-17 09:29:14 -04:00
Jonathan Bobel
f979d41565 Mostly ready to combine with actual data 2024-06-17 09:29:08 -04:00
Jonathan Bobel
0f738c8cb7 Moving from a tabbed area to switching on account dropdown 2024-06-13 10:29:59 -04:00
Beverly Nguyen
0fa6e59a49 fetch notification stats by user 2024-06-12 14:32:25 -07:00
Beverly Nguyen
53c938ebc6 fixed css 2024-06-11 15:12:05 -07:00
Beverly Nguyen
8407f5605b add back signin.html and removed login banner 2024-06-11 11:06:13 -07:00
Beverly Nguyen
ed0f5a7b9e removed old login announcement page and added new sign in button 2024-06-10 16:05:59 -07:00
Andrew Shumway
35e27ff25a Merge main 2024-06-10 10:44:09 -06:00
Andrew Shumway
a401562735 Add report options 1/3/5-day 2024-06-10 10:15:22 -06:00
Jonathan Bobel
468f6c9fc6 Merge branch 'main' of https://github.com/GSA/notifications-admin into 1484-dashboard-visualizations 2024-06-10 11:07:41 -04:00
Carlo Costino
9f9614d292 Merge pull request #1596 from GSA/1305-delivery-status-content-update
Delivery status content updates
2024-06-08 00:33:34 -04:00
Jonathan Bobel
726e8db5b2 Merge remote-tracking branch 'origin' into 1484-dashboard-visualizations 2024-06-07 11:07:12 -04:00
Jonathan Bobel
934f8927c6 Updated content, removed test no longer needed 2024-06-06 13:50:08 -04:00
Beverly Nguyen
e413f8c640 added sampleChartDashboard.js 2024-06-06 10:05:36 -07:00
Beverly Nguyen
ae7a14f3f2 fixed js chart referenced 2024-06-06 01:10:09 -07:00
Beverly Nguyen
9d3dc047ea added chartjs to path in gulp 2024-06-05 15:03:19 -07:00
Beverly Nguyen
e5a9eed626 installing socketio 2024-06-05 14:56:22 -07:00
Beverly Nguyen
7a9d260717 fix testing 2024-06-03 15:34:43 -07:00
Jonathan Bobel
ae78e5868a Merge branch 'main' of https://github.com/GSA/notifications-admin into 1484-dashboard-visualizations 2024-06-03 15:52:04 -04:00
Beverly Nguyen
72e82c818b added socket.io.min.js 2024-06-03 11:39:02 -07:00
Beverly Nguyen
4ebd5734d6 removed socket.js 2024-06-03 11:32:56 -07:00
Beverly Nguyen
8152985f9b Merge branch 'main' into socketIO 2024-06-03 09:52:41 -07:00
Carlo Costino
56d21ecbcd Merge pull request #1554 from GSA/500-pricing-content-updates
500 - Updating "Pricing" page content
2024-05-31 10:34:11 -04:00
Carlo Costino
67523fb535 Merge pull request #1502 from GSA/1405-bug-long-complicated-csv-name
Updated filename string into db for a notification and UI display
2024-05-31 10:29:16 -04:00
Carlo Costino
4bf6af4e45 Merge pull request #1480 from GSA/1464-switch-to-the-new-withnav_template
Switch to the new withnav_template
2024-05-31 10:28:01 -04:00
Beverly Nguyen
01321aeddc connecting api data to socket and setting up chartjs to use the data 2024-05-30 21:17:10 -07:00
Beverly Nguyen
108e889ac5 added example of fetch 2024-05-30 14:48:25 -07:00
Jonathan Bobel
f6e7402be9 Merge branch 'main' of https://github.com/GSA/notifications-admin into 1484-dashboard-visualizations
# Conflicts:
#	app/templates/new/components/head.html
2024-05-29 15:04:22 -04:00
Jonathan Bobel
473eefb5b0 Tentatively finished up the tabbed area with weekly/monthly/yearly stacked bar charts with dummy data 2024-05-24 10:29:01 -04:00
Beverly Nguyen
ad68c26450 installing socketIO and testing the WebSocket connection 2024-05-20 16:21:38 -07:00
Jonathan Bobel
2c18786486 500 - Updating "Pricing" page content 2024-05-20 11:51:09 -04:00
Beverly Nguyen
d739324d57 moved flash_message 2024-05-17 15:17:25 -07:00
Beverly Nguyen
f91756d2c3 moved script to base.html 2024-05-17 15:07:05 -07:00
Beverly Nguyen
90d3dde6b5 Merge branch 'main' into testing-chart.js 2024-05-17 11:26:45 -07:00
Beverly Nguyen
ff1b60cc89 Merge branch 'main' into 1464-switch-to-the-new-withnav_template 2024-05-17 11:20:55 -07:00