Skip to content

Commit 94b8ecd

Browse files
nikoshellnikoshell
committed
Add BODY to the EuroPython.
1 parent 1bf0884 commit 94b8ecd

File tree

6 files changed

+34
-51
lines changed

6 files changed

+34
-51
lines changed

‎src/components/footer.astro‎ renamed to ‎src/components/Footer.astro‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ const buildTimestamp = import.meta.env.TIMESTAMP;
88
const gitVersion = import.meta.env.GIT_VERSION;
99
---
1010

11+
<div class="mt-auto">
1112
<Fullbleed className="bg-primary text-white">
1213
<footer
1314
class="max-w-4xl lg:max-w-6xl mx-auto py-16 lg:grid grid-cols-2 px-6 gap-60"
@@ -106,3 +107,4 @@ const gitVersion = import.meta.env.GIT_VERSION;
106107
</article>
107108
</footer>
108109
</Fullbleed>
110+
</div>

‎src/components/header/header.astro‎ renamed to ‎src/components/Header.astro‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
---
22
import { promises as fs } from "fs";
3-
import { NavItems } from "../nav-items";
4-
import HeaderActions from "./header-actions.astro";
5-
import HeaderLogo from "./header-logo.astro";
3+
import { NavItems } from "@components/nav-items";
4+
import HeaderActions from "@components/header/header-actions.astro";
5+
import HeaderLogo from "@components/header/header-logo.astro";
66
7-
const links = JSON.parse(await fs.readFile("./src/data/links.json", "utf-8"));
7+
import links from "../data/links.json";
88
---
99

1010
<header class="p-6 flex items-center justify-between relative z-40">

‎src/components/search/Search.astro‎ renamed to ‎src/components/Search.astro‎

File renamed without changes.

‎src/layouts/BaseLayout.astro‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<!DOCTYPE html>
2+
<html lang="en">
3+
<head>
4+
<slot name="head" />
5+
</head>
6+
<body>
7+
<slot />
8+
</body>
9+
</html>

‎src/layouts/HomePageLayout.astro‎

Lines changed: 5 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,5 @@
11
---
2-
import Header from "../components/header/header.astro";
3-
import Footer from "../components/footer.astro";
4-
import BaseHead from "../components/BaseHead.astro";
5-
import Search from "@components/search/Search.astro";
6-
7-
export interface Props {
8-
title: string;
9-
description: string;
10-
}
2+
import Layout from "@layouts/Layout.astro";
113
124
const { title, description } = Astro.props;
135
const jsonLd = JSON.stringify({
@@ -39,26 +31,7 @@ const jsonLd = JSON.stringify({
3931
});
4032
---
4133

42-
<!doctype html>
43-
<html lang="en">
44-
<head>
45-
<BaseHead title={title} description={description} />
46-
<script type="application/ld+json" is:inline set:html={jsonLd} />
47-
</head>
48-
49-
<div class="flex flex-col items-stretch min-h-screen">
50-
<a href="#main-content" class="sr-only"> Skip to main content</a>
51-
52-
<Search />
53-
54-
<Header />
55-
56-
<main id="main-content" class="layout-wrapper overflow-x-clip">
57-
<slot />
58-
</main>
59-
60-
<div class="mt-auto">
61-
<Footer />
62-
</div>
63-
</div>
64-
</html>
34+
<Layout title={title} description={description}>
35+
<script type="application/ld+json" is:inline set:html={jsonLd} slot="head" />
36+
<slot />
37+
</Layout>

‎src/layouts/Layout.astro‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
---
2-
import Header from "../components/header/header.astro";
3-
import Footer from "../components/footer.astro";
4-
import BaseHead from "../components/BaseHead.astro";
5-
import Search from "@components/search/Search.astro";
2+
import BaseHead from "@components/BaseHead.astro";
3+
import Header from "@components/Header.astro";
4+
import Footer from "@components/Footer.astro";
5+
import Search from "@components/Search.astro";
66
77
export interface Props {
88
title: string;
@@ -16,20 +16,19 @@ const { title, description } = Astro.props;
1616
<html lang="en">
1717
<head>
1818
<BaseHead title={title} description={description} />
19+
<slot name="head" />
1920
</head>
21+
<body>
22+
<a href="#main-content" class="sr-only focus:not-sr-only focus:absolute focus:top-2 focus:left-2 bg-white text-blue-600 p-2 z-50"> Skip to main content</a>
2023

21-
<div class="flex flex-col items-stretch min-h-screen">
22-
<a href="#main-content" class="sr-only"> Skip to main content</a>
24+
<Search />
25+
<Header />
2326

24-
<Search />
25-
<Header />
27+
<main id="main-content" role="main" class="layout-wrapper overflow-x-clip">
28+
<slot />
29+
</main>
2630

27-
<main id="main-content" class="layout-wrapper overflow-x-clip">
28-
<slot />
29-
</main>
30-
31-
<div class="mt-auto">
3231
<Footer />
33-
</div>
34-
</div>
32+
33+
</body>
3534
</html>

0 commit comments

Comments
 (0)