From f399356aba699ff91cd98d14152f3ac27585b767 Mon Sep 17 00:00:00 2001 From: Namoshek Date: Sun, 19 Aug 2018 10:16:40 +0200 Subject: [PATCH 1/9] refactor dash header and footer into own components --- src/components/Dash.vue | 155 +++----------------------------- src/components/DashFooter.vue | 16 ++++ src/components/DashHeader.vue | 162 ++++++++++++++++++++++++++++++++++ 3 files changed, 191 insertions(+), 142 deletions(-) create mode 100644 src/components/DashFooter.vue create mode 100644 src/components/DashHeader.vue diff --git a/src/components/Dash.vue b/src/components/Dash.vue index f195b972..80cecf7e 100644 --- a/src/components/Dash.vue +++ b/src/components/Dash.vue @@ -1,129 +1,11 @@ diff --git a/src/components/DashFooter.vue b/src/components/DashFooter.vue new file mode 100644 index 00000000..4f9bee90 --- /dev/null +++ b/src/components/DashFooter.vue @@ -0,0 +1,16 @@ + + + diff --git a/src/components/DashHeader.vue b/src/components/DashHeader.vue new file mode 100644 index 00000000..962dbc32 --- /dev/null +++ b/src/components/DashHeader.vue @@ -0,0 +1,162 @@ + + + + + + From fe1e29f3804c13ab0db32f64a56f79dd900b63ab Mon Sep 17 00:00:00 2001 From: Namoshek Date: Sun, 19 Aug 2018 10:37:47 +0200 Subject: [PATCH 2/9] refactor menus into own components and rename demo to user --- src/components/Dash.vue | 13 +-- src/components/DashFooter.vue | 1 + src/components/DashHeader.vue | 143 ++++----------------------- src/components/MessagesMenu.vue | 47 +++++++++ src/components/NotificationsMenu.vue | 39 ++++++++ src/components/Sidebar.vue | 6 +- src/components/TasksMenu.vue | 50 ++++++++++ src/components/UserMenu.vue | 32 ++++++ 8 files changed, 195 insertions(+), 136 deletions(-) create mode 100644 src/components/MessagesMenu.vue create mode 100644 src/components/NotificationsMenu.vue create mode 100644 src/components/TasksMenu.vue create mode 100644 src/components/UserMenu.vue diff --git a/src/components/Dash.vue b/src/components/Dash.vue index 80cecf7e..61fec054 100644 --- a/src/components/Dash.vue +++ b/src/components/Dash.vue @@ -2,13 +2,11 @@
- + - - + +
@@ -56,12 +54,11 @@ export default { classes: { fixed_layout: config.fixedLayout, hide_logo: config.hideLogoOnMobile - }, - error: '' + } } }, computed: { - demo () { + user () { return { displayName: faker.name.findName(), avatar: faker.image.avatar(), diff --git a/src/components/DashFooter.vue b/src/components/DashFooter.vue index 4f9bee90..cb45f9a1 100644 --- a/src/components/DashFooter.vue +++ b/src/components/DashFooter.vue @@ -7,6 +7,7 @@ - - diff --git a/src/components/MessagesMenu.vue b/src/components/MessagesMenu.vue new file mode 100644 index 00000000..7d0ec56f --- /dev/null +++ b/src/components/MessagesMenu.vue @@ -0,0 +1,47 @@ + + + diff --git a/src/components/NotificationsMenu.vue b/src/components/NotificationsMenu.vue new file mode 100644 index 00000000..36fc0c4a --- /dev/null +++ b/src/components/NotificationsMenu.vue @@ -0,0 +1,39 @@ + + + diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue index 1b7c7a16..d6829475 100644 --- a/src/components/Sidebar.vue +++ b/src/components/Sidebar.vue @@ -7,11 +7,11 @@
- +
-

{{ displayName }}

+

{{user.displayName}}

Online @@ -50,7 +50,7 @@ import SidebarMenu from './SidebarMenu' export default { name: 'Sidebar', - props: ['displayName', 'pictureUrl'], + props: ['user'], components: { SidebarMenu }, mounted: function() { window diff --git a/src/components/TasksMenu.vue b/src/components/TasksMenu.vue new file mode 100644 index 00000000..c49564f5 --- /dev/null +++ b/src/components/TasksMenu.vue @@ -0,0 +1,50 @@ + + + diff --git a/src/components/UserMenu.vue b/src/components/UserMenu.vue new file mode 100644 index 00000000..8961e72a --- /dev/null +++ b/src/components/UserMenu.vue @@ -0,0 +1,32 @@ + + + From 7594662d2617a13f9c269d67e037649daae97422 Mon Sep 17 00:00:00 2001 From: Namoshek Date: Sun, 19 Aug 2018 11:03:34 +0200 Subject: [PATCH 3/9] move layout components into own directory --- src/components/Dash.vue | 6 +++--- src/components/{ => layout}/DashFooter.vue | 0 src/components/{ => layout}/DashHeader.vue | 7 ------- src/components/{ => layout}/MessagesMenu.vue | 7 +++++++ src/components/{ => layout}/NotificationsMenu.vue | 0 src/components/{ => layout}/Sidebar.vue | 0 src/components/{ => layout}/SidebarMenu.vue | 0 src/components/{ => layout}/TasksMenu.vue | 0 src/components/{ => layout}/UserMenu.vue | 0 9 files changed, 10 insertions(+), 10 deletions(-) rename src/components/{ => layout}/DashFooter.vue (100%) rename src/components/{ => layout}/DashHeader.vue (86%) rename src/components/{ => layout}/MessagesMenu.vue (86%) rename src/components/{ => layout}/NotificationsMenu.vue (100%) rename src/components/{ => layout}/Sidebar.vue (100%) rename src/components/{ => layout}/SidebarMenu.vue (100%) rename src/components/{ => layout}/TasksMenu.vue (100%) rename src/components/{ => layout}/UserMenu.vue (100%) diff --git a/src/components/Dash.vue b/src/components/Dash.vue index 61fec054..aa775e1c 100644 --- a/src/components/Dash.vue +++ b/src/components/Dash.vue @@ -36,9 +36,9 @@ - - diff --git a/src/components/MessagesMenu.vue b/src/components/layout/MessagesMenu.vue similarity index 86% rename from src/components/MessagesMenu.vue rename to src/components/layout/MessagesMenu.vue index 7d0ec56f..44a02283 100644 --- a/src/components/MessagesMenu.vue +++ b/src/components/layout/MessagesMenu.vue @@ -45,3 +45,10 @@ export default { } } + + diff --git a/src/components/NotificationsMenu.vue b/src/components/layout/NotificationsMenu.vue similarity index 100% rename from src/components/NotificationsMenu.vue rename to src/components/layout/NotificationsMenu.vue diff --git a/src/components/Sidebar.vue b/src/components/layout/Sidebar.vue similarity index 100% rename from src/components/Sidebar.vue rename to src/components/layout/Sidebar.vue diff --git a/src/components/SidebarMenu.vue b/src/components/layout/SidebarMenu.vue similarity index 100% rename from src/components/SidebarMenu.vue rename to src/components/layout/SidebarMenu.vue diff --git a/src/components/TasksMenu.vue b/src/components/layout/TasksMenu.vue similarity index 100% rename from src/components/TasksMenu.vue rename to src/components/layout/TasksMenu.vue diff --git a/src/components/UserMenu.vue b/src/components/layout/UserMenu.vue similarity index 100% rename from src/components/UserMenu.vue rename to src/components/layout/UserMenu.vue From 3a4de62d8b75d76bf38559deec9b83ab1eb1051f Mon Sep 17 00:00:00 2001 From: Namoshek Date: Sun, 19 Aug 2018 11:14:44 +0200 Subject: [PATCH 4/9] extract message item into own component and add real test message --- src/components/layout/MessageItem.vue | 28 ++++++++++++++++++++++++++ src/components/layout/MessagesMenu.vue | 28 +++++++------------------- src/store/state.js | 9 ++++++++- 3 files changed, 43 insertions(+), 22 deletions(-) create mode 100644 src/components/layout/MessageItem.vue diff --git a/src/components/layout/MessageItem.vue b/src/components/layout/MessageItem.vue new file mode 100644 index 00000000..c66a8a7e --- /dev/null +++ b/src/components/layout/MessageItem.vue @@ -0,0 +1,28 @@ + + + + + diff --git a/src/components/layout/MessagesMenu.vue b/src/components/layout/MessagesMenu.vue index 44a02283..b41c9d6a 100644 --- a/src/components/layout/MessagesMenu.vue +++ b/src/components/layout/MessagesMenu.vue @@ -9,20 +9,9 @@
  • @@ -35,9 +24,13 @@ - - diff --git a/src/store/state.js b/src/store/state.js index a9f1170f..c6976bbe 100644 --- a/src/store/state.js +++ b/src/store/state.js @@ -5,7 +5,14 @@ export default { user: null, token: null, userInfo: { - messages: [{1: 'test', 2: 'test'}], + messages: [ + { + id: 1, + title: 'Support Team', + body: 'Why not consider this a test message?', + createdAt: '17 min ago' + } + ], notifications: [], tasks: [] } From 04ab68f9727e7907f63ce16510868686af21c5fe Mon Sep 17 00:00:00 2001 From: Namoshek Date: Sun, 19 Aug 2018 12:00:32 +0200 Subject: [PATCH 5/9] refactor dashboard into widget components --- src/components/views/Dashboard.vue | 181 +++++++++------------- src/components/widgets/Alert.vue | 36 +++++ src/components/widgets/InfoBox.vue | 35 +++++ src/components/widgets/ProcessInfoBox.vue | 50 ++++++ 4 files changed, 191 insertions(+), 111 deletions(-) create mode 100644 src/components/widgets/Alert.vue create mode 100644 src/components/widgets/InfoBox.vue create mode 100644 src/components/widgets/ProcessInfoBox.vue diff --git a/src/components/views/Dashboard.vue b/src/components/views/Dashboard.vue index b2b14410..5d21e4e9 100644 --- a/src/components/views/Dashboard.vue +++ b/src/components/views/Dashboard.vue @@ -1,67 +1,51 @@