From 232d09db8672a0f1776aeabae7f572ed7b1ef71a Mon Sep 17 00:00:00 2001
From: Francesco Sansalvadore <f.sansalvadore@gmail.com>
Date: Tue, 4 Apr 2023 11:22:17 +0200
Subject: [PATCH 1/6] chore: lw7 countdown announcement banner

---
 .../LaunchWeek/Banners/CountdownBanner.tsx    | 71 +++++++++++++++++++
 apps/www/components/Layouts/Default.tsx       |  2 +
 apps/www/components/Nav/Announcement.tsx      | 54 +++++---------
 apps/www/components/Nav/index.tsx             |  5 +-
 apps/www/data/Announcement.json               |  6 +-
 apps/www/package.json                         |  1 +
 apps/www/pages/launch-week/index.tsx          |  4 +-
 .../pages/launch-week/tickets/[username].tsx  |  2 +-
 apps/www/pages/launch-week/tickets/index.tsx  |  2 +-
 package-lock.json                             | 22 ++++++
 10 files changed, 124 insertions(+), 45 deletions(-)
 create mode 100644 apps/www/components/LaunchWeek/Banners/CountdownBanner.tsx

diff --git a/apps/www/components/LaunchWeek/Banners/CountdownBanner.tsx b/apps/www/components/LaunchWeek/Banners/CountdownBanner.tsx
new file mode 100644
index 00000000000..ce89ec931ab
--- /dev/null
+++ b/apps/www/components/LaunchWeek/Banners/CountdownBanner.tsx
@@ -0,0 +1,71 @@
+import React from 'react'
+import Link from 'next/link'
+import Countdown from 'react-countdown'
+
+interface CountdownStepProps {
+  value: string | number
+  unit: string
+}
+
+function CountdownStep({ value, unit }: CountdownStepProps) {
+  return (
+    <div className="rounded-md p-[1px] overflow-hidden bg-gradient-to-b from-[#FFFFFF50] to-[#FFFFFF00]">
+      <div className="py-1 px-2 rounded-md leading-4 flex items-center justify-center bg-gradient-to-b from-[#9E44EF40] to-[#DBB8BF40] backdrop-blur-md">
+        <span className="m-0">{value}</span>
+        <span>{unit}</span>
+      </div>
+    </div>
+  )
+}
+
+function CountdownBanner() {
+  const LW7_DATE = '2023-04-10T07:00:00.000-04:00'
+
+  const renderer = ({ days, hours, minutes, seconds, completed }: any) => {
+    if (completed) {
+      // Render a completed state
+      return (
+        <div className="w-full flex gap-3 md:gap-6 items-center justify-center">
+          <p>Supabase Launch Week 7</p>
+          <div>
+            <Link href="/launch-week">
+              <a className="bg-white text-xs px-1.5 md:px-2.5 py-1 rounded-full text-[#9E44EF] shadow-none hover:shadow-mg cursor-pointer">
+                Now live
+              </a>
+            </Link>
+          </div>
+        </div>
+      )
+    } else {
+      // Render a countdown
+      return (
+        <div className="w-full flex gap-3 md:gap-6 items-center md:justify-center text-sm md:text-base">
+          <p>
+            <span className="hidden md:inline">Supabase</span> Launch Week 7
+          </p>
+          <div className="flex gap-1 items-center">
+            <CountdownStep value={days} unit="d" /> :
+            <CountdownStep value={hours} unit="h" /> :
+            <CountdownStep value={minutes} unit="m" /> :
+            <CountdownStep value={seconds} unit="s" />
+          </div>
+          <div>
+            <Link href="/launch-week">
+              <a className="bg-white text-xs px-1.5 md:px-2.5 py-1 rounded-full text-[#9E44EF] shadow-none hover:shadow-mg cursor-pointer">
+                Get your ticket
+              </a>
+            </Link>
+          </div>
+        </div>
+      )
+    }
+  }
+
+  return (
+    <div className="w-full h-14 p-2 bg-gradient-to-r from-[#9E44EF] to-[#DBB8BF] bg-blue-300 flex items-center justify-center text-white">
+      <Countdown date={new Date(LW7_DATE)} renderer={renderer} />
+    </div>
+  )
+}
+
+export default CountdownBanner
diff --git a/apps/www/components/Layouts/Default.tsx b/apps/www/components/Layouts/Default.tsx
index f960816a169..74e60591855 100644
--- a/apps/www/components/Layouts/Default.tsx
+++ b/apps/www/components/Layouts/Default.tsx
@@ -1,6 +1,7 @@
 import { useEffect } from 'react'
 import Nav from 'components/Nav/index'
 import Footer from 'components/Footer/index'
