Skip to content

feature/v1.1.0 #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 13 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
module.exports = {
root: true,
env: {
node: true
node: true,
},
extends: ['plugin:vue/essential'],
extends: ["plugin:vue/essential", "eslint:recommended", "@vue/prettier"],
rules: {
'no-console': process.env.NODE_ENV === 'production' ? 'error' : 'off',
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
"vue/multi-word-component-names": "off",
"no-console": process.env.NODE_ENV === "production" ? "error" : "off",
"no-debugger": process.env.NODE_ENV === "production" ? "error" : "off",
},
parserOptions: {
parser: 'babel-eslint'
}
parser: "@babel/eslint-parser",
},
};
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
node_modules/
dist/
.cache/
yarn.lock
npm-debug.log*
yarn-debug.log*
yarn-error.log*
Expand Down
3 changes: 3 additions & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
legacy-peer-deps=true
auto-install-peers=true
strict-peer-dependencies=false
4 changes: 2 additions & 2 deletions .postcssrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@
module.exports = {
plugins: {
// to edit target browsers: use "browserslist" field in package.json
autoprefixer: {}
}
autoprefixer: {},
},
};
14 changes: 13 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,14 @@
## [1.0.0] - 2020-07-27
# Change Log

## [1.1.0] 2023-06-23

- Update dependencies and devDependencies
- Migrate from `node-sass` to `sass`
- Fix issue when running `npm i`

### Initial Release

## [1.0.0] - 2020-07-27

- Package updates
- Add pwa support
53 changes: 22 additions & 31 deletions README.md

Large diffs are not rendered by default.

18 changes: 8 additions & 10 deletions babel.config.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
module.exports = {
"presets": [
"@vue/app"
],
"plugins": [
presets: ["@vue/app"],
plugins: [
[
"component",
{
"libraryName": "element-ui",
"styleLibraryName": "theme-chalk"
}
]
]
}
libraryName: "element-ui",
styleLibraryName: "theme-chalk",
},
],
],
};
8 changes: 4 additions & 4 deletions intelij.webpack.js
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
// This configuration file is not used anywhere in the code, it's a hack to handle InteliJ relative path imports
// Keep in sync with actual webpack aliases

const path = require('path');
const path = require("path");

