From 90a39f68c70d1faf169b72162e96552bee6bac89 Mon Sep 17 00:00:00 2001 From: xidedix Date: Tue, 26 Jun 2018 18:56:47 +0200 Subject: [PATCH 1/7] chore: dependencies update --- CHANGELOG.md | 11 +++++++++++ package.json | 18 +++++++++--------- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 903529fe..12e27477 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,16 @@ ## [vue](./README.md) version `changelog` +##### `v2.0.0-next` +- fix: typo `DafaultAside` to `DefaultAside` - thanks @DamianLion +- chore: update `@coreui/coreui` to `2.0.3` +- chore: update `@vue/cli-plugin-babel` to `3.0.0-rc.3` +- chore: update `@vue/cli-plugin-e2e-nightwatch` to `3.0.0-rc.3` +- chore: update `@vue/cli-plugin-eslint` to `3.0.0-rc.3` +- chore: update `@vue/cli-plugin-unit-jest` to `3.0.0-rc.3` +- chore: update `@vue/cli-service` to `3.0.0-rc.3` +- chore: update `@vue/test-utils` to `3.0.0-rc.3` +- chore: update `babel-jest` to `23.2.0` + ##### `v2.0.0-beta.5` - chore: move tooling to `vue-cli v3.0.0-rc.2` - refactor: move from `static/img` to `public/img` dir diff --git a/package.json b/package.json index 879eed7e..954c44c9 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,7 @@ "test:e2e": "vue-cli-service test:e2e" }, "dependencies": { - "@coreui/coreui": "^2.0.2", + "@coreui/coreui": "^2.0.3", "@coreui/coreui-plugin-chartjs-custom-tooltips": "^1.2.0", "@coreui/icons": "^0.2.0", "@coreui/vue": "^2.0.0-beta.2", @@ -28,19 +28,19 @@ "perfect-scrollbar": "^1.4.0", "simple-line-icons": "^2.4.1", "vue": "^2.5.16", - "vue-chartjs": "^3.3.1", + "vue-chartjs": "^3.3.2", "vue-perfect-scrollbar": "^0.1.0", "vue-router": "^3.0.1" }, "devDependencies": { - "@vue/cli-plugin-babel": "^3.0.0-rc.2", - "@vue/cli-plugin-e2e-nightwatch": "^3.0.0-rc.2", - "@vue/cli-plugin-eslint": "^3.0.0-rc.2", - "@vue/cli-plugin-unit-jest": "^3.0.0-rc.2", - "@vue/cli-service": "^3.0.0-rc.2", - "@vue/test-utils": "^1.0.0-beta.19", + "@vue/cli-plugin-babel": "^3.0.0-rc.3", + "@vue/cli-plugin-e2e-nightwatch": "^3.0.0-rc.3", + "@vue/cli-plugin-eslint": "^3.0.0-rc.3", + "@vue/cli-plugin-unit-jest": "^3.0.0-rc.3", + "@vue/cli-service": "^3.0.0-rc.3", + "@vue/test-utils": "^1.0.0-beta.20", "babel-core": "^7.0.0-bridge.0", - "babel-jest": "^23.0.1", + "babel-jest": "^23.2.0", "node-sass": "^4.9.0", "sass-loader": "^7.0.3", "vue-template-compiler": "^2.5.16" From 668d3b27a611b4863273700c91d1ee180c494dcb Mon Sep 17 00:00:00 2001 From: xidedix Date: Tue, 26 Jun 2018 18:58:01 +0200 Subject: [PATCH 2/7] refactor(Pages): add b-form, b-form-input, autocomplete to Login & Register --- CHANGELOG.md | 2 ++ src/views/pages/Login.vue | 38 ++++++++++++------------ src/views/pages/Register.vue | 56 +++++++++++++++++++----------------- 3 files changed, 51 insertions(+), 45 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 12e27477..df5be0d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,8 @@ ##### `v2.0.0-next` - fix: typo `DafaultAside` to `DefaultAside` - thanks @DamianLion +- refactor(Pages): add `b-form`, `b-form-input` and `autocomplete` to Login +- refactor(Pages): add `b-form`, `b-form-input` and `autocomplete` to Register - chore: update `@coreui/coreui` to `2.0.3` - chore: update `@vue/cli-plugin-babel` to `3.0.0-rc.3` - chore: update `@vue/cli-plugin-e2e-nightwatch` to `3.0.0-rc.3` diff --git a/src/views/pages/Login.vue b/src/views/pages/Login.vue index 9834fbaf..c19a536e 100644 --- a/src/views/pages/Login.vue +++ b/src/views/pages/Login.vue @@ -6,24 +6,26 @@ -

