Skip to content

armgit / dub

Public Imported from GitHub
0

The modern link attribution platform. Loved by world-class engineering teams at Twilio, Zillow, Jobber, Vercel, Raycast, and more.

Coordinate dashboard banner visibility and main nav offset

Kiran K522b1f1d0eff
diff --git a/apps/web/app/app.dub.co/(dashboard)/layout.tsx b/apps/web/app/app.dub.co/(dashboard)/layout.tsx
index 9eb2496a6d..b6dce4c75b 100644
--- a/apps/web/app/app.dub.co/(dashboard)/layout.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/layout.tsx
@@ -16,8 +16,8 @@ export default async function Layout({ children }: { children: ReactNode }) {
return (
<>
<div className="min-h-screen w-full bg-white">
- <UpgradeBanner />
<StagingWorkspaceBanner />
+ <UpgradeBanner />
<MainNav
sidebar={AppSidebarNav}
toolContent={
diff --git a/apps/web/lib/hooks/use-dashboard-banner-visible.ts b/apps/web/lib/hooks/use-dashboard-banner-visible.ts
new file mode 100644
index 0000000000..a15d4d51ec
--- /dev/null
+++ b/apps/web/lib/hooks/use-dashboard-banner-visible.ts
@@ -0,0 +1,28 @@
+"use client";
+
+import useWorkspace from "@/lib/swr/use-workspace";
+import { WorkspaceEnvironment } from "@dub/prisma/client";
+
+export function useDashboardBannerVisible() {
+ const {
+ exceededEvents,
+ exceededLinks,
+ exceededPayouts,
+ paymentFailedAt,
+ environment,
+ } = useWorkspace();
+
+ const isUpgradeBannerVisible =
+ exceededEvents || exceededLinks || exceededPayouts || !!paymentFailedAt;
+
+ const isStagingBannerVisible =
+ environment === WorkspaceEnvironment.staging && !isUpgradeBannerVisible;
+
+ const hasBanner = isUpgradeBannerVisible || isStagingBannerVisible;
+
+ return {
+ isUpgradeBannerVisible,
+ isStagingBannerVisible,
+ hasBanner,
+ };
+}
diff --git a/apps/web/ui/layout/main-nav.tsx b/apps/web/ui/layout/main-nav.tsx
index 7c315124ca..8078fd77f2 100644
--- a/apps/web/ui/layout/main-nav.tsx
+++ b/apps/web/ui/layout/main-nav.tsx
@@ -1,5 +1,6 @@
"use client";
+import { useDashboardBannerVisible } from "@/lib/hooks/use-dashboard-banner-visible";
import {
consumePendingDashboardScrollTop,
DUB_DASHBOARD_MAIN_SCROLL_ID,
@@ -18,7 +19,6 @@ import {
useLayoutEffect,
useState,
} from "react";
-import { useUpgradeBannerVisible } from "./upgrade-banner";
type SideNavContext = {
isOpen: boolean;
@@ -45,10 +45,10 @@ export function MainNav({
}>) {
const pathname = usePathname();
const searchParams = useSearchParams();
-
const { isDesktop } = useMediaQuery();
+ const { hasBanner } = useDashboardBannerVisible();
+
const [isOpen, setIsOpen] = useState(false);
- const isUpgradeBannerVisible = useUpgradeBannerVisible();
// Prevent body scroll when side nav is open
useEffect(() => {
@@ -84,9 +84,7 @@ export function MainNav({
isOpen
? "bg-black/20 backdrop-blur-sm"
: "bg-transparent max-lg:pointer-events-none",
- isUpgradeBannerVisible
- ? "top-12 h-[calc(100dvh-48px)]"
- : "top-0 h-dvh",
+ hasBanner ? "top-12 h-[calc(100dvh-48px)]" : "top-0 h-dvh",
)}
onClick={(e) => {
if (e.target === e.currentTarget) {
@@ -108,7 +106,7 @@ export function MainNav({
<div
className={cn(
"bg-neutral-200 pb-[var(--page-bottom-margin)] pt-[var(--page-top-margin)] [--page-bottom-margin:0px] [--page-top-margin:0px] lg:pb-2 lg:pr-2 lg:[--page-bottom-margin:0.5rem] lg:[--page-top-margin:0.5rem]",
- isUpgradeBannerVisible ? "mt-12 h-[calc(100vh-48px)]" : "h-screen",
+ hasBanner ? "mt-12 h-[calc(100vh-48px)]" : "h-screen",
)}
>
<div
diff --git a/apps/web/ui/layout/staging-workspace-banner.tsx b/apps/web/ui/layout/staging-workspace-banner.tsx
index 543ffb45e0..ad7800558b 100644
--- a/apps/web/ui/layout/staging-workspace-banner.tsx
+++ b/apps/web/ui/layout/staging-workspace-banner.tsx
@@ -1,20 +1,19 @@
"use client";
+import { useDashboardBannerVisible } from "@/lib/hooks/use-dashboard-banner-visible";
import useWorkspace from "@/lib/swr/use-workspace";
import useWorkspaces from "@/lib/swr/use-workspaces";
-import { WorkspaceEnvironment } from "@dub/prisma/client";
import { Cube } from "@dub/ui/icons";
import { cn } from "@dub/utils";
import { motion } from "motion/react";
import Link from "next/link";
export function StagingWorkspaceBanner() {
+ const { id } = useWorkspace();
const { workspaces } = useWorkspaces();
- const { id, environment } = useWorkspace();
+ const { isStagingBannerVisible } = useDashboardBannerVisible();
- const isVisible = environment === WorkspaceEnvironment.staging;
-
- if (!isVisible) {
+ if (!isStagingBannerVisible) {
return null;
}
@@ -27,7 +26,7 @@ export function StagingWorkspaceBanner() {
initial={{ transform: "translateY(-100%)" }}
animate={{ transform: "translateY(0)" }}
className={cn(
- "fixed left-0 right-0 z-50 flex items-center justify-between gap-4 overflow-hidden bg-amber-200 px-4 py-1.5 text-neutral-900",
+ "fixed left-0 right-0 top-0 z-50 flex h-12 items-center justify-between gap-4 overflow-hidden bg-amber-200 px-4 text-neutral-900",
)}
>
<div className="flex min-w-0 shrink-0 items-center gap-2">
diff --git a/apps/web/ui/layout/upgrade-banner.tsx b/apps/web/ui/layout/upgrade-banner.tsx
index 4c1d750ac2..2b1a96ffc9 100644
--- a/apps/web/ui/layout/upgrade-banner.tsx
+++ b/apps/web/ui/layout/upgrade-banner.tsx
@@ -1,5 +1,6 @@
"use client";
+import { useDashboardBannerVisible } from "@/lib/hooks/use-dashboard-banner-visible";
import useWorkspace from "@/lib/swr/use-workspace";
import { useTrialLimitActivateModal } from "@/ui/modals/trial-limit-activate-modal";
import { Crown } from "@dub/ui";
@@ -12,14 +13,6 @@ import { motion } from "motion/react";
import Link from "next/link";
import ManageSubscriptionButton from "../workspaces/manage-subscription-button";
-export function useUpgradeBannerVisible() {
- const { exceededEvents, exceededLinks, exceededPayouts, paymentFailedAt } =
- useWorkspace();
-
- const needsUpgrade = exceededEvents || exceededLinks || exceededPayouts;
- return needsUpgrade || !!paymentFailedAt;
-}
-
export function UpgradeBanner() {
const { slug, exceededEvents, exceededLinks, exceededPayouts, trialEndsAt } =
useWorkspace();
@@ -27,15 +20,19 @@ export function UpgradeBanner() {
useTrialLimitActivateModal();
const trialActive = isWorkspaceBillingTrialActive(trialEndsAt);
- const needsUpgrade = exceededEvents || exceededLinks || exceededPayouts;
const overageLimitResource = getTrialLimitResourceForOverageBanner({
exceededEvents: Boolean(exceededEvents),
exceededLinks: Boolean(exceededLinks),
exceededPayouts: Boolean(exceededPayouts),
});
- const isVisible = useUpgradeBannerVisible();
- if (!isVisible) return null;
+ const { isUpgradeBannerVisible } = useDashboardBannerVisible();
+
+ if (!isUpgradeBannerVisible) {
+ return null;
+ }
+
+ const needsUpgrade = exceededEvents || exceededLinks || exceededPayouts;
return (
<>