Merge branch develop

.circleci/config.yml

@@ -14,9 +14,6 @@ aliases:
     paths:
       - ~/.cache/yarn
 
-  - &build |
-    yarn build
-
 docker: &docker
   docker:
     - image: circleci/node:10.12.0
@@ -28,22 +25,37 @@ defaults: &defaults
 
 version: 2
 jobs:
+  test:
+    <<: *defaults
+    steps:
+      - checkout
+      - restore_cache: *restore_cache
+      - run: *install_dependencies
+      - save_cache: *save_cache
+      - run: yarn test:unit
+
   deploy-staging:
     <<: *defaults
     steps:
       - checkout
+      - run:
+          name: Add variables
+          command:
+            echo "VUE_APP_INCLUDE_DEMOS=true" >> .env.production.local &&
+            echo "VUE_APP_GOOGLE_MAPS_API_KEY=$GOOGLE_MAPS_API_KEY" >> .env.production.local
       - restore_cache: *restore_cache
       - run: *install_dependencies
       - save_cache: *save_cache
-      - run: *build
+      - run: yarn build
       - run:
           name: Deploy to hosting
+          # DEPLOY_PATH here is for staging only
+          # This doesn't really work. Has to be done manually for now. ssh-keyscan -t rsa  -H -F "[$SERVER_IP]:$SERVER_PORT"
           command: |
             tar -czf dist.tar.gz ~/repo/dist -C ~/repo/dist .
             sudo apt install sshpass
