chore: reverted merge

This PR introduces new one-click deployment option Elestio

packages/lib/translations/de/common.po

@@ -140,6 +140,14 @@ msgstr "Genehmiger"
 msgid "Approving"
 msgstr "Genehmigung"
 
+#: packages/ui/primitives/signature-pad/signature-pad.tsx:271
+msgid "Black"
+msgstr ""
+
+#: packages/ui/primitives/signature-pad/signature-pad.tsx:298
+msgid "Blue"
+msgstr ""
+
 #: packages/ui/primitives/document-flow/field-item-advanced-settings.tsx:297
 #: packages/ui/primitives/document-flow/send-document-action-dialog.tsx:58
 msgid "Cancel"
@@ -179,7 +187,7 @@ msgstr "Checkbox-Werte"
 msgid "Clear filters"
 msgstr "Filter löschen"
 
-#: packages/ui/primitives/signature-pad/signature-pad.tsx:256
+#: packages/ui/primitives/signature-pad/signature-pad.tsx:321
 msgid "Clear Signature"
 msgstr "Unterschrift löschen"
 
@@ -312,6 +320,10 @@ msgstr "Globale Empfängerauthentifizierung"
 msgid "Go Back"
 msgstr "Zurück"
 
+#: packages/ui/primitives/signature-pad/signature-pad.tsx:307
+msgid "Green"
+msgstr ""
+
 #: packages/lib/constants/recipient-roles.ts:72
 msgid "I am a signer of this document"
 msgstr "Ich bin ein Unterzeichner dieses Dokuments"
@@ -477,6 +489,10 @@ msgstr "Erhält Kopie"
 msgid "Recipient action authentication"
 msgstr "Empfängeraktion Authentifizierung"
 
+#: packages/ui/primitives/signature-pad/signature-pad.tsx:289
+msgid "Red"
+msgstr ""
+
 #: packages/ui/primitives/document-flow/add-settings.tsx:298
 #: packages/ui/primitives/template-flow/add-template-settings.tsx:332
 msgid "Redirect URL"
@@ -733,6 +749,10 @@ msgstr "Viewer"
 msgid "Viewing"
 msgstr "Viewing"
 
+#: packages/ui/primitives/signature-pad/signature-pad.tsx:280
+msgid "White"
+msgstr ""
+
 #: packages/ui/primitives/document-flow/send-document-action-dialog.tsx:44
 msgid "You are about to send this document to the recipients. Are you sure you want to continue?"
 msgstr "Sie sind dabei, dieses Dokument an die Empfänger zu senden. Sind Sie sicher, dass Sie fortfahren möchten?"

packages/lib/translations/de/web.po

@@ -633,6 +633,14 @@ msgstr ""
 msgid "Billing"
 msgstr ""
 
+#: apps/web/src/app/(signing)/sign/[token]/form.tsx:207
+#~ msgid "Black"
+#~ msgstr ""
+
+#: apps/web/src/app/(signing)/sign/[token]/form.tsx:223
+#~ msgid "Blue"
+#~ msgstr ""
+
 #: apps/web/src/app/(dashboard)/settings/security/activity/user-security-activity-data-table.tsx:101
 msgid "Browser"
 msgstr ""
@@ -1604,6 +1612,10 @@ msgstr ""
 msgid "Go to your <0>public profile settings</0> to add documents."
 msgstr ""
 
+#: apps/web/src/app/(signing)/sign/[token]/form.tsx:231
+#~ msgid "Green"
+#~ msgstr ""
+
 #: apps/web/src/app/(dashboard)/settings/profile/page.tsx:29
 msgid "Here you can edit your personal details."
 msgstr ""
@@ -2412,6 +2424,10 @@ msgstr ""
 msgid "Recovery codes"
 msgstr ""
 
+#: apps/web/src/app/(signing)/sign/[token]/form.tsx:215
+#~ msgid "Red"
+#~ msgstr ""
+
 #: apps/web/src/app/(signing)/sign/[token]/complete/claim-account.tsx:78
 #: apps/web/src/components/forms/signup.tsx:93
 #: apps/web/src/components/forms/v2/signup.tsx:127

