The Open Source DocuSign Alternative.
TypeScript digital-signaturedocument-signingdocusign-alternativee-signatureesignesignaturenext-authnextjsopen-sourcepades-standardpdfpdf-signpdf-signaturepostgresqlprismaself-hostedsigningtypescript
Merge branch 'main' into feat/public-api
Lucas Smithe91bb78f2d84
diff --cc apps/web/src/components/(dashboard)/layout/profile-dropdown.tsxindex 7c06557b1,a767b9700..6b9ec7fdf--- a/apps/web/src/components/(dashboard)/layout/profile-dropdown.tsx+++ b/apps/web/src/components/(dashboard)/layout/profile-dropdown.tsx@@@ -3,8 -3,8 +3,9 @@@import Link from 'next/link';import {+ Braces,CreditCard,+ FileSpreadsheet,Lock,LogOut,User as LucideUser,diff --cc apps/web/src/components/(dashboard)/settings/layout/desktop-nav.tsxindex 8bc395121,572c91c76..e87c47b67--- a/apps/web/src/components/(dashboard)/settings/layout/desktop-nav.tsx+++ b/apps/web/src/components/(dashboard)/settings/layout/desktop-nav.tsx@@@ -5,7 -5,7 +5,7 @@@ import type { HTMLAttributes } from 'reimport Link from 'next/link';import { usePathname } from 'next/navigation';- import { Braces, CreditCard, Lock, User } from 'lucide-react';-import { CreditCard, Lock, User, Users } from 'lucide-react';++import { Braces, CreditCard, Lock, User, Users } from 'lucide-react';import { useFeatureFlags } from '@documenso/lib/client-only/providers/feature-flag';import { cn } from '@documenso/ui/lib/utils';diff --cc apps/web/src/components/(dashboard)/settings/layout/mobile-nav.tsxindex 9a4436626,291c941f6..ad5ca96f6--- a/apps/web/src/components/(dashboard)/settings/layout/mobile-nav.tsx+++ b/apps/web/src/components/(dashboard)/settings/layout/mobile-nav.tsx@@@ -5,7 -5,7 +5,7 @@@ import type { HTMLAttributes } from 'reimport Link from 'next/link';import { usePathname } from 'next/navigation';- import { Braces, CreditCard, Lock, User } from 'lucide-react';-import { CreditCard, Lock, User, Users } from 'lucide-react';++import { Braces, CreditCard, Lock, User, Users } from 'lucide-react';import { useFeatureFlags } from '@documenso/lib/client-only/providers/feature-flag';import { cn } from '@documenso/ui/lib/utils';diff --cc package-lock.jsonindex decf0485d,aae034c57..5194b44e2--- a/package-lock.json+++ b/package-lock.json@@@ -6762,14 -6651,12 +7189,20 @@@"resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.5.6.tgz","integrity": "sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A=="},+ "node_modules/@types/swagger-ui-react": {+ "version": "4.18.3",+ "resolved": "https://registry.npmjs.org/@types/swagger-ui-react/-/swagger-ui-react-4.18.3.tgz",+ "integrity": "sha512-Mo/R7IjDVwtiFPs84pWvh5pI9iyNGBjmfielxqbOh2Jv+8WVSDVe8Nu25kb5BOuV2xmGS3o33jr6nwDJMBcX+Q==",+ "dependencies": {+ "@types/react": "*"+ }+ },+ "node_modules/@types/ua-parser-js": {+ "version": "0.7.39",+ "resolved": "https://registry.npmjs.org/@types/ua-parser-js/-/ua-parser-js-0.7.39.tgz",+ "integrity": "sha512-P/oDfpofrdtF5xw433SPALpdSchtJmY7nsJItf8h3KXqOslkbySh8zq4dSWXH2oTjRvJ5PczVEoCZPow6GicLg==",+ "dev": true+ },"node_modules/@types/unist": {"version": "2.0.10","resolved": "https://registry.npmjs.org/@types/unist/-/unist-2.0.10.tgz",@@@ -6982,11 -6864,11 +7415,16 @@@"crypto-js": "^4.2.0"}},+ "node_modules/@yarnpkg/lockfile": {+ "version": "1.1.0",+ "resolved": "https://registry.npmjs.org/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz",+ "integrity": "sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ=="+ },+ "node_modules/@vvo/tzdb": {+ "version": "6.117.0",+ "resolved": "https://registry.npmjs.org/@vvo/tzdb/-/tzdb-6.117.0.tgz",+ "integrity": "sha512-vZkfoag1kHqItK/zebxT0Fkt3R/zscjgD+Ib7kaAdum0Sz9psXDfVHPW1Benv91d02zPWlLIvZtjBmzX4a+6fw=="+ },"node_modules/abbrev": {"version": "1.1.1","resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz",diff --cc packages/prisma/schema.prismaindex 7f9a8e34e,fc128efc1..8f37d4274--- a/packages/prisma/schema.prisma+++ b/packages/prisma/schema.prisma@@@ -40,8 -43,10 +43,10 @@@ model UsertwoFactorSecret String?twoFactorEnabled Boolean @default(false)twoFactorBackupCodes String?-- VerificationToken VerificationToken[]- Template Template[]+ VerificationToken VerificationToken[]+ ApiToken ApiToken[]++ Template Template[]+ securityAuditLogs UserSecurityAuditLog[]@@index([email])}diff --cc packages/trpc/server/router.tsindex 1bd340cb0,aec70fd63..72fe0b2be--- a/packages/trpc/server/router.ts+++ b/packages/trpc/server/router.ts@@@ -1,6 -1,6 +1,7 @@@import { adminRouter } from './admin-router/router';+import { apiTokenRouter } from './api-token-router/router';import { authRouter } from './auth-router/router';+ import { cryptoRouter } from './crypto/router';import { documentRouter } from './document-router/router';import { fieldRouter } from './field-router/router';import { profileRouter } from './profile-router/router';@@@ -18,8 -21,9 +22,10 @@@ export const appRouter = router(recipient: recipientRouter,admin: adminRouter,shareLink: shareLinkRouter,+ apiToken: apiTokenRouter,singleplayer: singleplayerRouter,+ team: teamRouter,+ template: templateRouter,twoFactorAuthentication: twoFactorAuthenticationRouter,});