From bcedf7982b915511dacbd3a6b948b18bdaaae900 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santtu=20S=C3=B6derholm?= Date: Fri, 4 Jun 2021 12:25:50 +0300 Subject: [PATCH 01/17] Changed .sidebar background color to $gray-dark --- assets/styles/components/_layout.scss | 1 + 1 file changed, 1 insertion(+) diff --git a/assets/styles/components/_layout.scss b/assets/styles/components/_layout.scss index 3aa1fde..670a4ba 100644 --- a/assets/styles/components/_layout.scss +++ b/assets/styles/components/_layout.scss @@ -178,6 +178,7 @@ } .sidebar { + background-color: $gray-dark; flex-shrink: 0; width: var(--sidebar-width); } From efb50164443b8c49650adb353da0668c7d6a192c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santtu=20S=C3=B6derholm?= Date: Fri, 4 Jun 2021 12:27:01 +0300 Subject: [PATCH 02/17] Added a LeftSidebar component --- components/LeftSidebar.vue | 48 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 components/LeftSidebar.vue diff --git a/components/LeftSidebar.vue b/components/LeftSidebar.vue new file mode 100644 index 0000000..21fcbbc --- /dev/null +++ b/components/LeftSidebar.vue @@ -0,0 +1,48 @@ + + + + + From b0f518d2610fe522a46d7401b3a2a75185f803cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santtu=20S=C3=B6derholm?= Date: Fri, 4 Jun 2021 12:27:30 +0300 Subject: [PATCH 03/17] Added the left sidebar to the default layout --- layouts/default.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/layouts/default.vue b/layouts/default.vue index a94c10f..db26564 100644 --- a/layouts/default.vue +++ b/layouts/default.vue @@ -1,6 +1,7 @@ @@ -75,4 +80,17 @@ export default { border-left-color: $blue-light; border-left-style: solid; } + +.zeroxcert-advertisement { + align-items: center; + bottom: 0; + font-weight: bold; + left: 0; + padding: 1rem; + position: absolute; + + > a { + color: $gray-light; + } +} From d44bfea1470e7bd8d27e96a06040e498dff566a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santtu=20S=C3=B6derholm?= Date: Tue, 8 Jun 2021 21:22:00 +0300 Subject: [PATCH 11/17] Added filtering of Users tab based on user community abilities --- components/LeftSidebar.vue | 47 ++++++++++++++++++++++++++++++++------ 1 file changed, 40 insertions(+), 7 deletions(-) diff --git a/components/LeftSidebar.vue b/components/LeftSidebar.vue index 5b72919..32efa94 100644 --- a/components/LeftSidebar.vue +++ b/components/LeftSidebar.vue @@ -6,7 +6,7 @@
@@ -25,10 +25,39 @@ From efb60ed44079ee13fe064e20b925062eecf40ad1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santtu=20S=C3=B6derholm?= Date: Wed, 9 Jun 2021 13:57:18 +0300 Subject: [PATCH 15/17] Merged multiple vuex.maxState calls into one --- components/LeftSidebar.vue | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/components/LeftSidebar.vue b/components/LeftSidebar.vue index 92e8d2c..7399a7d 100644 --- a/components/LeftSidebar.vue +++ b/components/LeftSidebar.vue @@ -30,14 +30,11 @@ import { mapState } from 'vuex' export default { computed: { ...mapState({ - menuItems: (state) => state.nav.menuItems - }), - ...mapState({ - profileAbilities: (state) => state.profile.profileAbilities - }), - ...mapState({ + sidebarOpen: (state) => state.nav.sidebarOpen, + menuItems: (state) => state.nav.menuItems, requiredUserViewRights: (state) => - state.nav.menuItems[2].requiredAbilities + state.nav.menuItems[2].requiredAbilities, + profileAbilities: (state) => state.profile.profileAbilities }), filteredMenuItems() { const filteredItems = [] From a8d0176606edbe364642ea4e9bd8528b69bf8b4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Santtu=20S=C3=B6derholm?= Date: Wed, 9 Jun 2021 14:52:13 +0300 Subject: [PATCH 16/17] The sidebar is now correctly toggled by the hamburger button when the size of the viewport is < medium down --- assets/styles/components/_layout.scss | 3 ++- components/LeftSidebar.vue | 6 ++++++ layouts/default.vue | 6 ++++-- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/assets/styles/components/_layout.scss b/assets/styles/components/_layout.scss index 0c01bab..31bd5e9 100644 --- a/assets/styles/components/_layout.scss +++ b/assets/styles/components/_layout.scss @@ -3,6 +3,7 @@ --space: 15px; --avatar-size: 35px; --sidebar-width: 210px; + --controller-layer: 10; @include breakpoint(medium) { --avatar-size: 40px; @@ -142,7 +143,7 @@ top: 0; transition: min-height $ease; width: calc(100% - var(--sidebar-width)); - z-index: 10; + z-index: var(--controller-layer); @include breakpoint(medium down) { width: 100vw; diff --git a/components/LeftSidebar.vue b/components/LeftSidebar.vue index 7399a7d..2e8f32e 100644 --- a/components/LeftSidebar.vue +++ b/components/LeftSidebar.vue @@ -65,6 +65,12 @@ export default { background-color: $gray-dark; flex-shrink: 0; width: var(--sidebar-width); + z-index: calc(var(--controller-layer) + 2); + + /* &.sidebarOpen { + transform: translateX(var(--sidebar-width)); + transition: 0.3s; + } */ .sidebartitle { align-items: center; diff --git a/layouts/default.vue b/layouts/default.vue index db26564..ee77883 100644 --- a/layouts/default.vue +++ b/layouts/default.vue @@ -1,5 +1,5 @@