fixes
Build And Push Image / docker (push) Successful in 1m35s Details

This commit is contained in:
Matt 2025-08-14 10:46:12 +02:00
parent 503d10f0ab
commit 983361114c
2 changed files with 36 additions and 18 deletions

View File

@ -36,10 +36,7 @@
<div class="d-flex align-center justify-space-between"> <div class="d-flex align-center justify-space-between">
<div v-if="event.is_paid === 'true'" class="d-flex align-center"> <div v-if="event.is_paid === 'true'" class="d-flex align-center">
<v-icon size="16" class="me-2">mdi-currency-eur</v-icon> <v-icon size="16" class="me-2">mdi-currency-eur</v-icon>
<span class="text-body-2"> <span class="text-body-2">{{ priceDisplay }}</span>
{{ memberPrice || nonMemberPrice }}
<span v-if="memberPrice && nonMemberPrice" class="text-caption">(Members)</span>
</span>
</div> </div>
<div v-if="event.max_attendees" class="d-flex align-center"> <div v-if="event.max_attendees" class="d-flex align-center">
@ -105,10 +102,7 @@
<div v-if="event.is_paid === 'true'" class="d-flex align-center"> <div v-if="event.is_paid === 'true'" class="d-flex align-center">
<v-icon size="small" class="me-1">mdi-currency-eur</v-icon> <v-icon size="small" class="me-1">mdi-currency-eur</v-icon>
<span class="text-body-2"> <span class="text-body-2">{{ priceDisplay }}</span>
{{ memberPrice || nonMemberPrice }}
<span v-if="memberPrice && nonMemberPrice">(Members)</span>
</span>
</div> </div>
<div v-if="event.max_attendees" class="d-flex align-center"> <div v-if="event.max_attendees" class="d-flex align-center">
@ -236,8 +230,29 @@ const iconColor = computed(() => {
return 'white'; return 'white';
}); });
const memberPrice = computed(() => props.event?.cost_members || '');
const nonMemberPrice = computed(() => props.event?.cost_non_members || ''); const nonMemberPrice = computed(() => props.event?.cost_non_members || '');
const priceDisplay = computed(() => {
if (!props.event || props.event.is_paid !== 'true') return '';
const memberCost = props.event.cost_members;
const nonMemberCost = props.event.cost_non_members;
if (memberCost && nonMemberCost) {
// Show both prices
return `${memberCost} (Members) | €${nonMemberCost} (Non-Members)`;
} else if (memberCost) {
// Only member price
return `${memberCost} (Members)`;
} else if (nonMemberCost) {
// Only non-member price
return `${nonMemberCost}`;
}
return '';
});
const formatEventDate = computed(() => { const formatEventDate = computed(() => {
if (!props.event) return ''; if (!props.event) return '';
@ -261,16 +276,6 @@ const formatEventDate = computed(() => {
return `${format(startDate, 'MMM d')} - ${format(endDate, 'MMM d')}`; return `${format(startDate, 'MMM d')} - ${format(endDate, 'MMM d')}`;
}); });
const memberPrice = computed(() => {
if (!props.event || props.event.is_paid !== 'true') return '';
if (props.event.cost_members && props.event.cost_non_members) {
return `${props.event.cost_members} (Members)`;
}
return `${props.event.cost_members || props.event.cost_non_members}`;
});
const capacityInfo = computed(() => { const capacityInfo = computed(() => {
if (!props.event?.max_attendees) return ''; if (!props.event?.max_attendees) return '';

View File

@ -100,6 +100,19 @@ export default defineNuxtConfig({
wasm: true wasm: true
} }
}, },
vite: {
optimizeDeps: {
exclude: ['minio', 'sharp']
},
build: {
rollupOptions: {
external: ['minio', 'sharp', 'fs', 'path', 'crypto', 'stream']
}
},
ssr: {
noExternal: []
}
},
runtimeConfig: { runtimeConfig: {
// Server-side configuration // Server-side configuration
keycloak: { keycloak: {