Merge pull request #97 from AndresMorelos/1.21.1

1.21.1

Author: AndresMorelos

app/components/layout/AppUpdate.jsx

@@ -4,7 +4,7 @@ import { Circle } from 'rc-progress';
 import openDialog from '../../renderers/dialog';
 import i18n from '../../../i18n/i18n';
 import { Notify } from '../../../helpers/notify';
-const ipc = require('electron').ipcRenderer
+const ipc = require('electron').ipcRenderer;
 
 // Styled Components
 import styled, { keyframes } from 'styled-components';
@@ -54,10 +54,7 @@ class AppUpdate extends PureComponent {
           type: 'info',
           title: i18n.t('dialog:appUpdate:available:title'),
           message: i18n.t('dialog:appUpdate:available:message'),
-          buttons: [
-            i18n.t('common:yes'),
-            i18n.t('common:noThanks')
-          ],
+          buttons: [i18n.t('common:yes'), i18n.t('common:noThanks')],
         },
         'update-download-confirmed'
       );
@@ -73,11 +70,21 @@ class AppUpdate extends PureComponent {
     });
 
     ipc.on('update-error', (event, error) => {
-      openDialog({
-        type: 'warning',
-        title: i18n.t('dialog:appUpdate:error:title'),
-        message: error,
-      });
+      openDialog(
+        {
+          type: 'warning',
+          title: i18n.t('dialog:appUpdate:error:title'),
+          message: i18n.t('dialog:appUpdate:error:message'),
+          buttons: [
+            i18n.t('common:ok'),
+            {
+              message: i18n.t('dialog:appUpdate:error:OpenReleasePage'),
+              url: `https://github.com/AndresMorelos/Invoncify/releases`,
+            },
+          ],
+        },
+        'update-error-selection'
+      );
       this.hideIndicator();
     });
 
@@ -118,7 +125,7 @@ class AppUpdate extends PureComponent {
           message: i18n.t('dialog:appUpdate:downloaded:message'),
           buttons: [
             i18n.t('dialog:appUpdate:downloaded:quitNow'),
-            i18n.t('dialog:appUpdate:downloaded:later')
+            i18n.t('dialog:appUpdate:downloaded:later'),
           ],
         },
         'upgrade-confirmed'

app/reducers/ContactFormReducer.jsx

@@ -11,6 +11,7 @@ const initialState = {
   phone: '',
   _id: '',
   _rev: '',
+  address: '',
   created_at: new Date().getTime(),
 };
 
@@ -31,12 +32,14 @@ const ContactFormReducer = handleActions(
     },
 
     [ACTION_TYPES.CONTACT_FORM_CONTACT_UPDATE]: (state, action) => {
-      const { company, email, fullname, phone, _id, _rev } = action.payload;
+      const { company, email, fullname, phone, _id, _rev, address } =
+        action.payload;
       return Object.assign(state, {
         company,
         email,
         fullname,
         phone,
+        address,
         _id,
         _rev,
       });

i18n/en/dialog.json

@@ -9,7 +9,9 @@
       "message": "You're using the latest version of the app"
     },
     "error": {
-      "title": "An error has occurred"
+      "title": "An error has occurred",
+      "message": "There was an error updating the app. Please try again later or download it manually.",
+      "OpenReleasePage": "Open release page"
     },
     "downloaded": {
       "title": "Update downloaded",

main/export-data.js

@@ -14,13 +14,18 @@ ipcMain.on('export-data', (event, docToExport) => {
     `data-export-${moment().format('MM-DD-YYYY')}.invoncifyExport`
   );
 
-  fs.ensureDir(dirPath);
-  fs.writeFileSync(filePath, docToExport);
+  fs.ensureDir(dirPath)
+    .then(() => {
+      fs.writeFileSync(filePath, docToExport);
 
-  // Show notification
-  event.sender.send('file-exported', {
-    title: 'Data Exported',
-    body: 'Click to reveal file.',
-    location: filePath,
-  });
+      // Show notification
+      event.sender.send('file-exported', {
+        title: 'Data Exported',
+        body: 'Click to reveal file.',
+        location: filePath,
+      });
+    })
+    .catch((err) => {
+      console.log(err);
+    });
 });

