Skip to content

Commit bac6df1

Browse files
jiyuujinjiyuujin
authored
Merge pull request #356 from vuejs-jp/feat/update-timetable
タイムテーブルを更新
2 parents b3b2f19 + ea95451 commit bac6df1

File tree

6 files changed

+51
-45
lines changed

6 files changed

+51
-45
lines changed

‎apps/web/app/components/time-table/TimeTableCard.vue

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,9 @@ const { range } = useRange()
6161
>
6262
{{ currentLocale === 'en' ? row.subTitle_en : row.subTitle }}
6363
</component>
64+
<p v-if="row.description" class="description">
65+
{{ currentLocale === 'en' ? row.description_en : row.description }}
66+
</p>
6467
</div>
6568
<div
6669
v-for="session in row.sessions"
@@ -144,6 +147,12 @@ const { range } = useRange()
144147
color: var(--color-vue-blue);
145148
text-decoration: none;
146149
}
150+
.description {
151+
margin-top: 8px;
152+
font-size: 13px;
153+
line-height: 1.4;
154+
color: var(--color-vue-blue);
155+
}
147156
._link:hover {
148157
opacity: 0.6;
149158
transition: opacity 0.2s;

‎apps/web/app/components/time-table/TimeTableRow.vue

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,9 @@ const { range } = useRange()
5252
>
5353
{{ currentLocale === 'en' ? row.subTitle_en : row.subTitle }}
5454
</component>
55+
<p v-if="row.description" class="description">
56+
{{ currentLocale === 'en' ? row.description_en : row.description }}
57+
</p>
5558
</div>
5659
<div
5760
v-for="session in row.sessions"
@@ -111,6 +114,12 @@ const { range } = useRange()
111114
color: var(--color-vue-blue);
112115
text-decoration: none;
113116
}
117+
.description {
118+
margin-top: 12px;
119+
font-size: 14px;
120+
line-height: 1.4;
121+
color: var(--color-vue-blue);
122+
}
114123
._link:hover {
115124
opacity: 0.6;
116125
transition: opacity 0.2s;

‎apps/web/app/utils/data/timetable_pc.json

Lines changed: 10 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,12 @@
2929
"noDisplayTime": true
3030
},
3131
{
32-
"title": "サテライト",
33-
"title_en": "Satellite",
32+
"subTitle": "サテライト",
33+
"subTitle_en": "Satellite",
34+
"description": "メドピアトラックで行われるプログラムの映像と音声が同時中継されます。サテライトではキーノートは英語のみとなります。",
35+
"description_en": "The video and audio of the program held at the MedPeer truck will be broadcast live. At the satellite venue, the keynote will be in English only.",
3436
"colspan": 1,
35-
"rowspan": 1,
37+
"rowspan": 5,
3638
"track": "mntsq"
3739
},
3840
{
@@ -58,13 +60,6 @@
5860
"isOpeningOrKeyNote": true,
5961
"isTranslation": true,
6062
"noDisplayTime": true
61-
},
62-
{
63-
"title": "サテライト",
64-
"title_en": "Satellite",
65-
"colspan": 1,
66-
"rowspan": 1,
67-
"track": "mntsq"
6863
}
6964
]
7065
},
@@ -76,16 +71,9 @@
7671
"subTitle_en": "Platinum Sponsor Session",
7772
"colspan": 1,
7873
"rowspan": 1,
79-
"sessions": [],
74+
"sessions": [{ "id": "74fa37c4-73ce-4657-96b9-6ea0c168f52f" }],
8075
"track": "medpeer",
8176
"isSponsor": true
82-
},
83-
{
84-
"title": "サテライト",
85-
"title_en": "Satellite",
86-
"colspan": 1,
87-
"rowspan": 1,
88-
"track": "mntsq"
8977
}
9078
]
9179
},
@@ -97,16 +85,9 @@
9785
"subTitle_en": "Platinum Sponsor Session",
9886
"colspan": 1,
9987
"rowspan": 1,
100-
"sessions": [],
88+
"sessions": [{ "id": "7c240d6f-046d-4227-9960-2a77f6b03d5a" }],
10189
"track": "medpeer",
10290
"isSponsor": true
103-
},
104-
{
105-
"title": "サテライト",
106-
"title_en": "Satellite",
107-
"colspan": 1,
108-
"rowspan": 1,
109-
"track": "mntsq"
11091
}
11192
]
11293
},
@@ -118,16 +99,9 @@
11899
"subTitle_en": "Platinum Sponsor Session",
119100
"colspan": 1,
120101
"rowspan": 1,
121-
"sessions": [],
102+
"sessions": [{ "id": "7ed3097b-a3fd-4dac-9126-903518c5cb0e" }],
122103
"track": "medpeer",
123104
"isSponsor": true
124-
},
125-
{
126-
"title": "サテライト",
127-
"title_en": "Satellite",
128-
"colspan": 1,
129-
"rowspan": 1,
130-
"track": "mntsq"
131105
}
132106
]
133107
},
@@ -150,7 +124,7 @@
150124
"subTitle_en": "Special Lunch Session",
151125
"colspan": 1,
152126
"rowspan": 2,
153-
"sessions": [],
127+
"sessions": [{ "id": "6b2f871f-e4ef-44c6-a409-9acb52843edf" }],
154128
"track": "medpeer"
155129
},
156130
{
@@ -166,7 +140,7 @@
166140
"subTitle_en": "Lunch Session",
167141
"colspan": 1,
168142
"rowspan": 2,
169-
"sessions": [],
143+
"sessions": [{ "id": "0546afde-7a50-4c5f-80ec-faec2eee7211" }],
170144
"track": "kickflow"
171145
}
172146
]

