Commit Graph

5247 Commits

Author SHA1 Message Date
Jonathan Bobel
0f738c8cb7 Moving from a tabbed area to switching on account dropdown 2024-06-13 10:29:59 -04: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
Carlo Costino
3a42aafad2 Merge pull request #1470 from GSA/1463-convert-basehtml-template-to-become-the-new-main-template
Switch to the new base.html template
2024-05-17 14:11:04 -04:00
Jonathan Bobel
c6a116c9bb Commit before branch switch 2024-05-16 11:38:22 -04:00
Beverly Nguyen
7ff0cec147 installing chart.js via npm 2024-05-15 15:43:49 -07:00
Beverly Nguyen
d4a46ae552 installing chart.js via npm 2024-05-15 15:40:15 -07:00
Beverly Nguyen
6855a6ebe4 installing chart.js via npm 2024-05-15 15:35:39 -07:00
Jonathan Bobel
ccfc1166a7 commit before branch switch 2024-05-15 14:48:46 -04:00
Beverly Nguyen
5546de66c4 testing chart plain vanilla 2024-05-15 11:39:03 -07:00
Jonathan Bobel
f517180581 Experimenting with chart.js 2024-05-14 15:45:33 -04:00
Jonathan Bobel
04a7b57990 Merge branch 'main' of https://github.com/GSA/notifications-admin into 1484-dashboard-visualizations 2024-05-09 12:42:54 -04:00
Beverly Nguyen
065f1b7c15 removed comments on base.html 2024-05-03 10:58:06 -07:00
Jonathan Bobel
fb66531c44 1334 - Updating content for Eligible partners 2024-05-03 12:10:59 -04:00
Jonathan Bobel
afdc0ed58d 1484 - Dashboard visualizations 2024-05-03 11:10:41 -04:00
Anastasia Gradova
5f531f1f78 Updated filename string into db and UI display 2024-05-02 12:53:27 -06:00
Beverly Nguyen
8366a4c772 fix testing 2024-04-24 16:12:54 -07:00
Beverly Nguyen
f734e45242 added comments 2024-04-24 13:56:07 -07:00
Beverly Nguyen
04f1f6244c fixed file name 2024-04-24 13:53:28 -07:00
Beverly Nguyen
3b82e136e0 switched to withnav_template for org_template, settings template 2024-04-24 13:43:17 -07:00
Beverly Nguyen
bc945c9420 replaced content_tempalte and withoutnav_template with base.html 2024-04-24 12:31:00 -07:00
Beverly Nguyen
2c0a4f16f2 fixed testing 2024-04-23 16:23:31 -07:00
Beverly Nguyen
d47fbb8eb7 switched base.html in 2024-04-23 14:58:44 -07:00
Carlo Costino
27117d8983 Merge pull request #1466 from GSA/1155-remove-expired-invites
Removed canceled users from displaying in dashboard
2024-04-23 12:44:59 -04:00
Anastasia Gradova
dc97170956 Removed canceled users from displaying in
dashboard
2024-04-22 14:00:29 -06:00
Carlo Costino
dc24391d31 Merge pull request #1418 from GSA/1416-combine-withnav_templatehtml-and-org_templatehtml
revised withnav_templates to include org_template
2024-04-19 16:51:27 -04:00