modal/Dialog.jsx

@@ -1,12 +1,12 @@
 // Libs
 import React, { PureComponent } from 'react';
 import styled from 'styled-components';
+import './helpers/external_links';
 const appConfig = require('@electron/remote').require('electron-settings');
 const BrowserWindow = require('@electron/remote').BrowserWindow;
 const ipc = require('electron').ipcRenderer;
 const mainWindow = BrowserWindow.fromId(appConfig.getSync('mainWindowID'));
 
-
 const Wrapper = styled.div`
   display: flex;
   width: 100%;
@@ -26,11 +26,11 @@ const Type = styled.div`
   i {
     font-size: 42px;
   }
-  ${props =>
+  ${(props) =>
     props.type === 'warning' &&
     `
     i { color: #f0ad4e; }
-  `} ${props =>
+  `} ${(props) =>
     props.type === 'info' &&
     `
     i { color: #0275d8; }
@@ -53,11 +53,11 @@ const Title = styled.h4`
   text-transform: uppercase;
   font-weight: 600;
   letter-spacing: 0;
-  ${props =>
+  ${(props) =>
     props.type === 'warning' &&
     `
     color: #f0ad4e;
-  `} ${props =>
+  `} ${(props) =>
     props.type === 'info' &&
     `
     color: #0275d8;
@@ -83,11 +83,11 @@ const Actions = styled.div`
   flex-direction: row;
   border-top: 1px solid rgba(0, 0, 0, 0.1);
   padding: 5px 0;
-  ${props =>
+  ${(props) =>
     props.type === 'warning' &&
     `
     border-top: 4px solid #f0ad4e;
-  `} ${props =>
+  `} ${(props) =>
     props.type === 'info' &&
     `
     border-top: 4px solid #0275d8;
@@ -163,19 +163,35 @@ class Dialog extends PureComponent {
   }
 
   rendersButtons() {
-    const { buttons } = this.state
+    const { buttons } = this.state;
     if (!buttons) {
       return (
         <a href="#" onClick={this.handleClick}>
           Ok
         </a>
       );
     }
-    return buttons.map((button, index) => (
-      <a href="#" key={index} alt={index} onClick={this.handleClick}>
-        {button}
-      </a>
-    ));
+    return buttons.map((button, index) => {
+      if (typeof button === 'object' && button.url) {
+        return (
+          <a
+            href={button.url}
+            key={index}
+            alt={index}
+            onClick={this.handleClick}
+            className="js-external-link"
+          >
+            {button.message}
+          </a>
+        );
+      }
+
+      return (
+        <a href="#" key={index} alt={index} onClick={this.handleClick}>
+          {button}
+        </a>
+      );
+    });
   }
 
   render() {

modal/helpers/external_links.js

@@ -0,0 +1,25 @@
+import { shell } from '@electron/remote';
+
+const supportExternalLinks = (event) => {
+  let href;
+  let isExternal = false;
+
+  const checkDomElement = (element) => {
+    if (element.nodeName === 'A') {
+      href = element.getAttribute('href');
+    }
+    if (element.classList.contains('js-external-link')) {
+      isExternal = true;
+    }
+    if (href && isExternal) {
+      shell.openExternal(href);
+      event.preventDefault();
+    } else if (element.parentElement) {
+      checkDomElement(element.parentElement);
+    }
+  };
+
+  checkDomElement(event.target);
+};
+
+document.addEventListener('click', supportExternalLinks, false);

package.json

@@ -2,7 +2,7 @@
   "name": "invoncify",
   "homepage": "https://invoncify.andresmorelos.me",
   "productName": "Invoncify",
-  "version": "1.21.0",
+  "version": "1.21.1",
   "license": "GPL-3.0",
   "description": "Flexible invoicing desktop app with beautiful & customizable templates",
   "author": {