From c71eb853c5b10a503eb4fcfec3340ccbed0e5aa3 Mon Sep 17 00:00:00 2001
From: Allilengyi <allilengyi@riseup.net>
Date: Sun, 4 Feb 2024 00:02:58 +0100
Subject: [PATCH 1/2] transferred PR 1055 of upstream

---
 src/components/Event/EventBanner.vue          |  4 +-
 src/components/Event/EventMetadataSidebar.vue | 92 +++++++++++++++++++
 src/components/Image/BlurhashImg.vue          | 14 ++-
 src/components/Image/BlurhashImgWrapper.vue   | 80 ++++++++++++++++
 4 files changed, 185 insertions(+), 5 deletions(-)
 create mode 100644 src/components/Image/BlurhashImgWrapper.vue

diff --git a/src/components/Event/EventBanner.vue b/src/components/Event/EventBanner.vue
index 22ffc704c..3cb8e47e7 100644
--- a/src/components/Event/EventBanner.vue
+++ b/src/components/Event/EventBanner.vue
@@ -1,11 +1,11 @@
 <template>
   <div class="flex justify-center max-h-80">
-    <lazy-image-wrapper :picture="picture" />
+    <blurhash-img-wrapper :picture="picture" />
   </div>
 </template>
 <script lang="ts" setup>
 import { IMedia } from "@/types/media.model";
