Dev

.eslintignore

@@ -1,2 +1 @@
-build/*.js
-config/*.js
+build/build.js

.gitignore

@@ -2,6 +2,7 @@
 node_modules/
 dist/
 npm-debug.log
+yarn-error.log
 selenium-debug.log
 test/unit/coverage
 test/e2e/reports

.travis.yml

@@ -1,7 +1,6 @@
 sudo: false
 language: node_js
 node_js:
-  - "4"
   - "5"
   - "6"
 

README.md

@@ -1,36 +1,36 @@
 <div align="center">
-<p><img width="200" src="https://github.com/fundon/vue-admin/blob/master/client/assets/[email protected]"></p>
+<p><img width="200" src="https://github.com/vue-bulma/vue-admin/blob/master/client/assets/[email protected]"></p>
 
 <h1>Vue Admin</h1>
 
 <p>
   <strong>Vue Admin Panel Framework</strong>,
-  <a href="https://vue-admin.fundon.me">Live Demo</a>
+  <a href="https://admin.vuebulma.com">Live Demo</a>
 </p>
 
 <p>
   <sub>Made with ❤︎ by
     <a href="https://twitter.com/_fundon">Fangdun Cai</a> and
-    <a href="https://github.com/fundon/vue-admin/graphs/contributors">contributors</a>
+    <a href="https://github.com/vue-bulma/vue-admin/graphs/contributors">contributors</a>
   </sub>
 </p>
 
 <p>
 <a href="https://npmjs.org/package/vue-admin"><img src="https://img.shields.io/npm/v/vue-admin.svg" alt="NPM version"></a>
 <a href="https://www.npmjs.com/package/vue-admin"><img src="https://img.shields.io/badge/license-MIT-green.svg" alt="MIT License"></a>
-<a href="https://travis-ci.org/fundon/vue-admin"><img src="https://img.shields.io/travis/fundon/vue-admin.svg?label=linux" alt="Linux Build"></a>
+<a href="https://travis-ci.org/vue-bulma/vue-admin"><img src="https://img.shields.io/travis/vue-bulma/vue-admin.svg?label=linux" alt="Linux Build"></a>
 <a href="https://ci.appveyor.com/project/fundon/vue-admin"><img src="https://img.shields.io/appveyor/ci/fundon/vue-admin/master.svg?label=windows" alt="Window Build"/></a>
 <a href="https://gitter.im/fundon/vue-admin?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge"><img src="https://badges.gitter.im/fundon/vue-admin.svg" alt="Gitter"></a>
 </p>
 
 </div>
 
-![](screenshots/app.png)
+![](screenshots/preview.jpg)
 
 
 ## Features
 
-* Powered by [Vue][] **2.0** & [Bulma][] **0.2**
+* Powered by [Vue][] **2.0** & [Bulma][] **0.3**
 * Responsive and Flexible Box Layout
 * [Variety of Charts](doc/charts.md)
 * [Rich Components](doc/components.md) or See [vue-bulma][]
@@ -39,33 +39,106 @@
 
 ## [Backers](backers.md)
 
-Its ongoing development is made possible thanks to the support by these awesome backers. If you'd like to join them, check out [Vue Admin & Vue Bulma](https://www.patreon.com/_fundon)'s Patreon campaign.
+Its ongoing development is made possible thanks to the support by these awesome backers. If you'd like to join them, check out:
+
+* [Patreon campaign](https://www.patreon.com/_fundon)
+
+* [OpenCollective](https://opencollective.com/vue-admin#backer): Support us with a monthly donation and help us continue our activities
+
+<a href="https://opencollective.com/vue-admin/backer/0/website" target="_blank"><img src="https://opencollective.com/vue-admin/backer/0/avatar.svg"></a>
+<a href="https://opencollective.com/vue-admin/backer/1/website" target="_blank"><img src="https://opencollective.com/vue-admin/backer/1/avatar.svg"></a>
+<a href="https://opencollective.com/vue-admin/backer/2/website" target="_blank"><img src="https://opencollective.com/vue-admin/backer/2/avatar.svg"></a>
+<a href="https://opencollective.com/vue-admin/backer/3/website" target="_blank"><img src="https://opencollective.com/vue-admin/backer/3/avatar.svg"></a>
+<a href="https://opencollective.com/vue-admin/backer/4/website" target="_blank"><img src="https://opencollective.com/vue-admin/backer/4/avatar.svg"></a>
+<a href="https://opencollective.com/vue-admin/backer/5/website" target="_blank"><img src="https://opencollective.com/vue-admin/backer/5/avatar.svg"></a>
+<a href="https://opencollective.com/vue-admin/backer/6/website" target="_blank"><img src="https://opencollective.com/vue-admin/backer/6/avatar.svg"></a>
+<a href="https://opencollective.com/vue-admin/backer/7/website" target="_blank"><img src="https://opencollective.com/vue-admin/backer/7/avatar.svg"></a>
+<a href="https://opencollective.com/vue-admin/backer/8/website" target="_blank"><img src="https://opencollective.com/vue-admin/backer/8/avatar.svg"></a>
+<a href="https://opencollective.com/vue-admin/backer/9/website" target="_blank"><img src="https://opencollective.com/vue-admin/backer/9/avatar.svg"></a>
+<a href="https://opencollective.com/vue-admin/backer/10/website" target="_blank"><img src="https://opencollective.com/vue-admin/backer/10/avatar.svg"></a>
+<a href="https://opencollective.com/vue-admin/backer/11/website" target="_blank"><img src="https://opencollective.com/vue-admin/backer/11/avatar.svg"></a>
+<a href="https://opencollective.com/vue-admin/backer/12/website" target="_blank"><img src="https://opencollective.com/vue-admin/backer/12/avatar.svg"></a>
+<a href="https://opencollective.com/vue-admin/backer/13/website" target="_blank"><img src="https://opencollective.com/vue-admin/backer/13/avatar.svg"></a>
+<a href="https://opencollective.com/vue-admin/backer/14/website" target="_blank"><img src="https://opencollective.com/vue-admin/backer/14/avatar.svg"></a>
+<a href="https://opencollective.com/vue-admin/backer/15/website" target="_blank"><img src="https://opencollective.com/vue-admin/backer/15/avatar.svg"></a>
+<a href="https://opencollective.com/vue-admin/backer/16/website" target="_blank"><img src="https://opencollective.com/vue-admin/backer/16/avatar.svg"></a>
+<a href="https://opencollective.com/vue-admin/backer/17/website" target="_blank"><img src="https://opencollective.com/vue-admin/backer/17/avatar.svg"></a>
+<a href="https://opencollective.com/vue-admin/backer/18/website" target="_blank"><img src="https://opencollective.com/vue-admin/backer/18/avatar.svg"></a>
+<a href="https://opencollective.com/vue-admin/backer/19/website" target="_blank"><img src="https://opencollective.com/vue-admin/backer/19/avatar.svg"></a>
+<a href="https://opencollective.com/vue-admin/backer/20/website" target="_blank"><img src="https://opencollective.com/vue-admin/backer/20/avatar.svg"></a>
+<a href="https://opencollective.com/vue-admin/backer/21/website" target="_blank"><img src="https://opencollective.com/vue-admin/backer/21/avatar.svg"></a>
+<a href="https://opencollective.com/vue-admin/backer/22/website" target="_blank"><img src="https://opencollective.com/vue-admin/backer/22/avatar.svg"></a>
+<a href="https://opencollective.com/vue-admin/backer/23/website" target="_blank"><img src="https://opencollective.com/vue-admin/backer/23/avatar.svg"></a>
+<a href="https://opencollective.com/vue-admin/backer/24/website" target="_blank"><img src="https://opencollective.com/vue-admin/backer/24/avatar.svg"></a>
+<a href="https://opencollective.com/vue-admin/backer/25/website" target="_blank"><img src="https://opencollective.com/vue-admin/backer/25/avatar.svg"></a>
+<a href="https://opencollective.com/vue-admin/backer/26/website" target="_blank"><img src="https://opencollective.com/vue-admin/backer/26/avatar.svg"></a>
+<a href="https://opencollective.com/vue-admin/backer/27/website" target="_blank"><img src="https://opencollective.com/vue-admin/backer/27/avatar.svg"></a>
+<a href="https://opencollective.com/vue-admin/backer/28/website" target="_blank"><img src="https://opencollective.com/vue-admin/backer/28/avatar.svg"></a>
+<a href="https://opencollective.com/vue-admin/backer/29/website" target="_blank"><img src="https://opencollective.com/vue-admin/backer/29/avatar.svg"></a>
+
+## Sponsors
+
+Become a sponsor and get your logo on our README on Github with a link to your site. [[Become a sponsor](https://opencollective.com/vue-admin#sponsor)]
+
+<a href="https://opencollective.com/vue-admin/sponsor/0/website" target="_blank"><img src="https://opencollective.com/vue-admin/sponsor/0/avatar.svg"></a>
+<a href="https://opencollective.com/vue-admin/sponsor/1/website" target="_blank"><img src="https://opencollective.com/vue-admin/sponsor/1/avatar.svg"></a>
+<a href="https://opencollective.com/vue-admin/sponsor/2/website" target="_blank"><img src="https://opencollective.com/vue-admin/sponsor/2/avatar.svg"></a>
+<a href="https://opencollective.com/vue-admin/sponsor/3/website" target="_blank"><img src="https://opencollective.com/vue-admin/sponsor/3/avatar.svg"></a>
+<a href="https://opencollective.com/vue-admin/sponsor/4/website" target="_blank"><img src="https://opencollective.com/vue-admin/sponsor/4/avatar.svg"></a>
+<a href="https://opencollective.com/vue-admin/sponsor/5/website" target="_blank"><img src="https://opencollective.com/vue-admin/sponsor/5/avatar.svg"></a>
+<a href="https://opencollective.com/vue-admin/sponsor/6/website" target="_blank"><img src="https://opencollective.com/vue-admin/sponsor/6/avatar.svg"></a>
+<a href="https://opencollective.com/vue-admin/sponsor/7/website" target="_blank"><img src="https://opencollective.com/vue-admin/sponsor/7/avatar.svg"></a>
+<a href="https://opencollective.com/vue-admin/sponsor/8/website" target="_blank"><img src="https://opencollective.com/vue-admin/sponsor/8/avatar.svg"></a>
+<a href="https://opencollective.com/vue-admin/sponsor/9/website" target="_blank"><img src="https://opencollective.com/vue-admin/sponsor/9/avatar.svg"></a>
+<a href="https://opencollective.com/vue-admin/sponsor/10/website" target="_blank"><img src="https://opencollective.com/vue-admin/sponsor/10/avatar.svg"></a>
+<a href="https://opencollective.com/vue-admin/sponsor/11/website" target="_blank"><img src="https://opencollective.com/vue-admin/sponsor/11/avatar.svg"></a>
+<a href="https://opencollective.com/vue-admin/sponsor/12/website" target="_blank"><img src="https://opencollective.com/vue-admin/sponsor/12/avatar.svg"></a>
+<a href="https://opencollective.com/vue-admin/sponsor/13/website" target="_blank"><img src="https://opencollective.com/vue-admin/sponsor/13/avatar.svg"></a>
+<a href="https://opencollective.com/vue-admin/sponsor/14/website" target="_blank"><img src="https://opencollective.com/vue-admin/sponsor/14/avatar.svg"></a>
+<a href="https://opencollective.com/vue-admin/sponsor/15/website" target="_blank"><img src="https://opencollective.com/vue-admin/sponsor/15/avatar.svg"></a>
+<a href="https://opencollective.com/vue-admin/sponsor/16/website" target="_blank"><img src="https://opencollective.com/vue-admin/sponsor/16/avatar.svg"></a>
+<a href="https://opencollective.com/vue-admin/sponsor/17/website" target="_blank"><img src="https://opencollective.com/vue-admin/sponsor/17/avatar.svg"></a>
+<a href="https://opencollective.com/vue-admin/sponsor/18/website" target="_blank"><img src="https://opencollective.com/vue-admin/sponsor/18/avatar.svg"></a>
+<a href="https://opencollective.com/vue-admin/sponsor/19/website" target="_blank"><img src="https://opencollective.com/vue-admin/sponsor/19/avatar.svg"></a>
+<a href="https://opencollective.com/vue-admin/sponsor/20/website" target="_blank"><img src="https://opencollective.com/vue-admin/sponsor/20/avatar.svg"></a>
+<a href="https://opencollective.com/vue-admin/sponsor/21/website" target="_blank"><img src="https://opencollective.com/vue-admin/sponsor/21/avatar.svg"></a>
+<a href="https://opencollective.com/vue-admin/sponsor/22/website" target="_blank"><img src="https://opencollective.com/vue-admin/sponsor/22/avatar.svg"></a>
+<a href="https://opencollective.com/vue-admin/sponsor/23/website" target="_blank"><img src="https://opencollective.com/vue-admin/sponsor/23/avatar.svg"></a>
+<a href="https://opencollective.com/vue-admin/sponsor/24/website" target="_blank"><img src="https://opencollective.com/vue-admin/sponsor/24/avatar.svg"></a>
+<a href="https://opencollective.com/vue-admin/sponsor/25/website" target="_blank"><img src="https://opencollective.com/vue-admin/sponsor/25/avatar.svg"></a>
+<a href="https://opencollective.com/vue-admin/sponsor/26/website" target="_blank"><img src="https://opencollective.com/vue-admin/sponsor/26/avatar.svg"></a>
+<a href="https://opencollective.com/vue-admin/sponsor/27/website" target="_blank"><img src="https://opencollective.com/vue-admin/sponsor/27/avatar.svg"></a>
+<a href="https://opencollective.com/vue-admin/sponsor/28/website" target="_blank"><img src="https://opencollective.com/vue-admin/sponsor/28/avatar.svg"></a>
+<a href="https://opencollective.com/vue-admin/sponsor/29/website" target="_blank"><img src="https://opencollective.com/vue-admin/sponsor/29/avatar.svg"></a>
 
 
 ## [Development](doc/development.md)
 
 
 ### Requirements
 
-  * NPM v3
+  * Node >= v5
+
+  * NPM >= v3
 
   * Webpack v2
 
 
 ## Notes
 
-  If you want to use Vue Admin with Vue 1.0 version, please checkout the [vue-v1](https://github.com/fundon/vue-admin/tree/vue-v1) branch.
+  If you want to use Vue Admin with Vue 1.0 version, please checkout the [vue-v1](https://github.com/vue-bulma/vue-admin/tree/vue-v1) branch.
 
+  Launch Vue Admin as a desktop application! Please check [Run Project with Electron](https://github.com/vue-bulma/vue-admin/wiki/Guide#run-project-with-electron)
 
----
 
-> [fundon.me](https://fundon.me) &nbsp;&middot;&nbsp;
-> GitHub [@fundon](https://github.com/fundon) &nbsp;&middot;&nbsp;
-> Twitter [@_fundon](https://twitter.com/_fundon)
+## Maintainers
++ [fundon](https://github.com/fundon) &nbsp;&middot;&nbsp; [fundon.me](https://fundon.me) &nbsp;&middot;&nbsp; [Twitter@fundon](https://twitter.com/_fundon)
++ [luventa](https://github.com/luventa)
 
 
-[Live Demo]: https://vue-admin.fundon.me/
+[Live Demo]: https://admin.vuebulma.com/
 [Fangdun Cai]: https://twitter.com/_fundon
 [Vue]: http://vuejs.org
 [Bulma]: http://bulma.io
 [Vue-bulma]: https://github.com/vue-bulma
+

backers.md

@@ -0,0 +1,15 @@
+# Backers
+
+Thank you for your supports!
+
+* [WerGimity](https://www.patreon.com/user/creators?u=5268464)
+
+* [Thomas_Leong](https://www.patreon.com/user/creators?u=5244543)
+
+* [wen](https://www.patreon.com/user/creators?u=5239734)
+
+* [Joris Vanhecke](https://www.patreon.com/user/creators?u=5145359)
+
+* [datastream](https://www.patreon.com/user/creators?u=4315833)
+
+* [Lê Chương](https://www.patreon.com/user/creators?u=3495305)

build/build.js

@@ -1,32 +1,31 @@
 // https://github.com/shelljs/shelljs
+'use strict'
+
+require('./check-versions')()
 require('shelljs/global')
-env.NODE_ENV = 'production'
 
-var path = require('path')
-var config = require('../config')
-var ora = require('ora')
-var webpack = require('webpack')
-var webpackConfig = require('./webpack.prod.conf')
+env.NODE_ENV = 'production'
 
-console.log(
-  '  Tip:\n' +
-  '  Built files are meant to be served over an HTTP server.\n' +
-  '  Opening index.html over file:// won\'t work.\n'
-)
+const ora = require('ora')
+const path = require('path')
+const chalk = require('chalk')
+const webpack = require('webpack')
+const config = require('../config')
+const webpackConfig = require('./webpack.prod.conf')
 
-var spinner = ora('building for production...')
+const spinner = ora('building for production...')
 spinner.start()
 
-var assetsPath = path.join(config.build.assetsRoot, config.build.assetsSubDirectory)
+const assetsPath = path.join(config.build.assetsRoot, config.build.assetsSubDirectory)
 rm('-rf', assetsPath)
 mkdir('-p', assetsPath)
-cp('-R', 'assets/', assetsPath)
+cp('-R', 'assets/*', assetsPath)
 
 const compiler = webpack(webpackConfig)
-var ProgressPlugin = require('webpack/lib/ProgressPlugin')
+const ProgressPlugin = require('webpack/lib/ProgressPlugin')
 compiler.apply(new ProgressPlugin())
 
-compiler.run(function (err, stats) {
+compiler.run((err, stats) => {
   spinner.stop()
   if (err) throw err
   process.stdout.write(stats.toString({
@@ -35,5 +34,11 @@ compiler.run(function (err, stats) {
     children: false,
     chunks: false,
     chunkModules: false
-  }) + '\n')
+  }) + '\n\n')
+
+  console.log(chalk.cyan('  Build complete.\n'))
+  console.log(chalk.yellow(
+    '  Tip: built files are meant to be served over an HTTP server.\n' +
+    '  Opening index.html over file:// won\'t work.\n'
+  ))
 })

build/check-versions.js

@@ -0,0 +1,47 @@
+'use strict'
+
+const chalk = require('chalk')
+const semver = require('semver')
+const packageConfig = require('../package.json')
+
+const exec = (cmd) => {
+  return require('child_process').execSync(cmd).toString().trim()
+}
+
+const versionRequirements = [
+  {
+    name: 'node',
+    currentVersion: semver.clean(process.version),
+    versionRequirement: packageConfig.engines.node
+  },
+  {
+    name: 'npm',
+    currentVersion: exec('npm --version'),
+    versionRequirement: packageConfig.engines.npm
+  }
+]
+
+module.exports = () => {
+  const warnings = []
+  for (let i = 0; i < versionRequirements.length; i++) {
+    const mod = versionRequirements[i]
+    if (!semver.satisfies(mod.currentVersion, mod.versionRequirement)) {
+      warnings.push(mod.name + ': ' +
+        chalk.red(mod.currentVersion) + ' should be ' +
+        chalk.green(mod.versionRequirement)
+      )
+    }
+  }
+
+  if (warnings.length) {
+    console.log('')
+    console.log(chalk.yellow('To use this template, you must update following to modules:'))
+    console.log()
+    for (let i = 0; i < warnings.length; i++) {
+      const warning = warnings[i]
+      console.log('  ' + warning)
+    }
+    console.log()
+    process.exit(1)
+  }
+}

build/dev-client.js

@@ -1,8 +1,10 @@
+'use strict'
+
 /* eslint-disable */
 require('eventsource-polyfill')
-var hotClient = require('webpack-hot-middleware/client?noInfo=true&reload=true')
+const hotClient = require('webpack-hot-middleware/client?noInfo=true&reload=true')
 
-hotClient.subscribe(function (event) {
+hotClient.subscribe(event => {
   if (event.action === 'reload') {
     window.location.reload()
   }