Skip to content

Commit 946a899

Browse files
authored
Merge pull request #57 from creativetimofficial/feature/v2.0.0
Feature/v2.0.0
2 parents c0c6610 + 342ffb2 commit 946a899

File tree

107 files changed

+12298
-12452
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+12298
-12452
lines changed

.browserslistrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
> 1%
2+
last 2 versions
3+
not dead

.eslintrc.js

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
module.exports = {
2+
root: true,
3+
env: {
4+
node: true,
5+
},
6+
extends: ["plugin:vue/vue3-essential", "eslint:recommended", "@vue/prettier"],
7+
parserOptions: {
8+
parser: "babel-eslint",
9+
},
10+
rules: {
11+
"no-console": process.env.NODE_ENV === "production" ? "warn" : "off",
12+
"no-debugger": process.env.NODE_ENV === "production" ? "warn" : "off",
13+
},
14+
};

CHANGELOG.md

100755100644
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
## [2.0.0] - 2021-02-22
2+
### Vue 3 Update
3+
- Compatibility with new Vuejs 3
4+
15
## [1.1.1] - 2020-11-25
26
- Change broken links
37

ISSUES_TEMPLATE.md

100755100644
File mode changed.

README.md

100755100644
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33

44

5-
![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)
5+
![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)
66

77

88
![Product Gif](https://raw.githubusercontent.com/creativetimofficial/public-assets/master/vue-argon-dashboard/vue-argon-dashboard.gif)

babel.config.js

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
module.exports = {
2-
presets: [
3-
'@vue/app'
4-
]
5-
}
2+
presets: ["@vue/cli-plugin-babel/preset"],
3+
plugins: [
4+
[
5+
"component",
6+
{
7+
libraryName: "element-plus",
8+
styleLibraryName: "theme-chalk",
9+
},
10+
],
11+
],
12+
};

package.json

Lines changed: 23 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,62 +1,38 @@
11
{
22
"name": "vue-argon-dashboard",
3-
"version": "1.1.1",
3+
"version": "2.0.0",
44
"private": true,
55
"scripts": {
66
"serve": "vue-cli-service serve",
7-
"dev": "vue-cli-service serve",
87
"build": "vue-cli-service build",
98
"lint": "vue-cli-service lint"
109
},
1110
"dependencies": {
12-
"bootstrap": "4.5.0",
11+
"bootstrap": "4.6.0",
1312
"bootstrap-vue": "2.15.0",
14-
"chart.js": "2.9.3",
13+
"chart.js": "2.9.4",
1514
"core-js": "3.6.5",
16-
"flatpickr": "4.6.3",
15+
"element-plus": "1.0.1-beta.24",
1716
"nouislider": "14.6.0",
18-
"register-service-worker": "1.7.1",
19-
"vue": "2.6.11",
20-
"vue-chartjs": "3.5.0",
21-
"vue-clipboard2": "0.3.1",
22-
"vue-flatpickr-component": "8.1.5",
23-
"vue-router": "3.3.4",
24-
"vue2-transitions": "0.3.0"
17+
"google-maps": "4.3.3",
18+
"vue": "3.0.5",
19+
"vue-toastification": "1.7.11",
20+
"vue-router": "4.0.1"
2521
},
2622
"devDependencies": {
27-
"@vue/cli-plugin-babel": "^4.4.6",
28-
"@vue/cli-plugin-eslint": "^4.4.6",
29-
"@vue/cli-plugin-pwa": "^4.4.6",
30-
"@vue/cli-service": "^4.4.6",
31-
"babel-eslint": "^10.1.0",
32-
"eslint": "^7.3.1",
33-
"eslint-plugin-vue": "^6.2.2",
34-
"node-sass": "^4.14.1",
35-
"sass-loader": "^8.0.2",
36-
"vue-template-compiler": "2.6.11"
37-
},
38-
"eslintConfig": {
39-
"root": true,
40-
"env": {
41-
"node": true
42-
},
43-
"extends": [
44-
"plugin:vue/essential",
45-
"eslint:recommended"
46-
],
47-
"rules": {},
48-
"parserOptions": {
49-
"parser": "babel-eslint"
50-
}
51-
},
52-
"postcss": {
53-
"plugins": {
54-
"autoprefixer": {}
55-
}
56-
},
57-
"browserslist": [
58-
"> 1%",
59-
"last 2 versions",
60-
"not ie <= 8"
61-
]
23+
"@vue/cli-plugin-babel": "4.5.10",
24+
"@vue/cli-plugin-eslint": "4.5.10",
25+
"@vue/cli-plugin-router": "4.5.10",
26+
"@vue/cli-service": "4.5.10",
27+
"@vue/compiler-sfc": "3.0.5",
28+
"@vue/eslint-config-prettier": "6.0.0",
29+
"babel-eslint": "10.1.0",
30+
"babel-plugin-component": "1.1.1",
31+
"eslint": "7.17.0",
32+
"eslint-plugin-prettier": "3.3.1",
33+
"eslint-plugin-vue": "7.4.1",
34+
"node-sass": "5.0.0",
35+
"prettier": "2.2.1",
36+
"sass-loader": "10.1.1"
37+
}
6238
}

public/favicon.ico

3.06 KB
Binary file not shown.

public/index.html

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

public/manifest.json

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)