Merge branch 'develop'

Author: asvae

.browserslistrc

@@ -43,11 +43,12 @@ jobs:
           command:
             echo "VUE_APP_INCLUDE_DEMOS=true" >> .env.production.local &&
             echo "VUE_APP_BUILD_VERSION=true" >> .env.production.local &&
+            echo "VUE_APP_GTM_ENABLED=false" >> .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
+      - run: yarn build:ci
       - add_ssh_keys:
           fingerprints:
             - "f8:c0:94:79:68:a2:5e:33:9f:78:bc:ad:ed:86:c6:3c"
@@ -76,11 +77,12 @@ jobs:
             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_GTM_ENABLED=true" >> .env.production.local &&
             echo "VUE_APP_ROUTER_MODE_HISTORY=$ROUTER_MODE_HISTORY" >> .env.production.local
       - restore_cache: *restore_cache
       - run: *install_dependencies
       - save_cache: *save_cache
-      - run: yarn build
+      - run: yarn build:ci
       - run:
           name: Deploy to hosting
           command: |

.circleci/config.yml

@@ -1,29 +1,55 @@
+// TODO: DONT FORGET TO ADD 
+  
+// TO package.json
+// "gitHooks": {
+//   "pre-commit": "lint-staged"
+// },
+
 module.exports = {
   root: true,
   env: {
-    node: true,
+    node: true
   },
   extends: [
-    '@vue/standard',
-    'plugin:vue/essential',
+    'plugin:vue/vue3-essential',
+    'eslint:recommended',
+    '@vue/typescript/recommended'
   ],
-  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': []
-    }]
-  },
+  // old version
+  // extends: [
+  //   '@vue/standard',
+  //   'plugin:vue/essential',
+  //   '@vue/typescript',
+  // ],
   parserOptions: {
-    parser: 'babel-eslint',
+    parser: '@typescript-eslint/parser',
+    ecmaVersion: 2020
   },
   globals: {
-    'workbox': 'readonly',
+    workbox: 'readonly',
+  },
+  rules: {
+    'no-console': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
+    'no-debugger': process.env.NODE_ENV === 'production' ? 'warn' : 'off',
+    // 'comma-dangle': ['error', 'always-multiline'],
+    curly: 'error',
+    'vue/html-indent': ['error', 2, {
+      attribute: 1,
+      baseIndent: 1,
+      closeBracket: 0,
+      alignAttributesVertically: false,
+      ignores: [],
+    }],
   },
+  overrides: [
+    {
+      files: [
+        '**/__tests__/*.{j,t}s?(x)',
+        '**/tests/unit/**/*.spec.{j,t}s?(x)'
+      ],
+      env: {
+        jest: true
+      }
+    }
+  ]
 }

.eslintrc.js

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2019 Epicmax LLC
+Copyright (c) 2021 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

.postcssrc.js

