Skip to content

Commit 5558617

Browse files
authored
Merge pull request #61 from maisamaf/feature/v1.1.3
feature/v1.1.3
2 parents 7f90dba + 7c98882 commit 5558617

File tree

170 files changed

+8818
-7586
lines changed

Some content is hidden

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

170 files changed

+8818
-7586
lines changed

.babelrc

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
11
{
2-
"presets": [
3-
[
4-
"@vue/app",
5-
{
6-
"polyfills": ["es.promise", "es.symbol"],
7-
}
8-
]
9-
]
2+
"presets": [["@vue/app"]]
103
}

.eslintrc

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
{
22
"root": true,
3-
"extends": [
4-
"plugin:vue/essential"
5-
],
3+
"extends": ["plugin:vue/essential"],
64
"env": {
75
"amd": true
86
},

.github/workflows/main.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ jobs:
44
autoclose:
55
runs-on: ubuntu-latest
66
steps:
7-
- name: Issue auto-closer
8-
uses: roots/[email protected]
9-
with:
10-
repo-token: ${{ secrets.GITHUB_TOKEN }}
11-
issue-close-message: "@${issue.user.login} this issue was automatically closed because it did not follow the bellow rules:\n\n<pre>\n\n\n\nIMPORTANT: Please use the following link to create a new issue:\n\nhttps://www.creative-tim.com/new-issue/vue-black-dashboard\n\n**If your issue was not created using the app above, it will be closed immediately.**\n\n\n\nLove Creative Tim? Do you need Angular, React, Vuejs or HTML? You can visit:\n👉 https://www.creative-tim.com/bundles\n👉 https://www.creative-tim.com\n\n\n</pre>\n\n"
12-
issue-pattern: (\#\#\# Version([\S\s.*]*?)\#\#\# Reproduction link([\S\s.*]*?)\#\#\# Operating System([\S\s.*]*?)\#\#\# Device([\S\s.*]*?)\#\#\# Browser & Version([\S\s.*]*?)\#\#\# Steps to reproduce([\S\s.*]*?)\#\#\# What is expected([\S\s.*]*?)\#\#\# What is actually happening([\S\s.*]*?)---([\S\s.*]*?)\#\#\# Solution([\S\s.*]*?)\#\#\# Additional comments([\S\s.*]*?)\<\!-- generated by creative-tim-issues\. DO NOT REMOVE --\>)|(\#\#\# What is your enhancement([\S\s.*]*?)\<\!-- generated by creative-tim-issues\. DO NOT REMOVE --\>)
7+
- name: Issue auto-closer
8+
uses: roots/[email protected]
9+
with:
10+
repo-token: ${{ secrets.GITHUB_TOKEN }}
11+
issue-close-message: "@${issue.user.login} this issue was automatically closed because it did not follow the bellow rules:\n\n<pre>\n\n\n\nIMPORTANT: Please use the following link to create a new issue:\n\nhttps://www.creative-tim.com/new-issue/vue-black-dashboard\n\n**If your issue was not created using the app above, it will be closed immediately.**\n\n\n\nLove Creative Tim? Do you need Angular, React, Vuejs or HTML? You can visit:\n👉 https://www.creative-tim.com/bundles\n👉 https://www.creative-tim.com\n\n\n</pre>\n\n"
12+
issue-pattern: (\#\#\# Version([\S\s.*]*?)\#\#\# Reproduction link([\S\s.*]*?)\#\#\# Operating System([\S\s.*]*?)\#\#\# Device([\S\s.*]*?)\#\#\# Browser & Version([\S\s.*]*?)\#\#\# Steps to reproduce([\S\s.*]*?)\#\#\# What is expected([\S\s.*]*?)\#\#\# What is actually happening([\S\s.*]*?)---([\S\s.*]*?)\#\#\# Solution([\S\s.*]*?)\#\#\# Additional comments([\S\s.*]*?)\<\!-- generated by creative-tim-issues\. DO NOT REMOVE --\>)|(\#\#\# What is your enhancement([\S\s.*]*?)\<\!-- generated by creative-tim-issues\. DO NOT REMOVE --\>)

.npmrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
legacy-peer-deps=true
2+
auto-install-peers=true
3+
strict-peer-dependencies=false

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Change Log
22

3+
## [1.1.3] 2024-02-25
4+
5+
- Update dependencies & devDependencies
6+
37
## [1.1.2] 2022-01-10
48

59
- Update dependencies and devDependencies

CONTRIBUTING.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
* Fork the repository
2-
* Clone it on your PC
3-
* `npm install` or `yarn install`
4-
* Make changes, commit open PR
1+
- Fork the repository
2+
- Clone it on your PC
3+
- `npm install` or `yarn install`
4+
- Make changes, commit open PR
55

66
### Notes
7-
* Please don't use jQuery or jQuery based plugins since there are many pure Vue alternatives
7+
8+
- Please don't use jQuery or jQuery based plugins since there are many pure Vue alternatives
89

910
This project uses [vue-cli 3](https://github.com/vuejs/vue-cli).

README.md

Lines changed: 15 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
# [Vue-Black Dashboard](https://demos.creative-tim.com/vue-black-dashboard) [![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social&logo=twitter)](https://twitter.com/intent/tweet?text=Black%20Dashboard%20by%20Creative%20Tim&url=https%3A%2F%2Fdemos.creative-tim.com%2Fblack-dashboard%2Fexamples%2Fdashboard.html&via=CreativeTim)
22

3-
4-
![version](https://img.shields.io/badge/version-1.1.2-blue.svg) ![license](https://img.shields.io/badge/license-MIT-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/black-dashboard/issues.svg?maxAge=2592000)](https://github.com/creativetimofficial/black-dashboard/issues/issues?q=is%3Aopen+is%3Aissue) [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/black-dashboard/issues.svg?maxAge=2592000)](https://github.com/creativetimofficial/black-dashboard/issues/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-
3+
![version](https://img.shields.io/badge/version-1.1.3-blue.svg) ![license](https://img.shields.io/badge/license-MIT-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/black-dashboard/issues.svg?maxAge=2592000)](https://github.com/creativetimofficial/black-dashboard/issues/issues?q=is%3Aopen+is%3Aissue) [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/black-dashboard/issues.svg?maxAge=2592000)](https://github.com/creativetimofficial/black-dashboard/issues/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)
64

75
![Product Gif](https://github.com/creativetimofficial/vue-black-dashboard/blob/live-demo/src/assets/demo/product-gif.gif?raw=true)
86

@@ -15,21 +13,18 @@ We thought about everything, so this dashboard comes with 2 versions, Dark Mode
1513

1614
We are very excited to share this dashboard with you and we look forward to hearing your feedback!
1715

18-
1916
## Table of Contents
2017

21-
22-
* [Demo](#demo)
23-
* [Quick Start](#quick-start)
24-
* [Documentation](#documentation)
25-
* [File Structure](#file-structure)
26-
* [Browser Support](#browser-support)
27-
* [Resources](#resources)
28-
* [Reporting Issues](#reporting-issues)
29-
* [Technical Support or Questions](#technical-support-or-questions)
30-
* [Licensing](#licensing)
31-
* [Useful Links](#useful-links)
32-
18+
- [Demo](#demo)
19+
- [Quick Start](#quick-start)
20+
- [Documentation](#documentation)
21+
- [File Structure](#file-structure)
22+
- [Browser Support](#browser-support)
23+
- [Resources](#resources)
24+
- [Reporting Issues](#reporting-issues)
25+
- [Technical Support or Questions](#technical-support-or-questions)
26+
- [Licensing](#licensing)
27+
- [Useful Links](#useful-links)
3328

3429
## Demo
3530

@@ -41,24 +36,23 @@ We are very excited to share this dashboard with you and we look forward to hear
4136

4237
[View More](https://demos.creative-tim.com/vue-black-dashboard).
4338

44-
4539
## Quick start
4640

4741
- Clone the repo: `git clone https://github.com/creativetimofficial/vue-black-dashboard.git`.
4842
- [Download from Github](https://github.com/creativetimofficial/vue-black-dashboard/archive/master.zip).
4943
- [Download from Creative Tim](https://www.creative-tim.com/product/vue-black-dashboard).
5044

51-
5245
## Documentation
53-
The documentation for the Vue Black Dashboard is hosted at our [website](https://demos.creative-tim.com/vue-black-dashboard/documentation).
5446

47+
The documentation for the Vue Black Dashboard is hosted at our [website](https://demos.creative-tim.com/vue-black-dashboard/documentation).
5548

5649
## File Structure
50+
5751
Within the download you'll find the following directories and files:
5852

5953
```
6054
|-- Vue Black Dashboard
61-
|-- .babelrc
55+
|-- .babelrc
6256
|-- .env
6357
|-- .eslintrc
6458
|-- .gitattributes
@@ -160,15 +154,12 @@ Within the download you'll find the following directories and files:
160154
161155
```
162156

163-
164157
## Browser Support
165158

166159
At present, we officially aim to support the last two versions of the following browsers:
167160

168161
<img src="https://s3.amazonaws.com/creativetim_bucket/github/browser/chrome.png" width="64" height="64"> <img src="https://s3.amazonaws.com/creativetim_bucket/github/browser/firefox.png" width="64" height="64"> <img src="https://s3.amazonaws.com/creativetim_bucket/github/browser/edge.png" width="64" height="64"> <img src="https://s3.amazonaws.com/creativetim_bucket/github/browser/safari.png" width="64" height="64"> <img src="https://s3.amazonaws.com/creativetim_bucket/github/browser/opera.png" width="64" height="64">
169162

170-
171-
172163
## Reporting Issues
173164

174165
We use GitHub Issues as the official bug tracker for the Vue Black Dashboard. Here are some advices for our users that want to report an issue:
@@ -177,20 +168,16 @@ We use GitHub Issues as the official bug tracker for the Vue Black Dashboard. He
177168
2. Providing us reproducible steps for the issue will shorten the time it takes for it to be fixed.
178169
3. Some issues may be browser specific, so specifying in what browser you encountered the issue might help.
179170

180-
181171
## Technical Support or Questions
182172

183173
If you have questions or need help integrating the product please [contact us](https://www.creative-tim.com/contact-us) instead of opening an issue.
184174

185-
186175
## Licensing
187176

188-
- Copyright 2023 Creative Tim (https://www.creative-tim.com/)
177+
- Copyright 2024 Creative Tim (https://www.creative-tim.com/)
189178

190179
- Licensed under MIT (https://github.com/creativetimofficial/vue-black-dashboard/issues/blob/master/LICENSE.md)
191180

192-
193-
194181
## Useful Links
195182

196183
- [More products](https://www.creative-tim.com/bootstrap-themes) from Creative Tim

intelij.webpack.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
// This configuration file is not used anywhere in the code, it's a hack to handle InteliJ relative path imports
22
// Keep in sync with actual webpack aliases
33

4-
const path = require('path');
4+
const path = require("path");
55

66
module.exports = {
77
resolve: {
88
alias: {
9-
'@': path.resolve(__dirname, 'src')
10-
}
11-
}
9+
"@": path.resolve(__dirname, "src"),
10+
},
11+
},
1212
};

package.json

Lines changed: 21 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "vue-black-dashboard",
3-
"version": "1.1.2",
3+
"version": "1.1.3",
44
"private": true,
55
"description": "A sample admin dashboard based on black dashboard UI template",
66
"author": "cristian.jora <[email protected]>",
@@ -10,27 +10,34 @@
1010
"e2e": "node test/e2e/runner.js",
1111
"lint": "vue-cli-service lint",
1212
"dev": "vue-cli-service serve --open",
13-
"lint-fix": "vue-cli-service lint --fix"
13+
"lint-fix": "vue-cli-service lint --fix",
14+
"prettify": "prettier --write ."
1415
},
1516
"dependencies": {
16-
"chart.js": "^2.9.3",
17-
"eslint-plugin-vue": "^9.8.0",
17+
"chart.js": "2.9.4",
18+
"eslint-plugin-vue": "9.11.0",
1819
"register-service-worker": "^1.7.2",
19-
"vue": "^2.7.14",
20+
"vue": "2.7.14",
2021
"vue-chartjs": "3.5.1",
21-
"vue-i18n": "^8.18.2",
22+
"vue-i18n": "8.28.2",
2223
"vue-router": "3.6.5",
23-
"vue-router-prefetch": "^1.6.3",
24-
"vue2-transitions": "^0.3.0"
24+
"vue-router-prefetch": "1.6.3",
25+
"vue2-transitions": "0.3.0"
2526
},
2627
"devDependencies": {
27-
"@vue/cli-plugin-babel": "4.5.19",
28-
"@vue/cli-plugin-eslint": "4.5.19",
29-
"@vue/cli-plugin-pwa": "4.5.19",
30-
"@vue/cli-service": "4.5.19",
31-
"sass": "1.56.2",
28+
"@vue/cli-plugin-babel": "5.0.8",
29+
"@vue/cli-plugin-eslint": "5.0.8",
30+
"@vue/cli-plugin-pwa": "5.0.8",
31+
"@vue/cli-service": "5.0.8",
32+
"@vue/eslint-config-prettier": "7.1.0",
33+
"@babel/eslint-parser": "7.21.8",
34+
"eslint": "8.41.0",
35+
"eslint-plugin-prettier": "4.2.1",
36+
"eslint-plugin-vue": "9.14.1",
37+
"prettier": "2.8.8",
38+
"sass": "1.62.1",
3239
"sass-loader": "10.2.0",
33-
"vue-cli-plugin-i18n": "2.3.1",
40+
"vue-cli-plugin-i18n": "2.3.2",
3441
"vue-template-compiler": "2.7.14"
3542
},
3643
"browserslist": [

public/index.html

Lines changed: 44 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<!--
22
=========================================================
3-
* Vue Black Dashboard - v1.1.0
3+
* Vue Black Dashboard - v1.1.3
44
=========================================================
55
66
* Product Page: https://www.creative-tim.com/product/black-dashboard
7-
* Copyright 2019 Creative Tim (http://www.creative-tim.com)
7+
* Copyright 2024 Creative Tim (http://www.creative-tim.com)
88
99
=========================================================
1010
@@ -13,29 +13,46 @@
1313
-->
1414
<!DOCTYPE html>
1515
<html lang="en">
16-
<head>
17-
<meta charset="utf-8">
18-
<link rel="apple-touch-icon" sizes="76x76" href="<%= webpackConfig.output.publicPath %>apple-icon.png">
19-
<link rel="icon" type="image/png" sizes="96x96" href="<%= webpackConfig.output.publicPath %>favicon.png">
20-
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
21-
22-
<title>Vue Black Dashboard Free</title>
23-
<!-- Bootstrap core CSS -->
24-
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.5">
25-
26-
<!-- Fonts and icons -->
27-
<link href="https://fonts.googleapis.com/css?family=Poppins:200,300,400,600,700,800" rel="stylesheet">
28-
<link href="https://use.fontawesome.com/releases/v5.0.6/css/all.css" rel="stylesheet">
29-
<script src="https://maps.googleapis.com/maps/api/js?key=YOUR_KEY_HERE"></script>
30-
<link href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-rtl/3.4.0/css/bootstrap-rtl.css" rel="stylesheet" />
31-
32-
</head>
33-
<body>
34-
<div class="wrapper" id="app">
35-
36-
</div>
37-
<!-- built files will be auto injected -->
38-
<!-- Google Maps Plugin -->
39-
40-
</body>
16+
<head>
17+
<meta charset="utf-8" />
18+
<link
19+
rel="apple-touch-icon"
20+
sizes="76x76"
21+
href="<%= webpackConfig.output.publicPath %>apple-icon.png"
22+
/>
23+
<link
24+
rel="icon"
25+
type="image/png"
26+
sizes="96x96"
27+
href="<%= webpackConfig.output.publicPath %>favicon.png"
28+
/>
29+
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
30+
31+
<title>Vue Black Dashboard Free</title>
32+
<!-- Bootstrap core CSS -->
33+
<meta
34+
name="viewport"
35+
content="width=device-width, initial-scale=1.0, maximum-scale=1.5"
36+
/>
37+
38+
<!-- Fonts and icons -->
39+
<link
40+
href="https://fonts.googleapis.com/css?family=Poppins:200,300,400,600,700,800"
41+
rel="stylesheet"
42+
/>
43+
<link
44+
href="https://use.fontawesome.com/releases/v5.0.6/css/all.css"
45+
rel="stylesheet"
46+
/>
47+
<script src="https://maps.googleapis.com/maps/api/js?key=YOUR_KEY_HERE"></script>
48+
<link
49+
href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-rtl/3.4.0/css/bootstrap-rtl.css"
50+
rel="stylesheet"
51+
/>
52+
</head>
53+
<body>
54+
<div class="wrapper" id="app"></div>
55+
<!-- built files will be auto injected -->
56+
<!-- Google Maps Plugin -->
57+
</body>
4158
</html>

0 commit comments

Comments
 (0)