packages/lib/translations/en/common.po

@@ -135,6 +135,14 @@ msgstr "Approver"
 msgid "Approving"
 msgstr "Approving"
 
+#: packages/ui/primitives/signature-pad/signature-pad.tsx:271
+msgid "Black"
+msgstr "Black"
+
+#: packages/ui/primitives/signature-pad/signature-pad.tsx:298
+msgid "Blue"
+msgstr "Blue"
+
 #: packages/ui/primitives/document-flow/field-item-advanced-settings.tsx:297
 #: packages/ui/primitives/document-flow/send-document-action-dialog.tsx:58
 msgid "Cancel"
@@ -174,7 +182,7 @@ msgstr "Checkbox values"
 msgid "Clear filters"
 msgstr "Clear filters"
 
-#: packages/ui/primitives/signature-pad/signature-pad.tsx:256
+#: packages/ui/primitives/signature-pad/signature-pad.tsx:321
 msgid "Clear Signature"
 msgstr "Clear Signature"
 
@@ -307,6 +315,10 @@ msgstr "Global recipient action authentication"
 msgid "Go Back"
 msgstr "Go Back"
 
+#: packages/ui/primitives/signature-pad/signature-pad.tsx:307
+msgid "Green"
+msgstr "Green"
+
 #: packages/lib/constants/recipient-roles.ts:72
 msgid "I am a signer of this document"
 msgstr "I am a signer of this document"
@@ -472,6 +484,10 @@ msgstr "Receives copy"
 msgid "Recipient action authentication"
 msgstr "Recipient action authentication"
 
+#: packages/ui/primitives/signature-pad/signature-pad.tsx:289
+msgid "Red"
+msgstr "Red"
+
 #: packages/ui/primitives/document-flow/add-settings.tsx:298
 #: packages/ui/primitives/template-flow/add-template-settings.tsx:332
 msgid "Redirect URL"
@@ -728,6 +744,10 @@ msgstr "Viewer"
 msgid "Viewing"
 msgstr "Viewing"
 
+#: packages/ui/primitives/signature-pad/signature-pad.tsx:280
+msgid "White"
+msgstr "White"
+
 #: packages/ui/primitives/document-flow/send-document-action-dialog.tsx:44
 msgid "You are about to send this document to the recipients. Are you sure you want to continue?"
 msgstr "You are about to send this document to the recipients. Are you sure you want to continue?"

packages/lib/translations/en/web.po

@@ -628,6 +628,14 @@ msgstr "Basic details"
 msgid "Billing"
 msgstr "Billing"
 
+#: apps/web/src/app/(signing)/sign/[token]/form.tsx:207
+#~ msgid "Black"
+#~ msgstr "Black"
+
+#: apps/web/src/app/(signing)/sign/[token]/form.tsx:223
+#~ msgid "Blue"
+#~ msgstr "Blue"
+
 #: apps/web/src/app/(dashboard)/settings/security/activity/user-security-activity-data-table.tsx:101
 msgid "Browser"
 msgstr "Browser"
@@ -1599,6 +1607,10 @@ msgstr "Go to owner"
 msgid "Go to your <0>public profile settings</0> to add documents."
 msgstr "Go to your <0>public profile settings</0> to add documents."
 
+#: apps/web/src/app/(signing)/sign/[token]/form.tsx:231
+#~ msgid "Green"
+#~ msgstr "Green"
+
 #: apps/web/src/app/(dashboard)/settings/profile/page.tsx:29
 msgid "Here you can edit your personal details."
 msgstr "Here you can edit your personal details."
@@ -2407,6 +2419,10 @@ msgstr "Recovery code copied"
 msgid "Recovery codes"
 msgstr "Recovery codes"
 
+#: apps/web/src/app/(signing)/sign/[token]/form.tsx:215
+#~ msgid "Red"
+#~ msgstr "Red"
+
 #: apps/web/src/app/(signing)/sign/[token]/complete/claim-account.tsx:78
 #: apps/web/src/components/forms/signup.tsx:93
 #: apps/web/src/components/forms/v2/signup.tsx:127

packages/ui/primitives/signature-pad/signature-pad.tsx

