clean web to bring conformance up

dubinc · versecafe · Jan 19, 2024 · Jan 19, 2024 · Jan 20, 2024 · Jan 20, 2024
commit 8b13f9005a59558482f563dc17e5eb3e18ca0d59
diff --git a/README.md b/README.md
@@ -41,15 +41,15 @@ Dub.co is the open-source link management infrastructure for modern marketing te
 ## Tech Stack
 
 - [Next.js](https://nextjs.org/) – framework
-- [TypeScript](https://www.typescriptlang.org/) – language
-- [Tailwind](https://tailwindcss.com/) – CSS
-- [Upstash](https://upstash.com/) – redis
-- [Tinybird](https://tinybird.com/) – analytics
-- [PlanetScale](https://planetscale.com/) – database
+- [TypeScript](https://www.typescriptlang.org/) – language
+- [Tailwind](https://tailwindcss.com/) – CSS
+- [Upstash](https://upstash.com/) – redis
+- [Tinybird](https://tinybird.com/) – analytics
+- [PlanetScale](https://planetscale.com/) – database
 - [NextAuth.js](https://next-auth.js.org/) – auth
 - [BoxyHQ](https://boxyhq.com/enterprise-sso) – SSO/SAML
 - [Turborepo](https://turbo.build/repo) – monorepo
-- [Stripe](https://stripe.com/) – payments
+- [Stripe](https://stripe.com/) – payments
 - [Resend](https://resend.com/) – emails
 - [Vercel](https://vercel.com/) – deployments
 
@@ -71,7 +71,7 @@ We love our contributors! Here's how you can contribute:
 
 ## Repo Activity
 
-![Dub.co repo activity – generated by Axiom](https://repobeats.axiom.co/api/embed/c90805656bae44a62c62b38222270d5f697fcfb1.svg "Repobeats analytics image")
+![Dub.co repo activity – generated by Axiom](https://repobeats.axiom.co/api/embed/c90805656bae44a62c62b38222270d5f697fcfb1.svg "Repobeats analytics image")
 
 ## License
 

diff --git a/apps/web/.env.example b/apps/web/.env.example
@@ -6,11 +6,11 @@ NEXT_PUBLIC_APP_NAME=Dub.co
 NEXT_PUBLIC_APP_DOMAIN=dub.co
 NEXT_PUBLIC_APP_SHORT_DOMAIN=dub.sh
 
-# Tinybird – required for analytics 
+# Tinybird – required for analytics 
 # Get your Tinybird Auth Token here: https://www.tinybird.co/docs/concepts/auth-tokens.html
 TINYBIRD_API_KEY=
 
-# Vercel's Domains API – required for adding and removing domains
+# Vercel's Domains API – required for adding and removing domains
 # Learn how to set this up: https://vercel.com/templates/next.js/domains-api
 PROJECT_ID_VERCEL=
 TEAM_ID_VERCEL=
@@ -21,7 +21,7 @@ AUTH_BEARER_TOKEN=
 UPSTASH_REDIS_REST_URL=
 UPSTASH_REDIS_REST_TOKEN=
 
-# Upstash QStash – required for queues and background jobs
+# Upstash QStash – required for queues and background jobs
 # Get your QStash Token here: https://upstash.com/docs/qstash/overall/getstarted
 QSTASH_TOKEN=
 QSTASH_CURRENT_SIGNING_KEY=
@@ -43,7 +43,7 @@ RESEND_API_KEY=
 ###### OPTIONAL ENV VARS ######
 ###############################
 
-# Stripe – used for subscriptions
+# Stripe – used for subscriptions
 # If you don't need this, you can also remove the `lib/stripe` folder and all instances of `stripe` from the codebase
 NEXT_PUBLIC_STRIPE_PUBLISHABLE_KEY=
 STRIPE_SECRET_KEY=
@@ -59,7 +59,7 @@ GOOGLE_CLIENT_SECRET=
 GITHUB_CLIENT_ID=
 GITHUB_CLIENT_SECRET=
 
-# Edge Config – used for admin features like banning users, rate limiting etc.
+# Edge Config – used for admin features like banning users, rate limiting etc.
 # Create one here: https://vercel.com/docs/storage/edge-config
 # Alternatively, if you don't need this, you can also remove `lib/edge-config.ts`
 # and all instances of `EDGE_CONFIG` and `EDGE_CONFIG_ID` from the codebase

diff --git a/apps/web/app/admin.dub.co/actions.ts b/apps/web/app/admin.dub.co/actions.ts
@@ -3,7 +3,7 @@
 import { deleteProject } from "@/lib/api/projects";
 import { getSession, hashToken } from "@/lib/auth";
 import prisma from "@/lib/prisma";
-import { DUB_DOMAINS, DUB_PROJECT_ID, getDomainWithoutWWW } from "@dub/utils";
+import { DUB_DOMAINS, DUB_PROJECT_ID } from "@dub/utils";
 import { randomBytes } from "crypto";
 import cloudinary from "cloudinary";
 import { get } from "@vercel/edge-config";

diff --git a/apps/web/app/admin.dub.co/components/user-info.tsx b/apps/web/app/admin.dub.co/components/user-info.tsx
@@ -1,7 +1,7 @@
 "use client";
 
 import { Badge, Copy, Tick } from "@dub/ui";
-import { capitalize, cn, nFormatter } from "@dub/utils";
+import { capitalize, nFormatter } from "@dub/utils";
 import { useState } from "react";
 import { toast } from "sonner";
 import { Globe } from "lucide-react";

diff --git a/apps/web/app/api/admin/links/[linkId]/ban/route.ts b/apps/web/app/api/admin/links/[linkId]/ban/route.ts
@@ -9,7 +9,7 @@ import {
 import { formatRedisLink, redis } from "@/lib/upstash";
 import { get } from "@vercel/edge-config";
 
-// DELETE /api/admin/links/[linkId]/ban – ban a link
+// DELETE /api/admin/links/[linkId]/ban – ban a link
 export const DELETE = withAdmin(async ({ params }) => {
   const { linkId } = params as { linkId: string };
 

diff --git a/apps/web/app/api/admin/links/count/route.ts b/apps/web/app/api/admin/links/count/route.ts
@@ -3,7 +3,7 @@ import { NextResponse } from "next/server";
 import prisma from "@/lib/prisma";
 import { DUB_DOMAINS, LEGAL_USER_ID } from "@dub/utils";
 
-// GET /api/links – get all user links
+// GET /api/links – get all user links
 export const GET = withAdmin(async ({ searchParams }) => {
   let { groupBy, search, domain, tagId } = searchParams as {
     groupBy?: "domain" | "tagId";

diff --git a/apps/web/app/api/admin/links/route.ts b/apps/web/app/api/admin/links/route.ts
@@ -3,7 +3,7 @@ import { NextResponse } from "next/server";
 import prisma from "@/lib/prisma";
 import { DUB_DOMAINS, LEGAL_USER_ID } from "@dub/utils";
 
-// GET /api/links – get all user links
+// GET /api/links – get all user links
 export const GET = withAdmin(async ({ searchParams }) => {
   const {
     domain,

diff --git a/apps/web/app/api/callback/stripe/route.ts b/apps/web/app/api/callback/stripe/route.ts
@@ -14,7 +14,7 @@ const relevantEvents = new Set([
   "customer.subscription.deleted",
 ]);
 
-// POST /api/callback/stripe – listen to Stripe webhooks
+// POST /api/callback/stripe – listen to Stripe webhooks
 export const POST = async (req: Request) => {
   const buf = await req.text();
   const sig = req.headers.get("Stripe-Signature") as string;

diff --git a/apps/web/app/api/domains/[domain]/exists/route.ts b/apps/web/app/api/domains/[domain]/exists/route.ts
@@ -2,7 +2,7 @@ import { withSession } from "@/lib/auth";
 import { domainExists } from "@/lib/api/domains";
 import { NextResponse } from "next/server";
 
-// GET /api/domains/[domain]/exists – check if a domain exists
+// GET /api/domains/[domain]/exists – check if a domain exists
 export const GET = withSession(async ({ params }) => {
   const { domain } = params;
 

diff --git a/apps/web/app/api/links/[linkId]/archive/route.ts b/apps/web/app/api/links/[linkId]/archive/route.ts
@@ -2,13 +2,13 @@ import { archiveLink } from "@/lib/api/links";
 import { withAuth } from "@/lib/auth";
 import { NextResponse } from "next/server";
 
-// POST /api/links/[linkId]/archive – archive a link
+// POST /api/links/[linkId]/archive – archive a link
 export const POST = withAuth(async ({ headers, link }) => {
   const response = await archiveLink(link!.domain, link!.key, true);
   return NextResponse.json(response, { headers });
 });
 
-// DELETE /api/links/[linkId]/archive – unarchive a link
+// DELETE /api/links/[linkId]/archive – unarchive a link
 export const DELETE = withAuth(async ({ headers, link }) => {
   const response = await archiveLink(link!.domain, link!.key, false);
   return NextResponse.json(response, { headers });

diff --git a/apps/web/app/api/links/[linkId]/route.ts b/apps/web/app/api/links/[linkId]/route.ts
@@ -4,15 +4,15 @@ import { NextResponse } from "next/server";
 import { APP_DOMAIN_WITH_NGROK } from "@dub/utils";
 import { qstash } from "@/lib/cron";
 
-// GET /api/links/[linkId] – get a link
+// GET /api/links/[linkId] – get a link
 export const GET = withAuth(async ({ headers, link }) => {
   // link is guaranteed to exist because if not we will return 404
   return NextResponse.json(link!, {
     headers,
   });
 });
 
-// PUT /api/links/[linkId] – update a link
+// PUT /api/links/[linkId] – update a link
 export const PUT = withAuth(async ({ req, headers, project, link }) => {
   let body;
   try {
@@ -81,7 +81,7 @@ export const PUT = withAuth(async ({ req, headers, project, link }) => {
   });
 });
 
-// DELETE /api/links/[linkId] – delete a link
+// DELETE /api/links/[linkId] – delete a link
 export const DELETE = withAuth(async ({ headers, link, project }) => {
   // link is guaranteed to exist because if not we will return 404
   const response = await deleteLink({

diff --git a/apps/web/app/api/links/bulk/route.ts b/apps/web/app/api/links/bulk/route.ts
@@ -3,7 +3,7 @@ import { withAuth } from "@/lib/auth";
 import { NextResponse } from "next/server";
 import { exceededLimitError } from "@/lib/api/errors";
 
-// POST /api/links/bulk – bulk create up to 100 links
+// POST /api/links/bulk – bulk create up to 100 links
 export const POST = withAuth(
   async ({ req, headers, session, project }) => {
     if (!project) {

diff --git a/apps/web/app/api/links/count/route.ts b/apps/web/app/api/links/count/route.ts
@@ -2,7 +2,7 @@ import { getLinksCount } from "@/lib/api/links";
 import { withAuth } from "@/lib/auth";
 import { NextResponse } from "next/server";
 
-// GET /api/links/count – get the number of links for a project
+// GET /api/links/count – get the number of links for a project
 export const GET = withAuth(async ({ headers, searchParams, project }) => {
   const { userId } = searchParams;
   const count = await getLinksCount({

diff --git a/apps/web/app/api/links/exists/route.ts b/apps/web/app/api/links/exists/route.ts
@@ -2,7 +2,7 @@ import { withAuth } from "@/lib/auth";
 import { checkIfKeyExists } from "@/lib/api/links";
 import { NextResponse } from "next/server";
 
-// GET /api//links/exists – check if a link exists
+// GET /api//links/exists – check if a link exists
 export const GET = withAuth(
   async ({ headers, searchParams }) => {
     const { domain, key } = searchParams;

diff --git a/apps/web/app/api/links/info/route.ts b/apps/web/app/api/links/info/route.ts
@@ -3,7 +3,7 @@ import prisma from "@/lib/prisma";
 import { linkConstructor } from "@dub/utils";
 import { NextResponse } from "next/server";
 
-// GET /api/links/info – get the info for a link
+// GET /api/links/info – get the info for a link
 export const GET = withAuth(async ({ headers, searchParams }) => {
   const { domain, key } = searchParams;
   if (!domain || !key) {

diff --git a/apps/web/app/api/links/random/route.ts b/apps/web/app/api/links/random/route.ts
@@ -2,7 +2,7 @@ import { withAuth } from "@/lib/auth";
 import { getRandomKey } from "@/lib/api/links";
 import { NextResponse } from "next/server";
 
-// GET /api/links/random – get a random available link key
+// GET /api/links/random – get a random available link key
 export const GET = withAuth(async ({ headers, searchParams }) => {
   const { domain } = searchParams;
   if (!domain) {

diff --git a/apps/web/app/api/links/route.ts b/apps/web/app/api/links/route.ts
@@ -5,7 +5,7 @@ import { ratelimit } from "@/lib/upstash";
 import { APP_DOMAIN_WITH_NGROK, LOCALHOST_IP } from "@dub/utils";
 import { NextResponse } from "next/server";
 
-// GET /api/links – get all user links
+// GET /api/links – get all user links
 export const GET = withAuth(async ({ headers, searchParams, project }) => {
   const { domain, tagId, search, sort, page, userId, showArchived } =
     searchParams as {
@@ -32,7 +32,7 @@ export const GET = withAuth(async ({ headers, searchParams, project }) => {
   });
 });
 
-// POST /api/links – create a new link
+// POST /api/links – create a new link
 export const POST = withAuth(
   async ({ req, headers, session, project }) => {
     let body;

diff --git a/apps/web/app/api/links/sync/route.ts b/apps/web/app/api/links/sync/route.ts
@@ -5,7 +5,7 @@ import { LinkProps, SimpleLinkProps } from "@/lib/types";
 import { exceededLimitError } from "@/lib/api/errors";
 import { bulkCreateLinks } from "@/lib/api/links";
 
-// POST /api/links/sync – sync user's publicly created links to their accounts
+// POST /api/links/sync – sync user's publicly created links to their accounts
 export const POST = withAuth(async ({ req, session, project }) => {
   let links: SimpleLinkProps[] = [];
   try {

diff --git a/apps/web/app/api/projects/[slug]/domains/[domain]/exists/route.ts b/apps/web/app/api/projects/[slug]/domains/[domain]/exists/route.ts
@@ -2,7 +2,7 @@ import { withAuth } from "@/lib/auth";
 import { domainExists } from "@/lib/api/domains";
 import { NextResponse } from "next/server";
 
-// GET /api/projects/[slug]/domains/[domain]/exists – check if a domain exists
+// GET /api/projects/[slug]/domains/[domain]/exists – check if a domain exists
 export const GET = withAuth(async ({ domain, project }) => {
   const exists = await domainExists(domain);
   if (exists) {

diff --git a/apps/web/app/api/projects/[slug]/domains/[domain]/route.ts b/apps/web/app/api/projects/[slug]/domains/[domain]/route.ts
@@ -12,7 +12,7 @@ import {
 import { NextResponse } from "next/server";
 import { DUB_PROJECT_ID, isDubDomain } from "@dub/utils";
 
-// GET /api/projects/[slug]/domains/[domain] – get a project's domain
+// GET /api/projects/[slug]/domains/[domain] – get a project's domain
 export const GET = withAuth(async ({ domain, project }) => {
   if (isDubDomain(domain) && project.id !== DUB_PROJECT_ID) {
     return new Response("Domain does not belong to project.", {
@@ -43,7 +43,7 @@ export const GET = withAuth(async ({ domain, project }) => {
   });
 });
 
-// PUT /api/projects/[slug]/domains/[domain] – edit a project's domain
+// PUT /api/projects/[slug]/domains/[domain] – edit a project's domain
 export const PUT = withAuth(async ({ req, project, domain }) => {
   const {
     slug: newDomain,

diff --git a/apps/web/app/api/projects/[slug]/domains/route.ts b/apps/web/app/api/projects/[slug]/domains/route.ts
@@ -8,7 +8,7 @@ import {
 } from "@/lib/api/domains";
 import { exceededLimitError } from "@/lib/api/errors";
 
-// GET /api/projects/[slug]/domains – get all domains for a project
+// GET /api/projects/[slug]/domains – get all domains for a project
 export const GET = withAuth(async ({ project }) => {
   const domains = await prisma.domain.findMany({
     where: {

diff --git a/apps/web/app/api/projects/[slug]/exists/route.ts b/apps/web/app/api/projects/[slug]/exists/route.ts
@@ -4,7 +4,7 @@ import prisma from "@/lib/prisma";
 import { DEFAULT_REDIRECTS } from "@dub/utils";
 import { NextResponse } from "next/server";
 
-// GET /api/projects/[slug]/exists – check if a project exists
+// GET /api/projects/[slug]/exists – check if a project exists
 export const GET = withSession(async ({ params }) => {
   const { slug } = params;
   if ((await isReservedKey(slug)) || DEFAULT_REDIRECTS[slug]) {

diff --git a/apps/web/app/api/projects/[slug]/invites/accept/route.ts b/apps/web/app/api/projects/[slug]/invites/accept/route.ts
@@ -2,7 +2,7 @@ import { withSession } from "@/lib/auth";
 import { NextResponse } from "next/server";
 import prisma from "@/lib/prisma";
 
-// POST /api/projects/[slug]/invites/accept – accept a project invite
+// POST /api/projects/[slug]/invites/accept – accept a project invite
 export const POST = withSession(async ({ session, params }) => {
   const invite = await prisma.projectInvite.findFirst({
     where: {

diff --git a/apps/web/app/api/projects/[slug]/invites/route.tsx b/apps/web/app/api/projects/[slug]/invites/route.tsx
@@ -4,7 +4,7 @@ import { inviteUser } from "@/lib/api/users";
 import prisma from "@/lib/prisma";
 import { exceededLimitError } from "@/lib/api/errors";
 
-// GET /api/projects/[slug]/invites – get invites for a specific project
+// GET /api/projects/[slug]/invites – get invites for a specific project
 export const GET = withAuth(async ({ project }) => {
   const invites = await prisma.projectInvite.findMany({
     where: {
@@ -77,7 +77,7 @@ export const POST = withAuth(
   },
 );
 
-// DELETE /api/projects/[slug]/invites – delete a pending invite
+// DELETE /api/projects/[slug]/invites – delete a pending invite
 export const DELETE = withAuth(
   async ({ searchParams, project }) => {
     const { email } = searchParams;

diff --git a/apps/web/app/api/projects/[slug]/logo/route.ts b/apps/web/app/api/projects/[slug]/logo/route.ts
@@ -3,7 +3,7 @@ import prisma from "@/lib/prisma";
 import cloudinary from "cloudinary";
 import { NextResponse } from "next/server";
 
-// POST /api/projects/[slug]/logo – upload a new project logo
+// POST /api/projects/[slug]/logo – upload a new project logo
 export const POST = withAuth(
   async ({ req, project }) => {
     const { image } = await req.json();

diff --git a/apps/web/app/api/projects/[slug]/route.ts b/apps/web/app/api/projects/[slug]/route.ts
@@ -5,12 +5,12 @@ import { deleteProject } from "@/lib/api/projects";
 import { DEFAULT_REDIRECTS, validSlugRegex } from "@dub/utils";
 import { isReservedKey } from "@/lib/edge-config";
 
-// GET /api/projects/[slug] – get a specific project
+// GET /api/projects/[slug] – get a specific project
 export const GET = withAuth(async ({ project, headers }) => {
   return NextResponse.json(project, { headers });
 });
 
-// PUT /api/projects/[slug] – update a specific project
+// PUT /api/projects/[slug] – update a specific project
 export const PUT = withAuth(
   async ({ req, project }) => {
     const { name, slug, defaultDomains } = await req.json();
@@ -62,7 +62,7 @@ export const PUT = withAuth(
   },
 );
 
-// DELETE /api/projects/[slug] – delete a specific project
+// DELETE /api/projects/[slug] – delete a specific project
 export const DELETE = withAuth(
   async ({ project }) => {
     const response = await deleteProject(project);

diff --git a/apps/web/app/api/projects/[slug]/saml/route.ts b/apps/web/app/api/projects/[slug]/saml/route.ts
@@ -3,7 +3,7 @@ import { NextResponse } from "next/server";
 import jackson, { samlAudience } from "@/lib/jackson";
 import { APP_DOMAIN_WITH_NGROK } from "@dub/utils";
 
-// GET /api/projects/[slug]/saml – get SAML connections for a specific project
+// GET /api/projects/[slug]/saml – get SAML connections for a specific project
 export const GET = withAuth(async ({ project }) => {
   const { apiController } = await jackson();
 
@@ -24,7 +24,7 @@ export const GET = withAuth(async ({ project }) => {
   return NextResponse.json(response);
 });
 
-// POST /api/projects/[slug]/saml – create a new SAML connection
+// POST /api/projects/[slug]/saml – create a new SAML connection
 export const POST = withAuth(
   async ({ req, project }) => {
     const { metadataUrl, encodedRawMetadata } = await req.json();
@@ -52,7 +52,7 @@ export const POST = withAuth(
   },
 );
 
-// DELETE /api/projects/[slug]/saml – delete all SAML connections
+// DELETE /api/projects/[slug]/saml – delete all SAML connections
 
 export const DELETE = withAuth(
   async ({ searchParams }) => {