Skip to content

Commit

Permalink
Merge pull request #4 from dddwa/fix/sponsor-and-agenda-fixes
Browse files Browse the repository at this point in the history
Fix/sponsor and agenda fixes
  • Loading branch information
JakeGinnivan authored Oct 1, 2024
2 parents 6e18a7d + e72fe2f commit fbd1786
Show file tree
Hide file tree
Showing 18 changed files with 634 additions and 440 deletions.
125 changes: 62 additions & 63 deletions website/app/components/header/header.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,71 +4,70 @@ import { Box, Flex, styled } from '../../../styled-system/jsx'
import { AppLink } from '../app-link'

export function Header() {
return (
<>
<styled.header position="relative" bgColor="#070727" w="100%" display="flex" zIndex="10" py={4}>
<Box w="100%" position="relative" maxW="1200px" m="0 auto">
<Box w="100%" position="relative">
<Flex flexDir="row" justifyContent="space-between" alignItems="center">
<Flex flexDir="row" justifyContent="flex-start" alignItems="flex-start" md={{ p: '4' }}>
<AppLink
aria-label={`Visit the ${conferenceConfig.name} homepage`}
to={`/`}
display="flex"
justifyContent="flex-start"
alignItems="center"
ml={4}
width={{ base: 110, md: 180 }}
>
<Logo />
</AppLink>
</Flex>
<Flex
flexDir="row"
alignItems="center"
fontSize={{ base: 'sm', md: 'md' }}
gap={{ base: 4, md: 12 }}
fontWeight={600}
>
{/* <styled.a href="/event/speakers" color="white" _hover={{ color: '#8282FB' }}>
return (
<styled.header position="relative" bgColor="#070727" w="100%" display="flex" zIndex="10" py={4}>
<Box w="100%" position="relative" maxW="1200px" m="0 auto">
<Box w="100%" position="relative">
<Flex flexDir="row" justifyContent="space-between" alignItems="center">
<Flex flexDir="row" justifyContent="flex-start" alignItems="flex-start" p={{ base: 4, md: 0 }}>
<AppLink
aria-label={`Visit the ${conferenceConfig.name} homepage`}
to={`/`}
display="flex"
justifyContent="flex-start"
alignItems="center"
ml={{ base: 4, md: 0 }}
width={{ base: 110, md: 180 }}
>
<Logo />
</AppLink>
</Flex>
<Flex
flexDir="row"
alignItems="center"
fontSize={{ base: 'sm', md: 'md' }}
gap={{ base: 4, md: 12 }}
fontWeight={600}
>
{/* <styled.a href="/event/speakers" color="white" _hover={{ color: '#8282FB' }}>
Speakers
</styled.a> */}
<styled.a href="/agenda" color="white" _hover={{ color: '#8282FB' }}>
Agenda
</styled.a>
<styled.a href="/about" color="white" _hover={{ color: '#8282FB' }}>
About
</styled.a>
{/* <styled.a href="/blog" color="white" _hover={{ color: '#8282FB' }}>
<styled.a href="/agenda" color="white" _hover={{ color: '#8282FB' }}>
Agenda
</styled.a>
<styled.a href="/about" color="white" _hover={{ color: '#8282FB' }}>
About
</styled.a>
{/* <styled.a href="/blog" color="white" _hover={{ color: '#8282FB' }}>
Blog
</styled.a> */}
<styled.a
href="/tickets"
color="#520030"
_hover={{ gradientTo: '#FF52B7' }}
bgGradient="to-r"
gradientFrom="#FF52B7"
gradientTo="#FF8273"
borderRightRadius={100}
display="flex"
whiteSpace="nowrap"
flexWrap="nowrap"
fontWeight={600}
gap={2}
px={{ base: 2, md: 4 }}
py={2}
mr={4}
xl={{
mr: 0,
}}
>
Buy Tickets <styled.span display={{ base: 'hidden', md: 'inline-block' }}></styled.span>
</styled.a>
</Flex>
</Flex>
</Box>
</Box>
</styled.header>
</>
)
<styled.a
href="/tickets"
color="#520030"
_hover={{ gradientTo: '#FF52B7' }}
bgGradient="to-r"
gradientFrom="#FF52B7"
gradientTo="#FF8273"
borderRightRadius={100}
display="flex"
whiteSpace="nowrap"
flexWrap="nowrap"
fontWeight={600}
gap={2}
px={{ base: 2, md: 4 }}
py={2}
mr={4}
xl={{
mr: 0,
}}
>
Buy Tickets{' '}
<styled.span display={{ base: 'hidden', md: 'inline-block' }}></styled.span>
</styled.a>
</Flex>
</Flex>
</Box>
</Box>
</styled.header>
)
}
18 changes: 9 additions & 9 deletions website/app/components/page-components/SponsorSection.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ export function SponsorSection({ sponsors, year }: { sponsors: YearSponsors | un
gold: { gradientFrom: '#453927', logoSize: 'md' },
silver: { gradientFrom: '#2A3251', logoSize: 'sm' },
bronze: { gradientFrom: '#452927', logoSize: 'xs' },
room: { gradientFrom: '#1F1F4E', logoSize: 'xs' },
digital: { gradientFrom: '#371F4E', logoSize: 'xs' },
community: { gradientFrom: '#1F1F4E', logoSize: 'xs' },
coffeeCart: { gradientFrom: '#1F1F4E', logoSize: 'xs' },
Expand Down Expand Up @@ -94,18 +95,17 @@ export function SponsorSection({ sponsors, year }: { sponsors: YearSponsors | un
if (!sponsors) return null

return (
<Flex flexDirection="column" alignItems="flex-start" padding={12} marginY={24}>
<Flex flexDirection="column" alignItems="flex-start" marginY={16}>
<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' },
{renderSponsorGroup('Platinum', [{ sponsors: sponsors.platinum, category: 'platinum' }])}
{renderSponsorGroup('Gold', [{ sponsors: sponsors.gold, category: 'gold' }])}
{renderSponsorGroup('Silver', [{ sponsors: sponsors.silver, category: 'silver' }])}
{renderSponsorGroup('Bronze', [{ sponsors: sponsors.bronze, category: 'bronze' }])}
{renderSponsorGroup('Room', [{ sponsors: sponsors.room, category: 'room' }])}
{renderSponsorGroup('Digital', [{ sponsors: sponsors.digital, category: 'digital' }])}
{renderSponsorGroup('Other Sponsors', [
{ sponsors: sponsors.community, category: 'community' },
{ sponsors: sponsors.coffeeCart, category: 'coffeeCart' },
{ sponsors: sponsors.quietRoom, category: 'quietRoom' },
Expand Down
213 changes: 125 additions & 88 deletions website/app/config/years/2024.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,101 +3,138 @@ import { ConferenceYear } from '../../lib/config-types'

Settings.throwOnInvalid = true
declare module 'luxon' {
interface TSSettings {
throwOnInvalid: true
}
interface TSSettings {
throwOnInvalid: true
}
}

export const conference2024: ConferenceYear = {
year: '2024',
venue: undefined,
year: '2024',
venue: undefined,

ticketPrice: '$60',
sessionizeUrl: 'https://sessionize.com/ddd-perth-2024',
ticketPrice: '$60',
sessionizeUrl: 'https://sessionize.com/ddd-perth-2024',

sessions: {
kind: 'sessionize',
sessionizeEndpoint: 'https://sessionize.com/api/v2/vedvlykn',
},
sessions: {
kind: 'sessionize',
sessionizeEndpoint: 'https://sessionize.com/api/v2/vedvlykn',
},

conferenceDate: DateTime.fromISO('2024-11-16'),
agendaPublishedDateTime: DateTime.fromISO('2024-08-20T17:00:00', {
zone: 'Australia/Perth',
}),
cfpDates: {
opens: DateTime.fromISO('2024-06-14T08:00:00', {
zone: 'Australia/Perth',
conferenceDate: DateTime.fromISO('2024-11-16'),
agendaPublishedDateTime: DateTime.fromISO('2024-08-20T17:00:00', {
zone: 'Australia/Perth',
}),
closes: DateTime.fromISO('2024-07-12T23:59:59', {
zone: 'Australia/Perth',
cfpDates: {
opens: DateTime.fromISO('2024-06-14T08:00:00', {
zone: 'Australia/Perth',
}),
closes: DateTime.fromISO('2024-07-12T23:59:59', {
zone: 'Australia/Perth',
}),
},
talkVotingDates: {
opens: DateTime.fromISO('2024-07-23T00:00:00', {
zone: 'Australia/Perth',
}),
closes: DateTime.fromISO('2024-08-06T23:59:59', {
zone: 'Australia/Perth',
}),
},
ticketSalesDates: {
opens: DateTime.fromISO('2024-06-21T08:00:00', {
zone: 'Australia/Perth',
}),
closes: DateTime.fromISO('2024-11-15T23:59:59', {
zone: 'Australia/Perth',
}),
},
feedbackOpenUntilDateTime: DateTime.fromISO('2024-11-21T23:59:59', {
zone: 'Australia/Perth',
}),
},
talkVotingDates: {
opens: DateTime.fromISO('2024-07-23T00:00:00', {
zone: 'Australia/Perth',
}),
closes: DateTime.fromISO('2024-08-06T23:59:59', {
zone: 'Australia/Perth',
}),
},
ticketSalesDates: {
opens: DateTime.fromISO('2024-06-21T08:00:00', {
zone: 'Australia/Perth',
}),
closes: DateTime.fromISO('2024-11-15T23:59:59', {
zone: 'Australia/Perth',
}),
},
feedbackOpenUntilDateTime: DateTime.fromISO('2024-11-21T23:59:59', {
zone: 'Australia/Perth',
}),
ticketInfo: {
type: 'tito',
accountId: 'dddperth',
eventId: '2024',
},
ticketInfo: {
type: 'tito',
accountId: 'dddperth',
eventId: '2024',
},

sponsors: {
platinum: [
{
name: 'MakerX',
website: 'https://makerx.com.au/',
logoUrl: '/images/sponsors/2024-makerx.svg',
},
],
gold: [
{
name: 'Mantel Group',
website: 'https://mantelgroup.com.au/',
logoUrl: '/images/sponsors/2024-mantel-group.svg',
},
{
name: 'Virtual Gaming Worlds',
website: 'https://www.vgw.co/',
logoUrl: '/images/sponsors/2024-vgw.svg',
},
{
name: 'Qoria',
website: 'https://qoria.com/',
logoUrl: '/images/sponsors/2024-qoria.svg',
},
{
name: 'Tricentis',
website: 'https://www.tricentis.com/',
logoUrl: '/images/sponsors/2024-tricentis.svg',
},
{
name: 'Woodside Energy',
website: 'https://www.woodside.com/',
logoUrl: '/images/sponsors/2024-woodside.svg',
},
],
digital: [
{
name: 'Akkodis',
website: 'https://akkodis.com/',
logoUrl: '/images/sponsors/2024-akkodis.svg',
},
],
},
sponsors: {
platinum: [
{
name: 'Bankwest',
website: 'https://www.bankwest.com.au/',
logoUrl: '/images/sponsors/2024-bankwest.svg',
},
{
name: 'MakerX',
website: 'https://makerx.com.au/',
logoUrl: '/images/sponsors/2024-makerx.svg',
},
],
gold: [
{
name: 'Insight',
website: 'https://au.insight.com/',
logoUrl: '/images/sponsors/2024-insight.svg',
},
{
name: 'Mantel Group',
website: 'https://mantelgroup.com.au/',
logoUrl: '/images/sponsors/2024-mantel-group.svg',
},
{
name: 'Qoria',
website: 'https://qoria.com/',
logoUrl: '/images/sponsors/2024-qoria.svg',
},
{
name: 'Telstra / Versent',
website: 'https://www.telstra.com.au/',
logoUrl: '/images/sponsors/2024-telstra-versent.svg',
},
{
name: 'Tricentis',
website: 'https://www.tricentis.com/',
logoUrl: '/images/sponsors/2024-tricentis.svg',
},
{
name: 'Virtual Gaming Worlds',
website: 'https://www.vgw.co/',
logoUrl: '/images/sponsors/2024-vgw.svg',
},
{
name: 'Woodside Energy',
website: 'https://www.woodside.com/',
logoUrl: '/images/sponsors/2024-woodside.svg',
},
],
room: [
{
name: 'Microsoft',
website: 'https://www.microsoft.com/',
logoUrl: '/images/sponsors/2024-microsoft.svg',
},
{
name: 'SoftwareOne',
website: 'https://www.softwareone.com/',
logoUrl: '/images/sponsors/2024-softwareone.svg',
},
],
digital: [
{
name: 'AFG',
website: 'https://www.afgonline.com.au/',
logoUrl: '/images/sponsors/2024-afg.svg',
},
{
name: 'Akkodis',
website: 'https://akkodis.com/',
logoUrl: '/images/sponsors/2024-akkodis.svg',
},
{
name: 'Interfuze',
website: 'https://interfuze.com/',
logoUrl: '/images/sponsors/2024-interfuze.svg',
},
],
},
}
Loading

0 comments on commit fbd1786

Please sign in to comment.