Skip to content

Commit

Permalink
Merge pull request #86 from maisamaf/feature/v1.5.1
Browse files Browse the repository at this point in the history
Feature/v1.5.1
  • Loading branch information
sajadevo authored Jan 10, 2023
2 parents 7798ff1 + ad6064f commit e037d60
Show file tree
Hide file tree
Showing 8 changed files with 79 additions and 32 deletions.
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
legacy-peer-deps=true
24 changes: 24 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,53 +1,77 @@
# Change Log

## [1.5.1] 2023-01-10

- Update dependencies and devDependencies.
- Fix issue when running `npm install`.

## [1.5.0] 2022-03-18

### Dependencies Updates

- Updated all out of date dependencies from `package.json` file

## [1.4.0] 2020-03-12

### Dependencies Updates

- Updated all out of date dependencies from `package.json` file
- Add `API_KEY` file
- Add new structure for google maps plugin

## [1.3.2] 2019-12-13

### Dependencies Updates

- Updated all out of date dependencies from `package.json` file
- The version is now `v1.3.2` to have the same versioning line with the PRO version of this product

## [1.2.1] 2019-06-14

### Dependencies Updates, Vue Material Update

- Updated all out of date dependencies from `package.json` file
- The framework `Vuematerial.io` was updated to the latest beta version `1.0.0-beta-11`

## [1.2.0] 2019-04-30

### Dependencies Updates

- Updated all out of date dependencies from `package.json` file

## [1.1.0] 2019-02-08

### Dependencies Updates, Improvements

- Updated all out of date dependencies from `package.json` file
- Removed all `to=""` and replaced with `href=""` props from non router-link components for avoid this error `[Vue warn]: Error in render: "TypeError: Cannot read property 'options' of undefined"`
- Changed links from footer

## [1.0.3] 2018-11-26

### Bug Fixing

- Fixed error `[Vue warn]: Error in render: "TypeError: Cannot read property 'options' of undefined"`

## [1.0.2] 2018-11-19

### Plugin Updates, BugFixing

- Updated all `dependencies` and `devDependencies` to the latest versions
- Cleaned `package.json` file
- Removed all lint warnings and errors
- Github issues fixed
- Other bug fixes

## [1.0.1] 2018-07-13

### BugFixing and Updates

- updated all the npm packages
- scroll issue on mobile devices fixed
- added button `Upgrade to PRO` in the sidebar
- another small bug fixes

## [1.0.0] 2018-05-03

- Initial Release
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# [Vue Material Dashboard](https://demos.creative-tim.com/vue-material-dashboard) [![Tweet](https://img.shields.io/twitter/url/http/shields.io.svg?style=social&logo=twitter)](https://twitter.com/home?status=Vue%20Material%20Dashboard,%20a%20free%20Material%20Admin%20Template%20%E2%9D%A4%EF%B8%8F%20https%3A//bit.ly/2Nh5aVy%20%20%23vue%20%23material%20%23design%20%23developers%20%23freebie%20%20via%20%40CreativeTim)


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


