From 7d0a920eb939c9488fc7a398d62f6eb299896e2e Mon Sep 17 00:00:00 2001
From: lesion <lesion@autistici.org>
Date: Fri, 28 Oct 2022 12:01:59 +0200
Subject: [PATCH] add custom fallback image, fix #195

---
 components/MyPicture.vue              |  2 +-
 components/admin/Theme.vue            | 53 ++++++++++++++++++++++-----
 docs/assets/js/gancio-events.es.js    |  4 +-
 locales/en.json                       |  3 +-
 server/api/controller/settings.js     | 23 ++++++++++++
 server/api/index.js                   |  1 +
 server/helpers.js                     |  9 +++--
 static/gancio-events.es.js            |  4 +-
 webcomponents/src/GancioEvents.svelte |  2 +-
 wp-plugin/js/gancio-events.es.js      |  4 +-
 10 files changed, 84 insertions(+), 21 deletions(-)

diff --git a/components/MyPicture.vue b/components/MyPicture.vue
index ef4a863d..6f8c2142 100644
--- a/components/MyPicture.vue
+++ b/components/MyPicture.vue
@@ -10,7 +10,7 @@
       :height="height" :width="width"
       :style="{ 'object-position': thumbnailPosition }">
 
-    <img v-else-if='!media && thumb' class='thumb' src="/noimg.svg" alt=''>
+    <img v-else-if='!media && thumb' class='thumb' src="/fallbackimage.png" alt=''>
   </div>
 </template>
 <script>
diff --git a/components/admin/Theme.vue b/components/admin/Theme.vue
index 76df7c7d..e33ebdb7 100644
--- a/components/admin/Theme.vue
+++ b/components/admin/Theme.vue
@@ -2,20 +2,33 @@
 v-container
   v-card-title {{$t('common.theme')}}
   v-card-text
-    //- LOGO
-    v-file-input.mt-5(ref='upload'
-      :label="$t('admin.favicon')"
-      @change='uploadLogo'
-      accept='image/*')
-      template(slot='append-outer')
-        v-btn(color='warning' text @click='resetLogo') <v-icon v-text='mdiRestore'></v-icon> {{$t('common.reset')}}
-        v-img(:src='`/logo.png?${logoKey}`'
-          max-width="60px" max-height="60px" contain)
 
     v-switch.mt-5(v-model='is_dark'
       inset
       :label="$t('admin.is_dark')")
 
+    v-row
+      v-col(cols='6')
+        //- LOGO
+        v-file-input.mt-5(ref='upload'
+          :label="$t('admin.favicon')"
+          @change='uploadLogo'
+          accept='image/*')
+          template(slot='append-outer')
+            v-btn(color='warning' text @click='resetLogo') <v-icon v-text='mdiRestore'></v-icon> {{$t('common.reset')}}
+        v-img.mt-2(:src='`/logo.png?${logoKey}`' max-height="60px" contain)
+
+      v-col(cols='6')
+        //- NOIMG
+        v-file-input.mt-5(ref='upload'
+          :label="$t('admin.fallbackImage')"
+          persistent-hint
+          @change='uploadFallbackImage'
+          accept='image/*')
+          template(slot='append-outer')
+            v-btn(color='warning' text @click='resetFallbackImage') <v-icon v-text='mdiRestore'></v-icon> {{$t('common.reset')}}
+        v-img.mt-2(:src='`/fallbackimage.png?${fallbackImageKey}`' max-height="150px" contain)          
+
     //- TODO choose theme colors
     //- v-row
     //-   v-col(v-for='(color, i) in colors' :key='i')
