diff --git a/apps/www/components/LaunchWeek/13/Multiplayer/CanvasSingleMode.tsx b/apps/www/components/LaunchWeek/13/Multiplayer/CanvasSingleMode.tsx index 0a586f0c2a1..0383fa446d8 100644 --- a/apps/www/components/LaunchWeek/13/Multiplayer/CanvasSingleMode.tsx +++ b/apps/www/components/LaunchWeek/13/Multiplayer/CanvasSingleMode.tsx @@ -197,7 +197,7 @@ export default function InteractiveGridSingle() { height={CANVAS_HEIGHT} onMouseMove={handleMouseMove} onMouseLeave={handleMouseLeave} - className="border border-gray-300 shadow-lg" + className="border border-gray-300 shadow-lg pointer-events-auto" /> {/* Current user cursor */} diff --git a/apps/www/components/LaunchWeek/13/Releases/LWHeader.tsx b/apps/www/components/LaunchWeek/13/Releases/LWHeader.tsx index b30dca5c251..d55fc2b6c59 100644 --- a/apps/www/components/LaunchWeek/13/Releases/LWHeader.tsx +++ b/apps/www/components/LaunchWeek/13/Releases/LWHeader.tsx @@ -1,23 +1,29 @@ import React from 'react' import { cn } from 'ui' import SectionContainer from '~/components/Layouts/SectionContainer' +import CanvasSingleMode from '../Multiplayer/CanvasSingleMode' // import LW12Background from '../LW12Background' const LWHeader = ({ className }: { className?: string }) => { return ( -
-
-
- {/* */} +
+
+
+
-
+
- -

+ +

Launch Week 13

-

- Join us for a week of new features and find new ways to level up your development +

+ A week of new features and new ways to level up your development.

diff --git a/apps/www/components/LaunchWeek/13/ThreeTicketCanvas.tsx b/apps/www/components/LaunchWeek/13/ThreeTicketCanvas.tsx index 41317552b9b..c662e10e4a5 100644 --- a/apps/www/components/LaunchWeek/13/ThreeTicketCanvas.tsx +++ b/apps/www/components/LaunchWeek/13/ThreeTicketCanvas.tsx @@ -52,7 +52,7 @@ const ThreeTicketCanvas: React.FC<{ hasWon, } = useLwGame(inputRef) - const MIN_CANVAS_HEIGHT = 600 + const CANVAS_HEIGHT = 600 const FLIP_DELTA = 20 // Swipe px threshold for flipping const LINE_HEIGHT = 1.6 const SCALE_VARIATION_ON_INTERACTION = 0.025 @@ -112,8 +112,7 @@ const ThreeTicketCanvas: React.FC<{ targetScale.current = scale const calculateDesktopWidth = () => window.innerWidth const initialCanvasWidth = calculateDesktopWidth() - const initialCanvasHeight = - window.innerHeight < MIN_CANVAS_HEIGHT ? MIN_CANVAS_HEIGHT - 65 : window.innerHeight - 65 + const initialCanvasHeight = CANVAS_HEIGHT const ticketYIdleRotation = 0 // Initialize scene, camera, and renderer @@ -440,14 +439,9 @@ const ThreeTicketCanvas: React.FC<{ ticketGroup.position.x = getTicketXPosition(window.innerWidth, ALIGN_RIGHT) const tickeScale = getTicketScale(window.innerWidth) ticketGroup.scale.set(tickeScale, tickeScale, tickeScale) - camera.aspect = - newWidth / - (window.innerHeight < MIN_CANVAS_HEIGHT ? MIN_CANVAS_HEIGHT - 65 : window.innerHeight - 65) + camera.aspect = newWidth / CANVAS_HEIGHT camera.updateProjectionMatrix() - renderer.setSize( - newWidth, - window.innerHeight < MIN_CANVAS_HEIGHT ? MIN_CANVAS_HEIGHT - 65 : window.innerHeight - 65 - ) + renderer.setSize(newWidth, CANVAS_HEIGHT) } function onKeyDown(event: KeyboardEvent) { diff --git a/apps/www/components/LaunchWeek/13/Ticket/TicketForm.tsx b/apps/www/components/LaunchWeek/13/Ticket/TicketForm.tsx index 66d42bf2e8c..843b920d9bd 100644 --- a/apps/www/components/LaunchWeek/13/Ticket/TicketForm.tsx +++ b/apps/www/components/LaunchWeek/13/Ticket/TicketForm.tsx @@ -43,7 +43,10 @@ export default function TicketForm() { }) .select() .single() - .then(({ error }: any) => fetchUser({ error, username })) + .then(({ data, error }: any) => { + console.log(data, error, username, userData) + fetchUser({ error, username }) + }) } } } @@ -125,7 +128,7 @@ export default function TicketForm() { const redirectTo = `${SITE_ORIGIN}/launch-week/${ userData.username ? '?referral=' + userData.username : '' - }#ticket` + }` supabase?.auth.signInWithOAuth({ provider: 'github', diff --git a/apps/www/components/LaunchWeek/13/Ticket/TicketingFlow.tsx b/apps/www/components/LaunchWeek/13/Ticket/TicketingFlow.tsx index 33c58759fd0..ecbfa466ef1 100644 --- a/apps/www/components/LaunchWeek/13/Ticket/TicketingFlow.tsx +++ b/apps/www/components/LaunchWeek/13/Ticket/TicketingFlow.tsx @@ -38,25 +38,9 @@ const TicketingFlow = () => { const DISPLAY_NAME = userData?.name || userData?.username const FIRST_NAME = DISPLAY_NAME?.split(' ')[0] - const PartyModeButton = () => ( - - ) - return ( <> - +

Supabase Launch Week 13 | {LW13_DATE}

@@ -131,10 +115,10 @@ const TicketingFlow = () => { initial={initial} animate={animate} exit={exit} - className="w-full flex-1 lg:min-h-[400px] lg:pl-12 h-full flex flex-col lg:flex-row items-center lg:justify-start lg:items-start gap-8 md:gap-10 lg:gap-32 text-foreground text-center md:text-left" + className="w-full flex-1 lg:min-h-[400px] lg:pl-12 h-full flex flex-col lg:flex-row items-center lg:justify-start gap-8 md:gap-10 lg:gap-32 text-foreground text-center md:text-left" > -
-
+
+
{/* Header */}
{hasPlatinumTicket ? ( @@ -157,27 +141,7 @@ const TicketingFlow = () => { Registrations are closed but you can still claim a ticket.
- -
-
- - -
+
{ )} diff --git a/apps/www/pages/launch-week/index.tsx b/apps/www/pages/launch-week/index.tsx index faad6a76eb9..d095ebcd330 100644 --- a/apps/www/pages/launch-week/index.tsx +++ b/apps/www/pages/launch-week/index.tsx @@ -14,10 +14,11 @@ import SectionContainer from '~/components/Layouts/SectionContainer' import LWStickyNav from '~/components/LaunchWeek/13/Releases/LWStickyNav' import LWHeader from '~/components/LaunchWeek/13/Releases/LWHeader' import MainStage from '~/components/LaunchWeek/13/Releases/MainStage' +import TicketingFlow from '~/components/LaunchWeek/13/Ticket/TicketingFlow' const BuildStage = dynamic(() => import('~/components/LaunchWeek/13/Releases/BuildStage')) const CTABanner = dynamic(() => import('~/components/CTABanner')) -const TicketingFlow = dynamic(() => import('~/components/LaunchWeek/13/Ticket/TicketingFlow')) +// const TicketingFlow = dynamic(() => import('~/components/LaunchWeek/13/Ticket/TicketingFlow')) // const LW13Meetups = dynamic( // () => import('~/components/LaunchWeek/13/LWMeetups') // )