Skip to content

Commit 8453af2

Browse files
authored
Merge branch 'ep2025' into ep2025-ilikeit
2 parents c0e7c88 + 46b8e75 commit 8453af2

16 files changed

Lines changed: 168 additions & 208 deletions

File tree

astro.config.mjs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,12 @@ export default defineConfig({
100100
"/planning/": "https://forms.gle/riw6CvML8ck94A4V9",
101101
"/reviewers/": "https://forms.gle/4GTJjwZ1nHBGetM18",
102102
"/speaker/savannah-ostrowski": "/speaker/savannah-bailey",
103+
"/rust-summit": "/session/rust-summit",
104+
"/c-api-summit": "/session/c-api-summit",
105+
"/wasm-summit": "/session/webassembly-summit",
106+
"/programme/rust-summit": "/session/rust-summit",
107+
"/programme/c-api-summit": "/session/c-api-summit",
108+
"/programme/wasm-summit": "/session/webassembly-summit",
103109
},
104110
integrations: [
105111
mdx(),

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
"@astrojs/sitemap": "^3.3.1",
1818
"@astrojs/svelte": "^7.0.13",
1919
"@astrojs/tailwind": "^5.1.5",
20+
"@astrojs/ts-plugin": "^1.10.4",
2021
"@fortawesome/fontawesome-free": "^6.7.2",
2122
"@tailwindcss/typography": "^0.5.16",
2223
"astro": "^5.7.5",

pnpm-lock.yaml

Lines changed: 16 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/components/schedule/break.astro

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,13 @@ export interface Props {
33
time: string;
44
title: string;
55
style?: any;
6+
className?: string;
67
}
78
8-
const { time, title, style }: Props = Astro.props;
9+
const { time, title, style, className }: Props = Astro.props;
910
---
1011

11-
<div class="break" style={style} aria-label=`${time} ${title}` >
12+
<div class={className? className: "break"} style={style} aria-label=`${time} ${title}` >
1213
{time}{" "}
1314
{title}
1415
<span class="sr-only">{time} {title}</span>

src/components/schedule/day.astro

Lines changed: 40 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ type ScheduleSession = {
5151
end: Date;
5252
endTime: string;
5353
duration: number;
54-
sessionType?: string;
54+
sessionType?: string | undefined;
5555
type: string;
5656
rooms: string[];
5757
};
@@ -322,6 +322,16 @@ posters.forEach((poster) => {
322322

323323
const date = parseISO(dayName);
324324
const dateText = format(date, "eeee - do MMMM");
325+
326+
327+
328+
329+
const lastEndTime = Math.max(
330+
...slots.flatMap((slot) => slot.sessions.map((s) => timeToNumber(s.endTime)))
331+
);
332+
333+
const endStart = numberToTime(lastEndTime);
334+
325335
---
326336

327337
<div class="day"
@@ -362,7 +372,7 @@ const dateText = format(date, "eeee - do MMMM");
362372
<h2>{format(slot.start, "HH:mm")}</h2>
363373
</div>
364374

365-
{sessionsByTime[slot.startTime]
375+
{(sessionsByTime[slot.startTime] ?? [])
366376
.sort(sortSessionByRooms)
367377
.map((session) => {
368378
const style = getSessionStyle(session);
@@ -407,7 +417,14 @@ const dateText = format(date, "eeee - do MMMM");
407417
</div>
408418
))
409419
}
420+
410421
</div>
422+
423+
<Break
424+
title="End of the Day"
425+
time={endStart}
426+
className="day-end"
427+
/>
411428
</div>
412429
<div class="h-12"></div>
413430
</div>
@@ -426,6 +443,19 @@ const dateText = format(date, "eeee - do MMMM");
426443
{
427444
width: 100%;
428445
}
446+
447+
448+
:global(.day-end) {
449+
display: flex;
450+
align-items: center;
451+
text-align: center;
452+
justify-items: center;
453+
background-color: #FCFBFA;
454+
border-radius: 10px;
455+
margin: 10px 1.5rem;
456+
padding:2px 8px;
457+
font-size: 0.8rem;
458+
}
429459
:global(body) {
430460
}
431461

@@ -548,6 +578,14 @@ const dateText = format(date, "eeee - do MMMM");
548578
grid-column: var(--col-start) / var(--col-end);
549579
}
550580

581+
582+
:global(.day-end){
583+
font-size: 1.2rem;
584+
margin: 2px;
585+
padding: 8px;
586+
}
587+
588+
551589
.time {
552590
padding: 8px;
553591
grid-column: 1 / 2;

src/components/sections/keynoters/keynoter.astro

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ import Person5 from "./placeholders/person-5.astro";
1111
export interface Props {
1212
name: string;
1313
slug: string;
14-
tagline?: string;
14+
tagline?: string | undefined;
1515
image?: ImageMetadata;
16-
placeholder?: boolean;
17-
order?: number;
16+
placeholder?: boolean | undefined;
17+
order?: number | undefined;
1818
class?: string;
1919
}
2020

src/components/sections/speakers.astro

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ const sectionSubtitle = "Meet some of our amazing speakers";
7979

8080
let currentPosition = 0;
8181
const scrollSpeed = 4000;
82-
let slidingInterval: ReturnType<typeof setInterval> | null = null;
82+
let slidingInterval: number | null = null;
8383

8484
// Function to determine slides per view based on window width
8585
function getSlidesPerView() {
@@ -110,7 +110,7 @@ const sectionSubtitle = "Meet some of our amazing speakers";
110110
function startAnimation(slideWidth: number) {
111111
// Initial setup
112112
moveCarousel();
113-
slidingInterval = setInterval(moveCarousel, scrollSpeed);
113+
slidingInterval = window.setInterval(moveCarousel, scrollSpeed) as number;
114114

115115
function moveCarousel() {
116116
currentPosition += slideWidth;

src/content/pages/programme/c-api-summit.mdx

Lines changed: 0 additions & 60 deletions
This file was deleted.

src/content/pages/programme/rust-summit.mdx

Lines changed: 0 additions & 62 deletions
This file was deleted.

src/content/pages/programme/wasm-summit.mdx

Lines changed: 0 additions & 35 deletions
This file was deleted.

0 commit comments

Comments
 (0)