From c390228ed9bed63db330fecd4d1ebfca58c87df6 Mon Sep 17 00:00:00 2001 From: "Torsten Schulz (local)" Date: Sun, 23 Nov 2025 00:32:23 +0100 Subject: [PATCH] Update database configuration and improve WorshipRender component: Change database connection details to use 'miriamgemeinde' and 'localhost', and enhance conditional rendering in WorshipRender.vue for better handling of event place information. --- config/config.json | 4 ++-- config/database.js | 4 ++-- src/components/WorshipRender.vue | 31 ++++++++++++++++++++++--------- 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/config/config.json b/config/config.json index 20f591f..3274875 100644 --- a/config/config.json +++ b/config/config.json @@ -1,9 +1,9 @@ { "development": { - "username": "miriam_user", + "username": "miriamgemeinde", "password": "hitomisan", "database": "miriamgemeinde", - "host": "tsschulz.de", + "host": "localhost", "dialect": "mysql" }, "test": { diff --git a/config/database.js b/config/database.js index 9ba8592..cd914c2 100644 --- a/config/database.js +++ b/config/database.js @@ -1,7 +1,7 @@ const { Sequelize } = require('sequelize'); -const sequelize = new Sequelize('miriamgemeinde', 'miriam_user', 'hitomisan', { - host: 'tsschulz.de', +const sequelize = new Sequelize('miriamgemeinde', 'miriamgemeinde', 'hitomisan', { + host: 'localhost', dialect: 'mysql', retry: { match: [ diff --git a/src/components/WorshipRender.vue b/src/components/WorshipRender.vue index b0a99a9..6177d43 100644 --- a/src/components/WorshipRender.vue +++ b/src/components/WorshipRender.vue @@ -11,22 +11,35 @@
Einladung zum Gottesdienst im Nachbarschaftsraum:

- {{ formatTime(worship.time) - }} -  - {{ worship.title ? worship.title : `Gottesdienst in ${worship.eventPlace.name}` }} + {{ formatTime(worship.time) }} -  + {{ + worship.title + ? worship.title + : (worship.eventPlace && worship.eventPlace.name + ? `Gottesdienst in ${worship.eventPlace.name}` + : 'Gottesdienst') + }}

Gestaltung: {{ worship.organizer }}
Küsterdienst: {{ worship.sacristanService }}
Kollekte: {{ worship.collection }}
Orgelspiel: {{ worship.organPlaying }}
{{ worship.address }}
-
- Adresse: {{ worship.eventPlace.name }}, {{ worship.eventPlace.street }}, {{ - worship.eventPlace.city }} +
+ Adresse: {{ worship.eventPlace.name }}, {{ worship.eventPlace.street }}, {{ worship.eventPlace.city }}
-
Bitte informieren Sie sich auch auf den - Internetseiten dieser Gemeinde!Internetseiten dieser Gemeinde! +
+ Bitte informieren Sie sich auch auf den + Internetseiten dieser Gemeinde! + Internetseiten dieser Gemeinde!