Merge branch 'main' of github.com:dddwa/ddd-2024

# Conflicts: # website/app/routes/_layout.agenda.($year).tsx
dddwa · Aug 20, 2024 · cf2cc50 · cf2cc50
2 parents 2b02d69 + f496074
commit cf2cc50
Show file tree

Hide file tree

Showing 2 changed files with 118 additions and 62 deletions.
diff --git a/website/app/components/page-components/SponsorSection.tsx b/website/app/components/page-components/SponsorSection.tsx
@@ -0,0 +1,116 @@
+import { Flex, styled } from 'styled-system/jsx'
+import { Sponsor, Year, YearSponsors } from '~/lib/config-types'
+
+export function SponsorSection({ sponsors, year }: { sponsors: YearSponsors | undefined; year: Year }) {
+    const sponsorStyles = {
+        platinum: { gradientFrom: '#496F7F', logoSize: 'lg' },
+        gold: { gradientFrom: '#453927', logoSize: 'md' },
+        silver: { gradientFrom: '#2A3251', logoSize: 'sm' },
+        bronze: { gradientFrom: '#452927', logoSize: 'xs' },
+        digital: { gradientFrom: '#371F4E', logoSize: 'xs' },
+        community: { gradientFrom: '#1F1F4E', logoSize: 'xs' },
+        coffeeCart: { gradientFrom: '#1F1F4E', logoSize: 'xs' },
+        quietRoom: { gradientFrom: '#1F1F4E', logoSize: 'xs' },
+        keynotes: { gradientFrom: '#1F1F4E', logoSize: 'sm' },
+    } as const
+    const getSponsorStyle = (category: keyof typeof sponsorStyles) => sponsorStyles[category]
+
+    const renderSponsor = (sponsor: Sponsor, category: keyof typeof sponsorStyles, zIndex: number) => {
+        const { gradientFrom } = getSponsorStyle(category)
+
+        return (
+            <styled.a
+                key={sponsor.name}
+                href={sponsor.website}
+                target="_blank"
+                rel="noopener noreferrer"
+                position="relative"
+                display="flex"
+                justifyContent="center"
+                alignItems="center"
+                border="6px solid #0D0D3F"
+                style={{
+                    background: `linear-gradient(to bottom, ${gradientFrom}, #151544)`,
+                    zIndex: zIndex,
+                }}
+                width={260}
+                height={220}
+                ml={-6}
+                zIndex={1}
+                boxShadow="inset -1px 1px 0 0 rgba(255,255,255,0.21)"
+                borderRightRadius="full"
+            >
+                <styled.img
+                    src={sponsor.logoUrl}
+                    alt={sponsor.name}
+                    maxWidth={150}
+                    width="100%"
+                    maxHeight={90}
+                    ml={-3}
+                    display="inline-block"
+                    objectFit="contain"
+                />
+                <styled.h5
+                    position="absolute"
+                    left={3}
+                    bottom={3}
+                    fontSize="xs"
+                    color="white"
+                    mixBlendMode="soft-light"
+                >
+                    {category.charAt(0).toUpperCase() + category.slice(1)} Sponsor
+                </styled.h5>
+            </styled.a>
+        )
+    }
+
+    const renderSponsorGroup = (
+        title: string,
+        sponsorGroups: { sponsors: Sponsor[] | undefined; category: keyof typeof sponsorStyles }[],
+    ) => {
+        const allSponsors = sponsorGroups.flatMap((group) => group.sponsors || [])
+        if (allSponsors.length === 0) return null
+
+        let zIndex = allSponsors.length
+
+        return (
+            <Flex flexDirection="column" alignItems="flex-start" marginBottom="4">
+                <styled.h3 marginBottom="3" fontSize="2xl" textAlign="center" color="#C2C2FF">
+                    {title}
+                </styled.h3>
+                <Flex flexWrap="wrap" alignItems="center" p={6}>
+                    {sponsorGroups.map((group) =>
+                        group.sponsors?.map((sponsor) => {
+                            const sponsorElement = renderSponsor(sponsor, group.category, zIndex)
+                            zIndex -= 1
+                            return sponsorElement
+                        }),
+                    )}
+                </Flex>
+            </Flex>
+        )
+    }
+
+    if (!sponsors) return null
+
+    return (
+        <Flex flexDirection="column" alignItems="flex-start" padding={12} marginY={24}>
+            <styled.h2 fontSize="4xl" textAlign="center" color="white">
+                {year} Sponsors
+            </styled.h2>
+            {renderSponsorGroup('Major Sponsors', [
+                { sponsors: sponsors.platinum, category: 'platinum' },
+                { sponsors: sponsors.gold, category: 'gold' },
+                { sponsors: sponsors.silver, category: 'silver' },
+                { sponsors: sponsors.bronze, category: 'bronze' },
+            ])}
+            {renderSponsorGroup('Minor Sponsors', [
+                { sponsors: sponsors.digital, category: 'digital' },
+                { sponsors: sponsors.community, category: 'community' },
+                { sponsors: sponsors.coffeeCart, category: 'coffeeCart' },
+                { sponsors: sponsors.quietRoom, category: 'quietRoom' },
+                { sponsors: sponsors.keynotes, category: 'keynotes' },
+            ])}
+        </Flex>
+    )
+}
diff --git a/website/app/routes/_layout.agenda.$year.talk.$sessionId.tsx b/website/app/routes/_layout.agenda.$year.talk.$sessionId.tsx
@@ -6,14 +6,8 @@ import { $params, $path } from 'remix-routes'
 import { Box, Flex, styled } from 'styled-system/jsx'
 import { TypeOf } from 'zod'
 import { AppLink } from '~/components/app-link'
