Skip to content

Commit aaaf45d

Browse files
authored
Merge branch 'ep2025' into ep2025-issue-1126
2 parents 03a4b1a + 425a1b8 commit aaaf45d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+452
-342
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: 7 additions & 0 deletions
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"),
@@ -64,6 +66,7 @@ export default defineConfig({
6466
"/where": "/venue",
6567
},
6668
integrations: [
69+
preload(),
6770
mdx(),
6871
sitemap(),
6972
react(),
@@ -78,6 +81,10 @@ export default defineConfig({
7881
build: {
7982
minify: true,
8083
},
84+
image: {
85+
remotePatterns: [{ protocol: "https" }],
86+
domains: ["programme.europython.eu", "placehold.co"],
87+
},
8188
experimental: {
8289
svg: true,
8390
},

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.

0 commit comments

Comments
 (0)