Skip to content

Commit

Permalink
Merge pull request #61 from maisamaf/feature/v1.1.3
Browse files Browse the repository at this point in the history
feature/v1.1.3
  • Loading branch information
sajadevo authored Feb 27, 2024
2 parents 7f90dba + 7c98882 commit 5558617
Show file tree
Hide file tree
Showing 170 changed files with 8,818 additions and 7,586 deletions.
9 changes: 1 addition & 8 deletions .babelrc
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
{
"presets": [
[
"@vue/app",
{
"polyfills": ["es.promise", "es.symbol"],
}
]
]
"presets": [["@vue/app"]]
}
4 changes: 1 addition & 3 deletions .eslintrc
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
{
"root": true,
"extends": [
"plugin:vue/essential"
],
"extends": ["plugin:vue/essential"],
"env": {
"amd": true
},
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ jobs:
autoclose:
runs-on: ubuntu-latest
steps:
- name: Issue auto-closer
uses: roots/[email protected]
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
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"
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 --\>)
- name: Issue auto-closer
uses: roots/[email protected]
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
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"
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 --\>)
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: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Change Log

## [1.1.3] 2024-02-25

- Update dependencies & devDependencies

## [1.1.2] 2022-01-10

- Update dependencies and devDependencies
Expand Down
11 changes: 6 additions & 5 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
* Fork the repository
* Clone it on your PC
* `npm install` or `yarn install`
* Make changes, commit open PR
- Fork the repository
- Clone it on your PC
- `npm install` or `yarn install`
- Make changes, commit open PR

### Notes
* Please don't use jQuery or jQuery based plugins since there are many pure Vue alternatives

- Please don't use jQuery or jQuery based plugins since there are many pure Vue alternatives

