Skip to content

Commit

Permalink
Merge pull request #57 from tokyorubykaigi12/terfno/unasuke
Browse files Browse the repository at this point in the history 
代走トークを追加します。
  • Loading branch information
@Terfno
Terfno authored Jan 17, 2025
2 parents 62f690f + 595e22a commit 88c30a8
Show file tree
Hide file tree
Showing 3 changed files with 66 additions and 41 deletions.
91 changes: 52 additions & 39 deletions src/components/schedule/Zenyasai.astro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,26 @@ import Talk from "./Talk.astro";
import MiniPanel from "../Layouts/MiniPanel.astro";
// imgs
import OkuramasafumiImage from "../staff/pics/okuramasafumi.jpg";
import ArrowUpRightFromSquare from '../icons/arrow-up-right-from-square.svg';
import ArrowUpRightFromSquare from "../icons/arrow-up-right-from-square.svg";
// talks
const talkEntries = await getCollection("talks");
talkEntries.filter((entry)=>entry.data.session.id === 1)[0].data.speaker.ImageSrc = OkuramasafumiImage.src;
const talks = talkEntries.filter((entry) => entry.data.session.id <= 10).map((entry)=>{
return {
session: entry.data.session,
speaker: entry.data.speaker,
};
});
talkEntries.filter(
(entry) => entry.data.session.id === 1
)[0].data.speaker.ImageSrc = OkuramasafumiImage.src;
const talks = talkEntries
.filter(
(entry) => entry.data.session.id <= 10 || entry.data.session.id === 24
)
.map((entry) => {
return {
session: entry.data.session,
speaker: entry.data.speaker,
};
});
---

