Skip to content

Commit 5a4d1a7

Browse files
authored
Merge branch 'master' into master
2 parents a88d663 + aad583f commit 5a4d1a7

File tree

720 files changed

+39794
-1709
lines changed

Some content is hidden

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

720 files changed

+39794
-1709
lines changed

CHANGELOG.md

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,45 @@
11
## [vue](./README.md) version `changelog`
22

3+
##### `v1.0.11`
4+
- refactor: project directory structure
5+
- update: vuejs-templates/webpack to `1.3.1`
6+
- update: vue to `2.5.13`
7+
- chore: dependencies update
8+
9+
##### `v1.0.10`
10+
- fix: `className` -> `class`
11+
- refactor: `<b-input-group-prepend>`
12+
- refactor: `<b-input-group-append>`
13+
- refactor: `<b-input-group-text>`
14+
- refactor: remove `<b-input-group-button>`
15+
- test: initial `Dashboard` unit test added
16+
- update: bootstrap-vue to `2.0.0-rc.1`
17+
- chore: dependencies update
18+
19+
###### `v1.0.9`
20+
- refactor: Sidebar structure
21+
- test: initial e2e test added
22+
- chore: dependencies update
23+
24+
###### `v1.0.8`
25+
- update: vue to `2.5.13`
26+
- update: Bootstrap to `4.0.0-beta.3`
27+
- update: bootstrap-vue to `1.4.0`
28+
- chore: dependencies update
29+
- refactor: `<b-table>` use the prop `responsive="sm"` instead of `class="table-responsive-sm"`
30+
- fix: `Vue warn:` Do not use built-in or reserved HTML elements as component id: (header, aside, footer, table)
31+
- feature: some Bootstrap4 components added
32+
- temp tweaks(b4 beta3): `InputGroupAddon` and `InputGroupButton`
33+
- refactor(checkboxes, radios, labels): temp tweaks
34+
- feat: mobile sidebar link click closes the sidebar [#18](https://github.com/mrholek/CoreUI-Vue/pull/18)
35+
336
###### `v1.0.6`
437
- refactor: raw html to `b-row`, `b-col`, `b-card`, `b-button` components
538
- fix: Cards.vue: change `variant="accent-` to `class="card-accent-`
639
- refactor: Modal's ok-button variants
740
- refactor: forms with validation feedback
841
- update: bootstrap-vue to `1.1.0`
9-
- update: to vue: `2.5.6`
42+
- update: vue to `2.5.6`
1043

1144
###### `v1.0.5`
1245
- update: bootstrap-vue to `1.0.x`

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2017 creativeLabs Łukasz Holeczek.
3+
Copyright (c) 2018 creativeLabs Łukasz Holeczek.
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
### Check out our Vue Admin Templates and support CoreUI Development
44

5-
[![Bootstrap Admin Templates Bundle](https://genesisui.com/img/bundle2.png)](https://genesisui.com/bundle.html?support=1)
5+
[![Bootstrap Admin Templates Bundle](https://genesisui.com/img/bundle2.png)](https://genesisui.com/admin-templates/vuejs/prime/?support=1)
66

7-
[Check out Bootstrap Admin Templates Bundle](https://genesisui.com/bundle.html?support=1)
7+
[Check out Bootstrap Admin Templates Bundle](https://genesisui.com/admin-templates/vuejs/prime/?support=1)
88

99
This is Vue.js version of our Bootstrap 4 admin template [CoreUI](https://github.com/mrholek/CoreUI-Free-Bootstrap-Admin-Template).
1010

@@ -47,6 +47,7 @@ CoreUI includes 6 Version for Angular 4, AngularJS, React.js, Vue.js, Static HTM
4747
* [HTML5 Static Version](https://github.com/mrholek/CoreUI-Free-Bootstrap-Admin-Template).
4848
* [React.js Version](https://github.com/mrholek/CoreUI-React).
4949
* [Vue.js Version](https://github.com/mrholek/CoreUI-Vue).
50+
* [ASP.NET Core 2 MVC Version](https://github.com/mrholek/CoreUI-NET)
5051

5152
## Bugs and feature requests
5253

Vue_Full_Project/.babelrc

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,18 @@
11
{
22
"presets": [
3-
["env", { "modules": false }],
3+
["env", {
4+
"modules": false,
5+
"targets": {
6+
"browsers": ["> 1%", "last 2 versions", "not ie <= 9"]
7+
}
8+
}],
49
"stage-2"
510
],
6-
"plugins": ["transform-runtime"],
7-
"comments": false,
11+
"plugins": ["transform-vue-jsx", "transform-runtime"],
812
"env": {
913
"test": {
1014
"presets": ["env", "stage-2"],
11-
"plugins": [ "istanbul" ]
15+
"plugins": ["transform-vue-jsx", "istanbul"]
1216
}
1317
}
1418
}

Vue_Full_Project/.eslintignore

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
1-
build/*.js
2-
config/*.js
1+
/build/
2+
/config/
3+
/dist/
4+
/*.js
5+
/test/unit/coverage/
6+
/test/e2e/specs

Vue_Full_Project/.eslintrc.js

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,29 @@
1-
// http://eslint.org/docs/user-guide/configuring
1+
// https://eslint.org/docs/user-guide/configuring
22

33
module.exports = {
44
root: true,
5-
parser: 'babel-eslint',
65
parserOptions: {
7-
sourceType: 'module'
6+
parser: 'babel-eslint'
87
},
98
env: {
109
browser: true,
1110
},
12-
// https://github.com/feross/standard/blob/master/RULES.md#javascript-standard-style
13-
extends: 'standard',
11+
extends: [
12+
// https://github.com/vuejs/eslint-plugin-vue#priority-a-essential-error-prevention
13+
// consider switching to `plugin:vue/strongly-recommended` or `plugin:vue/recommended` for stricter rules.
14+
'plugin:vue/essential',
15+
// https://github.com/standard/standard/blob/master/docs/RULES-en.md
16+
'standard'
17+
],
1418
// required to lint *.vue files
1519
plugins: [
16-
'html'
20+
'vue'
1721
],
1822
// add your custom rules here
19-
'rules': {
20-
// allow paren-less arrow functions
21-
'arrow-parens': 0,
23+
rules: {
2224
// allow async-await
23-
'generator-star-spacing': 0,
25+
'generator-star-spacing': 'off',
2426
// allow debugger during development
25-
'no-debugger': process.env.NODE_ENV === 'production' ? 2 : 0
27+
'no-debugger': process.env.NODE_ENV === 'production' ? 'error' : 'off'
2628
}
2729
}

Vue_Full_Project/.gitignore

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,17 @@
11
.DS_Store
22
node_modules/
3-
dist/
3+
/dist/
44
npm-debug.log*
55
yarn-debug.log*
66
yarn-error.log*
7-
test/unit/coverage
8-
test/e2e/reports
7+
/test/unit/coverage/
8+
/test/e2e/reports/
99
selenium-debug.log
10+
11+
# Editor directories and files
12+
.idea
13+
.vscode
14+
*.suo
15+
*.ntvs*
16+
*.njsproj
17+
*.sln

Vue_Full_Project/.postcssrc.js

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
module.exports = {
44
"plugins": {
5-
// to edit target browsers: use "browserlist" field in package.json
5+
"postcss-import": {},
6+
"postcss-url": {},
7+
// to edit target browsers: use "browserslist" field in package.json
68
"autoprefixer": {}
79
}
810
}

Vue_Full_Project/CHANGELOG.md

Lines changed: 34 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,45 @@
11
## [vue](./README.md) version `changelog`
22

3+
##### `v1.0.11`
4+
- refactor: project directory structure
5+
- update: vuejs-templates/webpack to `1.3.1`
6+
- update: vue to `2.5.13`
7+
- chore: dependencies update
8+
9+
##### `v1.0.10`
10+
- fix: `className` -> `class`
11+
- refactor: `<b-input-group-prepend>`
12+
- refactor: `<b-input-group-append>`
13+
- refactor: `<b-input-group-text>`
14+
- refactor: remove `<b-input-group-button>`
15+
- test: initial `Dashboard` unit test added
16+
- update: bootstrap-vue to `2.0.0-rc.1`
17+
- chore: dependencies update
18+
19+
###### `v1.0.9`
20+
- refactor: Sidebar structure
21+
- test: initial e2e test added
22+
- chore: dependencies update
23+
24+
###### `v1.0.8`
25+
- update: vue to `2.5.13`
26+
- update: Bootstrap to `4.0.0-beta.3`
27+
- update: bootstrap-vue to `1.4.0`
28+
- chore: dependencies update
29+
- refactor: `<b-table>` use the prop `responsive="sm"` instead of `class="table-responsive-sm"`
30+
- fix: `Vue warn:` Do not use built-in or reserved HTML elements as component id: (header, aside, footer, table)
31+
- feature: some Bootstrap4 components added
32+
- temp tweaks(b4 beta3): `InputGroupAddon` and `InputGroupButton`
33+
- refactor(checkboxes, radios, labels): temp tweaks
34+
- feat: mobile sidebar link click closes the sidebar [#18](https://github.com/mrholek/CoreUI-Vue/pull/18)
35+
336
###### `v1.0.6`
437
- refactor: raw html to `b-row`, `b-col`, `b-card`, `b-button` components
538
- fix: Cards.vue: change `variant="accent-` to `class="card-accent-`
639
- refactor: Modal's ok-button variants
740
- refactor: forms with validation feedback
841
- update: bootstrap-vue to `1.1.0`
9-
- update: to vue: `2.5.6`
42+
- update: vue to `2.5.6`
1043

1144
###### `v1.0.5`
1245
- update: bootstrap-vue to `1.0.x`

Vue_Full_Project/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
# core-ui
1+
# CoreUI Vue
22

3-
> Open Source Admin Template
3+
> CoreUI Vue Open Source Bootsrtap 4 Admin Template
44
55
## Build Setup
66

@@ -27,4 +27,4 @@ npm run e2e
2727
npm test
2828
```
2929

30-
For detailed explanation on how things work, checkout the [guide](http://vuejs-templates.github.io/webpack/) and [docs for vue-loader](http://vuejs.github.io/vue-loader).
30+
For a detailed explanation on how things work, check out the [guide](http://vuejs-templates.github.io/webpack/) and [docs for vue-loader](http://vuejs.github.io/vue-loader).

0 commit comments

Comments
 (0)