Skip to content

Commit 2c1a1c6

Browse files
authored
Merge pull request #353 from vuejs-jp/enhance/add-cocktail-bash-image
add cocktail-bash image
2 parents 5873961 + cf8ad67 commit 2c1a1c6

File tree

6 files changed

+21
-16
lines changed

6 files changed

+21
-16
lines changed

apps/web/app/components/EventPageSection.vue

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ const { panelEventPanelers } = props.data as Panelers
2727
<EventCard id="welcome-vuejs-community" title="welcome-vuejs-community">
2828
<PanelerList :panelers="panelEventPanelers.list['welcome-vuejs-community']" />
2929
</EventCard>
30-
<EventCard title="vuejs-handson">
31-
<EventMultipleAssets />
30+
<EventCard id="handson" title="vuejs-handson">
31+
<EventMultipleAssets :title-list="['vuejs-handson', 'vuejs-handson']" :img-height="256" />
3232
</EventCard>
3333
<div class="event-body-column column-2">
3434
<EventCard title="creative-wall" font-class="title-2" padding-class="content-2">
@@ -40,9 +40,11 @@ const { panelEventPanelers } = props.data as Panelers
4040
<EventCard title="tattoo-space" font-class="title-2" padding-class="content-2">
4141
<EventAsset title="tattoo-space" :margin-top="16" />
4242
</EventCard>
43-
<EventCard title="cocktail-bash" font-class="title-2" padding-class="content-2" />
4443
<EventCard title="sponsor-booth-fotolary" font-class="title-2" padding-class="content-2" />
4544
</div>
45+
<EventCard id="cocktail-bash" title="cocktail-bash">
46+
<EventMultipleAssets :title-list="['cocktail-bash']" />
47+
</EventCard>
4648
</div>
4749
</div>
4850
</template>

apps/web/app/components/event/EventAsset.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import type { Event } from '@vuejs-jp/model'
33
44
interface EventAssetProps {
5-
title: Extract<Event, 'creative-wall' | 'free-drinks-and-snacks' | 'tattoo-space'>
5+
title: Extract<Event, 'creative-wall' | 'free-drinks-and-snacks' | 'tattoo-space' | 'cocktail-bash'>
66
marginTop?: number
77
}
88

apps/web/app/components/event/EventMultipleAssets.vue

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,21 @@
22
import type { Event } from '@vuejs-jp/model'
33
44
interface EventMultipleAssetsProps {
5-
title?: Extract<Event, 'vuejs-handson'>
5+
titleList: Extract<Event, 'vuejs-handson' | 'cocktail-bash'>[]
6+
imgHeight?: number
67
}
78
8-
const props = withDefaults(defineProps<EventMultipleAssetsProps>(), {
9-
title: 'vuejs-handson',
10-
})
9+
const props = defineProps<EventMultipleAssetsProps>()
1110
</script>
1211

1312
<template>
14-
<div class="eventcard-images">
15-
<img :src="`/event/${title}-1.png`" alt="" />
16-
<img :src="`/event/${title}-2.png`" alt="" />
13+
<div
14+
class="eventcard-images"
15+
:style="{
16+
'--head-img-height': `${imgHeight}px`,
17+
}"
18+
>
19+
<img v-for="(title, key) in titleList" :key :src="`/event/${title}-${key + 1}.png`" alt="" />
1720
</div>
1821
</template>
1922

@@ -32,8 +35,6 @@ const props = withDefaults(defineProps<EventMultipleAssetsProps>(), {
3235
}
3336
3437
.eventcard-images ::v-deep(img) {
35-
--head-img-height: 256px;
36-
3738
padding: 0;
3839
margin: 0 auto;
3940
height: var(--head-img-height);
Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
To further liven up Vue Fes Japan, we are excited to introduce our original cocktails this time! Inspired by Vue.js, as well as Pinia and Vite, these are special cocktails exclusively available at Vue Fes Japan. We've also prepared non-alcoholic versions so that minors and those who do not consume alcohol can enjoy them too. Please savor a drink in commemoration of your visit!
1+
To make Vue Fes Japan even more exciting, we’re thrilled to introduce our original cocktails! These special drinks are inspired by Vue.js, as well as Pinia and Vite, and can only be enjoyed at Vue Fes Japan. We also have non-alcoholic cocktails available for those underage or who prefer not to drink alcohol. Be sure to treat yourself to a drink as a memorable keepsake from your visit!
22

3-
*Original cocktails will be available only at the after-party.
4-
*Limited quantities available for each variety.
3+
*Please note that the original cocktails will only be available at the after-party.
4+
5+
*Quantities are limited for each drink.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
Vue Fes Japan をより盛り上げるべく、満を持して今回はオリジナルカクテルを用意しました!Vue.js はもちろん、Pinia や Vite などをイメージした、Vue Fes Japan でしか飲むことができない特別なカクテルです。未成年の方やアルコールが飲めない方にもお楽しみいただけるよう、ノンアルコールカクテルも用意しています。来場の記念に一杯、是非ご堪能ください!
22

33
※オリジナルカクテルのご提供は、アフターパーティーのみとなります。
4+
45
※各種数量限定でのご提供となります。
41.6 KB
Loading

0 commit comments

Comments
 (0)