This project uses [vue-cli 3](https://github.com/vuejs/vue-cli).
43 changes: 15 additions & 28 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
# [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)


![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)

![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)

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

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

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


## Table of Contents


* [Demo](#demo)
* [Quick Start](#quick-start)
* [Documentation](#documentation)
* [File Structure](#file-structure)
* [Browser Support](#browser-support)
* [Resources](#resources)
* [Reporting Issues](#reporting-issues)
* [Technical Support or Questions](#technical-support-or-questions)
* [Licensing](#licensing)
* [Useful Links](#useful-links)

- [Demo](#demo)
- [Quick Start](#quick-start)
- [Documentation](#documentation)
- [File Structure](#file-structure)
- [Browser Support](#browser-support)
- [Resources](#resources)
- [Reporting Issues](#reporting-issues)
- [Technical Support or Questions](#technical-support-or-questions)
- [Licensing](#licensing)
- [Useful Links](#useful-links)

## Demo

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

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


## Quick start

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


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

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

## File Structure

Within the download you'll find the following directories and files:

```
|-- Vue Black Dashboard
|-- .babelrc
|-- .babelrc
|-- .env
|-- .eslintrc
|-- .gitattributes
Expand Down Expand Up @@ -160,15 +154,12 @@ Within the download you'll find the following directories and files:
```


## Browser Support

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

<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">



## Reporting Issues

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:
Expand All @@ -177,20 +168,16 @@ We use GitHub Issues as the official bug tracker for the Vue Black Dashboard. He
2. Providing us reproducible steps for the issue will shorten the time it takes for it to be fixed.
3. Some issues may be browser specific, so specifying in what browser you encountered the issue might help.


## Technical Support or Questions

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.


## Licensing

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

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



## Useful Links

- [More products](https://www.creative-tim.com/bootstrap-themes) from Creative Tim
Expand Down
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"),
},
},
};
35 changes: 21 additions & 14 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vue-black-dashboard",
"version": "1.1.2",
"version": "1.1.3",
"private": true,
"description": "A sample admin dashboard based on black dashboard UI template",
"author": "cristian.jora <[email protected]>",
Expand All @@ -10,27 +10,34 @@
"e2e": "node test/e2e/runner.js",
"lint": "vue-cli-service lint",
"dev": "vue-cli-service serve --open",
"lint-fix": "vue-cli-service lint --fix"
"lint-fix": "vue-cli-service lint --fix",
"prettify": "prettier --write ."
},
"dependencies": {
"chart.js": "^2.9.3",
"eslint-plugin-vue": "^9.8.0",
"chart.js": "2.9.4",
"eslint-plugin-vue": "9.11.0",
"register-service-worker": "^1.7.2",
"vue": "^2.7.14",
"vue": "2.7.14",
"vue-chartjs": "3.5.1",
"vue-i18n": "^8.18.2",
"vue-i18n": "8.28.2",
"vue-router": "3.6.5",
"vue-router-prefetch": "^1.6.3",
"vue2-transitions": "^0.3.0"
"vue-router-prefetch": "1.6.3",
"vue2-transitions": "0.3.0"
},
"devDependencies": {
"@vue/cli-plugin-babel": "4.5.19",
"@vue/cli-plugin-eslint": "4.5.19",
"@vue/cli-plugin-pwa": "4.5.19",
"@vue/cli-service": "4.5.19",
"sass": "1.56.2",
"@vue/cli-plugin-babel": "5.0.8",
"@vue/cli-plugin-eslint": "5.0.8",
"@vue/cli-plugin-pwa": "5.0.8",
"@vue/cli-service": "5.0.8",
"@vue/eslint-config-prettier": "7.1.0",
"@babel/eslint-parser": "7.21.8",
"eslint": "8.41.0",
"eslint-plugin-prettier": "4.2.1",
"eslint-plugin-vue": "9.14.1",
"prettier": "2.8.8",
"sass": "1.62.1",
"sass-loader": "10.2.0",
"vue-cli-plugin-i18n": "2.3.1",
"vue-cli-plugin-i18n": "2.3.2",
"vue-template-compiler": "2.7.14"
},
"browserslist": [
Expand Down
71 changes: 44 additions & 27 deletions public/index.html
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<!--
=========================================================
* Vue Black Dashboard - v1.1.0
* Vue Black Dashboard - v1.1.3
=========================================================
* Product Page: https://www.creative-tim.com/product/black-dashboard
* Copyright 2019 Creative Tim (http://www.creative-tim.com)
* Copyright 2024 Creative Tim (http://www.creative-tim.com)
=========================================================
Expand All @@ -13,29 +13,46 @@
-->
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="utf-8">
<link rel="apple-touch-icon" sizes="76x76" href="<%= webpackConfig.output.publicPath %>apple-icon.png">
<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>Vue Black Dashboard Free</title>
<!-- Bootstrap core CSS -->
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.5">

<!-- Fonts and icons -->
<link href="https://fonts.googleapis.com/css?family=Poppins:200,300,400,600,700,800" rel="stylesheet">
<link href="https://use.fontawesome.com/releases/v5.0.6/css/all.css" rel="stylesheet">
<script src="https://maps.googleapis.com/maps/api/js?key=YOUR_KEY_HERE"></script>
<link href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-rtl/3.4.0/css/bootstrap-rtl.css" rel="stylesheet" />

</head>
<body>
<div class="wrapper" id="app">

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

</body>
<head>
<meta charset="utf-8" />
<link
rel="apple-touch-icon"
sizes="76x76"
href="<%= webpackConfig.output.publicPath %>apple-icon.png"
/>
<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>Vue Black Dashboard Free</title>
<!-- Bootstrap core CSS -->
<meta
name="viewport"
content="width=device-width, initial-scale=1.0, maximum-scale=1.5"
/>

<!-- Fonts and icons -->
<link
href="https://fonts.googleapis.com/css?family=Poppins:200,300,400,600,700,800"
rel="stylesheet"
/>
<link
href="https://use.fontawesome.com/releases/v5.0.6/css/all.css"
rel="stylesheet"
/>
<script src="https://maps.googleapis.com/maps/api/js?key=YOUR_KEY_HERE"></script>
<link
href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-rtl/3.4.0/css/bootstrap-rtl.css"
rel="stylesheet"
/>
</head>
<body>
<div class="wrapper" id="app"></div>
<!-- built files will be auto injected -->
<!-- Google Maps Plugin -->
</body>
</html>
30 changes: 15 additions & 15 deletions src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,23 +6,23 @@
</template>

<script>
export default {
methods: {
disableRTL() {
if (!this.$rtl.isRTL) {
this.$rtl.disableRTL();
}
},
toggleNavOpen() {
let root = document.getElementsByTagName('html')[0];
root.classList.toggle('nav-open');
export default {
methods: {
disableRTL() {
if (!this.$rtl.isRTL) {
this.$rtl.disableRTL();
}
},
mounted() {
this.$watch('$route', this.disableRTL, { immediate: true });
this.$watch('$sidebar.showSidebar', this.toggleNavOpen)
}
};
toggleNavOpen() {
let root = document.getElementsByTagName("html")[0];
root.classList.toggle("nav-open");
},
},
mounted() {
this.$watch("$route", this.disableRTL, { immediate: true });
this.$watch("$sidebar.showSidebar", this.toggleNavOpen);
},
};
</script>

<style lang="scss"></style>
Loading

0 comments on commit 5558617

Please sign in to comment.