Skip to content

Commit 425a1b8

Browse files
nikoshellclytaemnestraegeakman
authored
Add sessions and speakers. (#1101)
<!-- readthedocs-preview ep-website start --> 🖼️ Preview available 🖼️ : https://ep-website--1101.org.readthedocs.build/ <!-- readthedocs-preview ep-website end --> --------- Co-authored-by: Mia Bajić <38294198+clytaemnestra@users.noreply.github.com> Co-authored-by: Ege Akman <me@egeakman.dev>
1 parent c84b701 commit 425a1b8

38 files changed

+446
-335
lines changed

.env.development

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
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 & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
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 & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
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"

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,7 @@ dmypy.json
128128
.pyre/
129129

130130
.vscode/
131+
.idea/
131132
out/
132133
.next/
133134
.DS_Store
@@ -138,3 +139,6 @@ storybook-static/
138139
# Sentry Auth Token
139140
.sentryclirc
140141
.astro
142+
143+
# EuroPython website
144+
src/content/days

Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD)
1919
# Replace "/" and other non-alphanumeric characters with "-"
2020
SAFE_BRANCH := $(shell echo "$(BRANCH)" | sed 's/[^A-Za-z0-9-]/-/g')
2121
FORCE_DEPLOY ?= false
22+
SITE_URL ?= "https://$(SAFE_BRANCH).ep-preview.click"
2223

2324
.PHONY: build deploy dev clean install
2425

25-
2626
safe_branch:
2727
@echo $(SAFE_BRANCH)
2828

@@ -47,6 +47,7 @@ build:
4747
preview: RELEASES_DIR = $(VPS_PREVIEW_PATH)/$(SAFE_BRANCH)/releases
4848
preview: TARGET = $(RELEASES_DIR)/$(TIMESTAMP)
4949
preview:
50+
@echo "Preview site URL: $(SITE_URL)" # Output preview URL
5051
echo $(TARGET)
5152
@echo "\n\n**** Deploying preview of a branch '$(BRANCH)' (safe: $(SAFE_BRANCH)) to $(TARGET)...\n\n"
5253
$(REMOTE_CMD) "mkdir -p $(TARGET)"

astro.config.mjs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ import rehypeAutolinkHeadings from "rehype-autolink-headings";
1010
import metaTags from "astro-meta-tags";
1111
import pagefind from "astro-pagefind";
1212
import deleteUnusedImages from "astro-delete-unused-images";
13+
import preload from "astro-preload";
1314

