From bb4f490bb1023170750b617e86b77743e19639df Mon Sep 17 00:00:00 2001
From: Torsten Schulz <tsschulz@gmx.net>
Date: Wed, 7 May 2025 11:55:27 +0200
Subject: [PATCH] Added rendering of Event Images

---
 .gitignore                     |  1 +
 controllers/eventController.js |  2 +-
 models/event.js                |  8 +++++
 src/components/EventForm.vue   |  7 +++++
 src/components/EventRender.vue | 56 +++++++++++++++++++++++++++++-----
 vue.config.js                  |  4 +--
 6 files changed, 67 insertions(+), 11 deletions(-)

diff --git a/.gitignore b/.gitignore
index f5115c1..1d78bca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,3 +26,4 @@ node_modules
 server.key
 server.cert
 
+public/images/uploads/1ba24ea7-f52c-4179-896f-1909269cab58.jpg
diff --git a/controllers/eventController.js b/controllers/eventController.js
index ae285c1..c1e9a94 100644
--- a/controllers/eventController.js
+++ b/controllers/eventController.js
@@ -61,7 +61,7 @@ const filterEvents = async (req, res) => {
           { model: Institution, as: 'institution' },
           { model: EventPlace, as: 'eventPlace' },
           { model: EventType, as: 'eventType' },
-          { model: ContactPerson, as: 'contactPersons', through: { attributes: [] } }
+          { model: ContactPerson, as: 'contactPersons', through: { attributes: [] } },
         ],
         order: ['name', 'date', 'time']
       });
diff --git a/models/event.js b/models/event.js
index 500041b..b8814b1 100644
--- a/models/event.js
+++ b/models/event.js
@@ -41,6 +41,10 @@ module.exports = (sequelize) => {
     alsoOnHomepage: {
       type: DataTypes.INTEGER,
       allowNull: false
+    },
+    relatedImage: {
+      type: DataTypes.STRING,
+      allowNull: true
     }
   }, {
     tableName: 'events',
@@ -66,6 +70,10 @@ module.exports = (sequelize) => {
       otherKey: 'contact_person_id',
       as: 'contactPersons'
     });
+    Event.belongsTo(models.Image, {
+      foreignKey: 'relatedImage',
+      as: 'relatedImageAssociation'
+    })
   };
 
   return Event;
diff --git a/src/components/EventForm.vue b/src/components/EventForm.vue
index 235eee0..7fbfad6 100644
--- a/src/components/EventForm.vue
+++ b/src/components/EventForm.vue
@@ -94,6 +94,13 @@
             ></multiselect>
           </td>
         </tr>
+        <tr>
+          <td colspan="2"><label><input type="checkbox" v-model="onHomepage">Auf der Startseite anzeigen</label></td>
+        </tr>
+        <tr>
+          <td>Zugewiesenes Bild:</td>
+          <td><img v-if="assignedImage != null" :src="getImagePath" /><button @click="removeImage">Bild entfernen</button></td>
+        </tr>
         <tr>
           <td colspan="2"><button type="submit">Speichern</button></td>
         </tr>
diff --git a/src/components/EventRender.vue b/src/components/EventRender.vue
index f6e2d30..bea3d6d 100644
--- a/src/components/EventRender.vue
+++ b/src/components/EventRender.vue
@@ -3,24 +3,33 @@
         <table v-if="events.length > 1" class="event-table">
             <tr v-for="event in events" :key="event.id">
                 <td>
+                    <div v-if="hasImage(event)" class="event-image"><img v-if="imageMap[event.relatedImage]"
+                            :src="imageMap[event.relatedImage]" /></div>
                     <div v-if="shouldDisplay('name')" class="event-name">{{ event.name }}</div>
                     <div>{{ formatDateOrDay(event.date, event.dayOfWeek) }}</div>
-                    <div v-if="shouldDisplay('time')">{{ formatTime(event.time) }} <span v-if="event.endTime"> - {{ formatTime(event.endTime) }}</span> Uhr</div>
+                    <div v-if="shouldDisplay('time')">{{ formatTime(event.time) }} <span v-if="event.endTime"> - {{
+                            formatTime(event.endTime) }}</span> Uhr</div>
                     <div v-if="shouldDisplay('place')">{{ event.eventPlace?.name }}</div>
                     <div v-if="shouldDisplay('description')" class="description">{{ event.description }}</div>