‎apps/web/app/utils/data/timetable_sp.json

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,10 @@
2525
"noDisplayTime": true
2626
},
2727
{
28-
"title": "サテライト",
29-
"title_en": "Satellite",
28+
"subTitle": "サテライト",
29+
"subTitle_en": "Satellite",
30+
"description": "メドピアトラックで行われるプログラムの映像と音声が同時中継されます。サテライトではキーノートは英語のみとなります。",
31+
"description_en": "The video and audio of the program held at the MedPeer truck will be broadcast live. At the satellite venue, the keynote will be in English only.",
3032
"track": "mntsq"
3133
}
3234
]
@@ -42,8 +44,10 @@
4244
"noDisplayTime": true
4345
},
4446
{
45-
"title": "サテライト",
46-
"title_en": "Satellite",
47+
"subTitle": "サテライト",
48+
"subTitle_en": "Satellite",
49+
"description": "メドピアトラックで行われるプログラムの映像と音声が同時中継されます。サテライトではキーノートは英語のみとなります。",
50+
"description_en": "The video and audio of the program held at the MedPeer truck will be broadcast live. At the satellite venue, the keynote will be in English only.",
4751
"track": "mntsq"
4852
}
4953
]
@@ -54,13 +58,19 @@
5458
{
5559
"subTitle": "プラチナスポンサー\nセッション",
5660
"subTitle_en": "Platinum Sponsor Session",
57-
"sessions": [],
61+
"sessions": [
62+
{ "id": "74fa37c4-73ce-4657-96b9-6ea0c168f52f" },
63+
{ "id": "7c240d6f-046d-4227-9960-2a77f6b03d5a" },
64+
{ "id": "7ed3097b-a3fd-4dac-9126-903518c5cb0e" }
65+
],
5866
"track": "medpeer",
5967
"isSponsor": true
6068
},
6169
{
62-
"title": "サテライト",
63-
"title_en": "Satellite",
70+
"subTitle": "サテライト",
71+
"subTitle_en": "Satellite",
72+
"description": "メドピアトラックで行われるプログラムの映像と音声が同時中継されます。サテライトではキーノートは英語のみとなります。",
73+
"description_en": "The video and audio of the program held at the MedPeer truck will be broadcast live. At the satellite venue, the keynote will be in English only.",
6474
"track": "mntsq"
6575
}
6676
]
@@ -76,7 +86,7 @@
7686
{
7787
"subTitle": "スペシャル\nランチセッション",
7888
"subTitle_en": "Special Lunch Session",
79-
"sessions": [],
89+
"sessions": [{ "id": "6b2f871f-e4ef-44c6-a409-9acb52843edf" }],
8090
"track": "medpeer"
8191
},
8292
{
@@ -88,7 +98,7 @@
8898
{
8999
"subTitle": "ランチセッション",
90100
"subTitle_en": "Lunch Session",
91-
"sessions": [],
101+
"sessions": [{ "id": "0546afde-7a50-4c5f-80ec-faec2eee7211" }],
92102
"track": "kickflow"
93103
}
94104
]

‎packages/model/lib/timeTable.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ export type Row = {
1212
title_en?: string
1313
subTitle?: string
1414
subTitle_en?: string
15+
description?: string
16+
description_en?: string
1517
colspan: number
1618
rowspan: number
1719
sessions?: Speaker[]

‎packages/model/lib/timetable.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@ export type Row = {
1212
title_en?: string
1313
subTitle?: string
1414
subTitle_en?: string
15+
description?: string
16+
description_en?: string
1517
colspan: number
1618
rowspan: number
1719
sessions?: Speaker[]

0 commit comments

Comments
 (0)