Merge pull request 'Update dependency jsonwebtoken to v9.0.3' (#3) from renovate/jsonwebtoken-9.x-lockfile into main

Reviewed-on: #3

babel.config.js

@@ -2,4 +2,4 @@ module.exports = {
   presets: [
     '@vue/cli-plugin-babel/preset'
   ]
-}
+};

config/config.json

@@ -1,21 +1,21 @@
 {
   "development": {
-    "username": "miriam_user",
+    "username": "miriamgemeinde",
-    "password": "qTCTTWwpEwy3vPDU",
+    "password": "hitomisan",
     "database": "miriamgemeinde",
-    "host": "tsschulz.de",
+    "host": "localhost",
     "dialect": "mysql"
   },
   "test": {
     "username": "miriam_user",
-    "password": "qTCTTWwpEwy3vPDU",
+    "password": "hitomisan",
     "database": "miriamgemeinde",
     "host": "tsschulz.de",
     "dialect": "mysql"
   },
   "production": {
     "username": "miriam_user",
-    "password": "qTCTTWwpEwy3vPDU",
+    "password": "hitomisan",
     "database": "miriamgemeinde",
     "host": "tsschulz.de",
     "dialect": "mysql"

package.json

@@ -26,7 +26,7 @@
     "@tiptap/extension-underline": "^2.4.0",
     "@tiptap/starter-kit": "^2.4.0",
     "@tiptap/vue-3": "^2.4.0",
-    "@vue/cli": "^5.0.8",
+    "@vue/cli": "^4.2.2",
     "axios": "^1.7.2",
     "bcryptjs": "^2.4.3",
     "body-parser": "^1.20.2",

renovate.json

@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:recommended"
+  ]
+}

src/axios.js

@@ -2,20 +2,11 @@ import axios from 'axios';
 import store from './store';
 import router from './router';
 
-// Basis-URL für das Backend ermitteln
+// Einheitliche Basis-URL:
-let baseURL = process.env.VUE_APP_BACKEND_URL || '/api';
+// - immer relativ zur aktuellen Origin
-
+// - kein absoluter http/https-Host → verhindert Mixed-Content-Probleme
-// Mixed-Content vermeiden: wenn die Seite über HTTPS läuft,
+axios.defaults.baseURL = '/api';
-// aber die Konfiguration "http://" verwendet, auf "https://" umschalten.
+console.log('Axios baseURL:', axios.defaults.baseURL);
-if (typeof window !== 'undefined') {
-  const isHttps = window.location.protocol === 'https:';
-  if (isHttps && baseURL.startsWith('http://')) {
-    baseURL = baseURL.replace(/^http:/, 'https:');
-  }
-}
-
-axios.defaults.baseURL = baseURL;
-console.log('Axios baseURL:', baseURL);
 
 axios.interceptors.request.use(
   config => {

src/components/WorshipRender.vue

@@ -11,22 +11,35 @@
                     <div v-if="worship.neighborInvitation" class="neighborhood-invitation">Einladung zum Gottesdienst im
                         Nachbarschaftsraum:</div>
                     <h3>
-                        <span :class="worship.highlightTime ? 'highlight-time' : ''">{{ formatTime(worship.time)
+                        <span
-                            }}</span>&nbsp;-&nbsp;
+                          :class="worship.highlightTime ? 'highlight-time' : ''"
-                        {{ worship.title ? worship.title : `Gottesdienst in ${worship.eventPlace.name}` }}
+                        >{{ formatTime(worship.time) }}</span>&nbsp;-&nbsp;
+                        {{
+                          worship.title
+                            ? worship.title
+                            : (worship.eventPlace && worship.eventPlace.name
+                                ? `Gottesdienst in ${worship.eventPlace.name}`
+                                : 'Gottesdienst')
+                        }}
                     </h3>
                     <div v-if="worship.organizer">Gestaltung: {{ worship.organizer }}</div>
                     <div v-if="worship.sacristanService" class="internal-information">Küsterdienst: {{ worship.sacristanService }}</div>
                     <div v-if="worship.collection">Kollekte: {{ worship.collection }}</div>
                     <div v-if="worship.organPlaying" class="internal-information">Orgelspiel: {{ worship.organPlaying }}</div>
                     <div v-if="worship.address">{{ worship.address }}</div>
-                    <div v-if="!worship.address && worship.eventPlace.id && worship.eventPlace.id">
+                    <div
-                        Adresse: {{ worship.eventPlace.name }}, {{ worship.eventPlace.street }}, {{
+                      v-if="!worship.address && worship.eventPlace && worship.eventPlace.id"
-                        worship.eventPlace.city }}
+                    >
+                        Adresse: {{ worship.eventPlace.name }}, {{ worship.eventPlace.street }}, {{ worship.eventPlace.city }}
                     </div>
-                    <div v-if="worship.selfInformation" class="selfinformation">Bitte informieren Sie sich auch auf den
+                    <div v-if="worship.selfInformation" class="selfinformation">
-                        <a v-if="worship.eventPlace.website" :href="worship.eventPlace.website" target="_blank">Internetseiten dieser Gemeinde!</a><span
+                        Bitte informieren Sie sich auch auf den
-                            v-else>Internetseiten dieser Gemeinde!</span>
+                        <a
+                          v-if="worship.eventPlace && worship.eventPlace.website"
+                          :href="worship.eventPlace.website"
+                          target="_blank"
+                        >Internetseiten dieser Gemeinde!</a>
+                        <span v-else>Internetseiten dieser Gemeinde!</span>
                     </div>
                 </td>
             </tr>

src/router.js

@@ -45,8 +45,13 @@ const router = createRouter({
   routes: []
 });
 
+// Verhindert endlose Wiederholungen von fehlgeschlagenen Menü-Ladeversuchen
+let menuDataInitialized = false;
+
 router.beforeEach(async (to, from, next) => {
-  if (!store.state.menuData.length) {
+  if (!menuDataInitialized) {
+    menuDataInitialized = true;
+
     await store.dispatch('loadMenuData');
     const routes = generateRoutesFromMenu(store.state.menuData);
     routes.forEach(route => router.addRoute(route));

src/store/index.js

@@ -1,5 +1,5 @@
 import { createStore } from 'vuex';
-import axios from 'axios';
+import axios from '../axios';
 import router from '../router';
 
 let user = [];