Skip to content

Commit 23c8d07

Browse files
Merge branch 'ep2026' into speaker-orientation-update
2 parents b94cddc + 4889c47 commit 23c8d07

5 files changed

Lines changed: 20 additions & 19 deletions

File tree

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ submission.
3333
If you want to run this in docker, run:
3434

3535
```sh
36-
$ docker compose build
37-
$ docker compose up
36+
docker compose build
37+
docker compose up
3838
```
3939

4040
The website will be available at `http://localhost:4321`.
@@ -44,7 +44,7 @@ The website will be available at `http://localhost:4321`.
4444
Docker Compose mounts volumes from your file system to enable live reload. If
4545
you're having problems starting the container, try this:
4646

47-
```
47+
```sh
4848
# Clean everything
4949
docker compose down -v # Remove volumes
5050
docker image rmi website-web # Clean unused images

src/content/config.ts

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { defineCollection, reference, z } from "astro:content";
2-
// import { loadData } from "@utils/dataLoader";
2+
import { loadData } from "@utils/dataLoader";
33
import { glob } from "astro/loaders";
44

55
const mode = import.meta.env.MODE;
@@ -51,11 +51,10 @@ const keynoters = defineCollection({
5151
});
5252

5353
async function getCollectionsData() {
54-
// TODO: Re-enable when the API is available
55-
// const speakersData = await loadData(import.meta.env.EP_SPEAKERS_API);
56-
// const sessionsData = await loadData(import.meta.env.EP_SESSIONS_API);
57-
const speakersData = {};
58-
const sessionsData = {};
54+
const [speakersData, sessionsData] = await Promise.all([
55+
loadData(import.meta.env.EP_SPEAKERS_API),
56+
loadData(import.meta.env.EP_SESSIONS_API),
57+
]);
5958

6059
const speakersById = Object.entries(
6160
speakersData as Record<string, {}>

src/content/pages/programme/voting.mdx

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,13 @@ ingredient in this refinement and curation process.
1717

1818

1919
<Center>
20-
Community Voting is currently <b>Open</b>.
20+
Community Voting is <b>Closed</b>.
2121

22-
The voting period starts on Thursday 19 February 18:00:00 UTC
22+
It was open from Thursday 19 February 18:00:00 UTC
2323

2424
until Thursday, 5 March 23:59:59 UTC
2525
</Center>
2626

27-
<Button
28-
url="https://voting.europython.eu"
29-
>Go to the community voting</Button>
30-
3127

3228
---
3329

src/data/enabledPages.json

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
"/faq",
2525
"/sponsorship/sponsor",
2626
"/sponsorship/information",
27+
"/sessions",
28+
"/speakers",
2729
"/tickets"
2830
],
2931
"navItems": ["Programme", "Venue", "About"]

src/data/links.json

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
{
44
"name": "Programme",
55
"items": [
6+
{
7+
"name": "List of Sessions",
8+
"path": "/sessions"
9+
},
10+
{
11+
"name": "List of Speakers",
12+
"path": "/speakers"
13+
},
614
{
715
"name": "Tracks",
816
"path": "/tracks"
@@ -14,10 +22,6 @@
1422
{
1523
"name": "Speaker Mentorship",
1624
"path": "/mentorship"
17-
},
18-
{
19-
"name": "Community Voting",
20-
"path": "/voting"
2125
}
2226
]
2327
},

0 commit comments

Comments
 (0)