-import LazyImageWrapper from "../Image/LazyImageWrapper.vue";
+import BlurhashImgWrapper from "../Image/BlurhashImgWrapper.vue";
 
 withDefaults(
   defineProps<{
diff --git a/src/components/Event/EventMetadataSidebar.vue b/src/components/Event/EventMetadataSidebar.vue
index 051943a0b..2033b92f4 100644
--- a/src/components/Event/EventMetadataSidebar.vue
+++ b/src/components/Event/EventMetadataSidebar.vue
@@ -154,6 +154,98 @@
       >
       <span v-else>{{ extra.value }}</span>
     </event-metadata-block>
+    <div v-if="event.picture">
+      <h2>{{ $t("Headline picture") }}</h2>
+      <div style="position: relative" @click="showImage = true">
+        <img :src="event.picture.url" style="width: 100%" />
+      </div>
+    </div>
+    <b-modal v-if="event.picture" :active.sync="showImage" has-modal-card>
+      <div>
+        <header class="modal-card-head">{{ $t("Headline picture") }}</header>
+        <section
+          class="modal-card"
+          style="width: auto; -webkit-overflow-scrolling: touch; overflow: auto"
+        >
+          <img :src="event.picture.url" />
+        </section>
+        <footer class="modal-card-foot"></footer>
+      </div>
+    </b-modal>
+    <b-modal
+      class="map-modal"
+      v-if="physicalAddress && physicalAddress.geom"
+      :active.sync="showMap"
+      has-modal-card
+      full-screen
+    >
+      <div class="modal-card">
+        <header class="modal-card-head">
+          <button type="button" class="delete" @click="showMap = false" />
+        </header>
+        <div class="modal-card-body">
+          <section class="map">
+            <map-leaflet
+              :coords="physicalAddress.geom"
+              :marker="{
+                text: physicalAddress.fullName,
+                icon: physicalAddress.poiInfos.poiIcon.icon,
+              }"
+            />
+          </section>
+          <section class="columns is-centered map-footer">
+            <div class="column is-half has-text-centered">
+              <p class="address">
+                <i class="mdi mdi-map-marker"></i>
+                {{ physicalAddress.fullName }}
+              </p>
+              <p class="getting-there">{{ $t("Getting there") }}</p>
+              <div
+                class="buttons"
+                v-if="
+                  addressLinkToRouteByCar ||
+                  addressLinkToRouteByBike ||
+                  addressLinkToRouteByFeet
+                "
+              >
+                <a
+                  class="button"
+                  target="_blank"
+                  v-if="addressLinkToRouteByFeet"
+                  :href="addressLinkToRouteByFeet"
+                >
+                  <i class="mdi mdi-walk"></i
+                ></a>
+                <a
+                  class="button"
+                  target="_blank"
+                  v-if="addressLinkToRouteByBike"
+                  :href="addressLinkToRouteByBike"
+                >
+                  <i class="mdi mdi-bike"></i
+                ></a>
+                <a
+                  class="button"
+                  target="_blank"
+                  v-if="addressLinkToRouteByTransit"
+                  :href="addressLinkToRouteByTransit"
+                >
+                  <i class="mdi mdi-bus"></i
+                ></a>
+                <a
+                  class="button"
+                  target="_blank"
+                  v-if="addressLinkToRouteByCar"
+                  :href="addressLinkToRouteByCar"
+                >
+                  <i class="mdi mdi-car"></i>
+                </a>
+              </div>
+            </div>
+          </section>
+        </div>
+      </div>
+    </b-modal>
   </div>
 </template>
 <script lang="ts" setup>
diff --git a/src/components/Image/BlurhashImg.vue b/src/components/Image/BlurhashImg.vue
index fd53a33ee..306efdc87 100644
--- a/src/components/Image/BlurhashImg.vue
+++ b/src/components/Image/BlurhashImg.vue
@@ -1,5 +1,5 @@
 <template>
-  <canvas ref="canvas" width="32" height="32" />
+  <canvas ref="canvas" width="128" height="32" />
 </template>
 
 <script lang="ts" setup>
@@ -20,13 +20,21 @@ const canvas = ref<HTMLCanvasElement | undefined>(undefined);
 onMounted(() => {
   try {
     if (canvas.value) {
-      const pixels = decode(props.hash, 32, 32);
-      const imageData = new ImageData(pixels, 32, 32);
+      const pixels = decode(props.hash, 128, 32);
+      const imageData = new ImageData(pixels, 128, 32);
       const context = canvas.value.getContext("2d");
       if (context) {
         context.putImageData(imageData, 0, 0);
       }
     }
+
+    @Watch("hash")
+    updateHashChange(): void {
+      try {
+        const pixels = decode(this.hash, 128, 32);
+        const imageData = new ImageData(pixels, 128, 32);
+        const context = this.canvas.getContext("2d");
+        context.putImageData(imageData, 0, 0);
   } catch (e) {
     console.error(e);
   }
diff --git a/src/components/Image/BlurhashImgWrapper.vue b/src/components/Image/BlurhashImgWrapper.vue
new file mode 100644
index 000000000..8a6b15b01
--- /dev/null
+++ b/src/components/Image/BlurhashImgWrapper.vue
@@ -0,0 +1,80 @@
+<template>
+  <div class="wrapper" v-bind="$attrs">
+    <div class="relative container">
+      <blurhash-img
+        v-if="pictureOrDefault.metadata.blurhash"
+        :hash="pictureOrDefault.metadata.blurhash"
+        class="top-0 left-0"
+      />
+    </div>
+  </div>
+</template>
+
+<script lang="ts">
+import { IMedia } from "@/types/media.model";
+import { Prop, Component, Vue } from "vue-property-decorator";
+import { PropType } from "vue";
+import BlurhashImg from "./BlurhashImg.vue";
+
+const DEFAULT_CARD_URL = "/img/mobilizon_default_card.png";
+const DEFAULT_BLURHASH = "MCHKI4El-P-U}+={R-WWoes,Iu-P=?R,xD";
+const DEFAULT_WIDTH = 630;
+const DEFAULT_HEIGHT = 350;
+const DEFAULT_PICTURE = {
+  url: DEFAULT_CARD_URL,
+  metadata: {
+    width: DEFAULT_WIDTH,
+    height: DEFAULT_HEIGHT,
+    blurhash: DEFAULT_BLURHASH,
+  },
+};
+
+@Component({
+  components: {
+    BlurhashImg,
+  },
+})
+export default class BlurhashImgWrapper extends Vue {
+  @Prop({ required: false, type: Object as PropType<IMedia | null> })
+  picture!: IMedia | null;
+
+  get pictureOrDefault(): Partial<IMedia> {
+    if (this.picture === null) {
+      return DEFAULT_PICTURE;
+    }
+    return {
+      url: this?.picture?.url,
+      metadata: {
+        width: this?.picture?.metadata?.width,
+        height: this?.picture?.metadata?.height,
+        blurhash: this?.picture?.metadata?.blurhash,
+      },
+    };
+  }
+}
+</script>
+<style lang="scss" scoped>
+.relative {
+  position: relative;
+}
+.absolute {
+  position: absolute;
+}
+.top-0 {
+  top: 0;
+}
+.left-0 {
+  left: 0;
+}
+.wrapper,
+.container {
+  display: flex;
+  flex: 1;
+}
+img {
+  width: 100%;
+  height: 100%;
+  object-fit: cover;
+  object-position: 50% 50%;
+}
+</style>
-- 
2.44.1


From 195e2d37bc1b6a2377ae678f6f61257c177b4489 Mon Sep 17 00:00:00 2001
From: Allilengyi <allilengyi@riseup.net>
Date: Sun, 4 Feb 2024 01:26:14 +0100
Subject: [PATCH 2/2] migrated files to vue.js 3.x

---
 src/components/Image/BlurhashImg.vue        | 30 ++++----
 src/components/Image/BlurhashImgWrapper.vue | 80 ++++++---------------
 2 files changed, 36 insertions(+), 74 deletions(-)

diff --git a/src/components/Image/BlurhashImg.vue b/src/components/Image/BlurhashImg.vue
index 306efdc87..fa93943f3 100644
--- a/src/components/Image/BlurhashImg.vue
+++ b/src/components/Image/BlurhashImg.vue
@@ -18,25 +18,21 @@ const props = withDefaults(
 const canvas = ref<HTMLCanvasElement | undefined>(undefined);
 
 onMounted(() => {
-  try {
-    if (canvas.value) {
-      const pixels = decode(props.hash, 128, 32);
-      const imageData = new ImageData(pixels, 128, 32);
-      const context = canvas.value.getContext("2d");
-      if (context) {
-        context.putImageData(imageData, 0, 0);
-      }
-    }
+  updateCanvas();
+});
 
-    @Watch("hash")
-    updateHashChange(): void {
-      try {
-        const pixels = decode(this.hash, 128, 32);
-        const imageData = new ImageData(pixels, 128, 32);
-        const context = this.canvas.getContext("2d");
-        context.putImageData(imageData, 0, 0);
+watch(() => props.hash, () => {
+  updateCanvas();
+});
+
+function updateCanvas() {
+  try {
+    const pixels = decode(props.hash, 128, 32);
+    const imageData = new ImageData(pixels, 128, 32);
+    const context = canvasRef.value.getContext('2d');
+    context.putImageData(imageData, 0, 0);
   } catch (e) {
     console.error(e);
   }
-});
+}
 </script>
diff --git a/src/components/Image/BlurhashImgWrapper.vue b/src/components/Image/BlurhashImgWrapper.vue
index 8a6b15b01..c1bb3a555 100644
--- a/src/components/Image/BlurhashImgWrapper.vue
+++ b/src/components/Image/BlurhashImgWrapper.vue
@@ -10,71 +10,37 @@
   </div>
 </template>
 
-<script lang="ts">
-import { IMedia } from "@/types/media.model";
-import { Prop, Component, Vue } from "vue-property-decorator";
-import { PropType } from "vue";
-import BlurhashImg from "./BlurhashImg.vue";
+<script setup lang="ts">
+import { IMedia } from '@/types/media.model';
+import BlurhashImg from './BlurhashImg.vue';
 
-const DEFAULT_CARD_URL = "/img/mobilizon_default_card.png";
-const DEFAULT_BLURHASH = "MCHKI4El-P-U}+={R-WWoes,Iu-P=?R,xD";
+const DEFAULT_CARD_URL = '/img/mobilizon_default_card.png';
+const DEFAULT_BLURHASH = 'MCHKI4El-P-U}+={R-WWoes,Iu-P=?R,xD';
 const DEFAULT_WIDTH = 630;
 const DEFAULT_HEIGHT = 350;
-const DEFAULT_PICTURE = {
-  url: DEFAULT_CARD_URL,
-  metadata: {
-    width: DEFAULT_WIDTH,
-    height: DEFAULT_HEIGHT,
-    blurhash: DEFAULT_BLURHASH,
-  },
-};
 
-@Component({
-  components: {
-    BlurhashImg,
-  },
-})
-export default class BlurhashImgWrapper extends Vue {
-  @Prop({ required: false, type: Object as PropType<IMedia | null> })
-  picture!: IMedia | null;
+const props = defineProps({
+  picture: { type: Object as () => IMedia | null, default: null },
+});
 
-  get pictureOrDefault(): Partial<IMedia> {
-    if (this.picture === null) {
-      return DEFAULT_PICTURE;
-    }
+const pictureOrDefault = computed(() => {
+  if (props.picture === null) {
     return {
-      url: this?.picture?.url,
+      url: DEFAULT_CARD_URL,
       metadata: {
-        width: this?.picture?.metadata?.width,
-        height: this?.picture?.metadata?.height,
-        blurhash: this?.picture?.metadata?.blurhash,
+        width: DEFAULT_WIDTH,
+        height: DEFAULT_HEIGHT,
+        blurhash: DEFAULT_BLURHASH,
       },
     };
   }
-}
+  return {
+    url: props.picture?.url,
+    metadata: {
+      width: props.picture?.metadata?.width,
+      height: props.picture?.metadata?.height,
+      blurhash: props.picture?.metadata?.blurhash,
+    },
+  };
+});
 </script>
-<style lang="scss" scoped>
-.relative {
-  position: relative;
-}
-.absolute {
-  position: absolute;
-}
-.top-0 {
-  top: 0;
-}
-.left-0 {
-  left: 0;
-}
-.wrapper,
-.container {
-  display: flex;
-  flex: 1;
-}
-img {
-  width: 100%;
-  height: 100%;
-  object-fit: cover;
-  object-position: 50% 50%;
-}
-</style>
-- 
2.44.1