Skip to content

Commit d332690

Browse files
nikoshellnikoshell
authored
Merge branch 'ep2025' into ep2025-update-keynoters
2 parents 9e3674a + fefe4fd commit d332690

File tree

18 files changed

+117
-14
lines changed

18 files changed

+117
-14
lines changed

‎Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ check:
4444

4545
build:
4646
pnpm run astro build --mode $(MODE)
47+
pnpm pagefind
4748

4849
preview: RELEASES_DIR = $(VPS_PREVIEW_PATH)/$(SAFE_BRANCH)/releases
4950
preview: TARGET = $(RELEASES_DIR)/$(TIMESTAMP)

‎astro.config.mjs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ import remarkToc from "remark-toc";
66
import rehypeSlug from "rehype-slug";
77
import rehypeAutolinkHeadings from "rehype-autolink-headings";
88
import metaTags from "astro-meta-tags";
9-
import pagefind from "astro-pagefind";
109
import deleteUnusedImages from "astro-delete-unused-images";
1110
import { execSync } from "node:child_process";
1211
import svelte from "@astrojs/svelte";
@@ -116,7 +115,6 @@ export default defineConfig({
116115
mdx(),
117116
sitemap(),
118117
metaTags(),
119-
pagefind(),
120118
deleteUnusedImages(),
121119
svelte(),
122120
compress({

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"scripts": {
66
"dev": "astro dev",
77
"start": "astro dev",
8-
"build": "astro check && astro build && pnpm pagefind --site dist",
8+
"build": "astro check && astro build && pnpm pagefind",
99
"preview": "astro preview",
1010
"astro": "astro",
1111
"format": "prettier --write --plugin=prettier-plugin-astro ."

‎pagefind.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
site: dist
22
glob: "**/*.{html}"
3+
root_selector: "main"

‎src/components/SponsorLogo.astro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ const logo = sponsorLogos[sponsor.id];
2828
{
2929
website ? (
3030

31-
<a href={website} aria-label={`Link to ${title}`}
31+
<a href={website} target="_blank" aria-label={`Link to ${title}`}
3232
>
3333
<Image
3434
src={logo}

‎src/components/schedule/session.astro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ const hasFooter = true;
8080
codeId={session.code}
8181
title={session.title}
8282
/>
83-
<h2>
83+
<h2 id=`session-${session.slug}`>
8484
{session.title}
8585
</h2>
8686

‎src/components/sponsors/sponsor-tier.astro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ const { tier, top } = Astro.props;
2929
"grid ml-12 items-center justify-items-center",
3030
{
3131
"grid-cols-1 md:grid-cols-2 lg:grid-cols-3": !top,
32-
"grid-cols-1 md:grid-cols-1": top,
32+
"grid-cols-1 md:grid-cols-2": top,
3333
},
3434
]}
3535
>

‎src/content/sponsors/ataccama/ataccama.svg

Lines changed: 19 additions & 0 deletions
Loading

‎src/content/sponsors/ataccama/display.png

948 KB
Loading

‎src/content/sponsors/ataccama/index.md

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
---
2+
name: Ataccama
3+
url: https://jobs.ataccama.com/
4+
location: "Czechia"
5+
description:
6+
"Ataccama is an international software company full of data experts and
7+
enthusiasts developing Ataccama ONE—a unified Data Management platform that
8+
helps customers use the power of automated data governance and visualization
9+
to do exceptional things with their data."
10+
socials:
11+
linkedin: "https://www.linkedin.com/company/ataccama"
12+
twitter: "https://x.com/ataccama?lang=en"
13+
facebook: "https://www.facebook.com/Ataccama/"
14+
tier: Silver
15+
draft: true
16+
---
17+
18+
## About Ataccama
19+
20+
Ataccama ONE is a unified data trust platform for enterprise data leaders that
21+
combines data quality, observability, lineage, governance and master data
22+
management in ONE solution to accelerate business growth, reduce cost, and
23+
mitigate risk.

‎src/content/sponsors/microsoft/display.png

461 KB
Loading

‎src/content/sponsors/microsoft/index.md

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
---
2+
name: "Microsoft"
3+
url: "https://www.microsoft.com"
4+
location: "USA"
5+
description:
6+
"Open Source enables Microsoft products and services to bring choice,
7+
technology and community to our customers. "
8+
socials:
9+
linkedin: "https://www.linkedin.com/showcase/vs-code/"
10+
twitter: "https://x.com/code"
11+
bluesky: "https://bsky.app/profile/visualstudio.com"
12+
tier: Platinum
13+
logo_padding: 10px 0px
14+
15+
draft: true
16+
---
17+
18+
## About Microsoft
19+
20+
Open Source enables Microsoft products and services to bring choice, technology
21+
and community to our customers.

‎src/content/sponsors/microsoft/microsoft.svg

Lines changed: 35 additions & 0 deletions
Loading

‎src/layouts/ScheduleLayout.astro

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,16 @@
22
import Layout from "@layouts/Layout.astro";
33
import Section from "@ui/Section.astro";
44
import Note from "@ui/Note.astro";
5+
import Headline from "@ui/Headline.astro"
6+
import { slugify } from '@utils/content';
57
68
export interface Props {
79
title?: string;
810
description: string;
11+
headline: string;
912
}
1013
11-
const { title, description } = Astro.props;
14+
const { title, description, headline } = Astro.props;
1215
---
1316
<Layout title={title || "Schedule for 2025"} description={description} >
1417
<Fragment slot="head">
@@ -17,8 +20,10 @@ const { title, description } = Astro.props;
1720
</Fragment>
1821
<Section>
1922

20-
<Note type="warning">This is an early version of the schedule and may still change. If you're planning travel around specific sessions, please keep that in mind.</Note>
21-
<Note type="info" >Mark talks as favorites by opening their details and tapping the ❤️ icon. Your selections are saved locally and will only be visible on this device.</Note>
23+
<Headline as="h1"id={slugify(headline)} title={headline} />
24+
25+
<Note type="warning">This is an early version of the schedule and may still change. If you're planning travel around specific sessions, please keep that in mind.</Note>
26+
<Note type="info" >Mark talks as favorites by opening their details and tapping the ❤️ icon. Your selections are saved locally and will only be visible on this device.</Note>
2227

2328
<div class="layout-wrapper2">
2429
<slot />

‎src/pages/schedule.astro

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,13 @@ const days = await getCollection("days");
1919
2020
---
2121

22-
<Layout description="Browse all scheduled events.">
22+
<Layout description="Browse all scheduled events." headline="Schedule">
2323

2424
{
2525
days.map((day) => (
2626
<ScheduleDay day={day} />
2727
))
2828
}
29-
</Layout>
3029
<script>
3130
window.addEventListener('load', function() {
3231
function checkForAnchorAndHighlight() {
@@ -88,3 +87,4 @@ window.addEventListener('load', function() {
8887
window.addEventListener('hashchange', checkForAnchorAndHighlight);
8988
});
9089
</script>
90+
</Layout>

‎src/pages/schedule/day/[day].astro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ if (!dayEntry) {
2222
const day: Day = dayEntry;
2323
---
2424

25-
<Layout description=`Schedule for the day: ${day.id}`>
25+
<Layout description=`Schedule for the day: ${day.id}` headline=`Schedule for the day: ${day.id}`>
2626
<ScheduleDay day={day} />
2727
</Layout>

‎src/pages/schedule/talks.astro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ const days = await getCollection("days");
2323
2424
---
2525

26-
<Layout description="Browse all scheduled talks.">
26+
<Layout description="Browse all scheduled talks." headline="Talks schedule">
2727
{
2828
days
2929
.filter((day) => {

‎src/pages/schedule/tutorials.astro

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ const days = await getCollection("days");
2323
2424
---
2525

26-
<Layout description="Browse all scheduled tutorials.">
26+
<Layout description="Browse all scheduled tutorials." headline="Tutorials schedule">
2727
{
2828
days
2929
.filter((day) => {

0 commit comments

Comments
 (0)