Merge pull request #737 from epicmaxco/develop

Develop
epicmaxco · Feb 4, 2020 · 568c6d7 · 568c6d7
2 parents 52b7190 + 94d41e7
commit 568c6d7
Show file tree

Hide file tree

Showing 167 changed files with 17,897 additions and 13,764 deletions.
diff --git a/.browserslistrc b/.browserslistrc
@@ -1,3 +1,3 @@
 > 1%
 last 2 versions
-not ie <= 8
+ie 11
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -16,7 +16,7 @@ aliases:
 
 docker: &docker
   docker:
-    - image: circleci/node:10.12.0
+    - image: circleci/node:10.13.0
 
 defaults: &defaults
   <<: *docker
@@ -42,20 +42,24 @@ jobs:
           name: Add variables
           command:
             echo "VUE_APP_INCLUDE_DEMOS=true" >> .env.production.local &&
+            echo "VUE_APP_BUILD_VERSION=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: yarn build
+      - add_ssh_keys:
+          fingerprints:
+            - "f8:c0:94:79:68:a2:5e:33:9f:78:bc:ad:ed:86:c6:3c"
+      - run:
+          name: Add $SERVER_IP to known_hosts
+          command: ssh-keyscan -H $SERVER_IP >> ~/.ssh/known_hosts
       - 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
