Skip to content

Commit

Permalink
Merge pull request #4 from maisamaf/feature/v1.1.0
Browse files Browse the repository at this point in the history
feature/v1.1.0
  • Loading branch information
sajadevo authored Jan 10, 2023
2 parents 60223dc + 6610caa commit 4f34fc8
Show file tree
Hide file tree
Showing 61 changed files with 2,396 additions and 1,826 deletions.
8 changes: 4 additions & 4 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
module.exports = {
root: true,
env: {
node: true
node: true,
},
extends: ["plugin:vue/essential", "@vue/prettier"],
rules: {
"no-console": process.env.NODE_ENV === "production" ? "error" : "off",
"no-debugger": process.env.NODE_ENV === "production" ? "error" : "off"
"no-debugger": process.env.NODE_ENV === "production" ? "error" : "off",
},
parserOptions: {
parser: "babel-eslint"
}
parser: "babel-eslint",
},
};
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
.DS_Store
node_modules
package-lock.json
yarn.lock
/dist

# local env files
Expand Down
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
legacy-peer-deps=true
9 changes: 9 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
# Change Log

## [1.1.0] 2023-01-10

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

## [1.0.1] 2020-02-20

### Improvments

- Add Upgrade to PRO button

## [1.0.0] 2019-10-14

### Stable Original Release
2 changes: 1 addition & 1 deletion LICENSE.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
MIT License

Copyright (c) 2018 Creative Tim
Copyright (c) 2023 Creative Tim

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
61 changes: 26 additions & 35 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
# [Vue White Dashboard](https://demos.creative-tim.com/vue-white-dashboard) [![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social&logo=twitter)](https://twitter.com/share?url=https%3A%2F%2Fdemos.creative-tim.com%2Fvue-white-dashboard&text=Vue%20White%20Dashboard%20by%20Creative%20Tim&via=CreativeTim&hashtags=vuejs%20%23white%20%23dashboard)


