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.
This commit is contained in:
@@ -1,9 +1,9 @@
|
|||||||
{
|
{
|
||||||
"development": {
|
"development": {
|
||||||
"username": "miriam_user",
|
"username": "miriamgemeinde",
|
||||||
"password": "hitomisan",
|
"password": "hitomisan",
|
||||||
"database": "miriamgemeinde",
|
"database": "miriamgemeinde",
|
||||||
"host": "tsschulz.de",
|
"host": "localhost",
|
||||||
"dialect": "mysql"
|
"dialect": "mysql"
|
||||||
},
|
},
|
||||||
"test": {
|
"test": {
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
const { Sequelize } = require('sequelize');
|
const { Sequelize } = require('sequelize');
|
||||||
|
|
||||||
const sequelize = new Sequelize('miriamgemeinde', 'miriam_user', 'hitomisan', {
|
const sequelize = new Sequelize('miriamgemeinde', 'miriamgemeinde', 'hitomisan', {
|
||||||
host: 'tsschulz.de',
|
host: 'localhost',
|
||||||
dialect: 'mysql',
|
dialect: 'mysql',
|
||||||
retry: {
|
retry: {
|
||||||
match: [
|
match: [
|
||||||
|
|||||||
@@ -11,22 +11,35 @@
|
|||||||
<div v-if="worship.neighborInvitation" class="neighborhood-invitation">Einladung zum Gottesdienst im
|
<div v-if="worship.neighborInvitation" class="neighborhood-invitation">Einladung zum Gottesdienst im
|
||||||
Nachbarschaftsraum:</div>
|
Nachbarschaftsraum:</div>
|
||||||
<h3>
|
<h3>
|
||||||
<span :class="worship.highlightTime ? 'highlight-time' : ''">{{ formatTime(worship.time)
|
<span
|
||||||
}}</span> -
|
:class="worship.highlightTime ? 'highlight-time' : ''"
|
||||||
{{ worship.title ? worship.title : `Gottesdienst in ${worship.eventPlace.name}` }}
|
>{{ formatTime(worship.time) }}</span> -
|
||||||
|
{{
|
||||||
|
worship.title
|
||||||
|
? worship.title
|
||||||
|
: (worship.eventPlace && worship.eventPlace.name
|
||||||
|
? `Gottesdienst in ${worship.eventPlace.name}`
|
||||||
|
: 'Gottesdienst')
|
||||||
|
}}
|
||||||
</h3>
|
</h3>
|
||||||
<div v-if="worship.organizer">Gestaltung: {{ worship.organizer }}</div>
|
<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.sacristanService" class="internal-information">Küsterdienst: {{ worship.sacristanService }}</div>
|
||||||
<div v-if="worship.collection">Kollekte: {{ worship.collection }}</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.organPlaying" class="internal-information">Orgelspiel: {{ worship.organPlaying }}</div>
|
||||||
<div v-if="worship.address">{{ worship.address }}</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>
|
||||||
<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>
|
</div>
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|||||||
Reference in New Issue
Block a user