-            ssh-keyscan -t rsa $DEPLOY_URL >> ~/.ssh/known_hosts
-            sshpass -p $DEPLOY_PASSWORD scp ~/repo/dist.tar.gz $DEPLOY_USER@$DEPLOY_URL:~/tmp
-            sshpass -p $DEPLOY_PASSWORD ssh $DEPLOY_USER@$DEPLOY_URL /bin/bash << EOF
+            sshpass -p $SERVER_PASSWORD scp -P $SERVER_PORT ~/repo/dist.tar.gz $SERVER_USERNAME@$SERVER_IP:~/tmp
+            sshpass -p $SERVER_PASSWORD ssh -p $SERVER_PORT $SERVER_USERNAME@$SERVER_IP /bin/bash << EOF
               rm -rf $DEPLOY_PATH/*
               tar -xzf ~/tmp/dist.tar.gz -C $DEPLOY_PATH
               rm -f ~/tmp/dist.tar.gz
@@ -54,38 +66,44 @@ jobs:
     steps:
       - checkout
       - run:
-          name: Add variables for Yandex Metrics and Drift live chat
+          name: Add variables
           command:
+            echo "VUE_APP_YANDEX_METRICS_KEY=$YANDEX_METRICS_KEY" >> .env.production.local &&
+            echo "VUE_APP_DRIFT_KEY=$DRIFT_KEY" >> .env.production.local &&
+            echo "VUE_APP_GOOGLE_MAPS_API_KEY=$GOOGLE_MAPS_API_KEY" >> .env.production.local
             echo "VUE_APP_GTM_KEY=$GTM_KEY" >> .env.production.local &&
-            echo "VUE_APP_DRIFT_KEY=$DRIFT_KEY" >> .env.production.local
       - restore_cache: *restore_cache
       - run: *install_dependencies
       - save_cache: *save_cache
-      - run: *build
+      - run: yarn build
       - run:
           name: Deploy to hosting
-          environment:
-            DEPLOY_PATH: /var/www/html/vuestic-admin
           command: |
             tar -czf dist.tar.gz ~/repo/dist -C ~/repo/dist .
             ssh-keyscan -t rsa $SERVER_IP >> ~/.ssh/known_hosts
-            scp ~/repo/dist.tar.gz $SERVER_USER_NAME@$SERVER_IP:~/
-            ssh $SERVER_USER_NAME@$SERVER_IP << EOF
+            scp ~/repo/dist.tar.gz $SERVER_USERNAME@$SERVER_IP:~/
+            ssh $SERVER_USERNAME@$SERVER_IP << EOF
               mkdir -p tmp
-              rm -rf $DEPLOY_PATH/*
-              tar -xzf ~/dist.tar.gz -C $DEPLOY_PATH
+              rm -rf $PRODUCTION_DEPLOY_PATH/*
+              tar -xzf ~/dist.tar.gz -C $PRODUCTION_DEPLOY_PATH
               rm -rf ~/dist.tar.gz ~/tmp
             EOF
 
 workflows:
   version: 2
   build-and-deploy:
     jobs:
+      - test
       - deploy-staging:
+          requires:
+            - test
+          context: vuestic-staging
           filters:
             branches:
               only: develop
       - deploy-production:
+          requires:
+            - test
           context: vuestic-production
           filters:
             branches:

.env.example

@@ -1,2 +1,5 @@
 VUE_APP_GTM_KEY=
 VUE_APP_DRIFT_KEY=
+VUE_APP_GOOGLE_MAPS_API_KEY=
+
+VUE_APP_INCLUDE_DEMOS=

.eslintrc.js

@@ -1,18 +1,19 @@
 module.exports = {
   root: true,
   env: {
-    node: true
+    node: true,
   },
   'extends': [
     'plugin:vue/essential',
-    '@vue/standard'
+    '@vue/standard',
   ],
   rules: {
     'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
     'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
-    'comma-dangle': ['error', 'only-multiline']
+    'comma-dangle': ['error', 'always-multiline'],
+    'curly': 'error',
   },
   parserOptions: {
-    parser: 'babel-eslint'
+    parser: 'babel-eslint',
   },
 }

.github/CONTRIBUTING.md

@@ -36,20 +36,41 @@ Commit messages should follow the [commit message convention](./COMMIT_CONVENTIO
 * Check your code: https://github.com/epicmaxco/vuestic-admin/issues/378.
 * We use [yarn](https://yarnpkg.com/lang/en/) for package management.
 * Be proactive. If you think something is wrong - create an issue or discuss.
-* Recommended tools: [GitKraken](https://www.gitkraken.com/), [WebStorm](https://www.jetbrains.com/webstorm/)
+* Recommended tools: [GitKraken](https://www.gitkraken.com/), [WebStorm](https://www.jetbrains.com/webstorm/), [ShareX](https://getsharex.com/)
 * If you work on UI components - work in book environment (`yarn serve:book`). We want to keep global stuff out of components.
 
+#### Component folder structure
+
+Here's the component folder structure example for `va-checkbox` component.
+
+```
+va-checkbox // component directory
+  |- VaCheckbox.vue // component itself
+  |- VaCheckbox.demo.vue // component demo
+  |- VaCheckbox.spec.js // component tests
+  |- va-checkbox-docs.md // component documentation
+```
+
+This will allow us to easier version documentation as well as simplify transition docs to mature version (generation from markdown).
+
+Here's couple of points about these files:
+* Only tests are optional, documentation and demos are not. Docs and demos should also cover all supported cases.
+* Documentation for now should be duplicated to both wiki and `.md`, but you can copy it to wiki only before PR merge while keeping `*-docs.md` updated all the time.
+
 #### Before release workflow
 * Update package versions to newest ones. Update lock files (for both `npm` and `yarn`)
 
 ### Commonly used NPM scripts
 
 ``` bash
 # run dev server
-$ npm run serve
+$ yarn serve
+
+# run dev server
+$ yarn serve:book
 
 # build vuestic project into bundle
-$ npm run build
+$ yarn build
 ```
 
 ## Credits

.postcssrc.js

@@ -1,5 +1,5 @@
 module.exports = {
   plugins: {
-    autoprefixer: {}
-  }
+    autoprefixer: {},
+  },
 }

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018 Epicmax LLC
+Copyright (c) 2019 Epicmax LLC
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.ja-JP.md

@@ -0,0 +1,131 @@
+<p align="center"> 
+  <a href="./README.md"> English </a> | <a href="./README.zh-CN.md"> 简体中文 </a> | 日本語
+</p>
+
+<h1 align="center"> Vuestic Admin </h1>
+
+<p align="center">
+  38+のカスタムUIコンポーネントと美しいデザインのVue.js無料管理画面テンプレート</br>
+  開発者  <a href="https://epicmax.co">Epicmax</a>. 
+  デザイン <a href="https://www.xxsavitski.com">Vasili Savitski</a>
+</p>
+
+<p align="center">
+  <a href="https://epicmax.co"> デモ </a> | <a href="https://github.com/epicmaxco/vuestic-admin/wiki"> 説明書 </a>
+</p>
+
+<p align="center">
+  <a href="https://vuestic.epicmax.co" target="_blank">
+    <img src="https://i.imgur.com/q60P8VR.png" align="center" width="888px"/>
+  </a>
+</p>
+
+
+<p align="center">
+  <a href="https://circleci.com/gh/epicmaxco/vuestic-admin">
+    <img src="https://img.shields.io/circleci/build/github/epicmaxco/vuestic-admin/master" alt="Circleci">
+  </a>
+</p>
+
+## インストール方法
+
+まず初めに、事前に必要なソフトが全てインストールされていることを確認してください。
+- [Node.js](https://nodejs.org/en/) (>=8.9)
+- [npm](https://www.npmjs.com/get-npm) バージョン3+ (あるいは[yarn](https://yarnpkg.com/lang/en/docs/install/#mac-stable)バージョン1.16+) と[Git](https://git-scm.com/).
+
+必要なソフトウェアがインストールされていることを確認できたら、次に示す簡単なステップに沿ってVuestic Adminをインストールして、ご使用ください。
+
+```
+# repoをクローン
+$ git clone https://github.com/epicmaxco/vuestic-admin.git myproject
+
+# appディレクトリに移動し、dependenciesをインストール
+$ cd myproject
+
+```
+
+npmをご使用の方：
+
+```
+$ npm install
+
+# localhost:8080（デフォルト）でホットリロードを使ってサーブ
+$ npm run serve
+
+# プロダクション用にビルド 
+$ npm run build
+
+# プロダクション用にビルドして、バンドルアナライザーレポートを閲覧
+$ npm run build --report
+```
+
+yarnをご使用の方：
+
+```
+$ yarn install
+
+# localhost:8080（デフォルト）でホットリロードを使ってサーブ
+$ yarn serve
+
+# プロダクション用にビルド
+$ yarn build
+
+# プロダクション用にビルドして、バンドルアナライザーレポートを閲覧
+$ yarn build --report
+```
+
+## 機能
+[レスポンシブレイアウト](https://vuestic.epicmax.co/#/admin/dashboard) |
+[チャート (Chart.js)](https://vuestic.epicmax.co/#/admin/statistics/charts) |
+[プログレスバー](https://vuestic.epicmax.co/#/admin/statistics/progress-bars) |
+[フォーム](https://vuestic.epicmax.co/#/admin/forms/form-elements) |
+[セレクト](https://vuestic.epicmax.co/#/admin/forms/form-elements) |
+[デートピッカー](https://vuestic.epicmax.co/#/admin/forms/form-elements) |
+[チェックボックス・ラジオ](https://vuestic.epicmax.co/#/admin/forms/form-elements) |
+[スタティックテーブル・データテーブル](https://vuestic.epicmax.co/#/admin/tables/data) |
+[mediumエディタ](https://vuestic.epicmax.co/#/admin/forms/medium-editor) |
+[スムーズタイポグラフィ](https://vuestic.epicmax.co/#/admin/ui/typography) |
+[ボタン](https://vuestic.epicmax.co/#/admin/ui/buttons) |
+[折りたたみ](https://vuestic.epicmax.co/#/admin/ui/collapses) |
+[カラーピッカー](https://vuestic.epicmax.co/#/admin/ui/color-pickers) |
+[タイムライン](https://vuestic.epicmax.co/#/admin/ui/timelines) |
+[トースト](https://vuestic.epicmax.co/#/admin/ui/notifications) |
+[ツールチップ](https://vuestic.epicmax.co/#/admin/ui/popovers) |
+[ポップオーバー](https://vuestic.epicmax.co/#/admin/ui/popovers) |
+[アイコン](https://vuestic.epicmax.co/#/admin/ui/icons/) |
+[スピナー](https://vuestic.epicmax.co/#/admin/ui/spinners) |
+[モーダル](https://vuestic.epicmax.co/#/admin/ui/modals) |
+[ファイルアップロード](https://vuestic.epicmax.co/#/admin/ui/file-upload) |
+[チップ](https://vuestic.epicmax.co/#/admin/ui/chips) |
+[ツリー](https://vuestic.epicmax.co/#/admin/ui/tree-view) |
+[カード ](https://vuestic.epicmax.co/#/admin/ui/cards) |
+[レーティング](https://vuestic.epicmax.co/#/admin/ui/rating) |
+[スライダー](https://vuestic.epicmax.co/#/admin/ui/sliders) |
+[チャット](https://vuestic.epicmax.co/#/admin/ui/chatPage) |
+[マップ (Google, Yandex, Leaflet, amMap)](https://vuestic.epicmax.co/#/admin/maps/google-maps) |
+[ログイン/登録ページテンプレート](https://vuestic.epicmax.co/#/auth/login) |
+[404ページテンプレート](https://vuestic.epicmax.co/#/admin/pages/404-pages) |
+[i18n](https://vuestic.epicmax.co/#/admin/dashboard)
+
+
+## ブラウザサポート
+
+| [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/edge/edge_48x48.png" alt="IE / Edge" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>IE / Edge | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/firefox/firefox_48x48.png" alt="Firefox" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Firefox | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/chrome/chrome_48x48.png" alt="Chrome" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Chrome | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/safari/safari_48x48.png" alt="Safari" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Safari | [<img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/opera/opera_48x48.png" alt="Opera" width="24px" height="24px" />](http://godban.github.io/browsers-support-badges/)</br>Opera |
+| --- | --- | --- | --- | --- |
+| IE11, Edge | last 2 versions | last 2 versions | last 2 versions | last 2 versions |
+
+
+## 支援メンバー
+素晴らしいPR、課題、アイデアをご提供いただきいつもありがとうございます。[参加](https://github.com/epicmaxco/vuestic-admin/blob/master/.github/CONTRIBUTING.md)いただける方を常に受け付けています! 
+
+[![](https://sourcerer.io/fame/smartapant/epicmaxco/vuestic-admin/images/0)](https://sourcerer.io/fame/smartapant/epicmaxco/vuestic-admin/links/0)[![](https://sourcerer.io/fame/smartapant/epicmaxco/vuestic-admin/images/1)](https://sourcerer.io/fame/smartapant/epicmaxco/vuestic-admin/links/1)[![](https://sourcerer.io/fame/smartapant/epicmaxco/vuestic-admin/images/2)](https://sourcerer.io/fame/smartapant/epicmaxco/vuestic-admin/links/2)[![](https://sourcerer.io/fame/smartapant/epicmaxco/vuestic-admin/images/3)](https://sourcerer.io/fame/smartapant/epicmaxco/vuestic-admin/links/3)[![](https://sourcerer.io/fame/smartapant/epicmaxco/vuestic-admin/images/4)](https://sourcerer.io/fame/smartapant/epicmaxco/vuestic-admin/links/4)[![](https://sourcerer.io/fame/smartapant/epicmaxco/vuestic-admin/images/5)](https://sourcerer.io/fame/smartapant/epicmaxco/vuestic-admin/links/5)[![](https://sourcerer.io/fame/smartapant/epicmaxco/vuestic-admin/images/6)](https://sourcerer.io/fame/smartapant/epicmaxco/vuestic-admin/links/6)[![](https://sourcerer.io/fame/smartapant/epicmaxco/vuestic-admin/images/7)](https://sourcerer.io/fame/smartapant/epicmaxco/vuestic-admin/links/7)
+
+## あなた方に仕事を依頼することはできますか？
+はい！一声おかけください：[[email protected]](mailto:[email protected]) </br>
+ぜひ一緒に仕事をしましょう！その他これまでやってきた仕事 - [epicmax.co](https://epicmax.co)
+
+## ソーシャルネットワーク
+Vuesticの最新ニュースを受け取ろう！[Twitter](https://twitter.com/epicmaxco)や [Facebook](https://facebook.com/epicmaxco)でフォローしてください。
+
+## ライセンス
+[MIT](https://github.com/epicmaxco/vuestic-admin/blob/master/LICENSE) license