Skip to content

[pull] master from supabase:master #203

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 26, 2025
Merged

[pull] master from supabase:master #203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b252983
realtime: remove broadcast from footer (#38187)
filipecabaco Aug 25, 2025
b59b002
www nav CTAs to only render after user is loaded (#38177)
joshenlim Aug 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 1 addition & 9 deletions apps/www/components/Footer/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,7 @@ const Footer = (props: Props) => {
useEffect(() => {
const channel = supabase.channel('footer')
if (channel.state === REALTIME_CHANNEL_STATES.closed) {
channel.subscribe((status: string) => {
if (status == 'SUBSCRIBED') {
channel.send({
type: 'broadcast',
event: 'footer_subscribed',
payload: { ts: Date.now() },
})
}
})
channel.subscribe()
}
return () => {
channel.unsubscribe()
Expand Down
93 changes: 49 additions & 44 deletions apps/www/components/Nav/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,9 @@ import { useRouter } from 'next/router'
import React, { useState } from 'react'
import { useWindowSize } from 'react-use'

import { useIsLoggedIn, useUser } from 'common'
import { useIsLoggedIn, useIsUserLoading, useUser } from 'common'
import { Button, buttonVariants, cn } from 'ui'
import { AuthenticatedDropdownMenu } from 'ui-patterns'
import {
NavigationMenu,
NavigationMenuContent,
Expand All @@ -13,15 +14,14 @@ import {
NavigationMenuList,
NavigationMenuTrigger,
} from 'ui/src/components/shadcn/ui/navigation-menu'
import { AuthenticatedDropdownMenu } from 'ui-patterns'

import ScrollProgress from 'components/ScrollProgress'
import { useSendTelemetryEvent } from 'lib/telemetry'
import GitHubButton from './GitHubButton'
import HamburgerButton from './HamburgerMenu'
import MenuItem from './MenuItem'
import MobileMenu from './MobileMenu'
import RightClickBrandLogo from './RightClickBrandLogo'
import { useSendTelemetryEvent } from 'lib/telemetry'
import useDropdownMenu from './useDropdownMenu'

import { getMenu } from 'data/nav'
Expand All @@ -35,12 +35,15 @@ const Nav = ({ hideNavbar, stickyNavbar = true }: Props) => {
const router = useRouter()
const { width } = useWindowSize()
const [open, setOpen] = useState(false)
const isLoggedIn = useIsLoggedIn()
const menu = getMenu()
const sendTelemetryEvent = useSendTelemetryEvent()
const user = useUser()
const userMenu = useDropdownMenu(user)

const isLoggedIn = useIsLoggedIn()
const isLoadingUser = useIsUserLoading()
console.log({ isLoadingUser, isLoggedIn })

const isLaunchWeekPage = router.pathname.includes('/launch-week')
const isLaunchWeekXPage = router.pathname === '/launch-week/x'
const isGAWeekSection = router.pathname.startsWith('/ga-week')
Expand Down Expand Up @@ -126,47 +129,49 @@ const Nav = ({ hideNavbar, stickyNavbar = true }: Props) => {
</NavigationMenuList>
</NavigationMenu>
</div>
<div className="flex items-center gap-2 opacity-0 animate-fade-in !scale-100 delay-300">
<GitHubButton />
{!isLoadingUser && (
<div className="flex items-center gap-2 opacity-0 animate-fade-in !scale-100 delay-300">
<GitHubButton />

{isLoggedIn ? (
<>
<Button className="hidden lg:block" asChild>
<Link href="/dashboard/projects">Dashboard</Link>
</Button>
<AuthenticatedDropdownMenu menu={userMenu} user={user} site="www" />
</>
) : (
<>
<Button type="default" className="hidden lg:block" asChild>
<Link
href="https://supabase.com/dashboard"
onClick={() =>
sendTelemetryEvent({
action: 'sign_in_button_clicked',
properties: { buttonLocation: 'Header Nav' },
})
}
>
Sign in
</Link>
</Button>
<Button className="hidden lg:block" asChild>
<Link
href="https://supabase.com/dashboard"
onClick={() =>
sendTelemetryEvent({
action: 'start_project_button_clicked',
properties: { buttonLocation: 'Header Nav' },
})
}
>
Start your project
</Link>
</Button>
</>
)}
</div>
{isLoggedIn ? (
<>
<Button className="hidden lg:block" asChild>
<Link href="/dashboard/projects">Dashboard</Link>
</Button>
<AuthenticatedDropdownMenu menu={userMenu} user={user} site="www" />
</>
) : (
<>
<Button type="default" className="hidden lg:block" asChild>
<Link
href="https://supabase.com/dashboard"
onClick={() =>
sendTelemetryEvent({
action: 'sign_in_button_clicked',
properties: { buttonLocation: 'Header Nav' },
})
}
>
Sign in
</Link>
</Button>
<Button className="hidden lg:block" asChild>
<Link
href="https://supabase.com/dashboard"
onClick={() =>
sendTelemetryEvent({
action: 'start_project_button_clicked',
properties: { buttonLocation: 'Header Nav' },
})
}
>
Start your project
</Link>
</Button>
</>
)}
</div>
)}
</div>
<HamburgerButton
toggleFlyOut={() => setOpen(true)}
Expand Down
Loading