-                    <div v-if="shouldDisplay('contactPerson')">{{ event.contactPersons.map(cp => cp.name).join(', ') }}</div>
+                    <div v-if="shouldDisplay('contactPerson')">{{event.contactPersons.map(cp => cp.name).join(', ')}}
+                    </div>
                     <div v-if="shouldDisplay('institution')">{{ event.institution?.name }}</div>
                     <div v-if="shouldDisplay('type')">{{ event.eventType?.caption }}</div>
                 </td>
             </tr>
-        </table>
-        <div v-else-if="events.length === 1" :class="events[0].alsoOnHomepage && config.id === 'home' ? 'homepage' : ''">
+        </table> 
+        <div v-else-if="events.length === 1"
+            :class="events[0].alsoOnHomepage && config.id === 'home' ? 'homepage' : ''">
+            <div v-if="hasImage(events[0])" class="event-image"><img v-if="imageMap[events[0].relatedImage]"
+                    :src="imageMap[events[0].relatedImage]" /></div>
             <div v-if="shouldDisplay('name')" class="event-name">{{ events[0].name }}</div>
             <div>{{ formatDateOrDay(events[0].date, events[0].dayOfWeek) }}</div>
-            <div v-if="shouldDisplay('time')">{{ formatTime(events[0].time) }} <span v-if="events[0].endTime"> - {{ formatTime(events[0].endTime) }}</span> Uhr</div>
+            <div v-if="shouldDisplay('time')">{{ formatTime(events[0].time) }} <span v-if="events[0].endTime"> - {{
+                formatTime(events[0].endTime) }}</span> Uhr</div>
             <div v-if="shouldDisplay('place')">{{ events[0].eventPlace?.name }}</div>
             <div v-if="shouldDisplay('description')" class="description">{{ events[0].description }}</div>
-            <div v-if="shouldDisplay('contactPerson')">{{ events[0].contactPersons.map(cp => cp.name).join(', ') }}</div>
+            <div v-if="shouldDisplay('contactPerson')">{{events[0].contactPersons.map(cp => cp.name).join(', ')}}
+            </div>
             <div v-if="shouldDisplay('institution')">{{ events[0].institution?.name }}</div>
             <div v-if="shouldDisplay('type')">{{ events[0].eventType?.caption }}</div>
         </div>
@@ -29,7 +38,7 @@
 
 <script>
 import axios from '@/axios';
-import { format } from 'date-fns'; 
+import { format } from 'date-fns';
 import { formatTime } from '@/utils/strings';
 
 export default {
@@ -43,6 +52,7 @@ export default {
     data() {
         return {
             events: [],
+            imageMap: {},
         };
     },
     async created() {
@@ -52,10 +62,22 @@ export default {
         formatTime,
         async fetchEvents() {
             try {
-                const response = await axios.post('/events/filter', 
+                const response = await axios.post('/events/filter',
                     this.config
                 );
                 this.events = response.data.events;
+                await Promise.all(
+                    this.events
+                        .filter(event => this.hasImage(event))
+                        .map(async event => {
+                            try {
+                                const response = await axios.get('/image/' + event.relatedImage);
+                                this.imageMap[event.relatedImage] = '/images/uploads/' + response.data.filename;
+                            } catch (err) {
+                                console.error(`Bild konnte nicht geladen werden (ID ${event.relatedImage}):`, err);
+                            }
+                        })
+                );
             } catch (error) {
                 console.error('Fehler beim Abrufen der Events', error);
             }
@@ -71,6 +93,15 @@ export default {
                 return daysOfWeek[dayOfWeek];
             }
             return '';
+        },
+        hasImage(event) {
+            return event.relatedImage && event.relatedImage != '';
+        },
+        async imagePath(eventImage) {
+            const response = await axios.get('/image/' + eventImage);
+            const path = '/images/uploads/' + response.data.filename;
+            console.log(path);
+            return path;
         }
     }
 };
@@ -80,18 +111,27 @@ export default {
 .event-name {
     font-weight: bold;
 }
+
 .event-table {
     border-collapse: collapse;
 }
+
 .event-table td {
     border: 1px solid black;
 }
+
 .homepage {
     border: 1px solid #9400ff;
     padding: 0.5em;
     text-align: center;
 }
+
 .description {
     padding: 0.5em 0;
 }
+
+.event-image > img {
+    max-width: 8em;
+    max-height: 8em;
+}
 </style>
diff --git a/vue.config.js b/vue.config.js
index f5ed984..0a6a037 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -19,8 +19,8 @@ module.exports = defineConfig({
     },
     plugins: [
       new webpack.DefinePlugin({
-        'process.env': JSON.stringify(process.env)
-      }),
+        'process.env.CUSTOM_VAR': JSON.stringify(process.env.CUSTOM_VAR)
+      })
     ],
   },
 });