Skip to content

タイムテーブルを更新 #356

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 26, 2024
Merged

タイムテーブルを更新 #356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions apps/web/app/components/time-table/TimeTableCard.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,9 @@ const { range } = useRange()
>
{{ currentLocale === 'en' ? row.subTitle_en : row.subTitle }}
</component>
<p v-if="row.description" class="description">
{{ currentLocale === 'en' ? row.description_en : row.description }}
</p>
</div>
<div
v-for="session in row.sessions"
Expand Down Expand Up @@ -144,6 +147,12 @@ const { range } = useRange()
color: var(--color-vue-blue);
text-decoration: none;
}
.description {
margin-top: 8px;
font-size: 13px;
line-height: 1.4;
color: var(--color-vue-blue);
}
._link:hover {
opacity: 0.6;
transition: opacity 0.2s;
Expand Down
9 changes: 9 additions & 0 deletions apps/web/app/components/time-table/TimeTableRow.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,9 @@ const { range } = useRange()
>
{{ currentLocale === 'en' ? row.subTitle_en : row.subTitle }}
</component>
<p v-if="row.description" class="description">
{{ currentLocale === 'en' ? row.description_en : row.description }}
</p>
</div>
<div
v-for="session in row.sessions"
Expand Down Expand Up @@ -111,6 +114,12 @@ const { range } = useRange()
color: var(--color-vue-blue);
text-decoration: none;
}
.description {
margin-top: 12px;
font-size: 14px;
line-height: 1.4;
color: var(--color-vue-blue);
}
._link:hover {
opacity: 0.6;
transition: opacity 0.2s;
Expand Down
46 changes: 10 additions & 36 deletions apps/web/app/utils/data/timetable_pc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,12 @@
"noDisplayTime": true
},
{
"title": "サテライト",
"title_en": "Satellite",
"subTitle": "サテライト",
"subTitle_en": "Satellite",
"description": "メドピアトラックで行われるプログラムの映像と音声が同時中継されます。サテライトではキーノートは英語のみとなります。",
"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.",
"colspan": 1,
"rowspan": 1,
"rowspan": 5,
"track": "mntsq"
},
{
Expand All @@ -58,13 +60,6 @@
"isOpeningOrKeyNote": true,
"isTranslation": true,
"noDisplayTime": true
},
{
"title": "サテライト",
"title_en": "Satellite",
"colspan": 1,
"rowspan": 1,
"track": "mntsq"
}
]
},
Expand All @@ -76,16 +71,9 @@
"subTitle_en": "Platinum Sponsor Session",
"colspan": 1,
"rowspan": 1,
"sessions": [],
"sessions": [{ "id": "74fa37c4-73ce-4657-96b9-6ea0c168f52f" }],
"track": "medpeer",
"isSponsor": true
},
{
"title": "サテライト",
"title_en": "Satellite",
"colspan": 1,
"rowspan": 1,
"track": "mntsq"
}
]
},
Expand All @@ -97,16 +85,9 @@
"subTitle_en": "Platinum Sponsor Session",
"colspan": 1,
"rowspan": 1,
"sessions": [],
"sessions": [{ "id": "7c240d6f-046d-4227-9960-2a77f6b03d5a" }],
"track": "medpeer",
"isSponsor": true
},
{
"title": "サテライト",
"title_en": "Satellite",
"colspan": 1,
"rowspan": 1,
"track": "mntsq"
}
]
},
Expand All @@ -118,16 +99,9 @@
"subTitle_en": "Platinum Sponsor Session",
"colspan": 1,
"rowspan": 1,
"sessions": [],
"sessions": [{ "id": "7ed3097b-a3fd-4dac-9126-903518c5cb0e" }],
"track": "medpeer",
"isSponsor": true
},
{
"title": "サテライト",
"title_en": "Satellite",
"colspan": 1,
"rowspan": 1,
"track": "mntsq"
}
]
},
Expand All @@ -150,7 +124,7 @@
"subTitle_en": "Special Lunch Session",
"colspan": 1,
"rowspan": 2,
"sessions": [],
"sessions": [{ "id": "6b2f871f-e4ef-44c6-a409-9acb52843edf" }],
"track": "medpeer"
},
{
Expand All @@ -166,7 +140,7 @@
"subTitle_en": "Lunch Session",
"colspan": 1,
"rowspan": 2,
"sessions": [],
"sessions": [{ "id": "0546afde-7a50-4c5f-80ec-faec2eee7211" }],
"track": "kickflow"
}
]
Expand Down
28 changes: 19 additions & 9 deletions apps/web/app/utils/data/timetable_sp.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,10 @@
"noDisplayTime": true
},
{
"title": "サテライト",
"title_en": "Satellite",
"subTitle": "サテライト",
"subTitle_en": "Satellite",
"description": "メドピアトラックで行われるプログラムの映像と音声が同時中継されます。サテライトではキーノートは英語のみとなります。",
"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.",
"track": "mntsq"
}
]
Expand All @@ -42,8 +44,10 @@
"noDisplayTime": true
},
{
"title": "サテライト",
"title_en": "Satellite",
"subTitle": "サテライト",
"subTitle_en": "Satellite",
"description": "メドピアトラックで行われるプログラムの映像と音声が同時中継されます。サテライトではキーノートは英語のみとなります。",
"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.",
"track": "mntsq"
}
]
Expand All @@ -54,13 +58,19 @@
{
"subTitle": "プラチナスポンサー\nセッション",
"subTitle_en": "Platinum Sponsor Session",
"sessions": [],
"sessions": [
{ "id": "74fa37c4-73ce-4657-96b9-6ea0c168f52f" },
{ "id": "7c240d6f-046d-4227-9960-2a77f6b03d5a" },
{ "id": "7ed3097b-a3fd-4dac-9126-903518c5cb0e" }
],
"track": "medpeer",
"isSponsor": true
},
{
"title": "サテライト",
"title_en": "Satellite",
"subTitle": "サテライト",
"subTitle_en": "Satellite",
"description": "メドピアトラックで行われるプログラムの映像と音声が同時中継されます。サテライトではキーノートは英語のみとなります。",
"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.",
"track": "mntsq"
}
]
Expand All @@ -76,7 +86,7 @@
{
"subTitle": "スペシャル\nランチセッション",
"subTitle_en": "Special Lunch Session",
"sessions": [],
"sessions": [{ "id": "6b2f871f-e4ef-44c6-a409-9acb52843edf" }],
"track": "medpeer"
},
{
Expand All @@ -88,7 +98,7 @@
{
"subTitle": "ランチセッション",
"subTitle_en": "Lunch Session",
"sessions": [],
"sessions": [{ "id": "0546afde-7a50-4c5f-80ec-faec2eee7211" }],
"track": "kickflow"
}
]
Expand Down
2 changes: 2 additions & 0 deletions packages/model/lib/timeTable.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ export type Row = {
title_en?: string
subTitle?: string
subTitle_en?: string
description?: string
description_en?: string
colspan: number
rowspan: number
sessions?: Speaker[]
Expand Down
2 changes: 2 additions & 0 deletions packages/model/lib/timetable.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ export type Row = {
title_en?: string
subTitle?: string
subTitle_en?: string
description?: string
description_en?: string
colspan: number
rowspan: number
sessions?: Speaker[]
Expand Down