Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
* develop:
  chore(docs): Deploy docs
  chore(ci): Bump nodejs version
  chore(docs): Remove old docs
  chore(docs): Update languages dropdown and fixed Indonesian url (apertureless#424)
  chore(docs): Remove unnecessary back quote (apertureless#427)
  chore(docs): Update to vuepress
  docs: Fix code example in the docs (apertureless#422)

# Conflicts:
#	docs/CNAME
#	docs/README.md
#	docs/id/README.md
#	docs/index.html
  • Loading branch information
apertureless committed Nov 7, 2018
2 parents f04a0ec + 29c394a commit 7a9a913
Show file tree
Hide file tree
Showing 95 changed files with 7,140 additions and 2,668 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
language: node_js
node_js:
- "6"
- "10"
after_success:
- bash <(curl -s https://codecov.io/bash)
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ Both are included in the `mixins` module.
The mixins automatically create `chartData` as a prop or data. And add a watcher. If data has changed, the chart will update.
However, keep in mind the limitations of vue and javascript for mutations on arrays and objects.
**It is important that you pass your options in a local variable named `options`!**
The reason is that if the mixin re-renders the chart it calls `this.renderChart(this.chartData, this.options`)` so don't pass in the options object directly or it will be ignored.
The reason is that if the mixin re-renders the chart it calls `this.renderChart(this.chartData, this.options)` so don't pass in the options object directly or it will be ignored.

More info [here](http://vue-chartjs.org/#/home?id=reactive-data)

Expand Down
13 changes: 13 additions & 0 deletions deploy-docs.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
#!/usr/bin/env sh

# abort on errors
set -e
# build
npm run docs:build

# navigate into the build output directory
cd docs/.vuepress/dist

# if you are deploying to a custom domain
echo 'vue-chartjs.org' > CNAME
touch .nojekyll
132 changes: 132 additions & 0 deletions docs/.vuepress/config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
module.exports = {
title: 'vue-chartjs documentation',
themeConfig: {
nav: [
{ text: 'Home', link: '/' },
{ text: 'Guide', link: '/guide/' },
{ text: 'API', link: '/api/' }
],
sidebar: 'auto',
repo: 'apertureless/vue-chartjs',
editLinks: true,
editLinkText: 'Help us improve this page!',
docsDir: 'docs',
docsBranch: 'master',
locales: {
'/': {
selectText: 'Languages',
label: 'English',
editLinkText: 'Edit this page on GitHub',
serviceWorker: {
updatePopup: {
message: "New content is available.",
buttonText: "Refresh"
}
},
},
'/zh-cn/': {
selectText: 'Languages',
label: '中文(简体)',
editLinkText: 'Edit this page on GitHub',
serviceWorker: {
updatePopup: {
message: "New content is available.",
buttonText: "Refresh"
}
},
},
'/id/': {
selectText: 'Languages',
label: 'Bahasa Indonesia',
editLinkText: 'Edit this page on GitHub',
serviceWorker: {
updatePopup: {
message: "New content is available.",
buttonText: "Refresh"
}
},
},
'/ja/': {
selectText: 'Languages',
label: '日本語',
editLinkText: 'Edit this page on GitHub',
serviceWorker: {
updatePopup: {
message: "New content is available.",
buttonText: "Refresh"
}
},
},
'/ru/': {
selectText: 'Languages',
label: 'Русский',
editLinkText: 'Edit this page on GitHub',
serviceWorker: {
updatePopup: {
message: "New content is available.",
buttonText: "Refresh"
}
},
},
'/pt-br/': {
selectText: 'Languages',
label: 'Português do Brasil',
editLinkText: 'Edit this page on GitHub',
serviceWorker: {
updatePopup: {
message: "New content is available.",
buttonText: "Refresh"
}
},
},
'/fr-fr/': {
selectText: 'Languages',
label: 'Français',
editLinkText: 'Edit this page on GitHub',
serviceWorker: {
updatePopup: {
message: "New content is available.",
buttonText: "Refresh"
}
},
}
}
},
locales: {
'/': {
lang: 'en-US',
title: '📈 vue-chartjs',
description: '⚡ Easy and beautiful charts with Chart.js and Vue.js'
},
'/zh-cn/': {
lang: 'zh-CN',
title: '📈 vue-chartjs',
description: '⚡ Easy and beautiful charts with Chart.js and Vue.js'
},
'/id/': {
lang: 'id',
title: '📈 vue-chartjs',
description: '⚡ Easy and beautiful charts with Chart.js and Vue.js'
},
'/ja/': {
lang: 'ja',
title: '📈 vue-chartjs',
description: '⚡ Easy and beautiful charts with Chart.js and Vue.js'
},
'/ru/': {
lang: 'ru',
title: '📈 vue-chartjs',
description: '⚡ Easy and beautiful charts with Chart.js and Vue.js'
},
'/pt-br/': {
lang: 'pt-br',
title: '📈 vue-chartjs',
description: '⚡ Easy and beautiful charts with Chart.js and Vue.js'
},
'/fr-fr/': {
lang: 'fr-fr',
title: '📈 vue-chartjs',
description: '⚡ Easy and beautiful charts with Chart.js and Vue.js'
}
}
}
File renamed without changes.
17 changes: 17 additions & 0 deletions docs/.vuepress/dist/404.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<!DOCTYPE html>
<html lang="en-US">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width,initial-scale=1">
<title>📈 vue-chartjs</title>
<meta name="description" content="⚡ Easy and beautiful charts with Chart.js and Vue.js">


<link rel="preload" href="/assets/css/styles.698fecae.css" as="style"><link rel="preload" href="/assets/js/app.698fecae.js" as="script"><link rel="prefetch" href="/assets/js/10.b27c2bcc.js"><link rel="prefetch" href="/assets/css/1.styles.3ac4ce2d.css"><link rel="prefetch" href="/assets/js/1.3ac4ce2d.js"><link rel="prefetch" href="/assets/css/2.styles.8f5c8e96.css"><link rel="prefetch" href="/assets/js/2.8f5c8e96.js"><link rel="prefetch" href="/assets/js/3.5774cb5b.js"><link rel="prefetch" href="/assets/js/4.06a15e23.js"><link rel="prefetch" href="/assets/js/5.e04e82dd.js"><link rel="prefetch" href="/assets/js/6.b2f4c173.js"><link rel="prefetch" href="/assets/js/7.aed9035e.js"><link rel="prefetch" href="/assets/js/8.d5b39b11.js"><link rel="prefetch" href="/assets/js/9.39acf5c6.js"><link rel="prefetch" href="/assets/js/11.49ff9f4e.js"><link rel="prefetch" href="/assets/js/12.01d63eaa.js"><link rel="prefetch" href="/assets/js/13.ebea3386.js"><link rel="prefetch" href="/assets/js/14.94612b70.js"><link rel="prefetch" href="/assets/js/15.fd4516df.js"><link rel="prefetch" href="/assets/js/16.9ae1da91.js"><link rel="prefetch" href="/assets/js/17.546d6885.js"><link rel="prefetch" href="/assets/js/18.26f4f9eb.js"><link rel="prefetch" href="/assets/js/19.4100c56d.js"><link rel="prefetch" href="/assets/js/20.8a5c8025.js"><link rel="prefetch" href="/assets/js/21.e2afe677.js"><link rel="prefetch" href="/assets/js/22.28a14c49.js"><link rel="prefetch" href="/assets/js/23.e1908054.js">
<link rel="stylesheet" href="/assets/css/1.styles.3ac4ce2d.css"><link rel="stylesheet" href="/assets/css/2.styles.8f5c8e96.css"><link rel="stylesheet" href="/assets/css/styles.698fecae.css">
</head>
<body>
<div id="app" data-server-rendered="true"><div class="theme-container"><div class="content"><h1>404</h1> <blockquote>Looks like we've got some broken links.</blockquote> <a href="/" class="router-link-active">Take me home.</a></div></div></div>
<script src="/assets/js/app.698fecae.js" defer></script>
</body>
</html>
File renamed without changes.
Loading

0 comments on commit 7a9a913

Please sign in to comment.