diff --git a/app/assets/javascripts/chartTest.js b/app/assets/javascripts/chartTest.js index 3ffe76443..d5eca7f7f 100644 --- a/app/assets/javascripts/chartTest.js +++ b/app/assets/javascripts/chartTest.js @@ -1,26 +1,23 @@ (function (window) { - alert('loaded'); +const ctx = document.getElementById('myChart'); - const ctx = document.getElementById('myChart'); - - new Chart(ctx, { - type: 'bar', - data: { - labels: ['Red', 'Blue', 'Yellow', 'Green', 'Purple', 'Orange'], - datasets: [{ - label: '# of Votes', - data: [12, 19, 3, 5, 2, 3], - borderWidth: 1 - }] - }, - options: { - scales: { - y: { - beginAtZero: true - } - } + new Chart(ctx, { + type: 'bar', + data: { + labels: ['Red', 'Blue', 'Yellow', 'Green', 'Purple', 'Orange'], + datasets: [{ + label: '# of Votes', + data: [12, 19, 3, 5, 2, 3], + borderWidth: 1 + }] + }, + options: { + scales: { + y: { + beginAtZero: true } - }); - -}); + } + } + }); +})(window); diff --git a/app/assets/javascripts/dataVisualization.js b/app/assets/javascripts/dataVisualization.js index 52c7bbfbf..b780b54ba 100644 --- a/app/assets/javascripts/dataVisualization.js +++ b/app/assets/javascripts/dataVisualization.js @@ -4,8 +4,8 @@ const data = { messageStats: { totalMessages: 1000, - delivered: 820, - pending: 80, + delivered: 520, + pending: 280, failed: 100 }, dailyUsage: { diff --git a/app/templates/admin_template.html b/app/templates/admin_template.html index 921efdc5e..7cae082d6 100644 --- a/app/templates/admin_template.html +++ b/app/templates/admin_template.html @@ -24,6 +24,7 @@ {% endblock %} + {% endblock %} {% block pageTitle %} diff --git a/app/templates/new/components/head.html b/app/templates/new/components/head.html index 9ceb9dbc1..717da2c0b 100644 --- a/app/templates/new/components/head.html +++ b/app/templates/new/components/head.html @@ -37,6 +37,7 @@ {% endblock %} {# google #} + {% if g.hide_from_search_engines %} diff --git a/app/templates/views/dashboard/dashboard.html b/app/templates/views/dashboard/dashboard.html index 5dbf257b8..00023a33f 100644 --- a/app/templates/views/dashboard/dashboard.html +++ b/app/templates/views/dashboard/dashboard.html @@ -18,9 +18,7 @@ {{ ajax_block(partials, updates_url, 'upcoming') }} - +

SMS Activity diff --git a/gulpfile.js b/gulpfile.js index 95240e473..637d115c9 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -56,6 +56,10 @@ const copy = { gtm: () => { return src(paths.src + 'js/gtm_head.js') .pipe(dest(paths.dist + 'js/')); + }, + chart: () => { + return src(paths.src + 'js/chart.js') + .pipe(dest(paths.dist + 'js/')); } }; @@ -125,7 +129,6 @@ const javascripts = () => { paths.src + 'javascripts/date.js', paths.src + 'javascripts/loginAlert.js', paths.src + 'javascripts/dataVisualization.js', - paths.src + 'javascripts/chart.min.js', paths.src + 'javascripts/chartTest.js', paths.src + 'javascripts/main.js', ]) @@ -203,7 +206,8 @@ const defaultTask = parallel( ), uswds.compile, uswds.copyAssets, - copy.gtm + copy.gtm, + copy.chart ) );