Skip to content

Commit aa09245

Browse files
committed
Update endpoints, omit session room and start time
1 parent 2f2e181 commit aa09245

File tree

8 files changed

+34
-30
lines changed

8 files changed

+34
-30
lines changed

.env.development

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
EP_SESSIONS_API="https://gist.githubusercontent.com/egeakman/eddfb15f32ae805e8cfb4c5856ae304b/raw/466f8c20c17a9f6c5875f973acaec60e4e4d0fae/sessions.json"
2-
EP_SPEAKERS_API="https://gist.githubusercontent.com/nikoshell/d8efd41f90961cc6298519c0eec04843/raw/d13a7b1d35f61be1773404e7faf8395dd4862313/speakers.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"

.env.preview

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
EP_SESSIONS_API="https://gist.githubusercontent.com/egeakman/eddfb15f32ae805e8cfb4c5856ae304b/raw/466f8c20c17a9f6c5875f973acaec60e4e4d0fae/sessions.json"
2-
EP_SPEAKERS_API="https://gist.githubusercontent.com/nikoshell/d8efd41f90961cc6298519c0eec04843/raw/d13a7b1d35f61be1773404e7faf8395dd4862313/speakers.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"

.env.production

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
EP_SESSIONS_API="https://gist.githubusercontent.com/egeakman/eddfb15f32ae805e8cfb4c5856ae304b/raw/466f8c20c17a9f6c5875f973acaec60e4e4d0fae/sessions.json"
2-
EP_SPEAKERS_API="https://gist.githubusercontent.com/nikoshell/d8efd41f90961cc6298519c0eec04843/raw/d13a7b1d35f61be1773404e7faf8395dd4862313/speakers.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"

astro.config.mjs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ export default defineConfig({
6161
"/sponsor/": "/sponsorship/sponsor/",
6262
"/voting/": "/programme/voting/",
6363
"/wasm-summit/": "/programme/wasm-summit/",
64+
"/programme/sessions/": "/sessions/",
6465
},
6566
integrations: [
6667
preload(),

src/content/config.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ const speakers = defineCollection({
109109
submissions: z.array(reference("sessions")),
110110
affiliation: z.string().nullable(),
111111
homepage: z.string().nullable(),
112-
gitx: z.string().nullable(),
112+
gitx_url: z.string().url().nullable(),
113113
linkedin_url: z.string().url().nullable(),
114114
mastodon_url: z.string().url().nullable(),
115115
bluesky_url: z.string().url().nullable(),

src/data/links.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77
"name": "List of Sessions",
88
"path": "/sessions"
99
},
10+
{
11+
"name": "List of Speakers",
12+
"path": "/speakers"
13+
},
1014
{
1115
"name": "Tracks",
1216
"path": "/programme/tracks"
@@ -19,10 +23,6 @@
1923
"name": "Community Voting",
2024
"path": "/programme/voting"
2125
},
22-
{
23-
"name": "List of Speakers",
24-
"path": "/speakers"
25-
},
2626
{
2727
"name": "Speaker Mentorship",
2828
"path": "/programme/mentorship"

src/pages/session/[slug].astro

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ const nextSessionsOrdered = sameRoomNextSession
7474
<dd class="capitalize">{entry.data.session_type}</dd>
7575
<dt class="font-bold">Level:</dt>
7676
<dd class="capitalize">{entry.data.level}</dd>
77-
{
77+
<!-- {
7878
entry.data.room && (
7979
<>
8080
<dt class="font-bold">Room:</dt>
@@ -95,7 +95,7 @@ const nextSessionsOrdered = sameRoomNextSession
9595
</dd>
9696
</>
9797
)
98-
}
98+
} -->
9999
<dt class="font-bold">Duration:</dt>
100100
<dd>{entry.data.duration} minutes</dd>
101101
</dl>
@@ -185,7 +185,7 @@ const nextSessionsOrdered = sameRoomNextSession
185185
)
186186
}
187187

188-
{
188+
<!-- {
189189
(parallelSessions?.length ?? 0) > 0 ||
190190
(nextSessionsInAllRooms?.length ?? 0) > 0 ? (
191191
<>
@@ -232,7 +232,7 @@ const nextSessionsOrdered = sameRoomNextSession
232232
</div>
233233
</>
234234
) : null
235-
}
235+
} -->
236236
</footer>
237237
</article>
238238
</Layout>

src/pages/speaker/[slug].astro

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,14 @@ function getMastodonUsername(url: string): string | null {
5858
// Get in/username from LinkedIn URL
5959
function getLinkedInUsername(url: string): string | null {
6060
const match = url.match(/https?:\/\/([^\/]+)\/in\/([^\/]+)(\/|\?|$)/);
61-
return match ? `in/${match[2]}` : null;
61+
if (match) {
62+
try {
63+
return `in/${decodeURIComponent(match[2])}`;
64+
} catch {
65+
return `in/${match[2]}`;
66+
}
67+
}
68+
return null;
6269
}
6370
6471
// Get Git hosting service from URL
@@ -85,7 +92,7 @@ function getGitHosting(url: string): string | undefined {
8592
<div class="flex items-start">
8693
<div class="border-4 border-white rounded-lg shadow-lg inline-block mb-10">
8794
<Image
88-
src={entry.data.avatar}
95+
src={entry.data.avatar}
8996
alt={entry.data.name}
9097
height={400}
9198
width={600}
@@ -113,7 +120,7 @@ function getGitHosting(url: string): string | undefined {
113120
{
114121
entry.data.affiliation ||
115122
entry.data.homepage ||
116-
entry.data.gitx ||
123+
entry.data.gitx_url ||
117124
entry.data.linkedin_url ||
118125
entry.data.mastodon_url ||
119126
entry.data.twitter_url ? (
@@ -147,22 +154,18 @@ function getGitHosting(url: string): string | undefined {
147154
</>
148155
)}
149156

150-
{entry.data.gitx && (
157+
{entry.data.gitx_url && (
151158
<>
152159
<dt class="font-bold">
153-
{getGitHosting(entry.data.gitx) ?? "Git"}
160+
{getGitHosting(entry.data.gitx_url) ?? "Git"}
154161
</dt>
155162
<dd>
156-
{isUrl(entry.data.gitx) ? (
157-
<a
158-
href={ensureHttps(entry.data.gitx)}
159-
class="text-primary underline hover:text-primary-hover"
160-
>
161-
{entry.data.gitx}
162-
</a>
163-
) : (
164-
<span>{entry.data.gitx}</span>
165-
)}
163+
<a
164+
href={ensureHttps(entry.data.gitx_url)}
165+
class="text-primary underline hover:text-primary-hover"
166+
>
167+
{entry.data.gitx_url}
168+
</a>
166169
</dd>
167170
</>
168171
)}

0 commit comments

Comments
 (0)