![Product Gif](https://s3.amazonaws.com/creativetim_bucket/github/gif/vue-material-dashboard.gif)
Expand Down Expand Up @@ -173,7 +173,7 @@ If you have questions or need help integrating the product please [contact us](h

## Licensing

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

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

Expand Down
26 changes: 13 additions & 13 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vue-material-dashboard",
"version": "1.5.0",
"version": "1.5.1",
"private": true,
"scripts": {
"serve": "vue-cli-service serve --open",
Expand All @@ -10,29 +10,29 @@
},
"dependencies": {
"chartist": "0.11.4",
"core-js": "3.21.1",
"core-js": "3.26.1",
"google-maps": "4.3.3",
"vue": "2.6.14",
"vue": "2.7.14",
"vue-clickaway": "2.2.2",
"vue-github-buttons": "3.1.0",
"vue-material": "1.0.0-beta-15",
"vue-router": "3.5.2",
"vue-social-sharing": "3.0.9"
},
"devDependencies": {
"@vue/cli-plugin-babel": "4.5.15",
"@vue/cli-plugin-eslint": "4.5.15",
"@vue/cli-plugin-router": "4.5.15",
"@vue/cli-service": "4.5.15",
"@vue/eslint-config-prettier": "6.0.0",
"@vue/cli-plugin-babel": "4.5.19",
"@vue/cli-plugin-eslint": "4.5.19",
"@vue/cli-plugin-router": "4.5.19",
"@vue/cli-service": "4.5.19",
"@vue/eslint-config-prettier": "7.0.0",
"babel-eslint": "10.1.0",
"es6-promise": "4.2.8",
"eslint": "7.32.0",
"eslint-plugin-prettier": "4.0.0",
"eslint-plugin-prettier": "4.2.1",
"eslint-plugin-vue": "7.20.0",
"prettier": "2.6.0",
"sass": "1.49.9",
"sass-loader": "10.2.1",
"vue-template-compiler": "2.6.14"
"prettier": "2.8.1",
"sass": "1.56.2",
"sass-loader": "10.2.0",
"vue-template-compiler": "2.7.14"
}
}
37 changes: 27 additions & 10 deletions public/index.html
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<!--
=========================================================
* Vue Material Dashboard - v1.4.0
* Vue Material Dashboard - v1.5.1
=========================================================
* Product Page: https://www.creative-tim.com/product/vue-material-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-material-dashboard/blob/master/LICENSE.md)
* Coded by Creative Tim
Expand All @@ -18,18 +18,35 @@

<!DOCTYPE html>
<html>
<head>
<meta charset="utf-8">
<link rel="icon" type="image/png" sizes="96x96" href="<%= webpackConfig.output.publicPath %>favicon.png">
<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>Vue Material Dashboard by Creative Tim</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
<meta
name="viewport"
content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0"
/>

<!-- Fonts and icons -->
<link rel="stylesheet" href="//fonts.googleapis.com/css?family=Roboto:300,400,500,700,400italic">
<link rel="stylesheet" href="//fonts.googleapis.com/icon?family=Material+Icons">
<link href="https://use.fontawesome.com/releases/v5.0.8/css/all.css" rel="stylesheet">
</head>
<link
rel="stylesheet"
href="//fonts.googleapis.com/css?family=Roboto:300,400,500,700,400italic"
/>
<link
rel="stylesheet"
href="//fonts.googleapis.com/icon?family=Material+Icons"
/>
<link
href="https://use.fontawesome.com/releases/v5.0.8/css/all.css"
rel="stylesheet"
/>
</head>
<body>
<div id="app"></div>
<!-- built files will be auto injected -->
Expand Down
2 changes: 1 addition & 1 deletion src/assets/scss/material-dashboard.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// =========================================================
// * Vue Material Dashboard - v1.5.0
// * Vue Material Dashboard - v1.5.1
// =========================================================
//
// * Product Page: https://www.creative-tim.com/product/vue-material-dashboard
Expand Down
4 changes: 2 additions & 2 deletions src/main.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// =========================================================
// * Vue Material Dashboard - v1.5.0
// * Vue Material Dashboard - v1.5.1
// =========================================================
//
// * Product Page: https://www.creative-tim.com/product/vue-material-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-material-dashboard/blob/master/LICENSE.md)
//
// * Coded by Creative Tim
Expand Down
13 changes: 9 additions & 4 deletions src/pages/Layout/Extra/FixedPlugin.vue
Original file line number Diff line number Diff line change
Expand Up @@ -64,18 +64,22 @@
twitter-user="creativetim"
>
<div class="centered-buttons">
<network
<ShareNetwork
title=""
url="https://www.creative-tim.com/product/vue-material-dashboard"
network="facebook"
class="md-button md-round md-just-icon md-facebook"
>
<i class="fab fa-facebook-f"></i>
</network>
<network
</ShareNetwork>
<ShareNetwork
url="https://www.creative-tim.com/product/vue-material-dashboard"
title=""
network="twitter"
class="md-button md-round md-just-icon md-twitter"
>
<i class="fab fa-twitter"></i>
</network>
</ShareNetwork>
</div>
</social-sharing>
</li>
Expand All @@ -98,6 +102,7 @@ import "vue-github-buttons/dist/vue-github-buttons.css";
Vue.use(SocialSharing);
Vue.use(VueGitHubButtons, { useCache: true });
export default {
components: { SocialSharing },
data() {
return {
documentationLink:
Expand Down

0 comments on commit e037d60

Please sign in to comment.