@@ -1,29 +1,30 @@
->We’re working on Vuestic UI component library, which lets you easily customize components to your own design.<br>
->Get early access and receive support from the core team! 😎<br>
->[Sign up now](https://vuestic-ui.epicmax.co)
-
-<br>
-<br>
-
-
 <p align="center">
-  English | <a href="./README.zh-CN.md"> 简体中文 </a> | <a href="./README.ja-JP.md"> 日本語 </a>
+  <a href="https://vuestic.dev" target="_blank">
+    <img alt="Vuestic UI Logo" width="500" src="./public/img/vuestic-admin-logo.png">
+  </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>.
-  Designed by <a href="https://www.xxsavitski.com">Vasili Savitski</a>
+  Designed by <a href="https://xxsavitski.com/">Vasili Savitski</a>
+<br>
+Based on <a href="https://github.com/epicmaxco/vuestic-ui">Vuestic UI</a> library.
 </p>
 
+
 <p align="center">
-  <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>
+  <a href="https://vuestic.epicmax.co/admin/dashboard?theme=corporate"> White theme demo </a> | <a href="https://vuestic.epicmax.co">Blue theme demo </a> | <a href="https://vuestic.dev"> Documentation </a>
 </p>
+
+> Vuestic Admin is built with Vuestic UI. See our
+<a href="https://github.com/epicmaxco/vuestic-ui/issues">issues</a>,
+<a href="https://vuestic.dev/en/contribution/guide">contributing guide</a> and join discussions on our
+<a href="https://discord.gg/jTKTjj2weV">discord server</a> to help us improve Vuestic Admin & Vuestic UI experience.
+
 <p align="center">
   <a href="https://vuestic.epicmax.co" target="_blank">
-    <img src="https://i.imgur.com/N9AeaSc.jpg" align="center" width="888px"/>
+    <img src="./public/img/vuestic-admin-image.jpg" align="center" width="888px"/>
   </a>
 </p>
 
@@ -33,25 +34,27 @@
   </a>
 </p>
 
-<h2>
-  <a href="https://vuestic.epicmax.co/admin/dashboard?theme=corporate" target="_blank">
-    New white theme demo
-  </a>
-</h2>
+### Documentation
 
-<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>
+Documentation, guides and tutorials are available
+on <a href="https://vuestic.dev">vuestic.dev</a>
 
-## Installation
+### Official Discord Server
+
+Ask questions at the official
+community [discord server](https://discord.gg/jTKTjj2weV)
+
+### Installation
 
 First of all, make sure you have all prerequisites installed:
-- [Node.js](https://nodejs.org/en/) (>=8.9)
-- [npm](https://www.npmjs.com/get-npm) version 3+ (or [yarn](https://yarnpkg.com/lang/en/docs/install/#mac-stable) version 1.16+)  and [Git](https://git-scm.com/).
 
-After checking the prerequisites, follow these simple steps to install and use Vuestic Admin:
+* [Node.js](https://nodejs.org/en/) ( >=14.*)
+* [npm](https://www.npmjs.com/get-npm) version 3+ (
+  or [yarn](https://yarnpkg.com/lang/en/docs/install) version 1.16+)
+  and [Git](https://git-scm.com).
+
+After checking the prerequisites, follow these simple steps to install and use
+Vuestic Admin:
 
 ```
 # clone the repo
@@ -78,6 +81,7 @@ $ npm run build --report
 ```
 
 If you use yarn:
+
 ```
 $ yarn install
 
@@ -91,67 +95,83 @@ $ yarn build
 $ yarn build --report
 ```
 
-## Features
-[Responsive layout](https://vuestic.epicmax.co/#/admin/dashboard) |
-[charts (Chart.js)](https://vuestic.epicmax.co/#/admin/statistics/charts) |
-[progress bars](https://vuestic.epicmax.co/#/admin/statistics/progress-bars) |
-[forms](https://vuestic.epicmax.co/#/admin/forms/form-elements) |
-[selects](https://vuestic.epicmax.co/#/admin/forms/form-elements) |
-[date pickers](https://vuestic.epicmax.co/#/admin/forms/form-elements) |
-[checkboxes and radios](https://vuestic.epicmax.co/#/admin/forms/form-elements) |
-[static tables and data tables](https://vuestic.epicmax.co/#/admin/tables/data) |
-[medium editor](https://vuestic.epicmax.co/#/admin/forms/medium-editor) |
-[smooth typography](https://vuestic.epicmax.co/#/admin/ui/typography) |
-[buttons](https://vuestic.epicmax.co/#/admin/ui/buttons) |
-[collapses](https://vuestic.epicmax.co/#/admin/ui/collapses) |
-[color pickers](https://vuestic.epicmax.co/#/admin/ui/color-pickers) |
-[timelines](https://vuestic.epicmax.co/#/admin/ui/timelines) |
-[toasts](https://vuestic.epicmax.co/#/admin/ui/notifications) |
-[tooltips](https://vuestic.epicmax.co/#/admin/ui/popovers) |
-[popovers](https://vuestic.epicmax.co/#/admin/ui/popovers) |
-[icons](https://vuestic.epicmax.co/#/admin/ui/icons/) |
-[spinners](https://vuestic.epicmax.co/#/admin/ui/spinners) |
-[modals](https://vuestic.epicmax.co/#/admin/ui/modals) |
-[file upload](https://vuestic.epicmax.co/#/admin/ui/file-upload) |
-[chips](https://vuestic.epicmax.co/#/admin/ui/chips) |
-[trees](https://vuestic.epicmax.co/#/admin/ui/tree-view) |
-[cards](https://vuestic.epicmax.co/#/admin/ui/cards) |
-[ratings](https://vuestic.epicmax.co/#/admin/ui/rating) |
-[sliders](https://vuestic.epicmax.co/#/admin/ui/sliders) |
-[chat](https://vuestic.epicmax.co/#/admin/ui/chatPage) |
-[maps (Google, Yandex, Leaflet, amMap)](https://vuestic.epicmax.co/#/admin/maps/google-maps) |
-[login/signup pages templates](https://vuestic.epicmax.co/#/auth/login) |
-[404 pages templates](https://vuestic.epicmax.co/#/admin/pages/404-pages) |
-[i18n](https://vuestic.epicmax.co/#/admin/dashboard)
-
-
-## Browser Support
-Modern browsers and IE11
-
-| [<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 |
+### Features
+
+[Responsive layout](https://vuestic.epicmax.co/admin/dashboard) |
+[charts (Chart.js)](https://vuestic.epicmax.co/admin/statistics/charts) |
+[progress bars](https://vuestic.epicmax.co/admin/statistics/progress-bars) |
+[forms](https://vuestic.epicmax.co/admin/forms/form-elements) |
+[selects](https://vuestic.epicmax.co/admin/forms/form-elements) |
+[date pickers](https://vuestic.epicmax.co/admin/forms/form-elements) |
+[checkboxes and radios](https://vuestic.epicmax.co/admin/forms/form-elements)
+|
+[static tables and data tables](https://vuestic.epicmax.co/admin/tables/data)
+|
+[medium editor](https://vuestic.epicmax.co/admin/forms/medium-editor) |
+[smooth typography](https://vuestic.epicmax.co/admin/ui/typography) |
+[buttons](https://vuestic.epicmax.co/admin/ui/buttons) |
+[collapses](https://vuestic.epicmax.co/admin/ui/collapses) |
+[color pickers](https://vuestic.epicmax.co/admin/ui/color-pickers) |
+[timelines](https://vuestic.epicmax.co/admin/ui/timelines) |
+[toasts](https://vuestic.epicmax.co/admin/ui/notifications) |
+[tooltips](https://vuestic.epicmax.co/admin/ui/popovers) |
+[popovers](https://vuestic.epicmax.co/admin/ui/popovers) |
+[icons](https://vuestic.epicmax.co/admin/ui/icons/) |
+[spinners](https://vuestic.epicmax.co/admin/ui/spinners) |
+[modals](https://vuestic.epicmax.co/admin/ui/modals) |
+[file upload](https://vuestic.epicmax.co/admin/ui/file-upload) |
+[chips](https://vuestic.epicmax.co/admin/ui/chips) |
+[trees](https://vuestic.epicmax.co/admin/ui/tree-view) |
+[cards](https://vuestic.epicmax.co/admin/ui/cards) |
+[ratings](https://vuestic.epicmax.co/admin/ui/rating) |
+[sliders](https://vuestic.epicmax.co/admin/ui/sliders) |
+[chat](https://vuestic.epicmax.co/admin/ui/chatPage) |
+[maps (Google, Yandex, Leaflet, amMap)](https://vuestic.epicmax.co/admin/maps/google-maps)
+|
+[login/signup pages templates](https://vuestic.epicmax.co/auth/login) |
+[404 pages templates](https://vuestic.epicmax.co/admin/pages/404-pages) |
+[i18n](https://vuestic.epicmax.co/admin/dashboard)
+
+### Browser Support
+
+We design Vuestic Admin to support the latest modern web browsers.
+
+| <img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/edge/edge_48x48.png" alt="Edge" width="24px" height="24px" /><br>Edge | <img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/firefox/firefox_48x48.png" alt="Firefox" width="24px" height="24px" /><br>Firefox | <img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/chrome/chrome_48x48.png" alt="Chrome" width="24px" height="24px" /><br>Chrome | <img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/safari/safari_48x48.png" alt="Safari" width="24px" height="24px" /><br>Safari | <img src="https://raw.githubusercontent.com/alrra/browser-logos/master/src/opera/opera_48x48.png" alt="Opera" width="24px" height="24px" /><br>Opera |
 | --- | --- | --- | --- | --- |
-| IE11, Edge | last 2 versions | last 2 versions | last 2 versions | last 2 versions |
+| Edge | last 2 versions  | last 2 versions | last 2 versions | last 2 versions |
 
+### Contributing
+
+Thanks for all your wonderful PRs, issues and ideas.
+<a href="https://github.com/epicmaxco/vuestic-admin/graphs/contributors">
+<img src="https://opencollective.com/vuestic-admin/contributors.svg?width=890&button=false" />
+</a>
+<br>
+You’re always welcome to join: check out
+our <a href="https://vuestic.dev/en/contribution/guide">
+contribution guides</a>
+, [open issues](https://github.com/epicmaxco/vuestic-ui/issues)
+and [discord server](https://discord.gg/jTKTjj2weV)
 
-## Contributing
-Thanks for all your wonderful PRs, issues and ideas. You’re always welcome to [join](https://github.com/epicmaxco/vuestic-admin/blob/master/.github/CONTRIBUTING.md)!
+## Can I hire you guys?
+Yes! Say hi: [[email protected]](mailto:[email protected]) </br>
+We will be happy to work with you! Other [work we’ve done](https://epicmax.co)
 
-[![](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)
+### Awards
 
-## Awards
 <a href="https://flatlogic.com/templates/vuestic-vue-free-admin" target="_blank">
     <img src="https://i.imgur.com/ZeQPZ3Q.png" align="center" width="150px"/>
 </a>
 <p>
   By <a href="https://flatlogic.com/templates/vuestic-vue-free-admin" target="_blank">@flatlogic</a> marketplace
 </p>
 
-## Can I hire you guys?
-Yes! Say hi: [[email protected]](mailto:[email protected]) </br>
-We will be happy to work with you! Other [work we’ve done](https://epicmax.co)
+### Follow us
+
+Stay up to date with the latest Vuestic news! Follow us
+on [Twitter](https://twitter.com/epicmaxco)
+or [Facebook](https://facebook.com/epicmaxco)
 
-## Follow us
-Stay up to date with the latest Vuestic news! Follow us on [Twitter](https://twitter.com/epicmaxco) or [Facebook](https://facebook.com/epicmaxco)
+### License
 
-## License
 [MIT](https://github.com/epicmaxco/vuestic-admin/blob/master/LICENSE) license.

.stylelintrc

@@ -1,8 +1,12 @@
 module.exports = {
-  presets: [[
-    '@vue/app',
-    {
-      useBuiltIns: 'entry',
-    },
-  ]],
+  presets: [
+    '@vue/cli-plugin-babel/preset',
+  ],
+  // old version
+  // presets: [[
+  //   '@vue/app',
+  //   {
+  //     useBuiltIns: 'entry',
+  //   },
+  // ]],
 }