Skip to content

Commit

Permalink
Merge pull request #53 from maisamaf/feature/v1.1.2
Browse files Browse the repository at this point in the history
feature/v1.1.2
  • Loading branch information
sajadevo authored Jan 10, 2023
2 parents df4d18f + 6e5d046 commit 7f90dba
Show file tree
Hide file tree
Showing 9 changed files with 94 additions and 9,131 deletions.
8 changes: 7 additions & 1 deletion .eslintrc
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,11 @@
"root": true,
"extends": [
"plugin:vue/essential"
]
],
"env": {
"amd": true
},
"rules": {
"vue/multi-word-component-names": "off"
}
}
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
npm-debug.log
.idea/
dist/
11 changes: 10 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,23 +1,32 @@
# Change Log

## [1.1.2] 2022-01-10

- Update dependencies and devDependencies
- Migration from `node-sass` to `sass`

## [1.1.1] 2020-06-26

- Package updates

## [1.1.0] 2019-02-12

- Package updates
- Add pwa support
- Improve accessibility
- Cleanups & other minor UI improvements
- Improve bundle size

## [1.0.1] 2018-12-03

### Minor updates

- Upgrade packages
- Change sidebar gradient colors (more pleasant)
- Make links "bolder" in the sidebar so they are more readable
- Improve bundle size, add vue-router prefetch
- Add pwa support


## [1.0.0] 2018-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) 2017 Creative Tim (https://www.creative-tim.com)
Copyright (c) 2023 Creative Tim (https://www.creative-tim.com)

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
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# [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.1-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.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)


![Product Gif](https://github.com/creativetimofficial/vue-black-dashboard/blob/live-demo/src/assets/demo/product-gif.gif?raw=true)
Expand Down Expand Up @@ -185,7 +185,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-black-dashboard/issues/blob/master/LICENSE.md)

Expand Down
29 changes: 15 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.0.0",
"version": "1.1.2",
"private": true,
"description": "A sample admin dashboard based on black dashboard UI template",
"author": "cristian.jora <joracristi@gmail.com>",
Expand All @@ -14,23 +14,24 @@
},
"dependencies": {
"chart.js": "^2.9.3",
"register-service-worker": "^1.7.1",
"vue": "^2.6.11",
"vue-chartjs": "^3.5.0",
"eslint-plugin-vue": "^9.8.0",
"register-service-worker": "^1.7.2",
"vue": "^2.7.14",
"vue-chartjs": "3.5.1",
"vue-i18n": "^8.18.2",
"vue-router": "^3.3.4",
"vue-router-prefetch": "^1.6.0",
"vue-router": "3.6.5",
"vue-router-prefetch": "^1.6.3",
"vue2-transitions": "^0.3.0"
},
"devDependencies": {
"@vue/cli-plugin-babel": "^4.4.6",
"@vue/cli-plugin-eslint": "^4.4.6",
"@vue/cli-plugin-pwa": "^4.4.6",
"@vue/cli-service": "^4.4.6",
"node-sass": "^4.14.1",
"sass-loader": "^8.0.2",
"vue-cli-plugin-i18n": "^1.0.1",
"vue-template-compiler": "^2.6.11"
"@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",
"sass-loader": "10.2.0",
"vue-cli-plugin-i18n": "2.3.1",
"vue-template-compiler": "2.7.14"
},
"browserslist": [
"> 1%",
Expand Down
4 changes: 2 additions & 2 deletions src/main.js
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.2
=========================================================
* Product Page: https://www.creative-tim.com/product/black-dashboard
* Copyright 2018 Creative Tim (http://www.creative-tim.com)
* Copyright 2023 Creative Tim (http://www.creative-tim.com)
=========================================================
Expand Down
98 changes: 55 additions & 43 deletions src/pages/Profile/EditProfileForm.vue
Original file line number Diff line number Diff line change
@@ -1,95 +1,107 @@
<!-- eslint-disable vue/no-mutating-props -->
<template>
<card>
<h5 slot="header" class="title">Edit Profile</h5>
<div class="row">
<div class="col-md-5 pr-md-1">
<base-input label="Company (disabled)"
placeholder="Company"
v-model="model.company"
disabled>
<base-input
label="Company (disabled)"
placeholder="Company"
v-model="model.company"
disabled
>
</base-input>
</div>
<div class="col-md-3 px-md-1">
<base-input label="Username"
placeholder="Username"
v-model="model.username">
<base-input
label="Username"
placeholder="Username"
v-model="model.username"
>
</base-input>
</div>
<div class="col-md-4 pl-md-1">
<base-input label="Email address"
type="email"
placeholder="mike@email.com">
<base-input
label="Email address"
type="email"
placeholder="mike@email.com"
>
</base-input>
</div>
</div>
<div class="row">
<div class="col-md-6 pr-md-1">
<base-input label="First Name"
v-model="model.firstName"
placeholder="First Name">
<base-input
label="First Name"
v-model="model.firstName"
placeholder="First Name"
>
</base-input>
</div>
<div class="col-md-6 pl-md-1">
<base-input label="Last Name"
v-model="model.lastName"
placeholder="Last Name">
<base-input
label="Last Name"
v-model="model.lastName"
placeholder="Last Name"
>
</base-input>
</div>
</div>
<div class="row">
<div class="col-md-12">
<base-input label="Address"
v-model="model.address"
placeholder="Home Address">
<base-input
label="Address"
v-model="model.address"
placeholder="Home Address"
>
</base-input>
</div>
</div>
<div class="row">
<div class="col-md-4 pr-md-1">
<base-input label="City"
v-model="model.city"
placeholder="City">
<base-input label="City" v-model="model.city" placeholder="City">
</base-input>
</div>
<div class="col-md-4 px-md-1">
<base-input label="Country"
v-model="model.country"
placeholder="Country">
<base-input
label="Country"
v-model="model.country"
placeholder="Country"
>
</base-input>
</div>
<div class="col-md-4 pl-md-1">
<base-input label="Postal Code"
placeholder="ZIP Code">
</base-input>
<base-input label="Postal Code" placeholder="ZIP Code"> </base-input>
</div>
</div>
<div class="row">
<div class="col-md-8">
<base-input>
<label>About Me</label>
<textarea rows="4" cols="80"
class="form-control"
placeholder="Here can be your description"
v-model="model.about">

</textarea>
<textarea
rows="4"
cols="80"
class="form-control"
placeholder="Here can be your description"
v-model="model.about"
>
</textarea>
</base-input>
</div>
</div>
<base-button slot="footer" type="primary" fill>Save</base-button>
</card>
</template>
<script>
export default {
props: {
model: {
type: Object,
default: () => {
return {};
}
export default {
props: {
model: {
type: Object,
default: () => {
return {};
}
}
}
};
</script>
<style>
</style>
<style></style>
Loading

0 comments on commit 7f90dba

Please sign in to comment.