Merge pull request #307 from erikaperugachi/unsend

Unsend

Author: Erika Perugachi

electron_app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "criptext",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "author": {
     "name": "Criptext Inc.",
     "email": "[email protected]",

electron_app/src/models.js

@@ -102,12 +102,12 @@ const createEmailColumns = table => {
   table.string('subject').notNullable();
   table.text('content').notNullable();
   table.string('preview', LARGE_STRING_SIZE).notNullable();
-  table.timestamp('date').notNullable();
+  table.dateTime('date').notNullable();
   table.integer('status').notNullable();
   table.boolean('unread').notNullable();
   table.boolean('secure').notNullable();
   table.boolean('isMuted').notNullable();
-  table.timestamp('unsendDate');
+  table.dateTime('unsendDate');
 };
 
 const createEmailLabelColumns = table => {

electron_app/src/windows/menu.js

@@ -65,6 +65,20 @@ const template = [
         label: 'Close',
         accelerator: 'CmdOrCtrl+W',
         role: 'close'
+      },
+      {
+        label: 'Developer',
+        type: 'submenu',
+        submenu: [
+          {
+            label: 'Toggle Developer Tools',
+            accelerator:
+              process.platform === 'darwin' ? 'Alt+Command+I' : 'Ctrl+Shift+I',
+            click(item, focusedWindow) {
+              if (focusedWindow) focusedWindow.webContents.toggleDevTools();
+            }
+          }
+        ]
       }
     ]
   }
@@ -120,7 +134,7 @@ if (process.platform === 'darwin') {
     ]
   });
   // Window menu.