+import CountdownBanner from '../LaunchWeek/Banners/CountdownBanner'
 
 type Props = {
   hideHeader?: boolean
@@ -23,6 +24,7 @@ const DefaultLayout = (props: Props) => {
 
   return (
     <>
+      {/* <CountdownBanner /> */}
       {!hideHeader && <Nav />}
       <div className="min-h-screen">
         <main>{children}</main>
diff --git a/apps/www/components/Nav/Announcement.tsx b/apps/www/components/Nav/Announcement.tsx
index a85d9c524f2..2f5582d9e3e 100644
--- a/apps/www/components/Nav/Announcement.tsx
+++ b/apps/www/components/Nav/Announcement.tsx
@@ -1,26 +1,36 @@
 import React, { useEffect, useState } from 'react'
 
 import _announcement from '~/data/Announcement.json'
-import { IconChevronRight, IconX } from 'ui'
+import { IconX } from 'ui'
 import { useRouter } from 'next/router'
+import { PropsWithChildren } from 'react'
 
-interface AnnouncementProps {
+export interface AnnouncementProps {
   show: boolean
   text: string
-  cta: string
+  launchDate: string
   link: string
   badge?: string
 }
 
 const announcement = _announcement as AnnouncementProps
 
-const Announcement = () => {
+interface AnnouncementComponentProps {
+  show?: boolean
+  className?: string
+}
+
+const Announcement = ({
+  show = true,
+  className,
+  children,
+}: PropsWithChildren<AnnouncementComponentProps>) => {
   const [hidden, setHidden] = useState(true)
 
   const router = useRouter()
 
   // override to hide announcement
-  if (!announcement.show) return null
+  if (!show || !announcement.show) return null
 
   // construct the key for the announcement, based on the title text
   const announcementKey = 'announcement_' + announcement.text.replace(/ /g, '')
@@ -42,50 +52,20 @@ const Announcement = () => {
 
   function handleLink() {
     router.push(announcement.link)
-    window.localStorage.setItem(announcementKey, 'hidden')
   }
 
   if (hidden) {
     return null
   } else {
     return (
-      <div
-        onClick={handleLink}
-        className="
-          launch-week-gradientBg--announcement-bar
-          to-green-1000
-          hover:from-green-1000
-          hover:to-green-1100 relative flex
-          cursor-pointer flex-row
-          space-x-3
-          overflow-hidden
-          text-white
-        "
-      >
-        <div
-          className="
-            mx-auto flex items-center gap-6 justify-center p-3 text-sm font-medium lg:container
-            lg:px-16 xl:px-20
-          "
-        >
-          <span>{announcement.text}</span>
-          <span className="item-center flex gap-2 pr-8 sm:px-3">
-            {announcement.badge && (
-              <div className="bg-[#2E2E2E] text-white py-0.25 rounded-2xl px-3 py-1 border border-gray-1100	whitespace-nowrap">
-                {announcement.badge}
-              </div>
-            )}
-          </span>
-          <span className="hidden items-center space-x-2 px-3 lg:flex">
-            <span>{announcement.cta}</span>
-          </span>
-        </div>
+      <div onClick={handleLink} className={['relative w-full cursor-pointer', className].join(' ')}>
         <div
           className="absolute right-4 flex h-full items-center opacity-50 transition-opacity hover:opacity-100"
           onClick={handleClose}
         >
           <IconX size={16} />
         </div>
+        {children}
       </div>
     )
   }
diff --git a/apps/www/components/Nav/index.tsx b/apps/www/components/Nav/index.tsx
index 17e7eeac174..6173bd1bd84 100644
--- a/apps/www/components/Nav/index.tsx
+++ b/apps/www/components/Nav/index.tsx
@@ -17,6 +17,7 @@ import TextLink from '../TextLink'
 import Image from 'next/image'
 import * as supabaseLogoWordmarkDark from 'common/assets/images/supabase-logo-wordmark--dark.png'
 import * as supabaseLogoWordmarkLight from 'common/assets/images/supabase-logo-wordmark--light.png'
+import CountdownBanner from '../LaunchWeek/Banners/CountdownBanner'
 
 const Nav = () => {
   const { isDarkMode } = useTheme()
@@ -194,7 +195,9 @@ const Nav = () => {
 
   return (
     <>
-      {/* <Announcement /> */}
+      <Announcement>
+        <CountdownBanner />
+      </Announcement>
       <div className="sticky top-0 z-50 transform" style={{ transform: 'translate3d(0,0,999px)' }}>
         <div
           className={[
diff --git a/apps/www/data/Announcement.json b/apps/www/data/Announcement.json
index a0ab4c9ff86..03d59c9081f 100644
--- a/apps/www/data/Announcement.json
+++ b/apps/www/data/Announcement.json
@@ -1,7 +1,7 @@
 {
   "show": true,
-  "text": "Launch Week 6 begins December 12th",
-  "cta": "Don't miss a thing, get your free ticket",
+  "text": "Supabase Launch Week 7",
+  "launchDate": "2023-04-10T07:00:00.000-04:00",
   "link": "https://supabase.com/launch-week",
-  "badge": "Get a reminder"
+  "badge": "Get your ticket"
 }
diff --git a/apps/www/package.json b/apps/www/package.json
index e34b14c8ab1..386cf50b53a 100644
--- a/apps/www/package.json
+++ b/apps/www/package.json
@@ -41,6 +41,7 @@
     "parse-numeric-range": "^1.3.0",
     "react": "^17.0.2",
     "react-copy-to-clipboard": "^5.0.2",
+    "react-countdown": "^2.3.5",
     "react-dom": "^17.0.2",
     "react-ga": "^3.3.0",
     "react-markdown": "^8.0.3",
diff --git a/apps/www/pages/launch-week/index.tsx b/apps/www/pages/launch-week/index.tsx
index d882ec9625c..42fb65e47f2 100644
--- a/apps/www/pages/launch-week/index.tsx
+++ b/apps/www/pages/launch-week/index.tsx
@@ -95,7 +95,7 @@ export default function TicketHome({ users }: Props) {
         }}
       />
       <DefaultLayout>
-        <div className="bg-[#1C1C1C] -mt-20">
+        <div className="bg-[#1C1C1C] -mt-[65px]">
           <div className="relative bg-lw7 pt-20">
             <div className="relative z-10">
               <SectionContainer className="flex flex-col justify-around items-center !py-4 md:!py-8 gap-2 md:gap-4 !px-2 !mx-auto lg:h-[calc(80vh-65px)] min-h-[600px] lg:min-h-[650px]">
@@ -129,7 +129,7 @@ export default function TicketHome({ users }: Props) {
             />
           </div>
 
-          <LaunchWeekPrizeSection className="-mt-20 md:-mt-60" />
+          <LaunchWeekPrizeSection className="-mt-[65px] md:-mt-60" />
 
           {users && <TicketBrickWall users={users} />}
         </div>
diff --git a/apps/www/pages/launch-week/tickets/[username].tsx b/apps/www/pages/launch-week/tickets/[username].tsx
index 7c2707ddf5d..4f711ec921d 100644
--- a/apps/www/pages/launch-week/tickets/[username].tsx
+++ b/apps/www/pages/launch-week/tickets/[username].tsx
@@ -64,7 +64,7 @@ export default function UsernamePage({ user, users, ogImageUrl }: Props) {
         }}
       />
       <DefaultLayout>
-        <div className="bg-[#1C1C1C] -mt-20">
+        <div className="bg-[#1C1C1C] -mt-[65px]">
           <div className="relative bg-lw7 pt-20">
             <div className="relative z-10">
               <SectionContainer className="flex flex-col justify-around items-center !py-4 md:!py-8 gap-2 md:gap-4 !px-2 !mx-auto xl:h-[calc(90vh-65px)] min-h-[600px] md:min-h-[auto] lg:min-h-[650px]">
diff --git a/apps/www/pages/launch-week/tickets/index.tsx b/apps/www/pages/launch-week/tickets/index.tsx
index 2ed83a94917..e916dc8c0c5 100644
--- a/apps/www/pages/launch-week/tickets/index.tsx
+++ b/apps/www/pages/launch-week/tickets/index.tsx
@@ -109,7 +109,7 @@ export default function TicketsPage({ users }: Props) {
         }}
       />
       <DefaultLayout>
-        <div className="bg-[#1C1C1C] -mt-20">
+        <div className="bg-[#1C1C1C] -mt-[65px]">
           <div className="relative bg-lw7 pt-20">
             <div className="relative z-10">
               <SectionContainer className="flex flex-col justify-around items-center !py-4 md:!py-8 gap-2 md:gap-4 !px-2 !mx-auto h-auto">
diff --git a/package-lock.json b/package-lock.json
index b2eee282491..67067295f21 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -682,6 +682,7 @@
         "parse-numeric-range": "^1.3.0",
         "react": "^17.0.2",
         "react-copy-to-clipboard": "^5.0.2",
+        "react-countdown": "^2.3.5",
         "react-dom": "^17.0.2",
         "react-ga": "^3.3.0",
         "react-markdown": "^8.0.3",
@@ -31443,6 +31444,18 @@
         "react": "^15.3.0 || 16 || 17 || 18"
       }
     },
+    "node_modules/react-countdown": {
+      "version": "2.3.5",
+      "resolved": "https://registry.npmjs.org/react-countdown/-/react-countdown-2.3.5.tgz",
+      "integrity": "sha512-K26ENYEesMfPxhRRtm1r+Pf70SErrvW3g4CArLi/x6MPFjgfDFYePT4UghEj8p2nI0cqVV7/JjDgjyr//U60Og==",
+      "dependencies": {
+        "prop-types": "^15.7.2"
+      },
+      "peerDependencies": {
+        "react": ">= 15",
+        "react-dom": ">= 15"
+      }
+    },
     "node_modules/react-csv": {
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/react-csv/-/react-csv-2.2.2.tgz",
@@ -63238,6 +63251,14 @@
         "prop-types": "^15.8.1"
       }
     },
+    "react-countdown": {
+      "version": "2.3.5",
+      "resolved": "https://registry.npmjs.org/react-countdown/-/react-countdown-2.3.5.tgz",
+      "integrity": "sha512-K26ENYEesMfPxhRRtm1r+Pf70SErrvW3g4CArLi/x6MPFjgfDFYePT4UghEj8p2nI0cqVV7/JjDgjyr//U60Og==",
+      "requires": {
+        "prop-types": "^15.7.2"
+      }
+    },
     "react-csv": {
       "version": "2.2.2",
       "resolved": "https://registry.npmjs.org/react-csv/-/react-csv-2.2.2.tgz",
@@ -69302,6 +69323,7 @@
         "postcss-preset-env": "^6.7.0",
         "react": "^17.0.2",
         "react-copy-to-clipboard": "^5.0.2",
+        "react-countdown": "^2.3.5",
         "react-dom": "^17.0.2",
         "react-ga": "^3.3.0",
         "react-markdown": "^8.0.3",

From 6ba3b08575c3c6174db87934ed9509912f33e664 Mon Sep 17 00:00:00 2001
From: Francesco Sansalvadore <f.sansalvadore@gmail.com>
Date: Wed, 5 Apr 2023 09:57:31 +0200
Subject: [PATCH 2/6] chore: add logic to lw announcement banner

---
 .../LaunchWeek/Banners/CountdownBanner.tsx    | 26 ++++++++++++-------
 apps/www/components/Layouts/Default.tsx       |  2 --
 apps/www/components/Nav/Announcement.tsx      | 18 ++++++++-----
 apps/www/components/Nav/index.tsx             |  2 +-
 apps/www/data/Announcement.json               |  2 +-
 5 files changed, 30 insertions(+), 20 deletions(-)

diff --git a/apps/www/components/LaunchWeek/Banners/CountdownBanner.tsx b/apps/www/components/LaunchWeek/Banners/CountdownBanner.tsx
index ce89ec931ab..ff9adbe96a7 100644
--- a/apps/www/components/LaunchWeek/Banners/CountdownBanner.tsx
+++ b/apps/www/components/LaunchWeek/Banners/CountdownBanner.tsx
@@ -1,12 +1,17 @@
 import React from 'react'
 import Link from 'next/link'
 import Countdown from 'react-countdown'
+import _announcement from '~/data/Announcement.json'
+import { AnnouncementProps } from '../../Nav/Announcement'
+import { useRouter } from 'next/router'
 
 interface CountdownStepProps {
   value: string | number
   unit: string
 }
 
+const announcement = _announcement as AnnouncementProps
+
 function CountdownStep({ value, unit }: CountdownStepProps) {
   return (
     <div className="rounded-md p-[1px] overflow-hidden bg-gradient-to-b from-[#FFFFFF50] to-[#FFFFFF00]">
@@ -19,7 +24,8 @@ function CountdownStep({ value, unit }: CountdownStepProps) {
 }
 
 function CountdownBanner() {
-  const LW7_DATE = '2023-04-10T07:00:00.000-04:00'
+  const { pathname } = useRouter()
+  const isLaunchWeekPage = pathname === '/launch-week'
 
   const renderer = ({ days, hours, minutes, seconds, completed }: any) => {
     if (completed) {
@@ -49,13 +55,15 @@ function CountdownBanner() {
             <CountdownStep value={minutes} unit="m" /> :
             <CountdownStep value={seconds} unit="s" />
           </div>
-          <div>
-            <Link href="/launch-week">
-              <a className="bg-white text-xs px-1.5 md:px-2.5 py-1 rounded-full text-[#9E44EF] shadow-none hover:shadow-mg cursor-pointer">
-                Get your ticket
-              </a>
-            </Link>
-          </div>
+          {!isLaunchWeekPage && (
+            <div>
+              <Link href="/launch-week">
+                <a className="bg-white text-xs px-1.5 md:px-2.5 py-1 rounded-full text-[#9E44EF] shadow-none hover:shadow-mg cursor-pointer">
+                  Get your ticket
+                </a>
+              </Link>
+            </div>
+          )}
         </div>
       )
     }
@@ -63,7 +71,7 @@ function CountdownBanner() {
 
   return (
     <div className="w-full h-14 p-2 bg-gradient-to-r from-[#9E44EF] to-[#DBB8BF] bg-blue-300 flex items-center justify-center text-white">
-      <Countdown date={new Date(LW7_DATE)} renderer={renderer} />
+      <Countdown date={new Date(announcement.launchDate)} renderer={renderer} />
     </div>
   )
 }
diff --git a/apps/www/components/Layouts/Default.tsx b/apps/www/components/Layouts/Default.tsx
index 74e60591855..f960816a169 100644
--- a/apps/www/components/Layouts/Default.tsx
+++ b/apps/www/components/Layouts/Default.tsx
@@ -1,7 +1,6 @@
 import { useEffect } from 'react'
 import Nav from 'components/Nav/index'
 import Footer from 'components/Footer/index'
-import CountdownBanner from '../LaunchWeek/Banners/CountdownBanner'
 
 type Props = {
   hideHeader?: boolean
@@ -24,7 +23,6 @@ const DefaultLayout = (props: Props) => {
 
   return (
     <>
-      {/* <CountdownBanner /> */}
       {!hideHeader && <Nav />}
       <div className="min-h-screen">
         <main>{children}</main>
diff --git a/apps/www/components/Nav/Announcement.tsx b/apps/www/components/Nav/Announcement.tsx
index 2f5582d9e3e..60595a309be 100644
--- a/apps/www/components/Nav/Announcement.tsx
+++ b/apps/www/components/Nav/Announcement.tsx
@@ -28,6 +28,7 @@ const Announcement = ({
   const [hidden, setHidden] = useState(true)
 
   const router = useRouter()
+  const isLaunchWeekSection = router.pathname.includes('launch-week')
 
   // override to hide announcement
   if (!show || !announcement.show) return null
@@ -54,17 +55,20 @@ const Announcement = ({
     router.push(announcement.link)
   }
 
-  if (hidden) {
+  // Always show if on LW section
+  if (!isLaunchWeekSection && hidden) {
     return null
   } else {
     return (
       <div onClick={handleLink} className={['relative w-full cursor-pointer', className].join(' ')}>
-        <div
-          className="absolute right-4 flex h-full items-center opacity-50 transition-opacity hover:opacity-100"
-          onClick={handleClose}
-        >
-          <IconX size={16} />
-        </div>
+        {!isLaunchWeekSection && (
+          <div
+            className="absolute right-4 flex h-full items-center opacity-50 transition-opacity hover:opacity-100"
+            onClick={handleClose}
+          >
+            <IconX size={16} />
+          </div>
+        )}
         {children}
       </div>
     )
diff --git a/apps/www/components/Nav/index.tsx b/apps/www/components/Nav/index.tsx
index 6173bd1bd84..7792858587d 100644
--- a/apps/www/components/Nav/index.tsx
+++ b/apps/www/components/Nav/index.tsx
@@ -209,7 +209,7 @@ const Nav = () => {
         <nav
           className={[
             `border-scale-400 border-b backdrop-blur-sm transition-opacity`,
-            showLaunchWeekNavMode && '!opacity-100 border-[#e0d2f430]',
+            showLaunchWeekNavMode && '!opacity-100 !border-[#e0d2f430]',
           ].join(' ')}
         >
           {/* <div className="relative flex justify-between h-16 mx-auto lg:container lg:px-10 xl:px-0"> */}
diff --git a/apps/www/data/Announcement.json b/apps/www/data/Announcement.json
index 03d59c9081f..98d9ed77ecc 100644
--- a/apps/www/data/Announcement.json
+++ b/apps/www/data/Announcement.json
@@ -2,6 +2,6 @@
   "show": true,
   "text": "Supabase Launch Week 7",
   "launchDate": "2023-04-10T07:00:00.000-04:00",
-  "link": "https://supabase.com/launch-week",
+  "link": "/launch-week",
   "badge": "Get your ticket"
 }

From 3e4c1266a8b46002f0a0526e0551b14df734f2f0 Mon Sep 17 00:00:00 2001
From: Francesco Sansalvadore <f.sansalvadore@gmail.com>
Date: Wed, 5 Apr 2023 10:32:22 +0200
Subject: [PATCH 3/6] chore: correct 7AM PT timezone

---
 apps/www/data/Announcement.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/www/data/Announcement.json b/apps/www/data/Announcement.json
index 98d9ed77ecc..ee460e86b28 100644
--- a/apps/www/data/Announcement.json
+++ b/apps/www/data/Announcement.json
@@ -1,7 +1,7 @@
 {
   "show": true,
   "text": "Supabase Launch Week 7",
-  "launchDate": "2023-04-10T07:00:00.000-04:00",
+  "launchDate": "2023-04-10T07:00:00.000-07:00",
   "link": "/launch-week",
   "badge": "Get your ticket"
 }

From d99d27fa31b0e77c131ad36773371061ed183e80 Mon Sep 17 00:00:00 2001
From: Francesco Sansalvadore <f.sansalvadore@gmail.com>
Date: Wed, 5 Apr 2023 11:04:02 +0200
Subject: [PATCH 4/6] chore: restore margin

---
 apps/www/pages/launch-week/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/www/pages/launch-week/index.tsx b/apps/www/pages/launch-week/index.tsx
index 42fb65e47f2..4fea6ced64b 100644
--- a/apps/www/pages/launch-week/index.tsx
+++ b/apps/www/pages/launch-week/index.tsx
@@ -129,7 +129,7 @@ export default function TicketHome({ users }: Props) {
             />
           </div>
 
-          <LaunchWeekPrizeSection className="-mt-[65px] md:-mt-60" />
+          <LaunchWeekPrizeSection className="-mt-20 md:-mt-60" />
 
           {users && <TicketBrickWall users={users} />}
         </div>

From e74b5c59fa7c50c69fff68c55f00954e73c555fe Mon Sep 17 00:00:00 2001
From: Francesco Sansalvadore <f.sansalvadore@gmail.com>
Date: Wed, 5 Apr 2023 11:12:31 +0200
Subject: [PATCH 5/6] chore: center banner content in lw mobile

---
 .../components/LaunchWeek/Banners/CountdownBanner.tsx  | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/apps/www/components/LaunchWeek/Banners/CountdownBanner.tsx b/apps/www/components/LaunchWeek/Banners/CountdownBanner.tsx
index ff9adbe96a7..323336dc44c 100644
--- a/apps/www/components/LaunchWeek/Banners/CountdownBanner.tsx
+++ b/apps/www/components/LaunchWeek/Banners/CountdownBanner.tsx
@@ -26,6 +26,7 @@ function CountdownStep({ value, unit }: CountdownStepProps) {
 function CountdownBanner() {
   const { pathname } = useRouter()
   const isLaunchWeekPage = pathname === '/launch-week'
+  const isLaunchWeekSection = pathname.includes('launch-week')
 
   const renderer = ({ days, hours, minutes, seconds, completed }: any) => {
     if (completed) {
@@ -45,7 +46,12 @@ function CountdownBanner() {
     } else {
       // Render a countdown
       return (
-        <div className="w-full flex gap-3 md:gap-6 items-center md:justify-center text-sm md:text-base">
+        <div
+          className={[
+            'w-full flex gap-3 md:gap-6 items-center md:justify-center text-sm md:text-base',
+            isLaunchWeekSection && '!justify-center',
+          ].join(' ')}
+        >
           <p>
             <span className="hidden md:inline">Supabase</span> Launch Week 7
           </p>
@@ -56,7 +62,7 @@ function CountdownBanner() {
             <CountdownStep value={seconds} unit="s" />
           </div>
           {!isLaunchWeekPage && (
-            <div>
+            <div className="hidden md:block">
               <Link href="/launch-week">
                 <a className="bg-white text-xs px-1.5 md:px-2.5 py-1 rounded-full text-[#9E44EF] shadow-none hover:shadow-mg cursor-pointer">
                   Get your ticket

From 6f4ed6e030de7c55fa78da7eace635d5a5c014af Mon Sep 17 00:00:00 2001
From: Francesco Sansalvadore <f.sansalvadore@gmail.com>
Date: Wed, 5 Apr 2023 11:23:00 +0200
Subject: [PATCH 6/6] chore: cleanup

---
 apps/www/components/LaunchWeek/Banners/CountdownBanner.tsx | 2 +-
 apps/www/components/Nav/index.tsx                          | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/www/components/LaunchWeek/Banners/CountdownBanner.tsx b/apps/www/components/LaunchWeek/Banners/CountdownBanner.tsx
index 323336dc44c..12fe5c3738c 100644
--- a/apps/www/components/LaunchWeek/Banners/CountdownBanner.tsx
+++ b/apps/www/components/LaunchWeek/Banners/CountdownBanner.tsx
@@ -44,7 +44,7 @@ function CountdownBanner() {
         </div>
       )
     } else {
-      // Render a countdown
+      // Render countdown
       return (
         <div
           className={[
diff --git a/apps/www/components/Nav/index.tsx b/apps/www/components/Nav/index.tsx
index 7792858587d..7baf842c5f5 100644
--- a/apps/www/components/Nav/index.tsx
+++ b/apps/www/components/Nav/index.tsx
@@ -334,7 +334,6 @@ const Nav = () => {
                 )}
               </div>
             </div>
-            {/* <div className="absolute inset-y-0 right-0 flex items-center pr-2 sm:static sm:inset-auto sm:ml-6 sm:pr-0"></div> */}
           </div>
           {/* </div> */}
           {/* Mobile Nav Menu */}