commit before branch switch

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',
-    new Chart(ctx, {
+    data: {
-        type: 'bar',
+      labels: ['Red', 'Blue', 'Yellow', 'Green', 'Purple', 'Orange'],
-        data: {
+      datasets: [{
-            labels: ['Red', 'Blue', 'Yellow', 'Green', 'Purple', 'Orange'],
+        label: '# of Votes',
-            datasets: [{
+        data: [12, 19, 3, 5, 2, 3],
-                label: '# of Votes',
+        borderWidth: 1
-                data: [12, 19, 3, 5, 2, 3],
+      }]
-                borderWidth: 1
+    },
-            }]
+    options: {
-        },
+      scales: {
-        options: {
+        y: {
-            scales: {
+          beginAtZero: true
-                y: {
-                    beginAtZero: true
-                }
-            }
         }
-    });
+      }
-
+    }
-});
+  });
+})(window);

app/assets/javascripts/dataVisualization.js

@@ -4,8 +4,8 @@
     const data = {
         messageStats: {
             totalMessages: 1000,
-            delivered: 820,
+            delivered: 520,
-            pending: 80,
+            pending: 280,
             failed: 100
         },
         dailyUsage: {

app/templates/admin_template.html

@@ -24,6 +24,7 @@
     <meta property="og:image" content="{{ asset_url('images/notify-og-image.png') }}">
   {% endblock %}
   <script type="text/javascript" src="{{ asset_url('js/gtm_head.js') }}"></script>
+  <script type="text/javascript" type="module" src="{{ asset_url('js/chart.js') }}"></script>
 {% endblock %}
 
 {% block pageTitle %}

app/templates/new/components/head.html

@@ -37,6 +37,7 @@
     {% endblock %}
     {# google #}
     <script type="text/javascript" src="{{ asset_url('js/gtm_head.js') }}"></script>
+    <script type="text/javascript" src="{{ asset_url('js/chart.js') }}"></script>
     <meta name="google-site-verification" content="niWnSqImOWz6mVQTYqNb5tFK8HaKSB4b3ED4Z9gtUQ0" />
     {% if g.hide_from_search_engines %}
     <meta name="robots" content="noindex" />

app/templates/views/dashboard/dashboard.html

@@ -18,9 +18,7 @@
 
     {{ ajax_block(partials, updates_url, 'upcoming') }}
 
-    <!-- <div>
+    <canvas id="myChart" width="900" height="400"></canvas>
-      <canvas id="myChart"></canvas>
-    </div> -->
 
     <h2 class="font-body-xl margin-0">
       SMS Activity

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
   )
 );