![version](https://img.shields.io/badge/version-1.0.0-blue.svg) ![license](https://img.shields.io/badge/license-MIT-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/white-dashboard/issues.svg?maxAge=2592000)](https://github.com/creativetimofficial/vue-white-dashboard/issues/issues?q=is%3Aopen+is%3Aissue) [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/vue-white-dashboard/issues.svg?maxAge=2592000)](https://github.com/creativetimofficial/vue-white-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.0-blue.svg) ![license](https://img.shields.io/badge/license-MIT-blue.svg) [![GitHub issues open](https://img.shields.io/github/issues/creativetimofficial/white-dashboard/issues.svg?maxAge=2592000)](https://github.com/creativetimofficial/vue-white-dashboard/issues/issues?q=is%3Aopen+is%3Aissue) [![GitHub issues closed](https://img.shields.io/github/issues-closed-raw/creativetimofficial/vue-white-dashboard/issues.svg?maxAge=2592000)](https://github.com/creativetimofficial/vue-white-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-white-dashboard/blob/live-demo/src/assets/demo/product-gif.gif?raw=true)

Expand All @@ -15,30 +13,27 @@ 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


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

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

## Versions

[<img src="https://github.com/creativetimofficial/public-assets/blob/master/logos/vue-logo.jpg?raw=true" width="60" height="60" />](https://www.creative-tim.com/product/vue-white-dashboard)
[<img src="https://github.com/creativetimofficial/public-assets/blob/master/logos/laravel_logo.png?raw=true" width="60" height="60" />](https://www.creative-tim.com/product/white-dashboard-laravel)


| Vue | Laravel |
| --- | --- |
| [![Vue White Dashboard ](https://github.com/creativetimofficial/public-assets/blob/master/vue-white-dashboard/vue-white-dashboard.jpg?raw=true)](https://www.creative-tim.com/product/vue-white-dashboard) | [![White Dashboard Laravel](https://github.com/creativetimofficial/public-assets/blob/master/white-dashboard-laravel/white-dashboard-laravel.jpg?raw=true)](https://www.creative-tim.com/product/white-dashboard-laravel)
| Vue | Laravel |
| ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| [![Vue White Dashboard ](https://github.com/creativetimofficial/public-assets/blob/master/vue-white-dashboard/vue-white-dashboard.jpg?raw=true)](https://www.creative-tim.com/product/vue-white-dashboard) | [![White Dashboard Laravel](https://github.com/creativetimofficial/public-assets/blob/master/white-dashboard-laravel/white-dashboard-laravel.jpg?raw=true)](https://www.creative-tim.com/product/white-dashboard-laravel) |

## Demo

Expand All @@ -48,26 +43,26 @@ We are very excited to share this dashboard with you and we look forward to hear
- [Maps Page](https://demos.creative-tim.com/vue-white-dashboard/#/maps)
- [Notifications page](https://demos.creative-tim.com//vue-white-dashboard/#/notifications)

| Start page | User profile page | Tables page |
| --- | --- | --- |
| [![Start page](https://github.com/creativetimofficial/public-assets/blob/master/vue-white-dashboard/start-page.png?raw=true)](https://demos.creative-tim.com/vue-white-dashboard) | [![User profile page](https://github.com/creativetimofficial/public-assets/blob/master/vue-white-dashboard/profile-page.png?raw=true)](https://demos.creative-tim.com/vue-white-dashboard/#/user) | [![Tables pages](https://github.com/creativetimofficial/public-assets/blob/master/vue-white-dashboard/tables-page.png?raw=true)](https://demos.creative-tim.com/vue-white-dashboard/#/table)
| Start page | User profile page | Tables page |
| --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| [![Start page](https://github.com/creativetimofficial/public-assets/blob/master/vue-white-dashboard/start-page.png?raw=true)](https://demos.creative-tim.com/vue-white-dashboard) | [![User profile page](https://github.com/creativetimofficial/public-assets/blob/master/vue-white-dashboard/profile-page.png?raw=true)](https://demos.creative-tim.com/vue-white-dashboard/#/user) | [![Tables pages](https://github.com/creativetimofficial/public-assets/blob/master/vue-white-dashboard/tables-page.png?raw=true)](https://demos.creative-tim.com/vue-white-dashboard/#/table) |

| Maps page | Notifications page | RTL page |
| --- | --- | --- |
| [![Maps page](https://github.com/creativetimofficial/public-assets/blob/master/vue-white-dashboard/maps-page.png?raw=true)](https://demos.creative-tim.com/vue-white-dashboard/#/maps) | [![Notifications page](https://github.com/creativetimofficial/public-assets/blob/master/vue-white-dashboard/notifications-page.png?raw=true)](https://demos.creative-tim.com/vue-white-dashboard/#/notifications) | [![RTL page](https://github.com/creativetimofficial/public-assets/blob/master/vue-white-dashboard/rtl-page.png?raw=true)](https://demos.creative-tim.com/vue-white-dashboard/#/dashboard?enableRTL=true)
| Maps page | Notifications page | RTL page |
| -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| [![Maps page](https://github.com/creativetimofficial/public-assets/blob/master/vue-white-dashboard/maps-page.png?raw=true)](https://demos.creative-tim.com/vue-white-dashboard/#/maps) | [![Notifications page](https://github.com/creativetimofficial/public-assets/blob/master/vue-white-dashboard/notifications-page.png?raw=true)](https://demos.creative-tim.com/vue-white-dashboard/#/notifications) | [![RTL page](https://github.com/creativetimofficial/public-assets/blob/master/vue-white-dashboard/rtl-page.png?raw=true)](https://demos.creative-tim.com/vue-white-dashboard/#/dashboard?enableRTL=true) |

## Quick start

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


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

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

## File Structure

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

```
Expand Down Expand Up @@ -131,16 +126,14 @@ Within the download you'll find the following directories and files:
│   └── UserProfile.vue
└── router.js
```


## Browser Support
```## Browser Support
At present, we officially aim to support the last two versions of the following browsers:
<img src="https://github.com/creativetimofficial/public-assets/blob/master/logos/chrome-logo.png?raw=true" width="64" height="64"> <img src="https://raw.githubusercontent.com/creativetimofficial/public-assets/master/logos/firefox-logo.png" width="64" height="64"> <img src="https://raw.githubusercontent.com/creativetimofficial/public-assets/master/logos/edge-logo.png" width="64" height="64"> <img src="https://raw.githubusercontent.com/creativetimofficial/public-assets/master/logos/safari-logo.png" width="64" height="64"> <img src="https://raw.githubusercontent.com/creativetimofficial/public-assets/master/logos/opera-logo.png" width="64" height="64">
## Resources
- Demo: <https://demos.creative-tim.com/vue-white-dashboard/#/dashboard>
- Download Page: <https://www.creative-tim.com/product/vue-white-dashboard>
- Documentation: <https://demos.creative-tim.com/vue-white-dashboard/documentation>
Expand All @@ -156,14 +149,12 @@ We use GitHub Issues as the official bug tracker for the Vue White 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.

## Licensing
- 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/vue-white-dashboard/issues/blob/master/LICENSE.md)

## Useful Links
- [Tutorials](https://www.youtube.com/channel/UCVyTG4sCw-rOvB9oHkzZD1w)
Expand Down
2 changes: 1 addition & 1 deletion babel.config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
module.exports = {
presets: ["@vue/app"]
presets: ["@vue/app"],
};
42 changes: 21 additions & 21 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
{
"name": "vue-white-dashboard",
"version": "0.1.0",
"version": "1.1.0",
"private": true,
"scripts": {
"serve": "vue-cli-service serve",
"build": "vue-cli-service build",
"lint": "vue-cli-service lint"
},
"dependencies": {
"chart.js": "^2.8.0",
"core-js": "^2.6.5",
"vue": "^2.6.10",
"vue-chartjs": "^3.4.2",
"vue-click-outside": "^1.0.7",
"chart.js": "2.9.4",
"core-js": "2.6.5",
"vue": "2.7.14",
"vue-chartjs": "3.4.2",
"vue-click-outside": "1.1.0",
"vue-clickaway": "^2.2.2",
"vue-github-buttons": "^3.1.0",
"vue-i18n": "^8.14.1",
"vue-router": "^3.0.3",
"vue-social-sharing": "^2.4.6",
"vue-github-buttons": "3.1.0",
"vue-i18n": "8.14.1",
"vue-router": "3.0.3",
"vue-social-sharing": "2.4.6",
"vue2-transitions": "^0.3.0"
},
"devDependencies": {
"@vue/cli-plugin-babel": "^3.11.0",
"@vue/cli-plugin-eslint": "^3.11.0",
"@vue/cli-service": "^3.11.0",
"@vue/eslint-config-prettier": "^5.0.0",
"babel-eslint": "^10.0.1",
"eslint": "^5.16.0",
"eslint-plugin-prettier": "^3.1.0",
"@vue/cli-plugin-babel": "3.12.1",
"@vue/cli-plugin-eslint": "3.12.1",
"@vue/cli-service": "3.12.1",
"@vue/eslint-config-prettier": "5.0.0",
"babel-eslint": "10.0.1",
"eslint": "5.16.0",
"eslint-plugin-prettier": "3.1.0",
"eslint-plugin-vue": "^5.0.0",
"node-sass": "^4.9.0",
"prettier": "^1.18.2",
"sass-loader": "^7.1.0",
"vue-template-compiler": "^2.6.10"
"prettier": "2.8.1",
"sass": "1.56.2",
"sass-loader": "10.2.0",
"vue-template-compiler": "2.7.14"
}
}
4 changes: 2 additions & 2 deletions postcss.config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module.exports = {
plugins: {
autoprefixer: {}
}
autoprefixer: {},
},
};
51 changes: 41 additions & 10 deletions public/index.html
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<!--
=========================================================
* Vue White Dashboard - v1.0.0
* Vue White Dashboard - v1.1.0
=========================================================
* Product Page: https://www.creative-tim.com/product/vue-white-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/vue-white-dashboard/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand All @@ -15,27 +15,58 @@
* The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-->

<!DOCTYPE html>

<html lang="en">

<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 %>favicon.ico">
<link href="https://use.fontawesome.com/releases/v5.0.6/css/all.css" rel="stylesheet">
<link href="https://fonts.googleapis.com/css?family=Poppins:200,300,400,600,700,800" rel="stylesheet">
<link href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-rtl/3.4.0/css/bootstrap-rtl.css" rel="stylesheet" />

<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 %>favicon.ico" />

<link
href="https://use.fontawesome.com/releases/v5.0.6/css/all.css"
rel="stylesheet"
/>

<link
href="https://fonts.googleapis.com/css?family=Poppins:200,300,400,600,700,800"
rel="stylesheet"
/>

<link
href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-rtl/3.4.0/css/bootstrap-rtl.css"
rel="stylesheet"
/>

<title>Vue White Dashboard by Creative Tim</title>

<script src="https://maps.googleapis.com/maps/api/js?key=YOUR_KEY_HERE"></script>

</head>

<body>

<noscript>
<strong>We're sorry but vue-white-dashboard doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>

<strong>
We're sorry but vue-white-dashboard doesn't work properly without
JavaScript enabled. Please enable it to continue.
</strong>

</noscript>

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

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

</body>

</html>

30 changes: 15 additions & 15 deletions src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,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">
Expand Down
Loading

0 comments on commit 4f34fc8

Please sign in to comment.