1415
// https://astro.build/config
1516
export default defineConfig({
@@ -19,6 +20,7 @@ export default defineConfig({
1920
},
2021
resolve: {
2122
alias: {
23+
"@utils": path.resolve("./src/utils"),
2224
"@data": path.resolve("./src/data"),
2325
"@components": path.resolve("./src/components"),
2426
"@sections": path.resolve("./src/components/sections"),
@@ -59,9 +61,10 @@ export default defineConfig({
5961
"/sponsor/": "/sponsorship/sponsor/",
6062
"/voting/": "/programme/voting/",
6163
"/wasm-summit/": "/programme/wasm-summit/",
62-
"/sessions/": "/programme/sessions/",
64+
"/programme/sessions/": "/sessions/",
6365
},
6466
integrations: [
67+
preload(),
6568
mdx(),
6669
sitemap(),
6770
react(),
@@ -76,6 +79,10 @@ export default defineConfig({
7679
build: {
7780
minify: true,
7881
},
82+
image: {
83+
remotePatterns: [{ protocol: "https" }],
84+
domains: ["programme.europython.eu", "placehold.co"],
85+
},
7986
experimental: {
8087
svg: true,
8188
},

package.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,13 @@
2525
"astro-delete-unused-images": "^1.0.3",
2626
"astro-meta-tags": "^0.3.1",
2727
"astro-pagefind": "^1.8.1",
28+
"astro-preload": "^1.1.2",
2829
"clsx": "^2.1.1",
2930
"date-fns": "^4.1.0",
3031
"date-fns-tz": "^3.2.0",
3132
"hastscript": "^9.0.0",
33+
"js-yaml": "^4.1.0",
34+
"marked": "^15.0.7",
3235
"pagefind": "^1.3.0",
3336
"react": "^19.1.0",
3437
"react-dom": "^19.1.0",
@@ -40,6 +43,7 @@
4043
"typescript": "^5.8.3"
4144
},
4245
"devDependencies": {
46+
"@types/js-yaml": "^4.0.9",
4347
"prettier": "^3.4.2",
4448
"prettier-plugin-astro": "^0.14.1"
4549
},

pnpm-lock.yaml

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

public/favicon.ico

56.6 KB
Binary file not shown.

public/placeholder.png

5.35 KB
Loading

scripts/download-data.py

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

src/assets/placeholder.png

5.35 KB
Loading

src/assets/placeholder.svg

Lines changed: 1 addition & 0 deletions
Loading

src/components/header/header-actions.astro

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
---
2-
import ButtonLink from "../button-link/button-link.astro";
32
import Button from "@ui/Button.astro";
43
import HeaderButton from "./header-button.astro";
54
import Search from "astro-pagefind/components/Search";

src/components/keynoters/keynoter.astro

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,9 @@ export interface Props {
1919
2020
const {
2121
name,
22-
slug,
2322
tagline,
2423
image,
2524
placeholder,
26-
order,
2725
class: className,
2826
} = Astro.props;
2927

src/components/keynoters/keynoters.astro

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ const placeholders = Math.max(0, 5 - keynoters.length);
7979
</g>
8080
</svg>
8181

82-
<Headline id="keynoters" title="Keynote Speakers" />
82+
<Headline id="keynoters" title="Keynote Speakers" center=true />
8383

8484
<ul class="p-0 mt-12 flex gap-6 flex-wrap justify-center">
8585
{
@@ -120,7 +120,7 @@ const placeholders = Math.max(0, 5 - keynoters.length);
120120
<span class="text-body-light inline-block mr-2">#</span>
121121
See other sessions
122122
</h3>
123-
<Button url="/programme/sessions">See sessions preview</Button>
123+
<Button url="/sessions">See sessions preview</Button>
124124
</div>
125125
</div>
126126
</section>

src/components/schedule/speakers.astro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const speakers = Astro.props.speakers
2020

2121
{
2222
speakers.map((speaker, index) => (
23-
<a href={`/speaker/${speaker.slug}`} class="inline">
23+
<a href={`/speaker/${speaker.id}`} class="inline">
2424
{speaker.data.name}
2525
{index < speakers.length - 1 ? ", " : ""}
2626
</a>

src/components/sections/prague.astro

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,13 @@
11
---
22
import Button from "@ui/Button.astro";
3-
import { Title } from "@components/typography/title";
43
import { Image } from "astro:assets";
54
import pragueImage from "@assets/prague2.jpg";
65
import Logo from "@assets/prague.svg";
76
import Headline from "@ui/Headline.astro";
87
---
98

109
<div class="mt-12">
11-
<Headline id="prague" title="Prague & Venue" />
10+
<Headline id="prague" title="Prague & Venue" center=true />
1211
</div>
1312

1413
<article class="lg:grid gap-12 grid-cols-2 items-center">

src/components/sections/updates.astro

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
---
22
33
import { CardContainer } from "@components/card/card-container";
4-
import { Title } from "@components/typography/title";
54
import DeadlineCard from "@components/deadline-card.astro";
65
import Headline from "@ui/Headline.astro"
76
import { getCollection } from "astro:content";
@@ -14,7 +13,7 @@ deadlines = deadlines
1413
1514
---
1615
<section class="prose-xl m-0 my-12 p-0">
17-
<Headline id="updates" title="Updates" />
16+
<Headline id="updates" title="Updates" center=true />
1817
<CardContainer>
1918
{deadlines.map((deadline) => <DeadlineCard id={deadline.slug} />)}
2019
</CardContainer>

src/components/session-speakers.astro

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import { getEntries } from "astro:content";
33
44
interface Props {
55
speakers: Array<{
6-
slug: string;
6+
id: string;
77
collection: "speakers";
88
}>;
99
}
@@ -13,15 +13,15 @@ const { speakers: speakersEntries } = Astro.props;
1313
const speakers = await getEntries(
1414
speakersEntries.map((entry) => ({
1515
collection: entry.collection,
16-
id: entry.slug,
16+
id: entry.id,
1717
})),
1818
);
1919
---
2020

2121
{
2222
speakers.map((speaker, index) => (
2323
<span class="inline">
24-
<a href={`/speaker/${speaker.slug}`} class="underline">
24+
<a href={`/speaker/${speaker.id}`} class="underline">
2525
{speaker.data.name}
2626
</a>
2727
{index < speakers.length - 1 ? ", " : ""}

0 commit comments

Comments
 (0)