@@ -77,6 +90,7 @@ export default {
       mdiDeleteForever, mdiRestore, mdiPlus, mdiChevronUp,
       valid: false,
       logoKey: 0,
+      fallbackImageKey: 0,
       link: { href: '', label: '' },
       linkModal: false
       // menu: [false, false, false, false]
@@ -127,11 +141,19 @@ export default {
     forceLogoReload () {
       this.logoKey++
     },
+    forceFallbackImageReload () {
+      this.fallbackImageKey++
+    },
     resetLogo (e) {
       this.setSetting({ key: 'logo', value: null })
         .then(this.forceLogoReload)
       e.stopPropagation()
     },
+    resetFallbackImage (e) {
+      this.setSetting({ key: 'fallbackImage', value: null })
+        .then(this.forceFallbackImageReload)
+      e.stopPropagation()
+    },
     updateColor (i, v) {
       this.colors[i] = v.hex
       this.$vuetify.theme.themes.dark[i] = v.hex
@@ -177,6 +199,19 @@ export default {
 
       }
     },
+    async uploadFallbackImage (file) {
+      const formData = new FormData()
+      formData.append('fallbackImage', file)
+      try {
+        await this.$axios.$post('/settings/fallbackImage', formData)
+        this.$root.$emit('message', {
+          message: 'Fallback image updated'
+        })
+        this.forceFallbackImageReload()
+      } catch (e) {
+
+      }    
+    },
     save (key, value) {
       if (this.settings[key] !== value) {
         this.setSetting({ key, value })
diff --git a/docs/assets/js/gancio-events.es.js b/docs/assets/js/gancio-events.es.js
index 35d91346..1f9dbe21 100644
--- a/docs/assets/js/gancio-events.es.js
+++ b/docs/assets/js/gancio-events.es.js
@@ -313,13 +313,13 @@ function Le(t) {
   let e, i, n;
   return {
     c() {
-      e = g("img"), a(e, "style", "aspect-ratio=1.7778;"), a(e, "alt", i = t[12].title), G(e.src, n = t[0] + "/noimg.svg") || a(e, "src", n), a(e, "loading", "lazy");
+      e = g("img"), a(e, "style", "aspect-ratio=1.7778;"), a(e, "alt", i = t[12].title), G(e.src, n = t[0] + "/fallbackimage.png") || a(e, "src", n), a(e, "loading", "lazy");
     },
     m(l, o) {
       v(l, e, o);
     },
     p(l, o) {
-      o & 32 && i !== (i = l[12].title) && a(e, "alt", i), o & 1 && !G(e.src, n = l[0] + "/noimg.svg") && a(e, "src", n);
+      o & 32 && i !== (i = l[12].title) && a(e, "alt", i), o & 1 && !G(e.src, n = l[0] + "/fallbackimage.png") && a(e, "src", n);
     },
     d(l) {
       l && x(e);
diff --git a/locales/en.json b/locales/en.json
index d233e1b4..6897c612 100644
--- a/locales/en.json
+++ b/locales/en.json
@@ -246,7 +246,8 @@
     "collections_description": "Collections are groupings of events by tags and places. They will be displayed on the home page",
     "edit_collection": "Edit Collection",
     "config_plugin": "Plugin configuration",
-    "plugins_description": ""
+    "plugins_description": "",
+    "fallbackImage": "Fallback image"
   },
   "auth": {
     "not_confirmed": "Not confirmed yet…",
diff --git a/server/api/controller/settings.js b/server/api/controller/settings.js
index 2682eb25..0e20039c 100644
--- a/server/api/controller/settings.js
+++ b/server/api/controller/settings.js
@@ -176,7 +176,30 @@ const settingsController = {
         settingsController.set('logo', baseImgPath)
         res.sendStatus(200)
       })
+  },
+
+  setFallbackImage (req, res) {
+    if (!req.file) {
+      settingsController.set('fallbackImage', false)
+      return res.status(200)
+    }
+
+    const uploadedPath = path.join(req.file.destination, req.file.filename)
+    const baseImgPath = path.resolve(config.upload_path, 'fallbackImage.png')
+
+    // convert and resize to png
+    return sharp(uploadedPath)
+      .resize(600)
+      .png({ quality: 99 })
+      .toFile(baseImgPath, (err) => {
+        if (err) {
+          log.error('[FALLBACK IMAGE] ' + err)
+        }
+        settingsController.set('fallbackImage', baseImgPath)
+        res.sendStatus(200)
+      })
   }
+
 }
 
 module.exports = settingsController
diff --git a/server/api/index.js b/server/api/index.js
index 21ccceb4..a0946772 100644
--- a/server/api/index.js
+++ b/server/api/index.js
@@ -141,6 +141,7 @@ if (config.status !== 'READY') {
   api.post('/settings', isAdmin, settingsController.setRequest)
   api.get('/settings', isAdmin, settingsController.getAll)
   api.post('/settings/logo', isAdmin, multer({ dest: config.upload_path }).single('logo'), settingsController.setLogo)
+  api.post('/settings/fallbackImage', isAdmin, multer({ dest: config.upload_path }).single('fallbackImage'), settingsController.setFallbackImage)
   api.post('/settings/smtp', isAdmin, settingsController.testSMTP)
   api.get('/settings/smtp', isAdmin, settingsController.getSMTPSettings)
 
diff --git a/server/helpers.js b/server/helpers.js
index 113c92ee..639dbe6b 100644
--- a/server/helpers.js
+++ b/server/helpers.js
@@ -22,7 +22,6 @@ const { JSDOM } = require('jsdom')
 const { window } = new JSDOM('<!DOCTYPE html>')
 const domPurify = DOMPurify(window)
 const url = require('url')
-const locales = require('../locales')
 
 domPurify.addHook('beforeSanitizeElements', node => {
   if (node.hasAttribute && node.hasAttribute('href')) {
@@ -108,10 +107,14 @@ module.exports = {
         }
       })
     })
-    router.use('/noimg.svg', express.static('./static/noimg.svg'))
+
+    router.use('/fallbackimage.png', (req, res, next) => {
+      const fallbackImagePath =  settingsController.settings.fallbackImage || './static/noimg.svg'
+      return express.static(fallbackImagePath)(req, res, next)      
+    })
 
     router.use('/logo.png', (req, res, next) => {
-      const logoPath = res.locals.settings.logo || './static/gancio'
+      const logoPath = settingsController.settings.logo || './static/gancio'
       return express.static(logoPath + '.png')(req, res, next)
     })
 
diff --git a/static/gancio-events.es.js b/static/gancio-events.es.js
index 35d91346..1f9dbe21 100644
--- a/static/gancio-events.es.js
+++ b/static/gancio-events.es.js
@@ -313,13 +313,13 @@ function Le(t) {
   let e, i, n;
   return {
     c() {
-      e = g("img"), a(e, "style", "aspect-ratio=1.7778;"), a(e, "alt", i = t[12].title), G(e.src, n = t[0] + "/noimg.svg") || a(e, "src", n), a(e, "loading", "lazy");
+      e = g("img"), a(e, "style", "aspect-ratio=1.7778;"), a(e, "alt", i = t[12].title), G(e.src, n = t[0] + "/fallbackimage.png") || a(e, "src", n), a(e, "loading", "lazy");
     },
     m(l, o) {
       v(l, e, o);
     },
     p(l, o) {
-      o & 32 && i !== (i = l[12].title) && a(e, "alt", i), o & 1 && !G(e.src, n = l[0] + "/noimg.svg") && a(e, "src", n);
+      o & 32 && i !== (i = l[12].title) && a(e, "alt", i), o & 1 && !G(e.src, n = l[0] + "/fallbackimage.png") && a(e, "src", n);
     },
     d(l) {
       l && x(e);
diff --git a/webcomponents/src/GancioEvents.svelte b/webcomponents/src/GancioEvents.svelte
index 240ca5d9..fdcd778a 100644
--- a/webcomponents/src/GancioEvents.svelte
+++ b/webcomponents/src/GancioEvents.svelte
@@ -98,7 +98,7 @@
               <img
                 style="aspect-ratio=1.7778;"
                 alt={event.title}
-                src={baseurl + '/noimg.svg'}
+                src={baseurl + '/fallbackimage.png'}
                 loading="lazy"
               />
             {/if}
diff --git a/wp-plugin/js/gancio-events.es.js b/wp-plugin/js/gancio-events.es.js
index 35d91346..1f9dbe21 100644
--- a/wp-plugin/js/gancio-events.es.js
+++ b/wp-plugin/js/gancio-events.es.js
@@ -313,13 +313,13 @@ function Le(t) {
   let e, i, n;
   return {
     c() {
-      e = g("img"), a(e, "style", "aspect-ratio=1.7778;"), a(e, "alt", i = t[12].title), G(e.src, n = t[0] + "/noimg.svg") || a(e, "src", n), a(e, "loading", "lazy");
+      e = g("img"), a(e, "style", "aspect-ratio=1.7778;"), a(e, "alt", i = t[12].title), G(e.src, n = t[0] + "/fallbackimage.png") || a(e, "src", n), a(e, "loading", "lazy");
     },
     m(l, o) {
       v(l, e, o);
     },
     p(l, o) {
-      o & 32 && i !== (i = l[12].title) && a(e, "alt", i), o & 1 && !G(e.src, n = l[0] + "/noimg.svg") && a(e, "src", n);
+      o & 32 && i !== (i = l[12].title) && a(e, "alt", i), o & 1 && !G(e.src, n = l[0] + "/fallbackimage.png") && a(e, "src", n);
     },
     d(l) {
       l && x(e);