module.exports = {
resolve: {
alias: {
'@': path.resolve(__dirname, 'src')
}
}
"@": path.resolve(__dirname, "src"),
},
},
};
67 changes: 36 additions & 31 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "bootstrap-vue-argon-dashboard",
"version": "1.0.0",
"version": "1.1.0",
"private": true,
"scripts": {
"serve": "vue-cli-service serve --open",
Expand All @@ -9,39 +9,44 @@
"dev": "npm run serve"
},
"dependencies": {
"bootstrap": "4.3.1",
"bootstrap-vue": "^2.5.0",
"chart.js": "^2.9.3",
"d3": "^5.7.0",
"datamaps": "^0.5.9",
"date-fns": "^1.30.1",
"dropzone": "^5.5.1",
"element-ui": "2.4.11",
"es6-promise": "^4.1.1",
"flatpickr": "^4.5.7",
"fuse.js": "^3.2.0",
"bootstrap": "4.6.2",
"bootstrap-vue": "2.23.1",
"chart.js": "2.9.4",
"d3": "7.8.5",
"datamaps": "0.5.9",
"date-fns": "2.30.0",
"dropzone": "5.9.3",
"element-ui": "2.15.13",
"es6-promise": "4.2.8",
"flatpickr": "4.6.13",
"fuse.js": "6.6.2",
"google-maps": "^3.2.1",
"nouislider": "^12.1.0",
"perfect-scrollbar": "^1.3.0",
"quill": "^1.3.6",
"sweetalert2": "^9.5.4",
"vee-validate": "^3.2.1",
"vue": "^2.6.11",
"vue-chartjs": "^3.5.0",
"vue-clipboard2": "^0.3.0",
"vue-flatpickr-component": "^8.1.2",
"vue-router": "^3.0.6",
"vue2-transitions": "^0.2.3"
"nouislider": "15.7.1",
"perfect-scrollbar": "1.5.5",
"quill": "1.3.7",
"sweetalert2": "11.7.12",
"vee-validate": "3.2.1",
"vue": "2.7.14",
"vue-chartjs": "3.5.0",
"vue-clipboard2": "0.3.3",
"vue-flatpickr-component": "11.0.3",
"vue-router": "3.6.5",
"vue2-transitions": "0.3.0"
},
"devDependencies": {
"@vue/cli-plugin-babel": "^3.7.0",
"@vue/cli-plugin-eslint": "^3.7.0",
"@vue/cli-service": "^3.7.0",
"@vue/eslint-config-prettier": "^4.0.1",
"babel-plugin-component": "^1.1.0",
"node-sass": "^4.12.0",
"sass-loader": "^7.1.0",
"vue-template-compiler": "^2.6.11"
"@vue/cli-plugin-babel": "5.0.8",
"@vue/cli-plugin-eslint": "5.0.8",
"@vue/cli-service": "5.0.8",
"@vue/eslint-config-prettier": "7.1.0",
"babel-plugin-component": "1.1.1",
"@babel/eslint-parser": "7.22.5",
"eslint": "8.43.0",
"eslint-plugin-prettier": "4.2.1",
"eslint-plugin-vue": "9.15.0",
"prettier": "2.8.8",
"sass": "1.63.6",
"sass-loader": "13.3.2",
"vue-template-compiler": "2.7.14"
},
"postcss": {
"plugins": {
Expand Down
55 changes: 34 additions & 21 deletions public/index.html
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<!--

=========================================================
* BootstrapVue Argon Dashboard - v1.0.0
* BootstrapVue Argon Dashboard - v1.1.0
=========================================================

* Product Page: https://www.creative-tim.com/product/bootstrap-vue-argon-dashboard
* Copyright 2020 Creative Tim (https://www.creative-tim.com)
* Copyright 2023 Creative Tim (https://www.creative-tim.com)

* Coded by www.creative-tim.com

Expand All @@ -16,23 +16,36 @@
-->
<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<link rel="icon" type="image/png" sizes="96x96" href="<%= webpackConfig.output.publicPath %>favicon.png">
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />

<title>BootstrapVue Argon Dashboard by Creative Tim</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">

<!-- Fonts -->
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700">
<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.6.3/css/all.css" integrity="sha384-UHRtZLI+pbxtHCWp1t77Bi1L4ZtiqrqD80Kn4Z8NTSRyMA2Fd33n5dQ8lWUE00s/" crossorigin="anonymous">
</head>
<body>
<div class="wrapper" id="app">

</div>
<!-- built files will be auto injected -->

</body>
<head>
<meta charset="utf-8" />
<link
rel="icon"
type="image/png"
sizes="96x96"
href="<%= webpackConfig.output.publicPath %>favicon.png"
/>
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />

<title>BootstrapVue Argon Dashboard by Creative Tim</title>
<meta
name="viewport"
content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
/>

<!-- Fonts -->
<link
rel="stylesheet"
href="https://fonts.googleapis.com/css?family=Open+Sans:300,400,600,700"
/>
<link
rel="stylesheet"
href="https://use.fontawesome.com/releases/v5.6.3/css/all.css"
integrity="sha384-UHRtZLI+pbxtHCWp1t77Bi1L4ZtiqrqD80Kn4Z8NTSRyMA2Fd33n5dQ8lWUE00s/"
crossorigin="anonymous"
/>
</head>
<body>
<div class="wrapper" id="app"></div>
<!-- built files will be auto injected -->
</body>
</html>
3 changes: 1 addition & 2 deletions src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,5 @@
</template>

<script>
export default {
}
export default {};
</script>
4 changes: 2 additions & 2 deletions src/assets/scss/argon.scss
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/*!

=========================================================
* Vue Argon Dashboard - v1.0.0
* Vue Argon Dashboard - v1.1.0
=========================================================

* Product Page: https://www.creative-tim.com/product/argon-dashboard
* Copyright 2019 Creative Tim (https://www.creative-tim.com)
* Copyright 2023 Creative Tim (https://www.creative-tim.com)
* Licensed under MIT (https://github.com/creativetimofficial/argon-dashboard/blob/master/LICENSE.md)

* Coded by Creative Tim
Expand Down
4 changes: 1 addition & 3 deletions src/assets/scss/core/custom-forms/_custom-checkbox.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@
&::before {
border-color: $custom-control-indicator-checked-border-color;
}
&::after {
background-image: $custom-checkbox-indicator-icon-checked;
}

}
}

Expand Down
4 changes: 1 addition & 3 deletions src/assets/scss/core/custom-forms/_custom-form.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@
&::before {
border-color: $custom-control-indicator-checked-border-color;
}
&::after {
background-image: $custom-checkbox-indicator-icon-checked;
}

}
}

Expand Down
54 changes: 27 additions & 27 deletions src/assets/scss/custom/_components.scss
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Loading