chore: add code of conduct

Update contributing guidelines

CONTRIBUTING.md

@@ -5,8 +5,8 @@ If you plan to contribute to Documenso, please take a moment to feel awesome ✨
 ## Before getting started
 
 - Before jumping into a PR be sure to search [existing PRs](https://github.com/documenso/documenso/pulls) or [issues](https://github.com/documenso/documenso/issues) for an open or closed item that relates to your submission.
-- Select an issue from [here](https://github.com/documenso/documenso/issues) or create a new one
-- Consider the results from the discussion on the issue
+- Select and issue from [here](https://github.com/documenso/documenso/issues) or create a new one
+- Consider the results from the discussion in the issue
 - Accept the [Contributor License Agreement](https://documen.so/cla) to ensure we can accept your contributions.
 
 ## Taking issues
@@ -27,14 +27,14 @@ Always feel free to ask questions or seek clarification on the issue.
 
 ## Developing
 
-The development branch is <code>main</code>. All pull requests should be made against this branch. If you need help getting started, [join us on Discord](https://documen.so/discord).
+The development branch is <code>main</code>. All pull request should be made against this branch. If you need help getting started, [join us on Discord](https://documen.so/discord).
 
 1. [Fork](https://help.github.com/articles/fork-a-repo/) this repository to your
    own GitHub account and then
    [clone](https://help.github.com/articles/cloning-a-repository/) it to your local device.
 2. Create a new branch:
 
-- Create a new branch (include the issue id and something readable):
+- Create a new branch (include the issue id and somthing readable):
 
   ```sh
   git checkout -b doc-999-my-feature-or-fix
@@ -45,7 +45,7 @@ The development branch is <code>main</code>. All pull requests should be made ag
 ## Building
 
 > **Note**
-> Please ensure you can make a full production build before pushing code or creating PRs.
+> Please be sure that you can make a full production build before pushing code or creating PRs.
 
 You can build the project with:
 

apps/marketing/package.json

@@ -31,7 +31,7 @@
     "react-confetti": "^6.1.0",
     "react-dom": "18.2.0",
     "react-hook-form": "^7.43.9",
-    "react-icons": "^4.11.0",
+    "react-icons": "^4.8.0",
     "recharts": "^2.7.2",
     "sharp": "0.32.5",
     "typescript": "5.1.6",

apps/marketing/src/app/(marketing)/open/data.ts

@@ -31,22 +31,6 @@ export const TEAM_MEMBERS = [
     engagement: 'Full-Time',
     joinDate: 'July 26th, 2023',
   },
-  {
-    name: 'Catalin-Marinel Pit',
-    role: 'Software Engineer - II',
-    salary: 80_000,
-    location: 'Romania',
-    engagement: 'Full-Time',
-    joinDate: 'September 4th, 2023',
-  },
-  {
-    name: 'Gowdhama Rajan B',
-    role: 'Designer - III',
-    salary: 100_000,
-    location: 'India',
-    engagement: 'Full-Time',
-    joinDate: 'October 9th, 2023',
-  },
 ];
 
 export const FUNDING_RAISED = [

apps/marketing/src/components/(marketing)/callout.tsx

@@ -2,8 +2,8 @@
 
 import Link from 'next/link';
 
+import { Github } from 'lucide-react';
 import { usePlausible } from 'next-plausible';
-import { LuGithub } from 'react-icons/lu';
 
 import { Button } from '@documenso/ui/primitives/button';
 
@@ -52,7 +52,7 @@ export const Callout = ({ starCount }: CalloutProps) => {
         onClick={() => event('view-github')}
       >
         <Button variant="outline" className="rounded-full bg-transparent backdrop-blur-sm">
-          <LuGithub className="mr-2 h-5 w-5" />
+          <Github className="mr-2 h-5 w-5" />
           Star on Github
           {starCount && starCount > 0 && (
             <span className="bg-primary dark:text-background -mr-2.5 ml-2.5 rounded-full px-2 py-1.5 text-xs">

apps/marketing/src/components/(marketing)/claim-plan-dialog.tsx

@@ -1,6 +1,6 @@
 'use client';
 
-import React, { useEffect, useState } from 'react';
+import React, { useState } from 'react';
 
 import { useSearchParams } from 'next/navigation';
 
@@ -55,8 +55,8 @@ export const ClaimPlanDialog = ({ className, planId, children }: ClaimPlanDialog
     register,
     handleSubmit,
     formState: { errors, isSubmitting },
-    reset,
   } = useForm<TClaimPlanDialogFormSchema>({
+    mode: 'onBlur',
     defaultValues: {
       name: params?.get('name') ?? '',
       email: params?.get('email') ?? '',
@@ -91,12 +91,6 @@ export const ClaimPlanDialog = ({ className, planId, children }: ClaimPlanDialog
     }
   };
 
-  useEffect(() => {
-    if (!isSubmitting && !open) {
-      reset();
-    }
-  }, [open]);
-
   return (
     <Dialog open={open} onOpenChange={(value) => !isSubmitting && setOpen(value)}>
       <DialogTrigger asChild>{children}</DialogTrigger>

apps/marketing/src/components/(marketing)/footer.tsx

@@ -5,20 +5,17 @@ import { HTMLAttributes } from 'react';
 import Image from 'next/image';
 import Link from 'next/link';
 
-import { Moon, Sun } from 'lucide-react';
+import { Github, MessagesSquare, Moon, Sun, Twitter } from 'lucide-react';
 import { useTheme } from 'next-themes';
-import { FaXTwitter } from 'react-icons/fa6';
-import { LiaDiscord } from 'react-icons/lia';
-import { LuGithub } from 'react-icons/lu';
 
 import { cn } from '@documenso/ui/lib/utils';
 
 export type FooterProps = HTMLAttributes<HTMLDivElement>;
 
 const SOCIAL_LINKS = [
-  { href: 'https://twitter.com/documenso', icon: <FaXTwitter className="h-6 w-6" /> },
-  { href: 'https://github.com/documenso/documenso', icon: <LuGithub className="h-6 w-6" /> },
-  { href: 'https://documen.so/discord', icon: <LiaDiscord className="h-7 w-7" /> },
+  { href: 'https://twitter.com/documenso', icon: <Twitter className="h-6 w-6" /> },
+  { href: 'https://github.com/documenso/documenso', icon: <Github className="h-6 w-6" /> },
+  { href: 'https://documen.so/discord', icon: <MessagesSquare className="h-6 w-6" /> },
 ];
 
 const FOOTER_LINKS = [

apps/marketing/src/components/(marketing)/hero.tsx

@@ -4,8 +4,8 @@ import Image from 'next/image';
 import Link from 'next/link';
 
 import { Variants, motion } from 'framer-motion';
+import { Github } from 'lucide-react';
 import { usePlausible } from 'next-plausible';
-import { LuGithub } from 'react-icons/lu';
 import { match } from 'ts-pattern';
 
 import { useFeatureFlags } from '@documenso/lib/client-only/providers/feature-flag';
@@ -122,7 +122,7 @@ export const Hero = ({ className, ...props }: HeroProps) => {
 
           <Link href="https://github.com/documenso/documenso" onClick={() => event('view-github')}>
             <Button variant="outline" className="rounded-full bg-transparent backdrop-blur-sm">
-              <LuGithub className="mr-2 h-5 w-5" />
+              <Github className="mr-2 h-5 w-5" />
               Star on Github
             </Button>
           </Link>

apps/marketing/src/components/(marketing)/mobile-navigation.tsx

@@ -4,9 +4,7 @@ import Image from 'next/image';
 import Link from 'next/link';
 
 import { motion, useReducedMotion } from 'framer-motion';
-import { FaXTwitter } from 'react-icons/fa6';
-import { LiaDiscord } from 'react-icons/lia';
-import { LuGithub } from 'react-icons/lu';
+import { Github, MessagesSquare, Twitter } from 'lucide-react';
 
 import { Sheet, SheetContent } from '@documenso/ui/primitives/sheet';
 
@@ -113,7 +111,7 @@ export const MobileNavigation = ({ isMenuOpen, onMenuOpenChange }: MobileNavigat
             target="_blank"
             className="text-foreground hover:text-foreground/80"
           >
-            <FaXTwitter className="h-6 w-6" />
+            <Twitter className="h-6 w-6" />
           </Link>
 
           <Link
@@ -121,7 +119,7 @@ export const MobileNavigation = ({ isMenuOpen, onMenuOpenChange }: MobileNavigat
             target="_blank"
             className="text-foreground hover:text-foreground/80"
           >
-            <LuGithub className="h-6 w-6" />
+            <Github className="h-6 w-6" />
           </Link>
 
           <Link
@@ -129,7 +127,7 @@ export const MobileNavigation = ({ isMenuOpen, onMenuOpenChange }: MobileNavigat
             target="_blank"
             className="text-foreground hover:text-foreground/80"
           >
-            <LiaDiscord className="h-7 w-7" />
+            <MessagesSquare className="h-6 w-6" />
           </Link>
         </div>
       </SheetContent>

apps/web/package.json

@@ -36,7 +36,7 @@
     "react-dom": "18.2.0",
     "react-dropzone": "^14.2.3",
     "react-hook-form": "^7.43.9",
-    "react-icons": "^4.11.0",
+    "react-icons": "^4.8.0",
     "react-rnd": "^10.4.1",
     "sharp": "0.32.5",
     "ts-pattern": "^5.0.5",

apps/web/src/app/(signing)/sign/[token]/complete/share-button.tsx

@@ -2,8 +2,7 @@
 
 import { HTMLAttributes, useState } from 'react';
 
-import { Copy, Share } from 'lucide-react';
-import { FaXTwitter } from 'react-icons/fa6';
+import { Copy, Share, Twitter } from 'lucide-react';
 
 import { generateTwitterIntent } from '@documenso/lib/universal/generate-twitter-intent';
 import { trpc } from '@documenso/trpc/react';
@@ -126,7 +125,7 @@ export const ShareButton = ({ token, documentId }: ShareButtonProps) => {
           </div>
 
           <Button variant="outline" className="mt-4" onClick={onTweetClick}>
-            <FaXTwitter className="mr-2 h-4 w-4" />
+            <Twitter className="mr-2 h-4 w-4" />
             Tweet
           </Button>
 

apps/web/src/components/(dashboard)/layout/profile-dropdown.tsx

@@ -4,6 +4,7 @@ import Link from 'next/link';
 
 import {
   CreditCard,
+  Github,
   Key,
   LogOut,
   User as LucideUser,
@@ -15,7 +16,6 @@ import {
 } from 'lucide-react';
 import { signOut } from 'next-auth/react';
 import { useTheme } from 'next-themes';
-import { LuGithub } from 'react-icons/lu';
 
 import { useFeatureFlags } from '@documenso/lib/client-only/providers/feature-flag';
 import { isAdmin } from '@documenso/lib/next-auth/guards/is-admin';
@@ -130,7 +130,7 @@ export const ProfileDropdown = ({ user }: ProfileDropdownProps) => {
         <DropdownMenuSeparator />
         <DropdownMenuItem asChild>
           <Link href="https://github.com/documenso/documenso" className="cursor-pointer">
-            <LuGithub className="mr-2 h-4 w-4" />
+            <Github className="mr-2 h-4 w-4" />
             Star on Github
           </Link>
         </DropdownMenuItem>

apps/web/src/components/forms/password.tsx

@@ -20,7 +20,6 @@ import { FormErrorMessage } from '../form/form-error-message';
 
 export const ZPasswordFormSchema = z
   .object({
-    currentPassword: z.string().min(6).max(72),
     password: z.string().min(6).max(72),
     repeatedPassword: z.string().min(6).max(72),
   })
@@ -41,7 +40,6 @@ export const PasswordForm = ({ className }: PasswordFormProps) => {
 
   const [showPassword, setShowPassword] = useState(false);
   const [showConfirmPassword, setShowConfirmPassword] = useState(false);
-  const [showCurrentPassword, setShowCurrentPassword] = useState(false);
 
   const {
     register,
@@ -50,7 +48,6 @@ export const PasswordForm = ({ className }: PasswordFormProps) => {
     formState: { errors, isSubmitting },
   } = useForm<TPasswordFormSchema>({
     values: {
-      currentPassword: '',
       password: '',
       repeatedPassword: '',
     },
@@ -59,10 +56,9 @@ export const PasswordForm = ({ className }: PasswordFormProps) => {
 
   const { mutateAsync: updatePassword } = trpc.profile.updatePassword.useMutation();
 
-  const onFormSubmit = async ({ currentPassword, password }: TPasswordFormSchema) => {
+  const onFormSubmit = async ({ password }: TPasswordFormSchema) => {
     try {
       await updatePassword({
-        currentPassword,
         password,
       });
 
@@ -96,39 +92,6 @@ export const PasswordForm = ({ className }: PasswordFormProps) => {
       className={cn('flex w-full flex-col gap-y-4', className)}
       onSubmit={handleSubmit(onFormSubmit)}
     >
-      <div>
-        <Label htmlFor="current-password" className="text-muted-foreground">
-          Current Password
-        </Label>
-
-        <div className="relative">
-          <Input
-            id="current-password"
-            type={showCurrentPassword ? 'text' : 'password'}
-            minLength={6}
-            maxLength={72}
-            autoComplete="current-password"
-            className="bg-background mt-2 pr-10"
-            {...register('currentPassword')}
-          />
-
-          <Button
-            variant="link"
-            type="button"
-            className="absolute right-0 top-0 flex h-full items-center justify-center pr-3"
-            aria-label={showCurrentPassword ? 'Mask password' : 'Reveal password'}
-            onClick={() => setShowCurrentPassword((show) => !show)}
-          >
-            {showCurrentPassword ? (
-              <EyeOff className="text-muted-foreground h-5 w-5" />
-            ) : (
-              <Eye className="text-muted-foreground h-5 w-5" />
-            )}
-          </Button>
-        </div>
-
-        <FormErrorMessage className="mt-1.5" error={errors.currentPassword} />
-      </div>
       <div>
         <Label htmlFor="password" className="text-muted-foreground">
           Password

package-lock.json

@@ -54,7 +54,7 @@
         "react-confetti": "^6.1.0",
         "react-dom": "18.2.0",
         "react-hook-form": "^7.43.9",
-        "react-icons": "^4.11.0",
+        "react-icons": "^4.8.0",
         "recharts": "^2.7.2",
         "sharp": "0.32.5",
         "typescript": "5.1.6",
@@ -95,7 +95,7 @@
         "react-dom": "18.2.0",
         "react-dropzone": "^14.2.3",
         "react-hook-form": "^7.43.9",
-        "react-icons": "^4.11.0",
+        "react-icons": "^4.8.0",
         "react-rnd": "^10.4.1",
         "sharp": "0.32.5",
         "ts-pattern": "^5.0.5",
@@ -16359,9 +16359,9 @@
       }
     },
     "node_modules/react-icons": {
-      "version": "4.11.0",
-      "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-4.11.0.tgz",
-      "integrity": "sha512-V+4khzYcE5EBk/BvcuYRq6V/osf11ODUM2J8hg2FDSswRrGvqiYUYPRy4OdrWaQOBj4NcpJfmHZLNaD+VH0TyA==",
+      "version": "4.10.1",
+      "resolved": "https://registry.npmjs.org/react-icons/-/react-icons-4.10.1.tgz",
+      "integrity": "sha512-/ngzDP/77tlCfqthiiGNZeYFACw85fUjZtLbedmJ5DTlNDIwETxhwBzdOJ21zj4iJdvc0J3y7yOsX3PpxAJzrw==",
       "peerDependencies": {
         "react": "*"
       }

package.json

@@ -2,7 +2,6 @@
   "private": true,
   "scripts": {
     "build": "turbo run build",
-    "build:web": "turbo run build --filter=@documenso/web",
     "dev": "turbo run dev --filter=@documenso/web --filter=@documenso/marketing",
     "start": "cd apps && cd web && next start",
     "lint": "turbo run lint",

packages/lib/server-only/user/update-password.ts

@@ -7,14 +7,9 @@ import { SALT_ROUNDS } from '../../constants/auth';
 export type UpdatePasswordOptions = {
   userId: number;
   password: string;
-  currentPassword: string;
 };
 
-export const updatePassword = async ({
-  userId,
-  password,
-  currentPassword,
-}: UpdatePasswordOptions) => {
+export const updatePassword = async ({ userId, password }: UpdatePasswordOptions) => {
   // Existence check
   const user = await prisma.user.findFirstOrThrow({
     where: {
@@ -22,29 +17,23 @@ export const updatePassword = async ({
     },
   });
 
-  if (!user.password) {
-    throw new Error('User has no password');
-  }
+  const hashedPassword = await hash(password, SALT_ROUNDS);
 
-  const isCurrentPasswordValid = await compare(currentPassword, user.password);
-  if (!isCurrentPasswordValid) {
-    throw new Error('Current password is incorrect.');
-  }
+  if (user.password) {
+    // Compare the new password with the old password
+    const isSamePassword = await compare(password, user.password);
 
-  // Compare the new password with the old password
-  const isSamePassword = await compare(password, user.password);
-  if (isSamePassword) {
-    throw new Error('Your new password cannot be the same as your old password.');
+    if (isSamePassword) {
+      throw new Error('Your new password cannot be the same as your old password.');
+    }
   }
 
-  const hashedNewPassword = await hash(password, SALT_ROUNDS);
-
   const updatedUser = await prisma.user.update({
     where: {
       id: userId,
     },
     data: {
-      password: hashedNewPassword,
+      password: hashedPassword,
     },
   });
 

packages/trpc/server/profile-router/router.ts

@@ -40,12 +40,11 @@ export const profileRouter = router({
     .input(ZUpdatePasswordMutationSchema)
     .mutation(async ({ input, ctx }) => {
       try {
-        const { password, currentPassword } = input;
+        const { password } = input;
 
         return await updatePassword({
           userId: ctx.user.id,
           password,
-          currentPassword,
         });
       } catch (err) {
         let message =

packages/trpc/server/profile-router/schema.ts

@@ -6,7 +6,6 @@ export const ZUpdateProfileMutationSchema = z.object({
 });
 
 export const ZUpdatePasswordMutationSchema = z.object({
-  currentPassword: z.string().min(6),
   password: z.string().min(6),
 });
 

packages/trpc/server/router.ts

@@ -6,9 +6,7 @@ import { shareLinkRouter } from './share-link-router/router';
 import { procedure, router } from './trpc';
 
 export const appRouter = router({
-  health: procedure.query(() => {
-    return { status: 'ok' };
-  }),
+  hello: procedure.query(() => 'Hello, world!'),
   auth: authRouter,
   profile: profileRouter,
   document: documentRouter,

render.yaml

@@ -1,103 +0,0 @@
-services:
-  - type: web
-    name: documenso-app
-    env: node
-    plan: free
-    buildCommand: npm i && npm run build:web
-    startCommand: npx prisma migrate deploy --schema packages/prisma/schema.prisma && npm run start
-    healthCheckPath: /api/trpc/health
-
-    envVars:
-      # Node Version
-      - key: NODE_VERSION
-        value: 18.17.0
-
-      - key: PORT
-        value: 10000
-
-      # Auth
-      - key: NEXTAUTH_URL
-        fromService:
-          name: documenso-app
-          type: web
-          envVarKey: RENDER_EXTERNAL_URL
-      - key: NEXTAUTH_SECRET
-        generateValue: true
-
-      # Database
-      - key: NEXT_PRIVATE_DATABASE_URL
-        fromDatabase:
-          name: documenso-db
-          property: connectionString
-
-      - key: NEXT_PRIVATE_DIRECT_DATABASE_URL
-        fromDatabase:
-          name: documenso-db
-          property: connectionString
-
-      # URLs
-      - key: NEXT_PUBLIC_WEBAPP_URL
-        fromService:
-          name: documenso-app
-          type: web
-          envVarKey: RENDER_EXTERNAL_URL
-      - key: NEXT_PUBLIC_MARKETING_URL
-        value: 'http://localhost:3001'
-
-      # SMTP
-      - key: NEXT_PRIVATE_SMTP_TRANSPORT
-        value: 'smtp-auth'
-      - key: NEXT_PRIVATE_SMTP_HOST
-        sync: false
-      - key: NEXT_PRIVATE_SMTP_PORT
-        sync: false
-      - key: NEXT_PRIVATE_SMTP_USERNAME
-        sync: false
-      - key: NEXT_PRIVATE_SMTP_PASSWORD
-        sync: false
-      - key: NEXT_PRIVATE_SMTP_FROM_NAME
-        sync: false
-      - key: NEXT_PRIVATE_SMTP_FROM_ADDRESS
-        sync: false
-
-      # Stripe
-      - key: NEXT_PRIVATE_STRIPE_API_KEY
-        sync: false
-      - key: NEXT_PRIVATE_STRIPE_WEBHOOK_SECRET
-        sync: false
-      - key: NEXT_PUBLIC_STRIPE_COMMUNITY_PLAN_MONTHLY_PRICE_ID
-        sync: false
-      - key: NEXT_PUBLIC_STRIPE_COMMUNITY_PLAN_YEARLY_PRICE_ID
-        sync: false
-
-      # Features
-      - key: NEXT_PUBLIC_POSTHOG_KEY
-        sync: false
-      - key: NEXT_PUBLIC_POSTHOG_HOST
-        value: 'https://eu.posthog.com'
-      - key: NEXT_PUBLIC_FEATURE_BILLING_ENABLED
-        sync: false
-
-      # Redis (Only required for marketing site, but added for completeness)
-      - key: NEXT_PRIVATE_REDIS_URL
-        sync: false
-      - key: NEXT_PRIVATE_REDIS_TOKEN
-        sync: false
-
-      # Storage
-      - key: NEXT_PUBLIC_UPLOAD_TRANSPORT
-        value: 'database'
-      - key: NEXT_PRIVATE_UPLOAD_ENDPOINT
-        sync: false
-      - key: NEXT_PRIVATE_UPLOAD_REGION
-        sync: false
-      - key: NEXT_PRIVATE_UPLOAD_BUCKET
-        sync: false
-      - key: NEXT_PRIVATE_UPLOAD_ACCESS_KEY_ID
-        sync: false
-      - key: NEXT_PRIVATE_UPLOAD_SECRET_ACCESS_KEY
-        sync: false
-
-databases:
-  - name: documenso-db
-    plan: free