-import {
-    ConferenceConfigYear,
-    ConferenceImportantInformation,
-    ConferenceYear,
-    Sponsor,
-    Year,
-    YearSponsors,
-} from '~/lib/config-types'
+import { SponsorSection } from '~/components/page-components/SponsorSection'
+import { ConferenceConfigYear, ConferenceImportantInformation, ConferenceYear, Year } from '~/lib/config-types'
 import { localeTimeFormat } from '~/lib/dates/formatting'
 import { CACHE_CONTROL } from '~/lib/http.server'
 import { conferenceConfig } from '../config/conference-config'
@@ -134,60 +128,6 @@ function ConferenceBrowser({ conferences }: { conferences: { year: Year }[] }) {
     )
 }
 
-function SponsorSection({ sponsors, year }: { sponsors: YearSponsors | undefined; year: Year }) {
-    const renderSponsorCategory = (
-        title: string,
-        sponsors: Sponsor[] | undefined,
-        logoSize: 'xs' | 'sm' | 'md' | 'lg',
-    ) => {
-        if (!sponsors || sponsors.length === 0) return null
-
-        const maxLogoSize =
-            logoSize === 'lg' ? '250px' : logoSize === 'md' ? '150px' : logoSize === 'sm' ? '100px' : '75px'
-        return (
-            <styled.div marginBottom="4" background="white" padding="3" borderRadius="lg">
-                <styled.h3 marginBottom="3" fontSize="2xl" textAlign="center" color="slate.text">
-                    {title}
-                </styled.h3>
-                <styled.div display="flex" flexWrap="wrap" justifyContent="space-around" gap="4" alignItems="center">
-                    {sponsors.map((sponsor) => (
-                        <styled.a key={sponsor.name} href={sponsor.website} target="_blank" rel="noopener noreferrer">
-                            <styled.img
-                                src={sponsor.logoUrl}
-                                alt={sponsor.name}
-                                maxWidth={maxLogoSize}
-                                width="100%"
-                                maxHeight={maxLogoSize}
-                                display="inline-block"
-                                objectFit="contain"
-                            />
-                        </styled.a>
-                    ))}
-                </styled.div>
-            </styled.div>
-        )
-    }
-
-    if (!sponsors) return null
-
-    return (
-        <styled.div padding="4">
-            <styled.h2 fontSize="4xl" textAlign="center" color="white">
-                {year} Sponsors
-            </styled.h2>
-            {renderSponsorCategory('Platinum Sponsors', sponsors.platinum, 'lg')}
-            {renderSponsorCategory('Gold Sponsors', sponsors.gold, 'md')}
-            {renderSponsorCategory('Silver Sponsors', sponsors.silver, 'sm')}
-            {renderSponsorCategory('Bronze Sponsors', sponsors.bronze, 'xs')}
-            {renderSponsorCategory('Community Sponsors', sponsors.community, 'xs')}
-            {renderSponsorCategory('Digital Sponsors', sponsors.digital, 'xs')}
-            {renderSponsorCategory('Coffee Cart Sponsors', sponsors.coffeeCart, 'xs')}
-            {renderSponsorCategory('Quiet Room Sponsors', sponsors.quietRoom, 'xs')}
-            {renderSponsorCategory('Keynote Sponsors', sponsors.keynotes, 'sm')}
-        </styled.div>
-    )
-}
-
 function getImportantInformation(yearConfig: ConferenceYear): ConferenceImportantInformation {
     return {
         date: yearConfig.conferenceDate?.toISO(),