-            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
+            scp  ~/repo/dist.tar.gz $SERVER_USER@$SERVER_IP:~/tmp
+            ssh $SERVER_USER@$SERVER_IP /bin/bash << EOF
               rm -rf $DEPLOY_PATH/*
               tar -xzf ~/tmp/dist.tar.gz -C $DEPLOY_PATH
               rm -f ~/tmp/dist.tar.gz
@@ -98,7 +102,7 @@ workflows:
       - deploy-staging:
           requires:
             - test
-          context: vuestic-staging
+          context: vuestic-admin-staging
           filters:
             branches:
               only: develop

diff --git a/.env.example b/.env.example
@@ -1,7 +1,8 @@
 VUE_APP_GTM_KEY=
-VUE_APP_DRIFT_KEY=
 VUE_APP_GOOGLE_MAPS_API_KEY=
 
 VUE_APP_INCLUDE_DEMOS=
 
 VUE_APP_ROUTER_MODE_HISTORY=
+
+VUE_APP_BUILD_VERSION=
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -3,17 +3,27 @@ module.exports = {
   env: {
     node: true,
   },
-  'extends': [
-    'plugin:vue/essential',
+  extends: [
     '@vue/standard',
+    'plugin:vue/essential',
   ],
   rules: {
     'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
     'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off',
     'comma-dangle': ['error', 'always-multiline'],
     'curly': 'error',
+    'vue/html-indent': ['error', 2, {
+      'attribute': 1,
+      'baseIndent': 1,
+      'closeBracket': 0,
+      'alignAttributesVertically': false,
+      'ignores': []
+    }]
   },
   parserOptions: {
     parser: 'babel-eslint',
   },
+  globals: {
+    'workbox': 'readonly',
+  },
 }
diff --git a/.gitignore b/.gitignore
@@ -10,6 +10,7 @@ node_modules
 npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
+stylelintOutput.log*
 inspect.js
 
 # Editor directories and files
@@ -20,3 +21,4 @@ inspect.js
 *.njsproj
 *.sln
 *.sw*
+*.orig
diff --git a/.stylelintrc b/.stylelintrc
@@ -0,0 +1,11 @@
+{
+  "extends": ["stylelint-config-standard", "stylelint-config-recommended-scss"],
+  "rules": {
+    "no-empty-source": null,
+    "font-family-no-missing-generic-family-keyword": null,
+    "block-no-empty": null,
+    "no-descending-specificity": null,
+    "color-hex-length": "long",
+    "color-hex-case": "lower"
+  }
+}
diff --git a/README.ja-JP.md b/README.ja-JP.md
@@ -1,32 +1,43 @@
-<p align="center"> 
+<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://epicmax.co">Epicmax</a>.
   デザイン <a href="https://www.xxsavitski.com">Vasili Savitski</a>
 </p>
 
 <p align="center">
-  <a href="https://vuestic.epicmax.co"> デモ </a> | <a href="https://github.com/epicmaxco/vuestic-admin/wiki"> 説明書 </a>
+  <a href="https://vuestic.epicmax.co"> デモ </a> | <a href="[THEME_URL]"> 新しい白いテーマのデモ </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"/>
+    <img src="https://i.imgur.com/RMchKNW.jpg" 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>
 
+<h2>
+  <a href="[THEME_URL]" target="_blank">
+    新しい白いテーマのデモ
+  </a>
+</h2>
+
+<p align="center">
+  <a href="[THEME_URL]" target="_blank">
+    <img src="https://i.imgur.com/DnFcrjD.png" align="center" width="888px"/>
+  </a>
+</p>
+
 ## インストール方法
 
 まず初めに、事前に必要なソフトが全てインストールされていることを確認してください。
@@ -52,7 +63,7 @@ $ npm install
 # localhost:8080（デフォルト）でホットリロードを使ってサーブ
 $ npm run serve
 
-# プロダクション用にビルド 
+# プロダクション用にビルド
 $ npm run build
 
 # プロダクション用にビルドして、バンドルアナライザーレポートを閲覧
@@ -116,7 +127,7 @@ $ yarn build --report
 
 
 ## 支援メンバー
-素晴らしいPR、課題、アイデアをご提供いただきいつもありがとうございます。[参加](https://github.com/epicmaxco/vuestic-admin/blob/master/.github/CONTRIBUTING.md)いただける方を常に受け付けています! 
+素晴らしい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)
 

diff --git a/README.md b/README.md
@@ -6,34 +6,44 @@
 <br>
 
 
-<p align="center"> 
+<p align="center">
   English | <a href="./README.zh-CN.md"> 简体中文 </a> | <a href="./README.ja-JP.md"> 日本語 </a>
 </p>
 
 <h1 align="center"> Vuestic Admin </h1>
-  
+
 <p align="center">
   Free and beautiful Vue.js admin template with 44+ custom UI components.</br>
-  Developed by  <a href="https://epicmax.co">Epicmax</a>. 
+  Developed by  <a href="https://epicmax.co">Epicmax</a>.
   Designed by <a href="https://www.xxsavitski.com">Vasili Savitski</a>
 </p>
 
 <p align="center">
-  <a href="https://vuestic.epicmax.co"> Demo </a> | <a href="https://github.com/epicmaxco/vuestic-admin/wiki"> Documentation </a>
+  <a href="https://vuestic.epicmax.co"> Demo </a> | <a href="https://vuestic.epicmax.co/admin/dashboard?theme=corporate"> New white theme demo </a> | <a href="https://github.com/epicmaxco/vuestic-admin/wiki"> Documentation </a>
 </p>
 <p align="center">
   <a href="https://vuestic.epicmax.co" target="_blank">
-    <img src="https://i.imgur.com/h37ur0s.png" align="center" width="888px"/>
+    <img src="https://i.imgur.com/N9AeaSc.jpg" 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>
 
+<h2>
+  <a href="https://vuestic.epicmax.co/admin/dashboard?theme=corporate" target="_blank">
+    New white theme demo
+  </a>
+</h2>
+
+<p align="center">
+  <a href="https://vuestic.epicmax.co/admin/dashboard?theme=corporate" target="_blank">
+    <img src="https://i.imgur.com/DnFcrjD.png" align="center" width="888px"/>
+  </a>
+</p>
 
 ## Installation
 
@@ -60,7 +70,7 @@ $ npm install
 # serve with hot reload at localhost:8080 by default.
 $ npm run serve
 
-# build for production 
+# build for production
 $ npm run build
 
 # build for production and view the bundle analyzer report.
@@ -74,7 +84,7 @@ $ yarn install
 # serve with hot reload at localhost:8080 by default.
 $ yarn serve
 
-# build for production 
+# build for production
 $ yarn build
 
 # build for production and view the bundle analyzer report.

diff --git a/README.zh-CN.md b/README.zh-CN.md
@@ -1,22 +1,22 @@
-<p align="center"> 
+<p align="center">
   <a href="./README.md"> English </a> | 简体中文 | <a href="./README.ja-JP.md"> 日本語 </a>
 </p>
 
 <h1 align="center"> Vuestic Admin </h1>
-  
+
 <p align="center">
   免费与美妙Vue.js管理模板包括38以上个定制用户界面组件</br>
   由<a href="https://epicmax.co">Epicmax</a>开发。
   由<a href="https://www.xxsavitski.com">Vasili Savitski</a>设计
 </p>
 
 <p align="center">
-  <a href="https://vuestic.epicmax.co">演示版</a> | <a href="https://github.com/epicmaxco/vuestic-admin/wiki"> 文档 </a>
+  <a href="https://vuestic.epicmax.co"> 演示版 </a> | <a href="[THEME_URL]"> 新白色主题演示 </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/hgcSCmT.png" align="center" width="888px"/>
+    <img src="https://i.imgur.com/hVxoYQM.jpg" align="center" width="888px"/>
   </a>
 </p>
 
@@ -27,6 +27,19 @@
   </a>
 </p>
 
+
+<h2>
+  <a href="[THEME_URL]" target="_blank">
+    新白色主题演示
+  </a>
+</h2>
+
+<p align="center">
+  <a href="[THEME_URL]" target="_blank">
+    <img src="https://i.imgur.com/DnFcrjD.png" align="center" width="888px"/>
+  </a>
+</p>
+
 ## 安装
 
 首先确定ni安装所有的先决条件：

diff --git a/babel.config.js b/babel.config.js
@@ -1,5 +1,8 @@
 module.exports = {
-  presets: [
+  presets: [[
     '@vue/app',
-  ],
+    {
+      useBuiltIns: 'entry',
+    },
+  ]],
 }
diff --git a/docs/pre-production.md b/docs/pre-production.md
@@ -5,7 +5,6 @@
 We have a boierplate prepared with some analytics ingrained. This includes:
 
 * [Yandex Metrica](https://metrica.yandex.com/about)
-* [Drift](https://www.drift.com/mobile-app/)
 
 To get these running - just provide keys to respective apis. You're advised to copy `.env.example` with rename to `.env` then modify it.
 
@@ -36,3 +35,13 @@ You can enable demos in build by:
 VUE_APP_INCLUDE_DEMOS=true
 ```
 Demos are included in staging build by default. They're not present in production because of significant impact on bundle size.
+
+
+## Build Version
+
+You can enable build version, hash commit, and timestamp by build to the main page footer:
+
+```
+VUE_APP_BUILD_VERSION=true
+```
+This information are excluded by default.