Skip to content

Commit

Permalink
Merge branch 'main'
Browse files Browse the repository at this point in the history
  • Loading branch information
JoshuaKGoldberg committed Sep 3, 2024
2 parents e55c83d + ba2e658 commit f0ad4af
Show file tree
Hide file tree
Showing 22 changed files with 144 additions and 62 deletions.
19 changes: 19 additions & 0 deletions .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,25 @@
"projectManagement",
"tool"
]
},
{
"login": "nicolo-ribaudo",
"name": "Nicolò Ribaudo",
"avatar_url": "https://avatars.githubusercontent.com/u/7000710?v=4",
"profile": "https://nicr.dev",
"contributions": [
"code"
]
},
{
"login": "offroaders123",
"name": "Brandon Bennett",
"avatar_url": "https://avatars.githubusercontent.com/u/65947371?v=4",
"profile": "https://github.com/Offroaders123",
"contributions": [
"ideas",
"code"
]
}
],
"contributorsPerLine": 7,
Expand Down
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<p align="center">
<!-- prettier-ignore-start -->
<!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
<a href="#contributors" target="_blank"><img alt="👪 All Contributors: 2" src="https://img.shields.io/badge/%F0%9F%91%AA_all_contributors-2-21bb42.svg" /></a>
<a href="#contributors" target="_blank"><img alt="👪 All Contributors: 4" src="https://img.shields.io/badge/%F0%9F%91%AA_all_contributors-4-21bb42.svg" /></a>
<!-- ALL-CONTRIBUTORS-BADGE:END -->
<!-- prettier-ignore-end -->
<a href="https://github.com/JoshuaKGoldberg/SquiggleConf/blob/main/.github/CODE_OF_CONDUCT.md" target="_blank"><img alt="🤝 Code of Conduct: Kept" src="https://img.shields.io/badge/%F0%9F%A4%9D_code_of_conduct-kept-21bb42" /></a>
Expand All @@ -28,8 +28,10 @@ pnpm dev
<table>
<tbody>
<tr>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/Offroaders123"><img src="https://avatars.githubusercontent.com/u/65947371?v=4?s=100" width="100px;" alt="Brandon Bennett"/><br /><sub><b>Brandon Bennett</b></sub></a><br /><a href="#ideas-offroaders123" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/SquiggleTools/SquiggleConf/commits?author=offroaders123" title="Code">💻</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/dimitropoulos"><img src="https://avatars.githubusercontent.com/u/15232461?v=4?s=100" width="100px;" alt="Dimitri Mitropoulos"/><br /><sub><b>Dimitri Mitropoulos</b></sub></a><br /><a href="https://github.com/SquiggleTools/SquiggleConf/commits?author=dimitropoulos" title="Code">💻</a> <a href="#content-dimitropoulos" title="Content">🖋</a> <a href="https://github.com/SquiggleTools/SquiggleConf/commits?author=dimitropoulos" title="Documentation">📖</a> <a href="#ideas-dimitropoulos" title="Ideas, Planning, & Feedback">🤔</a> <a href="#infra-dimitropoulos" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#maintenance-dimitropoulos" title="Maintenance">🚧</a> <a href="#projectManagement-dimitropoulos" title="Project Management">📆</a> <a href="#tool-dimitropoulos" title="Tools">🔧</a></td>
<td align="center" valign="top" width="14.28%"><a href="http://www.joshuakgoldberg.com/"><img src="https://avatars.githubusercontent.com/u/3335181?v=4?s=100" width="100px;" alt="Josh Goldberg ✨"/><br /><sub><b>Josh Goldberg ✨</b></sub></a><br /><a href="https://github.com/SquiggleTools/SquiggleConf/commits?author=JoshuaKGoldberg" title="Code">💻</a> <a href="#content-JoshuaKGoldberg" title="Content">🖋</a> <a href="https://github.com/SquiggleTools/SquiggleConf/commits?author=JoshuaKGoldberg" title="Documentation">📖</a> <a href="#ideas-JoshuaKGoldberg" title="Ideas, Planning, & Feedback">🤔</a> <a href="#infra-JoshuaKGoldberg" title="Infrastructure (Hosting, Build-Tools, etc)">🚇</a> <a href="#maintenance-JoshuaKGoldberg" title="Maintenance">🚧</a> <a href="#projectManagement-JoshuaKGoldberg" title="Project Management">📆</a> <a href="#tool-JoshuaKGoldberg" title="Tools">🔧</a> <a href="https://github.com/SquiggleTools/SquiggleConf/issues?q=author%3AJoshuaKGoldberg" title="Bug reports">🐛</a></td>
<td align="center" valign="top" width="14.28%"><a href="https://nicr.dev"><img src="https://avatars.githubusercontent.com/u/7000710?v=4?s=100" width="100px;" alt="Nicolò Ribaudo"/><br /><sub><b>Nicolò Ribaudo</b></sub></a><br /><a href="https://github.com/SquiggleTools/SquiggleConf/commits?author=nicolo-ribaudo" title="Code">💻</a></td>
</tr>
</tbody>
</table>
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"@fontsource-variable/josefin-sans": "5.0.21",
"@fontsource/urbanist": "5.0.20",
"@types/eslint-plugin-markdown": "2.0.2",
"accessible-astro-components": "2.3.6",
"accessible-astro-components": "^2.3.6",
"astro": "4.11.5",
"cspell": "8.10.4",
"eslint": "8.57.0",
Expand Down
2 changes: 1 addition & 1 deletion pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added public/apple-touch-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/components/FAQs.astro
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ At the very least, SquiggleConf will include:
[
"What is the full schedule of events?",
await markdown(
`We will let you know soon! This is partially dependent on the CFP and corporate sponsorships. Subscribe to the <a href="/#newsletter">newsletter</a> to be the first to know!`,
`See <a href="/schedule">Schedule</a>! Subscribe to the <a href="/#newsletter">newsletter</a> to be the first to know as more is added.`,
),
],
],
Expand Down
2 changes: 2 additions & 0 deletions src/components/Head.astro
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,12 @@ const metaPairs = [
<head>
<meta charset="utf-8" />
<link href="/favicon.png" rel="icon" type="image/svg+xml" />
<link href="/apple-touch-icon.png" rel="apple-touch-icon" sizes="180x180" />
{metaPairs.map((meta) => <meta {...meta} />)}
<meta content={description} name="description" />
<meta content={keywords.join()} name="keywords" />
<meta content={Astro.generator} name="generator" />
<meta content="width=device-width" name="viewport" />
<meta content="SquiggleConf" name="apple-mobile-web-app-title" />
<title>{title}</title>
</head>
1 change: 1 addition & 0 deletions src/components/HeadingFlanked.astro
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,6 @@ const { class: className, id, ...rest } = Astro.props;

.heading {
font-size: var(--fontSizeH2);
text-align: center;
}
</style>
2 changes: 1 addition & 1 deletion src/components/MCs.astro
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import BioLinks from "./BioLinks.astro";
<CardsList>
{
(["nick-nisi", "fatima-sarah-khalid"] as const).map((person) => (
<SubtleCard class="mc-card">
<SubtleCard class="mc-card" renderAs="li">
<SpeakerSmall
href={`/speakers#${peopleBySlug[person].slug}`}
person={peopleBySlug[person]}
Expand Down
7 changes: 6 additions & 1 deletion src/components/Partners.astro
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,12 @@ import HeadingFlanked from "./HeadingFlanked.astro";
<div class="partners">
{
partners.map((partner) => (
<a href={partner.href} rel="noreferrer" target="_blank">
<a
href={partner.href}
rel="noreferrer"
target="_blank"
title={partner.title}
>
<Image
alt=""
class="partner-logo partner-logo-dark"
Expand Down
44 changes: 30 additions & 14 deletions src/components/ScheduledActivity.astro
Original file line number Diff line number Diff line change
Expand Up @@ -20,54 +20,70 @@ const descriptionLines = await Promise.all(
<div class:list={["scheduled-activity", className]} {...rest}>
<Heading level="h3" class="activity-title">{activity.title}</Heading>
<div class="activity-locators">
<div class="activity-time">
{activity.time && <span class="activity-time-zone">EDT</span>}
<span class="activity-time-value">{activity.time ?? "Time TBA"}</span>
</div>
<div class="activity-time">{activity.time ?? "Time TBA"}</div>
<div class="activity-location">{activity.location ?? "Location TBA"}</div>
</div>
<div class="activity-description">{descriptionLines}</div>
</div>

<style>
.scheduled-activity {
display: grid;
font-family: var(--fontFamilyBody);
gap: 0.75rem 1rem;
grid-template-columns: clamp(5rem, 20vw, 10rem) auto;
grid-template-rows: auto auto;
margin: 0 var(--widthBodyPadding) 3rem;
max-width: var(--widthBodyLean);
}

.activity-title {
font-size: var(--fontSizeH3);
grid-area: 1 / 2 / 2 / 3;
}

.activity-locators {
display: flex;
flex-direction: column;
gap: 0.75rem;
grid-area: 1 / 1 / 3 / 2;
text-align: right;
justify-content: space-between;
margin: 0.5rem 0;
}

.activity-time-value {
.activity-time {
font-size: var(--fontSizeH3);
font-family: var(--fontFamilyHeading);
}

.activity-location {
font-size: var(--fontSizeBody);
text-align: right;
}

.activity-description {
display: flex;
gap: 0.5rem;
flex-direction: column;
grid-area: 2 / 2 / 3 / 3;
font-size: var(--fontSizeBody);
width: 100%;
}

@media (min-width: 490px) {
.scheduled-activity {
display: grid;
grid-template-columns: clamp(5rem, 20vw, 10rem) auto;
grid-template-rows: auto auto;
gap: 0.75rem 1rem;
}

.activity-title {
grid-area: 1 / 2 / 2 / 3;
}

.activity-locators {
grid-area: 1 / 1 / 3 / 2;
flex-direction: column;
margin: 0;
justify-content: flex-start;
text-align: right;
}

.activity-description {
grid-area: 2 / 2 / 3 / 3;
}
}
</style>
18 changes: 1 addition & 17 deletions src/components/SessionTags.astro
Original file line number Diff line number Diff line change
@@ -1,23 +1,7 @@
---
import SessionTag, { SessionTagSize } from "./SessionTag.astro";
const languageSoup = [
"Rust",
"TypeScript",
"Zig",
"Go",
"C++",
"C",
"OCaml",
"Haskell",
"Python",
"Ruby",
"Elixir",
"Java",
".Net",
"Perl",
"PHP",
];
const languageSoup = ["Rust", "TypeScript", "Zig", "Go", "C++", "C"];
interface Props {
class?: string;
Expand Down
6 changes: 2 additions & 4 deletions src/components/Speaker.astro
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,20 @@ import SubtleCard from "./SubtleCard.astro";
interface Props {
class?: string;
showBioLinkText?: boolean;
renderAs: "div" | "li";
speaker: Person;
talks: TalkInfo[];
}
const {
class: className,
renderAs: As,
showBioLinkText,
speaker: { links, qualification, name, role, slug },
talks,
...rest
} = Astro.props;
---

<As class:list={["speaker", className]} id={slug} {...rest}>
<li class:list={["speaker", className]} id={slug} {...rest}>
<SubtleCard>
<div class="speaker-top">
<div class="speaker-top-content">
Expand Down Expand Up @@ -81,7 +79,7 @@ const {
}
</div>
</SubtleCard>
</As>
</li>

<style>
.speaker {
Expand Down
12 changes: 8 additions & 4 deletions src/components/SpeakerSmall.astro
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,16 @@ interface Props {
const { class: className, href, person: speaker, ...rest } = Astro.props;
---

<li class:list={["speaker", className]} {...rest}>
<div class:list={["speaker-small", className]} {...rest}>
<div class="speaker-image-container">
<SpeakerImage name={speaker.name} slug={speaker.slug} />
</div>
<div class="speaker-text">
{href && <a class="speaker-text-links" href={href} />}
{
href && (
<a class="speaker-text-links" href={href} aria-label={speaker.name} />
)
}
<div class="name">{speaker.name}</div>
<div class="details">
{
Expand All @@ -38,10 +42,10 @@ const { class: className, href, person: speaker, ...rest } = Astro.props;
</div>
<slot />
</div>
</li>
</div>

<style>
.speaker {
.speaker-small {
position: relative;
align-items: center;
display: flex;
Expand Down
2 changes: 1 addition & 1 deletion src/components/SpeakersContent.astro
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import BioLinks from "./BioLinks.astro";
{
talks.flatMap((talk) =>
talk.people.map((person) => (
<SubtleCard class="speaker-card">
<SubtleCard class="speaker-card" renderAs="li">
<SpeakerSmall href={`/talks#${talk.slug}`} person={person}>
<BioLinks
class="speaker-bio-links"
Expand Down
7 changes: 6 additions & 1 deletion src/components/Sponsors.astro
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,12 @@ import HeadingFlanked from "./HeadingFlanked.astro";
<div class="sponsors">
{
Object.values(sponsorsBySlug).map((sponsor) => (
<a href={sponsor.href} rel="noreferrer" target="_blank">
<a
href={sponsor.href}
rel="noreferrer"
target="_blank"
title={sponsor.title}
>
<Image
alt=""
class="sponsor-logo-dark"
Expand Down
8 changes: 5 additions & 3 deletions src/components/SubtleCard.astro
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
---
interface Props {
class?: string;
renderAs?: "div" | "li";
}
const { class: className, ...rest } = Astro.props;
const { class: className, renderAs: As = "div", ...rest } = Astro.props;
---

<div class:list={["subtle-card", className]} {...rest}>
<As class:list={["subtle-card", className]} {...rest}>
<slot />
</div>
</As>

<style>
.subtle-card {
Expand All @@ -19,6 +20,7 @@ const { class: className, ...rest } = Astro.props;
border: 1px solid var(--colorBackdropOff);
box-shadow: 0 0 0.125rem var(--colorTextShadow);
font-family: var(--fontFamilyBody);
list-style: none;
padding: var(--cardPadding);
}
</style>
2 changes: 1 addition & 1 deletion src/data/schedule.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export const days: ScheduleDay[] = [
{
description: ["Full-length and lightning talks from our speakers."],
location: "Simons Theater",
time: "9:45am",
time: "9:40am",
title: "Talks",
},
{
Expand Down
2 changes: 1 addition & 1 deletion src/layouts/ContentLayout.astro
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import BaseLayout from "./BaseLayout.astro";

<BaseLayout>
<SkipLinks />
<main>
<main id="main-content">
<Header />
<slot />
</main>
Expand Down
9 changes: 9 additions & 0 deletions src/pages/schedule.astro
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,16 @@ import PrimaryContents from "~/components/PrimaryContents.astro";
import ScheduledActivity from "~/components/ScheduledActivity.astro";
import ContentLayout from "~/layouts/ContentLayout.astro";
import { days } from "~/data/schedule";
import BodyText from "~/components/BodyText.astro";
---

<ContentLayout>
<HeroForPage>Schedule</HeroForPage>

<BodyText class="schedule-body-text" width="lean">
All times are in EDT, local to Boston.
</BodyText>

<PrimaryContents>
{
days.map(({ activities, title }) => (
Expand All @@ -28,6 +33,10 @@ import { days } from "~/data/schedule";
</ContentLayout>

<style>
.schedule-body-text {
margin: 4rem auto 0;
}

.schedule-day:not(:last-of-type) {
margin-bottom: 3rem;
}
Expand Down
1 change: 0 additions & 1 deletion src/pages/speakers.astro
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@ const speakersToExclude = new Set([
)
.map((person) => (
<Speaker
renderAs="li"
speaker={person}
talks={Object.values(talksBySlug).filter((talk) =>
talk.people.includes(person),
Expand Down
Loading

0 comments on commit f0ad4af

Please sign in to comment.