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 23, 2024
2 parents af97ae6 + f253e19 commit 203efed
Show file tree
Hide file tree
Showing 27 changed files with 397 additions and 62 deletions.
1 change: 1 addition & 0 deletions cspell.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
"fosstodon",
"griffing",
"Harborside",
"hor'dourves",
"igalia",
"inngest",
"Instabase",
Expand Down
Binary file added src/assets/branding/hero-dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/branding/hero-light.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/branding/thumbnail.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 24 additions & 0 deletions src/assets/partners/hack-diversity-blue.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
24 changes: 24 additions & 0 deletions src/assets/partners/hack-diversity-white.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/partners/react-africa-dark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/partners/react-africa-light.webp
Binary file not shown.
Binary file added src/assets/venues/howlAtTheMoonDark.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/assets/venues/howlAtTheMoonLight.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
14 changes: 10 additions & 4 deletions src/components/AdImage.astro
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,21 @@ import { Image } from "astro:assets";
interface Props {
src: ImageMetadata;
}
const className =
Astro.props.src.height > Astro.props.src.width
? "ad-image-tall"
: "ad-image-wide";
---

<Image alt="" class="ad-image" src={Astro.props.src} />
<Image alt="" class:list={["ad-image", className]} src={Astro.props.src} />

<style>
.ad-image {
height: 100%;
.ad-image-tall {
max-height: 15rem;
}

.ad-image-wide {
max-width: 70vw;
width: 100%;
}
</style>
1 change: 1 addition & 0 deletions src/components/Footer.astro
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import AnchorButton from "./AnchorButton.astro";

<style>
footer {
background: var(--colorBackdropLight);
align-items: center;
display: flex;
gap: 2rem;
Expand Down
27 changes: 24 additions & 3 deletions src/components/Partners.astro
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,21 @@ import HeadingFlanked from "./HeadingFlanked.astro";
alt=""
class="partner-logo partner-logo-dark"
src={partner.logos.dark}
height={120}
width={
partner.logos.light.width > partner.logos.light.height * 2
? 250
: 150
}
/>
<Image
alt=""
class="partner-logo partner-logo-light"
src={partner.logos.light}
height={120}
width={
partner.logos.light.width > partner.logos.light.height * 2
? 250
: 150
}
/>
</a>
))
Expand All @@ -60,6 +68,13 @@ import HeadingFlanked from "./HeadingFlanked.astro";
margin: 0 auto;
}

.partner {
align-items: center;
display: flex;
justify-content: center;
min-height: 7rem;
}

.partner-logo {
transform: scale(0.9);
user-select: none;
Expand All @@ -83,12 +98,18 @@ import HeadingFlanked from "./HeadingFlanked.astro";
}

.partners a {
padding: 1.5rem;
padding: 1.5rem 0;
}

.partner {
max-width: calc(49% - 5rem);
width: 100%;
}
}

@media (min-width: 1024px) {
.partner {
max-width: calc(35% - 5rem);
}
}
</style>
9 changes: 9 additions & 0 deletions src/components/PrimaryHero.astro
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,15 @@ import TicketsButton from "./TicketsButton.astro";
<NoBreak>Now Available</NoBreak>
<Image alt="" class="link-out" src={LinkOut} />
</a>
<a
class="sub-mention"
href={links.volunteering}
target="_blank"
rel="noreferrer"
>
Attendee Volunteering Event
<Image alt="" class="link-out" src={LinkOut} />
</a>
</div>

