Merge branch 'ep2025' into ep2025-logo

Author: nikoshell

.env.development

@@ -0,0 +1,2 @@
+EP_SESSIONS_API="https://static.europython.eu/programme/ep2025/releases/current/sessions.json"
+EP_SPEAKERS_API="https://static.europython.eu/programme/ep2025/releases/current/speakers.json"

.env.preview

@@ -0,0 +1,2 @@
+EP_SESSIONS_API="https://static.europython.eu/programme/ep2025/releases/current/sessions.json"
+EP_SPEAKERS_API="https://static.europython.eu/programme/ep2025/releases/current/speakers.json"

.env.production

@@ -0,0 +1,2 @@
+EP_SESSIONS_API="https://static.europython.eu/programme/ep2025/releases/current/sessions.json"
+EP_SPEAKERS_API="https://static.europython.eu/programme/ep2025/releases/current/speakers.json"

.github/workflows/build-deploy.yml

@@ -32,7 +32,7 @@ jobs:
         run: make install
 
       - name: Build the website
-        run: make build
+        run: make build MODE=production
 
       - name: Set up SSH key
         uses: webfactory/[email protected]

.github/workflows/preview.yml

@@ -32,19 +32,21 @@ jobs:
       - name: Install dependencies
         run: make install
 
+      - name: Get current branch name
+        run: |
+          BRANCH_NAME=$(make safe_branch BRANCH=$GITHUB_BRANCH_NAME)
+          echo "BRANCH_NAME=${BRANCH_NAME}" >> $GITHUB_ENV
+
       - name: Build the website
-        run: make build PREVIEW=true
+        run:
+          make build MODE=preview
+          SITE_URL="https://${BRANCH_NAME}.ep-preview.click"
 
       - name: Set up SSH key
         uses: webfactory/[email protected]
         with:
           ssh-private-key: ${{ secrets.DEPLOY_SSH_KEY }}
 
-      - name: Get current branch name
-        run: |
-          BRANCH_NAME=$(make safe_branch BRANCH=$GITHUB_BRANCH_NAME)
-          echo "BRANCH_NAME=${BRANCH_NAME}" >> $GITHUB_ENV
-
       - name: ssh keyscan
         run: ssh-keyscan "static.europython.eu" > ~/.ssh/known_hosts
 

.gitignore

@@ -128,6 +128,7 @@ dmypy.json
 .pyre/
 
 .vscode/
+.idea/
 out/
 .next/
 .DS_Store
@@ -138,3 +139,6 @@ storybook-static/
 # Sentry Auth Token
 .sentryclirc
 .astro
+
+# EuroPython website
+src/content/days

.readthedocs.yaml

@@ -20,6 +20,6 @@ build:
   commands:
     - npm install -g pnpm@latest-10
     - make install
-    - make build PREVIEW=true
+    - make build MODE=preview SITE_URL=$READTHEDOCS_CANONICAL_URL
     - mkdir -p $READTHEDOCS_OUTPUT/html
     - cd dist && cp -r * $READTHEDOCS_OUTPUT/html

Makefile

@@ -6,6 +6,7 @@ VPS_HOST  ?= static.europython.eu
 VPS_PROD_PATH  ?= /home/static_content_user/content/europython_websites/ep2025
 VPS_PREVIEW_PATH  ?= /home/static_content_user/content/previews
 REMOTE_CMD=ssh $(VPS_USER)@$(VPS_HOST)
+PREVIEW_SITE_URL ?= "https://$(SAFE_BRANCH).ep-preview.click"
 
 # Variables for build/deploy
 # ==========================
@@ -19,10 +20,10 @@ BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD)
 # Replace "/" and other non-alphanumeric characters with "-"
 SAFE_BRANCH := $(shell echo "$(BRANCH)" | sed 's/[^A-Za-z0-9-]/-/g')
 FORCE_DEPLOY ?= false
+SITE_URL ?= "https://$(SAFE_BRANCH).ep-preview.click"
 
 .PHONY: build deploy dev clean install
 
-
 safe_branch:
 	@echo $(SAFE_BRANCH)
 
@@ -42,17 +43,19 @@ check:
 	pnpm run astro check
 
 build:
-	pnpm build
+	pnpm run astro build --mode $(MODE)
 
 preview: RELEASES_DIR = $(VPS_PREVIEW_PATH)/$(SAFE_BRANCH)/releases
 preview: TARGET = $(RELEASES_DIR)/$(TIMESTAMP)
 preview:
+	@echo "Preview site URL: $(PREVIEW_SITE_URL)"
 	echo $(TARGET)
 	@echo "\n\n**** Deploying preview of a branch '$(BRANCH)' (safe: $(SAFE_BRANCH)) to $(TARGET)...\n\n"
 	$(REMOTE_CMD) "mkdir -p $(TARGET)"
 	rsync -avz --delete ./dist/ $(VPS_USER)@$(VPS_HOST):$(TARGET)/
 	$(REMOTE_CMD) "cd $(RELEASES_DIR) && ln -snf $(TIMESTAMP) current"
 	@echo "\n\n**** Preview complete.\n\n"
+	@echo "Open the preview site at: $(PREVIEW_SITE_URL)\n\n"
 
 
 ifeq ($(FORCE_DEPLOY), true)

astro.config.mjs

@@ -10,6 +10,7 @@ import rehypeAutolinkHeadings from "rehype-autolink-headings";
 import metaTags from "astro-meta-tags";
 import pagefind from "astro-pagefind";
 import deleteUnusedImages from "astro-delete-unused-images";
+import preload from "astro-preload";
 
 // https://astro.build/config
 export default defineConfig({
@@ -19,6 +20,7 @@ export default defineConfig({
     },
     resolve: {
       alias: {
+        "@utils": path.resolve("./src/utils"),
         "@data": path.resolve("./src/data"),
         "@components": path.resolve("./src/components"),
         "@sections": path.resolve("./src/components/sections"),
@@ -51,17 +53,11 @@ export default defineConfig({
   },
   site: process.env.SITE_URL || "https://ep2025.europython.eu",
   redirects: {
-    "/c-api-summit/": "/programme/c-api-summit/",
-    "/cfp/": "/programme/cfp/",
     "/planning/": "https://forms.gle/riw6CvML8ck94A4V9",
     "/reviewers/": "https://forms.gle/4GTJjwZ1nHBGetM18",
-    "/rust-summit/": "/programme/rust-summit/",
-    "/sponsor/": "/sponsorship/sponsor/",
-    "/voting/": "/programme/voting/",
-    "/wasm-summit/": "/programme/wasm-summit/",
-    "/sessions/": "/programme/sessions/",
   },
   integrations: [
+    preload(),
     mdx(),
     sitemap(),
     react(),
@@ -76,6 +72,10 @@ export default defineConfig({
   build: {
     minify: true,
   },
+  image: {
+    remotePatterns: [{ protocol: "https" }],
+    domains: ["programme.europython.eu", "placehold.co"],
+  },
   experimental: {
     svg: true,
   },

package.json

@@ -18,17 +18,21 @@
     "@astrojs/sitemap": "^3.3.0",
     "@astrojs/tailwind": "^5.1.4",
     "@fontsource-variable/inter": "^5.1.1",
+    "@fortawesome/fontawesome-free": "^6.7.2",
     "@tailwindcss/typography": "^0.5.16",
     "@types/react": "^19.1.0",
     "@types/react-dom": "^19.1.1",
     "astro": "^5.1.6",
     "astro-delete-unused-images": "^1.0.3",
     "astro-meta-tags": "^0.3.1",
     "astro-pagefind": "^1.8.1",
+    "astro-preload": "^1.1.2",
     "clsx": "^2.1.1",
     "date-fns": "^4.1.0",
     "date-fns-tz": "^3.2.0",
     "hastscript": "^9.0.0",
+    "js-yaml": "^4.1.0",
+    "marked": "^15.0.7",
     "pagefind": "^1.3.0",
     "react": "^19.1.0",
     "react-dom": "^19.1.0",
@@ -40,6 +44,7 @@
     "typescript": "^5.8.3"
   },
   "devDependencies": {
+    "@types/js-yaml": "^4.0.9",
     "prettier": "^3.4.2",
     "prettier-plugin-astro": "^0.14.1"
   },