diff --git a/README.md b/README.md
index 2553653..90cf55b 100644
--- a/README.md
+++ b/README.md
@@ -48,8 +48,8 @@ We believe in a transparent and fair world, so we open-source the app and
you get a trial version for your personal use, but if you find the app helpful,
please make a purchase.
-Purchase page: https://gum.co/plainmerge (Accept Debit/Credit cards and PayPal)
+Purchase page: https://gum.co/plainmerge (accept Debit/Credit cards and PayPal)
---
-© 2021 PlainLab
+© 2022 PlainLab
diff --git a/package.json b/package.json
index 03d7a7a..aa26e49 100644
--- a/package.json
+++ b/package.json
@@ -100,7 +100,7 @@
"email": "plain@manhtai.com",
"url": "https://plainlab.github.io"
},
- "license": "GPL-3.0-only",
+ "license": "AGPL-3.0-only",
"bugs": {
"url": "https://github.com/plainlab/plainmerge/issues"
},
diff --git a/src/components/merge/MailMerge.tsx b/src/components/merge/MailMerge.tsx
index 1072942..9a36930 100644
--- a/src/components/merge/MailMerge.tsx
+++ b/src/components/merge/MailMerge.tsx
@@ -124,7 +124,7 @@ const MailMerge = ({ configPath }: MailMergeProps) => {
}`}
>
- Merge to Files
+ Merge into Files
@@ -228,8 +228,8 @@ const MailMerge = ({ configPath }: MailMergeProps) => {
{!smtpValid && (
- Invalid SMTP configuration. Please configure and validate SMTP
- server first in the Settings menu.
+ Invalid SMTP configuration. Please configure and validate your
+ SMTP server in the Settings menu.
)}
diff --git a/src/components/merge/MergeList.tsx b/src/components/merge/MergeList.tsx
index 5b679bf..5fae4aa 100644
--- a/src/components/merge/MergeList.tsx
+++ b/src/components/merge/MergeList.tsx
@@ -56,7 +56,7 @@ const MergeList = () => {
handleRemove(state.pdfFile)}
+ onClick={() => handleRemove(state.configPath)}
className="w-3 h-3 text-gray-400 cursor-pointer hover:opacity-80"
/>
diff --git a/src/components/pdf/PdfEditor.tsx b/src/components/pdf/PdfEditor.tsx
index 8b950f0..599f35d 100644
--- a/src/components/pdf/PdfEditor.tsx
+++ b/src/components/pdf/PdfEditor.tsx
@@ -33,6 +33,7 @@ export interface CanvasObjects {
clientWidth: number;
}
export interface RenderPdfState {
+ configPath: string;
pdfFile: string;
excelFile: string;
combinePdf: boolean;
diff --git a/src/main.dev.ts b/src/main.dev.ts
index 4bcf2f9..f8dda7b 100644
--- a/src/main.dev.ts
+++ b/src/main.dev.ts
@@ -181,7 +181,9 @@ const saveConfig = async (params: RenderPdfState) => {
const loadConfig = async (fp: string) => {
const data = await readFile(fp, { encoding: 'utf8' });
- return JSON.parse(data);
+ const conf = JSON.parse(data);
+ conf.configPath = fp;
+ return conf;
};
const loadConfigs = async () => {
@@ -204,8 +206,8 @@ const loadConfigs = async () => {
return configList.filter((c: any) => c && c.pdfFile);
};
-const removeConfig = async (pdfFile: string) => {
- return promisify(fs.unlink)(getPathHash(pdfFile));
+const removeConfig = async (confPath: string) => {
+ return promisify(fs.unlink)(confPath);
};
const savePdf = async (params: RenderPdfState) => {
diff --git a/src/package.json b/src/package.json
index 6be3175..0f2b139 100644
--- a/src/package.json
+++ b/src/package.json
@@ -1,7 +1,7 @@
{
"name": "plainmerge",
"productName": "PlainMerge",
- "version": "0.2.0",
+ "version": "0.2.1",
"description": "Offline PDF mail merger",
"main": "./main.prod.js",
"author": {
@@ -13,7 +13,7 @@
"electron-rebuild": "node -r ../.erb/scripts/BabelRegister.js ../.erb/scripts/ElectronRebuild.js",
"postinstall": "yarn electron-rebuild"
},
- "license": "GPL-3.0-only",
+ "license": "AGPL-3.0-only",
"dependencies": {
"fabric": "^4.6.0"
},