@vc-shell/framework 1.0.341 → 1.1.0-alpha.10

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

@@ -1,47 +1,27 @@
 <template>
-  <div
-    class="vc-notification-template"
-    :class="{ 'vc-notification-template--clickable': $attrs.onClick }"
-    v-bind="$attrs"
-    @click="handleTemplateClick"
-  >
+  <div class="vc-notification-template">
     <div
       class="vc-notification-template__container"
       :class="{
         '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
-            v-bind="$attrs"
-            v-on="$attrs"
-          ></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>
@@ -54,49 +34,32 @@ 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;
-  clickable?: boolean;
-}
-
-export interface Emits {
-  (event: "onClick", notification: PushNotification): void;
 }
 
 const props = defineProps<Props>();
-const emit = defineEmits<Emits>();
 
 const locale = window.navigator.language;
 
 const pushTime = computed(() => {
   return moment(props.notification.created).locale(locale).format("L LT");
 });
-
-const handleTemplateClick = () => {
-  emit("onClick", props.notification);
-};
-
-defineOptions({
-  inheritAttrs: false,
-});
 </script>
 
 <style lang="scss">
 :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 {
   @apply tw-w-full;
 
-  &--clickable {
-    cursor: pointer;
-  }
-
   &__container {
     @apply tw-flex tw-flex-row tw-justify-between tw-grow tw-basis-0;
 
@@ -110,16 +73,14 @@ defineOptions({
   }
 
   &__icon-container {
-    @apply tw-w-[41px] tw-h-[41px] tw-rounded-full tw-text-[color:var(--notification-template-icon-color)] tw-mr-4 tw-flex tw-items-center tw-justify-center tw-shrink-0;
+    @apply tw-w-[41px] tw-h-[41px] tw-rounded-full tw-text-[color:var(--notification-template-icon-color)]
+      tw-mr-4 tw-flex tw-items-center tw-justify-center tw-shrink-0;
   }
 
   &__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 {
@@ -130,8 +91,12 @@ defineOptions({
     }
   }
 
+  &__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,25 @@
+<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 { useSettingsMenu } from "../../../core/composables/useSettingsMenu";
+import { SettingsMenuServiceKey } from "../../../injection-keys";
+
+const settingsMenu = 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";

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

@@ -0,0 +1,136 @@
+<template>
+  <div
+    class="vc-menu-item"
+    :class="{
+      'vc-menu-item--active': isActive,
+      'vc-menu-item--clickable': !disabled,
+      'vc-menu-item--invisible': !isVisible,
+    }"
+  >
+    <!-- Trigger -->
+    <div
+      class="vc-menu-item__trigger"
+      @click.stop="handleTriggerClick"
+    >
+      <slot name="trigger">
+        <div class="vc-menu-item__content">
+          <slot name="icon">
+            <VcIcon
+              v-if="icon"
+              :icon="icon"
+              size="l"
+              class="vc-menu-item__icon"
+            />
+            <VcImage
+              v-else-if="image"
+              :src="image"
+              class="vc-menu-item__image"
+              :empty-icon="emptyIcon"
+            />
+          </slot>
+
+          <slot name="title">
+            <p class="vc-menu-item__title">{{ title }}</p>
+          </slot>
+
+          <slot name="additional" />
+        </div>
+      </slot>
+    </div>
+
+    <!-- Content -->
+    <slot name="content" />
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { Component } from "vue";
+import { VcIcon, VcImage } from "../../../ui/components";
+
+interface Props {
+  title?: string;
+  icon?: string | Component;
+  image?: string;
+  emptyIcon?: string;
+  isActive?: boolean;
+  disabled?: boolean;
+  isVisible?: boolean;
+  triggerAction?: "click" | "hover" | "none";
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  isVisible: true,
+  triggerAction: "click",
+});
+
+const emit = defineEmits<{
+  (e: "trigger:click"): void;
+  (e: "trigger:hover"): void;
+}>();
+
+const handleTriggerClick = () => {
+  if (props.disabled || props.triggerAction === "none") return;
+  emit("trigger:click");
+};
+</script>
+
+<style lang="scss">
+:root {
+  --menu-item-text-color: var(--additional-950);
+  --menu-item-border-color: var(--neutrals-200);
+  --menu-item-bg: transparent;
+  --menu-item-bg-hover: var(--primary-50);
+  --menu-item-icon-color-hover: var(--primary-700);
+  --menu-item-bg-active: var(--primary-50);
+}
+
+.vc-menu-item {
+  @apply tw-flex tw-flex-col;
+
+  &__trigger {
+    @apply tw-p-3 tw-text-sm tw-text-[color:var(--menu-item-text-color)]
+      tw-border-solid tw-border-b tw-border-b-[color:var(--menu-item-border-color)]
+      tw-bg-[color:var(--menu-item-bg)] tw-flex tw-flex-row tw-items-center;
+  }
+
+  &--clickable {
+    @apply tw-cursor-pointer;
+
+    &:hover {
+      @apply tw-bg-[color:var(--menu-item-bg-hover)];
+
+      .vc-menu-item__icon {
+        @apply tw-text-[color:var(--menu-item-icon-color-hover)];
+      }
+    }
+  }
+
+  &--invisible {
+    @apply tw-hidden;
+  }
+
+  &--active {
+    @apply tw-bg-[color:var(--menu-item-bg-active)];
+  }
+
+  &:last-of-type {
+    @apply tw-border-b-0;
+  }
+
+  &__content {
+    @apply tw-flex tw-items-center tw-w-full;
+  }
+
+  &__icon {
+    @apply tw-w-6 tw-mr-3 tw-text-[color:var(--menu-item-icon-color)];
+  }
+
+  &__image {
+    @apply tw-w-6 tw-h-6 tw-mr-3;
+  }
+
+  &__title {
+    @apply tw-flex-grow;
+  }
+}
+</style>

package/shared/components/sidebar/sidebar.vue

@@ -1,49 +1,58 @@
 <template>
-  <template v-if="isExpanded">
-    <div
-      v-if="isExpanded"
-      class="sidebar__overlay"
-      @click.stop="$emit('close')"
-    ></div>
-
-    <div
-      v-if="isExpanded"
-      :class="[
-        'sidebar__dropdown',
-        {
-          'sidebar__dropdown--mobile': $isMobile.value && render === 'mobile',
-          'sidebar__dropdown--desktop': $isDesktop.value && render === 'desktop',
-          'sidebar__dropdown--always': render === 'always',
-          'sidebar__dropdown--left': position === 'left',
-          'sidebar__dropdown--right': position === 'right',
-        },
-      ]"
-    >
-      <slot
-        name="header"
-        :header="header"
+  <Teleport
+    to="body"
+    :disabled="$isDesktop.value"
+  >
+    <template v-if="isExpanded">
+      <div
+        v-if="isExpanded"
+        class="sidebar__overlay"
+        @click.stop="$emit('close')"
+      ></div>
+
+      <div
+        v-if="isExpanded"
+        :class="[
+          'sidebar__dropdown',
+          {
+            'sidebar__dropdown--mobile': $isMobile.value && render === 'mobile',
+            'sidebar__dropdown--desktop': $isDesktop.value && render === 'desktop',
+            'sidebar__dropdown--always': render === 'always',
+            'sidebar__dropdown--left': position === 'left',
+            'sidebar__dropdown--right': position === 'right',
+            'sidebar__dropdown--title': title,
+          },
+        ]"
       >