Login

-

Sign In to your account

- - - - - - - - - - - Login - - - Forgot password? - - + +

Login

+

Sign In to your account

+ + + + + + + + + + + Login + + + Forgot password? + + + diff --git a/src/views/pages/Register.vue b/src/views/pages/Register.vue index 80f91ff2..474703d3 100644 --- a/src/views/pages/Register.vue +++ b/src/views/pages/Register.vue @@ -5,37 +5,39 @@ -

Register

-

Create your account

- - - - - - + +

Register

+

Create your account

+ + + + + + - - - @ - - - + + + @ + + + - - - - - - + + + + + + - - - - - - + + + + + + - Create Account + Create Account + From 76a81b4e10e97edb0c085ae295e48cb22e00b0dc Mon Sep 17 00:00:00 2001 From: xidedix Date: Wed, 27 Jun 2018 14:45:52 +0200 Subject: [PATCH 3/7] refactor: remove empty diff --git a/src/views/base/ListGroups.vue b/src/views/base/ListGroups.vue index a294f56b..3e6a96a1 100644 --- a/src/views/base/ListGroups.vue +++ b/src/views/base/ListGroups.vue @@ -250,6 +250,3 @@ export default { } - diff --git a/src/views/base/Navbars.vue b/src/views/base/Navbars.vue index d9d5215e..71d06712 100644 --- a/src/views/base/Navbars.vue +++ b/src/views/base/Navbars.vue @@ -162,6 +162,3 @@ export default { } - diff --git a/src/views/base/Navs.vue b/src/views/base/Navs.vue index 91c0f7b1..256f10d5 100644 --- a/src/views/base/Navs.vue +++ b/src/views/base/Navs.vue @@ -125,6 +125,3 @@ export default { } - diff --git a/src/views/base/Paginations.vue b/src/views/base/Paginations.vue index 46644b79..11bebdcf 100644 --- a/src/views/base/Paginations.vue +++ b/src/views/base/Paginations.vue @@ -97,6 +97,3 @@ export default { } - diff --git a/src/views/base/ProgressBars.vue b/src/views/base/ProgressBars.vue index 1a3dc4f3..d95d3cad 100644 --- a/src/views/base/ProgressBars.vue +++ b/src/views/base/ProgressBars.vue @@ -201,6 +201,3 @@ export default { } - diff --git a/src/views/base/Tooltips.vue b/src/views/base/Tooltips.vue index dacff831..7eed3345 100644 --- a/src/views/base/Tooltips.vue +++ b/src/views/base/Tooltips.vue @@ -143,6 +143,3 @@ export default { } - diff --git a/src/views/theme/ColorTheme.vue b/src/views/theme/ColorTheme.vue index a462f1e0..f1343787 100644 --- a/src/views/theme/ColorTheme.vue +++ b/src/views/theme/ColorTheme.vue @@ -24,6 +24,3 @@ export default { } - diff --git a/src/views/theme/ColorView.vue b/src/views/theme/ColorView.vue index 2e33a462..4498219e 100644 --- a/src/views/theme/ColorView.vue +++ b/src/views/theme/ColorView.vue @@ -40,6 +40,3 @@ export default { } - diff --git a/src/views/widgets/Widget03.vue b/src/views/widgets/Widget03.vue index e2e0f0e2..008d4a7f 100644 --- a/src/views/widgets/Widget03.vue +++ b/src/views/widgets/Widget03.vue @@ -29,6 +29,3 @@ export default { } - From 14747004fc48969942b05016cf99b45db64dd315 Mon Sep 17 00:00:00 2001 From: xidedix Date: Wed, 27 Jun 2018 15:10:32 +0200 Subject: [PATCH 4/7] refactor(router): add dynamic imports for Webpack code splitting --- src/router/index.js | 74 ++++++++++++++++++++++----------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index 96079e9e..98ec888e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -2,57 +2,57 @@ import Vue from 'vue' import Router from 'vue-router' // Containers -import DefaultContainer from '@/containers/DefaultContainer' +const DefaultContainer = () => import('@/containers/DefaultContainer') // Views -import Dashboard from '@/views/Dashboard' +const Dashboard = () => import('@/views/Dashboard') -import Colors from '@/views/theme/Colors' -import Typography from '@/views/theme/Typography' +const Colors = () => import('@/views/theme/Colors') +const Typography = () => import('@/views/theme/Typography') -import Charts from '@/views/Charts' -import Widgets from '@/views/Widgets' +const Charts = () => import('@/views/Charts') +const Widgets = () => import('@/views/Widgets') // Views - Components -import Cards from '@/views/base/Cards' -import Forms from '@/views/base/Forms' -import Switches from '@/views/base/Switches' -import Tables from '@/views/base/Tables' -import Tabs from '@/views/base/Tabs' -import Breadcrumbs from '@/views/base/Breadcrumbs' -import Carousels from '@/views/base/Carousels' -import Collapses from '@/views/base/Collapses' -import Jumbotrons from '@/views/base/Jumbotrons' -import ListGroups from '@/views/base/ListGroups' -import Navs from '@/views/base/Navs' -import Navbars from '@/views/base/Navbars' -import Paginations from '@/views/base/Paginations' -import Popovers from '@/views/base/Popovers' -import ProgressBars from '@/views/base/ProgressBars' -import Tooltips from '@/views/base/Tooltips' +const Cards = () => import('@/views/base/Cards') +const Forms = () => import('@/views/base/Forms') +const Switches = () => import('@/views/base/Switches') +const Tables = () => import('@/views/base/Tables') +const Tabs = () => import('@/views/base/Tabs') +const Breadcrumbs = () => import('@/views/base/Breadcrumbs') +const Carousels = () => import('@/views/base/Carousels') +const Collapses = () => import('@/views/base/Collapses') +const Jumbotrons = () => import('@/views/base/Jumbotrons') +const ListGroups = () => import('@/views/base/ListGroups') +const Navs = () => import('@/views/base/Navs') +const Navbars = () => import('@/views/base/Navbars') +const Paginations = () => import('@/views/base/Paginations') +const Popovers = () => import('@/views/base/Popovers') +const ProgressBars = () => import('@/views/base/ProgressBars') +const Tooltips = () => import('@/views/base/Tooltips') // Views - Buttons -import StandardButtons from '@/views/buttons/StandardButtons' -import ButtonGroups from '@/views/buttons/ButtonGroups' -import Dropdowns from '@/views/buttons/Dropdowns' -import BrandButtons from '@/views/buttons/BrandButtons' +const StandardButtons = () => import('@/views/buttons/StandardButtons') +const ButtonGroups = () => import('@/views/buttons/ButtonGroups') +const Dropdowns = () => import('@/views/buttons/Dropdowns') +const BrandButtons = () => import('@/views/buttons/BrandButtons') // Views - Icons -import Flags from '@/views/icons/Flags' -import FontAwesome from '@/views/icons/FontAwesome' -import SimpleLineIcons from '@/views/icons/SimpleLineIcons' -import CoreUIIcons from '@/views/icons/CoreUIIcons' +const Flags = () => import('@/views/icons/Flags') +const FontAwesome = () => import('@/views/icons/FontAwesome') +const SimpleLineIcons = () => import('@/views/icons/SimpleLineIcons') +const CoreUIIcons = () => import('@/views/icons/CoreUIIcons') // Views - Notifications -import Alerts from '@/views/notifications/Alerts' -import Badges from '@/views/notifications/Badges' -import Modals from '@/views/notifications/Modals' +const Alerts = () => import('@/views/notifications/Alerts') +const Badges = () => import('@/views/notifications/Badges') +const Modals = () => import('@/views/notifications/Modals') // Views - Pages -import Page404 from '@/views/pages/Page404' -import Page500 from '@/views/pages/Page500' -import Login from '@/views/pages/Login' -import Register from '@/views/pages/Register' +const Page404 = () => import('@/views/pages/Page404') +const Page500 = () => import('@/views/pages/Page500') +const Login = () => import('@/views/pages/Login') +const Register = () => import('@/views/pages/Register') Vue.use(Router) From cb8b974396e73ef407bf07f5d60390163af93880 Mon Sep 17 00:00:00 2001 From: xidedix Date: Wed, 27 Jun 2018 15:29:17 +0200 Subject: [PATCH 5/7] feat: Users Breadcrumb example with /users/:id --- src/containers/DefaultContainer.vue | 10 +-- src/router/index.js | 23 +++++++ src/views/users/User.vue | 51 +++++++++++++++ src/views/users/Users.vue | 99 +++++++++++++++++++++++++++++ src/views/users/UsersData.js | 31 +++++++++ 5 files changed, 209 insertions(+), 5 deletions(-) create mode 100644 src/views/users/User.vue create mode 100644 src/views/users/Users.vue create mode 100644 src/views/users/UsersData.js diff --git a/src/containers/DefaultContainer.vue b/src/containers/DefaultContainer.vue index bff5f89c..eb6b94e0 100644 --- a/src/containers/DefaultContainer.vue +++ b/src/containers/DefaultContainer.vue @@ -8,8 +8,8 @@ - Dashboard - Users + Dashboard + Users Settings @@ -37,7 +37,7 @@
- +
@@ -54,7 +54,7 @@ diff --git a/src/views/users/Users.vue b/src/views/users/Users.vue new file mode 100644 index 00000000..7c8d8ea6 --- /dev/null +++ b/src/views/users/Users.vue @@ -0,0 +1,99 @@ + + + + + diff --git a/src/views/users/UsersData.js b/src/views/users/UsersData.js new file mode 100644 index 00000000..977920d5 --- /dev/null +++ b/src/views/users/UsersData.js @@ -0,0 +1,31 @@ +const usersData = [ + {id: 0, name: 'John Doe', registered: '2018/01/01', role: 'Guest', status: 'Pending'}, + {id: 1, name: 'Samppa Nori', registered: '2018/01/01', role: 'Member', status: 'Active'}, + {id: 2, name: 'Estavan Lykos', registered: '2018/02/01', role: 'Staff', status: 'Banned'}, + {id: 3, name: 'Chetan Mohamed', registered: '2018/02/01', role: 'Admin', status: 'Inactive'}, + {id: 4, name: 'Derick Maximinus', registered: '2018/03/01', role: 'Member', status: 'Pending'}, + {id: 5, name: 'Friderik Dávid', registered: '2018/01/21', role: 'Staff', status: 'Active'}, + {id: 6, name: 'Yiorgos Avraamu', registered: '2018/01/01', role: 'Member', status: 'Active'}, + {id: 7, name: 'Avram Tarasios', registered: '2018/02/01', role: 'Staff', status: 'Banned'}, + {id: 8, name: 'Quintin Ed', registered: '2018/02/01', role: 'Admin', status: 'Inactive'}, + {id: 9, name: 'Enéas Kwadwo', registered: '2018/03/01', role: 'Member', status: 'Pending'}, + {id: 10, name: 'Agapetus Tadeáš', registered: '2018/01/21', role: 'Staff', status: 'Active'}, + {id: 11, name: 'Carwyn Fachtna', registered: '2018/01/01', role: 'Member', status: 'Active'}, + {id: 12, name: 'Nehemiah Tatius', registered: '2018/02/01', role: 'Staff', status: 'Banned'}, + {id: 13, name: 'Ebbe Gemariah', registered: '2018/02/01', role: 'Admin', status: 'Inactive'}, + {id: 14, name: 'Eustorgios Amulius', registered: '2018/03/01', role: 'Member', status: 'Pending'}, + {id: 15, name: 'Leopold Gáspár', registered: '2018/01/21', role: 'Staff', status: 'Active'}, + {id: 16, name: 'Pompeius René', registered: '2018/01/01', role: 'Member', status: 'Active'}, + {id: 17, name: 'Paĉjo Jadon', registered: '2018/02/01', role: 'Staff', status: 'Banned'}, + {id: 18, name: 'Micheal Mercurius', registered: '2018/02/01', role: 'Admin', status: 'Inactive'}, + {id: 19, name: 'Ganesha Dubhghall', registered: '2018/03/01', role: 'Member', status: 'Pending'}, + {id: 20, name: 'Hiroto Šimun', registered: '2018/01/21', role: 'Staff', status: 'Active'}, + {id: 21, name: 'Vishnu Serghei', registered: '2018/01/01', role: 'Member', status: 'Active'}, + {id: 22, name: 'Zbyněk Phoibos', registered: '2018/02/01', role: 'Staff', status: 'Banned'}, + {id: 23, name: 'Einar Randall', registered: '2018/02/01', role: 'Admin', status: 'Inactive'}, + {id: 24, name: 'Félix Troels', registered: '2018/03/21', role: 'Staff', status: 'Active'}, + {id: 25, name: 'Aulus Agmundr', registered: '2018/01/01', role: 'Member', status: 'Pending'}, + {id: 42, name: 'Ford Prefex', registered: '2001/05/21', role: 'Alien', status: 'Don\'t panic!'} +] + +export default usersData From 21912a9c024ef326eb1ebf4b15c2715c7337a6fc Mon Sep 17 00:00:00 2001 From: xidedix Date: Wed, 27 Jun 2018 15:31:42 +0200 Subject: [PATCH 6/7] fix(temp): for Jest testMatch issue --- jest.config.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/jest.config.js b/jest.config.js index d4f0822e..0d8b4f1f 100644 --- a/jest.config.js +++ b/jest.config.js @@ -17,6 +17,7 @@ module.exports = { 'jest-serializer-vue' ], testMatch: [ - '/(tests/unit/**/*.spec.(js|jsx|ts|tsx)|**/__tests__/*.(js|jsx|ts|tsx))' + '/(tests/unit/**/*.spec.(js|jsx|ts|tsx)|**/__tests__/*.(js|jsx|ts|tsx))', + '/tests/unit/Dashboard.spec.js' ] -} \ No newline at end of file +} From 78bf04c68937642e64f62558adebd2edfdb594c9 Mon Sep 17 00:00:00 2001 From: xidedix Date: Wed, 27 Jun 2018 15:32:43 +0200 Subject: [PATCH 7/7] chore(ship): v2.0.0-beta.6 --- CHANGELOG.md | 5 ++++- package.json | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index df5be0d8..390328d8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,10 @@ ## [vue](./README.md) version `changelog` -##### `v2.0.0-next` +##### `v2.0.0-beta.6` - fix: typo `DafaultAside` to `DefaultAside` - thanks @DamianLion +- feat(router): `Users/User Details` Breadcrumb example with `/users/:id` +- refactor(router): add dynamic imports for Webpack code splitting +- refactor: remove empty `