<style>
.schedule {
padding: 24px 0;
Expand All @@ -26,7 +34,7 @@ const talks = talkEntries.filter((entry) => entry.data.session.id <= 10).map((en

.ann {
.ann-title {
h3{
h3 {
font-size: 20px;
font-weight: 600;
line-height: 30px;
Expand All @@ -48,7 +56,7 @@ const talks = talkEntries.filter((entry) => entry.data.session.id <= 10).map((en
text-decoration: none;
}

.ann-detail{
.ann-detail {
display: flex;
justify-content: center;
margin-top: 16px;
Expand All @@ -62,10 +70,10 @@ const talks = talkEntries.filter((entry) => entry.data.session.id <= 10).map((en
text-decoration: none;
}

border: 2px solid #AEAEB2;
border: 2px solid #aeaeb2;
padding: 16px 24px;
border-radius: 4px;
background: #FFFFFF;
background: #ffffff;

display: flex;
gap: 8px;
Expand All @@ -74,23 +82,23 @@ const talks = talkEntries.filter((entry) => entry.data.session.id <= 10).map((en
}
}

.timetable{
.timetable {
overflow-x: auto;
-webkit-overflow-scrolling: touch;

table thead:first-child tr:first-child th:first-child {
border-top-left-radius: 24px;
border-right: 1px solid #AEAEB2;
border-right: 1px solid #aeaeb2;
}
table thead:first-child tr:first-child th:last-child {
border-top-right-radius: 24px;
border-left: 1px solid #AEAEB2;
border-left: 1px solid #aeaeb2;
}

table tbody:first-child tr:first-child td:first-child {
border-top-left-radius: 24px;
border-top: none !important;
border-right: 1px solid #AEAEB2;
border-right: 1px solid #aeaeb2;
}
table tbody:first-child tr:first-child td:last-child {
border-top-right-radius: 24px;
Expand All @@ -101,7 +109,7 @@ const talks = talkEntries.filter((entry) => entry.data.session.id <= 10).map((en
width: 100%;
border-spacing: 0;
border-radius: 24px;
border: 1px solid #AEAEB2;
border: 1px solid #aeaeb2;

.tt-no-left-line {
border-left: none !important;
Expand All @@ -115,16 +123,16 @@ const talks = talkEntries.filter((entry) => entry.data.session.id <= 10).map((en
}

tbody tr td:first-child {
border-right: 1px solid #AEAEB2;
background-color: #F5F5F5;
border-right: 1px solid #aeaeb2;
background-color: #f5f5f5;
}

tbody tr td:nth-child(3) {
border-left: 1px solid #AEAEB2;
border-left: 1px solid #aeaeb2;
}

td {
border-top: 1px solid #AEAEB2;
border-top: 1px solid #aeaeb2;
padding: 24px;
}

Expand All @@ -141,15 +149,16 @@ const talks = talkEntries.filter((entry) => entry.data.session.id <= 10).map((en

.tt-4 {
color: #fff;
background: #DD451D;
background: #dd451d;
}

.tt-3 {
color: #fff;
background: #000;
}

.tt-time, .tt-timerange {
.tt-time,
.tt-timerange {
font-family: "Futura", "Jost", sans-serif;
font-size: 16px;
font-weight: 500;
Expand All @@ -167,7 +176,10 @@ const talks = talkEntries.filter((entry) => entry.data.session.id <= 10).map((en
text-align: left;
}

.tt-4, .tt-3, .tt-event, .tt-talk {
.tt-4,
.tt-3,
.tt-event,
.tt-talk {
width: 50%;
}
}
Expand All @@ -183,16 +195,17 @@ const talks = talkEntries.filter((entry) => entry.data.session.id <= 10).map((en
</div>
<div class="ann-body">
<p>
前夜祭には当日チケットを購入した方のみご参加いただけます。詳細は connpass をご確認ください。
前夜祭には当日チケットを購入した方のみご参加いただけます。詳細は
connpass をご確認ください。
</p>
<div class="ann-detail">
<div class="ann-button">
<a
href="https://connpass.com/event/339170/"
target="_blank"
rel="noreferrer"
>イベントページ(connpass)</a>
<img src={ArrowUpRightFromSquare.src} alt="link icon"/>
rel="noreferrer">イベントページ(connpass)</a
>
<img src={ArrowUpRightFromSquare.src} alt="link icon" />
</div>
</div>
</div>
Expand All @@ -205,7 +218,7 @@ const talks = talkEntries.filter((entry) => entry.data.session.id <= 10).map((en
<tr>
<td class="tt-time">16:00</td>
<td class="tt-event">
<Talk talks={talks} id={0}/>
<Talk talks={talks} id={0} />
</td>
</tr>
<tr>
Expand All @@ -223,39 +236,39 @@ const talks = talkEntries.filter((entry) => entry.data.session.id <= 10).map((en
<p>18:10</p>
</td>
<td class="tt-talk">
<Talk talks={talks} id={8}/>
<Talk talks={talks} id={8} />
</td>
</tr>
<tr>
<td class="tt-time">
<p>18:15</p>
</td>
<td class="tt-talk">
<Talk talks={talks} id={1}/>
<Talk talks={talks} id={1} />
</td>
</tr>
<tr>
<td class="tt-time">
<p>18:35</p>
</td>
<td class="tt-talk">
<Talk talks={talks} id={10}/>
<Talk talks={talks} id={10} />
</td>
</tr>
<tr>
<td class="tt-time">
<p>18:45</p>
</td>
<td class="tt-talk">
<Talk talks={talks} id={6}/>
<Talk talks={talks} id={6} />
</td>
</tr>
<tr>
<td class="tt-time">
<p>18:50</p>
</td>
<td class="tt-talk">
<Talk talks={talks} id={2}/>
<Talk talks={talks} id={2} />
</td>
</tr>
<tr>
Expand All @@ -271,39 +284,39 @@ const talks = talkEntries.filter((entry) => entry.data.session.id <= 10).map((en
<p>19:25</p>
</td>
<td class="tt-talk">
<Talk talks={talks} id={3}/>
<Talk talks={talks} id={3} />
</td>
</tr>
<tr>
<td class="tt-time">
<p>19:45</p>
</td>
<td class="tt-talk">
<Talk talks={talks} id={4}/>
<Talk talks={talks} id={24} />
</td>
</tr>
<tr>
<td class="tt-time">
<p>19:50</p>
</td>
<td class="tt-talk">
<Talk talks={talks} id={5}/>
<Talk talks={talks} id={5} />
</td>
</tr>
<tr>
<td class="tt-time">
<p>20:00</p>
</td>
<td class="tt-talk">
<Talk talks={talks} id={9}/>
<Talk talks={talks} id={9} />
</td>
</tr>
<tr>
<td class="tt-time">
<p>20:20</p>
</td>
<td class="tt-talk">
<Talk talks={talks} id={7}/>
<Talk talks={talks} id={7} />
</td>
</tr>
</tbody>
Expand Down
4 changes: 2 additions & 2 deletions src/components/talks/Main.astro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ talkEntries.filter((entry)=>entry.data.session.id === 21)[0].data.speaker.ImageS
talkEntries.filter((entry)=>entry.data.session.id === 22)[0].data.speaker.ImageSrc = EagletmtImage.src;
talkEntries.filter((entry)=>entry.data.session.id === 23)[0].data.speaker.ImageSrc = JhawthornImage.src;
const mainTalkEntries = talkEntries.filter((entry) => entry.data.session.id > 10);
const zenyasaiTalkEntries = talkEntries.filter((entry) => entry.data.session.id <= 10);
const mainTalkEntries = talkEntries.filter((entry) => entry.data.session.id > 10 && entry.data.session.id !== 24);
const zenyasaiTalkEntries = talkEntries.filter((entry) => entry.data.session.id <= 10 || entry.data.session.id === 24);
const sortedMainTalkEntries = mainTalkEntries.sort((a, b) => a.data.session.id - b.data.session.id);
const sortedZenyasaiTalkEntries = zenyasaiTalkEntries.sort((a, b) => a.data.session.id - b.data.session.id);
Expand Down
12 changes: 12 additions & 0 deletions src/content/talks/24-unasuke.mdx
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
---
speaker:
name: Yusuke Nakamura (わこー代走)
GitHubId: unasuke
XId: yu_suke1994
ImageSrc: https://secure.gravatar.com/avatar/858f777cffa7e215697ff78db4e52791.jpg?s=400
session:
id: 24
title: タイトルは今から考えます
---

代走

0 comments on commit 88c30a8

Please sign in to comment.