Merge branch 'feat/refresh' into fix/467-bugsafari-only-unable-to-copy-document-sharing-link

2025-11-15 09:12:02 +10:00 · 2023-10-06 13:21:40 +11:00
parent 6b801fff34 49d55227e8
commit 0d42285f5d
22 changed files with 283 additions and 61 deletions
--- a/apps/marketing/package.json
+++ b/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.8.0",
+    "react-icons": "^4.11.0",
    "recharts": "^2.7.2",
    "sharp": "0.32.5",
    "typescript": "5.1.6",
--- a/apps/marketing/src/app/(marketing)/open/data.ts
+++ b/apps/marketing/src/app/(marketing)/open/data.ts
@ -31,6 +31,22 @@ 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 = [
--- a/apps/marketing/src/components/(marketing)/callout.tsx
+++ b/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">
-          <Github className="mr-2 h-5 w-5" />
+          <LuGithub 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">
--- a/apps/marketing/src/components/(marketing)/claim-plan-dialog.tsx
+++ b/apps/marketing/src/components/(marketing)/claim-plan-dialog.tsx
@ -1,6 +1,6 @@
 'use client';

-import React, { useState } from 'react';
+import React, { useEffect, 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,6 +91,12 @@ 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>
--- a/apps/marketing/src/components/(marketing)/footer.tsx
+++ b/apps/marketing/src/components/(marketing)/footer.tsx
@ -5,17 +5,20 @@ import { HTMLAttributes } from 'react';
 import Image from 'next/image';
 import Link from 'next/link';

-import { Github, MessagesSquare, Moon, Sun, Twitter } from 'lucide-react';
+import { Moon, Sun } 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: <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" /> },
+  { 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" /> },
 ];

 const FOOTER_LINKS = [
--- a/apps/marketing/src/components/(marketing)/hero.tsx
+++ b/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">
-              <Github className="mr-2 h-5 w-5" />
+              <LuGithub className="mr-2 h-5 w-5" />
              Star on Github
            </Button>
          </Link>
--- a/apps/marketing/src/components/(marketing)/mobile-navigation.tsx
+++ b/apps/marketing/src/components/(marketing)/mobile-navigation.tsx
@ -4,7 +4,9 @@ import Image from 'next/image';
 import Link from 'next/link';

 import { motion, useReducedMotion } from 'framer-motion';
-import { Github, MessagesSquare, Twitter } from 'lucide-react';
+import { FaXTwitter } from 'react-icons/fa6';
+import { LiaDiscord } from 'react-icons/lia';
+import { LuGithub } from 'react-icons/lu';

 import { Sheet, SheetContent } from '@documenso/ui/primitives/sheet';

@ -111,7 +113,7 @@ export const MobileNavigation = ({ isMenuOpen, onMenuOpenChange }: MobileNavigat
            target="_blank"
            className="text-foreground hover:text-foreground/80"
          >
-            <Twitter className="h-6 w-6" />
+            <FaXTwitter className="h-6 w-6" />
          </Link>

          <Link
@ -119,7 +121,7 @@ export const MobileNavigation = ({ isMenuOpen, onMenuOpenChange }: MobileNavigat
            target="_blank"
            className="text-foreground hover:text-foreground/80"
          >
-            <Github className="h-6 w-6" />
+            <LuGithub className="h-6 w-6" />
          </Link>

          <Link
@ -127,7 +129,7 @@ export const MobileNavigation = ({ isMenuOpen, onMenuOpenChange }: MobileNavigat
            target="_blank"
            className="text-foreground hover:text-foreground/80"
          >
-            <MessagesSquare className="h-6 w-6" />
+            <LiaDiscord className="h-7 w-7" />
          </Link>
        </div>
      </SheetContent>
--- a/apps/marketing/src/components/(marketing)/widget.tsx
+++ b/apps/marketing/src/components/(marketing)/widget.tsx
@ -391,6 +391,7 @@ export const Widget = ({ className, children, ...props }: WidgetProps) => {

          <SignaturePad
            className="aspect-video w-full rounded-md border"
+            defaultValue={signatureDataUrl || ''}
            onChange={setDraftSignatureDataUrl}
          />

--- a/apps/web/package.json
+++ b/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.8.0",
+    "react-icons": "^4.11.0",
    "react-rnd": "^10.4.1",
    "sharp": "0.32.5",
    "ts-pattern": "^5.0.5",
--- a/apps/web/src/app/(signing)/sign/[token]/complete/share-button.tsx
+++ b/apps/web/src/app/(signing)/sign/[token]/complete/share-button.tsx
@ -2,7 +2,8 @@

 import { HTMLAttributes, useState } from 'react';

-import { Copy, Share, Twitter } from 'lucide-react';
+import { Copy, Share } from 'lucide-react';
+import { FaXTwitter } from 'react-icons/fa6';

 import { useCopyShareLink } from '@documenso/lib/client-only/hooks/use-copy-share-link';
 import { generateTwitterIntent } from '@documenso/lib/universal/generate-twitter-intent';
@ -113,7 +114,7 @@ export const ShareButton = ({ token, documentId }: ShareButtonProps) => {
          </div>

          <Button variant="outline" className="mt-4" onClick={onTweetClick}>
-            <Twitter className="mr-2 h-4 w-4" />
+            <FaXTwitter className="mr-2 h-4 w-4" />
            Tweet
          </Button>

--- a/apps/web/src/components/(dashboard)/layout/profile-dropdown.tsx
+++ b/apps/web/src/components/(dashboard)/layout/profile-dropdown.tsx
@ -4,7 +4,6 @@ import Link from 'next/link';

 import {
  CreditCard,
-  Github,
  Key,
  LogOut,
  User as LucideUser,
@ -16,6 +15,7 @@ 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">
-            <Github className="mr-2 h-4 w-4" />
+            <LuGithub className="mr-2 h-4 w-4" />
            Star on Github
          </Link>
        </DropdownMenuItem>
--- a/apps/web/src/components/forms/password.tsx
+++ b/apps/web/src/components/forms/password.tsx
@ -20,6 +20,7 @@ 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),
  })
@ -40,6 +41,7 @@ export const PasswordForm = ({ className }: PasswordFormProps) => {

  const [showPassword, setShowPassword] = useState(false);
  const [showConfirmPassword, setShowConfirmPassword] = useState(false);
+  const [showCurrentPassword, setShowCurrentPassword] = useState(false);

  const {
    register,
@ -48,6 +50,7 @@ export const PasswordForm = ({ className }: PasswordFormProps) => {
    formState: { errors, isSubmitting },
  } = useForm<TPasswordFormSchema>({
    values: {
+      currentPassword: '',
      password: '',
      repeatedPassword: '',
    },
@ -56,9 +59,10 @@ export const PasswordForm = ({ className }: PasswordFormProps) => {

  const { mutateAsync: updatePassword } = trpc.profile.updatePassword.useMutation();

-  const onFormSubmit = async ({ password }: TPasswordFormSchema) => {
+  const onFormSubmit = async ({ currentPassword, password }: TPasswordFormSchema) => {
    try {
      await updatePassword({
+        currentPassword,
        password,
      });

@ -92,6 +96,39 @@ 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