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.

Remove vars fix playwright (#4061)

Steven Teyece40304df73
diff --git a/.github/workflows/playwright.yaml b/.github/workflows/playwright.yaml
index c342690c45..cd0e4f2383 100644
--- a/.github/workflows/playwright.yaml
+++ b/.github/workflows/playwright.yaml
@@ -28,10 +28,6 @@ jobs:
NEXTAUTH_SECRET: "e2e-test-secret-at-least-32-chars-long"
NEXTAUTH_URL: "http://partners.localhost:8888"
- NEXT_PUBLIC_APP_NAME: "Dub"
- NEXT_PUBLIC_APP_DOMAIN: "localhost:8888"
- NEXT_PUBLIC_APP_SHORT_DOMAIN: "dub.sh"
-
E2E_PARTNER_EMAIL: "[email protected]"
E2E_PARTNER_PASSWORD: "password"
diff --git a/apps/web/.env.example b/apps/web/.env.example
index a1c0de4a3d..033f320ab9 100644
--- a/apps/web/.env.example
+++ b/apps/web/.env.example
@@ -2,10 +2,6 @@
###### REQUIRED ENV VARS ######
###############################
-NEXT_PUBLIC_APP_NAME=Dub
-NEXT_PUBLIC_APP_DOMAIN=dub.co
-NEXT_PUBLIC_APP_SHORT_DOMAIN=dub.sh
-
# Generate secrets with: node -e "console.log(require('crypto').randomBytes(32).toString('base64'))"
NEXTAUTH_SECRET=
NEXTAUTH_URL=http://localhost:8888 # (only needed for localhost)
@@ -187,7 +183,6 @@ INTERCOM_CLIENT_ID=
INTERCOM_CLIENT_SECRET=
# E2E Playwright Tests
-PLAYWRIGHT_BASE_URL=http://partners.localhost:8888
E2E_PARTNER_EMAIL=
E2E_PARTNER_PASSWORD=
diff --git a/apps/web/app/(ee)/api/cron/usage/utils.ts b/apps/web/app/(ee)/api/cron/usage/utils.ts
index b41037037e..b880b62509 100644
--- a/apps/web/app/(ee)/api/cron/usage/utils.ts
+++ b/apps/web/app/(ee)/api/cron/usage/utils.ts
@@ -160,7 +160,7 @@ export const updateUsage = async () => {
await sendBatchEmail(
emails.map((email) => ({
- subject: `Your 30-day ${process.env.NEXT_PUBLIC_APP_NAME} summary for ${workspace.name}`,
+ subject: `Your 30-day Dub summary for ${workspace.name}`,
to: email,
react: ClicksSummary({
email,
diff --git a/apps/web/app/(ee)/api/stripe/integration/webhook/coupon-deleted.ts b/apps/web/app/(ee)/api/stripe/integration/webhook/coupon-deleted.ts
index 83809a58ff..7abc7298b0 100644
--- a/apps/web/app/(ee)/api/stripe/integration/webhook/coupon-deleted.ts
+++ b/apps/web/app/(ee)/api/stripe/integration/webhook/coupon-deleted.ts
@@ -124,7 +124,7 @@ export async function couponDeleted(event: Stripe.CouponDeletedEvent) {
users.map((user) => ({
from: VARIANT_TO_FROM_MAP.notifications,
to: user.email,
- subject: `${process.env.NEXT_PUBLIC_APP_NAME}: Discount has been deleted`,
+ subject: "Your discount has been deleted",
react: DiscountDeleted({
email: user.email,
coupon: {
diff --git a/apps/web/app/api/user/password/route.ts b/apps/web/app/api/user/password/route.ts
index 6252d174af..2085615254 100644
--- a/apps/web/app/api/user/password/route.ts
+++ b/apps/web/app/api/user/password/route.ts
@@ -63,7 +63,7 @@ export const PATCH = withSession(async ({ req, session }) => {
// Send the email to inform the user that their password has been updated
waitUntil(
sendEmail({
- subject: `Your ${process.env.NEXT_PUBLIC_APP_NAME} account password has been updated`,
+ subject: "Your Dub account password has been updated",
to: session.user.email,
react: PasswordUpdated({
email: session.user.email,
diff --git a/apps/web/app/api/user/set-password/route.ts b/apps/web/app/api/user/set-password/route.ts
index 5975b5407b..3ce9735973 100644
--- a/apps/web/app/api/user/set-password/route.ts
+++ b/apps/web/app/api/user/set-password/route.ts
@@ -38,7 +38,7 @@ export const POST = withSession(async ({ session }) => {
// Send email with password reset link
await sendEmail({
- subject: `${process.env.NEXT_PUBLIC_APP_NAME}: Password reset instructions`,
+ subject: "Dub: Password reset instructions",
to: session.user.email,
react: ResetPasswordLink({
email: session.user.email,
diff --git a/apps/web/app/app.dub.co/(auth)/auth/saml/page.tsx b/apps/web/app/app.dub.co/(auth)/auth/saml/page.tsx
index 7eff4b839b..4c4d1cbaa9 100644
--- a/apps/web/app/app.dub.co/(auth)/auth/saml/page.tsx
+++ b/apps/web/app/app.dub.co/(auth)/auth/saml/page.tsx
@@ -1,6 +1,5 @@
import EmptyState from "@/ui/shared/empty-state";
import { LoadingSpinner } from "@dub/ui";
-import { APP_NAME } from "@dub/utils";
import { Suspense } from "react";
import SAMLIDPForm from "./form";
@@ -10,7 +9,7 @@ export default function SAMLPage() {
<EmptyState
icon={LoadingSpinner}
title="SAML Authentication"
- description={`${APP_NAME} is verifying your identity via SAML. This might take a few seconds...`}
+ description="Dub is verifying your identity via SAML. This might take a few seconds..."
/>
<Suspense>
<SAMLIDPForm />
diff --git a/apps/web/app/app.dub.co/(auth)/forgot-password/page.tsx b/apps/web/app/app.dub.co/(auth)/forgot-password/page.tsx
index 64b282d01b..761c1e39ae 100644
--- a/apps/web/app/app.dub.co/(auth)/forgot-password/page.tsx
+++ b/apps/web/app/app.dub.co/(auth)/forgot-password/page.tsx
@@ -3,7 +3,7 @@ import { AuthLayout } from "@/ui/layout/auth-layout";
import { constructMetadata } from "@dub/utils";
export const metadata = constructMetadata({
- title: `Forgot Password for ${process.env.NEXT_PUBLIC_APP_NAME}`,
+ title: "Reset your Password",
});
export default function ForgotPasswordPage() {
diff --git a/apps/web/app/app.dub.co/(auth)/invites/[code]/page.tsx b/apps/web/app/app.dub.co/(auth)/invites/[code]/page.tsx
index 8336ad5bb4..c0d2dfd9bd 100644
--- a/apps/web/app/app.dub.co/(auth)/invites/[code]/page.tsx
+++ b/apps/web/app/app.dub.co/(auth)/invites/[code]/page.tsx
@@ -4,7 +4,6 @@ import { prisma } from "@/lib/prisma";
import EmptyState from "@/ui/shared/empty-state";
import { LoadingSpinner } from "@dub/ui";
import { LinkBroken, Users6 } from "@dub/ui/icons";
-import { APP_NAME } from "@dub/utils";
import { redirect } from "next/navigation";
import { Suspense } from "react";
@@ -21,7 +20,7 @@ export default async function InvitesPage(props: {
<EmptyState
icon={LoadingSpinner}
title="Verifying Invite"
- description={`${APP_NAME} is verifying your invite link. This might take a few seconds...`}
+ description="Dub is verifying your invite link. This might take a few seconds..."
/>
}
>
diff --git a/apps/web/app/app.dub.co/(auth)/login/page.tsx b/apps/web/app/app.dub.co/(auth)/login/page.tsx
index bec070e0c8..f4e5fde6c6 100644
--- a/apps/web/app/app.dub.co/(auth)/login/page.tsx
+++ b/apps/web/app/app.dub.co/(auth)/login/page.tsx
@@ -5,7 +5,7 @@ import { APP_DOMAIN, constructMetadata } from "@dub/utils";
import Link from "next/link";
export const metadata = constructMetadata({
- title: `Sign in to ${process.env.NEXT_PUBLIC_APP_NAME}`,
+ title: "Sign in to Dub",
canonicalUrl: `${APP_DOMAIN}/login`,
});
diff --git a/apps/web/app/app.dub.co/(auth)/register/page.tsx b/apps/web/app/app.dub.co/(auth)/register/page.tsx
index 4e276cc3ec..bd5f5c2a3c 100644
--- a/apps/web/app/app.dub.co/(auth)/register/page.tsx
+++ b/apps/web/app/app.dub.co/(auth)/register/page.tsx
@@ -3,7 +3,7 @@ import { APP_DOMAIN, constructMetadata } from "@dub/utils";
import RegisterPageClient from "./page-client";
export const metadata = constructMetadata({
- title: `Create your ${process.env.NEXT_PUBLIC_APP_NAME} account`,
+ title: "Create your Dub account",
canonicalUrl: `${APP_DOMAIN}/register`,
});
diff --git a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/page-client.tsx
index 5e565629a8..36fe881031 100644
--- a/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/page-client.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/[slug]/(ee)/settings/page-client.tsx
@@ -27,7 +27,7 @@ export default function WorkspaceSettingsClient() {
<SlackSupportSettingsCard />
<Form
title="Workspace Name"
- description={`This is the name of your workspace on ${process.env.NEXT_PUBLIC_APP_NAME}.`}
+ description="This is the name of your workspace on Dub."
inputAttrs={{
name: "name",
defaultValue: name,
@@ -59,7 +59,7 @@ export default function WorkspaceSettingsClient() {
/>
<Form
title="Workspace Slug"
- description={`This is your workspace's unique slug on ${process.env.NEXT_PUBLIC_APP_NAME}.`}
+ description="This is your workspace's unique slug on Dub."
inputAttrs={{
name: "slug",
defaultValue: slug,
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 067c418791..53819d20c5 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
@@ -125,7 +125,7 @@ export function SAML() {
</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.
+ Dub with your identity provider.
</p>
</div>
diff --git a/apps/web/app/app.dub.co/(dashboard)/account/settings/page-client.tsx b/apps/web/app/app.dub.co/(dashboard)/account/settings/page-client.tsx
index ddbb81635f..87a360dfc4 100644
--- a/apps/web/app/app.dub.co/(dashboard)/account/settings/page-client.tsx
+++ b/apps/web/app/app.dub.co/(dashboard)/account/settings/page-client.tsx
@@ -7,7 +7,6 @@ import UploadAvatar from "@/ui/account/upload-avatar";
import UserId from "@/ui/account/user-id";
import { PageWidthWrapper } from "@/ui/layout/page-width-wrapper";
import { Form, useCurrentSubdomain } from "@dub/ui";
-import { APP_NAME } from "@dub/utils";
import { useSession } from "next-auth/react";
import { toast } from "sonner";
@@ -19,7 +18,7 @@ export function SettingsPageClient() {
<PageWidthWrapper className="mb-8 grid gap-8">
<Form
title="Your Name"
- description={`This is your display name on ${APP_NAME}.`}
+ description="This is your display name on Dub."
inputAttrs={{
name: "name",
defaultValue:
@@ -48,7 +47,7 @@ export function SettingsPageClient() {
/>
<Form
title="Your Email"
- description={`This will be the email you use to log in to ${APP_NAME} and receive notifications. A confirmation is required for changes.`}
+ description="This will be the email you use to log in to Dub and receive notifications. A confirmation is required for changes."
inputAttrs={{
name: "email",
type: "email",
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 c2c1c6c538..3735bf7c63 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
@@ -51,8 +51,7 @@ export const UpdatePassword = () => {
<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}
- .
+ Manage your account password on Dub.
</p>
</div>
<div className="grid w-full max-w-sm items-center gap-2">
diff --git a/apps/web/app/app.dub.co/(share)/share/[dashboardId]/page.tsx b/apps/web/app/app.dub.co/(share)/share/[dashboardId]/page.tsx
index 0841ce9eed..74668d155c 100644
--- a/apps/web/app/app.dub.co/(share)/share/[dashboardId]/page.tsx
+++ b/apps/web/app/app.dub.co/(share)/share/[dashboardId]/page.tsx
@@ -22,7 +22,7 @@ export async function generateMetadata(props: {
}
return constructMetadata({
- title: `Analytics for ${data.link ? `${data.link.domain}/${data.link.key}` : data.folder!.name} – ${process.env.NEXT_PUBLIC_APP_NAME}`,
+ title: `Analytics for ${data.link ? `${data.link.domain}/${data.link.key}` : data.folder!.name}`,
image: `${APP_DOMAIN}/api/og/analytics?${data.link ? `linkId=${data.link.id}` : `folderId=${data.folder!.id}`}`,
noIndex: !data.doIndex,
});
diff --git a/apps/web/lib/actions/request-password-reset.ts b/apps/web/lib/actions/request-password-reset.ts
index a4025df546..331a5446c9 100644
--- a/apps/web/lib/actions/request-password-reset.ts
+++ b/apps/web/lib/actions/request-password-reset.ts
@@ -61,7 +61,7 @@ export const requestPasswordResetAction = actionClient
]);
await sendEmail({
- subject: `${process.env.NEXT_PUBLIC_APP_NAME}: Password reset instructions`,
+ subject: "Dub: Password reset instructions",
to: email,
react: ResetPasswordLink({
email,
diff --git a/apps/web/lib/actions/send-invite-referral-email.ts b/apps/web/lib/actions/send-invite-referral-email.ts
index dc53a1067d..13d8d467cb 100644
--- a/apps/web/lib/actions/send-invite-referral-email.ts
+++ b/apps/web/lib/actions/send-invite-referral-email.ts
@@ -34,7 +34,7 @@ export const sendInviteReferralEmail = authActionClient
try {
return await sendEmail({
- subject: `You've been invited to start using ${process.env.NEXT_PUBLIC_APP_NAME}`,
+ subject: "You've been invited to start using Dub",
to: email,
react: ReferralInvite({
email,
diff --git a/apps/web/lib/actions/send-otp.ts b/apps/web/lib/actions/send-otp.ts
index 5c369e02f9..ce1f228049 100644
--- a/apps/web/lib/actions/send-otp.ts
+++ b/apps/web/lib/actions/send-otp.ts
@@ -122,7 +122,7 @@ export const sendOtpAction = actionClient
}),
sendEmail({
- subject: `${process.env.NEXT_PUBLIC_APP_NAME}: OTP to verify your account`,
+ subject: "Dub: OTP to verify your account",
to: email,
react: VerifyEmail({
email,
diff --git a/apps/web/lib/api/users.ts b/apps/web/lib/api/users.ts
index f19b20eb23..a9c79b9fce 100644
--- a/apps/web/lib/api/users.ts
+++ b/apps/web/lib/api/users.ts
@@ -61,7 +61,7 @@ export async function inviteUser({
const url = `${process.env.NEXTAUTH_URL}/api/auth/callback/email?${params}`;
return await sendEmail({
- subject: `You've been invited to join a workspace on ${process.env.NEXT_PUBLIC_APP_NAME}`,
+ subject: "You've been invited to join a workspace on Dub",
to: email,
react: WorkspaceInvite({
email,
diff --git a/apps/web/lib/auth/options.ts b/apps/web/lib/auth/options.ts
index c66e8833b1..6d6a6cf8fa 100644
--- a/apps/web/lib/auth/options.ts
+++ b/apps/web/lib/auth/options.ts
@@ -103,7 +103,7 @@ export const authOptions: NextAuthOptions = {
sendEmail({
to: identifier,
- subject: `Your ${process.env.NEXT_PUBLIC_APP_NAME} Login Link`,
+ subject: "Your Dub Login Link",
react: LoginLink({ url, email: identifier }),
});
},
@@ -382,9 +382,7 @@ export const authOptions: NextAuthOptions = {
sameSite: "lax",
path: "/",
// When working on localhost, the cookie domain must be omitted entirely (https://stackoverflow.com/a/1188145)
- domain: VERCEL_DEPLOYMENT
- ? `.${process.env.NEXT_PUBLIC_APP_DOMAIN}`
- : undefined,
+ domain: VERCEL_DEPLOYMENT ? ".dub.co" : undefined,
secure: VERCEL_DEPLOYMENT,
},
},
diff --git a/apps/web/playwright.config.ts b/apps/web/playwright.config.ts
index aad4e8abcf..37dc310e5f 100644
--- a/apps/web/playwright.config.ts
+++ b/apps/web/playwright.config.ts
@@ -2,6 +2,9 @@ import "dotenv-flow/config";
import { defineConfig, devices } from "@playwright/test";
+const workspaceBaseURL = "http://localhost:8888";
+const partnersBaseURL = "http://partners.localhost:8888";
+
export default defineConfig({
globalSetup: require.resolve("./global-setup"),
testDir: "./playwright",
@@ -16,8 +19,7 @@ export default defineConfig({
timeout: 30000,
},
use: {
- baseURL:
- process.env.PLAYWRIGHT_BASE_URL || "http://partners.localhost:8888",
+ baseURL: workspaceBaseURL,
trace: "on-first-retry",
screenshot: "only-on-failure",
},
@@ -26,11 +28,15 @@ export default defineConfig({
{
name: "partner-setup",
testMatch: /partners\/auth\.setup\.ts/,
+ use: {
+ baseURL: partnersBaseURL,
+ },
},
{
name: "partners",
use: {
...devices["Desktop Chrome"],
+ baseURL: partnersBaseURL,
storageState: "playwright/.auth/partner.json",
},
testDir: "./playwright/partners",
@@ -41,15 +47,11 @@ export default defineConfig({
{
name: "workspace-setup",
testMatch: /workspaces\/auth\.setup\.ts/,
- use: {
- baseURL: "http://app.localhost:8888",
- },
},
{
name: "workspaces",
use: {
...devices["Desktop Chrome"],
- baseURL: "http://app.localhost:8888",
storageState: "playwright/.auth/workspace.json",
},
testDir: "./playwright/workspaces",
@@ -63,7 +65,6 @@ export default defineConfig({
use: {
...devices["Desktop Chrome"],
storageState: "playwright/.auth/workspace.json",
- baseURL: "http://app.localhost:8888",
},
dependencies: ["workspaces"],
},
diff --git a/apps/web/playwright/README.md b/apps/web/playwright/README.md
index c5beb04645..9d2fd72311 100644
--- a/apps/web/playwright/README.md
+++ b/apps/web/playwright/README.md
@@ -26,9 +26,6 @@
SMTP_PORT=1025
# RESEND_API_KEY must NOT be set, otherwise emails go to Resend instead of MailHog
-
- # Optional — defaults to http://partners.localhost:8888
- PLAYWRIGHT_BASE_URL=http://partners.localhost:8888
```
The seeded test user (`E2E_PARTNER_EMAIL`) must exist in your local database — run `tsx apps/web/playwright/seed.ts` to create it. Signup tests generate a fresh user each run via MailHog email verification.
diff --git a/apps/web/playwright/workspaces/auth.setup.ts b/apps/web/playwright/workspaces/auth.setup.ts
index 3dd239a049..7cc850d464 100644
--- a/apps/web/playwright/workspaces/auth.setup.ts
+++ b/apps/web/playwright/workspaces/auth.setup.ts
@@ -10,8 +10,8 @@ const authFile = "playwright/.auth/workspace.json";
test("sign up new user for workspace onboarding", async ({ page }) => {
const email = `${nanoid(10)}@dub-internal-test.com`;
- // Go to registration page on the app subdomain
- await page.goto("http://app.localhost:8888/register");
+ // Go to registration page
+ await page.goto("/register");
// Step 1: Enter email and reveal password field
await page.locator('input[name="email"]').fill(email);
diff --git a/apps/web/playwright/workspaces/billing-trial.spec.ts b/apps/web/playwright/workspaces/billing-trial.spec.ts
index cdb689e0fe..d6bb93605b 100644
--- a/apps/web/playwright/workspaces/billing-trial.spec.ts
+++ b/apps/web/playwright/workspaces/billing-trial.spec.ts
@@ -20,7 +20,7 @@ test.describe("Billing trial checkout", () => {
baseURL,
request,
}) => {
- const dashboardOrigin = baseURL ?? "http://app.localhost:8888";
+ const dashboardOrigin = baseURL ?? "http://localhost:8888";
const res = await request.get("/api/workspaces");
expect(res.ok()).toBeTruthy();
diff --git a/apps/web/playwright/workspaces/onboarding-dub-partners.spec.ts b/apps/web/playwright/workspaces/onboarding-dub-partners.spec.ts
index f1d33a1d77..c57357132b 100644
--- a/apps/web/playwright/workspaces/onboarding-dub-partners.spec.ts
+++ b/apps/web/playwright/workspaces/onboarding-dub-partners.spec.ts
@@ -33,7 +33,7 @@ test.describe("Dub Partners onboarding", () => {
const workspaceName = `Test WS ${nanoid(6)}`;
const customDomain = randomOnboardingDomain();
- const baseURL = baseURLParam ?? "http://app.localhost:8888";
+ const baseURL = baseURLParam ?? "http://localhost:8888";
// Welcome page
await page.goto("/onboarding");
diff --git a/apps/web/ui/account/delete-account.tsx b/apps/web/ui/account/delete-account.tsx
index 2516ad7fc6..58e574d5bd 100644
--- a/apps/web/ui/account/delete-account.tsx
+++ b/apps/web/ui/account/delete-account.tsx
@@ -13,9 +13,9 @@ export default function DeleteAccountSection() {
<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.
+ Permanently delete your Dub 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-200" />
diff --git a/apps/web/ui/account/upload-avatar.tsx b/apps/web/ui/account/upload-avatar.tsx
index d18a155410..7bfa32b002 100644
--- a/apps/web/ui/account/upload-avatar.tsx
+++ b/apps/web/ui/account/upload-avatar.tsx
@@ -47,8 +47,7 @@ export default function UploadAvatar() {
<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.
+ This is your avatar image on your Dub account.
</p>
<p className="text-sm text-neutral-500">
Click your avatar to upload a new image.
diff --git a/apps/web/ui/auth/login/sso-sign-in.tsx b/apps/web/ui/auth/login/sso-sign-in.tsx
index dbbe8eac66..3d36206223 100644
--- a/apps/web/ui/auth/login/sso-sign-in.tsx
+++ b/apps/web/ui/auth/login/sso-sign-in.tsx
@@ -52,9 +52,7 @@ export const SSOSignIn = () => {
<h2 className="text-sm font-medium text-neutral-900">
Workspace Slug
</h2>
- <InfoTooltip
- content={`This is your workspace's unique identifier on ${process.env.NEXT_PUBLIC_APP_NAME}. E.g. app.dub.co/acme is "acme".`}
- />
+ <InfoTooltip content="This is your workspace's unique identifier on Dub. E.g. app.dub.co/acme is 'acme'." />
</div>
<input
id="slug"
diff --git a/apps/web/ui/links/link-builder/tag-select.tsx b/apps/web/ui/links/link-builder/tag-select.tsx
index 61b4f37264..1186707606 100644
--- a/apps/web/ui/links/link-builder/tag-select.tsx
+++ b/apps/web/ui/links/link-builder/tag-select.tsx
@@ -173,9 +173,7 @@ export const TagSelect = memo(() => {
<div className="mb-1 flex items-center justify-between">
<div className="flex items-center gap-2">
<p className="text-sm font-medium text-neutral-700">Tags</p>
- <InfoTooltip
- content={`Tags are used to organize your links in your ${process.env.NEXT_PUBLIC_APP_NAME} dashboard. [Learn more.](https://dub.co/help/article/how-to-use-tags)`}
- />
+ <InfoTooltip content="Tags are used to organize your links in your Dub dashboard. [Learn more.](https://dub.co/help/article/how-to-use-tags)" />
</div>
<a
href={`/${slug}/settings/library/tags`}
diff --git a/apps/web/ui/modals/google-oauth-modal.tsx b/apps/web/ui/modals/google-oauth-modal.tsx
index 4aef2a7b59..73504be1cc 100644
--- a/apps/web/ui/modals/google-oauth-modal.tsx
+++ b/apps/web/ui/modals/google-oauth-modal.tsx
@@ -27,8 +27,7 @@ function GoogleOauthModal({
<Logo />
<h3 className="text-lg font-medium">Connect your Google Account</h3>
<p className="text-center text-sm text-neutral-500">
- This allows you to sign in to your {process.env.NEXT_PUBLIC_APP_NAME}{" "}
- account with Google.{" "}
+ This allows you to sign in to your Dub account with Google.{" "}
<a
className="underline underline-offset-4 transition-colors hover:text-black"
href="https://dub.co/changelog/sign-in-with-google"
diff --git a/apps/web/ui/modals/import-bitly-modal.tsx b/apps/web/ui/modals/import-bitly-modal.tsx
index e9205e45cb..e2c6506298 100644
--- a/apps/web/ui/modals/import-bitly-modal.tsx
+++ b/apps/web/ui/modals/import-bitly-modal.tsx
@@ -127,8 +127,8 @@ function ImportBitlyModal({
</div>
<h3 className="text-lg font-medium">Import Your Bitly Links</h3>
<p className="text-center text-sm text-neutral-500">
- Easily import all your existing Bitly links into{" "}
- {process.env.NEXT_PUBLIC_APP_NAME} with just a few clicks.
+ Easily import all your existing Bitly links into Dub with just a few
+ clicks.
</p>
</div>
diff --git a/apps/web/ui/modals/import-rebrandly-modal.tsx b/apps/web/ui/modals/import-rebrandly-modal.tsx
index b1d5754372..22b0e4888f 100644
--- a/apps/web/ui/modals/import-rebrandly-modal.tsx
+++ b/apps/web/ui/modals/import-rebrandly-modal.tsx
@@ -115,8 +115,8 @@ function ImportRebrandlyModal({
</div>
<h3 className="text-lg font-medium">Import Your Rebrandly Links</h3>
<p className="text-center text-sm text-neutral-500">
- Easily import all your existing Rebrandly links into{" "}
- {process.env.NEXT_PUBLIC_APP_NAME} with just a few clicks.
+ Easily import all your existing Rebrandly links into Dub with just a
+ few clicks.
</p>
</div>
diff --git a/apps/web/ui/modals/import-short-modal.tsx b/apps/web/ui/modals/import-short-modal.tsx
index eba3ccabba..a47986babc 100644
--- a/apps/web/ui/modals/import-short-modal.tsx
+++ b/apps/web/ui/modals/import-short-modal.tsx
@@ -105,8 +105,8 @@ function ImportShortModal({
</div>
<h3 className="text-lg font-medium">Import Your Short.io Links</h3>
<p className="text-center text-sm text-neutral-500">
- Easily import all your existing Short.io links into{" "}
- {process.env.NEXT_PUBLIC_APP_NAME} with just a few clicks.
+ Easily import all your existing Short.io links into Dub with just a
+ few clicks.
</p>
</div>
diff --git a/apps/web/ui/modals/saml-modal.tsx b/apps/web/ui/modals/saml-modal.tsx
index 5e52a77416..d3e0ce2005 100644
--- a/apps/web/ui/modals/saml-modal.tsx
+++ b/apps/web/ui/modals/saml-modal.tsx
@@ -45,8 +45,7 @@ function SAMLModal({
</div>
<h3 className="text-lg font-medium">Configure SAML</h3>
<p className="text-center text-sm text-neutral-500">
- Select a provider to configure SAML for your{" "}
- {process.env.NEXT_PUBLIC_APP_NAME} workspace.
+ Select a provider to configure SAML for your Dub workspace.
</p>
</div>
diff --git a/apps/web/ui/modals/scim-modal.tsx b/apps/web/ui/modals/scim-modal.tsx
index a88026d22d..5a131c449b 100644
--- a/apps/web/ui/modals/scim-modal.tsx
+++ b/apps/web/ui/modals/scim-modal.tsx
@@ -82,7 +82,7 @@ function SCIMModal({
<p className="text-center text-sm text-neutral-500">
{currentProvider
? "Your workspace is currently syncing with your SCIM directory."
- : `Select a provider to configure directory sync for your ${process.env.NEXT_PUBLIC_APP_NAME} workspace.`}
+ : "Select a provider to configure directory sync for your Dub workspace."}
</p>
</div>
diff --git a/apps/web/ui/workspaces/create-workspace-form.tsx b/apps/web/ui/workspaces/create-workspace-form.tsx
index da7efd3865..e6de574843 100644
--- a/apps/web/ui/workspaces/create-workspace-form.tsx
+++ b/apps/web/ui/workspaces/create-workspace-form.tsx
@@ -139,7 +139,7 @@ export function CreateWorkspaceForm({
</label>
<div className="relative mt-2 flex rounded-md shadow-sm">
<span className="inline-flex items-center rounded-l-md border border-r-0 border-neutral-300 bg-neutral-50 px-3 text-neutral-500 sm:text-sm">
- app.{process.env.NEXT_PUBLIC_APP_DOMAIN}
+ app.dub.co
</span>
<input
id="slug"
diff --git a/apps/web/ui/workspaces/upload-logo.tsx b/apps/web/ui/workspaces/upload-logo.tsx
index c8fc8a7ff3..f8e6984617 100644
--- a/apps/web/ui/workspaces/upload-logo.tsx
+++ b/apps/web/ui/workspaces/upload-logo.tsx
@@ -48,7 +48,7 @@ export default function UploadLogo() {
<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}.
+ This is your workspace's logo on Dub.
</p>
<p className="text-sm text-neutral-500">
Click the logo to upload a new image.
diff --git a/packages/email/src/templates/login-link.tsx b/packages/email/src/templates/login-link.tsx
index 1991a59d4c..78e5d9409d 100644
--- a/packages/email/src/templates/login-link.tsx
+++ b/packages/email/src/templates/login-link.tsx
@@ -16,7 +16,7 @@ import { Footer } from "../components/footer";
export default function LoginLink({
email = "[email protected]",
- url = "http://localhost:8888/api/auth/callback/email?callbackUrl=http%3A%2F%2Fapp.localhost%3A3000%2Flogin&token=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx&[email protected]",
+ url = "http://localhost:8888/api/auth/callback/email?callbackUrl=http%3A%2F%2Flocalhost%3A3000%2Flogin&token=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx&[email protected]",
}: {
email: string;
url: string;
diff --git a/packages/email/src/templates/partner-user-invited.tsx b/packages/email/src/templates/partner-user-invited.tsx
index ef68c18e34..138c31baf5 100644
--- a/packages/email/src/templates/partner-user-invited.tsx
+++ b/packages/email/src/templates/partner-user-invited.tsx
@@ -16,7 +16,7 @@ import { Footer } from "../components/footer";
export default function PartnerUserInvited({
email = "[email protected]",
- url = "http://localhost:8888/api/auth/callback/email?callbackUrl=http%3A%2F%2Fapp.localhost%3A3000%2Flogin&token=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx&[email protected]",
+ url = "http://partners.localhost:8888/api/auth/callback/email?callbackUrl=http%3A%2F%2Fpartners.localhost%3A3000%2Flogin&token=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx&[email protected]",
partnerName = "Acme",
partnerUser = "Brendon Urie",
partnerUserEmail = "[email protected]",
diff --git a/packages/email/src/templates/workspace-invite.tsx b/packages/email/src/templates/workspace-invite.tsx
index be6c67c9f4..7878883a24 100644
--- a/packages/email/src/templates/workspace-invite.tsx
+++ b/packages/email/src/templates/workspace-invite.tsx
@@ -16,7 +16,7 @@ import { Footer } from "../components/footer";
export default function WorkspaceInvite({
email = "[email protected]",
- url = "http://localhost:8888/api/auth/callback/email?callbackUrl=http%3A%2F%2Fapp.localhost%3A3000%2Flogin&token=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx&[email protected]",
+ url = "http://localhost:8888/api/auth/callback/email?callbackUrl=http%3A%2F%2Flocalhost%3A3000%2Flogin&token=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxx&[email protected]",
workspaceName = "Acme",
workspaceUser = "Brendon Urie",
workspaceUserEmail = "[email protected]",
diff --git a/packages/ui/src/footer.tsx b/packages/ui/src/footer.tsx
index 0897c6396a..b44f836a32 100644
--- a/packages/ui/src/footer.tsx
+++ b/packages/ui/src/footer.tsx
@@ -134,9 +134,7 @@ export function Footer({
})}
className="block max-w-fit"
>
- <span className="sr-only">
- {process.env.NEXT_PUBLIC_APP_NAME} Logo
- </span>
+ <span className="sr-only">Dub Logo</span>
<NavWordmark className="h-8 text-neutral-800" />
</Link>
</div>
diff --git a/packages/utils/src/constants/main.ts b/packages/utils/src/constants/main.ts
index 77ead25a6b..da20408f36 100644
--- a/packages/utils/src/constants/main.ts
+++ b/packages/utils/src/constants/main.ts
@@ -1,34 +1,31 @@
-export const APP_NAME = process.env.NEXT_PUBLIC_APP_NAME || "Dub";
-
-export const SHORT_DOMAIN =
- process.env.NEXT_PUBLIC_APP_SHORT_DOMAIN || "dub.sh";
+export const SHORT_DOMAIN = "dub.sh";
export const APP_HOSTNAMES = new Set([
- `app.${process.env.NEXT_PUBLIC_APP_DOMAIN}`,
- `preview.${process.env.NEXT_PUBLIC_APP_DOMAIN}`,
+ "app.dub.co",
+ "preview.dub.co",
"localhost:8888",
"localhost",
]);
export const APP_DOMAIN =
process.env.NEXT_PUBLIC_VERCEL_ENV === "production"
- ? `https://app.${process.env.NEXT_PUBLIC_APP_DOMAIN}`
+ ? "https://app.dub.co"
: process.env.NEXT_PUBLIC_VERCEL_ENV === "preview"
- ? `https://preview.${process.env.NEXT_PUBLIC_APP_DOMAIN}`
+ ? "https://preview.dub.co"
: "http://localhost:8888";
export const APP_DOMAIN_WITH_NGROK =
process.env.NEXT_PUBLIC_VERCEL_ENV === "production"
- ? `https://app.${process.env.NEXT_PUBLIC_APP_DOMAIN}`
+ ? "https://app.dub.co"
: process.env.NEXT_PUBLIC_VERCEL_ENV === "preview"
? process.env.VERCEL_URL
? `https://${process.env.VERCEL_URL}`
- : `https://preview.${process.env.NEXT_PUBLIC_APP_DOMAIN}`
+ : "https://preview.dub.co"
: process.env.NEXT_PUBLIC_NGROK_URL || "http://localhost:8888";
export const API_HOSTNAMES = new Set([
- `api.${process.env.NEXT_PUBLIC_APP_DOMAIN}`,
- `api-staging.${process.env.NEXT_PUBLIC_APP_DOMAIN}`,
+ "api.dub.co",
+ "api-staging.dub.co",
`api.${SHORT_DOMAIN}`,
"api.localhost:8888",
"api.localhost",
@@ -36,36 +33,36 @@ export const API_HOSTNAMES = new Set([
export const API_DOMAIN =
process.env.NEXT_PUBLIC_VERCEL_ENV === "production"
- ? `https://api.${process.env.NEXT_PUBLIC_APP_DOMAIN}`
+ ? "https://api.dub.co"
: process.env.NEXT_PUBLIC_VERCEL_ENV === "preview"
- ? `https://api-staging.${process.env.NEXT_PUBLIC_APP_DOMAIN}`
+ ? "https://api-staging.dub.co"
: "http://api.localhost:8888";
export const ADMIN_HOSTNAMES = new Set([
- `admin.${process.env.NEXT_PUBLIC_APP_DOMAIN}`,
+ "admin.dub.co",
"admin.localhost:8888",
"admin.localhost",
]);
export const PARTNERS_HOSTNAMES = new Set([
- `partners.${process.env.NEXT_PUBLIC_APP_DOMAIN}`,
- `partners-staging.${process.env.NEXT_PUBLIC_APP_DOMAIN}`,
+ "partners.dub.co",
+ "partners-staging.dub.co",
"partners.localhost:8888",
"partners.localhost",
]);
export const PARTNERS_DOMAIN =
process.env.NEXT_PUBLIC_VERCEL_ENV === "production"
- ? `https://partners.${process.env.NEXT_PUBLIC_APP_DOMAIN}`
+ ? "https://partners.dub.co"
: process.env.NEXT_PUBLIC_VERCEL_ENV === "preview"
- ? `https://partners-staging.${process.env.NEXT_PUBLIC_APP_DOMAIN}`
+ ? "https://partners-staging.dub.co"
: "http://partners.localhost:8888";
export const PARTNERS_DOMAIN_WITH_NGROK =
process.env.NEXT_PUBLIC_VERCEL_ENV === "production"
- ? `https://partners.${process.env.NEXT_PUBLIC_APP_DOMAIN}`
+ ? "https://partners.dub.co"
: process.env.NEXT_PUBLIC_VERCEL_ENV === "preview"
- ? `https://partners-staging.${process.env.NEXT_PUBLIC_APP_DOMAIN}`
+ ? "https://partners-staging.dub.co"
: process.env.NEXT_PUBLIC_NGROK_URL || "http://partners.localhost:8888";
export const DUB_LOGO = "https://assets.dub.co/logo.png";