@vc-shell/framework 1.0.326 → 1.0.328-0

package/shared/components/language-selector/language-selector.vue

@@ -1,55 +1,50 @@
 <template>
-  <AppBarButtonTemplate
-    :title="$t('COMPONENTS.LANGUAGE_SELECTOR.TITLE')"
-    position="bottom-end"
-  >
-    <template #button>
-      <div class="vc-language-selector__button-wrap">
+  <SettingsMenuItem @trigger:click="opened = !opened">
+    <template #trigger>
+      <div class="vc-language-selector__trigger">
         <VcImage
           :src="currLocaleFlag"
-          class="vc-language-selector__img vc-language-selector__img--button"
-          empty-icon="fas fa-globe"
+          :empty-icon="'fas fa-globe'"
+          class="vc-language-selector__flag"
         />
+        <span class="vc-language-selector__title">
+          {{ $t("COMPONENTS.LANGUAGE_SELECTOR.TITLE") }}
+        </span>
       </div>
     </template>
-    <template #dropdown-content="{ opened, toggle }">
-      <Sidebar
-        :is-expanded="$isMobile.value ? opened : false"
-        position="right"
-        render="mobile"
-        @close="toggle"
+
+    <template #content>
+      <GenericDropdown
+        :opened="opened"
+        :items="languageItems"
+        :is-item-active="(lang) => lang.lang === $i18n.locale"
+        @item-click="handleLanguageSelect"
       >
-        <template #content>
+        <template #item="{ item: lang, click }">
           <div
-            v-if="opened"
-            class="vc-language-selector__dropdown"
+            class="vc-language-selector__item"
+            :class="{ 'vc-language-selector__item--active': lang.lang === $i18n.locale }"
+            @click="click"
           >
-            <div
-              v-for="(lang, i) in languageItems"
-              :key="i"
-              class="vc-language-selector__item"
-              :class="{ 'vc-language-selector__item--active': lang.lang === $i18n.locale }"
-              @click="lang.hasOwnProperty('clickHandler') && lang.clickHandler(lang.lang)"
-            >
-              <VcImage
-                :src="lang.flag"
-                class="vc-language-selector__img"
-              />
-              {{ lang.title }}
-            </div>
+            <VcImage
+              :src="lang.flag"
+              class="vc-language-selector__flag"
+            />
+            <span class="vc-language-selector__item-title">{{ lang.title }}</span>
           </div>
         </template>
-      </Sidebar>
+      </GenericDropdown>
     </template>
-  </AppBarButtonTemplate>
+  </SettingsMenuItem>
 </template>
 
 <script lang="ts" setup>
 import { useI18n } from "vue-i18n";
 import { useLanguages } from "../../../core/composables";
-import { AppBarButtonTemplate } from "./../app-bar-button";
-import { Sidebar } from "./../sidebar";
+import { GenericDropdown } from "../generic-dropdown";
 import { watch, ref } from "vue";
