From 7d181f334cd2499e66ef2b43b366cc6448fb2806 Mon Sep 17 00:00:00 2001 From: Kunal Singh Date: Thu, 2 Feb 2023 18:49:58 +0530 Subject: [PATCH 1/3] fix site url on pdf to be .env/SITE_URL --- frontend/src/components/utilities/config/index.ts | 5 +++-- frontend/src/components/utilities/generateBackupPDF.ts | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/frontend/src/components/utilities/config/index.ts b/frontend/src/components/utilities/config/index.ts index 7570785ba..7ecfb9d4d 100644 --- a/frontend/src/components/utilities/config/index.ts +++ b/frontend/src/components/utilities/config/index.ts @@ -4,11 +4,12 @@ const POSTHOG_HOST = process.env.NEXT_PUBLIC_POSTHOG_HOST! || "https://app.posthog.com"; const STRIPE_PRODUCT_PRO = process.env.NEXT_PUBLIC_STRIPE_PRODUCT_PRO!; const STRIPE_PRODUCT_STARTER = process.env.NEXT_PUBLIC_STRIPE_PRODUCT_STARTER!; +const {SITE_URL} = process.env export { ENV, POSTHOG_API_KEY, POSTHOG_HOST, + SITE_URL, STRIPE_PRODUCT_PRO, - STRIPE_PRODUCT_STARTER -}; \ No newline at end of file + STRIPE_PRODUCT_STARTER}; \ No newline at end of file diff --git a/frontend/src/components/utilities/generateBackupPDF.ts b/frontend/src/components/utilities/generateBackupPDF.ts index a4ee0035e..e51dfaa0a 100644 --- a/frontend/src/components/utilities/generateBackupPDF.ts +++ b/frontend/src/components/utilities/generateBackupPDF.ts @@ -1,5 +1,7 @@ import { jsPDF } from 'jspdf'; +import { SITE_URL } from './config'; + interface PDFProps { personalName: string; personalEmail: string; @@ -73,7 +75,7 @@ function generateBackupPDF({ personalName, personalEmail, generatedKey }: PDFPro doc.roundedRect(170, 488, 375, 35, 5, 5, 'F'); doc.setTextColor(23, 23, 23); doc.setFontSize(14); - doc.text('https://app.infisical.com/login', 180, 420); + doc.text(`${SITE_URL}/login`, 180, 420); doc.text(personalEmail, 180, 465); doc.text(generatedKey, 180, 510); doc.text('Need help? Contact us at support@infisical.com', 32, 575); From a660261678df4731357542ff5c9fad708dcf7430 Mon Sep 17 00:00:00 2001 From: Kunal Singh Date: Thu, 2 Feb 2023 19:25:36 +0530 Subject: [PATCH 2/3] fix type in Title -> --- frontend/public/locales/en/common.json | 8 ++++---- frontend/public/locales/fr/common.json | 8 ++++---- frontend/public/locales/ko/common.json | 4 ++-- frontend/public/locales/pt-BR/common.json | 2 +- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/frontend/public/locales/en/common.json b/frontend/public/locales/en/common.json index 34cdcaea8..e02c4f474 100644 --- a/frontend/public/locales/en/common.json +++ b/frontend/public/locales/en/common.json @@ -1,5 +1,5 @@ { - "head-title": "{{title}} | Infiscal", + "head-title": "{{title}} | Infisical", "error_project-already-exists": "A project with this name already exists.", "no-mobile": " To use Infisical, please log in through a device with larger dimensions. ", "email": "Email", @@ -28,7 +28,7 @@ "select-event": "Select an event", "event": "Event", "user": "User", - "source": "Source", - "time": "Time", + "source": "Source", + "time": "Time", "timestamp": "Timestamp" -} +} \ No newline at end of file diff --git a/frontend/public/locales/fr/common.json b/frontend/public/locales/fr/common.json index 8552668aa..1f6a52447 100644 --- a/frontend/public/locales/fr/common.json +++ b/frontend/public/locales/fr/common.json @@ -1,5 +1,5 @@ { - "head-title": "{{title}} | Infiscal", + "head-title": "{{title}} | Infisical", "error_project-already-exists": "Un projet avec ce nom existe déjà.", "no-mobile": " Pour utiliser Infisical, veuillez vous connecter avec un appareil avec des dimensions plus grandes. ", "email": "Email", @@ -28,7 +28,7 @@ "select-event": "Sélectionnez un événement", "event": "Événement", "user": "Utilisateur", - "source": "Source", - "time": "Heure", + "source": "Source", + "time": "Heure", "timestamp": "Horodatage" -} +} \ No newline at end of file diff --git a/frontend/public/locales/ko/common.json b/frontend/public/locales/ko/common.json index 8274dd060..f0692ebf7 100644 --- a/frontend/public/locales/ko/common.json +++ b/frontend/public/locales/ko/common.json @@ -1,5 +1,5 @@ { - "head-title": "{{title}} | Infiscal", + "head-title": "{{title}} | Infisical", "error_project-already-exists": "동일한 이름을 가진 프로젝트가 이미 존재해요.", "no-mobile": " Infisical을 사용하려면, 큰 화면을 가진 디바이스로 로그인하여 주세요.", "email": "메일", @@ -23,4 +23,4 @@ "language": "언어", "search": "검색하기...", "note": "Note" -} +} \ No newline at end of file diff --git a/frontend/public/locales/pt-BR/common.json b/frontend/public/locales/pt-BR/common.json index 12e657d7c..207f0db29 100644 --- a/frontend/public/locales/pt-BR/common.json +++ b/frontend/public/locales/pt-BR/common.json @@ -1,5 +1,5 @@ { - "head-title": "{{title}} | Infiscal", + "head-title": "{{title}} | Infisical", "error_project-already-exists": "Já exite um projeto com este nome.", "no-mobile": "Para usar o Infisical, faça o login através de um dispositivo com dimensões maiores.", "email": "Email", From a013768313df844be3546108cfdae8c0e36d82b8 Mon Sep 17 00:00:00 2001 From: Kunal Singh Date: Thu, 2 Feb 2023 19:45:24 +0530 Subject: [PATCH 3/3] fix copyright label in go source --- cli/main.go | 2 +- cli/packages/cmd/export.go | 2 +- cli/packages/cmd/init.go | 2 +- cli/packages/cmd/login.go | 2 +- cli/packages/cmd/man.go | 2 +- cli/packages/cmd/root.go | 2 +- cli/packages/cmd/run.go | 2 +- cli/packages/cmd/secrets.go | 2 +- cli/packages/cmd/vault.go | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cli/main.go b/cli/main.go index 9b1e420fa..a51661ff6 100644 --- a/cli/main.go +++ b/cli/main.go @@ -1,5 +1,5 @@ /* -Copyright © 2022 NAME HERE +Copyright (c) 2023 Infisical Inc. */ package main diff --git a/cli/packages/cmd/export.go b/cli/packages/cmd/export.go index 2a6fa0dbd..41e170f70 100644 --- a/cli/packages/cmd/export.go +++ b/cli/packages/cmd/export.go @@ -1,5 +1,5 @@ /* -Copyright © 2022 NAME HERE +Copyright (c) 2023 Infisical Inc. */ package cmd diff --git a/cli/packages/cmd/init.go b/cli/packages/cmd/init.go index a9a2d943d..413f61440 100644 --- a/cli/packages/cmd/init.go +++ b/cli/packages/cmd/init.go @@ -1,5 +1,5 @@ /* -Copyright © 2022 NAME HERE +Copyright (c) 2023 Infisical Inc. */ package cmd diff --git a/cli/packages/cmd/login.go b/cli/packages/cmd/login.go index 74573c226..6a1dc2313 100644 --- a/cli/packages/cmd/login.go +++ b/cli/packages/cmd/login.go @@ -1,5 +1,5 @@ /* -Copyright © 2022 NAME HERE +Copyright (c) 2023 Infisical Inc. */ package cmd diff --git a/cli/packages/cmd/man.go b/cli/packages/cmd/man.go index efe8686b3..86d68c8e7 100644 --- a/cli/packages/cmd/man.go +++ b/cli/packages/cmd/man.go @@ -1,5 +1,5 @@ /* -Copyright © 2022 NAME HERE +Copyright (c) 2023 Infisical Inc. */ package cmd diff --git a/cli/packages/cmd/root.go b/cli/packages/cmd/root.go index 93a498860..ac827feb3 100644 --- a/cli/packages/cmd/root.go +++ b/cli/packages/cmd/root.go @@ -1,5 +1,5 @@ /* -Copyright © 2022 NAME HERE +Copyright (c) 2023 Infisical Inc. */ package cmd diff --git a/cli/packages/cmd/run.go b/cli/packages/cmd/run.go index c95a83bc4..d31981b02 100644 --- a/cli/packages/cmd/run.go +++ b/cli/packages/cmd/run.go @@ -1,5 +1,5 @@ /* -Copyright © 2022 NAME HERE +Copyright (c) 2023 Infisical Inc. */ package cmd diff --git a/cli/packages/cmd/secrets.go b/cli/packages/cmd/secrets.go index 912801f5d..060a69a45 100644 --- a/cli/packages/cmd/secrets.go +++ b/cli/packages/cmd/secrets.go @@ -1,5 +1,5 @@ /* -Copyright © 2022 NAME HERE +Copyright (c) 2023 Infisical Inc. */ package cmd diff --git a/cli/packages/cmd/vault.go b/cli/packages/cmd/vault.go index a2b03dbec..d9e32769e 100644 --- a/cli/packages/cmd/vault.go +++ b/cli/packages/cmd/vault.go @@ -1,5 +1,5 @@ /* -Copyright © 2022 NAME HERE +Copyright (c) 2023 Infisical Inc. */ package cmd