From cd08521c7bc1c49d7a1e896d73cc371f9b8d5425 Mon Sep 17 00:00:00 2001 From: Niko Date: Wed, 26 Mar 2025 08:03:49 +0100 Subject: [PATCH 1/6] Update refirects and meta tags. --- astro.config.mjs | 10 +++++ src/components/BaseHead.astro | 12 +++--- src/layouts/HomePageLayout.astro | 64 ++++++++++++++++++++++++++++++++ src/pages/c-api-summit.astro | 7 ---- src/pages/cfp.astro | 7 ---- src/pages/index.astro | 2 +- src/pages/planning.astro | 7 ---- src/pages/reviewers.astro | 7 ---- src/pages/rust-summit.astro | 7 ---- src/pages/sponsor.astro | 7 ---- src/pages/voting.astro | 6 --- src/pages/wasm-summit.astro | 7 ---- 12 files changed, 80 insertions(+), 63 deletions(-) create mode 100644 src/layouts/HomePageLayout.astro delete mode 100644 src/pages/c-api-summit.astro delete mode 100644 src/pages/cfp.astro delete mode 100644 src/pages/planning.astro delete mode 100644 src/pages/reviewers.astro delete mode 100644 src/pages/rust-summit.astro delete mode 100644 src/pages/sponsor.astro delete mode 100644 src/pages/voting.astro delete mode 100644 src/pages/wasm-summit.astro diff --git a/astro.config.mjs b/astro.config.mjs index f89c995ba..72fa67365 100644 --- a/astro.config.mjs +++ b/astro.config.mjs @@ -35,6 +35,16 @@ export default defineConfig({ ], }, site: "https://ep2025.europython.eu", + redirects: { + "/c-api-summit/": "/programme/c-api-summit/", + "/programme/cfp/": "/programme/cfp/", + "/planning/": "https://forms.gle/riw6CvML8ck94A4V9", + "/reviewers/": "https://forms.gle/4GTJjwZ1nHBGetM18", + "/rust-summit/": "/programme/rust-summit/", + "/sponsor/": "/sponsorship/sponsor/", + "/voting/": "/programme/voting/", + "/programme/wasm-summit/": "/programme/wasm-summit/", + }, integrations: [ mdx(), sitemap(), diff --git a/src/components/BaseHead.astro b/src/components/BaseHead.astro index dec387d94..671f754d7 100644 --- a/src/components/BaseHead.astro +++ b/src/components/BaseHead.astro @@ -19,9 +19,11 @@ const { title, description, image = "/social-card.png" } = Astro.props; - + + + @@ -32,6 +34,7 @@ const { title, description, image = "/social-card.png" } = Astro.props; + @@ -43,11 +46,6 @@ const { title, description, image = "/social-card.png" } = Astro.props; - - - - - - + diff --git a/src/layouts/HomePageLayout.astro b/src/layouts/HomePageLayout.astro new file mode 100644 index 000000000..0f61f00c1 --- /dev/null +++ b/src/layouts/HomePageLayout.astro @@ -0,0 +1,64 @@ +--- +import "../styles/global.css"; +import Header from "../components/header/header.astro"; +import Footer from "../components/footer.astro"; +import BaseHead from "../components/BaseHead.astro"; + +export interface Props { + title: string; + description: string; +} + +const { title, description } = Astro.props; +--- + + + + + + + + + +
+ Skip to main content + +
+ +
+ +
+ +
+
+
+
+ diff --git a/src/pages/c-api-summit.astro b/src/pages/c-api-summit.astro deleted file mode 100644 index fd972ffdf..000000000 --- a/src/pages/c-api-summit.astro +++ /dev/null @@ -1,7 +0,0 @@ - - - diff --git a/src/pages/cfp.astro b/src/pages/cfp.astro deleted file mode 100644 index a5e892aac..000000000 --- a/src/pages/cfp.astro +++ /dev/null @@ -1,7 +0,0 @@ - - - diff --git a/src/pages/index.astro b/src/pages/index.astro index 6d67e4106..399371e50 100644 --- a/src/pages/index.astro +++ b/src/pages/index.astro @@ -5,7 +5,7 @@ import HeroWithCTA from "../components/hero-section/hero-with-cta.astro"; import { Fullbleed } from "../components/layout/fullbleed"; import Prose from "../components/prose/prose.astro"; import { Title } from "../components/typography/title"; -import Layout from "../layouts/Layout.astro"; +import Layout from "../layouts/HomePageLayout.astro"; import DeadlineCard from "../components/deadline-card.astro"; import { getCollection } from "astro:content"; import Accent from "../components/accent/accent.astro"; diff --git a/src/pages/planning.astro b/src/pages/planning.astro deleted file mode 100644 index b06d8d85d..000000000 --- a/src/pages/planning.astro +++ /dev/null @@ -1,7 +0,0 @@ - - - diff --git a/src/pages/reviewers.astro b/src/pages/reviewers.astro deleted file mode 100644 index 238c1c1c4..000000000 --- a/src/pages/reviewers.astro +++ /dev/null @@ -1,7 +0,0 @@ - - - diff --git a/src/pages/rust-summit.astro b/src/pages/rust-summit.astro deleted file mode 100644 index 82993a0a8..000000000 --- a/src/pages/rust-summit.astro +++ /dev/null @@ -1,7 +0,0 @@ - - - diff --git a/src/pages/sponsor.astro b/src/pages/sponsor.astro deleted file mode 100644 index eae6734bc..000000000 --- a/src/pages/sponsor.astro +++ /dev/null @@ -1,7 +0,0 @@ - - - diff --git a/src/pages/voting.astro b/src/pages/voting.astro deleted file mode 100644 index 3d8c4be84..000000000 --- a/src/pages/voting.astro +++ /dev/null @@ -1,6 +0,0 @@ - - diff --git a/src/pages/wasm-summit.astro b/src/pages/wasm-summit.astro deleted file mode 100644 index 47c4a4f71..000000000 --- a/src/pages/wasm-summit.astro +++ /dev/null @@ -1,7 +0,0 @@ - - - From 03b3dddcc4dc147faf27e6c5abd47e1dbcf2266b Mon Sep 17 00:00:00 2001 From: Niko Date: Wed, 26 Mar 2025 08:38:08 +0100 Subject: [PATCH 2/6] Fix minor SEO issues --- src/components/footer.astro | 5 +++-- src/components/header/header-button.astro | 4 +++- src/components/nav-items/nav-items.tsx | 6 +++++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/src/components/footer.astro b/src/components/footer.astro index 2d006689c..8d1f4efe5 100644 --- a/src/components/footer.astro +++ b/src/components/footer.astro @@ -15,7 +15,7 @@ const gitVersion = import.meta.env.GIT_VERSION;
@@ -36,7 +37,7 @@ const gitVersion = import.meta.env.GIT_VERSION; class="flex flex-col lg:flex-row self-center gap-8 lg:gap-12 justify-end" >
- +
diff --git a/src/components/header/header-button.astro b/src/components/header/header-button.astro index a1e44ecb2..81fa4b089 100644 --- a/src/components/header/header-button.astro +++ b/src/components/header/header-button.astro @@ -18,7 +18,9 @@ const { href, variant = "standard" } = Astro.props; "bg-red": variant === "live", }, ]} - href={href} + + role="button" + href={href || "#"} > diff --git a/src/components/nav-items/nav-items.tsx b/src/components/nav-items/nav-items.tsx index 195d94e8a..3a8078f17 100644 --- a/src/components/nav-items/nav-items.tsx +++ b/src/components/nav-items/nav-items.tsx @@ -27,7 +27,10 @@ export const NavItems = ({ items, inverted = false }: Props) => { )} > { > Date: Wed, 26 Mar 2025 07:41:01 +0000 Subject: [PATCH 3/6] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- astro.config.mjs | 4 ++-- src/layouts/HomePageLayout.astro | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/astro.config.mjs b/astro.config.mjs index 72fa67365..dac66ad5a 100644 --- a/astro.config.mjs +++ b/astro.config.mjs @@ -38,9 +38,9 @@ export default defineConfig({ redirects: { "/c-api-summit/": "/programme/c-api-summit/", "/programme/cfp/": "/programme/cfp/", - "/planning/": "https://forms.gle/riw6CvML8ck94A4V9", + "/planning/": "https://forms.gle/riw6CvML8ck94A4V9", "/reviewers/": "https://forms.gle/4GTJjwZ1nHBGetM18", - "/rust-summit/": "/programme/rust-summit/", + "/rust-summit/": "/programme/rust-summit/", "/sponsor/": "/sponsorship/sponsor/", "/voting/": "/programme/voting/", "/programme/wasm-summit/": "/programme/wasm-summit/", diff --git a/src/layouts/HomePageLayout.astro b/src/layouts/HomePageLayout.astro index 0f61f00c1..af841ba7d 100644 --- a/src/layouts/HomePageLayout.astro +++ b/src/layouts/HomePageLayout.astro @@ -29,7 +29,7 @@ const { title, description } = Astro.props; "@type": "ImageObject", "url": "https://ep2025.europython.eu/_astro/hero.BAlu7uXS_rd8vG.svg", "width": 1686, - "height": 888 + "height": 888 } }, "url": "https://ep2025.europython.eu/", From 46f4f1aa768af276c0b52762d0ef13a2f685a5e4 Mon Sep 17 00:00:00 2001 From: Niko Date: Wed, 26 Mar 2025 11:38:52 +0100 Subject: [PATCH 4/6] Fix ld+json inline script with param. --- src/layouts/HomePageLayout.astro | 58 +++++++++++++++----------------- 1 file changed, 28 insertions(+), 30 deletions(-) diff --git a/src/layouts/HomePageLayout.astro b/src/layouts/HomePageLayout.astro index af841ba7d..15f85ade4 100644 --- a/src/layouts/HomePageLayout.astro +++ b/src/layouts/HomePageLayout.astro @@ -10,42 +10,40 @@ export interface Props { } const { title, description } = Astro.props; +const jsonLd = JSON.stringify({ + "@context": "https://schema.org", + "@type": "WebSite", + "publisher": { + "@type": "Organization", + "name": "EuroPython 2025", + "url": "https://ep2025.europython.eu/", + "logo": { + "@type": "ImageObject", + "url": "https://ep2025.europython.eu/_astro/hero.BAlu7uXS_rd8vG.svg", + "width": 1686, + "height": 888 + } + }, + "url": "https://ep2025.europython.eu/", + "image": { + "@type": "ImageObject", + "url": "https://ep2025.europython.eu/_astro/hero.BAlu7uXS_rd8vG.svg", + "width": 1686, + "height": 888 + }, + "mainEntityOfPage": { + "@type": "WebPage", + "@id": "https://ep2025.europython.eu/" + }, + "description": description +}); --- - - +
From d57cbbbbc1bb4457c23082f6f28ec5f4fafc3e12 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niko=C5=9B?= Date: Wed, 26 Mar 2025 15:53:46 +0100 Subject: [PATCH 5/6] Update astro.config.mjs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Mia Bajić <38294198+clytaemnestra@users.noreply.github.com> --- astro.config.mjs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/astro.config.mjs b/astro.config.mjs index dac66ad5a..ba90a30f0 100644 --- a/astro.config.mjs +++ b/astro.config.mjs @@ -43,7 +43,7 @@ export default defineConfig({ "/rust-summit/": "/programme/rust-summit/", "/sponsor/": "/sponsorship/sponsor/", "/voting/": "/programme/voting/", - "/programme/wasm-summit/": "/programme/wasm-summit/", + "/wasm-summit/": "/programme/wasm-summit/", }, integrations: [ mdx(), From d38a2ca03ff6f1df6f6cb3b6a33b5e883c1d4cdb Mon Sep 17 00:00:00 2001 From: Niko Date: Thu, 27 Mar 2025 07:57:05 +0100 Subject: [PATCH 6/6] Update meta tags. --- src/components/BaseHead.astro | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/components/BaseHead.astro b/src/components/BaseHead.astro index 671f754d7..c6d34ef19 100644 --- a/src/components/BaseHead.astro +++ b/src/components/BaseHead.astro @@ -41,11 +41,16 @@ const { title, description, image = "/social-card.png" } = Astro.props; - - - - - + + + + + + + + + +