<ThemeToggle />
Expand Down
9 changes: 2 additions & 7 deletions src/components/SponsorLogos.astro
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,7 @@
import _ from "lodash";
import { Image } from "astro:assets";
import { sponsorsBySlug } from "~/data/sponsors";
const sponsorGroups = _.groupBy(
Object.values(sponsorsBySlug),
(sponsor) => sponsor.placement,
);
import { sponsorsByPlacement } from "~/data/sponsors";
interface Props {
light?: boolean;
Expand All @@ -24,7 +19,7 @@ const { size = "normal", light } = Astro.props;
]}
>
{
Object.values(sponsorGroups).map((sponsors) => (
Object.values(sponsorsByPlacement).map((sponsors) => (
<div class="sponsor-group">
{sponsors!.map((sponsor) => (
<a
Expand Down
20 changes: 20 additions & 0 deletions src/data/partners.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
import afhBlack from "../assets/partners/afh-black.svg";
import afhWhite from "../assets/partners/afh-white.svg";
import conTejasCode from "../assets/partners/contejas-code.png";
import hackDiversityBlue from "../assets/partners/hack-diversity-blue.svg";
import hackDiversityWhite from "../assets/partners/hack-diversity-white.svg";
import jsParty from "../assets/partners/js-party.png";
import reactAfricaDark from "../assets/partners/react-africa-dark.png";
import reactAfricaLight from "../assets/partners/react-africa-light.webp";
import thisWeekInReactDarkMode from "../assets/partners/this-week-in-react-dark-mode.png";
import thisWeekInReactLightMode from "../assets/partners/this-week-in-react-light-mode.png";

Expand All @@ -22,6 +26,14 @@ export const partnersBySlug = {
},
title: "ConTejas Code Podcast",
},
hackDiversity: {
href: "https://www.hackdiversity.com/?utm_source=squiggleconf",
logos: {
dark: hackDiversityWhite,
light: hackDiversityBlue,
},
title: "Hack.Diversity",
},
jsparty: {
href: "https://changelog.com/jsparty?utm_source=squiggleconf",
logos: {
Expand All @@ -30,6 +42,14 @@ export const partnersBySlug = {
},
title: "JS Party",
},
reactAfrica: {
href: "https://react-africa.com/?utm_source=squiggleconf",
logos: {
dark: reactAfricaLight,
light: reactAfricaDark,
},
title: "React Africa",
},
twir: {
href: "https://thisweekinreact.com?utm_source=squiggleconf",
logos: {
Expand Down
9 changes: 7 additions & 2 deletions src/data/schedule.ts
Original file line number Diff line number Diff line change
Expand Up @@ -231,10 +231,15 @@ export const days: ScheduleDay[] = [
title: "Closing Announcements",
},
{
at: "7:30pm",
description: [
"We'll set up a casual space for folks to mingle after the conference. Location and time TBA.",
"Subscribe to our [newsletter](/#newsletter) to be the first to hear about it.",
"After dinner, bring your badge for entry and hang out with the organizers, speakers, and fellow attendees in our mixer.",
"Expect locally prepared hor'dourves and a craft lemonade stand.",
],
location: {
href: "https://www.howlatthemoon.com/boston",
text: "Howl at the Moon Boston",
},
title: "Post-Conference Hangout",
},
],
Expand Down
10 changes: 10 additions & 0 deletions src/data/sponsors.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import _ from "lodash";

import bloombergBlack from "../assets/sponsors/bloomberg-black.svg";
import bloombergWhite from "../assets/sponsors/bloomberg-white.svg";
import datastaxBlack from "../assets/sponsors/datastax-black.svg";
Expand Down Expand Up @@ -78,3 +80,11 @@ export const sponsorsBySlug = {
title: "Prisma",
},
};

export const sponsorsByPlacement = _.groupBy(
Object.entries(sponsorsBySlug).map(([slug, sponsor]) => ({
slug,
...sponsor,
})),
(sponsor) => sponsor.placement,
);
13 changes: 13 additions & 0 deletions src/data/venues.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import howlAtTheMoonDark from "../assets/venues/howlAtTheMoonDark.png";
import howlAtTheMoonLight from "../assets/venues/howlAtTheMoonLight.png";

export const venuesBySlug = {
howlAtTheMoon: {
href: "https://howlatthemoon.com?utm_source=squiggleconf",
logos: {
dark: howlAtTheMoonLight,
light: howlAtTheMoonDark,
},
title: "Howl at the Moon",
},
};
4 changes: 2 additions & 2 deletions src/layouts/BadgeLayout.astro
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ import "./normalize.css";
</main>
<style>
.badge {
width: 45rem;
height: 60rem;
width: 42rem;
height: 63rem;
position: absolute;
}

Expand Down
Loading

0 comments on commit 203efed

Please sign in to comment.