@dative-gpi/foundation-shared-components 1.0.58 → 1.0.59

package/components/FSImage.vue

@@ -10,8 +10,7 @@
 <script lang="ts">
 import { computed, defineComponent, type PropType } from "vue";
 
-import { IMAGE_RAW_URL } from "@dative-gpi/foundation-shared-services/config/urls";
-
+import { IMAGE_THUMBNAIL_URL, IMAGE_RAW_URL } from "@dative-gpi/foundation-shared-services/config/urls";
 import { useAppAuthToken, useImage } from "@dative-gpi/foundation-shared-services/composables";
 
 import FSImageUI from "./FSImageUI.vue";
@@ -26,6 +25,11 @@ export default defineComponent({
       type: String as PropType<string | null>,
       required: false,
       default: null
+    },
+    thumbnail: {
+      type: Boolean as PropType<boolean>,
+      required: false,
+      default: false
     }
   },
   setup(props) {
@@ -33,6 +37,9 @@ export default defineComponent({
     const { authToken } = useAppAuthToken();
 
     const source = computed(() => {
+      if (props.thumbnail) {
+        return props.imageId ? IMAGE_THUMBNAIL_URL(props.imageId, authToken.value) : null;
+      }
       return props.imageId ? IMAGE_RAW_URL(props.imageId, authToken.value) : null;
     });
 

package/components/FSImageUI.vue

@@ -42,9 +42,8 @@
 import { computed, defineComponent, type PropType, ref, type StyleValue, watch } from "vue";
 import { decode, isBlurhashValid } from "blurhash";
 
-import type { ImageDetails } from "@dative-gpi/foundation-shared-domain/models";
-
 import { sizeToVar, varToSize } from "@dative-gpi/foundation-shared-components/utils";
+import { type ImageDetails } from "@dative-gpi/foundation-shared-domain/models";
 
 import FSLoader from "./FSLoader.vue";
 
@@ -64,6 +63,11 @@ export default defineComponent({
       required: false,
       default: null
     },
+    aspectRatio: {
+      type: Number as PropType<number | null>,
+      required: false,
+      default: 1
+    },
     imageB64: {
       type: String as PropType<string | null>,
       required: false,
@@ -79,11 +83,6 @@ export default defineComponent({
       required: false,
       default: null
     },
-    aspectRatio: {
-      type: String as PropType<string | null>,
-      required: false,
-      default: null
-    },
     borderRadius: {
       type: [String, Number],
       required: false,
@@ -127,10 +126,7 @@ export default defineComponent({
           return undefined;
         }
         if (props.aspectRatio) {
-          const split = props.aspectRatio.split('/');
-          if (split.length === 2 && !isNaN(parseFloat(split[0])) && !isNaN(parseFloat(split[1]))) {
-            return sizeToVar(varToSize(props.width) * (parseFloat(split[1]) / parseFloat(split[0])));
-          }
+          return sizeToVar(varToSize(props.width) / props.aspectRatio);
         }
         return sizeToVar(props.width);
       }
@@ -146,10 +142,7 @@ export default defineComponent({
           return undefined;
         }
         if (props.aspectRatio) {
-          const split = props.aspectRatio.split('/');
-          if (split.length === 2 && !isNaN(parseFloat(split[0])) && !isNaN(parseFloat(split[1]))) {
-            return sizeToVar(varToSize(props.height) * (parseFloat(split[0]) / parseFloat(split[1])));
-          }
+          return sizeToVar(varToSize(props.height) * props.aspectRatio);
         }
         return sizeToVar(props.height);
       }

package/components/FSTag.vue

@@ -1,8 +1,9 @@
 <template>
   <FSRow
-    class="fs-tag"
-    width="hug"
     align="center-left"
+    class="fs-tag"
+    :height="$props.height"
+    :width="$props.width"
     :style="style"
     :wrap="false"
     v-bind="$attrs"
@@ -55,6 +56,16 @@ export default defineComponent({
     FSRow
   },
   props: {
+    height: {
+      type: [Array, String, Number] as PropType<string[] | number[] | string | number | null>,
+      required: false,
+      default: "hug"
+    },
+    width: {
+      type: [Array, String, Number] as PropType<string[] | number[] | string | number | null>,
+      required: false,
+      default: "hug"
+    },
     label: {
       type: String as PropType<string | null>,
       required: false,

package/components/agenda/FSDayAgenda.vue

@@ -180,7 +180,7 @@ export default defineComponent({
 
     const dayEvents = computed(() => {
       return props.events.filter((event) => {
-        return (event.start <= props.end && event.start >= props.start) || (event.end <= props.end && event.end >= props.start);
+        return event.start < props.end && event.end > props.start;
       });
     });
 

package/components/agenda/FSMonthAgenda.vue

@@ -240,9 +240,8 @@ export default defineComponent({
 
     const getDayEvents = (dayStartEpoch: number) => {
       return props.events.filter((event) => {
-        const isStartingInDay = event.start >= dayStartEpoch && event.start < (dayStartEpoch + 1000 * 60 * 60 * 24);
-        const isEndingInDay = event.end >= dayStartEpoch && event.end < (dayStartEpoch + 1000 * 60 * 60 * 24);
-        return isStartingInDay || isEndingInDay;
+        const dayEndEpoch = dayStartEpoch + 1000 * 60 * 60 * 24;
+        return event.start < dayEndEpoch && event.end > dayStartEpoch;
       });
     };
 

package/components/agenda/FSWeekAgenda.vue

@@ -309,9 +309,8 @@ export default defineComponent({
 
     const getDayEvents = (dayStartEpoch: number) => {
       return props.events.filter((event) => {
-        const isStartingInDay = event.start >= dayStartEpoch && event.start < (dayStartEpoch + 1000 * 60 * 60 * 24);
-        const isEndingInDay = event.end >= dayStartEpoch && event.end < (dayStartEpoch + 1000 * 60 * 60 * 24);
-        return isStartingInDay || isEndingInDay;
+        const dayEndEpoch = dayStartEpoch + 1000 * 60 * 60 * 24;
+        return event.start < dayEndEpoch && event.end > dayStartEpoch;
       });
     };
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dative-gpi/foundation-shared-components",
   "sideEffects": false,
-  "version": "1.0.58",
+  "version": "1.0.59",
   "description": "",
   "publishConfig": {
     "access": "public"
@@ -10,8 +10,8 @@
   "author": "",
   "license": "ISC",
   "dependencies": {
-    "@dative-gpi/foundation-shared-domain": "1.0.58",
-    "@dative-gpi/foundation-shared-services": "1.0.58"
+    "@dative-gpi/foundation-shared-domain": "1.0.59",
+    "@dative-gpi/foundation-shared-services": "1.0.59"
   },
   "peerDependencies": {
     "@dative-gpi/bones-ui": "^0.0.75",
@@ -35,5 +35,5 @@
     "sass": "1.71.1",
     "sass-loader": "13.3.2"
   },
-  "gitHead": "ee85735c6816c9c5f6264ac108a05e8bc6b2bec2"
+  "gitHead": "583e582d2f2185269a2d2880806be36bdc4dffdd"
 }