Merge pull request #57 from creativetimofficial/feature/v2.0.0

Feature/v2.0.0

.browserslistrc

@@ -0,0 +1,3 @@
+> 1%
+last 2 versions
+not dead

.eslintrc.js

@@ -0,0 +1,14 @@
+module.exports = {
+  root: true,
+  env: {
+    node: true,
+  },
+  extends: ["plugin:vue/vue3-essential", "eslint:recommended", "@vue/prettier"],
+  parserOptions: {
+    parser: "babel-eslint",
+  },
+  rules: {
+    "no-console": process.env.NODE_ENV === "production" ? "warn" : "off",
+    "no-debugger": process.env.NODE_ENV === "production" ? "warn" : "off",
+  },
+};

CHANGELOG.md

@@ -1,3 +1,7 @@
+## [2.0.0] - 2021-02-22
+### Vue 3 Update
+- Compatibility with new Vuejs 3
+
 ## [1.1.1] - 2020-11-25
 - Change broken links
 

README.md

@@ -2,7 +2,7 @@
 
 
 
- ![version](https://img.shields.io/badge/version-1.1.1-blue.svg)  ![license](https://img.shields.io/badge/license-MIT-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/vue-argon-dashboard.svg?maxAge=2592000)](https://github.com/creativetimofficial/vue-argon-dashboard/issues?q=is%3Aopen+is%3Aissue) [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/vue-argon-dashboard.svg?maxAge=2592000)](https://github.com/creativetimofficial/vue-argon-dashboard/issues?q=is%3Aissue+is%3Aclosed) [![Join the chat at https://gitter.im/NIT-dgp/General](https://badges.gitter.im/NIT-dgp/General.svg)](https://gitter.im/creative-tim-general/Lobby) [![Chat](https://img.shields.io/badge/chat-on%20discord-7289da.svg)](https://discord.gg/E4aHAQy)
+ ![version](https://img.shields.io/badge/version-2.0.0-blue.svg)  ![license](https://img.shields.io/badge/license-MIT-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/vue-argon-dashboard.svg?maxAge=2592000)](https://github.com/creativetimofficial/vue-argon-dashboard/issues?q=is%3Aopen+is%3Aissue) [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/vue-argon-dashboard.svg?maxAge=2592000)](https://github.com/creativetimofficial/vue-argon-dashboard/issues?q=is%3Aissue+is%3Aclosed) [![Join the chat at https://gitter.im/NIT-dgp/General](https://badges.gitter.im/NIT-dgp/General.svg)](https://gitter.im/creative-tim-general/Lobby) [![Chat](https://img.shields.io/badge/chat-on%20discord-7289da.svg)](https://discord.gg/E4aHAQy)
 
 
 ![Product Gif](https://raw.githubusercontent.com/creativetimofficial/public-assets/master/vue-argon-dashboard/vue-argon-dashboard.gif)

babel.config.js

@@ -1,5 +1,12 @@
 module.exports = {
-  presets: [
-    '@vue/app'
-  ]
-}
+  presets: ["@vue/cli-plugin-babel/preset"],
+  plugins: [
+    [
+      "component",
+      {
+        libraryName: "element-plus",
+        styleLibraryName: "theme-chalk",
+      },
+    ],
+  ],
+};

package.json

@@ -1,62 +1,38 @@
 {
   "name": "vue-argon-dashboard",
-  "version": "1.1.1",
+  "version": "2.0.0",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
-    "dev": "vue-cli-service serve",
     "build": "vue-cli-service build",
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
-    "bootstrap": "4.5.0",
+    "bootstrap": "4.6.0",
     "bootstrap-vue": "2.15.0",
-    "chart.js": "2.9.3",
+    "chart.js": "2.9.4",
     "core-js": "3.6.5",
-    "flatpickr": "4.6.3",
+    "element-plus": "1.0.1-beta.24",
     "nouislider": "14.6.0",
-    "register-service-worker": "1.7.1",
-    "vue": "2.6.11",
-    "vue-chartjs": "3.5.0",
-    "vue-clipboard2": "0.3.1",
-    "vue-flatpickr-component": "8.1.5",
-    "vue-router": "3.3.4",
-    "vue2-transitions": "0.3.0"
+    "google-maps": "4.3.3",
+    "vue": "3.0.5",
+    "vue-toastification": "1.7.11",
+    "vue-router": "4.0.1"
   },
   "devDependencies": {
-    "@vue/cli-plugin-babel": "^4.4.6",
-    "@vue/cli-plugin-eslint": "^4.4.6",
-    "@vue/cli-plugin-pwa": "^4.4.6",
-    "@vue/cli-service": "^4.4.6",
-    "babel-eslint": "^10.1.0",
-    "eslint": "^7.3.1",
-    "eslint-plugin-vue": "^6.2.2",
-    "node-sass": "^4.14.1",
-    "sass-loader": "^8.0.2",
-    "vue-template-compiler": "2.6.11"
-  },
-  "eslintConfig": {
-    "root": true,
-    "env": {
-      "node": true
-    },
-    "extends": [
-      "plugin:vue/essential",
-      "eslint:recommended"
-    ],
-    "rules": {},
-    "parserOptions": {
-      "parser": "babel-eslint"
-    }
-  },
-  "postcss": {
-    "plugins": {
-      "autoprefixer": {}
-    }
-  },
-  "browserslist": [
-    "> 1%",
-    "last 2 versions",
-    "not ie <= 8"
-  ]
+    "@vue/cli-plugin-babel": "4.5.10",
+    "@vue/cli-plugin-eslint": "4.5.10",
+    "@vue/cli-plugin-router": "4.5.10",
+    "@vue/cli-service": "4.5.10",
+    "@vue/compiler-sfc": "3.0.5",
+    "@vue/eslint-config-prettier": "6.0.0",
+    "babel-eslint": "10.1.0",
+    "babel-plugin-component": "1.1.1",
+    "eslint": "7.17.0",
+    "eslint-plugin-prettier": "3.3.1",
+    "eslint-plugin-vue": "7.4.1",
+    "node-sass": "5.0.0",
+    "prettier": "2.2.1",
+    "sass-loader": "10.1.1"
+  }
 }

