From 73541a576d60f5fc690a5eafb701bdbc00b154aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Chopin?= <seb@nuxtjs.com>
Date: Mon, 13 Apr 2020 20:41:34 +0200
Subject: [PATCH] chore(example): Update vue-chartjs (#7211)

* chore(example): Update vue-chartjs

* add: live demo and CSB link

* fix: lint
---
 examples/vue-chartjs/README.md              |  3 +-
 examples/vue-chartjs/layouts/default.vue    | 40 +++++++++++++++------
 examples/vue-chartjs/nuxt.config.js         |  4 +++
 examples/vue-chartjs/package.json           |  8 ++---
 examples/vue-chartjs/pages/contributors.vue | 25 ++++++++-----
 examples/vue-chartjs/pages/index.vue        | 20 ++++++-----
 6 files changed, 66 insertions(+), 34 deletions(-)

diff --git a/examples/vue-chartjs/README.md b/examples/vue-chartjs/README.md
index 77b2d2e9ff..a8eea1680e 100644
--- a/examples/vue-chartjs/README.md
+++ b/examples/vue-chartjs/README.md
@@ -2,5 +2,6 @@
 
 > *Vue-chartjs* is a wrapper for [Chart.js](https://github.com/chartjs/Chart.js) in vue. You can easily create reuseable chart components.
 
+Live demo: http://nuxt-vue-chartjs.surge.sh
 
-https://nuxtjs.org/examples
+[![Edit example-vue-chartjs](https://codesandbox.io/static/img/play-codesandbox.svg)](https://codesandbox.io/s/github/nuxt/nuxt.js/tree/dev/examples/vue-chartjs?fontsize=14&hidenavigation=1&theme=dark)
diff --git a/examples/vue-chartjs/layouts/default.vue b/examples/vue-chartjs/layouts/default.vue
index b1d322c34b..f9705198d0 100644
--- a/examples/vue-chartjs/layouts/default.vue
+++ b/examples/vue-chartjs/layouts/default.vue
@@ -1,5 +1,5 @@
 <template>
-  <div>
+  <div class="container">
     <ul>
       <li>
         <NuxtLink to="/">
@@ -20,25 +20,43 @@
 * {
   box-sizing: border-box;
 }
+.container {
+  text-align: center;
+  padding-top: 20px;
+  font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen, Ubuntu, Cantarell, 'Open Sans', 'Helvetica Neue', sans-serif;
+}
 ul {
   margin: 0;
   padding: 0;
   list-style-type: none;
 }
-ul li {
+li {
   display: inline-block;
-  float: left;
-  border: 1px #ddd solid;
 }
-ul li a {
+a {
   display: inline-block;
-  width: 100%;
-  height: 100%;
-  padding: 10px;
-  color: #222;
+  font-weight: 500;
+  padding-top: .75rem;
+  padding-bottom: .75rem;
+  padding-left: 1.5rem;
+  padding-right: 1.5rem;
+  text-transform: uppercase;
   text-decoration: none;
+  box-shadow: 0 1px 3px 0 rgba(0,0,0,.1), 0 1px 2px 0 rgba(0,0,0,.06);
+  border-radius: .25rem;
+  border: none;
+  background-color: #edf2f7;
+  color: #2f495e;
+  margin-right: 1rem;
 }
-ul li a.nuxt-link-exact-active {
-  text-decoration: underline;
+a:hover {
+  background-color: #e2e8f0;
+}
+.nuxt-link-exact-active {
+  background-color: #00c58e;
+  color: #fff;
+}
+.nuxt-link-exact-active:hover {
+  background-color: #00e0a1;
 }
 </style>
diff --git a/examples/vue-chartjs/nuxt.config.js b/examples/vue-chartjs/nuxt.config.js
index 45a4f48443..7ca1fc8d51 100644
--- a/examples/vue-chartjs/nuxt.config.js
+++ b/examples/vue-chartjs/nuxt.config.js
@@ -6,6 +6,10 @@ export default {
       { name: 'viewport', content: 'width=device-width, initial-scale=1' }
     ]
   },
+  modules: [
+    // https://http.nuxtjs.org
+    '@nuxt/http'
+  ],
   env: {
     githubToken: '42cdf9fd55abf41d24f34c0f8a4d9ada5f9e9b93'
   }
diff --git a/examples/vue-chartjs/package.json b/examples/vue-chartjs/package.json
index 00a24be08c..84931417f7 100644
--- a/examples/vue-chartjs/package.json
+++ b/examples/vue-chartjs/package.json
@@ -1,11 +1,11 @@
 {
   "name": "example-vue-chartjs",
   "dependencies": {
-    "axios": "^0.19.0",
-    "chart.js": "^2.7.1",
-    "moment": "^2.18.1",
+    "@nuxt/http": "^0.4.0",
+    "chart.js": "^2.9.3",
+    "moment": "^2.24.0",
     "nuxt": "latest",
-    "vue-chartjs": "^3.1.0"
+    "vue-chartjs": "^3.5.0"
   },
   "scripts": {
     "dev": "nuxt",
diff --git a/examples/vue-chartjs/pages/contributors.vue b/examples/vue-chartjs/pages/contributors.vue
index 2dc98d9831..daf9dd33a2 100644
--- a/examples/vue-chartjs/pages/contributors.vue
+++ b/examples/vue-chartjs/pages/contributors.vue
@@ -5,9 +5,12 @@
 </template>
 
 <script>
-import axios from 'axios'
 import DoughnutChart from '~/components/doughnut-chart'
 
+function isBot (username) {
+  return username.includes('[bot]') || username.includes('-bot')
+}
+
 function getRandomColor () {
   const letters = '0123456789ABCDEF'
   let color = '#'
@@ -21,16 +24,21 @@ export default {
   components: {
     DoughnutChart
   },
-  async asyncData ({ env }) {
-    const res = await axios.get(`https://api.github.com/repos/nuxt/nuxt.js/stats/contributors?access_token=${env.githubToken}`)
+  async asyncData ({ $http, env }) {
+    let contributors = await $http.$get('https://api.github.com/repos/nuxt/nuxt.js/contributors', {
+      headers: {
+        Authorization: `token ${env.githubToken}`
+      }
+    })
+    contributors = contributors.filter(c => c.contributions >= 10 && !isBot(c.login))
     return {
       doughnutChartData: {
-        labels: res.data.map(stat => stat.author.login),
+        labels: contributors.map(c => c.login),
         datasets: [
           {
             label: 'Nuxt.js Contributors',
-            backgroundColor: res.data.map(getRandomColor),
-            data: res.data.map(() => 1)
+            backgroundColor: contributors.map(getRandomColor),
+            data: contributors.map(c => c.contributions)
           }
         ]
       }
@@ -41,10 +49,9 @@ export default {
 
 <style scoped>
 .doughnut-chart {
-  position: fixed;
-  left: 10%;
-  top: 10%;
   width: 80%;
   height: 80%;
+  margin: auto;
+  margin-top: 30px;
 }
 </style>
diff --git a/examples/vue-chartjs/pages/index.vue b/examples/vue-chartjs/pages/index.vue
index b6517a9d28..c00f4f74d6 100755
--- a/examples/vue-chartjs/pages/index.vue
+++ b/examples/vue-chartjs/pages/index.vue
@@ -5,7 +5,6 @@
 </template>
 
 <script>
-import axios from 'axios'
 import moment from 'moment'
 import BarChart from '~/components/bar-chart'
 
@@ -13,16 +12,20 @@ export default {
   components: {
     BarChart
   },
-  async asyncData ({ env }) {
-    const res = await axios.get(`https://api.github.com/repos/nuxt/nuxt.js/stats/commit_activity?access_token=${env.githubToken}`)
+  async asyncData ({ env, $http, $dayjs }) {
+    const stats = await $http.$get('https://api.github.com/repos/nuxt/nuxt.js/stats/commit_activity', {
+      headers: {
+        Authorization: `token ${env.githubToken}`
+      }
+    })
     return {
       barChartData: {
-        labels: res.data.map(stat => moment(stat.week * 1000).format('GGGG[-W]WW')),
+        labels: stats.map(stat => moment(stat.week * 1000).format('GGGG[-W]WW')),
         datasets: [
           {
             label: 'Nuxt.js Commit Activity',
-            backgroundColor: '#41b883',
-            data: res.data.map(stat => stat.total)
+            backgroundColor: '#41B38A',
+            data: stats.map(stat => stat.total)
           }
         ]
       }
@@ -33,10 +36,9 @@ export default {
 
 <style scoped>
 .bar-chart {
-  position: fixed;
-  left: 10%;
-  top: 10%;
   width: 80%;
   height: 80%;
+  margin: auto;
+  margin-top: 30px;
 }
 </style>