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.

Settings pages update

Marcus Farrell18cc0230586b
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/layout.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/layout.tsx
new file mode 100644
index 0000000000..72053141f1
--- /dev/null
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/layout.tsx
@@ -0,0 +1,11 @@
+import { PageContent } from "@/ui/layout/page-content";
+import { PageWidthWrapper } from "@/ui/layout/page-width-wrapper";
+import { ReactNode } from "react";
+
+export default function BillingLayout({ children }: { children: ReactNode }) {
+ return (
+ <PageContent title="Billing">
+ <PageWidthWrapper>{children}</PageWidthWrapper>
+ </PageContent>
+ );
+}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/payment-methods.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/payment-methods.tsx
index 5e817fd967..0c143f2fc8 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/payment-methods.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/payment-methods.tsx
@@ -45,7 +45,7 @@ export default function PaymentMethods() {
}
return (
- <div className="rounded-lg border border-neutral-200 bg-white">
+ <div className="mb-8 rounded-xl border border-neutral-200 bg-white">
<div className="flex flex-col items-start justify-between gap-y-4 p-6 md:flex-row md:items-center md:p-8">
<div>
<h2 className="text-xl font-medium">Payment methods</h2>
@@ -63,7 +63,7 @@ export default function PaymentMethods() {
/>
)}
</div>
- <div className="grid gap-4 border-t border-neutral-200 bg-neutral-100 p-6">
+ <div className="grid gap-4 rounded-b-xl border-t border-neutral-200 bg-neutral-100 p-6">
{regularPaymentMethods ? (
regularPaymentMethods.length > 0 ? (
regularPaymentMethods.map((paymentMethod) => (
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/plan-usage.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/plan-usage.tsx
index 0ba9ca824e..cd3866e6d8 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/plan-usage.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/billing/plan-usage.tsx
@@ -124,7 +124,7 @@ export default function PlanUsage() {
}, [usage, usageLimit, linksUsage, linksLimit, totalLinks]);
return (
- <div className="rounded-lg border border-neutral-200 bg-white">
+ <div className="rounded-xl border border-neutral-200 bg-white">
<div className="flex flex-col items-start justify-between gap-y-4 p-6 md:px-8 lg:flex-row">
<div>
<h2 className="text-xl font-medium">
@@ -206,7 +206,7 @@ export default function PlanUsage() {
href={`/${slug}/settings/people`}
/>
</div>
- <div className="grid grid-cols-1 gap-[1px] overflow-hidden rounded-b-lg bg-neutral-200 md:grid-cols-4">
+ <div className="grid grid-cols-1 gap-[1px] overflow-hidden rounded-b-xl bg-neutral-200 md:grid-cols-4">
<UsageCategory
title="Partners"
icon={Users}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/security/audit-logs.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/security/audit-logs.tsx
index 70a8f2eaf2..22febaef3a 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/security/audit-logs.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/security/audit-logs.tsx
@@ -66,15 +66,15 @@ export function AuditLogs() {
};
return (
- <div className="rounded-lg border border-neutral-200 bg-white">
- <div className="flex flex-col gap-6 p-5 sm:p-10">
- <div className="flex flex-col gap-1.5">
- <h2 className="text-xl font-semibold">Audit Logs</h2>
+ <div className="mb-6 rounded-xl border border-neutral-200 bg-white">
+ <div className="relative flex flex-col gap-5 p-5">
+ <div className="flex flex-col gap-1">
+ <h2 className="text-base font-medium text-neutral-900">Audit Logs</h2>
<p className="text-sm text-neutral-500">
Workspace partner and payout history
</p>
</div>
- <div className="flex flex-col gap-4 rounded-md border border-neutral-200 bg-neutral-50 p-4 sm:flex-row sm:items-center sm:justify-between sm:gap-2 sm:bg-white">
+ <div className="flex flex-col items-start justify-between space-y-4 rounded-xl border border-neutral-200 bg-white p-4 sm:flex-row sm:items-center sm:justify-between sm:space-y-0">
<SimpleDateRangePicker
className="w-full sm:max-w-xs"
align="start"
@@ -104,7 +104,7 @@ export function AuditLogs() {
</div>
{!canExportAuditLogs && (
- <div className="flex items-center justify-between rounded-b-lg border-t border-neutral-200 bg-neutral-50 px-3 py-3 sm:px-10">
+ <div className="flex flex-col items-start justify-between space-y-3 rounded-b-xl border-t border-neutral-200 bg-neutral-50 px-5 py-4 sm:flex-row sm:items-center sm:justify-between sm:space-y-0">
<span className="text-sm text-neutral-500">
Audit logs are available on the{" "}
<a
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/security/layout.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/security/layout.tsx
new file mode 100644
index 0000000000..7e0300fb08
--- /dev/null
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/security/layout.tsx
@@ -0,0 +1,11 @@
+import { PageContent } from "@/ui/layout/page-content";
+import { PageWidthWrapper } from "@/ui/layout/page-width-wrapper";
+import { ReactNode } from "react";
+
+export default function SecurityLayout({ children }: { children: ReactNode }) {
+ return (
+ <PageContent title="Security">
+ <PageWidthWrapper>{children}</PageWidthWrapper>
+ </PageContent>
+ );
+}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/security/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/security/page-client.tsx
index e0f652eb15..d961a22893 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/security/page-client.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/security/page-client.tsx
@@ -6,10 +6,10 @@ import { SCIM } from "./scim";
export default function WorkspaceSecurityClient() {
return (
- <>
+ <div className="flex flex-col gap-6">
<SAML />
<SCIM />
<AuditLogs />
- </>
+ </div>
);
}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/security/saml.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/security/saml.tsx
index 9ab7dc6ba6..90424166a8 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/security/saml.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/security/saml.tsx
@@ -110,19 +110,21 @@ export function SAML() {
return (
<>
{configured ? <RemoveSAMLModal /> : <SAMLModal />}
- <div className="rounded-lg border border-neutral-200 bg-white">
- <div className="relative p-5 sm:p-10">
- <div className="flex flex-col space-y-3">
- <h2 className="text-xl font-medium">SAML Single Sign-On</h2>
+ <div className="rounded-xl border border-neutral-200 bg-white">
+ <div className="relative flex flex-col gap-5 p-5">
+ <div className="flex flex-col gap-1">
+ <h2 className="text-base font-medium text-neutral-900">
+ SAML Single Sign-On
+ </h2>
<p className="text-sm text-neutral-500">
Set up SAML Single Sign-On (SSO) to allow your team to sign in to{" "}
{process.env.NEXT_PUBLIC_APP_NAME} with your identity provider.
</p>
</div>
- <div className="mt-8 rounded-t-md border border-neutral-200 px-4 py-3">
- <div className="flex items-center justify-between">
- <div className="flex items-center space-x-4">
+ <div className="rounded-xl border border-neutral-200 bg-white">
+ <div className="flex flex-col items-start justify-between space-y-4 px-4 py-4 sm:flex-row sm:items-center sm:justify-between sm:space-y-0">
+ <div className="flex flex-col items-start gap-4 sm:flex-row sm:items-center">
{data.logo || (
<div className="h-8 w-8 animate-pulse rounded-full bg-neutral-100" />
)}
@@ -197,40 +199,40 @@ export function SAML() {
)}
</div>
</div>
- </div>
- <div className="flex items-center justify-between rounded-b-md border border-t-0 border-neutral-200 bg-neutral-50 px-4 py-3">
- <div className="flex items-center gap-2">
- <label className="text-sm font-medium text-neutral-700">
- Require workspace members to login with SAML to access this
- workspace
- </label>
- {workspaceData?.ssoEnforcedAt && (
- <Badge
- variant="blueGradient"
- className="flex items-center gap-1"
- >
- <Globe2 className="size-3" />
- {ssoEmailDomain}
- </Badge>
- )}
+ <div className="flex items-center justify-between rounded-b-xl border-t border-neutral-200 bg-neutral-50 px-4 py-3">
+ <div className="flex items-center gap-2">
+ <label className="text-sm font-medium text-neutral-800">
+ Require workspace members to login with SAML to access this
+ workspace
+ </label>
+ {workspaceData?.ssoEnforcedAt && (
+ <Badge
+ variant="blueGradient"
+ className="flex items-center gap-1"
+ >
+ <Globe2 className="size-3" />
+ {ssoEmailDomain}
+ </Badge>
+ )}
+ </div>
+ <Switch
+ checked={workspaceData?.ssoEnforcedAt !== null}
+ loading={isLoading}
+ disabled={plan !== "enterprise"}
+ fn={handleSSOEnforcementChange}
+ />
</div>
- <Switch
- checked={workspaceData?.ssoEnforcedAt !== null}
- loading={isLoading}
- disabled={plan !== "enterprise"}
- fn={handleSSOEnforcementChange}
- />
</div>
</div>
- <div className="rounded-b-lg border-t border-neutral-200 bg-neutral-50 px-3 py-5 sm:px-10">
+ <div className="rounded-b-xl border-t border-neutral-200 bg-neutral-50 px-5 pb-4 pt-3">
<a
href="https://dub.co/help/category/saml-sso"
target="_blank"
className="text-sm text-neutral-400 underline underline-offset-4 transition-colors hover:text-neutral-700"
>
- Learn more about SAML SSO.
+ Learn more about SAML SSO
</a>
</div>
</div>
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/security/scim.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/security/scim.tsx
index e0f0c402c0..8b85d34c3c 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/security/scim.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/security/scim.tsx
@@ -52,113 +52,118 @@ export function SCIM() {
return (
<>
- <SCIMModal />
- {configured && <RemoveSCIMModal />}
- <div className="rounded-lg border border-neutral-200 bg-white">
- <div className="relative flex flex-col space-y-6 p-5 sm:p-10">
- <div className="flex flex-col space-y-3">
- <h2 className="text-xl font-medium">Directory Sync</h2>
+ {configured ? <RemoveSCIMModal /> : <SCIMModal />}
+ <div className="rounded-xl border border-neutral-200 bg-white">
+ <div className="relative flex flex-col gap-5 p-5">
+ <div className="flex flex-col gap-1">
+ <h2 className="text-base font-medium text-neutral-900">
+ Directory Sync
+ </h2>
<p className="text-sm text-neutral-500">
Automatically provision and deprovision users from your identity
provider.
</p>
</div>
- <div className="mt-2 flex items-center justify-between rounded-md border border-neutral-200 px-4 py-3">
- <div className="flex items-center space-x-4">
- {data.logo || (
- <div className="h-8 w-8 animate-pulse rounded-full bg-neutral-100" />
- )}
- <div className="flex flex-col">
- {data.title ? (
- <h3 className="font-medium">{data.title}</h3>
- ) : (
- <div className="h-5 w-20 animate-pulse rounded-md bg-neutral-100" />
+ <div className="rounded-xl border border-neutral-200 bg-white">
+ <div className="flex flex-col items-start justify-between space-y-4 px-4 py-4 sm:flex-row sm:items-center sm:justify-between sm:space-y-0">
+ <div className="flex flex-col items-start gap-4 sm:flex-row sm:items-center">
+ {data.logo || (
+ <div className="h-8 w-8 animate-pulse rounded-full bg-neutral-100" />
)}
- {data.description ? (
- <p className="text-sm text-neutral-500">{data.description}</p>
+ <div className="flex flex-col">
+ {data.title ? (
+ <h3 className="font-medium">{data.title}</h3>
+ ) : (
+ <div className="h-5 w-20 animate-pulse rounded-md bg-neutral-100" />
+ )}
+ {data.description ? (
+ <p className="text-sm text-neutral-500">
+ {data.description}
+ </p>
+ ) : (
+ <div className="mt-2 h-4 w-40 animate-pulse rounded-md bg-neutral-100" />
+ )}
+ </div>
+ </div>
+ <div>
+ {loading ? (
+ <div className="h-9 w-24 animate-pulse rounded-md bg-neutral-100" />
+ ) : configured ? (
+ <Popover
+ content={
+ <div className="grid w-full gap-1 p-2 sm:w-48">
+ <button
+ onClick={() => {
+ setShowSCIMModal(true);
+ setOpenPopover(false);
+ }}
+ className="rounded-md p-2 text-sm font-medium text-neutral-500 transition-all duration-75 hover:bg-neutral-100"
+ >
+ <IconMenu
+ text="View configuration"
+ icon={<FolderSync className="h-4 w-4" />}
+ />
+ </button>
+ <button
+ onClick={() => {
+ setShowRemoveSCIMModal(true);
+ setOpenPopover(false);
+ }}
+ className="rounded-md p-2 text-left text-sm font-medium text-red-600 transition-all duration-75 hover:bg-red-600 hover:text-white"
+ >
+ <IconMenu
+ text="Remove"
+ icon={<ShieldOff className="h-4 w-4" />}
+ />
+ </button>
+ </div>
+ }
+ align="end"
+ openPopover={openPopover}
+ setOpenPopover={setOpenPopover}
+ >
+ <button
+ type="button"
+ onClick={(e) => {
+ e.stopPropagation();
+ setOpenPopover(!openPopover);
+ }}
+ className="rounded-md px-1 py-2 transition-all duration-75 hover:bg-neutral-100 active:bg-neutral-200"
+ >
+ <span className="sr-only">Edit</span>
+ <ThreeDots className="h-5 w-5 text-neutral-500" />
+ </button>
+ </Popover>
) : (
- <div className="mt-2 h-4 w-40 animate-pulse rounded-md bg-neutral-100" />
+ <Button
+ text="Configure"
+ disabled={plan !== "enterprise"}
+ {...(plan !== "enterprise" && {
+ disabledTooltip: (
+ <TooltipContent
+ title="SCIM Directory Sync is only available on Enterprise plans. Upgrade to get started."
+ cta="Contact sales"
+ href="https://dub.co/enterprise"
+ target="_blank"
+ />
+ ),
+ })}
+ onClick={() => setShowSCIMModal(true)}
+ />
)}
</div>
</div>
- <div>
- {loading ? (
- <div className="h-9 w-24 animate-pulse rounded-md bg-neutral-100" />
- ) : configured ? (
- <Popover
- content={
- <div className="grid w-full gap-1 p-2 sm:w-48">
- <button
- onClick={() => {
- setShowSCIMModal(true);
- setOpenPopover(false);
- }}
- className="rounded-md p-2 text-sm font-medium text-neutral-500 transition-all duration-75 hover:bg-neutral-100"
- >
- <IconMenu
- text="View configuration"
- icon={<FolderSync className="h-4 w-4" />}
- />
- </button>
- <button
- onClick={() => {
- setShowRemoveSCIMModal(true);
- setOpenPopover(false);
- }}
- className="rounded-md p-2 text-left text-sm font-medium text-red-600 transition-all duration-75 hover:bg-red-600 hover:text-white"
- >
- <IconMenu
- text="Remove"
- icon={<ShieldOff className="h-4 w-4" />}
- />
- </button>
- </div>
- }
- align="end"
- openPopover={openPopover}
- setOpenPopover={setOpenPopover}
- >
- <button
- type="button"
- onClick={(e) => {
- e.stopPropagation();
- setOpenPopover(!openPopover);
- }}
- className="rounded-md px-1 py-2 transition-all duration-75 hover:bg-neutral-100 active:bg-neutral-200"
- >
- <span className="sr-only">Edit</span>
- <ThreeDots className="h-5 w-5 text-neutral-500" />
- </button>
- </Popover>
- ) : (
- <Button
- text="Configure"
- disabled={plan !== "enterprise"}
- {...(plan !== "enterprise" && {
- disabledTooltip: (
- <TooltipContent
- title="SCIM Directory Sync is only available on Enterprise plans. Upgrade to get started."
- cta="Contact sales"
- href="https://dub.co/enterprise"
- target="_blank"
- />
- ),
- })}
- onClick={() => setShowSCIMModal(true)}
- />
- )}
- </div>
</div>
</div>
- <div className="flex items-center justify-between rounded-b-lg border-t border-neutral-200 bg-neutral-50 px-3 py-5 sm:px-10">
+ <div className="rounded-b-xl border-t border-neutral-200 bg-neutral-50 px-5 pb-4 pt-3">
<a
href="https://dub.co/help/category/saml-sso"
target="_blank"
className="text-sm text-neutral-400 underline underline-offset-4 transition-colors hover:text-neutral-700"
>
- Learn more about SCIM Directory Sync.
+ Learn more about SCIM Directory Sync
</a>
</div>
</div>
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/settings/(basic-layout)/integrations/layout.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/settings/(basic-layout)/integrations/layout.tsx
new file mode 100644
index 0000000000..32e15c7aa1
--- /dev/null
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/settings/(basic-layout)/integrations/layout.tsx
@@ -0,0 +1,22 @@
+import { PageContent } from "@/ui/layout/page-content";
+import { PageWidthWrapper } from "@/ui/layout/page-width-wrapper";
+import { ReactNode } from "react";
+
+export default function IntegrationsLayout({
+ children,
+}: {
+ children: ReactNode;
+}) {
+ return (
+ <PageContent
+ title="Integrations"
+ titleInfo={{
+ title:
+ "Use Dub with your existing favorite tools with our seamless integrations.",
+ href: "https://d.to/integrations",
+ }}
+ >
+ <PageWidthWrapper>{children}</PageWidthWrapper>
+ </PageContent>
+ );
+}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/settings/(basic-layout)/integrations/page.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/settings/(basic-layout)/integrations/page.tsx
index f10caab3f1..499efb1028 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/settings/(basic-layout)/integrations/page.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/settings/(basic-layout)/integrations/page.tsx
@@ -3,18 +3,5 @@ import { IntegrationsList } from "./integrations-list";
export const revalidate = 300; // 5 minutes
export default function IntegrationsPage() {
- return (
- <div className="mx-auto flex w-full max-w-screen-md flex-col gap-12">
- <div className="">
- <h1 className="text-2xl font-semibold tracking-tight text-black">
- Integrations
- </h1>
- <p className="mb-2 mt-2 text-base text-neutral-600">
- Use Dub with your existing favorite tools with our seamless
- integrations.
- </p>
- </div>
- <IntegrationsList />
- </div>
- );
+ return <IntegrationsList />;
}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/settings/(basic-layout)/layout.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/settings/(basic-layout)/layout.tsx
index 8ee3029679..386dc73f09 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/settings/(basic-layout)/layout.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/settings/(basic-layout)/layout.tsx
@@ -1,4 +1,3 @@
-import SettingsLayout from "@/ui/layout/settings-layout";
import { ReactNode } from "react";
// TODO: Move remaining (basic-layout) pages out and get them using PageContent instead
@@ -7,5 +6,5 @@ export default function WorkspaceSettingsLayout({
}: {
children: ReactNode;
}) {
- return <SettingsLayout>{children}</SettingsLayout>;
+ return <>{children}</>;
}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/settings/(basic-layout)/notifications/layout.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/settings/(basic-layout)/notifications/layout.tsx
new file mode 100644
index 0000000000..c922682406
--- /dev/null
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/settings/(basic-layout)/notifications/layout.tsx
@@ -0,0 +1,21 @@
+import { PageContent } from "@/ui/layout/page-content";
+import { PageWidthWrapper } from "@/ui/layout/page-width-wrapper";
+import { ReactNode } from "react";
+
+export default function NotificationsLayout({
+ children,
+}: {
+ children: ReactNode;
+}) {
+ return (
+ <PageContent
+ title="Notifications"
+ titleInfo={{
+ title:
+ "Adjust your notification preferences and choose the updates you want to receive. These settings apply only to your account.",
+ }}
+ >
+ <PageWidthWrapper>{children}</PageWidthWrapper>
+ </PageContent>
+ );
+}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/settings/(basic-layout)/notifications/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/settings/(basic-layout)/notifications/page-client.tsx
index 1f99f15c64..83e0bfc2c3 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/settings/(basic-layout)/notifications/page-client.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/settings/(basic-layout)/notifications/page-client.tsx
@@ -5,8 +5,10 @@ import useWorkspace from "@/lib/swr/use-workspace";
import { notificationTypes } from "@/lib/zod/schemas/workspaces";
import { Switch, useOptimisticUpdate } from "@dub/ui";
import { Globe, Hyperlink, Msgs, UserPlus } from "@dub/ui/icons";
-import { DollarSign, ShieldAlert, Trophy } from "lucide-react";
+import { isClickOnInteractiveChild } from "@dub/utils";
+import { DollarSign, Trophy } from "lucide-react";
import { useAction } from "next-safe-action/hooks";
+import React from "react";
import { z } from "zod";
type PreferenceType = z.infer<typeof notificationTypes>;
@@ -16,7 +18,7 @@ export default function NotificationsSettingsPageClient() {
const { id: workspaceId } = useWorkspace();
const { executeAsync } = useAction(updateNotificationPreference);
- const notifications = [
+ const workspaceNotifications = [
{
type: "domainConfigurationUpdates",
icon: Globe,
@@ -30,6 +32,9 @@ export default function NotificationsSettingsPageClient() {
description:
"Monthly summary email of your top 5 links by usage & total links created.",
},
+ ];
+
+ const partnerProgramNotifications = [
{
type: "newPartnerApplication",
icon: UserPlus,
@@ -57,13 +62,13 @@ export default function NotificationsSettingsPageClient() {
description:
"Alert when a new message is received from a partner in your partner program.",
},
- {
- type: "fraudEventsSummary",
- icon: ShieldAlert,
- title: "Daily Fraud events summary",
- description:
- "Daily summary email of unresolved fraud events detected in your partner program.",
- },
+ // {
+ // type: "fraudEventsSummary",
+ // icon: ShieldAlert,
+ // title: "Daily Fraud events summary",
+ // description:
+ // "Daily summary email of unresolved fraud events detected in your partner program.",
+ // },
];
const {
@@ -100,64 +105,119 @@ export default function NotificationsSettingsPageClient() {
};
};
- return (
- <div>
- <div className="max-w-screen-sm pb-8">
- <h2 className="text-xl font-semibold tracking-tight text-black">
- Workspace Notifications
- </h2>
- <p className="mt-3 text-sm text-neutral-500">
- Adjust your personal notification preferences and choose which updates
- you want to receive. These settings will only be applied to your
- personal account.
- </p>
- </div>
- <div className="mt-2 grid grid-cols-1 gap-3">
- {notifications.map(({ type, icon: Icon, title, description }) => (
- <div
- key={type}
- className="flex items-center justify-between gap-4 rounded-xl border border-neutral-200 bg-white p-5"
- >
- <div className="flex min-w-0 items-center gap-4">
- <div className="hidden rounded-full border border-neutral-200 sm:block">
- <div className="rounded-full border border-white bg-gradient-to-t from-neutral-100 p-1 md:p-3">
- <Icon className="size-5" />
- </div>
+ const renderNotificationItem = ({
+ type,
+ icon: Icon,
+ title,
+ description,
+ isLast,
+ }: {
+ type: string;
+ icon: React.ComponentType<{ className?: string }>;
+ title: string;
+ description: string;
+ isLast?: boolean;
+ }) => {
+ const handleRowClick = (e: React.MouseEvent<HTMLDivElement>) => {
+ if (isClickOnInteractiveChild(e) || !preferences || isLoading) return;
+
+ const newValue = !preferences[type];
+ update(
+ () =>
+ handleUpdate({
+ type,
+ value: newValue,
+ currentPreferences: preferences,
+ }),
+ {
+ ...preferences,
+ [type]: newValue,
+ },
+ );
+ };
+
+ return (
+ <div key={type}>
+ <div
+ onClick={handleRowClick}
+ className="flex cursor-pointer items-start justify-between py-5 pr-2 sm:items-center"
+ >
+ <div className="flex min-w-0 items-start gap-4 sm:items-center">
+ <div className="flex shrink-0 items-center justify-center rounded-full border border-neutral-200 bg-gradient-to-t from-neutral-100 p-2.5">
+ <Icon className="size-5" />
+ </div>
+ <div className="min-w-0 flex-1 pr-4">
+ <div className="text-sm font-medium text-neutral-800">
+ {title}
</div>
- <div className="overflow-hidden">
- <div className="flex items-center gap-1.5 sm:gap-2.5">
- <div className="truncate text-sm font-medium">{title}</div>
- </div>
- <div className="mt-1 flex items-center gap-1 text-xs">
- <span className="whitespace-pre-wrap text-neutral-500">
- {description}
- </span>
- </div>
+ <div className="mt-0.5 text-xs text-neutral-500">
+ {description}
</div>
</div>
- <Switch
- checked={preferences?.[type] ?? false}
- disabled={isLoading}
- fn={(checked: boolean) => {
- if (!preferences) return;
-
- update(
- () =>
- handleUpdate({
- type,
- value: checked,
- currentPreferences: preferences,
- }),
- {
- ...preferences,
- [type]: checked,
- },
- );
- }}
- />
</div>
- ))}
+ <Switch
+ checked={preferences?.[type] ?? false}
+ disabled={isLoading}
+ fn={(checked: boolean) => {
+ if (!preferences) return;
+
+ update(
+ () =>
+ handleUpdate({
+ type,
+ value: checked,
+ currentPreferences: preferences,
+ }),
+ {
+ ...preferences,
+ [type]: checked,
+ },
+ );
+ }}
+ />
+ </div>
+ {!isLast && <div className="border-t border-neutral-200" />}
</div>
+ );
+ };
+
+ const renderSection = ({
+ title,
+ notifications,
+ }: {
+ title: string;
+ notifications: Array<{
+ type: string;
+ icon: React.ComponentType<{ className?: string }>;
+ title: string;
+ description: string;
+ }>;
+ }) => (
+ <div className="rounded-xl border border-neutral-200 bg-white">
+ <div className="border-b border-neutral-200 p-5">
+ <h2 className="text-base font-semibold text-neutral-900">{title}</h2>
+ </div>
+ <div className="px-5">
+ {notifications.map((notification, index) =>
+ renderNotificationItem({
+ ...notification,
+ isLast: index === notifications.length - 1,
+ }),
+ )}
+ </div>
+ </div>
+ );
+
+ return (
+ <div className="flex flex-col gap-6">
+ {renderSection({
+ title: "Workspace",
+ notifications: workspaceNotifications,
+ })}
+ {renderSection({
+ title: "Partner program",
+ notifications: partnerProgramNotifications,
+ })}
</div>
);
}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/settings/(basic-layout)/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/settings/(basic-layout)/page-client.tsx
index 60b34eeaf6..fbfb190269 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/settings/(basic-layout)/page-client.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/settings/(basic-layout)/page-client.tsx
@@ -22,7 +22,7 @@ export default function WorkspaceSettingsClient() {
const { update } = useSession();
return (
- <>
+ <div className="mb-6 space-y-6">
<Form
title="Workspace Name"
description={`This is the name of your workspace on ${process.env.NEXT_PUBLIC_APP_NAME}.`}
@@ -92,6 +92,6 @@ export default function WorkspaceSettingsClient() {
/>
<UploadLogo />
<DeleteWorkspace />
- </>
+ </div>
);
}
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/settings/(basic-layout)/page.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/settings/(basic-layout)/page.tsx
index 290e38c0dd..6692b7794f 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/settings/(basic-layout)/page.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/settings/(basic-layout)/page.tsx
@@ -1,5 +1,13 @@
+import { PageContent } from "@/ui/layout/page-content";
+import { PageWidthWrapper } from "@/ui/layout/page-width-wrapper";
import WorkspaceSettingsClient from "./page-client";
export default function WorkspaceSettings() {
- return <WorkspaceSettingsClient />;
+ return (
+ <PageContent title="General">
+ <PageWidthWrapper>
+ <WorkspaceSettingsClient />
+ </PageWidthWrapper>
+ </PageContent>
+ );
}
diff --git a/apps/web/app/app.dub.co/(dashboard)/account/settings/security/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/account/settings/security/page-client.tsx
index c5b4f97629..63a75e8dfd 100644
--- a/apps/web/app/app.dub.co/(dashboard)/account/settings/security/page-client.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/account/settings/security/page-client.tsx
@@ -11,12 +11,12 @@ export default function SecurityPageClient() {
if (loading) {
return (
- <div className="rounded-lg border border-neutral-200 bg-white">
- <div className="flex flex-col gap-3 border-b border-neutral-200 p-5 sm:p-10">
- <h2 className="text-xl font-medium">Password</h2>
+ <div className="rounded-xl border border-neutral-200 bg-white">
+ <div className="flex flex-col space-y-1 border-b border-neutral-200 p-6">
+ <h2 className="text-base font-semibold">Password</h2>
<div className="h-3 w-56 rounded-full bg-neutral-100"></div>
</div>
- <div className="p-5 sm:p-10">
+ <div className="p-5">
<div className="flex justify-between gap-2">
<div className="h-3 w-56 rounded-full bg-neutral-100"></div>
<div className="h-3 w-56 rounded-full bg-neutral-100"></div>
diff --git a/apps/web/app/app.dub.co/(dashboard)/account/settings/security/request-set-password.tsx b/apps/web/app/app.dub.co/(dashboard)/account/settings/security/request-set-password.tsx
index 5ea36275f7..07e61c2882 100644
--- a/apps/web/app/app.dub.co/(dashboard)/account/settings/security/request-set-password.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/account/settings/security/request-set-password.tsx
@@ -37,9 +37,9 @@ export const RequestSetPassword = () => {
};
return (
- <div className="rounded-lg border border-neutral-200 bg-white">
- <div className="flex flex-col gap-3 border-b border-neutral-200 p-5 sm:p-10">
- <h2 className="text-xl font-medium">Password</h2>
+ <div className="rounded-xl border border-neutral-200 bg-white p-6">
+ <div className="flex flex-col space-y-1 border-b border-neutral-200">
+ <h2 className="text-base font-semibold">Password</h2>
<p className="pb-2 text-sm text-neutral-500">
{user?.provider && (
<>
@@ -58,14 +58,16 @@ export const RequestSetPassword = () => {
You can set a password to use with your Dub account.
</p>
</div>
- <div className="p-5 sm:p-10">
- <Button
- text="Create account password"
- onClick={sendPasswordSetRequest}
- loading={sending}
- disabled={sending}
- className="w-fit"
- />
+ <div className="flex items-center justify-start">
+ <div className="shrink-0">
+ <Button
+ text="Create account password"
+ onClick={sendPasswordSetRequest}
+ loading={sending}
+ disabled={sending}
+ className="w-fit"
+ />
+ </div>
</div>
</div>
);
diff --git a/apps/web/app/app.dub.co/(dashboard)/account/settings/security/update-password.tsx b/apps/web/app/app.dub.co/(dashboard)/account/settings/security/update-password.tsx
index 79c5715045..c38878bc95 100644
--- a/apps/web/app/app.dub.co/(dashboard)/account/settings/security/update-password.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/account/settings/security/update-password.tsx
@@ -1,20 +1,28 @@
"use client";
import { updatePasswordSchema } from "@/lib/zod/schemas/auth";
-import { Button, Input, Label, Tooltip } from "@dub/ui";
-import { useForm } from "react-hook-form";
+import { PasswordRequirements } from "@/ui/shared/password-requirements";
+import { Button, Input, Label } from "@dub/ui";
+import { FormProvider, useForm } from "react-hook-form";
import { toast } from "sonner";
import { z } from "zod";
// Allow the user to update their existing password
export const UpdatePassword = () => {
+import { zodResolver } from "@hookform/resolvers/zod";
+
+// Allow the user to update their existing password
+export const UpdatePassword = () => {
+ const form = useForm<z.infer<typeof updatePasswordSchema>>({
+ resolver: zodResolver(updatePasswordSchema),
+ });
const {
register,
handleSubmit,
setError,
formState: { isSubmitting, isDirty, errors },
reset,
- } = useForm<z.infer<typeof updatePasswordSchema>>();
+ } = form;
const onSubmit = handleSubmit(async (data) => {
try {
@@ -41,17 +49,18 @@ export const UpdatePassword = () => {
return (
<form
- className="rounded-lg border border-neutral-200 bg-white"
+ className="rounded-xl border border-neutral-200 bg-white"
onSubmit={onSubmit}
>
- <div>
- <div className="flex flex-col gap-3 border-b border-neutral-200 p-5 sm:p-10">
- <h2 className="text-xl font-medium">Password</h2>
- <p className="pb-2 text-sm text-neutral-500">
- Manage your account password on {process.env.NEXT_PUBLIC_APP_NAME}.
- </p>
- </div>
- <div className="flex flex-wrap justify-between gap-4 p-5 sm:p-10">
+ <div className="border-neutral-200">
+ <div className="flex flex-col gap-6 p-6">
+ <div className="flex flex-col space-y-1">
+ <h2 className="text-xl font-medium">Password</h2>
+ <p className="pb-2 text-sm text-neutral-500">
+ Manage your account password on {process.env.NEXT_PUBLIC_APP_NAME}
+ .
+ </p>
+ </div>
<div className="grid w-full max-w-sm items-center gap-2">
<Label htmlFor="currentPassword">Current Password</Label>
<Input
@@ -73,30 +82,21 @@ export const UpdatePassword = () => {
type="password"
{...register("newPassword", { required: true })}
/>
- <span
- className="block text-sm text-red-500"
- role="alert"
- aria-live="assertive"
- >
- {errors.newPassword?.message}
- </span>
+ <FormProvider {...form}>
+ <PasswordRequirements field="newPassword" className="mt-0" />
+ </FormProvider>
</div>
</div>
- </div>
- <div className="flex items-center justify-between space-x-4 rounded-b-lg border-t border-neutral-200 bg-neutral-50 p-3 sm:px-10">
- <Tooltip content="Passwords must be at least 8 characters long containing at least one number, one uppercase, and one lowercase letter.">
- <p className="text-sm text-neutral-500 underline decoration-dotted underline-offset-2 hover:text-neutral-700">
- Password requirements
- </p>
- </Tooltip>
- <div className="shrink-0">
- <Button
- text="Update Password"
- loading={isSubmitting}
- disabled={!isDirty}
- type="submit"
- />
+ <div className="flex flex-col items-start justify-between gap-4 rounded-b-xl border-t border-neutral-200 bg-neutral-50 px-5 py-4 sm:flex-row sm:items-center sm:justify-end sm:space-y-0 sm:py-3">
+ <div className="shrink-0">
+ <Button
+ text="Update Password"
+ loading={isSubmitting}
+ disabled={!isDirty}
+ type="submit"
+ />
+ </div>
</div>
</div>
</form>
diff --git a/apps/web/ui/account/delete-account.tsx b/apps/web/ui/account/delete-account.tsx
index 0bf8a0dd5b..c45779b7bd 100644
--- a/apps/web/ui/account/delete-account.tsx
+++ b/apps/web/ui/account/delete-account.tsx
@@ -7,19 +7,19 @@ export default function DeleteAccountSection() {
useDeleteAccountModal();
return (
- <div className="rounded-lg border border-red-600 bg-white">
+ <div className="rounded-xl border border-red-200 bg-white">
<DeleteAccountModal />
- <div className="flex flex-col space-y-3 p-5 sm:p-10">
- <h2 className="text-xl font-medium">Delete Account</h2>
+ <div className="flex flex-col space-y-1 p-6">
+ <h2 className="text-base font-semibold">Delete Account</h2>
<p className="text-sm text-neutral-500">
Permanently delete your {process.env.NEXT_PUBLIC_APP_NAME} account,
all of your workspaces, links and their respective stats. This action
cannot be undone - please proceed with caution.
</p>
</div>
- <div className="border-b border-red-600" />
+ <div className="border-b border-red-200" />
- <div className="flex items-center justify-end p-3 sm:px-10">
+ <div className="flex items-center justify-start bg-red-50 px-6 py-3 sm:justify-end">
<div>
<Button
text="Delete Account"
diff --git a/apps/web/ui/account/update-default-workspace.tsx b/apps/web/ui/account/update-default-workspace.tsx
index e4f34bcc8f..e6bfeaffd0 100644
--- a/apps/web/ui/account/update-default-workspace.tsx
+++ b/apps/web/ui/account/update-default-workspace.tsx
@@ -50,13 +50,15 @@ export default function UpdateDefaultWorkspace() {
error: (error) => error,
});
}}
- className="rounded-lg border border-neutral-200 bg-white"
+ className="rounded-xl border border-neutral-200 bg-white"
>
- <div className="flex flex-col space-y-3 p-5 sm:p-10">
- <h2 className="text-xl font-medium">Your Default Workspace</h2>
- <p className="text-sm text-neutral-500">
- Choose the workspace to show by default when you sign in.
- </p>
+ <div className="flex flex-col space-y-6 p-6">
+ <div className="flex flex-col space-y-1">
+ <h2 className="text-base font-semibold">Your Default Workspace</h2>
+ <p className="text-sm text-neutral-500">
+ Choose the workspace to show by default when you sign in.
+ </p>
+ </div>
<div className="mt-1 max-w-md">
<WorkspaceSelector
selectedWorkspace={selectedWorkspace || ""}
@@ -65,7 +67,7 @@ export default function UpdateDefaultWorkspace() {
</div>
</div>
- <div className="flex items-center justify-between space-x-4 rounded-b-lg border-t border-neutral-200 bg-neutral-50 p-3 sm:px-10">
+ <div className="flex flex-col items-start justify-start gap-4 rounded-b-xl border-t border-neutral-200 bg-neutral-50 px-6 py-3 sm:flex-row sm:items-center sm:justify-between sm:space-y-0">
<a
href="https://dub.co/help/article/how-to-change-default-workspace"
target="_blank"
diff --git a/apps/web/ui/account/upload-avatar.tsx b/apps/web/ui/account/upload-avatar.tsx
index 3089996a70..13bc8e80c5 100644
--- a/apps/web/ui/account/upload-avatar.tsx
+++ b/apps/web/ui/account/upload-avatar.tsx
@@ -38,14 +38,19 @@ export default function UploadAvatar() {
}
});
}}
- className="rounded-lg border border-neutral-200 bg-white"
+ className="rounded-xl border border-neutral-200 bg-white"
>
- <div className="flex flex-col space-y-3 p-5 sm:p-10">
- <h2 className="text-xl font-medium">Your Avatar</h2>
- <p className="text-sm text-neutral-500">
- This is your avatar image on your {process.env.NEXT_PUBLIC_APP_NAME}{" "}
- account.
- </p>
+ <div className="flex flex-col items-start justify-between gap-4 p-6 sm:flex-row sm:justify-between">
+ <div className="flex flex-col space-y-1">
+ <h2 className="text-base font-semibold">Your Avatar</h2>
+ <p className="text-sm text-neutral-500">
+ This is your avatar image on your {process.env.NEXT_PUBLIC_APP_NAME}{" "}
+ account.
+ </p>
+ <p className="text-sm text-neutral-500">
+ Click your avatar to upload a new image.
+ </p>
+ </div>
<div className="mt-1">
<FileUpload
accept="images"
@@ -62,7 +67,7 @@ export default function UploadAvatar() {
</div>
</div>
- <div className="flex items-center justify-between space-x-4 rounded-b-lg border-t border-neutral-200 bg-neutral-50 p-3 sm:px-10">
+ <div className="flex flex-col items-start justify-start gap-4 rounded-b-xl border-t border-neutral-200 bg-neutral-50 px-6 py-4 sm:flex-row sm:items-center sm:justify-between sm:space-y-0 sm:py-3">
<p className="text-sm text-neutral-500">
Square image recommended. Accepted file types: .png, .jpg. Max file
size: 2MB.
diff --git a/apps/web/ui/account/user-id.tsx b/apps/web/ui/account/user-id.tsx
index cfbd0fab2e..b02c6f0037 100644
--- a/apps/web/ui/account/user-id.tsx
+++ b/apps/web/ui/account/user-id.tsx
@@ -12,10 +12,10 @@ export default function UserId() {
return (
<>
- <div className="rounded-lg border border-neutral-200 bg-white">
- <div className="relative flex flex-col space-y-6 p-5 sm:p-10">
- <div className="flex flex-col space-y-3">
- <h2 className="text-xl font-medium">Your User ID</h2>
+ <div className="rounded-xl border border-neutral-200 bg-white">
+ <div className="relative flex flex-col space-y-6 p-6">
+ <div className="flex flex-col space-y-1">
+ <h2 className="text-base font-semibold">Your User ID</h2>
<p className="text-sm text-neutral-500">
This is your unique account identifier on Dub.
</p>
@@ -29,7 +29,12 @@ export default function UserId() {
<div className="h-[2.35rem] w-full max-w-md animate-pulse rounded-md bg-neutral-200" />
)}
</div>
- <div className="h-14 rounded-b-lg border-t border-neutral-200 bg-neutral-50" />
+
+ <div className="flex items-center justify-between space-x-4 rounded-b-lg border-t border-neutral-200 bg-neutral-50 px-6 py-5">
+ <p className="text-sm text-neutral-500">
+ This may be used to identify your account in the API.
+ </p>
+ </div>
</div>
</>
);
diff --git a/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx b/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx
index ff96095987..2e0969106b 100644
--- a/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx
+++ b/apps/web/ui/layout/sidebar/app-sidebar-nav.tsx
@@ -10,6 +10,7 @@ import { usePartnerMessagesCount } from "@/lib/swr/use-partner-messages-count";
import usePayoutsCount from "@/lib/swr/use-payouts-count";
import useProgram from "@/lib/swr/use-program";
import useWorkspace from "@/lib/swr/use-workspace";
+import useWorkspaces from "@/lib/swr/use-workspaces";
import { useRouterStuff } from "@dub/ui";
import {
Bell,
@@ -44,7 +45,7 @@ import { Trophy } from "lucide-react";
import { Session } from "next-auth";
import { useSession } from "next-auth/react";
import { useParams, usePathname } from "next/navigation";
-import { ReactNode, useMemo } from "react";
+import { ReactNode, useEffect, useMemo } from "react";
import { DubPartnersPopup } from "./dub-partners-popup";
import { Compass } from "./icons/compass";
import { ConnectedDots4 } from "./icons/connected-dots4";
@@ -462,6 +463,12 @@ const NAV_AREAS: SidebarNavAreas<SidebarNavData> = {
icon: Gift,
href: "/account/settings/referrals",
},
+ {
+ name: "Notifications",
+ icon: Bell,
+ href: `/${slug}/settings/notifications`,
+ arrow: true,
+ },
],
},
],
@@ -475,11 +482,55 @@ export function AppSidebarNav({
toolContent?: ReactNode;
newsContent?: ReactNode;
}) {
- const { slug } = useParams() as { slug?: string };
+ const { slug: paramsSlug } = useParams() as { slug?: string };
const pathname = usePathname();
const { getQueryString } = useRouterStuff();
- const { data: session } = useSession();
+ const { data: session, status } = useSession();
const { plan, defaultProgramId } = useWorkspace();
+ const { workspaces } = useWorkspaces();
+
+ // Store the current workspace slug in sessionStorage so we can remember it on account settings pages
+ useEffect(() => {
+ if (paramsSlug) {
+ sessionStorage.setItem("dub_last_workspace", paramsSlug);
+ }
+ }, [paramsSlug]);
+
+ // Validate and clear sessionStorage if user doesn't have access to the stored workspace
+ useEffect(() => {
+ if (status === "unauthenticated") {
+ // Clear sessionStorage on logout
+ sessionStorage.removeItem("dub_last_workspace");
+ return;
+ }
+
+ if (workspaces && typeof window !== "undefined") {
+ const storedSlug = sessionStorage.getItem("dub_last_workspace");
+ if (storedSlug && !paramsSlug) {
+ // Only validate if we're not currently on a workspace page (to avoid clearing during navigation)
+ const hasAccess = workspaces.some((w) => w.slug === storedSlug);
+ if (!hasAccess) {
+ // User doesn't have access to the stored workspace, clear it
+ sessionStorage.removeItem("dub_last_workspace");
+ }
+ }
+ }
+ }, [workspaces, status, paramsSlug]);
+
+ // Use params slug when available, otherwise try sessionStorage (last visited workspace), then fall back to default workspace
+ const slug =
+ paramsSlug ||
+ (typeof window !== "undefined" && workspaces
+ ? (() => {
+ const storedSlug = sessionStorage.getItem("dub_last_workspace");
+ // Validate that the stored slug is accessible by the current user
+ if (storedSlug && workspaces.some((w) => w.slug === storedSlug)) {
+ return storedSlug;
+ }
+ return null;
+ })()
+ : null) ||
+ session?.user?.["defaultWorkspace"];
const currentArea = useMemo(() => {
return pathname.startsWith("/account/settings")
diff --git a/apps/web/ui/shared/password-requirements.tsx b/apps/web/ui/shared/password-requirements.tsx
index 2196f7c39d..6907859af6 100644
--- a/apps/web/ui/shared/password-requirements.tsx
+++ b/apps/web/ui/shared/password-requirements.tsx
@@ -19,6 +19,10 @@ const REQUIREMENTS: {
name: "Lowercase letter",
check: (p) => /[a-z]/.test(p),
},
+ {
+ name: "8 chars",
+ check: (p) => p.length >= 8,
+ },
];
/**
diff --git a/apps/web/ui/workspaces/delete-workspace.tsx b/apps/web/ui/workspaces/delete-workspace.tsx
index 42e1821f24..831eb912ce 100644
--- a/apps/web/ui/workspaces/delete-workspace.tsx
+++ b/apps/web/ui/workspaces/delete-workspace.tsx
@@ -19,13 +19,13 @@ export default function DeleteWorkspace() {
return (
<div
- className={cn("rounded-lg border border-red-600 bg-white", {
+ className={cn("rounded-xl border border-red-200 bg-white", {
"border-neutral-200": permissionsError,
})}
>
<DeleteWorkspaceModal />
- <div className="flex flex-col space-y-3 p-5 sm:p-10">
- <h2 className="text-xl font-medium">Delete Workspace</h2>
+ <div className="flex flex-col space-y-1 p-6">
+ <h2 className="text-base font-semibold">Delete Workspace</h2>
<p className="text-sm text-neutral-500">
Permanently delete your workspace, custom domain, and all associated
links + their stats. This action cannot be undone - please proceed
@@ -33,12 +33,12 @@ export default function DeleteWorkspace() {
</p>
</div>
<div
- className={cn("border-b border-red-600", {
+ className={cn("border-b border-red-200", {
"border-neutral-200": permissionsError,
})}
/>
- <div className="flex items-center justify-end px-5 py-4 sm:px-10">
+ <div className="flex items-center justify-start bg-red-50 p-3 sm:justify-end">
<div>
<Button
text="Delete Workspace"
diff --git a/apps/web/ui/workspaces/upload-logo.tsx b/apps/web/ui/workspaces/upload-logo.tsx
index 20f447d1ff..c8fc8a7ff3 100644
--- a/apps/web/ui/workspaces/upload-logo.tsx
+++ b/apps/web/ui/workspaces/upload-logo.tsx
@@ -42,13 +42,18 @@ export default function UploadLogo() {
setUploading(false);
});
}}
- className="rounded-lg border border-neutral-200 bg-white"
+ className="rounded-xl border border-neutral-200 bg-white"
>
- <div className="flex flex-col space-y-3 p-5 sm:p-10">
- <h2 className="text-xl font-medium">Workspace Logo</h2>
- <p className="text-sm text-neutral-500">
- This is your workspace's logo on {process.env.NEXT_PUBLIC_APP_NAME}.
- </p>
+ <div className="flex flex-col items-start justify-between gap-4 p-6 sm:flex-row sm:justify-between">
+ <div className="flex flex-col space-y-1">
+ <h2 className="text-base font-semibold">Workspace Logo</h2>
+ <p className="text-sm text-neutral-500">
+ This is your workspace's logo on {process.env.NEXT_PUBLIC_APP_NAME}.
+ </p>
+ <p className="text-sm text-neutral-500">
+ Click the logo to upload a new image.
+ </p>
+ </div>
<div className="mt-1">
<FileUpload
accept="images"
@@ -65,7 +70,7 @@ export default function UploadLogo() {
</div>
</div>
- <div className="flex items-center justify-between space-x-4 rounded-b-lg border-t border-neutral-200 bg-neutral-50 p-3 sm:px-10">
+ <div className="flex flex-col items-start justify-between gap-4 rounded-b-xl border-t border-neutral-200 bg-neutral-50 px-5 py-4 sm:flex-row sm:items-center sm:justify-between sm:space-y-0 sm:py-3">
<p className="text-sm text-neutral-500">
Square image recommended. Accepted file types: .png, .jpg. Max file
size: 2MB.
diff --git a/packages/ui/src/form.tsx b/packages/ui/src/form.tsx
index f4cbc87f2f..715d3399bf 100644
--- a/packages/ui/src/form.tsx
+++ b/packages/ui/src/form.tsx
@@ -35,11 +35,11 @@ export function Form({
});
setSaving(false);
}}
- className="rounded-lg border border-neutral-200 bg-white"
+ className="rounded-xl border border-neutral-200 bg-white"
>
- <div className="relative flex flex-col space-y-6 p-5 sm:p-10">
- <div className="flex flex-col space-y-3">
- <h2 className="text-xl font-medium">{title}</h2>
+ <div className="relative flex flex-col space-y-6 p-6">
+ <div className="flex flex-col space-y-1">
+ <h2 className="text-base font-semibold">{title}</h2>
<p className="text-sm text-neutral-500">{description}</p>
</div>
{typeof inputAttrs.defaultValue === "string" ? (
@@ -62,7 +62,7 @@ export function Form({
)}
</div>
- <div className="flex items-center justify-between space-x-4 rounded-b-lg border-t border-neutral-200 bg-neutral-50 p-3 sm:px-10">
+ <div className="flex flex-col items-start justify-between gap-4 rounded-b-xl border-t border-neutral-200 bg-neutral-50 px-5 py-4 sm:flex-row sm:items-center sm:justify-between sm:space-y-0 sm:py-3">
{typeof helpText === "string" ? (
<p
className="prose-sm prose-a:underline prose-a:underline-offset-4 hover:prose-a:text-neutral-700 text-neutral-500 transition-colors"
@@ -71,7 +71,7 @@ export function Form({
) : (
helpText
)}
- <div className="shrink-0">
+ <div className="w-fit shrink-0">
<Button
text={buttonText}
loading={saving}