Skip to content

Commit 8f591d6

Browse files
authored
Merge branch 'ep2025' into ep2025-better-speakers
2 parents 5638729 + 885fbc9 commit 8f591d6

31 files changed

+641
-150
lines changed

.env.development

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
EP_SESSIONS_API="https://static.europython.eu/programme/ep2025/releases/current/sessions.json"
22
EP_SPEAKERS_API="https://static.europython.eu/programme/ep2025/releases/current/speakers.json"
3+
EP_SCHEDULE_API="https://static.europython.eu/programme/ep2025/releases/current/schedule.json"

.env.preview

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
EP_SESSIONS_API="https://static.europython.eu/programme/ep2024/releases/current/sessions.json"
2-
EP_SPEAKERS_API="https://gist.githubusercontent.com/nikoshell/24f8c99de3758dc4ed1391876c382b43/raw/bdf11fe89e5010f35dc1351e9b71c02a19adefe2/24speakers.json"
3-
EP_SCHEDULE_API="https://static.europython.eu/programme/ep2024/releases/current/schedule.json"
1+
EP_SESSIONS_API="https://static.europython.eu/programme/ep2025/releases/current/sessions.json"
2+
EP_SPEAKERS_API="https://static.europython.eu/programme/ep2025/releases/current/speakers.json"
3+
EP_SCHEDULE_API="https://static.europython.eu/programme/ep2025/releases/current/schedule.json"

.env.production

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
EP_SESSIONS_API="https://static.europython.eu/programme/ep2025/releases/current/sessions.json"
22
EP_SPEAKERS_API="https://static.europython.eu/programme/ep2025/releases/current/speakers.json"
3+
EP_SCHEDULE_API="https://static.europython.eu/programme/ep2025/releases/current/schedule.json"

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,21 @@
1616
"@astrojs/mdx": "^4.2.3",
1717
"@astrojs/react": "^4.2.3",
1818
"@astrojs/sitemap": "^3.3.0",
19-
"@astrojs/tailwind": "^5.1.4",
20-
"@fontsource-variable/inter": "^5.1.1",
19+
"@astrojs/tailwind": "^5.1.5",
20+
"@fontsource-variable/inter": "^5.2.5",
2121
"@fortawesome/fontawesome-free": "^6.7.2",
2222
"@tailwindcss/typography": "^0.5.16",
2323
"@types/react": "^19.1.0",
2424
"@types/react-dom": "^19.1.1",
25-
"astro": "^5.1.6",
25+
"astro": "^5.5.2",
2626
"astro-delete-unused-images": "^1.0.3",
2727
"astro-meta-tags": "^0.3.1",
28-
"astro-pagefind": "^1.8.1",
28+
"astro-pagefind": "^1.8.3",
2929
"astro-preload": "^1.1.2",
3030
"clsx": "^2.1.1",
3131
"date-fns": "^4.1.0",
3232
"date-fns-tz": "^3.2.0",
33-
"hastscript": "^9.0.0",
33+
"hastscript": "^9.0.1",
3434
"js-yaml": "^4.1.0",
3535
"marked": "^15.0.7",
3636
"pagefind": "^1.3.0",
@@ -45,7 +45,7 @@
4545
},
4646
"devDependencies": {
4747
"@types/js-yaml": "^4.0.9",
48-
"prettier": "^3.4.2",
48+
"prettier": "^3.5.3",
4949
"prettier-plugin-astro": "^0.14.1"
5050
},
5151
"prettier": {

pnpm-lock.yaml

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

src/components/keynoters/keynoter.astro

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
---
22
import type { ImageMetadata } from "astro";
3+
import { getCollection } from "astro:content";
34
import { Image } from "astro:assets";
45
import Person1 from "../placeholders/person-1.astro";
56
import Person2 from "../placeholders/person-2.astro";
@@ -19,6 +20,7 @@ export interface Props {
1920
2021
const {
2122
name,
23+
slug,
2224
tagline,
2325
image,
2426
placeholder,
@@ -30,10 +32,12 @@ const placeholders = [Person1, Person2, Person3, Person4, Person5];
3032
const Placeholder =
3133
placeholders[Math.floor(Math.random() * placeholders.length)];
3234
35+
const entries = await getCollection("speakers");
36+
const isSpeaker = entries.some((entry) => entry.id === slug);
3337
---
3438

3539
<li class:list={["list-none rounded-2xl overflow-clip flex group", className]}>
36-
<a class="block w-full h-full relative " >
40+
<div class="block w-full h-full relative">
3741
<div class="relative aspect-[9/10] overflow-clip">
3842
{
3943
image ? (
@@ -51,21 +55,30 @@ const Placeholder =
5155
}
5256
</div>
5357

54-
<div
55-
class="px-5 py-2 pb-4 bg-keynoter-info rounded-t-none h-full "
56-
>
58+
<div class="px-5 py-2 pb-4 bg-keynoter-info rounded-t-none h-full">
5759
{
5860
placeholder ? (
59-
<p class="text-body-inverted ">More keynoters coming soon</p>
61+
<p class="text-body-inverted">More keynoters coming soon</p>
6062
) : (
6163
<>
62-
<p class="text-[#17223A] font-bold">{name}</p>
63-
{tagline ? (
64+
{isSpeaker ? (
65+
<p class="text-[#17223A] font-bold">
66+
<a
67+
href={`/speaker/${slug}`}
68+
class="text-[#17223A] font-bold hover:underline"
69+
>
70+
{name}
71+
</a>
72+
</p>
73+
) : (
74+
<p class="text-[#17223A] font-bold">{name}</p>
75+
)}
76+
{tagline && (
6477
<p class="text-secondary-hover text-lg italic">{tagline}</p>
65-
) : null}
78+
)}
6679
</>
6780
)
6881
}
6982
</div>
70-
</a>
83+
</div>
7184
</li>

src/components/schedule/break.astro

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,19 @@ export interface Props {
88
const { time, title, style }: Props = Astro.props;
99
---
1010

11-
<div class="break" style={style}>
11+
<div class="break" style={style} aria-label=`${time} ${title}` >
1212
{time}{" "}
1313
{title}
14+
<span class="sr-only">{time} {title}</span>
1415
</div>
1516

1617
<style>
1718
.break {
18-
background: var(--color-session-neutral);
19-
color: var(--color-text);
2019
display: flex;
2120
align-items: center;
22-
font-weight: bold;
21+
text-align: center;
22+
justify-items: center;
2323
padding-left: 8px;
24+
background-color: #FCFBFA;
2425
}
2526
</style>

0 commit comments

Comments
 (0)