public/index.html

@@ -1,11 +1,11 @@
 <!--
 
 =========================================================
-* Vue Argon Dashboard - v1.1.1
+* Vue Argon Dashboard - v2.0.0
 =========================================================
 
 * Product Page: https://www.creative-tim.com/product/vue-argon-dashboard
-* Copyright 2020 Creative Tim (https://www.creative-tim.com)
+* Copyright 2021 Creative Tim (https://www.creative-tim.com)
 * Licensed under MIT (https://github.com/creativetimofficial/vue-argon-dashboard/blob/master/LICENSE.md)
 
 * Coded by Creative Tim
@@ -16,19 +16,17 @@
 
 -->
 <!DOCTYPE html>
-<html lang="en">
+<html lang="">
   <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
     <link rel="icon" href="<%= BASE_URL %>img/brand/favicon.png" type="image/png">
     <title>Vue Argon Dashboard - Free Dashboard for Vue.js & Bootstrap 4</title>
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.1/css/all.css" integrity="sha384-50oBUHEmvpQ+1lW4y57PTFmhCaXp0ML5d60M1M7uH2+nqUivzIebhndOJK28anvf" crossorigin="anonymous">
-    <script src="https://maps.googleapis.com/maps/api/js?key=YOUR_API_KEY"></script>
   </head>
   <body>
     <noscript>
-      <strong>We're sorry but vue-argon-dashboard doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
+      <strong>We're sorry but <%= htmlWebpackPlugin.options.title %> doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
     </noscript>
     <div id="app"></div>
     <!-- built files will be auto injected -->

src/App.vue

@@ -1,6 +1,5 @@
 <template>
   <div id="app">
-    <notifications></notifications>
-    <router-view/>
+    <router-view />
   </div>
 </template>

src/assets/scss/argon.scss

@@ -1,11 +1,11 @@
 /*!
 
 =========================================================
-* Vue Argon Dashboard - v1.1.1
+* Vue Argon Dashboard - v2.0.0
 =========================================================
 
 * Product Page: https://www.creative-tim.com/product/vue-argon-dashboard
-* Copyright 2020 Creative Tim (https://www.creative-tim.com)
+* Copyright 2021 Creative Tim (https://www.creative-tim.com)
 * Licensed under MIT (https://github.com/creativetimofficial/vue-argon-dashboard/blob/master/LICENSE.md)
 
 * Coded by Creative Tim

src/assets/scss/core/forms/_input-group.scss

@@ -26,6 +26,7 @@
 
 .input-group-text {
     transition: $input-transition;
+		border: 0;
 }
 
 

src/assets/scss/core/utilities/_opacity.scss

@@ -3,6 +3,9 @@
 // modify the transparency of an element with this quick modifier classes
 //
 
+.opacity-0 {
+    opacity: 0 !important;
+}
 .opacity-1 {
     opacity: .1 !important;
 }

src/assets/scss/core/utilities/_sizing.scss

@@ -2,6 +2,10 @@
 // Height
 //
 
+.h-0{
+	height: 0;
+}
+
 .h-100vh {
 	height: 100vh !important;
 }

src/assets/scss/core/utilities/_text.scss

@@ -45,5 +45,5 @@
 // Color variations
 
 @each $color, $value in $colors {
-	@include text-emphasis-variant(".text-#{$color}", $value);
+	@include text-emphasis-variant(".text-#{$color}", $value, true);
 }

src/assets/scss/custom/_components.scss

@@ -2,30 +2,30 @@
 // Components
 //
 
-@import "custom/alert";
-@import "custom/avatar";
-@import "custom/badge";
-@import "custom/buttons";
-@import "custom/card";
-@import "custom/chart";
-@import "custom/close";
-@import "custom/content";
-@import "custom/custom-forms";
-@import "custom/dropdown";
-@import "custom/footer";
-@import "custom/forms";
-@import "custom/header";
-@import "custom/icons";
-@import "custom/input-group";
-@import "custom/list-group";
-@import "custom/map";
-@import "custom/mask";
-@import "custom/modal";
-@import "custom/nav";
-@import "custom/navbar";
-@import "custom/pagination";
-@import "custom/popover";
-@import "custom/progress";
-@import "custom/separator";
-@import "custom/tables";
-@import "custom/type";
+@import "alert";
+@import "avatar";
+@import "badge";
+@import "buttons";
+@import "card";
+@import "chart";
+@import "close";
+@import "content";
+@import "custom-forms";
+@import "dropdown";
+@import "footer";
+@import "forms";
+@import "header";
+@import "icons";
+@import "input-group";
+@import "list-group";
+@import "map";
+@import "mask";
+@import "modal";
+@import "nav";
+@import "navbar";
+@import "pagination";
+@import "popover";
+@import "progress";
+@import "separator";
+@import "tables";
+@import "type";

src/assets/vendor/@fortawesome/fontawesome-free/LICENSE.txt

@@ -0,0 +1,34 @@
+Font Awesome Free License
+-------------------------
+
+Font Awesome Free is free, open source, and GPL friendly. You can use it for
+commercial projects, open source projects, or really almost whatever you want.
+Full Font Awesome Free license: https://fontawesome.com/license/free.
+
+# Icons: CC BY 4.0 License (https://creativecommons.org/licenses/by/4.0/)
+In the Font Awesome Free download, the CC BY 4.0 license applies to all icons
+packaged as SVG and JS file types.
+
+# Fonts: SIL OFL 1.1 License (https://scripts.sil.org/OFL)
+In the Font Awesome Free download, the SIL OFL license applies to all icons
+packaged as web and desktop font files.
+
+# Code: MIT License (https://opensource.org/licenses/MIT)
+In the Font Awesome Free download, the MIT license applies to all non-font and
+non-icon files.
+
+# Attribution
+Attribution is required by MIT, SIL OFL, and CC BY licenses. Downloaded Font
+Awesome Free files already contain embedded comments with sufficient
+attribution, so you shouldn't need to do anything additional when using these
+files normally.
+
+We've kept attribution comments terse, so we ask that you do not actively work
+to remove them from files, especially code. They're a great way for folks to
+learn about Font Awesome.
+
+# Brand Icons
+All brand icons are trademarks of their respective owners. The use of these
+trademarks does not indicate endorsement of the trademark holder by Font
+Awesome, nor vice versa. **Please do not use brand logos for any purpose except
+to represent the company, product, or service to which they refer.**