-        <component :is="header" />
-      </slot>
-
+        <slot
+          name="header"
+          :header="header"
+        >
+          <component :is="header" />
+        </slot>
+        <div class="sidebar__content">
+          <slot name="content"></slot>
+        </div>
+      </div>
+    </template>
+
+    <!-- Pass through content if not expanded -->
+    <template v-else>
       <slot name="content"></slot>
-    </div>
-  </template>
-
-  <!-- Pass through content if not expanded -->
-  <template v-else>
-    <slot name="content"></slot>
-  </template>
+    </template>
+  </Teleport>
 </template>
 
 <script lang="ts" setup>
 import { h } from "vue";
-import { VcIcon } from "../../../ui/components";
+import { VcIcon, CrossSignIcon } from "../../../ui/components";
 
 export interface Props {
   position?: "left" | "right";
   render: "always" | "mobile" | "desktop";
   isExpanded: boolean;
+  title?: string;
+  closeCross?: boolean;
 }
 
 export interface Emits {
@@ -52,36 +61,52 @@ export interface Emits {
 
 const emit = defineEmits<Emits>();
 
-withDefaults(defineProps<Props>(), {
+const props = withDefaults(defineProps<Props>(), {
   position: "right",
   render: "always",
+  closeCross: true,
+});
+
+defineOptions({
+  inheritAttrs: false,
 });
 
 const header = h("div", { class: "sidebar__header" }, [
-  h(VcIcon, { icon: "fas fa-times", size: "xl", onClick: () => emit("close") }),
+  props.title ? h("h3", { class: "sidebar__title" }, props.title) : null,
+  props.closeCross
+    ? h(VcIcon, { icon: CrossSignIcon, size: "xs", onClick: () => emit("close"), class: "sidebar__close-icon" })
+    : null,
 ]);
 </script>
 
 <style lang="scss">
 :root {
-  --sidebar-mobile-bg-color: var(--neutral-500);
+  --sidebar-bg-color: var(--neutrals-100);
+  --sidebar-header-height: 82px;
   --sidebar-dropdown-mobile-icon-color: var(--primary-500);
+  --sidebar-title-color: var(--additional-950);
+  --sidebar-header-padding: 18px;
+  --sidebar-dropdown-icon-color: var(--neutrals-500);
+  --sidebar-overlay-color: var(--additional-950);
 }
 
 .sidebar {
   @apply tw-relative;
 
   &__overlay {
-    @apply tw-fixed tw-left-0 tw-top-0 tw-right-0 tw-bottom-0 tw-z-[10000]
-      tw-bg-[--sidebar-mobile-bg-color] tw-backdrop-blur-[3px];
+    @apply tw-fixed tw-left-0 tw-top-0 tw-right-0 tw-bottom-0 tw-z-[10000] tw-backdrop-blur-[3px] tw-bg-black/50;
   }
+
   &__header {
-    @apply tw-text-[color:var(--sidebar-dropdown-mobile-icon-color)] tw-flex tw-justify-end tw-items-center tw-p-4 tw-cursor-pointer;
+    @apply tw-text-[color:var(--sidebar-dropdown-mobile-icon-color)] tw-flex tw-justify-end tw-items-center tw-h-[var(--sidebar-header-height)] tw-cursor-pointer tw-p-[var(--sidebar-header-padding)];
+  }
+
+  &__title {
+    @apply tw-text-[color:var(--sidebar-title-color)] tw-text-xl tw-font-bold;
   }
 
   &__dropdown {
-    @apply tw-absolute tw-top-[var(--app-bar-button-height)] tw-bg-[color:var(--app-bar-button-bg-color)] tw-z-[10000] tw-flex tw-flex-col;
-    box-shadow: var(--app-bar-button-shadow);
+    @apply tw-bg-[color:var(--sidebar-bg-color)] tw-absolute tw-top-[var(--app-bar-button-height)] tw-z-[10000] tw-flex tw-flex-col;
 
     &--mobile,
     &--always,
@@ -97,6 +122,20 @@ const header = h("div", { class: "sidebar__header" }, [
     &--right {
       @apply tw-right-0 tw-left-auto;
     }
+
+    &--title {
+      .sidebar__header {
+        @apply tw-justify-between #{!important};
+      }
+    }
+  }
+
+  &__close-icon {
+    @apply tw-text-[color:var(--sidebar-dropdown-icon-color)] tw-cursor-pointer;
+  }
+
+  &__content {
+    @apply tw-flex tw-flex-col tw-h-full tw-bg-[color:var(--sidebar-bg-color)] tw-flex-1 tw-relative;
   }
 }
 </style>

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

@@ -1,55 +1,54 @@
 <template>
-  <AppBarButtonTemplate
-    icon="fas fa-palette"
-    :title="$t('COMPONENTS.THEME_SELECTOR.THEME_SELECTOR')"
-    position="bottom-end"
-  >
-    <template #dropdown-content="{ opened, toggle }">
-      <Sidebar
-        :is-expanded="$isMobile.value ? opened : false"
-        position="right"
-        render="mobile"
-        @close="toggle"
+  <SettingsMenuItem @trigger:click="opened = !opened">
+    <template #trigger>
+      <div class="vc-theme-selector__trigger">
+        <VcIcon
+          icon="fas fa-palette"
+          class="vc-theme-selector__icon"
+        />
+        <span class="vc-theme-selector__title">
+          {{ $t("COMPONENTS.THEME_SELECTOR.THEME_SELECTOR") }}
+        </span>
+      </div>
+    </template>
+
+    <template #content>
+      <GenericDropdown
+        :opened="opened"
+        :items="themes"
+        :is-item-active="(theme) => theme === current"
+        @item-click="handleThemeSelect"
       >
-        <template #content>
+        <template #item="{ item: theme, click }">
           <div
-            v-if="opened"
-            class="vc-theme-selector__dropdown"
-            :class="{
-              'vc-theme-selector__dropdown--mobile': $isMobile.value,
-            }"
+            class="vc-theme-selector__item"
+            :class="{ 'vc-theme-selector__item--active': theme === current }"
+            @click="click"
           >
-            <div
-              v-for="(theme, i) in themes"
-              :key="i"
-              class="vc-theme-selector__item"
-              :class="{ 'vc-theme-selector__item--active': theme === current }"
-              @click="
-                () => {
-                  setTheme(theme);
-                  toggle();
-                }
-              "
-            >
-              {{ themeText(theme) }}
-            </div>
+            <span class="vc-theme-selector__item-title">{{ _.capitalize(theme) }}</span>
           </div>
         </template>
-      </Sidebar>
+      </GenericDropdown>
     </template>
-  </AppBarButtonTemplate>
+  </SettingsMenuItem>
 </template>
 
 <script lang="ts" setup>
-import { AppBarButtonTemplate } from "./../app-bar-button";
-import { Sidebar } from "./../sidebar";
-import { useTheme } from "./../../../core/composables/useTheme";
-import { watch, computed } from "vue";
-import { notification } from "./../";
+import { GenericDropdown } from "../generic-dropdown";
+import { useTheme } from "../../../core/composables/useTheme";
+import { ref, watch } from "vue";
+import { notification } from "..";
 import * as _ from "lodash-es";
-import { createUnrefFn } from "@vueuse/core";
+import { SettingsMenuItem } from "../settings-menu-item";
+import { VcIcon } from "../../../ui/components";
 
 const { current, themes, setTheme } = useTheme();
+const opened = ref(false);
+
+const handleThemeSelect = (theme: string) => {
+  setTheme(theme);
+  opened.value = false;
+};
 
 watch(
   () => current.value,
@@ -58,44 +57,34 @@ watch(
   },
   { deep: true },
 );
-
-const themeText = computed(() => {
-  return createUnrefFn((theme: string) => {
-    return _.capitalize(theme);
-  });
-});
 </script>
 
 <style lang="scss">
-:root {
-  --theme-selector-bg-color: var(--additional-50);
-  --theme-selector-text-color: var(--base-text-color, var(--neutrals-950));
-  --theme-selector-border-color: var(--app-bar-divider-color);
-  --theme-selector-hover-bg-color: var(--primary-50);
-}
-
 .vc-theme-selector {
-  &__dropdown {
-    @apply tw-bg-[color:var(--theme-selector-bg-color)] tw-min-w-20 tw-max-w-max;
+  &__trigger {
+    @apply tw-flex tw-items-center tw-w-full;
+  }
 
-    &--mobile {
-      @apply tw-min-w-full tw-max-w-full;
-    }
+  &__icon {
+    @apply tw-w-6 tw-mr-3;
   }
 
-  &__item {
-    @apply tw-truncate tw-p-3 tw-text-sm tw-text-[color:var(--theme-selector-text-color)]
-      tw-border-l tw-border-solid tw-border-l-[var(--theme-selector-border-color)]
-      tw-border-b tw-border-b-[var(--theme-selector-border-color)] tw-w-full tw-cursor-pointer;
-    transition: background-color 0.2s;
+  &__title {
+    @apply tw-flex-grow;
+  }
 
-    &:hover {
-      background-color: var(--theme-selector-hover-bg-color);
-    }
+  &__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)];
 
     &--active {
-      @apply tw-bg-[color:var(--theme-selector-hover-bg-color)];
+      @apply tw-bg-[color:var(--menu-item-bg-active)];
     }
   }
+
+  &__item-title {
+    @apply tw-flex-grow;
+  }
 }
 </style>