@@ -9,6 +9,13 @@ import type { StrokeOptions } from 'perfect-freehand';
 import { getStroke } from 'perfect-freehand';
 
 import { unsafe_useEffectOnce } from '@documenso/lib/client-only/hooks/use-effect-once';
+import {
+  Select,
+  SelectContent,
+  SelectItem,
+  SelectTrigger,
+  SelectValue,
+} from '@documenso/ui/primitives/select';
 
 import { cn } from '../../lib/utils';
 import { getSvgPathFromStroke } from './helper';
@@ -36,6 +43,7 @@ export const SignaturePad = ({
   const [isPressed, setIsPressed] = useState(false);
   const [lines, setLines] = useState<Point[][]>([]);
   const [currentLine, setCurrentLine] = useState<Point[]>([]);
+  const [selectedColor, setSelectedColor] = useState('black');
 
   const perfectFreehandOptions = useMemo(() => {
     const size = $el.current ? Math.min($el.current.height, $el.current.width) * 0.03 : 10;
@@ -85,6 +93,7 @@ export const SignaturePad = ({
           ctx.restore();
           ctx.imageSmoothingEnabled = true;
           ctx.imageSmoothingQuality = 'high';
+          ctx.fillStyle = selectedColor;
 
           lines.forEach((line) => {
             const pathData = new Path2D(
@@ -129,6 +138,7 @@ export const SignaturePad = ({
 
         ctx.imageSmoothingEnabled = true;
         ctx.imageSmoothingQuality = 'high';
+        ctx.fillStyle = selectedColor;
 
         newLines.forEach((line) => {
           const pathData = new Path2D(
@@ -237,7 +247,7 @@ export const SignaturePad = ({
     >
       <canvas
         ref={$el}
-        className={cn('relative block dark:invert', className)}
+        className={cn('relative block', className)}
         style={{ touchAction: 'none' }}
         onPointerMove={(event) => onMouseMove(event)}
         onPointerDown={(event) => onMouseDown(event)}
@@ -247,6 +257,61 @@ export const SignaturePad = ({
         {...props}
       />
 
+      <div className="absolute right-2 top-2">
+        <Select onValueChange={(value) => setSelectedColor(value)}>
+          <SelectTrigger className="bg-background w-[90px]">
+            <SelectValue placeholder="Color" />
+          </SelectTrigger>
+
+          <SelectContent align="end">
+            <SelectItem value="black">
+              <div className="flex items-center">
+                <div className="flex w-[150px] items-center">
+                  <div className="mr-2 h-5 w-5 rounded-full border-2 bg-black shadow-sm"></div>
+                  <Trans>Black</Trans>
+                </div>
+              </div>
+            </SelectItem>
+
+            <SelectItem value="white">
+              <div className="flex items-center">
+                <div className="flex w-[150px] items-center">
+                  <div className="mr-2 h-5 w-5 rounded-full border-2 shadow-sm"></div>
+                  <Trans>White</Trans>
+                </div>
+              </div>
+            </SelectItem>
+
+            <SelectItem value="red">
+              <div className="flex items-center">
+                <div className="flex w-[150px] items-center">
+                  <div className="mr-2 h-5 w-5 rounded-full border-2 bg-red-500 shadow-sm"></div>
+                  <Trans>Red</Trans>
+                </div>
+              </div>
+            </SelectItem>
+
+            <SelectItem value="blue">
+              <div className="flex items-center">
+                <div className="flex w-[150px] items-center">
+                  <div className="mr-2 h-5 w-5 rounded-full border-2 bg-blue-500 shadow-sm"></div>
+                  <Trans>Blue</Trans>
+                </div>
+              </div>
+            </SelectItem>
+
+            <SelectItem value="green">
+              <div className="flex items-center">
+                <div className="flex w-[150px] items-center">
+                  <div className="mr-2 h-5 w-5 rounded-full border-2 bg-green-500 shadow-sm"></div>
+                  <Trans>Green</Trans>
+                </div>
+              </div>
+            </SelectItem>
+          </SelectContent>
+        </Select>
+      </div>
+
       <div className="absolute bottom-4 right-4 flex gap-2">
         <button
           type="button"