From 0088f0d25c98fd38f31f908a9ec2e73e1ab96fd3 Mon Sep 17 00:00:00 2001
From: lesion <lesion@autistici.org>
Date: Tue, 29 Nov 2022 23:03:36 +0100
Subject: [PATCH] fix logo & fallbackimages reload

---
 components/admin/Theme.vue | 8 +++++---
 server/helpers.js          | 6 +++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/components/admin/Theme.vue b/components/admin/Theme.vue
index 6b65ffd4..1bc47c09 100644
--- a/components/admin/Theme.vue
+++ b/components/admin/Theme.vue
@@ -16,6 +16,7 @@ v-container
       :label="$t('admin.hide_calendar')")
 
   v-card-title {{$t('admin.default_images')}}
+  v-card-subtitle(v-html="$t('admin.default_images_help')")
   v-card-text
     v-row
       v-col(cols='4')
@@ -109,12 +110,13 @@ import { mdiDeleteForever, mdiRestore, mdiPlus, mdiChevronUp } from '@mdi/js'
 export default {
   name: 'Theme',
   data () {
+    const t = new Date().getMilliseconds()
     return {
       mdiDeleteForever, mdiRestore, mdiPlus, mdiChevronUp,
       valid: false,
-      logoKey: 0,
-      fallbackImageKey: 0,
-      headerImageKey: 0,
+      logoKey: t,
+      fallbackImageKey: t,
+      headerImageKey: t,
       link: { href: '', label: '' },
       linkModal: false
       // menu: [false, false, false, false]
diff --git a/server/helpers.js b/server/helpers.js
index cc145b54..c187e347 100644
--- a/server/helpers.js
+++ b/server/helpers.js
@@ -120,7 +120,7 @@ module.exports = {
 
     router.use('/fallbackimage.png', (req, res, next) => {
       const fallbackImagePath =  settingsController.settings.fallback_image || './static/noimg.svg'
-      return express.static(fallbackImagePath, { maxAge: '1d' })(req, res, next)
+      return express.static(fallbackImagePath)(req, res, next)
     })
 
     router.use('/headerimage.png', (req, res, next) => {
@@ -130,12 +130,12 @@ module.exports = {
 
     router.use('/logo.png', (req, res, next) => {
       const logoPath = settingsController.settings.logo || './static/gancio'
-      return express.static(logoPath + '.png', {maxAge: '1d'})(req, res, next)
+      return express.static(logoPath + '.png')(req, res, next)
     })
 
     router.use('/favicon.ico', (req, res, next) => {
       const faviconPath = res.locals.settings.logo ? res.locals.settings.logo + '.png' : './assets/favicon.ico'
-      return express.static(faviconPath, {maxAge: '1d'})(req, res, next)
+      return express.static(faviconPath)(req, res, next)
     })
 
     return router