+import { SettingsMenuItem } from "../settings-menu-item";
+import { VcImage } from "../../../ui/components";
 
 interface ILanguage {
   lang: string;
@@ -61,6 +56,9 @@ interface ILanguage {
 const { availableLocales, getLocaleMessage, locale } = useI18n({ useScope: "global" });
 const { setLocale, getFlag } = useLanguages();
 
+const opened = ref(false);
+const currLocaleFlag = ref<string>();
+
 const languageItems: ILanguage[] = availableLocales
   .map((locale: string) => ({
     lang: locale,
@@ -72,15 +70,21 @@ const languageItems: ILanguage[] = availableLocales
   }))
   .filter((item) => item.title);
 
-const currLocaleFlag = ref<string>();
+const handleLanguageSelect = (lang: ILanguage) => {
+  if (Object.prototype.hasOwnProperty.call(lang, "clickHandler")) {
+    lang.clickHandler(lang.lang);
+  }
+  opened.value = false;
+};
 
 watch(
   [() => languageItems, () => locale.value],
   async ([newValLangItem]) => {
     for (const lang of newValLangItem) {
       lang.flag = await getFlag(lang.lang);
-
-      currLocaleFlag.value = languageItems.find((lang) => lang.lang === locale.value)?.flag;
+      if (lang.lang === locale.value) {
+        currLocaleFlag.value = lang.flag;
+      }
     }
   },
   { immediate: true },
@@ -88,44 +92,31 @@ watch(
 </script>
 
 <style lang="scss">
-:root {
-  --language-selector-bg-color: var(--additional-50);
-  --language-selector-text-color: var(--base-text-color, var(--neutrals-950));
-  --language-selector-border-color: var(--app-bar-divider-color);
-  --language-selector-hover-bg-color: var(--primary-50);
-  --language-selector-button-width: var(--app-bar-button-width);
-}
-
 .vc-language-selector {
-  &__dropdown {
-    @apply tw-bg-[color:var(--language-selector-bg-color)] tw-min-w-max;
+  &__trigger {
+    @apply tw-flex tw-items-center tw-w-full;
   }
 
-  &__item {
-    @apply tw-truncate tw-flex tw-items-center tw-p-3 tw-text-sm tw-text-[color:var(--language-selector-text-color)]
-      tw-border-l tw-border-solid tw-border-l-[var(--language-selector-border-color)]
-      tw-border-b tw-border-b-[var(--language-selector-border-color)] tw-w-full tw-cursor-pointer;
-    transition: background-color 0.2s;
-
-    &:hover {
-      background-color: var(--language-selector-hover-bg-color);
-    }
+  &__flag {
+    @apply tw-w-6 tw-h-6 tw-mr-3;
+  }
 
-    &--active {
-      @apply tw-bg-[color:var(--language-selector-hover-bg-color)];
-    }
+  &__title {
+    @apply tw-flex-grow;
   }
 
-  &__img {
-    @apply tw-w-6 tw-h-6 tw-mr-2;
+  &__item {
+    @apply tw-flex tw-items-center tw-w-full tw-px-3
+      tw-cursor-pointer tw-transition-colors
+      hover:tw-bg-[color:var(--menu-item-bg-hover)];
 
-    &--button {
-      @apply tw-mr-0;
+    &--active {
+      @apply tw-bg-[color:var(--menu-item-bg-active)];
     }
   }
 
-  &__button-wrap {
-    @apply tw-w-[var(--language-selector-button-width)] tw-flex tw-justify-center;
+  &__item-title {
+    @apply tw-flex-grow;
   }
 }
 </style>

package/shared/components/logout-button/index.ts

@@ -0,0 +1 @@
+export { default as LogoutButton } from './logout-button.vue';

package/shared/components/logout-button/logout-button.vue

@@ -0,0 +1,27 @@
+<template>
+  <SettingsMenuItem
+    :icon="LogoutIcon"
+    :title="$t('SHELL.ACCOUNT.LOGOUT')"
+    @trigger:click="handleLogout"
+  />
+</template>
+
+<script lang="ts" setup>
+import { SettingsMenuItem } from "../settings-menu-item";
+import { LogoutIcon } from "../../../ui/components/atoms/vc-icon/icons";
+import { useUser } from "../../../core/composables";
+import { useRouter } from "vue-router";
+import { useBladeNavigation } from "../blade-navigation";
+
+const { signOut } = useUser();
+const router = useRouter();
+const { closeBlade } = useBladeNavigation();
+
+const handleLogout = async () => {
+  const isPrevented = await closeBlade(0);
+  if (!isPrevented) {
+    await signOut();
+    router.push({ name: "Login" });
+  }
+};
+</script>

package/shared/components/notification-dropdown/_internal/notification/index.ts

@@ -0,0 +1 @@
+export { default as NotificationItem } from "./notification.vue";

package/shared/components/notification-dropdown/_internal/notification/notification.vue

@@ -1,11 +1,14 @@
 <template>
   <div class="tw-flex">
     <VcRow class="tw-justify-between tw-grow tw-basis-0 !tw-flex">
-      <template v-if="currentTemplate">
-        <notificationTemplateRenderer />
-      </template>
-      <template v-else>
+      <div @click="handleClick">
+        <component
+          :is="currentTemplate"
+          v-if="currentTemplate"
+          v-bind="templateProps"
+        />
         <NotificationTemplate
+          v-else
           :color="notificationStyle.color"
           :title="notification.title ?? ''"
           :icon="notificationStyle.icon"
@@ -14,20 +17,20 @@
           <VcHint
             v-if="notification.description"
             class="tw-mb-1"
-            >{{ notification.description }}</VcHint
           >
+            {{ notification.description }}
+          </VcHint>
         </NotificationTemplate>
-      </template>
+      </div>
     </VcRow>
   </div>
 </template>
 
 <script lang="ts" setup>
-import { computed, h } from "vue";
+import { computed } from "vue";
 import { PushNotification } from "./../../../../../core/api/platform";
-import { VcRow } from "./../../../../../ui/components";
-import { NotificationTemplate } from "./../../../notification-template";
 import { NotificationTemplateConstructor } from "../../../../../core/types";
+import { NotificationTemplate } from "../../../notification-template";
 
 export interface Props {
   notification: PushNotification;
@@ -35,28 +38,26 @@ export interface Props {
 }
 
 export interface Emits {
-  (event: "onClick"): void;
+  (event: "onClick", notification: PushNotification): void;
 }
 
 const props = defineProps<Props>();
-
 const emit = defineEmits<Emits>();
 
+const currentTemplate = computed(() => props.templates?.find((x) => x?.notifyType === props.notification.notifyType));
+
+const templateProps = computed(() => ({
+  notification: props.notification,
+}));
+
+const handleClick = () => {
+  emit("onClick", props.notification);
+};
+
 const notificationStyle = computed(() => ({
   color: "var(--notification-icon-color)",
   icon: "fas fa-info",
 }));
-
-const currentTemplate = computed(() => props.templates?.find((x) => x?.notifyType === props.notification.notifyType));
-
-function notificationTemplateRenderer() {
-  const notificationTemplate = currentTemplate.value;
-
-  return (
-    notificationTemplate &&
-    h(notificationTemplate, { notification: props.notification, onNotificationClick: () => emit("onClick") })
-  );
-}
 </script>
 
 <style lang="scss">

package/shared/components/notification-dropdown/notification-dropdown.vue

@@ -2,67 +2,38 @@
   <AppBarButtonTemplate
     :title="$t('COMPONENTS.NOTIFICATION_DROPDOWN.TITLE')"
     position="bottom-end"
+    :overlayed="overlayed"
     @toggle="onOpen"
   >
-    <template #button>
+    <template #trigger>
       <div class="vc-notification-dropdown__button">
-        <VcIcon
-          icon="fas fa-bell"
-          size="xl"
-        ></VcIcon>
-        <div
-          :class="{
-            'vc-notification-dropdown__accent': isAccent,
-          }"
-        ></div>
+        <div class="vc-notification-dropdown__button-icon">
+          <VcIcon
+            :icon="BellIcon"
+            size="l"
+          />
+          <div
+            :class="{
+              'vc-notification-dropdown__accent': hasUnreadNotifications,
+            }"
+          ></div>
+        </div>
       </div>
     </template>
 
-    <template #dropdown-content="{ opened, toggle }">
-      <Sidebar
-        :is-expanded="$isMobile.value ? opened : false"
-        position="right"
-        render="mobile"
-        @close="toggle"
+    <template #content="{ toggle }">
+      <GenericDropdown
+        :items="notifications"
+        :empty-text="t('COMPONENTS.NOTIFICATION_DROPDOWN.EMPTY')"
+        @item-click="toggle"
       >
-        <template #content>
-          <div
-            v-if="opened"
-            :class="[
-              'vc-notification-dropdown__dropdown',
-              { 'vc-notification-dropdown__dropdown--mobile': $isMobile.value },
-            ]"
-          >
-            <VcContainer
-              :no-padding="true"
-              @click.stop
-            >
-              <VcCol v-if="notifications && notifications.length">
-                <div
-                  v-for="item in notifications"
-                  :key="`notification_${item.id}`"
-                  class="vc-notification-dropdown__item"
-                  :class="{
-                    'vc-notification-dropdown__item--mobile': $isMobile.value,
-                  }"
-                >
-                  <NotificationItem
-                    :notification="item"
-                    :templates="notificationTemplates || []"
-                    @on-click="toggle"
-                  />
-                </div>
-              </VcCol>
-              <div
-                v-else
-                class="vc-notification-dropdown__empty"
-              >
-                {{ t("COMPONENTS.NOTIFICATION_DROPDOWN.EMPTY") }}
-              </div>
-            </VcContainer>
-          </div>
+        <template #item="{ item }">
+          <NotificationItem
+            :notification="item"
+            :templates="notificationTemplates || []"
+          />
         </template>
-      </Sidebar>
+      </GenericDropdown>
     </template>
   </AppBarButtonTemplate>
 </template>
@@ -70,19 +41,28 @@
 <script lang="ts" setup>
 import { inject, computed } from "vue";
 import NotificationItem from "./_internal/notification/notification.vue";
-import { VcCol, VcContainer, VcIcon } from "../../../ui/components";
+import { VcIcon } from "../../../ui/components";
 import { useI18n } from "vue-i18n";
-import { NotificationTemplateConstructor } from "../../../core/types";
 import { useNotifications } from "../../../core/composables";
-import { AppBarButtonTemplate } from "./../app-bar-button";
-import { Sidebar } from "./../sidebar";
+import { AppBarButtonTemplate } from "./../../../ui/components/organisms/vc-app";
+import { GenericDropdown } from "../generic-dropdown";
+import { BellIcon } from "../../../ui/components/atoms/vc-icon/icons";
+import { NotificationTemplatesSymbol } from "./../../../injection-keys";
+
+export interface Props {
+  overlayed?: boolean;
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  overlayed: false,
+});
 
-const notificationTemplates = inject<NotificationTemplateConstructor[]>("notificationTemplates");
+const notificationTemplates = inject(NotificationTemplatesSymbol);
 
 const { t } = useI18n({ useScope: "global" });
 const { notifications, markAllAsRead } = useNotifications();
 
-const isAccent = computed(() => {
+const hasUnreadNotifications = computed(() => {
   return notifications.value.some((item) => item.isNew);
 });
 
@@ -95,35 +75,25 @@ function onOpen(state: boolean) {
 
 <style lang="scss">
 :root {
-  --notification-dropdown-border-color: var(--additional-50);
-  --notification-dropdown-bg-color: var(--additional-50);
   --notification-dropdown-accent-color: var(--danger-500);
-  --notification-dropdown-button-width: var(--app-bar-button-width);
-  --notification-dropdown-divider-color: var(--base-border-color, var(--neutrals-200));
 }
 
 .vc-notification-dropdown {
   &__accent {
-    @apply tw-block tw-absolute tw-right-[12px] tw-top-[18px] tw-w-[7px] tw-h-[7px] tw-bg-[--notification-dropdown-accent-color] tw-rounded-full tw-z-[1];
+    @apply tw-block tw-absolute -tw-right-[4px] tw-top-[0px] tw-w-[5px] tw-h-[5px] tw-bg-[--notification-dropdown-accent-color] tw-rounded-full tw-z-[1];
   }
 
-  &__dropdown {
-    @apply tw-bg-[--notification-dropdown-bg-color] tw-rounded-b-[6px] tw-w-[439px]
-      tw-max-h-[350px] tw-min-h-[50px] tw-overflow-hidden tw-flex tw-flex-col;
-
-    &--mobile {
-      @apply tw-max-h-full tw-w-full;
-      display: flex !important;
-    }
+  &__button {
+    @apply tw-flex tw-items-center tw-justify-center tw-relative;
   }
 
-  &__button {
-    @apply tw-w-[var(--notification-dropdown-button-width)] tw-h-full tw-flex tw-items-center tw-justify-center tw-relative;
+  &__button-icon {
+    @apply tw-relative;
   }
 
   &__item {
     @apply tw-py-[18px] tw-px-[15px] tw-border-b tw-border-solid
-      tw-border-b-[var(--notification-dropdown-border-color)] tw-cursor-pointer;
+      tw-border-b-[var(--notification-dropdown-border-color)];
     transition: background-color 0.2s;
 
     &:last-of-type {

package/shared/components/notification-template/notification-template.vue

@@ -6,34 +6,22 @@
         'vc-notification-template__container--mobile': $isMobile.value,
       }"
     >
-      <div class="vc-notification-template__left">
-        <div
-          class="vc-notification-template__icon-container"
-          :style="{ 'background-color': color }"
+      <div class="vc-notification-template__content">
+        <p
+          class="vc-notification-template__title"
+          :class="{ 'vc-notification-template__title--desktop': $isDesktop.value }"
         >
-          <VcIcon
-            :icon="icon"
-            size="l"
-            aria-label="Notification Icon"
-          ></VcIcon>
-        </div>
-        <div class="vc-notification-template__content">
-          <p
-            class="vc-notification-template__title"
-            :class="{ 'vc-notification-template__title--desktop': $isDesktop.value }"
-          >
-            {{ title }}
-          </p>
-          <slot></slot>
-        </div>
-      </div>
-      <div
-        class="vc-notification-template__right"
-        :class="{ 'vc-notification-template__right--mobile': $isMobile.value }"
-      >
+          {{ title }}
+        </p>
         <p class="vc-notification-template__time">
           {{ pushTime }}
         </p>
+        <div
+          v-if="$slots.default"
+          class="vc-notification-template__content-body"
+        >
+          <slot></slot>
+        </div>
       </div>
     </div>
   </div>
@@ -46,8 +34,8 @@ import moment from "moment";
 import { PushNotification } from "../../../core/api/platform";
 
 export interface Props {
-  color: string;
-  icon: string;
+  color?: string;
+  icon?: string;
   title: string;
   notification: PushNotification;
 }
@@ -65,7 +53,8 @@ const pushTime = computed(() => {
 :root {
   --notification-template-icon-color: var(--additional-50);
   --notification-template-text-color: var(--additional-950);
-  --notification-template-time-color: var(--neutrals-600);
+  --notification-template-time-color: var(--neutrals-500);
+  --notification-template-content-body-color: var(--neutrals-700);
 }
 
 .vc-notification-template {
@@ -89,13 +78,9 @@ const pushTime = computed(() => {
   }
 
   &__title {
-    @apply tw-text-[color:var(--notification-template-text-color)] tw-text-lg tw-leading-[19px]
-      tw-font-bold tw-m-0 tw-mb-1;
+    @apply tw-text-[color:var(--notification-template-text-color)] tw-text-xs tw-leading-[19px]
+      tw-font-bold tw-m-0 tw-text-wrap;
     word-break: break-word;
-
-    &--desktop {
-      @apply tw-mr-4;
-    }
   }
 
   &__right {
@@ -106,8 +91,12 @@ const pushTime = computed(() => {
     }
   }
 
+  &__content-body {
+    @apply tw-text-xs tw-text-[color:var(--notification-template-content-body-color)] tw-m-0 tw-text-wrap;
+  }
+
   &__time {
-    @apply tw-text-sm tw-text-[color:var(--notification-template-time-color)] tw-m-0;
+    @apply tw-text-xxs tw-text-[color:var(--notification-template-time-color)] tw-m-0 tw-mb-2;
   }
 }
 </style>

package/shared/components/notifications/styles/index.scss

@@ -1,10 +1,10 @@
-.notification__container {
-  position: fixed;
-  top: 1em;
-  left: 50%;
-  transform: translateX(-50%);
-  display: flex;
-  display: flex;
-  flex-direction: column;
-  gap: 5px;
-}
+.notification__container {
+  position: fixed;
+  top: 1em;
+  left: 50%;
+  transform: translateX(-50%);
+  display: flex;
+  display: flex;
+  flex-direction: column;
+  gap: 5px;
+}

package/shared/components/settings-menu/index.ts

@@ -0,0 +1 @@
+export { default as SettingsMenu } from "./settings-menu.vue";

package/shared/components/settings-menu/settings-menu.vue

@@ -0,0 +1,24 @@
+<template>
+  <div class="vc-settings-menu">
+    <component
+      :is="item.component"
+      v-for="item in items"
+      :key="item.id"
+      v-bind="item.props || {}"
+    />
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { inject } from "vue";
+import { SettingsMenuKey, useSettingsMenu } from "../../composables/useSettingsMenu";
+
+const settingsMenu = inject(SettingsMenuKey, useSettingsMenu());
+const { items } = settingsMenu;
+</script>
+
+<style lang="scss">
+.vc-settings-menu {
+  @apply tw-w-full;
+}
+</style>

package/shared/components/settings-menu-item/index.ts

@@ -0,0 +1 @@
+export { default as SettingsMenuItem } from "./settings-menu-item.vue";