@fy-/fws-vue 0.3.56 → 0.3.58

package/components/fws/UserFlow.vue

@@ -176,16 +176,6 @@ const userFlow = async (params: paramsType = { initial: false }) => {
   eventBus.emit("login-loading", false);
 };
 
-const getContrastingTextColor = (backgroundColor: string) => {
-  const r = parseInt(backgroundColor.substring(1, 3), 16);
-  const g = parseInt(backgroundColor.substring(3, 5), 16);
-  const b = parseInt(backgroundColor.substring(5, 7), 16);
-
-  const luminance = (0.299 * r + 0.587 * g + 0.114 * b) / 255;
-
-  return luminance > 0.5 ? "#000000" : "#FFFFFF";
-};
-
 onMounted(async () => {
   await userFlow({ initial: true });
 });
@@ -223,7 +213,7 @@ onMounted(async () => {
                 class="flex border border-fv-neutral-300 dark:border-fv-neutral-700 shadow items-center gap-2 justify-start btn neutral defaults w-full mx-auto !font-semibold"
                 :style="`background: ${
                   field.button['background-color']
-                }; color: ${getContrastingTextColor(
+                }; color: ${$getContrastingTextColor(
                   field.button['background-color'],
                 )}`"
               >

package/components/fws/UserOAuth2.vue

@@ -0,0 +1,161 @@
+<script setup lang="ts">
+import { useTranslation } from "../../composables/translations";
+import { useEventBus } from "../../composables/event-bus";
+import { useUserStore } from "../../stores/user";
+import { useRest, APIResult } from "../../composables/rest";
+import DefaultModal from "../ui/DefaultModal.vue";
+
+import { ref, computed, onMounted } from "vue";
+const rest = useRest();
+const eventBus = useEventBus();
+const userStore = useUserStore();
+const isAuth = computed(() => userStore.isAuth);
+const data = ref();
+const providersData = ref();
+const usedProviders = ref<Record<string, boolean>>({});
+const getOAuth2Providers = async () => {
+  eventBus.emit("main-loading", true);
+  const d = await rest("User/OAuth2/Providers", "GET");
+  if (d && d.result == "success") {
+    providersData.value = d.data;
+  }
+  eventBus.emit("main-loading", false);
+};
+const getOAuth2Redirect = async (providerUUID: string) => {
+  eventBus.emit("main-loading", true);
+  const d = await rest(`User/OAuth2/Provider/${providerUUID}`, "GET");
+  if (d && d.result == "success") {
+    window.location.href = d.data;
+  }
+  eventBus.emit("main-loading", false);
+};
+const translate = useTranslation();
+const deleteOAuth2Connection = async (providerUUID: string) => {
+  eventBus.emit("showConfirm", {
+    title: translate("remove_provider_confirm_title"),
+    desc: translate("remove_provider_confirm_desc_warning"),
+    onConfirm: async () => {
+      eventBus.emit("main-loading", true);
+      const d = await rest(`User/OAuth2/Provider/${providerUUID}`, "DELETE");
+      if (d && d.result == "success") {
+        getOAuth2User();
+      }
+      eventBus.emit("main-loading", false);
+    },
+  });
+};
+const getOAuth2User = async () => {
+  eventBus.emit("main-loading", true);
+  if (!isAuth.value) {
+    return;
+  }
+  const d = await rest("User/OAuth2", "GET");
+  usedProviders.value = {};
+  if (d && d.result == "success") {
+    data.value = d.data;
+    data.value.forEach((p: any) => {
+      usedProviders.value[p.ProviderUUID] = true;
+    });
+  }
+  eventBus.emit("main-loading", false);
+};
+onMounted(() => {
+  getOAuth2User();
+  getOAuth2Providers();
+});
+</script>
+
+<template>
+  <div class="flex flex-col gap-3">
+    <DefaultModal id="providers" :title="$t('providers_modal_title')">
+      <template v-for="provider in providersData" :key="provider.UUID">
+        <div
+          class="flex items-center gap-3"
+          v-if="!usedProviders[provider.UUID]"
+        >
+          <button
+            @click="
+              () => {
+                getOAuth2Redirect(provider.UUID);
+              }
+            "
+            class="flex border border-fv-neutral-300 dark:border-fv-neutral-700 shadow items-center gap-2 justify-start btn neutral defaults w-full mx-auto !font-semibold"
+            :style="`background: ${
+              provider.Data.Button.button['background-color']
+            }; color: ${$getContrastingTextColor(
+              provider.Data.Button.button['background-color'],
+            )}`"
+          >
+            <img
+              :key="`${provider.Data.Button.label}oauth`"
+              class="h-12 w-12 block p-2 mr-3"
+              :alt="provider.Data.Button.info.Name"
+              :src="provider.Data.Button.button.logo"
+            />
+            <div>
+              {{
+                $t("user_flow_signin_with", {
+                  provider: provider.Data.Button.name,
+                })
+              }}
+            </div>
+          </button>
+        </div>
+      </template>
+    </DefaultModal>
+    <h2 class="text-xl flex items-center justify-between">
+      <span>{{ $t("oauth2_providers_title") }}</span>
+      <button
+        class="btn primary medium !py-1 !px-3"
+        @click="
+          () => {
+            $eventBus.emit('providersModal', true);
+          }
+        "
+      >
+        {{ $t("add_oauth2_con_cta") }}
+      </button>
+    </h2>
+    <p
+      class="text-red-900 dark:text-red-300 text-sm bg-red-200/[.2] dark:bg-red-900/[.2] p-2 rounded shadow"
+      v-if="
+        $route.query.error &&
+        $route.query.error === 'user_oauth2_connection_exists'
+      "
+    >
+      {{ $t("oauth2_error_user_oauth2_connection_exists") }}
+    </p>
+    <div v-if="data && data.length == 0">
+      <p>{{ $t("providers_empty") }}</p>
+    </div>
+    <div
+      v-for="provider in data"
+      class="flex items-center gap-3"
+      :key="provider.ProviderUUID"
+    >
+      <img
+        :src="provider.Provider.Button.button.logo"
+        class="w-14 h-14 p-1 rounded-full"
+        :style="`background-color: ${provider.Provider.Button.button['background-color']}`"
+      />
+      <div>
+        <h3 class="text-xl">
+          {{ provider.Provider.Button.name }}
+          <small class="text-xs">({{ provider.ServiceID }})</small>
+        </h3>
+        <div class="flex gap-2 mt-1">
+          <button
+            class="btn danger small"
+            @click="
+              () => {
+                deleteOAuth2Connection(provider.ProviderUUID);
+              }
+            "
+          >
+            {{ $t("remove_oauth2_con_cta") }}
+          </button>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>

package/components/ui/DefaultGallery.vue

@@ -313,6 +313,7 @@ onUnmounted(() => {
                   />
                   <component
                     v-else
+                    @click="$eventBus.emit(`${id}GalleryImage`, i - 1)"
                     :is="imageComponent"
                     :image="getThumbnailUrl(images[i - 1]).image"
                     :variant="getThumbnailUrl(images[i - 1]).variant"
@@ -357,6 +358,7 @@ onUnmounted(() => {
                     :variant="getThumbnailUrl(images[i + j - 2]).variant"
                     :alt="getThumbnailUrl(images[i + j - 2]).alt"
                     class="h-auto max-w-full rounded-lg cursor-pointer"
+                    @click="$eventBus.emit(`${id}GalleryImage`, i + j - 2)"
                   />
                 </div>
               </template>
@@ -376,6 +378,7 @@ onUnmounted(() => {
               :variant="getThumbnailUrl(images[i - 1]).variant"
               :alt="getThumbnailUrl(images[i - 1]).alt"
               class="h-auto max-w-full rounded-lg cursor-pointer"
+              @click="$eventBus.emit(`${id}GalleryImage`, i - 1)"
             />
           </div>
         </template>

package/composables/templating.ts

@@ -8,7 +8,15 @@ const cropText = (str: string, ml = 100, end = "...") => {
   }
   return str;
 };
+const getContrastingTextColor = (backgroundColor: string) => {
+  const r = parseInt(backgroundColor.substring(1, 3), 16);
+  const g = parseInt(backgroundColor.substring(3, 5), 16);
+  const b = parseInt(backgroundColor.substring(5, 7), 16);
 
+  const luminance = (0.299 * r + 0.587 * g + 0.114 * b) / 255;
+
+  return luminance > 0.5 ? "#000000" : "#FFFFFF";
+};
 const formatBytes = (bytes: number, decimals = 2) => {
   if (!+bytes) return "0 Bytes";
 
@@ -76,4 +84,11 @@ const formatTimeago = (dt: Date | string | number) => {
   return formatDateTimeago(new Date(_dt), getLocale().replace("_", "-"));
 };
 
-export { cropText, formatBytes, formatDate, formatDatetime, formatTimeago };
+export {
+  cropText,
+  formatBytes,
+  formatDate,
+  formatDatetime,
+  formatTimeago,
+  getContrastingTextColor,
+};

package/index.ts

@@ -19,6 +19,7 @@ import {
   formatDate,
   formatDatetime,
   formatTimeago,
+  getContrastingTextColor,
 } from "./composables/templating";
 import { useRest } from "./composables/rest";
 export * from "./stores/serverRouter";
@@ -48,7 +49,7 @@ import DataTable from "./components/fws/DataTable.vue";
 import FilterData from "./components/fws/FilterData.vue";
 import CmsArticleBoxed from "./components/fws/CmsArticleBoxed.vue";
 import CmsArticleSingle from "./components/fws/CmsArticleSingle.vue";
-
+import UserOAuth2 from "./components/fws/UserOAuth2.vue";
 // Css
 import "./style.css";
 
@@ -71,6 +72,8 @@ function createFWS(): Plugin {
         app.config.globalProperties.$formatTimeago = formatTimeago;
         app.config.globalProperties.$formatDatetime = formatDatetime;
         app.config.globalProperties.$formatDate = formatDate;
+        app.config.globalProperties.$getContrastingTextColor =
+          getContrastingTextColor;
 
         app.component("ClientOnly", ClientOnly);
       }
@@ -87,6 +90,7 @@ declare module "vue" {
     $formatTimeago: typeof formatTimeago;
     $formatDatetime: typeof formatDatetime;
     $formatDate: typeof formatDate;
+    $getContrastingTextColor: typeof getContrastingTextColor;
   }
   export interface GlobalComponents {
     ClientOnly: typeof ClientOnly;
@@ -130,6 +134,7 @@ export {
 
   // FWS
   UserFlow,
+  UserOAuth2,
   DataTable,
   FilterData,
   CmsArticleBoxed,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fy-/fws-vue",
-  "version": "0.3.56",
+  "version": "0.3.58",
   "author": "Florian 'Fy' Gasquez <m@fy.to>",
   "license": "MIT",
   "repository": {