diff --git a/.gitignore b/.gitignore index eb4b0483..0c97e27c 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,5 @@ test/unit/coverage test/e2e/reports selenium-debug.log .netlify -.*.dockerfile \ No newline at end of file +.*.dockerfile +.vs \ No newline at end of file diff --git a/index.html b/index.html index 4d76b93f..d452776c 100644 --- a/index.html +++ b/index.html @@ -22,7 +22,7 @@ - +
@@ -30,6 +30,8 @@ + + - diff --git a/src/components/layout/MessagesMenu.vue b/src/components/layout/MessagesMenu.vue new file mode 100644 index 00000000..b41c9d6a --- /dev/null +++ b/src/components/layout/MessagesMenu.vue @@ -0,0 +1,40 @@ + + + diff --git a/src/components/layout/NotificationItem.vue b/src/components/layout/NotificationItem.vue new file mode 100644 index 00000000..4546bdd4 --- /dev/null +++ b/src/components/layout/NotificationItem.vue @@ -0,0 +1,48 @@ + + + + + diff --git a/src/components/layout/NotificationsMenu.vue b/src/components/layout/NotificationsMenu.vue new file mode 100644 index 00000000..0f7e80d6 --- /dev/null +++ b/src/components/layout/NotificationsMenu.vue @@ -0,0 +1,115 @@ + + + + + diff --git a/src/components/Sidebar.vue b/src/components/layout/Sidebar.vue similarity index 66% rename from src/components/Sidebar.vue rename to src/components/layout/Sidebar.vue index 9fbdc509..d6829475 100644 --- a/src/components/Sidebar.vue +++ b/src/components/layout/Sidebar.vue @@ -7,11 +7,11 @@
- +
-

{{ displayName }}

+

{{user.displayName}}

Online @@ -20,16 +20,16 @@
-
-
- +
+ + - @@ -50,15 +50,34 @@ import SidebarMenu from './SidebarMenu' export default { name: 'Sidebar', - props: ['displayName', 'pictureUrl'], + props: ['user'], components: { SidebarMenu }, - mounted: function () { - window.jQuery('[data-toggle="hideseek"]').off().hideseek() + mounted: function() { + window + .jQuery('[data-toggle="hideseek"]') + .off() + .hideseek() } } - diff --git a/src/components/SidebarMenu.vue b/src/components/layout/SidebarMenu.vue similarity index 80% rename from src/components/SidebarMenu.vue rename to src/components/layout/SidebarMenu.vue index ad2462bd..127d0ea7 100644 --- a/src/components/SidebarMenu.vue +++ b/src/components/layout/SidebarMenu.vue @@ -30,9 +30,9 @@
  • - Files - - + Files + +
      @@ -96,24 +96,29 @@ export default { } diff --git a/src/components/layout/TasksMenu.vue b/src/components/layout/TasksMenu.vue new file mode 100644 index 00000000..c49564f5 --- /dev/null +++ b/src/components/layout/TasksMenu.vue @@ -0,0 +1,50 @@ + + + diff --git a/src/components/layout/UserMenu.vue b/src/components/layout/UserMenu.vue new file mode 100644 index 00000000..8961e72a --- /dev/null +++ b/src/components/layout/UserMenu.vue @@ -0,0 +1,32 @@ + + + diff --git a/src/components/views/Dashboard.vue b/src/components/views/Dashboard.vue index b2b14410..fb5b24ab 100644 --- a/src/components/views/Dashboard.vue +++ b/src/components/views/Dashboard.vue @@ -1,67 +1,51 @@