Remove legacy config files

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

package.json

@@ -100,7 +100,7 @@
     "email": "[email protected]",
     "url": "https://plainlab.github.io"
   },
-  "license": "GPL-3.0-only",
+  "license": "AGPL-3.0-only",
   "bugs": {
     "url": "https://github.com/plainlab/plainmerge/issues"
   },

src/components/merge/MailMerge.tsx

@@ -124,7 +124,7 @@ const MailMerge = ({ configPath }: MailMergeProps) => {
               }`}
             >
               <FontAwesomeIcon icon="folder" className="mr-2" />
-              Merge to Files
+              Merge into Files
             </button>
           </li>
           <li className="mr-2">
@@ -228,8 +228,8 @@ const MailMerge = ({ configPath }: MailMergeProps) => {
         {!smtpValid && (
           <section className="w-full space-y-2">
             <p className="text-red-500">
-              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.
             </p>
           </section>
         )}

src/components/merge/MergeList.tsx

@@ -56,7 +56,7 @@ const MergeList = () => {
           <section className="flex items-center justify-center">
             <FontAwesomeIcon
               icon={['far', 'trash-alt']}
-              onClick={() => handleRemove(state.pdfFile)}
+              onClick={() => handleRemove(state.configPath)}
               className="w-3 h-3 text-gray-400 cursor-pointer hover:opacity-80"
             />
           </section>

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;

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) => {

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"
   },