@appscode/design-system 1.1.0-beta.8 → 1.1.0-beta.81

package/vue-components/v3/navbar/User.vue

@@ -1,8 +1,15 @@
 <script setup lang="ts">
 import { defineAsyncComponent, ref, watch, computed, nextTick } from "vue";
-import type { User, Organization } from "../../types/user";
+import HeroiconsCog6Tooth from "~icons/heroicons/cog-6-tooth";
+import HeroiconsWrenchScrewdriver from "~icons/heroicons/wrench-screwdriver";
+import HeroiconsUserGroup from "~icons/heroicons/user-group";
+import HeroiconsChartPie from "~icons/heroicons/chart-pie";
+import HeroiconsPower from "~icons/heroicons/power";
+import HeroiconsCheck from "~icons/heroicons/check";
 
-interface FormatedOrgs extends Organization {
+import type { User } from "../../types/user";
+
+interface FormatedOrgs extends User {
   isPersonalAccount?: boolean;
 }
 
@@ -93,13 +100,13 @@ watch(dropDownStatus, (n) => {
   <navbar-item :modifierClasses="'ac-profile-button'">
     <template #navbar-item>
       <div class="ac-user-profile mr-8">
-        <img :src="(user.avatar_url as string)" alt="User Photo" />
+        <img :src="user.avatar_url" alt="User Photo" />
       </div>
       {{ user.full_name || user.username }}
       <i class="fa fa-angle-down" aria-hidden="true"></i>
     </template>
     <!-- <button class="button ac-nav-button ac-profile-button">
-      
+
     </button> -->
 
     <template #navbar-content>
@@ -129,17 +136,19 @@ watch(dropDownStatus, (n) => {
               <a :href="`mailto:${user.email}`"> {{ user.email }}</a>
             </div>
           </div>
-          <transition-group name="list" tag="ul" class="list-items">
+          <transition-group name="list" tag="ul" class="list-items py-2">
             <li key="settings">
               <a
                 data-testid="user-settings-link"
                 :href="`${serverDomain}/user/settings/`"
-                >Settings</a
+                ><span class="icon"><HeroiconsCog6Tooth /></span
+                ><span>Settings</span></a
               >
             </li>
             <li v-if="user.is_admin" key="site-admin">
               <a data-testid="site-admin-link" :href="`${accountsDomain}/admin`"
-                >Site Administration</a
+                ><span class="icon"><HeroiconsWrenchScrewdriver /></span
+                ><span>Site Administration</span></a
               >
             </li>
             <li
@@ -151,7 +160,10 @@ watch(dropDownStatus, (n) => {
                 class="ac-dropdown-button is-fullwidth is-flex is-justify-content-space-between is-align-items-center"
                 @click="toggleList()"
               >
-                <span>Switch Account</span>
+                <div class="is-flex gap-8">
+                  <span class="icon"><HeroiconsUserGroup /></span
+                  ><span>Switch Account</span>
+                </div>
                 <span
                   ><i
                     :class="`fa fa-angle-${
@@ -203,40 +215,25 @@ watch(dropDownStatus, (n) => {
                         v-if="idx === 0"
                         class="material-icons font-size-18 ml-10 is-pulled-right"
                       >
-                        check
+                        <HeroiconsCheck />
                       </span>
                     </div>
                   </a>
                 </li>
               </transition-group>
             </li>
-            <li key="dashboard">
-              <router-link
-                v-if="isPlatformDomain"
-                to="/dashboard"
-                data-testid="user-dashboard-link"
-              >
-                Dashboard
-              </router-link>
-              <a
-                v-else
-                :href="`${serverDomain}/dashboard`"
-                data-testid="user-dashboard-link"
-              >
-                Dashboard
-              </a>
-            </li>
             <li key="signout" @click="$emit('on-logout')">
               <a
                 data-testid="user-logout-link"
                 :href="`${accountsDomain}/user/logout`"
               >
-                Sign out
+                <span class="icon"><HeroiconsPower /></span>
+                <span>Sign out</span>
               </a>
             </li>
-            <li key="theme" v-if="showThemeMode">
+            <!-- <li key="theme" v-if="showThemeMode">
               <theme-mode @set:theme="setTheme" />
-            </li>
+            </li> -->
           </transition-group>
         </div>
       </navbar-item-content>
@@ -253,7 +250,6 @@ watch(dropDownStatus, (n) => {
 }
 .navbar-dropdown-wrapper {
   width: 240px;
-  transition: width 0.9s ease-in-out;
 }
 
 .user-profile-wrapper {
@@ -265,7 +261,7 @@ watch(dropDownStatus, (n) => {
     display: flex;
     align-items: center;
     border-bottom: 1px solid $primary-90;
-    padding: 8px 16px;
+    padding: 16px 16px;
 
     .profile-photo {
       // width: 50px;
@@ -341,17 +337,25 @@ watch(dropDownStatus, (n) => {
 
     &.is-open {
       ul {
+        padding: 8px;
         max-height: 200px;
         visibility: visible;
         transition: max-height 0.25s ease-out;
+        li {
+          padding: 0;
+          border: 1px solid $primary-95;
+        }
       }
     }
     a {
-      padding: 6px 16px;
+      padding: 8px 16px;
       font-weight: 500;
       display: block;
       color: $primary-10;
       transition: 0.3s;
+      display: flex;
+      align-items: center;
+      gap: 8px;
 
       &:hover {
         background-color: $primary-97;

package/vue-components/v3/notification/AlertBox.vue

@@ -27,10 +27,15 @@ const { notificationType, content, hideIcon, actionButton } = toRefs(props);
 
 const iconClass = computed(() => {
   if (notificationType.value === "success") return "fa-check-circle";
-  else if (notificationType.value === "info") return "fa-info-circle";
-  else if (notificationType.value === "danger") return "fa-times-circle";
+  else if (notificationType.value === "info") return "fa-info-circle ";
+  else if (notificationType.value === "error") return "fa-times-circle";
   else return "fa-info-circle";
 });
+const backgroundColor = computed(() => {
+  if (notificationType.value === "success") return "is-success";
+  else if (notificationType.value === "error") return "is-danger";
+  else return "";
+});
 
 const getSanitizedHtml = (content: string) => {
   return DOMPurify.sanitize(content || "");
@@ -40,7 +45,10 @@ const getSanitizedHtml = (content: string) => {
 <template>
   <!-- alert-message area start  -->
   <!-- plsease, use this class name ('.is-info' 'is-success', 'is-danger', 'is-warning') -->
-  <div :class="`notification is-${notificationType} mb-15`">
+  <div
+    class="ac-notification is-${notificationType} mb-15"
+    :class="backgroundColor"
+  >
     <p>
       <i v-if="!hideIcon" :class="`fa ${iconClass} mr-5`"></i
       ><span v-html="getSanitizedHtml(content)"></span>
@@ -56,3 +64,225 @@ const getSanitizedHtml = (content: string) => {
   </div>
   <!-- alert-message area end -->
 </template>
+
+<style lang="scss" scoped>
+// for alert message
+.ac-notification {
+  background-color: #dee7f5;
+  font-size: 13px;
+  color: $primary;
+  min-height: 36px;
+  display: flex;
+  align-items: center;
+  padding: 8px 16px;
+  overflow: hidden;
+  border: 1px solid $primary;
+  border-radius: 4px;
+  justify-content: flex-start;
+  position: relative;
+  z-index: 1;
+  min-width: 280px;
+
+  p {
+    color: $primary;
+    margin-bottom: 0;
+
+    .close-icon {
+      padding-right: 10px;
+      font-size: 15px;
+    }
+
+    a {
+      text-decoration: underline;
+      color: $primary;
+
+      &:hover {
+        color: hsla(
+          var(--hsl-hue),
+          var(--hsl-saturation),
+          calc(var(--hsl-lightness) - 10%),
+          1
+        );
+      }
+    }
+  }
+
+  button.close {
+    background-color: transparent;
+    cursor: pointer;
+    right: 0px;
+    position: absolute;
+    box-shadow: none;
+    border: none;
+    font-size: 14px;
+    color: $danger;
+    width: 40px;
+    height: 100%;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+  }
+}
+
+// mixin for .ac-notification
+@mixin acNotification($colorName) {
+  background-color: scale-color($color: $colorName, $lightness: 80%);
+  color: $white-100;
+  border-color: $colorName;
+
+  p {
+    color: $colorName;
+
+    a {
+      color: $colorName;
+
+      &:hover {
+        color: $colorName;
+        opacity: 0.8;
+      }
+    }
+  }
+}
+@mixin acPrimaryNotification() {
+  background-color: hsla(
+    var(--hsl-hue),
+    var(--hsl-saturation),
+    var(--hsl-lightness),
+    0.2
+  );
+  color: $white-100;
+  border-color: $primary;
+
+  p {
+    color: $primary;
+
+    a {
+      color: $primary;
+
+      &:hover {
+        color: $primary;
+        opacity: 0.8;
+      }
+    }
+  }
+}
+
+// is-primary
+.ac-notification.is-primary {
+  @include acPrimaryNotification();
+}
+
+// is.info
+.ac-notification.is-info {
+  @include acNotification($info);
+}
+
+// is.success
+.ac-notification.is-success {
+  @include acNotification($success);
+}
+
+// is-danger
+.ac-notification.is-danger {
+  @include acNotification($danger);
+}
+
+// is-warning
+.ac-notification.is-warning {
+  @include acNotification($warning);
+}
+
+/*====================================
+AC Toast
+=====================================*/
+
+.ac-toast {
+  width: 350px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  font-size: 13px;
+  border-radius: 4px;
+  position: relative;
+  padding-right: 30px;
+  margin-bottom: 10px;
+
+  * {
+    color: $white-100;
+  }
+
+  p {
+    padding-left: 16px;
+
+    i.fa {
+      padding-right: 0 !important;
+      margin-right: 4px;
+    }
+  }
+
+  a {
+    font-weight: 500;
+    text-decoration: underline;
+    padding: 0 15px;
+
+    &:hover {
+      color: $black-70;
+    }
+  }
+
+  button.close-button {
+    border-radius: 0px;
+    background-color: transparent;
+    border: none;
+    color: $white-100;
+    position: absolute;
+    right: 0;
+    top: 0;
+    padding: 5px;
+    height: 100%;
+    width: 30px;
+    z-index: 1;
+    cursor: pointer;
+    border-left: 1px solid #dddddd;
+  }
+}
+
+// mixin for .ac-toast
+@mixin acToast($colorName) {
+  background-color: $colorName;
+  color: $white-100;
+  border-color: $colorName;
+}
+
+// is-primary
+.ac-toast.is-primary {
+  @include acToast($primary);
+}
+
+// is-info
+.ac-toast.is-info {
+  @include acToast($info);
+}
+
+// is.success
+.ac-toast.is-success {
+  @include acToast($success);
+}
+
+// is-danger
+.ac-toast.is-danger {
+  @include acToast($danger);
+}
+
+// is-warning
+.ac-toast.is-warning {
+  @include acToast($warning);
+}
+
+// dark theme start
+// .is-dark-theme {
+//   .ac-notification.is-danger {
+//     background-color: $black-80;
+//   }
+// }
+</style>

package/vue-components/v3/notification/Notification.vue

@@ -9,7 +9,7 @@ import {
   watch,
 } from "vue";
 import type { Ref } from "vue";
-import type { TaskLog } from "../../types/longRunningTasks";
+// import type { TaskLog } from "../../types/longRunningTasks";
 import type { Notification } from "../../types/notification";
 
 const NotificationItem = defineAsyncComponent(
@@ -48,7 +48,7 @@ async function subscribeToNotifcations() {
     for await (const msg of subscription) {
       console.log("notifications ===>");
       console.log({ data: StringCodec().decode(msg.data) });
-      const log: TaskLog = JSON.parse(StringCodec().decode(msg.data));
+      const log = JSON.parse(StringCodec().decode(msg.data));
       console.log({ log });
       const currentTime = new Date().getTime();
       addNewNotification({

package/vue-components/v3/option-dots/Options.vue

@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { type Ref, onMounted, onUnmounted, ref } from "vue";
+import { onMounted, onUnmounted, ref, type Ref } from "vue";
 
 interface Props {
   modifierClasses?: string;
@@ -44,18 +44,28 @@ const documentClick = (e: Event) => {
     </div>
     <!-- dropdown Item start  -->
     <!-- use "is-hidden" class in the line below for hide dropdown element  -->
-    <slot v-if="showOptions" />
+    <slot :class="{ 'is-hidden': !showOptions }" />
     <!-- dropdown Item end -->
   </button>
 </template>
 
 <style lang="scss">
 .ac-options {
-  position: relative;
-  z-index: 9;
-  background-color: transparent;
+  border-radius: 50%;
+  width: 32px;
+  height: 32px;
+  text-align: center;
+  margin: 0;
+  display: flex;
+  align-items: center;
+  justify-content: center;
   border: none;
-  box-shadow: none;
+  background-color: transparent;
+  cursor: pointer;
+  &:hover {
+    background-color: $primary-90;
+  }
+
   &:focus-within {
     .options-items {
       opacity: 1;
@@ -87,8 +97,6 @@ const documentClick = (e: Event) => {
   &.is-right {
     .option-dots {
       align-items: flex-end;
-      padding: 0 10px;
-      margin-right: -10px;
     }
 
     .options-items {
@@ -131,6 +139,7 @@ const documentClick = (e: Event) => {
     opacity: 0;
     visibility: hidden;
     transition: 0.3s ease-in-out;
+    text-align: left;
 
     li {
       .list-button {

package/vue-components/v3/pagination/Pagination.vue

@@ -1,22 +1,30 @@
 <script setup lang="ts">
-import { ref, computed, watch } from "vue";
+import { computed, ref, watch } from "vue";
 
 interface Props {
   hideRowsPerPageSelection?: boolean;
   totalNoOfItems?: number;
-  preSelectedItemsCountPerPage?: number;
+  itemsPerPage?: number;
 }
 
 const props = withDefaults(defineProps<Props>(), {
   hideRowsPerPageSelection: false,
   totalNoOfItems: 0,
-  preSelectedItemsCountPerPage: 5,
+  itemsPerPage: 5,
 });
 
-const emit = defineEmits(["pagination:pagechange"]);
+const emit = defineEmits(["pagination:pagechange", "pagination:countchange"]);
 
 const activePageNo = ref(1);
-const selectedItemCountPerPage = ref(props.preSelectedItemsCountPerPage);
+const selectedItemCountPerPage = computed({
+  get() {
+    return props.itemsPerPage;
+  },
+  set(n) {
+    activePageNo.value = 1;
+    emit("pagination:countchange", n);
+  },
+});
 
 const noOfPages = computed(() => {
   return Math.ceil(props.totalNoOfItems / selectedItemCountPerPage.value);
@@ -35,9 +43,9 @@ const pageRange = computed(() => {
     if (activePageNo.value < 3) {
       o.start = 1;
       o.end = 5;
-    } else if (activePageNo.value > noOfPageNos.value - 2) {
-      o.start = noOfPageNos.value - 4;
-      o.end = noOfPageNos.value;
+    } else if (activePageNo.value >= noOfPages.value - 2) {
+      o.start = noOfPages.value - 4;
+      o.end = noOfPages.value;
     } else {
       o.start = activePageNo.value - 2;
       o.end = activePageNo.value + 2;
@@ -79,7 +87,7 @@ const changePage = (page: number) => {
 };
 
 const nextPage = () => {
-  activePageNo.value = Math.min(activePageNo.value + 1, noOfPageNos.value);
+  activePageNo.value = Math.min(activePageNo.value + 1, noOfPages.value);
 };
 
 watch(
@@ -89,12 +97,9 @@ watch(
   },
   {
     deep: true,
+    immediate: true,
   }
 );
-
-watch(selectedItemCountPerPage, () => {
-  activePageNo.value = 1;
-});
 </script>
 
 <template>
@@ -102,10 +107,7 @@ watch(selectedItemCountPerPage, () => {
     <div class="pagination-filter level-left">
       <div
         class="level-item"
-        v-show="
-          !hideRowsPerPageSelection &&
-          totalNoOfItems > preSelectedItemsCountPerPage
-        "
+        v-show="!hideRowsPerPageSelection && totalNoOfItems > itemsPerPage"
       >
         <label>Rows per page</label>
         <select
@@ -172,6 +174,7 @@ watch(selectedItemCountPerPage, () => {
   ul {
     li {
       display: inline-block;
+
       a {
         display: block;
         width: 20px;
@@ -188,12 +191,15 @@ watch(selectedItemCountPerPage, () => {
           color: $white-100;
           border: 1px solid $primary-90;
         }
+
         &.previous {
           background-color: $primary-97;
         }
+
         &.next {
           background-color: $primary-97;
         }
+
         &.is-current {
           background-color: $primary;
           color: $white-100;
@@ -207,11 +213,13 @@ watch(selectedItemCountPerPage, () => {
 .pagination-filter {
   color: $primary-30;
   font-size: 12px;
+
   span {
     font-weight: 500;
     padding: 0 4px;
   }
 }
+
 .pagination-filter {
   select {
     background-color: $primary-97;
@@ -220,10 +228,12 @@ watch(selectedItemCountPerPage, () => {
     margin-left: 4px;
     height: 22px;
     padding: 0 4px;
+
     &:focus,
     &:active,
     &:focus-visible {
       border: 1px solid $primary;
+      outline: none;
     }
   }
 }

package/vue-components/v3/preloader/Preloader.vue

@@ -12,7 +12,7 @@ withDefaults(defineProps<Props>(), {
 
 <template>
   <div
-    class="is-flex is-justify-content-center is-align-items-center is-flex-direction-column ac-preloader"
+    class="is-flex is-justify-content-center is-align-items-center is-flex-direction-column ac-preloader page-loader"
     style="height: calc(100vh - 200px)"
   >
     <span v-if="showSpinner" class="spinner"></span>

package/vue-components/v3/searchbars/SearchBar.vue

@@ -20,7 +20,7 @@ const emit = defineEmits(["search"]);
 const searchText = ref("");
 
 watch(searchText, (n) => {
-  emit("search", n);
+  emit("search", n.trim());
 });
 </script>
 
@@ -58,15 +58,6 @@ watch(searchText, (n) => {
   .ac-single-input {
     width: 200px;
     transition: 0.3s all;
-    input {
-      // padding: 0 20px;
-      &::placeholder {
-        // opacity: 0;
-      }
-      &:focus {
-        // opacity: 1;
-      }
-    }
   }
 }
 </style>