-  template[2].submenu.push(
+  template[3].submenu.push(
     {
       type: 'separator'
     },

email_mailbox/src/actions/emails.js

@@ -10,9 +10,8 @@ import {
 } from '../utils/electronInterface';
 import { loadContacts } from './contacts';
 import { updateLabelSuccess } from './labels';
-import { EmailStatus, unsentText } from '../utils/const';
+import { EmailStatus } from '../utils/const';
 import { getCriptextRecipients } from '../utils/EmailUtils';
-import { removeHTMLTags } from '../utils/StringUtils';
 
 export const addEmails = emails => {
   return {
@@ -124,19 +123,20 @@ export const unsendEmail = params => {
         await updateEmail({
           key,
           status: EmailStatus.UNSEND,
-          content: unsentText,
-          preview: removeHTMLTags(unsentText),
+          content: '',
+          preview: '',
           unsendDate: Date.now()
         });
-        dispatch(unsendEmailOnSuccess(emailId));
+        dispatch(unsendEmailOnSuccess(emailId, Date.now()));
       }
     } catch (e) {
       // To do
     }
   };
 };
 
-export const unsendEmailOnSuccess = emailId => ({
+export const unsendEmailOnSuccess = (emailId, unsendDate) => ({
   type: Email.UNSEND,
-  emailId
+  emailId,
+  unsendDate
 });

email_mailbox/src/components/ButtonUnsend.js

@@ -8,9 +8,9 @@ const ButtonUnsend = props => (
       'button-unsend ' +
       (props.displayLoading ? 'button-unsend-loading' : 'button-unsend-normal')
     }
-    onClick={props.onClick}
+    onClick={ev => props.onClick(ev)}
   >
-    {props.displayLoading ? renderLoading() : renderButton(props.onClick)}
+    {props.displayLoading ? renderLoading() : renderButton()}
   </button>
 );
 

email_mailbox/src/components/ButtonUnsendWrapper.js

@@ -14,23 +14,23 @@ class ButtonUnsendWrapper extends Component {
     return (
       <ButtonUnsend
         displayLoading={this.state.displayLoading}
-        onClick={this.onClick}
-        {...this.props}
+        onClick={this.handleClick}
       />
     );
   }
 
-  onClick = () => {
+  handleClick = ev => {
+    if (ev) ev.stopPropagation();
     this.setState({
       displayLoading: true
     });
-    this.props.onClicked(true);
+    this.props.onClick(true);
   };
 }
 
 ButtonUnsendWrapper.propTypes = {
   displayPopOver: PropTypes.bool,
-  onClicked: PropTypes.func,
+  onClick: PropTypes.func,
   onTogglePopOver: PropTypes.func
 };
 

email_mailbox/src/components/Email.js

@@ -20,7 +20,7 @@ const renderEmailCollapse = props => (
   <div
     className={
       'email-container email-container-collapse ' +
-      (props.isUnsend ? 'email-unsent' : 'email-normal')
+      (props.isUnsend ? 'email-unsend' : 'email-normal')
     }
     onClick={props.onToggleEmail}
   >
@@ -99,7 +99,7 @@ const renderEmailExpand = props => (
             </div>
             <div className="email-info-content-actions">
               {props.isFromMe && !props.isUnsend ? (
-                <ButtonUnsend onClicked={props.unsendButtonOnClicked} />
+                <ButtonUnsend onClick={props.onClickUnsendButton} />
               ) : null}
               <i
                 className="icon-replay"
@@ -219,7 +219,7 @@ renderEmailExpand.propTypes = {
   onTogglePopOverEmailActions: PropTypes.func,
   onTooglePopOverEmailMoreInfo: PropTypes.func,
   staticOpen: PropTypes.func,
-  unsendButtonOnClicked: PropTypes.func
+  onClickUnsendButton: PropTypes.func
 };
 
 renderMuteIcon.propTypes = {

email_mailbox/src/components/EmailWrapper.js

@@ -23,7 +23,7 @@ class EmailWrapper extends Component {
         onToggleEmail={this.onToggleEmail}
         onTooglePopOverEmailMoreInfo={this.handleTooglePopOverEmailMoreInfo}
         onTogglePopOverEmailActions={this.handleTogglePopOverEmailActions}
-        unsendButtonOnClicked={this.setHideView}
+        onClickUnsendButton={this.handleClickUnsendButton}
         {...this.props}
       />
     );
@@ -62,14 +62,14 @@ class EmailWrapper extends Component {
     });
   };
 
-  setHideView = value => {
+  handleClickUnsendButton = value => {
     this.setState(
       {
-        hideView: value
+        hideView: !value
       },
       async () => {
         await this.props.unsendEmail();
-        this.setState({ hideView: !value });
+        this.setState({ hideView: value });
       }
     );
   };

email_mailbox/src/components/PanelWrapper.js

@@ -66,7 +66,7 @@ class PanelWrapper extends Component {
       }
     });
 
-    addEvent(Event.EMAIL_TRACKING_UPDATE, (threadId, status) => {
+    addEvent(Event.EMAIL_TRACKING_UPDATE, (threadId, status, date) => {
       if (status === EmailStatus.OPENED) {
         props.onMarkThreadAsOpen(threadId);
       }
@@ -84,7 +84,7 @@ class PanelWrapper extends Component {
           });
         }
         if (isRenderingThread) {
-          props.onUnsendEmail(threadId);
+          props.onUnsendEmail(threadId, date);
         }
       }
     });

email_mailbox/src/components/email.scss

@@ -3,24 +3,15 @@
 .email-container{
   align-items: center;
   background-color: white;
+  border: solid 1px #dcdde0;
   border-radius: 4px;
   display: flex;
-  font-family: NunitoSans;
   margin-bottom: 6px;
   position: relative;
-  width: 100%;
+  width: calc(100% - 2px);
 
   &.email-unsend {
-    i {
-      color: #d0021b;
-    }
-    .button-expand {
-      border-color: #ff99a5;
-    }
-    .email-text {
-      font-style: italic;
-      color: #acacac;
-    }
+    border: solid 1px #eeb6b7;
   }
 
   hr{
@@ -120,17 +111,9 @@
 }
 
 .email-container-collapse{
-  width: calc(100% - 2px);
-
-  &.email-normal{
-    border: solid 1px #dcdde0;
-  }
-
-  &.email-unsent{
-    border: solid 1px rgba(221, 64, 64, 0.48);
-  
+  &.email-unsend{
     .email-preview-content{
-      color: #eea3a3;
+      color: #eeb6b7;
       font-style: italic;
     }
   }
@@ -149,10 +132,15 @@
 }
 
 .email-container-expand{
-  box-shadow: 0 2px 4px 0 rgba(175, 175, 175, 0.35);
   height: auto;
   flex-direction: column;
 
+  &.email-unsend {
+    .email-text {
+      font-style: italic;
+    }
+  }
+
   > div{
     margin: 0 17px;
     width: calc(100% - 34px);
@@ -210,9 +198,13 @@
       font-weight: 200;
 
       &[disabled]{
-        opacity: 0.2;
+        opacity: 0.3;
         pointer-events: none;
       }
+
+      >div{
+        margin: 10px 0;
+      }
     }
 
     .email-files{