From c71a89d1b7f79f8405bb228007ec1a6f809c2691 Mon Sep 17 00:00:00 2001 From: Anik Dhabal Babu Date: Thu, 5 Oct 2023 12:21:34 +0000 Subject: [PATCH 1/5] fix: Add gitpod configuration --- .gitpod.yml | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 .gitpod.yml diff --git a/.gitpod.yml b/.gitpod.yml new file mode 100644 index 000000000..b5ab15cb7 --- /dev/null +++ b/.gitpod.yml @@ -0,0 +1,40 @@ +tasks: + - init: | + cp .env.example .env && + set -a; source .env && + npm run dx && + sed -i -e "s|http://localhost:3000|$(gp url 3000)|" .env \ + -e "s|http://localhost:3001|$(gp url 3001)|" .env \ + -e "s|http://localhost:9000|$(gp url 9000)|" .env + command: npm run dev + +ports: + - port: 3000 + visibility: public + onOpen: open-preview + - port: 3001 + visibility: public + onOpen: open-preview + - port: 9000 + visibility: public + onOpen: ignore + - port: 1100 + visibility: private + onOpen: ignore + - port: 2500 + visibility: private + onOpen: ignore + + +github: + prebuilds: + master: true + pullRequests: true + pullRequestsFromForks: true + addCheck: true + addComment: true + addBadge: true + +vscode: + extensions: + - bradlc.vscode-tailwindcss From 04a80b7c037c1e45c9a877f973ad7878d1461896 Mon Sep 17 00:00:00 2001 From: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com> Date: Fri, 6 Oct 2023 11:06:34 +0530 Subject: [PATCH 2/5] fix: add gitpod configuration --- .gitpod.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitpod.yml b/.gitpod.yml index b5ab15cb7..9bfc333db 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -1,12 +1,13 @@ tasks: - init: | + npm i && + npm run dx:up && cp .env.example .env && set -a; source .env && - npm run dx && sed -i -e "s|http://localhost:3000|$(gp url 3000)|" .env \ -e "s|http://localhost:3001|$(gp url 3001)|" .env \ -e "s|http://localhost:9000|$(gp url 9000)|" .env - command: npm run dev + command: npm run d ports: - port: 3000 @@ -38,3 +39,6 @@ github: vscode: extensions: - bradlc.vscode-tailwindcss + - esbenp.prettier-vscode + - Prisma.prisma + From cc65537ea38e91119715c234a4cedef91cd134fc Mon Sep 17 00:00:00 2001 From: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com> Date: Fri, 6 Oct 2023 23:03:13 +0530 Subject: [PATCH 3/5] fix: Add gitpod configuration --- .gitpod.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitpod.yml b/.gitpod.yml index 9bfc333db..0ad9299b2 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -25,6 +25,9 @@ ports: - port: 2500 visibility: private onOpen: ignore + - port: 54320 + visibility: private + onOpen: ignore github: From 4e010c562478c824b4401547d36215ffe1a22aaa Mon Sep 17 00:00:00 2001 From: Anik Dhabal Babu <81948346+anikdhabal@users.noreply.github.com> Date: Mon, 9 Oct 2023 09:58:12 +0530 Subject: [PATCH 4/5] fix : add gittpod configuration --- .gitpod.yml | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/.gitpod.yml b/.gitpod.yml index 0ad9299b2..b03003160 100644 --- a/.gitpod.yml +++ b/.gitpod.yml @@ -4,9 +4,9 @@ tasks: npm run dx:up && cp .env.example .env && set -a; source .env && - sed -i -e "s|http://localhost:3000|$(gp url 3000)|" .env \ - -e "s|http://localhost:3001|$(gp url 3001)|" .env \ - -e "s|http://localhost:9000|$(gp url 9000)|" .env + export NEXTAUTH_URL="$(gp url 3000)" && + export NEXT_PUBLIC_WEBAPP_URL="$(gp url 3000)" && + export NEXT_PUBLIC_MARKETING_URL="$(gp url 3001)" command: npm run d ports: @@ -25,8 +25,8 @@ ports: - port: 2500 visibility: private onOpen: ignore - - port: 54320 - visibility: private + - port: 54320 + visibility: private onOpen: ignore @@ -41,7 +41,15 @@ github: vscode: extensions: + - aaron-bond.better-comments - bradlc.vscode-tailwindcss + - dbaeumer.vscode-eslint - esbenp.prettier-vscode + - mikestead.dotenv + - unifiedjs.vscode-mdx + - GitHub.copilot-chat + - GitHub.copilot-labs + - GitHub.copilot + - GitHub.vscode-pull-request-github - Prisma.prisma - + - VisualStudioExptTeam.vscodeintellicode From 2ea5ff2c94569601f28830145158f2f278b62d68 Mon Sep 17 00:00:00 2001 From: Abhinav-Developer-23 <145282438+Abhinav-Developer-23@users.noreply.github.com> Date: Thu, 12 Oct 2023 06:03:01 +0530 Subject: [PATCH 5/5] fix: bypass signature fix (#536) (#547) --- .../app/(signing)/sign/[token]/signature-field.tsx | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/apps/web/src/app/(signing)/sign/[token]/signature-field.tsx b/apps/web/src/app/(signing)/sign/[token]/signature-field.tsx index 020af41c2..01923bd6c 100644 --- a/apps/web/src/app/(signing)/sign/[token]/signature-field.tsx +++ b/apps/web/src/app/(signing)/sign/[token]/signature-field.tsx @@ -1,6 +1,6 @@ 'use client'; -import { useMemo, useState, useTransition } from 'react'; +import { useEffect, useMemo, useState, useTransition } from 'react'; import { useRouter } from 'next/navigation'; @@ -48,6 +48,7 @@ export const SignatureField = ({ field, recipient }: SignatureFieldProps) => { const [showSignatureModal, setShowSignatureModal] = useState(false); const [localSignature, setLocalSignature] = useState(null); + const [isLocalSignatureSet, setIsLocalSignatureSet] = useState(false); const state = useMemo(() => { if (!field.inserted) { @@ -61,9 +62,16 @@ export const SignatureField = ({ field, recipient }: SignatureFieldProps) => { return 'signed-text'; }, [field.inserted, signature?.signatureImageAsBase64]); + useEffect(() => { + if (!showSignatureModal && !isLocalSignatureSet) { + setLocalSignature(null); + } + }, [showSignatureModal, isLocalSignatureSet]); + const onSign = async (source: 'local' | 'provider' = 'provider') => { try { if (!providedSignature && !localSignature) { + setIsLocalSignatureSet(false); setShowSignatureModal(true); return; } @@ -178,6 +186,7 @@ export const SignatureField = ({ field, recipient }: SignatureFieldProps) => { disabled={!localSignature} onClick={() => { setShowSignatureModal(false); + setIsLocalSignatureSet(true); void onSign('local'); }} >