diff --git a/LICENSE b/LICENSE index 53d1f3d..0ad25db 100644 --- a/LICENSE +++ b/LICENSE @@ -1,5 +1,5 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 Copyright (C) 2007 Free Software Foundation, Inc. Everyone is permitted to copy and distribute verbatim copies @@ -7,17 +7,15 @@ Preamble - The GNU General Public License is a free, copyleft license for -software and other kinds of works. + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to +our General Public Licenses are intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. +software for all its users. When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you @@ -26,44 +24,34 @@ them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things. - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. The precise terms and conditions for copying, distribution and modification follow. @@ -72,7 +60,7 @@ modification follow. 0. Definitions. - "This License" refers to version 3 of the GNU General Public License. + "This License" refers to version 3 of the GNU Affero General Public License. "Copyright" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. @@ -549,35 +537,45 @@ to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program. - 13. Use with the GNU Affero General Public License. + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single +under version 3 of the GNU General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. 14. Revised Versions of this License. The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to +the GNU Affero General Public License from time to time. Such new versions +will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General +Program specifies that a certain numbered version of the GNU Affero General Public License "or any later version" applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published +GNU Affero General Public License, you may choose any version ever published by the Free Software Foundation. If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's +versions of the GNU Affero General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program. @@ -635,41 +633,29 @@ the "copyright" line and a pointer to where the full notice is found. Copyright (C) This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or + it under the terms of the GNU Affero General Public License as published + by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + GNU Affero General Public License for more details. - You should have received a copy of the GNU General Public License + You should have received a copy of the GNU Affero General Public License along with this program. If not, see . Also add information on how to contact you by electronic and paper mail. - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see +For more information on this, and how to apply and follow the GNU AGPL, see . - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. - diff --git a/README.md b/README.md index 60dd809..2553653 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ ## What is this? -Imagine you want to fill a PDF form for 100 employees with a specific name and address +Imagine you want to fill out a PDF form for 100 employees with a specific name and address for each of them. You got the PDF form and all your staff information in an Excel file. That's when PlainMerge helps. @@ -37,7 +37,8 @@ You got 100 different PDFs for each employee now. Download page: https://github.com/plainlab/plainmerge/releases -- macOS: Get `.dmg` file, open it and drag the app into Applications folder, for M1 mac: get `arm64.dmg` file instead. +- macOS: Get `.dmg` file, open it and drag the app into Applications folder, for Apple + Silicon mac: get `arm64.dmg` file instead. - Windows: Get `.exe` file and open it to install. - Linux: Get `.AppImage` file to install, for ARM laptop: get `arm64.AppImage` file instead. diff --git a/src/components/email/Config.tsx b/src/components/email/Config.tsx index 8788aad..d3942bd 100644 --- a/src/components/email/Config.tsx +++ b/src/components/email/Config.tsx @@ -115,11 +115,14 @@ const Config = () => { return (
-

SMTP configuration

+

+ SMTP configuration + (For sending out emails) +

-

Host:

+

Host:

{ />
-

Port:

+

Port:

{ />
-

Secure:

+

Secure:

{ />
-

User:

+

User:

{ />
-

Password:

+

Password:

{
-

+

Gmail SMTP example:{' '} (Some limitations may apply)

@@ -216,7 +219,7 @@ const Config = () => {

Password:

-

email-pass-or-2fa-pass

+

email-password-or-2fa-passcode

diff --git a/src/components/merge/MailMerge.tsx b/src/components/merge/MailMerge.tsx index 9300769..1072942 100644 --- a/src/components/merge/MailMerge.tsx +++ b/src/components/merge/MailMerge.tsx @@ -4,6 +4,7 @@ import React, { useEffect, useState } from 'react'; import { Helmet } from 'react-helmet'; import Tags from '@yaireo/tagify/dist/react.tagify'; +import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'; import { DataHeader, RenderPdfState } from '../pdf/PdfEditor'; import { readExcelMeta } from '../utils/excel'; import { SmtpConfigKey, SmtpConfigType } from '../email/Config'; @@ -28,6 +29,7 @@ const MailMerge = ({ configPath }: MailMergeProps) => { const [combinePdf, setCombinePdf] = useState(true); const [outputPdf, setOutputPdf] = useState(''); const [smtpValid, setSmtpValid] = useState(false); + const [tab, setTab] = useState('local'); const tagSettings = { pattern: /@/, @@ -108,15 +110,48 @@ const MailMerge = ({ configPath }: MailMergeProps) => { }, []); return ( -
-
-

- Save to files -

+
+
+
    +
  • + +
    • +
  • + +
    • +
+
+
-

Save to:

+

Location:

-
+
{saving ? (

@@ -180,29 +215,29 @@ const MailMerge = ({ configPath }: MailMergeProps) => { onClick={handleSavePdf} disabled={!outputPdf || saving} > - Save + Merge

-
-
-

- Send as email attachments -

- - {!smtpValid ? ( +
+ {!smtpValid && ( +

Invalid SMTP configuration. Please configure and validate SMTP - server first. + server first in the Settings menu.

- ) : null} -
+
+ )}
-

From:

+

From:

{
-

To:

+

To:

Choose a column that contains email address for sending @@ -235,9 +270,9 @@ const MailMerge = ({ configPath }: MailMergeProps) => {
-

Subject:

+

Subject:

- Type @ to insert column value into subject + Type @ to insert column values into the subject
{
-

Body:

+

Body:

- Type @ to insert column value into body + Type @ to insert column values into the body
{
-
+
{sending ? (

diff --git a/src/components/merge/MergeList.tsx b/src/components/merge/MergeList.tsx index fea9c51..5b679bf 100644 --- a/src/components/merge/MergeList.tsx +++ b/src/components/merge/MergeList.tsx @@ -30,7 +30,7 @@ const MergeList = () => {

    {merges.map((state) => (
  • diff --git a/src/components/pdf/PdfEditor.tsx b/src/components/pdf/PdfEditor.tsx index 1d8b758..8b950f0 100644 --- a/src/components/pdf/PdfEditor.tsx +++ b/src/components/pdf/PdfEditor.tsx @@ -425,7 +425,7 @@ const PdfEditor = () => { id="toggle" checked={formLayout} onChange={() => setFormLayout(!formLayout)} - className="absolute block w-5 h-5 bg-white border-2 rounded-full appearance-none cursor-pointer checked:right-0" + className="absolute block w-5 h-5 bg-white border-2 rounded-full outline-none appearance-none cursor-pointer checked:right-0" />
diff --git a/src/helpers/fontAwesome.ts b/src/helpers/fontAwesome.ts index 28d1e78..6619cb8 100644 --- a/src/helpers/fontAwesome.ts +++ b/src/helpers/fontAwesome.ts @@ -3,6 +3,8 @@ import { fab } from '@fortawesome/free-brands-svg-icons'; import { faFilePdf, faTrashAlt } from '@fortawesome/free-regular-svg-icons'; import { faAlignCenter, + faEnvelope, + faFolder, faAlignLeft, faAlignRight, faCog, @@ -19,6 +21,8 @@ library.add( faFilePdf, faHistory, faPlus, + faFolder, + faEnvelope, faEllipsisV, faTrashAlt, faAlignRight, diff --git a/src/package.json b/src/package.json index e6c22fc..6be3175 100644 --- a/src/package.json +++ b/src/package.json @@ -1,7 +1,7 @@ { "name": "plainmerge", "productName": "PlainMerge", - "version": "0.1.0", + "version": "0.2.0", "description": "Offline PDF mail merger", "main": "./main.prod.js", "author": {