From 1decc9416ba0a69e4b7b7b54aeb99cef1c5b7009 Mon Sep 17 00:00:00 2001 From: Laila Los <44241786+ElectronicBlueberry@users.noreply.github.com> Date: Tue, 13 Feb 2024 12:28:58 +0100 Subject: [PATCH 01/12] adjust panel style --- client/src/components/Panels/ActivityPanel.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/client/src/components/Panels/ActivityPanel.vue b/client/src/components/Panels/ActivityPanel.vue index 47480ba91d62..e5674a02dc34 100644 --- a/client/src/components/Panels/ActivityPanel.vue +++ b/client/src/components/Panels/ActivityPanel.vue @@ -43,7 +43,7 @@ const emit = defineEmits(["goToAll"]); height: 100%; display: flex; flex-flow: column; - padding: 0.5rem 0.25rem; + padding: 0.5rem 1rem; background-color: $brand-light; .activity-panel-header { @@ -55,7 +55,8 @@ const emit = defineEmits(["goToAll"]); justify-content: space-between; .activity-panel-heading { - margin: 0 !important; + margin: 0; + padding-left: 0.25rem; } } } From d99af5b3c4dd99ea46575ba621c19bdad26fd4e3 Mon Sep 17 00:00:00 2001 From: Laila Los <44241786+ElectronicBlueberry@users.noreply.github.com> Date: Tue, 13 Feb 2024 12:29:37 +0100 Subject: [PATCH 02/12] remove disabled state --- client/src/components/Panels/NotificationsPanel.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/client/src/components/Panels/NotificationsPanel.vue b/client/src/components/Panels/NotificationsPanel.vue index b0c0bd61cbe1..0229c3776228 100644 --- a/client/src/components/Panels/NotificationsPanel.vue +++ b/client/src/components/Panels/NotificationsPanel.vue @@ -50,7 +50,6 @@ function goToAllNotifications() { Date: Tue, 13 Feb 2024 12:32:50 +0100 Subject: [PATCH 03/12] add href prop --- client/src/components/Panels/ActivityPanel.vue | 2 ++ client/src/components/Panels/NotificationsPanel.vue | 8 +------- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/client/src/components/Panels/ActivityPanel.vue b/client/src/components/Panels/ActivityPanel.vue index e5674a02dc34..28a599d3d30a 100644 --- a/client/src/components/Panels/ActivityPanel.vue +++ b/client/src/components/Panels/ActivityPanel.vue @@ -2,6 +2,7 @@ interface Props { title: string; goToAllTitle?: string; + href?: string; } const props = defineProps(); @@ -30,6 +31,7 @@ const emit = defineEmits(["goToAll"]); class="activity-panel-footer" variant="primary" :data-description="`props.mainButtonText button`" + :to="props.href" @click="emit('goToAll')"> {{ props.goToAllTitle }} diff --git a/client/src/components/Panels/NotificationsPanel.vue b/client/src/components/Panels/NotificationsPanel.vue index 0229c3776228..fa46c93988e2 100644 --- a/client/src/components/Panels/NotificationsPanel.vue +++ b/client/src/components/Panels/NotificationsPanel.vue @@ -5,7 +5,6 @@ import { FontAwesomeIcon } from "@fortawesome/vue-fontawesome"; import { BAlert, BButton, BButtonGroup } from "bootstrap-vue"; import { storeToRefs } from "pinia"; import { computed } from "vue"; -import { useRouter } from "vue-router/composables"; import { useConfirmDialog } from "@/composables/confirmDialog"; import { useNotificationsStore } from "@/stores/notificationsStore"; @@ -16,7 +15,6 @@ import ActivityPanel from "@/components/Panels/ActivityPanel.vue"; library.add(faCheckDouble); -const router = useRouter(); const { confirm } = useConfirmDialog(); const notificationsStore = useNotificationsStore(); @@ -38,14 +36,10 @@ async function onMarkAllAsRead() { }); } } - -function goToAllNotifications() { - router.push("/user/notifications"); -}