From 5394774022d5bf769a53155c97058b0e7a10fcf9 Mon Sep 17 00:00:00 2001
From: inishchith <inishchith@gmail.com>
Date: Mon, 4 Jun 2018 19:03:06 +0530
Subject: [PATCH 01/57]  add receiver

---
 email/config.json |  7 ++++++
 email/receiver.js | 54 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+)
 create mode 100644 email/config.json
 create mode 100644 email/receiver.js

diff --git a/email/config.json b/email/config.json
new file mode 100644
index 00000000..3d6cefaa
--- /dev/null
+++ b/email/config.json
@@ -0,0 +1,7 @@
+{
+    "user": "your_email",
+    "password": "your_password",
+    "host": "imap.gmail.com",
+    "port": 993,
+    "tls": true
+}
diff --git a/email/receiver.js b/email/receiver.js
new file mode 100644
index 00000000..c1847262
--- /dev/null
+++ b/email/receiver.js
@@ -0,0 +1,54 @@
+var config = require('./config');
+
+var Imap = require('imap'),
+    inspect = require('util').inspect;
+
+var imap = new Imap(config);
+
+function openInbox(cb) {
+  imap.openBox('INBOX', true, cb);
+}
+
+imap.once('ready', function() {
+    var fs = require('fs'), fileStream;
+
+    openInbox(function(err, box) {
+      if (err) throw err;
+      // test for May 28, 2018
+      imap.search([ 'UNSEEN', ['SINCE', 'May 28, 2018'] ], function(err, results) {
+        if (err) throw err;
+        var f = imap.fetch(results, { bodies: '' });
+        f.on('message', function(msg, seqno) {
+          console.log('Message #%d', seqno);
+          var prefix = '(#' + seqno + ') ';
+          msg.on('body', function(stream, info) {
+            console.log(prefix + 'Body');
+            stream.pipe(fs.createWriteStream('msg-' + seqno + '-body.txt'));
+          });
+          msg.once('attributes', function(attrs) {
+            console.log(prefix + 'Attributes: %s', inspect(attrs, false, 8));
+          });
+          msg.once('end', function() {
+            console.log(prefix + 'Finished');
+          });
+        });
+        f.once('error', function(err) {
+          console.log('Fetch error: ' + err);
+        });
+        f.once('end', function() {
+          console.log('Done fetching all messages!');
+          imap.end();
+        });
+      });
+    });
+});
+
+imap.once('error', function(err) {
+  console.log(err);
+});
+
+imap.once('end', function() {
+  console.log('Connection ended');
+});
+
+imap.connect();

From 1181bb85a69d0b4273251b3677ff57305516ce7f Mon Sep 17 00:00:00 2001
From: accakks <aakanksha.jain8@gmail.com>
Date: Tue, 5 Jun 2018 23:33:55 +0530
Subject: [PATCH 02/57] Added sender.js

---
 email/sender.js | 43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)
 create mode 100644 email/sender.js

diff --git a/email/sender.js b/email/sender.js
new file mode 100644
index 00000000..56640981
--- /dev/null
+++ b/email/sender.js
@@ -0,0 +1,43 @@
+
+const nodemailer = require('nodemailer');
+const xoauth2 = require('xoauth2');
+const smtp = require('nodemailer-smtp-transport');
+const config = require('config.json')('./config.json');
+
+//var userEmail, receiverEmail, clientId_input, clientSecret_input, refreshToken_Input, subjectText, contentText,userPassword, attachments;
+
+let transporter = nodemailer.createTransport({
+    service: 'gmail',
+    host: 'smtp.gmail.com',
+    secure: 'true',
+    port: '465',
+    auth: {
+          type: 'OAuth2',
+          user: config.userMail,
+          clientId: config.clientId_input,
+          clientSecret:config.clientSecret_input,
+          refreshToken:config.refreshToken_input    }
+        
+    } 
+);
+
+let mailOptions = {
+    from: config.userMail,
+    to: config.receiverMail,
+    cc: config.receiverCC,
+    bcc: config.receiverBCC,
+    subject: config.subjectText,
+    text: config.contentText,
+    attachments: config._attachments
+    };
+ 
+
+transporter.sendMail(mailOptions, function(e, r) {
+  if (e) {
+    console.log(e);
+  } else {
+    console.log(r);
+  }
+  transporter.close();
+});
+

From 23a9bb6e1d421ef63be584157732ed918f4c0cb0 Mon Sep 17 00:00:00 2001
From: accakks <aakanksha.jain8@gmail.com>
Date: Tue, 5 Jun 2018 23:39:53 +0530
Subject: [PATCH 03/57] added package.json

---
 email/package.json | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 email/package.json

diff --git a/email/package.json b/email/package.json
new file mode 100644
index 00000000..9f8bb482
--- /dev/null
+++ b/email/package.json
@@ -0,0 +1,10 @@
+{
+    "name": "GmailMailer",
+    "version": "0.0.1",
+    "dependencies": {
+        "xoauth2": "1.2.0",
+        "nodemailer": "4.6.5",
+        "nodemailer-smtp-transport": "2.7.4",
+        "imap": "v0.8.x "
+    }
+}

From ce49e0079948cc6f48c44533de7f6174958a2874 Mon Sep 17 00:00:00 2001
From: accakks <aakanksha.jain8@gmail.com>
Date: Tue, 5 Jun 2018 23:42:13 +0530
Subject: [PATCH 04/57] Edited config.json

---
 email/config.json | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/email/config.json b/email/config.json
index 3d6cefaa..af3bf88d 100644
--- a/email/config.json
+++ b/email/config.json
@@ -5,3 +5,18 @@
     "port": 993,
     "tls": true
 }
+
+{
+    "userMail" : "aakanksha.isp8buddy@gmail.com",
+    "receiverMail": "aakanksha.jain8@gmail.com",
+    "subjectText":"Wow it worked",
+    "contentText":"hahahhahaha",
+    "_attachments":"",
+    "receiverCC":"",
+    "receiverBCC":"",
+    "userPassword":"isp82828",
+    "clientId_input":"923388861604-9vnclirkoi9t7nsijrrq7r6g2rvv88f5.apps.googleusercontent.com",
+    "clientSecret_input":"'JvdpRgDP2xRsudMJmE24LgVz'",
+    "refreshToken_input":"1/Bj5tAhN593rBsV8uYdVLVDZW8bUpvCOgeE43jYVdEaw"
+
+}   
\ No newline at end of file

From 1afa191e8304a14eface747a1fd7586d48f50980 Mon Sep 17 00:00:00 2001
From: Aakanksha Jain <aakanksha.jain8@gmail.com>
Date: Thu, 7 Jun 2018 17:27:28 +0530
Subject: [PATCH 05/57] Update config.json

---
 email/config.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/email/config.json b/email/config.json
index af3bf88d..de2f80a8 100644
--- a/email/config.json
+++ b/email/config.json
@@ -7,16 +7,16 @@
 }
 
 {
-    "userMail" : "aakanksha.isp8buddy@gmail.com",
-    "receiverMail": "aakanksha.jain8@gmail.com",
-    "subjectText":"Wow it worked",
-    "contentText":"hahahhahaha",
+    "userMail" : "your_email",
+    "receiverMail": "receiver_email",
+    "subjectText":"",
+    "contentText":"",
     "_attachments":"",
     "receiverCC":"",
     "receiverBCC":"",
-    "userPassword":"isp82828",
-    "clientId_input":"923388861604-9vnclirkoi9t7nsijrrq7r6g2rvv88f5.apps.googleusercontent.com",
-    "clientSecret_input":"'JvdpRgDP2xRsudMJmE24LgVz'",
-    "refreshToken_input":"1/Bj5tAhN593rBsV8uYdVLVDZW8bUpvCOgeE43jYVdEaw"
+    "userPassword":"",
+    "clientId_input":"",
+    "clientSecret_input":"",
+    "refreshToken_input":""
 
-}   
\ No newline at end of file
+}   

From 83be32eb16db396319496768ffab32baf5af8749 Mon Sep 17 00:00:00 2001
From: inishchith <inishchith@gmail.com>
Date: Thu, 7 Jun 2018 20:05:11 +0530
Subject: [PATCH 06/57]  add email model

---
 models/doctype/Email/Email.js | 43 +++++++++++++++++++++++++++++++++++
 models/index.js               |  3 ++-
 2 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 models/doctype/Email/Email.js

diff --git a/models/doctype/Email/Email.js b/models/doctype/Email/Email.js
new file mode 100644
index 00000000..2edf6b27
--- /dev/null
+++ b/models/doctype/Email/Email.js
@@ -0,0 +1,43 @@
+module.exports = {
+    "name": "Email",
+    "doctype": "DocType",
+    "isSingle": 0,
+    "isChild": 0,
+    "keywordFields": [
+        "name",
+        "emailAddress"
+    ],
+    "fields": [
+        {
+            "fieldname": "name",
+            "label": "Name",
+            "fieldtype": "Data",
+            "required": 1
+        },
+        {
+            "fieldname": "emailAddress",
+            "label": "Email Address",
+            "fieldtype": "Data",
+            "required": 1
+        },
+        {
+            "fieldname": "password",
+            "label": "Password",
+            "fieldtype": "Password",
+            "required": 1,
+            "hidden": 1,
+        },
+        {
+            "fieldname": "host",
+            "label": "Host",
+            "fieldtype": "Link",
+            "required": 1
+        },
+        {
+            "fieldname": "port",
+            "label": "Port",
+            "fieldtype": "Int",
+            "required": 1
+        }
+    ]
+}
\ No newline at end of file
diff --git a/models/index.js b/models/index.js
index 0040080f..70e967f4 100644
--- a/models/index.js
+++ b/models/index.js
@@ -11,6 +11,7 @@ module.exports = {
         SystemSettings: require('./doctype/SystemSettings/SystemSettings.js'),
         ToDo: require('./doctype/ToDo/ToDo.js'),
         User: require('./doctype/User/User.js'),
-        UserRole: require('./doctype/UserRole/UserRole.js')
+        UserRole: require('./doctype/UserRole/UserRole.js'),
+        Email: require('./doctype/Email/Email.js')
     }
 }

From 0182c15295ca34b717862d699624e131291fe3e9 Mon Sep 17 00:00:00 2001
From: Aakanksha Jain <aakanksha.jain8@gmail.com>
Date: Sun, 10 Jun 2018 12:12:30 +0530
Subject: [PATCH 07/57] Update Email.js

---
 models/doctype/Email/Email.js | 38 ++++++++++++++++++++++++++++++++---
 1 file changed, 35 insertions(+), 3 deletions(-)

diff --git a/models/doctype/Email/Email.js b/models/doctype/Email/Email.js
index 2edf6b27..21adaf22 100644
--- a/models/doctype/Email/Email.js
+++ b/models/doctype/Email/Email.js
@@ -16,7 +16,7 @@ module.exports = {
         },
         {
             "fieldname": "emailAddress",
-            "label": "Email Address",
+            "label": "from",
             "fieldtype": "Data",
             "required": 1
         },
@@ -38,6 +38,38 @@ module.exports = {
             "label": "Port",
             "fieldtype": "Int",
             "required": 1
-        }
+        },
+        {
+            "fieldname": "emailAddress",
+            "label": "to",
+            "fieldtype": "Data",
+            "required": 1
+        },
+        {
+            "fieldname": "emailAddress",
+            "label": "cc",
+            "fieldtype": "Data",
+            "required": 1
+        },
+        {
+            "fieldname": "emailAddress",
+            "label": "bcc",
+            "fieldtype": "Data",
+            "required": 1
+        },
+        {
+          "fieldname": "Subject",
+          "label": "Subject",
+          "fieldtype" : "Text",
+          "required": 0
+        },
+        { 
+          "fieldname": "Content",
+          "label": "",
+          "fieldtype" : "Text",
+          "required": 0
+        }         
+        
+     
     ]
-}
\ No newline at end of file
+}

From 9410484d05ed027b4a3dffea32fb0c102b906b11 Mon Sep 17 00:00:00 2001
From: accakks <aakanksha.jain8@gmail.com>
Date: Sun, 10 Jun 2018 12:35:21 +0530
Subject: [PATCH 08/57] Changes made in cc, bcc fields in models

---
 models/doctype/Email/Email.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/models/doctype/Email/Email.js b/models/doctype/Email/Email.js
index 21adaf22..ca6dbc4a 100644
--- a/models/doctype/Email/Email.js
+++ b/models/doctype/Email/Email.js
@@ -49,13 +49,13 @@ module.exports = {
             "fieldname": "emailAddress",
             "label": "cc",
             "fieldtype": "Data",
-            "required": 1
+            "required": 0
         },
         {
             "fieldname": "emailAddress",
             "label": "bcc",
             "fieldtype": "Data",
-            "required": 1
+            "required": 0
         },
         {
           "fieldname": "Subject",

From a2ae74d614e0d747e2c04ac5e2764b77e18ad74d Mon Sep 17 00:00:00 2001
From: Aakanksha Jain <aakanksha.jain8@gmail.com>
Date: Sun, 10 Jun 2018 13:39:23 +0530
Subject: [PATCH 09/57] Added more models to Email.js (#8)

* Update Email.js

* Changes made in cc, bcc fields in models
---
 models/doctype/Email/Email.js | 38 ++++++++++++++++++++++++++++++++---
 1 file changed, 35 insertions(+), 3 deletions(-)

diff --git a/models/doctype/Email/Email.js b/models/doctype/Email/Email.js
index 2edf6b27..ca6dbc4a 100644
--- a/models/doctype/Email/Email.js
+++ b/models/doctype/Email/Email.js
@@ -16,7 +16,7 @@ module.exports = {
         },
         {
             "fieldname": "emailAddress",
-            "label": "Email Address",
+            "label": "from",
             "fieldtype": "Data",
             "required": 1
         },
@@ -38,6 +38,38 @@ module.exports = {
             "label": "Port",
             "fieldtype": "Int",
             "required": 1
-        }
+        },
+        {
+            "fieldname": "emailAddress",
+            "label": "to",
+            "fieldtype": "Data",
+            "required": 1
+        },
+        {
+            "fieldname": "emailAddress",
+            "label": "cc",
+            "fieldtype": "Data",
+            "required": 0
+        },
+        {
+            "fieldname": "emailAddress",
+            "label": "bcc",
+            "fieldtype": "Data",
+            "required": 0
+        },
+        {
+          "fieldname": "Subject",
+          "label": "Subject",
+          "fieldtype" : "Text",
+          "required": 0
+        },
+        { 
+          "fieldname": "Content",
+          "label": "",
+          "fieldtype" : "Text",
+          "required": 0
+        }         
+        
+     
     ]
-}
\ No newline at end of file
+}

From 965ea472a503691105af125ca6d15e84fbc19a4f Mon Sep 17 00:00:00 2001
From: inishchith <inishchith@gmail.com>
Date: Sun, 10 Jun 2018 14:39:17 +0530
Subject: [PATCH 10/57]  clean up receiver.js

---
 email/receiver.js | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/email/receiver.js b/email/receiver.js
index c1847262..d09ed6a3 100644
--- a/email/receiver.js
+++ b/email/receiver.js
@@ -17,25 +17,20 @@ imap.once('ready', function() {
       // test for May 28, 2018
       imap.search([ 'UNSEEN', ['SINCE', 'May 28, 2018'] ], function(err, results) {
         if (err) throw err;
-        var f = imap.fetch(results, { bodies: '' });
-        f.on('message', function(msg, seqno) {
-          console.log('Message #%d', seqno);
+        var fetch = imap.fetch(results, { bodies: '' });
+        fetch.on('message', function(msg, seqno) {
+          // console.log('Message #%d', seqno);
           var prefix = '(#' + seqno + ') ';
           msg.on('body', function(stream, info) {
-            console.log(prefix + 'Body');
+            // console.log(prefix + 'Body');
             stream.pipe(fs.createWriteStream('msg-' + seqno + '-body.txt'));
-          });
-          msg.once('attributes', function(attrs) {
-            console.log(prefix + 'Attributes: %s', inspect(attrs, false, 8));
-          });
-          msg.once('end', function() {
-            console.log(prefix + 'Finished');
+            // TODO : have to dump this in db
           });
         });
-        f.once('error', function(err) {
+        fetch.once('error', function(err) {
           console.log('Fetch error: ' + err);
         });
-        f.once('end', function() {
+        fetch.once('end', function() {
           console.log('Done fetching all messages!');
           imap.end();
         });

From 6b73021b56e95c98944586a3bbd9589e5685ce58 Mon Sep 17 00:00:00 2001
From: inishchith <inishchith@gmail.com>
Date: Tue, 12 Jun 2018 11:52:51 +0530
Subject: [PATCH 11/57]  add EmailList.js and change fields in Email.js

---
 models/doctype/Email/Email.js     | 12 +++++------
 models/doctype/Email/EmailList.js | 36 +++++++++++++++++++++++++++++++
 models/index.js                   |  3 ++-
 3 files changed, 44 insertions(+), 7 deletions(-)
 create mode 100644 models/doctype/Email/EmailList.js

diff --git a/models/doctype/Email/Email.js b/models/doctype/Email/Email.js
index ca6dbc4a..6206eb56 100644
--- a/models/doctype/Email/Email.js
+++ b/models/doctype/Email/Email.js
@@ -5,7 +5,7 @@ module.exports = {
     "isChild": 0,
     "keywordFields": [
         "name",
-        "emailAddress"
+        "from_emailAddress"
     ],
     "fields": [
         {
@@ -15,7 +15,7 @@ module.exports = {
             "required": 1
         },
         {
-            "fieldname": "emailAddress",
+            "fieldname": "from_emailAddress",
             "label": "from",
             "fieldtype": "Data",
             "required": 1
@@ -40,19 +40,19 @@ module.exports = {
             "required": 1
         },
         {
-            "fieldname": "emailAddress",
+            "fieldname": "to_emailAddress",
             "label": "to",
             "fieldtype": "Data",
             "required": 1
         },
         {
-            "fieldname": "emailAddress",
+            "fieldname": "cc_emailAddress",
             "label": "cc",
             "fieldtype": "Data",
             "required": 0
         },
         {
-            "fieldname": "emailAddress",
+            "fieldname": "bcc_emailAddress",
             "label": "bcc",
             "fieldtype": "Data",
             "required": 0
@@ -64,7 +64,7 @@ module.exports = {
           "required": 0
         },
         { 
-          "fieldname": "Content",
+          "fieldname": "Body",
           "label": "",
           "fieldtype" : "Text",
           "required": 0
diff --git a/models/doctype/Email/EmailList.js b/models/doctype/Email/EmailList.js
new file mode 100644
index 00000000..0e8b0872
--- /dev/null
+++ b/models/doctype/Email/EmailList.js
@@ -0,0 +1,36 @@
+module.exports = {
+    "name": "EmailItem",
+    "doctype": "DocType",
+    "isSingle": 0,
+    "isChild": 0,   // isChild of Email ? 
+    "keywordFields": [
+        "emailAddress"
+    ],
+    "fields": [
+        {
+            "fieldname": "from_emailAddress",
+            "label": "from",
+            "fieldtype": "Data",
+            "required": 1
+        },
+        {
+            "fieldname": "to_emailAddress",
+            "label": "to",
+            "fieldtype": "Data",
+            "required": 1
+        },
+        {
+          "fieldname": "Subject",
+          "label": "Subject",
+          "fieldtype" : "Text",
+          "required": 0
+        },
+        { 
+          "fieldname": "Body",
+          "label": "",
+          "fieldtype" : "Text",
+          "required": 0
+        }         
+        // haven't captured attachments ?
+    ]
+}
diff --git a/models/index.js b/models/index.js
index 70e967f4..0b0e8cf8 100644
--- a/models/index.js
+++ b/models/index.js
@@ -12,6 +12,7 @@ module.exports = {
         ToDo: require('./doctype/ToDo/ToDo.js'),
         User: require('./doctype/User/User.js'),
         UserRole: require('./doctype/UserRole/UserRole.js'),
-        Email: require('./doctype/Email/Email.js')
+        Email: require('./doctype/Email/Email.js'),
+        EmailList: require('./doctype/Email/EmailList.js')
     }
 }

From 275c32a90495442fa8043acc0452537b0d378984 Mon Sep 17 00:00:00 2001
From: inishchith <inishchith@gmail.com>
Date: Tue, 12 Jun 2018 19:48:21 +0530
Subject: [PATCH 12/57]  updated Models

---
 models/doctype/Email/Email.js                 | 40 +++++++------------
 .../EmailSummary.js}                          | 16 ++++----
 models/index.js                               |  2 +-
 3 files changed, 24 insertions(+), 34 deletions(-)
 rename models/doctype/{Email/EmailList.js => EmailSummary/EmailSummary.js} (71%)

diff --git a/models/doctype/Email/Email.js b/models/doctype/Email/Email.js
index 6206eb56..0c586f78 100644
--- a/models/doctype/Email/Email.js
+++ b/models/doctype/Email/Email.js
@@ -16,16 +16,16 @@ module.exports = {
         },
         {
             "fieldname": "from_emailAddress",
-            "label": "from",
+            "label": "Email",
             "fieldtype": "Data",
             "required": 1
         },
         {
             "fieldname": "password",
             "label": "Password",
-            "fieldtype": "Password",
+            "fieldtype": "Data",
             "required": 1,
-            "hidden": 1,
+            // "hidden": 1, uncomment when s: OAuth
         },
         {
             "fieldname": "host",
@@ -40,36 +40,24 @@ module.exports = {
             "required": 1
         },
         {
-            "fieldname": "to_emailAddress",
-            "label": "to",
+            "fieldname": "clientId",
+            "label": "Client Id",
             "fieldtype": "Data",
             "required": 1
         },
         {
-            "fieldname": "cc_emailAddress",
-            "label": "cc",
+            "fieldname": "clientSecret",
+            "label": "Client Secret",
             "fieldtype": "Data",
-            "required": 0
+            "required": 1
         },
         {
-            "fieldname": "bcc_emailAddress",
-            "label": "bcc",
+            "fieldname": "refreshToken",
+            "label": "Refresh Token",
             "fieldtype": "Data",
-            "required": 0
-        },
-        {
-          "fieldname": "Subject",
-          "label": "Subject",
-          "fieldtype" : "Text",
-          "required": 0
-        },
-        { 
-          "fieldname": "Body",
-          "label": "",
-          "fieldtype" : "Text",
-          "required": 0
-        }         
-        
-     
+            "required": 1
+        }
+    
     ]
 }
+
diff --git a/models/doctype/Email/EmailList.js b/models/doctype/EmailSummary/EmailSummary.js
similarity index 71%
rename from models/doctype/Email/EmailList.js
rename to models/doctype/EmailSummary/EmailSummary.js
index 0e8b0872..72d90afd 100644
--- a/models/doctype/Email/EmailList.js
+++ b/models/doctype/EmailSummary/EmailSummary.js
@@ -1,36 +1,38 @@
 module.exports = {
-    "name": "EmailItem",
+    "name": "EmailSummary",
     "doctype": "DocType",
     "isSingle": 0,
     "isChild": 0,   // isChild of Email ? 
     "keywordFields": [
-        "emailAddress"
+        "from_emailAddress"
     ],
     "fields": [
         {
+        	// here comes question of default values
             "fieldname": "from_emailAddress",
-            "label": "from",
+            "label": "From",
             "fieldtype": "Data",
             "required": 1
         },
         {
             "fieldname": "to_emailAddress",
-            "label": "to",
+            "label": "To",
             "fieldtype": "Data",
             "required": 1
         },
         {
-          "fieldname": "Subject",
+          "fieldname": "subject",
           "label": "Subject",
           "fieldtype" : "Text",
           "required": 0
         },
         { 
-          "fieldname": "Body",
-          "label": "",
+          "fieldname": "body",
+          "label": "Body",
           "fieldtype" : "Text",
           "required": 0
         }         
         // haven't captured attachments ?
     ]
 }
+
diff --git a/models/index.js b/models/index.js
index 0b0e8cf8..3a8de58c 100644
--- a/models/index.js
+++ b/models/index.js
@@ -13,6 +13,6 @@ module.exports = {
         User: require('./doctype/User/User.js'),
         UserRole: require('./doctype/UserRole/UserRole.js'),
         Email: require('./doctype/Email/Email.js'),
-        EmailList: require('./doctype/Email/EmailList.js')
+        EmailSummary: require('./doctype/EmailSummary/EmailSummary.js')
     }
 }

From 74579d36e8722c9d406e2f7f8b73c6d8c9957de5 Mon Sep 17 00:00:00 2001
From: Aakanksha Jain <aakanksha.jain8@gmail.com>
Date: Wed, 13 Jun 2018 10:02:07 +0530
Subject: [PATCH 13/57] Update EmailSummary.js (#18)

---
 models/doctype/EmailSummary/EmailSummary.js | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/models/doctype/EmailSummary/EmailSummary.js b/models/doctype/EmailSummary/EmailSummary.js
index 72d90afd..d346a737 100644
--- a/models/doctype/EmailSummary/EmailSummary.js
+++ b/models/doctype/EmailSummary/EmailSummary.js
@@ -21,6 +21,18 @@ module.exports = {
             "required": 1
         },
         {
++            "fieldname": "cc_emailAddress",
++            "label": "cc",
++            "fieldtype": "Data",
++            "required": 0
++        },
++        {
++            "fieldname": "bcc_emailAddress",
++            "label": "bcc",
++            "fieldtype": "Data",
++            "required": 0
++        },
+        {
           "fieldname": "subject",
           "label": "Subject",
           "fieldtype" : "Text",

From 790663e4e934e6eda91ec5dbb7c1f114183295bf Mon Sep 17 00:00:00 2001
From: Aakanksha Jain <aakanksha.jain8@gmail.com>
Date: Wed, 13 Jun 2018 10:40:44 +0530
Subject: [PATCH 14/57] Added missing '}' at the end of Email.js & in corrected
 by mistake copied '+++' while adding cc, bcc to 'EmailSummary.js' (#19)

* Update EmailSummary.js

* '+' by mistake

* Missing '}'
---
 models/doctype/Email/Email.js               |  1 +
 models/doctype/EmailSummary/EmailSummary.js | 24 +++++++++++----------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/models/doctype/Email/Email.js b/models/doctype/Email/Email.js
index 1d574fca..8c2b024d 100644
--- a/models/doctype/Email/Email.js
+++ b/models/doctype/Email/Email.js
@@ -59,3 +59,4 @@ module.exports = {
         }
     
     ]
+}
diff --git a/models/doctype/EmailSummary/EmailSummary.js b/models/doctype/EmailSummary/EmailSummary.js
index d346a737..4c13e4aa 100644
--- a/models/doctype/EmailSummary/EmailSummary.js
+++ b/models/doctype/EmailSummary/EmailSummary.js
@@ -21,17 +21,19 @@ module.exports = {
             "required": 1
         },
         {
-+            "fieldname": "cc_emailAddress",
-+            "label": "cc",
-+            "fieldtype": "Data",
-+            "required": 0
-+        },
-+        {
-+            "fieldname": "bcc_emailAddress",
-+            "label": "bcc",
-+            "fieldtype": "Data",
-+            "required": 0
-+        },
+
+            "fieldname": "cc_emailAddress",
+            "label": "cc",
+            "fieldtype": "Data",
+            "required": 0
+        },
+        {
+            "fieldname": "bcc_emailAddress",
+            "label": "bcc",
+            "fieldtype": "Data",
+            "required": 0
+      },
+
         {
           "fieldname": "subject",
           "label": "Subject",

From 19e1c8eb146bc76dd2eff345736618d8a9a98cb7 Mon Sep 17 00:00:00 2001
From: inishchith <inishchith@gmail.com>
Date: Mon, 9 Jul 2018 20:23:19 +0530
Subject: [PATCH 15/57]  incorp. for vue functionality

---
 email/getConfig.js                       |  8 +++
 email/index.js                           | 25 ++++++++
 email/receiver.js                        | 81 ++++++++++++++++++++++++
 email/sender.js                          | 31 +++++++++
 email/validator.js                       | 27 ++++++++
 package-lock.json                        | 13 ++++
 package.json                             |  1 +
 server/index.js                          |  3 +
 ui/components/controls/Base.vue          |  3 +-
 ui/components/controls/FrappeControl.vue |  1 +
 10 files changed, 192 insertions(+), 1 deletion(-)
 create mode 100644 email/getConfig.js
 create mode 100644 email/index.js
 create mode 100644 email/receiver.js
 create mode 100644 email/sender.js
 create mode 100644 email/validator.js
 create mode 100644 package-lock.json

diff --git a/email/getConfig.js b/email/getConfig.js
new file mode 100644
index 00000000..b550205d
--- /dev/null
+++ b/email/getConfig.js
@@ -0,0 +1,8 @@
+const frappe = require('frappejs');
+module.exports = async function getData(emailAddress) {
+    account = await frappe.db.getAll({
+        doctype: 'EmailAccount',
+        fields: ['*']
+    })
+    return account;
+}
\ No newline at end of file
diff --git a/email/index.js b/email/index.js
new file mode 100644
index 00000000..0b41db39
--- /dev/null
+++ b/email/index.js
@@ -0,0 +1,25 @@
+const sender = require('./sender');
+const receiver = require('./receiver');
+const validator = require('./validator');
+const frappe = require('frappejs');
+
+module.exports = () => {
+    frappe.registerMethod({
+        method: 'send-mail',
+        handler: sender.sendMail
+    });
+
+    frappe.registerMethod({
+        method: 'sync-mail',
+        handler: receiver.sync
+    });
+
+    frappe.registerMethod({
+        method: 'validate-mail',
+        handler: validator.validate
+    });
+    frappe.registerMethod({
+        method: 'validate-auth',
+        handler: validator.authValidate
+    });
+};
\ No newline at end of file
diff --git a/email/receiver.js b/email/receiver.js
new file mode 100644
index 00000000..fbf6b049
--- /dev/null
+++ b/email/receiver.js
@@ -0,0 +1,81 @@
+const frappe = require('frappejs');
+const simpleParser = require('mailparser').simpleParser;
+const Imap = require('imap');
+const getConfig = require("./getConfig");
+
+module.exports = {
+  sync: async () => {
+
+    let account = await getConfig();
+    let emailSyncOption = account[0].emailSync;
+    var config = {
+      "user": account[0].email,
+      "password": account[0].password,
+      "host": account[0].imapHost,
+      "port": account[0].imapPort,
+      "tls": true,
+  };
+  var imap = new Imap(config);
+    function openInbox(cb) {
+      imap.openBox('INBOX', true, cb);
+    }
+
+    imap.once('ready', function () {
+
+      openInbox(function (err, box) {
+
+        if (err) throw err;
+        imap.search([emailSyncOption, ['SINCE', account[0].initialDate]], function (err, results) {
+          if (err) throw err;
+          var fetch = imap.fetch(results, {
+            bodies: ''
+          });
+
+          fetch.on('message', function (msg, seqno) {
+            msg.on('body', function (stream, info) {
+
+              simpleParser(stream)
+                .then(async function (mail_object) {
+                  const mail = await frappe.insert({
+                    doctype: 'Email',
+                    name: "Received from : " + mail_object.to.value[0].address + " " + mail_object.subject.slice(0, 10), // needs change : THINK 
+                    fromEmailAddress: mail_object.from.value[0].address,
+                    toEmailAddress: mail_object.to.value[0].address,
+                    ccEmailAddress: mail_object.cc,
+                    bccEmailAddress: mail_object.bcc,
+                    date: mail_object.date,
+                    subject: mail_object.subject,
+                    bodyHtml: mail_object.html,
+                    bodyText: mail_object.text,
+                    sent: "1",
+                  });
+                })
+                .catch(function (err) {
+                  console.log('An error occurred:', err.message);
+                });
+            });
+          });
+
+          fetch.once('error', function (err) {
+            console.log('Fetch error: ' + err);
+          });
+
+          fetch.once('end', function () {
+            console.log('Done fetching all messages!');
+            imap.end();
+          });
+        });
+      });
+    });
+
+    imap.once('error', function (err) {
+      console.log(err);
+    });
+
+    imap.once('end', function () {
+      console.log('Connection ended');
+    });
+
+    imap.connect();
+  }
+}
\ No newline at end of file
diff --git a/email/sender.js b/email/sender.js
new file mode 100644
index 00000000..14d73a94
--- /dev/null
+++ b/email/sender.js
@@ -0,0 +1,31 @@
+const nodemailer = require('nodemailer');
+const getConfig = require("./getConfig");
+
+module.exports = {
+  'sendMail': async function (mailDetails) {
+    let account = await getConfig(mailDetails.fromEmailAddress);
+    for (var i = 0; i < account.length; i++) {
+      if (mailDetails.fromEmailAddress == account[i].email) {
+        var mailKey = "Sent to : " + mailDetails.toEmailAddress + " " + mailDetails.subject.slice(0, 10);  // needs change : THINK
+        mailDetails = {
+          from: mailDetails.fromEmailAddress,
+          to: mailDetails.toEmailAddress,
+          cc: mailDetails.ccEmailAddress,
+          bcc: mailDetails.bccEmailAddress,
+          subject: mailDetails.subject,
+          text: mailDetails.bodyText,
+        };
+        let transporter = nodemailer.createTransport({
+          service: 'gmail',
+          auth: {
+            user: account[i].email,
+            pass: account[i].password,
+          }
+        });
+        transporter.sendMail(mailDetails);
+        return mailKey;
+        }
+      }
+  console.log(mailDetails.fromEmailAddress + " NOT FOUND IN RECORDS");
+  }
+};
\ No newline at end of file
diff --git a/email/validator.js b/email/validator.js
new file mode 100644
index 00000000..b5c53a1a
--- /dev/null
+++ b/email/validator.js
@@ -0,0 +1,27 @@
+// Verify this with mentor
+// REF. https://github.com/nodemailer/nodemailer/issues/206
+
+module.exports = {
+    validate: async function (mailDetails) {
+        var reg = /^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/;
+        if (reg.test(mailDetails.email) == false) {
+            return false;
+        }
+        return true;
+    },
+    authValidate: async function (mailDetails) {
+        return new Promise((resolve,reject) => {
+            var Imap = require('imap');
+            var imap = new Imap({
+                user: mailDetails.email,
+                password: mailDetails.password,
+                host: mailDetails.imapHost,
+                port: mailDetails.imapPort,
+                tls: true
+            });
+            imap.once('ready',resolve);
+            imap.once('error',reject);
+            imap.connect();
+        })
+    }
+}
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
new file mode 100644
index 00000000..6fc1a654
--- /dev/null
+++ b/package-lock.json
@@ -0,0 +1,13 @@
+{
+  "name": "frappejs",
+  "version": "0.0.8",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "nodemailer": {
+      "version": "4.6.6",
+      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-4.6.6.tgz",
+      "integrity": "sha512-sIcM/Do0XBJmu7ruENLoR+4TCk0B4C1ftqRjWrVeoez9Dt23SmL9bXKqswVqyxuT/RdK8TKWciZvxHykerXCRw=="
+    }
+  }
+}
diff --git a/package.json b/package.json
index bfa1d6dc..2dc594f0 100644
--- a/package.json
+++ b/package.json
@@ -33,6 +33,7 @@
     "mysql": "^2.15.0",
     "node-fetch": "^1.7.3",
     "node-sass": "^4.7.2",
+    "nodemailer": "^4.6.6",
     "nodemon": "^1.14.7",
     "nunjucks": "^3.1.0",
     "octicons": "^7.2.0",
diff --git a/server/index.js b/server/index.js
index 10ac5775..5e6e7327 100644
--- a/server/index.js
+++ b/server/index.js
@@ -16,6 +16,7 @@ const fs = require('fs');
 const { setupExpressRoute: setRouteForPDF } = require('frappejs/server/pdf');
 const auth = require('./../auth/auth')();
 const morgan = require('morgan')
+const setupEmail = require('../email');
 
 require.extensions['.html'] = function (module, filename) {
     module.exports = fs.readFileSync(filename, 'utf8');
@@ -64,6 +65,8 @@ module.exports = {
         frappe.server = server;
 
         setRouteForPDF();
+        console.log("HEY THERE");
+        setupEmail();
     },
 
     async init() {
diff --git a/ui/components/controls/Base.vue b/ui/components/controls/Base.vue
index ac0d7160..5f7125fc 100644
--- a/ui/components/controls/Base.vue
+++ b/ui/components/controls/Base.vue
@@ -70,7 +70,8 @@ export default {
                 type: 'text',
                 placeholder: '',
                 value: this.value,
-                required: this.docfield.required
+                required: this.docfield.required,
+                disabled: this.docfield.disabled
             }
         },
         getInputListeners() {
diff --git a/ui/components/controls/FrappeControl.vue b/ui/components/controls/FrappeControl.vue
index db6cb830..b2651653 100644
--- a/ui/components/controls/FrappeControl.vue
+++ b/ui/components/controls/FrappeControl.vue
@@ -3,6 +3,7 @@
         :docfield="docfield"
         :value="value"
         :onlyInput="onlyInput"
+        v-if="!docfield.hidden"
         @change="$emit('change', $event)"
     />
 </template>

From e83ccbbb91ed4af7bdd80398539bdcfeb2eb6d5a Mon Sep 17 00:00:00 2001
From: inishchith <inishchith@gmail.com>
Date: Thu, 12 Jul 2018 21:28:34 +0530
Subject: [PATCH 16/57]  rm. redundant lines

---
 email/getConfig.js                       | 2 +-
 email/receiver.js                        | 5 ++---
 email/sender.js                          | 5 +++--
 email/validator.js                       | 4 +---
 ui/components/controls/FrappeControl.vue | 1 -
 5 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/email/getConfig.js b/email/getConfig.js
index b550205d..47a7c8df 100644
--- a/email/getConfig.js
+++ b/email/getConfig.js
@@ -1,5 +1,5 @@
 const frappe = require('frappejs');
-module.exports = async function getData(emailAddress) {
+module.exports = async function getData() {
     account = await frappe.db.getAll({
         doctype: 'EmailAccount',
         fields: ['*']
diff --git a/email/receiver.js b/email/receiver.js
index 8951c7d6..1c91d12f 100644
--- a/email/receiver.js
+++ b/email/receiver.js
@@ -5,7 +5,6 @@ const getConfig = require("./getConfig");
 
 module.exports = {
   sync: async () => {
-
     let account = await getConfig();
     let emailSyncOption = account[0].emailSync;
     var config = {
@@ -30,14 +29,14 @@ module.exports = {
           var fetch = imap.fetch(results, {
             bodies: ''
           });
-
           fetch.on('message', function (msg, seqno) {
             msg.on('body', function (stream, info) {
 
               simpleParser(stream)
                 .then(async function (mail_object) {
-                  const mail = await frappe.insert({
+                  await frappe.insert({
                     doctype: 'Email',
+                    // EDITS 
                     name: "Received from : " + mail_object.to.value[0].address + " " + mail_object.subject.slice(0, 10), // needs change : THINK 
                     fromEmailAddress: mail_object.from.value[0].address,
                     toEmailAddress: mail_object.to.value[0].address,
diff --git a/email/sender.js b/email/sender.js
index caa39dc7..cef864f7 100644
--- a/email/sender.js
+++ b/email/sender.js
@@ -3,10 +3,11 @@ const getConfig = require("./getConfig");
 
 module.exports = {
   'sendMail': async function (mailDetails) {
-    let account = await getConfig(mailDetails.fromEmailAddress);
+    let account = await getConfig();
     for (var i = 0; i < account.length; i++) {
       if (mailDetails.fromEmailAddress == account[i].email) {
-        var mailKey = "Sent to : " + mailDetails.toEmailAddress + " " + mailDetails.subject.slice(0, 10);  // needs change : THINK
+        // EDITS 
+        var mailKey = "Sent to : " + mailDetails.toEmailAddress + " " + mailDetails.subject.slice(0, 10);  
         mailDetails = {
           from: mailDetails.fromEmailAddress,
           to: mailDetails.toEmailAddress,
diff --git a/email/validator.js b/email/validator.js
index b5c53a1a..91263a3a 100644
--- a/email/validator.js
+++ b/email/validator.js
@@ -1,8 +1,6 @@
-// Verify this with mentor
-// REF. https://github.com/nodemailer/nodemailer/issues/206
 
 module.exports = {
-    validate: async function (mailDetails) {
+    validate: function (mailDetails) {
         var reg = /^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/;
         if (reg.test(mailDetails.email) == false) {
             return false;
diff --git a/ui/components/controls/FrappeControl.vue b/ui/components/controls/FrappeControl.vue
index 8c868a44..9f67e594 100644
--- a/ui/components/controls/FrappeControl.vue
+++ b/ui/components/controls/FrappeControl.vue
@@ -4,7 +4,6 @@
         :docfield="docfield"
         :value="value"
         :onlyInput="onlyInput"
-        v-if="!docfield.hidden"
         @change="$emit('change', $event)"
     />
 </template>

From 640866aa525bc5db902b1b1666093311c2b41615 Mon Sep 17 00:00:00 2001
From: inishchith <inishchith@gmail.com>
Date: Fri, 13 Jul 2018 17:05:31 +0530
Subject: [PATCH 17/57]  update email module

---
 email/index.js     |  9 --------
 email/sender.js    | 53 ++++++++++++++++++++++++++++------------------
 email/validator.js | 20 ++---------------
 3 files changed, 34 insertions(+), 48 deletions(-)

diff --git a/email/index.js b/email/index.js
index 0b41db39..e7416bef 100644
--- a/email/index.js
+++ b/email/index.js
@@ -1,6 +1,5 @@
 const sender = require('./sender');
 const receiver = require('./receiver');
-const validator = require('./validator');
 const frappe = require('frappejs');
 
 module.exports = () => {
@@ -14,12 +13,4 @@ module.exports = () => {
         handler: receiver.sync
     });
 
-    frappe.registerMethod({
-        method: 'validate-mail',
-        handler: validator.validate
-    });
-    frappe.registerMethod({
-        method: 'validate-auth',
-        handler: validator.authValidate
-    });
 };
\ No newline at end of file
diff --git a/email/sender.js b/email/sender.js
index cef864f7..fadcedb5 100644
--- a/email/sender.js
+++ b/email/sender.js
@@ -1,32 +1,43 @@
 const nodemailer = require('nodemailer');
 const getConfig = require("./getConfig");
+const validator = require('./validator');
 
 module.exports = {
   'sendMail': async function (mailDetails) {
+    if(!validator.validate(mailDetails.fromEmailAddress)){
+      console.log("invalid from email");
+      return false;
+    }
+
     let account = await getConfig();
     for (var i = 0; i < account.length; i++) {
       if (mailDetails.fromEmailAddress == account[i].email) {
-        // EDITS 
-        var mailKey = "Sent to : " + mailDetails.toEmailAddress + " " + mailDetails.subject.slice(0, 10);  
-        mailDetails = {
-          from: mailDetails.fromEmailAddress,
-          to: mailDetails.toEmailAddress,
-          cc: mailDetails.ccEmailAddress,
-          bcc: mailDetails.bccEmailAddress,
-          subject: mailDetails.subject,
-          text: mailDetails.bodyText,
-        };
-        let transporter = nodemailer.createTransport({
-          service: 'gmail',
-          auth: {
-            user: account[i].email,
-            pass: account[i].password,
-          }
-        });
-        transporter.sendMail(mailDetails);
-        return mailKey;
+        if(validator.validate(mailDetails.toEmailAddress)){
+          mailDetails = {
+            from: mailDetails.fromEmailAddress,
+            to: mailDetails.toEmailAddress,
+            cc: mailDetails.ccEmailAddress,
+            bcc: mailDetails.bccEmailAddress,
+            subject: mailDetails.subject,
+            text: mailDetails.bodyText,
+          };
+          let transporter = nodemailer.createTransport({
+            service: 'gmail',
+            auth: {
+              user: account[i].email,
+              pass: account[i].password,
+            }
+          });
+          transporter.sendMail(mailDetails);
+          return true;
+        }
+        else{
+          console.log("Sender Email Invalid");
+          return false;
         }
       }
-  console.log(mailDetails.fromEmailAddress + " NOT FOUND IN RECORDS");
+    }
+    return false;
+    console.log(mailDetails.fromEmailAddress + " NOT FOUND IN RECORDS");
   }
-};
+};  
diff --git a/email/validator.js b/email/validator.js
index 91263a3a..00c8aa4a 100644
--- a/email/validator.js
+++ b/email/validator.js
@@ -1,25 +1,9 @@
-
 module.exports = {
-    validate: function (mailDetails) {
+    validate: function (email) {
         var reg = /^([A-Za-z0-9_\-\.])+\@([A-Za-z0-9_\-\.])+\.([A-Za-z]{2,4})$/;
-        if (reg.test(mailDetails.email) == false) {
+        if (reg.test(email) == false) {
             return false;
         }
         return true;
-    },
-    authValidate: async function (mailDetails) {
-        return new Promise((resolve,reject) => {
-            var Imap = require('imap');
-            var imap = new Imap({
-                user: mailDetails.email,
-                password: mailDetails.password,
-                host: mailDetails.imapHost,
-                port: mailDetails.imapPort,
-                tls: true
-            });
-            imap.once('ready',resolve);
-            imap.once('error',reject);
-            imap.connect();
-        })
     }
 }
\ No newline at end of file

From 8a1717d8c9e500b978b919b817738d247cc34db2 Mon Sep 17 00:00:00 2001
From: inishchith <inishchith@gmail.com>
Date: Fri, 13 Jul 2018 20:32:25 +0530
Subject: [PATCH 18/57]  Add Default Pull Email List

---
 email/receiver.js | 29 ++++++++++++++++++-----------
 1 file changed, 18 insertions(+), 11 deletions(-)

diff --git a/email/receiver.js b/email/receiver.js
index 1c91d12f..24c00f46 100644
--- a/email/receiver.js
+++ b/email/receiver.js
@@ -4,17 +4,24 @@ const Imap = require('imap');
 const getConfig = require("./getConfig");
 
 module.exports = {
-  sync: async () => {
+  sync: async (email) => {
     let account = await getConfig();
-    let emailSyncOption = account[0].emailSync;
-    var config = {
-      "user": account[0].email,
-      "password": account[0].password,
-      "host": account[0].imapHost,
-      "port": account[0].imapPort,
-      "tls": true,
-  };
-  var imap = new Imap(config);
+    var i ;
+    for (i = 0; i < account.length; i++) {
+      if (account[i].email == email.Id) {
+        break;
+      }
+    }
+    let emailSyncOption = account[i].emailSync;
+        var config = {
+          "user": account[i].email,
+          "password": account[i].password,
+          "host": account[i].imapHost,
+          "port": account[i].imapPort,
+          "tls": true,
+        }
+    var imap = new Imap(config);
+
     function openInbox(cb) {
       imap.openBox('INBOX', true, cb);
     }
@@ -24,7 +31,7 @@ module.exports = {
       openInbox(function (err, box) {
 
         if (err) throw err;
-        imap.search([emailSyncOption, ['SINCE', account[0].initialDate]], function (err, results) {
+        imap.search([emailSyncOption, ['SINCE', account[i].initialDate]], function (err, results) {
           if (err) throw err;
           var fetch = imap.fetch(results, {
             bodies: ''

From 6a9ce7e9e3621356c7cf8eee5a06d182909bd409 Mon Sep 17 00:00:00 2001
From: inishchith <inishchith@gmail.com>
Date: Fri, 13 Jul 2018 20:32:25 +0530
Subject: [PATCH 19/57]  Add Default Pull Email List

---
 email/receiver.js | 29 ++++++++++++++++++-----------
 models/index.js   |  2 +-
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/email/receiver.js b/email/receiver.js
index 1c91d12f..24c00f46 100644
--- a/email/receiver.js
+++ b/email/receiver.js
@@ -4,17 +4,24 @@ const Imap = require('imap');
 const getConfig = require("./getConfig");
 
 module.exports = {
-  sync: async () => {
+  sync: async (email) => {
     let account = await getConfig();
-    let emailSyncOption = account[0].emailSync;
-    var config = {
-      "user": account[0].email,
-      "password": account[0].password,
-      "host": account[0].imapHost,
-      "port": account[0].imapPort,
-      "tls": true,
-  };
-  var imap = new Imap(config);
+    var i ;
+    for (i = 0; i < account.length; i++) {
+      if (account[i].email == email.Id) {
+        break;
+      }
+    }
+    let emailSyncOption = account[i].emailSync;
+        var config = {
+          "user": account[i].email,
+          "password": account[i].password,
+          "host": account[i].imapHost,
+          "port": account[i].imapPort,
+          "tls": true,
+        }
+    var imap = new Imap(config);
+
     function openInbox(cb) {
       imap.openBox('INBOX', true, cb);
     }
@@ -24,7 +31,7 @@ module.exports = {
       openInbox(function (err, box) {
 
         if (err) throw err;
-        imap.search([emailSyncOption, ['SINCE', account[0].initialDate]], function (err, results) {
+        imap.search([emailSyncOption, ['SINCE', account[i].initialDate]], function (err, results) {
           if (err) throw err;
           var fetch = imap.fetch(results, {
             bodies: ''
diff --git a/models/index.js b/models/index.js
index 8c702d14..0040080f 100644
--- a/models/index.js
+++ b/models/index.js
@@ -11,6 +11,6 @@ module.exports = {
         SystemSettings: require('./doctype/SystemSettings/SystemSettings.js'),
         ToDo: require('./doctype/ToDo/ToDo.js'),
         User: require('./doctype/User/User.js'),
-        UserRole: require('./doctype/UserRole/UserRole.js'),
+        UserRole: require('./doctype/UserRole/UserRole.js')
     }
 }

From 1f7f6217cc765c5806884e396cdb6740b5a38ed8 Mon Sep 17 00:00:00 2001
From: inishchith <inishchith@gmail.com>
Date: Mon, 23 Jul 2018 23:37:18 +0530
Subject: [PATCH 20/57]  add sync param

---
 email/receiver.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/email/receiver.js b/email/receiver.js
index 24c00f46..856a3494 100644
--- a/email/receiver.js
+++ b/email/receiver.js
@@ -12,7 +12,6 @@ module.exports = {
         break;
       }
     }
-    let emailSyncOption = account[i].emailSync;
         var config = {
           "user": account[i].email,
           "password": account[i].password,
@@ -21,7 +20,6 @@ module.exports = {
           "tls": true,
         }
     var imap = new Imap(config);
-
     function openInbox(cb) {
       imap.openBox('INBOX', true, cb);
     }
@@ -31,7 +29,7 @@ module.exports = {
       openInbox(function (err, box) {
 
         if (err) throw err;
-        imap.search([emailSyncOption, ['SINCE', account[i].initialDate]], function (err, results) {
+        imap.search([email.syncOption, ['SINCE', account[i].initialDate]], function (err, results) {
           if (err) throw err;
           var fetch = imap.fetch(results, {
             bodies: ''

From 7afa6ad4a2b17a051af96c7efb41acb67b0adac3 Mon Sep 17 00:00:00 2001
From: inishchith <inishchith@gmail.com>
Date: Mon, 23 Jul 2018 23:37:18 +0530
Subject: [PATCH 21/57]  add sync param + reframe name

---
 email/receiver.js | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/email/receiver.js b/email/receiver.js
index 24c00f46..ae9ece10 100644
--- a/email/receiver.js
+++ b/email/receiver.js
@@ -12,7 +12,6 @@ module.exports = {
         break;
       }
     }
-    let emailSyncOption = account[i].emailSync;
         var config = {
           "user": account[i].email,
           "password": account[i].password,
@@ -21,7 +20,6 @@ module.exports = {
           "tls": true,
         }
     var imap = new Imap(config);
-
     function openInbox(cb) {
       imap.openBox('INBOX', true, cb);
     }
@@ -31,7 +29,7 @@ module.exports = {
       openInbox(function (err, box) {
 
         if (err) throw err;
-        imap.search([emailSyncOption, ['SINCE', account[i].initialDate]], function (err, results) {
+        imap.search([email.syncOption, ['SINCE', account[i].initialDate]], function (err, results) {
           if (err) throw err;
           var fetch = imap.fetch(results, {
             bodies: ''
@@ -43,8 +41,7 @@ module.exports = {
                 .then(async function (mail_object) {
                   await frappe.insert({
                     doctype: 'Email',
-                    // EDITS 
-                    name: "Received from : " + mail_object.to.value[0].address + " " + mail_object.subject.slice(0, 10), // needs change : THINK 
+                    name: mail_object.to.value[0].address + " " + mail_object.subject.slice(0, 10),
                     fromEmailAddress: mail_object.from.value[0].address,
                     toEmailAddress: mail_object.to.value[0].address,
                     ccEmailAddress: mail_object.cc,

From 7774756157e5abd3844b875f390b7a1a9391b4ae Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Thu, 9 Aug 2018 22:49:30 +0530
Subject: [PATCH 22/57] Fix bugs - Add mailparser to package.json - Add quotes
 around default value to prevent migration errors

---
 backends/sqlite.js          | 4 ++--
 package.json                | 1 +
 ui/components/Form/Form.vue | 3 ++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/backends/sqlite.js b/backends/sqlite.js
index a6438874..94cbb16f 100644
--- a/backends/sqlite.js
+++ b/backends/sqlite.js
@@ -59,7 +59,7 @@ module.exports = class sqliteDatabase extends Database {
     async runCreateTableQuery(doctype, columns, indexes) {
         const query = `CREATE TABLE IF NOT EXISTS ${doctype} (
             ${columns.join(", ")} ${indexes.length ? (", " + indexes.join(", ")) : ''})`;
-
+            
         return await this.run(query);
     }
 
@@ -79,7 +79,7 @@ module.exports = class sqliteDatabase extends Database {
             this.typeMap[field.fieldtype],
             field.fieldname === 'name' ? 'PRIMARY KEY NOT NULL' : '',
             field.required ? 'NOT NULL' : '',
-            field.default ? `DEFAULT ${field.default}` : ''
+            field.default ? `DEFAULT '${field.default}'` : ''
         ].join(' ');
 
         return def;
diff --git a/package.json b/package.json
index 5f69f834..5df5f599 100644
--- a/package.json
+++ b/package.json
@@ -36,6 +36,7 @@
     "jquery": "^3.3.1",
     "jwt-simple": "^0.5.1",
     "luxon": "^1.0.0",
+    "mailparser": "^2.3.2",
     "mkdirp": "^0.5.1",
     "morgan": "^1.9.0",
     "mysql": "^2.15.0",
diff --git a/ui/components/Form/Form.vue b/ui/components/Form/Form.vue
index e9ac15f0..2b24ac35 100644
--- a/ui/components/Form/Form.vue
+++ b/ui/components/Form/Form.vue
@@ -40,7 +40,8 @@ export default {
       notFound: false,
       invalid: false,
       invalidFields: [],
-      links: []
+      links: [],
+      doc: {}
     };
   },
   computed: {

From c7db36770a4f92a9ad24fbd5ee57575d0325fc02 Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Thu, 9 Aug 2018 23:03:54 +0530
Subject: [PATCH 23/57] Add filter and fields to getAll email account in
 receiver.js

---
 email/receiver.js | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/email/receiver.js b/email/receiver.js
index ae9ece10..d51fc9fe 100644
--- a/email/receiver.js
+++ b/email/receiver.js
@@ -1,24 +1,27 @@
 const frappe = require('frappejs');
 const simpleParser = require('mailparser').simpleParser;
 const Imap = require('imap');
-const getConfig = require("./getConfig");
 
 module.exports = {
-  sync: async (email) => {
-    let account = await getConfig();
-    var i ;
-    for (i = 0; i < account.length; i++) {
-      if (account[i].email == email.Id) {
-        break;
+  sync: async ({email, syncOption}) => {
+    // could be replaced with getDoc if account name is set same as email
+    let account = await frappe.db.getAll({
+      doctype: 'EmailAccount',
+      fields: ['email', 'password', 'imapHost', 'imapPort', 'initialDate'],
+      filters: {
+        email
       }
+    });
+    account = account[0]
+
+    var config = {
+      "user": account.email,
+      "password": account.password,
+      "host": account.imapHost,
+      "port": account.imapPort,
+      "tls": true,
     }
-        var config = {
-          "user": account[i].email,
-          "password": account[i].password,
-          "host": account[i].imapHost,
-          "port": account[i].imapPort,
-          "tls": true,
-        }
+
     var imap = new Imap(config);
     function openInbox(cb) {
       imap.openBox('INBOX', true, cb);
@@ -29,7 +32,7 @@ module.exports = {
       openInbox(function (err, box) {
 
         if (err) throw err;
-        imap.search([email.syncOption, ['SINCE', account[i].initialDate]], function (err, results) {
+        imap.search([syncOption, ['SINCE', account.initialDate]], function (err, results) {
           if (err) throw err;
           var fetch = imap.fetch(results, {
             bodies: ''
@@ -41,7 +44,6 @@ module.exports = {
                 .then(async function (mail_object) {
                   await frappe.insert({
                     doctype: 'Email',
-                    name: mail_object.to.value[0].address + " " + mail_object.subject.slice(0, 10),
                     fromEmailAddress: mail_object.from.value[0].address,
                     toEmailAddress: mail_object.to.value[0].address,
                     ccEmailAddress: mail_object.cc,
@@ -50,7 +52,7 @@ module.exports = {
                     subject: mail_object.subject,
                     bodyHtml: mail_object.html,
                     bodyText: mail_object.text,
-                    sent: "1",
+                    sent: 0,
                   });
                 })
                 .catch(function (err) {

From ed360ce87878462d806c4fc893407a4b078fc4fd Mon Sep 17 00:00:00 2001
From: Suraj Shetty <surajshetty3416@gmail.com>
Date: Fri, 10 Aug 2018 11:18:23 +0530
Subject: [PATCH 24/57] Emit event even if child element in listItem is clicked

---
 ui/components/List/ListItem.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ui/components/List/ListItem.vue b/ui/components/List/ListItem.vue
index b874b76f..0ab25bd0 100644
--- a/ui/components/List/ListItem.vue
+++ b/ui/components/List/ListItem.vue
@@ -1,6 +1,6 @@
 <template>
-    <div :class="classList" @click.self="$emit('clickItem')">
-        <div class="custom-control custom-checkbox d-flex">
+    <div :class="classList" @click="$emit('clickItem')">
+        <div @click.stop class="custom-control custom-checkbox d-flex">
             <input type="checkbox" class="custom-control-input" :id="id"
                 :value="isChecked" @change="$emit('checkItem', isChecked)"
             >

From 4bf89cfffecf80d2ae8a0193974be6b2f9e612a5 Mon Sep 17 00:00:00 2001
From: inishchith <inishchith@gmail.com>
Date: Thu, 23 Aug 2018 22:15:56 +0530
Subject: [PATCH 25/57]  revert to emailjs-imap

---
 email/receiver.js | 105 ++++++++++++++++++----------------------------
 1 file changed, 41 insertions(+), 64 deletions(-)

diff --git a/email/receiver.js b/email/receiver.js
index 11e62a53..d7247e30 100644
--- a/email/receiver.js
+++ b/email/receiver.js
@@ -1,6 +1,7 @@
+
 const frappe = require('frappejs');
+const ImapClient = require('emailjs-imap-client').default;
 const simpleParser = require('mailparser').simpleParser;
-const Imap = require('imap');
 
 module.exports = {
   sync: async ({
@@ -16,73 +17,49 @@ module.exports = {
       }
     });
     account = account[0];
-    var config = {
-      "user": account.email,
-      "password": account.password,
-      "host": account.imapHost,
-      "port": account.imapPort,
-      "tls": true,
-    }
-    var imap = new Imap(config);
-
-    function openInbox(cb) {
-      imap.openBox('INBOX', true, cb);
-    }
-    imap.once('ready', function () {
-
-      openInbox(function (err, box) {
-
-        if (err) throw err;
-        imap.search([syncOption, ['SINCE', account.initialDate]], function (err, results) {
-          if (err) throw err;
-          var fetch = imap.fetch(results, {
-            bodies: ''
-          });
-          fetch.on('message', function (msg, seqno) {
-            msg.on('body', function (stream, info) {
-
-              simpleParser(stream)
-                .then(async function (mail_object) {
-                  await frappe.insert({
-                    doctype: 'Email',
-                    name: mail_object.messageId,
-                    fromEmailAddress: mail_object.from.value[0].address,
-                    toEmailAddress: mail_object.to.value[0].address,
-                    ccEmailAddress: mail_object.cc,
-                    bccEmailAddress: mail_object.bcc,
-                    date: mail_object.date,
-                    subject: mail_object.subject,
-                    bodyHtml: mail_object.html,
-                    bodyText: mail_object.text,
-                    sent: 0,
-                  });
-                })
-                .catch(function (err) {
-                  console.log('An error occurred:', err.message);
-                });
-            });
-          });
-
-          fetch.once('error', function (err) {
-            console.log('Fetch error: ' + err);
-          });
+    const client = new ImapClient(account.imapHost, account.imapPort, {
+      useSecureTransport:true,
+      logLevel:'error',
+      auth: {
+        user: account.email,
+        pass: account.password
+      }
+    });
+    client.onerror = function (error) {console.log(error)};
 
-          fetch.once('end', function () {
-            console.log('Done fetching all messages!');
-            imap.end();
+    client.connect().then(() => {
+      client.listMessages('INBOX', '10:*', ['uid', 'flags', 'envelope', 'body[]']).then((messages) => {
+        messages.forEach((message) => {
+          simpleParser(message['body[]']).then(async function (parsed){
+            // message.envelope.from[0].name to DisplayName Field :TODO
+            // ccEmailAddress ,bccEmailAddress UNAVAILABLE : TODO
+            // save to , from in "," seperated and split at interface :TODO
+            await frappe.insert({
+              doctype: 'Email',
+              name: message.envelope['message-id'],
+              fromEmailAddress: message.envelope.from[0].address,
+              toEmailAddress: message.envelope.to[0].address,
+              //ccEmailAddress: message.envelope.cc[0].address,
+              //bccEmailAddress: message.envelope.bcc[0].address,
+              date: message.envelope.date,
+              subject: message.envelope.subject,
+              bodyHtml: parsed.html,
+              bodyText: parsed.text,
+              sent: 0,
+            })
+          }).catch(function (err) {
+            console.log('An error occurred:', err.message);
           });
         });
       });
     });
-
-    imap.once('error', function (err) {
-      console.log(err);
-    });
-
-    imap.once('end', function () {
-      console.log('Connection ended');
-    });
-
-    imap.connect();
+    function sleep(ms) {
+      return new Promise(resolve => setTimeout(resolve, ms));
+    }
+    async function demo() {
+      await sleep(5000);
+      client.close().then(() => { console.log("Done Fetching!. CLOSED CONNECTION") });
+    }
+    demo();  
   }
 }
\ No newline at end of file

From 9e4c3dfec2151aed2954c6e6cef118d08b297821 Mon Sep 17 00:00:00 2001
From: inishchith <inishchith@gmail.com>
Date: Thu, 6 Sep 2018 00:09:16 +0530
Subject: [PATCH 26/57]  add replying option

---
 backends/sqlite.js | 412 +++++++++++++++++++++------------------------
 email/sender.js    |   5 +
 2 files changed, 199 insertions(+), 218 deletions(-)

diff --git a/backends/sqlite.js b/backends/sqlite.js
index 6bc504a1..efc6786f 100644
--- a/backends/sqlite.js
+++ b/backends/sqlite.js
@@ -4,268 +4,244 @@ const Database = require('./database');
 const debug = false;
 
 module.exports = class sqliteDatabase extends Database {
-  constructor({ dbPath }) {
-    super();
-    this.dbPath = dbPath;
-  }
-
-  connect(dbPath) {
-    if (dbPath) {
-      this.dbPath = dbPath;
+    constructor({ dbPath }) {
+        super();
+        this.dbPath = dbPath;
     }
-    return new Promise(resolve => {
-      this.conn = new sqlite3.Database(this.dbPath, () => {
-        if (debug) {
-          this.conn.on('trace', (trace) => console.log(trace));
+
+    connect(dbPath) {
+        if (dbPath) {
+            this.dbPath = dbPath;
         }
-        this.run('PRAGMA foreign_keys=ON').then(resolve);
-      });
-    });
-  }
+        return new Promise(resolve => {
+            this.conn = new sqlite3.Database(this.dbPath, () => {
+                if (debug) {
+                    this.conn.on('trace', (trace) => console.log(trace));
+                }
+                this.run('PRAGMA foreign_keys=ON').then(resolve);
+            });
+        });
+    }
 
-  async tableExists(table) {
-    const name = await this.sql(`SELECT name FROM sqlite_master WHERE type='table' AND name='${table}'`);
-    return (name && name.length) ? true : false;
-  }
+    async tableExists(table) {
+        const name = await this.sql(`SELECT name FROM sqlite_master WHERE type='table' AND name='${table}'`);
+        return (name && name.length) ? true : false;
+    }
 
-  async addForeignKeys(doctype, newForeignKeys) {
-    await this.run('PRAGMA foreign_keys=OFF');
-    await this.run('BEGIN TRANSACTION');
+    async addForeignKeys(doctype, newForeignKeys) {
+        await this.run('PRAGMA foreign_keys=OFF');
+        await this.run('BEGIN TRANSACTION');
 
-    const tempName = 'TEMP' + doctype
+        const tempName = 'TEMP' + doctype
 
-    // create temp table
-    await this.createTable(doctype, tempName);
+        // create temp table
+        await this.createTable(doctype, tempName);
 
-    const columns = (await this.getTableColumns(tempName)).join(', ');
+        const columns = (await this.getTableColumns(tempName)).join(', ');
 
-    // copy from old to new table
-    await this.run(`INSERT INTO ${tempName} (${columns}) SELECT ${columns} from ${doctype}`);
+        // copy from old to new table
+        await this.run(`INSERT INTO ${tempName} (${columns}) SELECT ${columns} from ${doctype}`);
 
-    // drop old table
-    await this.run(`DROP TABLE ${doctype}`);
+        // drop old table
+        await this.run(`DROP TABLE ${doctype}`);
 
-    // rename new table
-    await this.run(`ALTER TABLE ${tempName} RENAME TO ${doctype}`);
+        // rename new table
+        await this.run(`ALTER TABLE ${tempName} RENAME TO ${doctype}`);
 
-    await this.run('COMMIT');
-    await this.run('PRAGMA foreign_keys=ON');
-  }
+        await this.run('COMMIT');
+        await this.run('PRAGMA foreign_keys=ON');
+    }
 
-  removeColumns() {
-    // pass
-  }
+    removeColumns() {
+        // pass
+    }
 
-  async runCreateTableQuery(doctype, columns, indexes) {
-    const query = `CREATE TABLE IF NOT EXISTS ${doctype} (
+    async runCreateTableQuery(doctype, columns, indexes) {
+        const query = `CREATE TABLE IF NOT EXISTS ${doctype} (
             ${columns.join(", ")} ${indexes.length ? (", " + indexes.join(", ")) : ''})`;
+            
+        return await this.run(query);
+    }
+
+    updateColumnDefinition(field, columns, indexes) {
+        let def = this.getColumnDefinition(field);
+
+        columns.push(def);
+
+        if (field.fieldtype==='Link' && field.target) {
+            indexes.push(`FOREIGN KEY (${field.fieldname}) REFERENCES ${field.target} ON UPDATE CASCADE ON DELETE RESTRICT`);
+        }
+    }
 
-    return await this.run(query);
-  }
+    getColumnDefinition(field) {
+        let def = [
+            field.fieldname,
+            this.typeMap[field.fieldtype],
+            field.fieldname === 'name' ? 'PRIMARY KEY NOT NULL' : '',
+            field.required ? 'NOT NULL' : '',
+            field.default ? `DEFAULT '${field.default}'` : ''
+        ].join(' ');
 
-  updateColumnDefinition(field, columns, indexes) {
-    let def = this.getColumnDefinition(field);
+        return def;
+    }
+
+    async getTableColumns(doctype) {
+        return (await this.sql(`PRAGMA table_info(${doctype})`)).map(d => d.name);
+    }
 
-    columns.push(def);
+    async getForeignKeys(doctype) {
+        return (await this.sql(`PRAGMA foreign_key_list(${doctype})`)).map(d => d.from);
+    }
 
-    if (field.fieldtype === 'Link' && field.target) {
-      indexes.push(`FOREIGN KEY (${field.fieldname}) REFERENCES ${field.target} ON UPDATE CASCADE ON DELETE RESTRICT`);
+    async runAddColumnQuery(doctype, field, values) {
+        await this.run(`ALTER TABLE ${doctype} ADD COLUMN ${this.getColumnDefinition(field)}`, values);
     }
-  }
-
-  getColumnDefinition(field) {
-    let def = [
-      field.fieldname,
-      this.typeMap[field.fieldtype],
-      field.fieldname === 'name' ? 'PRIMARY KEY NOT NULL' : '',
-      field.required ? 'NOT NULL' : '',
-      field.default ? `DEFAULT ${field.default}` : ''
-    ].join(' ');
-
-    return def;
-  }
-
-  async getTableColumns(doctype) {
-    return (await this.sql(`PRAGMA table_info(${doctype})`)).map(d => d.name);
-  }
-
-  async getForeignKeys(doctype) {
-    return (await this.sql(`PRAGMA foreign_key_list(${doctype})`)).map(d => d.from);
-  }
-
-  async runAddColumnQuery(doctype, field, values) {
-    await this.run(`ALTER TABLE ${doctype} ADD COLUMN ${this.getColumnDefinition(field)}`, values);
-  }
-
-  getOne(doctype, name, fields = '*') {
-    fields = this.prepareFields(fields);
-    return new Promise((resolve, reject) => {
-      this.conn.get(`select ${fields} from ${doctype}
+
+    getOne(doctype, name, fields = '*') {
+        fields = this.prepareFields(fields);
+        return new Promise((resolve, reject) => {
+            this.conn.get(`select ${fields} from ${doctype}
                 where name = ?`, name,
-        (err, row) => {
-          resolve(row || {});
+                (err, row) => {
+                    resolve(row || {});
+                });
         });
-    });
-  }
+    }
 
-  async insertOne(doctype, doc) {
-    let fields = this.getKeys(doctype);
-    let placeholders = fields.map(d => '?').join(', ');
+    async insertOne(doctype, doc) {
+        let fields = this.getKeys(doctype);
+        let placeholders = fields.map(d => '?').join(', ');
 
-    if (!doc.name) {
-      doc.name = frappe.getRandomString();
-    }
+        if (!doc.name) {
+            doc.name = frappe.getRandomString();
+        }
 
-    return await this.run(`insert into ${doctype}
+        return await this.run(`insert into ${doctype}
             (${fields.map(field => field.fieldname).join(", ")})
             values (${placeholders})`, this.getFormattedValues(fields, doc));
-  }
+    }
 
-  async updateOne(doctype, doc) {
-    let fields = this.getKeys(doctype);
-    let assigns = fields.map(field => `${field.fieldname} = ?`);
-    let values = this.getFormattedValues(fields, doc);
+    async updateOne(doctype, doc) {
+        let fields = this.getKeys(doctype);
+        let assigns = fields.map(field => `${field.fieldname} = ?`);
+        let values = this.getFormattedValues(fields, doc);
 
-    // additional name for where clause
-    values.push(doc.name);
+        // additional name for where clause
+        values.push(doc.name);
 
-    return await this.run(`update ${doctype}
+        return await this.run(`update ${doctype}
                 set ${assigns.join(", ")} where name=?`, values);
-  }
+    }
 
-  async runDeleteOtherChildren(field, added) {
-    // delete other children
-    // `delete from doctype where parent = ? and name not in (?, ?, ?)}`
-    await this.run(`delete from ${field.childtype}
+    async runDeleteOtherChildren(field, added) {
+        // delete other children
+        // `delete from doctype where parent = ? and name not in (?, ?, ?)}`
+        await this.run(`delete from ${field.childtype}
             where
                 parent = ? and
                 name not in (${added.slice(1).map(d => '?').join(', ')})`, added);
-  }
-
-  async deleteOne(doctype, name) {
-    return await this.run(`delete from ${doctype} where name=?`, name);
-  }
-
-  async deleteChildren(parenttype, parent) {
-    await this.run(`delete from ${parenttype} where parent=?`, parent);
-  }
-
-  async deleteSingleValues(name) {
-    await frappe.db.run('delete from SingleValue where parent=?', name)
-  }
-
-  async setValues(doctype, name, fieldValuePair) {
-    const meta = frappe.getMeta(doctype);
-    const validFields = this.getKeys(doctype);
-    const validFieldnames = validFields.map(df => df.fieldname);
-    const fieldsToUpdate = Object.keys(fieldValuePair)
-      .filter(fieldname => validFieldnames.includes(fieldname))
-
-    // assignment part of query
-    const assigns = fieldsToUpdate.map(fieldname => `${fieldname} = ?`);
-
-    // values
-    const values = fieldsToUpdate.map(fieldname => {
-      const field = meta.getField(fieldname);
-      const value = fieldValuePair[fieldname];
-      return this.getFormattedValue(field, value);
-    });
-
-    // additional name for where clause
-    values.push(name);
-
-    return await this.run(`update ${doctype}
-      set ${assigns.join(', ')} where name=?`, values);
-  }
-
-  getAll({ doctype, fields, filters, start, limit, orderBy = 'modified', groupBy, order = 'desc' } = {}) {
-    if (!fields) {
-      fields = frappe.getMeta(doctype).getKeywordFields();
     }
-    if (typeof fields === 'string') {
-      fields = [fields];
+
+    async deleteOne(doctype, name) {
+        return await this.run(`delete from ${doctype} where name=?`, name);
+    }
+
+    async deleteChildren(parenttype, parent) {
+        await this.run(`delete from ${parenttype} where parent=?`, parent);
+    }
+
+    async deleteSingleValues(name) {
+        await frappe.db.run('delete from SingleValue where parent=?', name)
     }
 
-    return new Promise((resolve, reject) => {
-      let conditions = this.getFilterConditions(filters);
-      let query = `select ${fields.join(", ")}
+    getAll({ doctype, fields, filters, start, limit, orderBy = 'modified', groupBy, order = 'desc' } = {}) {
+        if (!fields) {
+            fields = frappe.getMeta(doctype).getKeywordFields();
+        }
+        if (typeof fields === 'string') {
+            fields = [fields];
+        }
+
+        return new Promise((resolve, reject) => {
+            let conditions = this.getFilterConditions(filters);
+            let query = `select ${fields.join(", ")}
                 from ${doctype}
                 ${conditions.conditions ? "where" : ""} ${conditions.conditions}
                 ${groupBy ? ("group by " + groupBy.join(', ')) : ""}
                 ${orderBy ? ("order by " + orderBy) : ""} ${orderBy ? (order || "asc") : ""}
                 ${limit ? ("limit " + limit) : ""} ${start ? ("offset " + start) : ""}`;
 
-      this.conn.all(query, conditions.values,
-        (err, rows) => {
-          if (err) {
-            console.error(err);
-            reject(err);
-          } else {
-            resolve(rows);
-          }
+            this.conn.all(query, conditions.values,
+                (err, rows) => {
+                    if (err) {
+                        console.error(err);
+                        reject(err);
+                    } else {
+                        resolve(rows);
+                    }
+                });
         });
-    });
-  }
-
-  run(query, params) {
-    return new Promise((resolve, reject) => {
-      this.conn.run(query, params, (err) => {
-        if (err) {
-          reject(err);
-        } else {
-          resolve();
+    }
+
+    run(query, params) {
+        return new Promise((resolve, reject) => {
+            this.conn.run(query, params, (err) => {
+                if (err) {
+                    reject(err);
+                } else {
+                    resolve();
+                }
+            });
+        });
+    }
+
+    sql(query, params) {
+        return new Promise((resolve) => {
+            this.conn.all(query, params, (err, rows) => {
+                resolve(rows);
+            });
+        });
+    }
+
+    async commit() {
+        try {
+            await this.run('commit');
+        } catch (e) {
+            if (e.errno !== 1) {
+                throw e;
+            }
         }
-      });
-    });
-  }
-
-  sql(query, params) {
-    return new Promise((resolve) => {
-      this.conn.all(query, params, (err, rows) => {
-        resolve(rows);
-      });
-    });
-  }
-
-  async commit() {
-    try {
-      await this.run('commit');
-    } catch (e) {
-      if (e.errno !== 1) {
-        throw e;
-      }
     }
-  }
-
-  initTypeMap() {
-    this.typeMap = {
-      'Autocomplete': 'text'
-      , 'Currency': 'real'
-      , 'Int': 'integer'
-      , 'Float': 'real'
-      , 'Percent': 'real'
-      , 'Check': 'integer'
-      , 'Small Text': 'text'
-      , 'Long Text': 'text'
-      , 'Code': 'text'
-      , 'Text Editor': 'text'
-      , 'Date': 'text'
-      , 'Datetime': 'text'
-      , 'Time': 'text'
-      , 'Text': 'text'
-      , 'Data': 'text'
-      , 'Link': 'text'
-      , 'DynamicLink': 'text'
-      , 'Password': 'text'
-      , 'Select': 'text'
-      , 'Read Only': 'text'
-      , 'File': 'text'
-      , 'Attach': 'text'
-      , 'Attach Image': 'text'
-      , 'Signature': 'text'
-      , 'Color': 'text'
-      , 'Barcode': 'text'
-      , 'Geolocation': 'text'
+
+    initTypeMap() {
+        this.typeMap = {
+            'Autocomplete': 'text'
+            , 'Currency': 'real'
+            , 'Int': 'integer'
+            , 'Float': 'real'
+            , 'Percent': 'real'
+            , 'Check': 'integer'
+            , 'Small Text': 'text'
+            , 'Long Text': 'text'
+            , 'Code': 'text'
+            , 'Text Editor': 'text'
+            , 'Date': 'text'
+            , 'Datetime': 'text'
+            , 'Time': 'text'
+            , 'Text': 'text'
+            , 'Data': 'text'
+            , 'Link': 'text'
+            , 'DynamicLink': 'text'
+            , 'Password': 'text'
+            , 'Select': 'text'
+            , 'Read Only': 'text'
+            , 'File': 'text'
+            , 'Attach': 'text'
+            , 'Attach Image': 'text'
+            , 'Signature': 'text'
+            , 'Color': 'text'
+            , 'Barcode': 'text'
+            , 'Geolocation': 'text'
+        }
     }
-  }
-}
+}
\ No newline at end of file
diff --git a/email/sender.js b/email/sender.js
index 97563c67..d228fc3a 100644
--- a/email/sender.js
+++ b/email/sender.js
@@ -8,6 +8,7 @@ module.exports = {
       console.log("invalid from email");
       return false;
     }
+    //console.log(mailDetails);
 
     let account = await getConfig();
     for (var i = 0; i < account.length; i++) {
@@ -16,10 +17,14 @@ module.exports = {
           mailDetails = {
             from: mailDetails.fromEmailAddress,
             to: mailDetails.toEmailAddress,
+            replyTo:mailDetails.toEmailAddress,
+            inReplyTo:mailDetails.replyId,
+            references:[mailDetails.replyId],
             cc: mailDetails.ccEmailAddress,
             bcc: mailDetails.bccEmailAddress,
             subject: mailDetails.subject,
             text: mailDetails.bodyText,
+            //html:"",
           };
           let transporter = nodemailer.createTransport({
             service: 'gmail',

From 6c441802d54bf8dff87236647c1d7dcb57784b66 Mon Sep 17 00:00:00 2001
From: inishchith <inishchith@gmail.com>
Date: Sun, 16 Sep 2018 19:03:29 +0530
Subject: [PATCH 27/57]  fix error log Exists + orderBy Date

---
 backends/http.js  |  4 ++--
 email/receiver.js | 20 +++++++++++---------
 email/sender.js   | 11 ++++-------
 server/restAPI.js |  2 +-
 4 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/backends/http.js b/backends/http.js
index 9f190b0a..e6b2e97c 100644
--- a/backends/http.js
+++ b/backends/http.js
@@ -43,7 +43,7 @@ module.exports = class HTTPClient extends Observable {
     })
   }
 
-  async getAll({ doctype, fields, filters, start, limit, sortBy, order }) {
+  async getAll({ doctype, fields, filters, start, limit, orderBy, order }) {
     let url = this.getURL('/api/resource', doctype);
 
     url = url + '?' + frappe.getQueryString({
@@ -51,7 +51,7 @@ module.exports = class HTTPClient extends Observable {
       filters: JSON.stringify(filters),
       start: start,
       limit: limit,
-      sortBy: sortBy,
+      orderBy: orderBy,
       order: order
     });
 
diff --git a/email/receiver.js b/email/receiver.js
index a32bf30d..9fe0e61c 100644
--- a/email/receiver.js
+++ b/email/receiver.js
@@ -7,7 +7,6 @@ module.exports = {
     email,
     syncOption
   }) => {
-    // could be replaced with getDoc if account name is set same as email
     let account = await frappe.db.getAll({
       doctype: 'EmailAccount',
       fields: ['email', 'password', 'imapHost', 'imapPort', 'initialDate'],
@@ -35,19 +34,22 @@ module.exports = {
             // message.envelope.from[0].name to DisplayName Field :TODO
             // ccEmailAddress ,bccEmailAddress UNAVAILABLE : TODO
             // save to , from in "," seperated and split at interface :TODO
-            await frappe.insert({
+            var mailObject = {
               doctype: 'Email',
               name: message.envelope['message-id'],
               fromEmailAddress: message.envelope.from[0].address,
               toEmailAddress: message.envelope.to[0].address,
-              //ccEmailAddress: message.envelope.cc[0].address,
-              //bccEmailAddress: message.envelope.bcc[0].address,
-              date: message.envelope.date,
+              // ccEmailAddress: message.envelope.cc[0].address,
+              // bccEmailAddress: message.envelope.bcc[0].address,
+              date: new Date(message.envelope.date),
               subject: message.envelope.subject,
               bodyHtml: parsed.html,
               bodyText: parsed.text,
-              sent: 0,
-            })
+              sent: 0
+            }
+            if (await frappe.db.exists('Email', mailObject.name) == false) {
+              await frappe.insert(mailObject);
+            }
           }).catch(function (err) {
             console.log('An error occurred:', err.message);
           });
@@ -58,12 +60,12 @@ module.exports = {
     function sleep(ms) {
       return new Promise(resolve => setTimeout(resolve, ms));
     }
-    async function demo() {
+    async function wait() {
       await sleep(5000);
       client.close().then(() => {
         console.log("Done Fetching!. CLOSED CONNECTION")
       });
     }
-    demo();
+    wait();
   }
 }
\ No newline at end of file
diff --git a/email/sender.js b/email/sender.js
index d228fc3a..4a73d2bf 100644
--- a/email/sender.js
+++ b/email/sender.js
@@ -5,10 +5,9 @@ const validator = require('./validator');
 module.exports = {
   'sendMail': async function (mailDetails) {
     if (!validator.validate(mailDetails.fromEmailAddress)) {
-      console.log("invalid from email");
+      console.log("INVALID EMAIL");
       return false;
     }
-    //console.log(mailDetails);
 
     let account = await getConfig();
     for (var i = 0; i < account.length; i++) {
@@ -17,9 +16,9 @@ module.exports = {
           mailDetails = {
             from: mailDetails.fromEmailAddress,
             to: mailDetails.toEmailAddress,
-            replyTo:mailDetails.toEmailAddress,
-            inReplyTo:mailDetails.replyId,
-            references:[mailDetails.replyId],
+            replyTo: mailDetails.toEmailAddress,
+            inReplyTo: mailDetails.replyId,
+            references: [mailDetails.replyId],
             cc: mailDetails.ccEmailAddress,
             bcc: mailDetails.bccEmailAddress,
             subject: mailDetails.subject,
@@ -41,7 +40,5 @@ module.exports = {
         }
       }
     }
-    return false;
-    console.log(mailDetails.fromEmailAddress + " NOT FOUND IN RECORDS");
   }
 };
diff --git a/server/restAPI.js b/server/restAPI.js
index c0d35adc..cf99cb9a 100644
--- a/server/restAPI.js
+++ b/server/restAPI.js
@@ -18,7 +18,7 @@ module.exports = {
                 filters: request.query.filters,
                 start: request.query.start || 0,
                 limit: request.query.limit || 20,
-                order_by: request.query.order_by,
+                orderBy: request.query.orderBy,
                 order: request.query.order
             });
 

From e28f459408a2e6c49f6cf6da49c98884bbfff200 Mon Sep 17 00:00:00 2001
From: inishchith <inishchith@gmail.com>
Date: Sun, 16 Sep 2018 23:15:41 +0530
Subject: [PATCH 28/57]  update SENT & Received

---
 email/receiver.js | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/email/receiver.js b/email/receiver.js
index 9fe0e61c..05d14d3c 100644
--- a/email/receiver.js
+++ b/email/receiver.js
@@ -27,13 +27,26 @@ module.exports = {
       console.log(error)
     };
 
+    var MailBoxMap = {
+      "SENT": "[Gmail]/Sent Mail",
+      "INBOX": "INBOX", // TODO: FILTER to find only unseen
+      "STARRED": "[Gmail]/Starred", // REM
+    };
+
+    var sent = 0;
+    // FIX THIS
+    if (syncOption == "SENT") {
+      sent = 1;
+    }
+    console.log()
     client.connect().then(() => {
-      client.listMessages('INBOX', '10:*', ['uid', 'flags', 'envelope', 'body[]']).then((messages) => {
+      client.listMessages(MailBoxMap[syncOption], '1:*', ['uid', 'flags', 'envelope', 'body[]']).then((messages) => {
         messages.forEach((message) => {
           simpleParser(message['body[]']).then(async function (parsed) {
             // message.envelope.from[0].name to DisplayName Field :TODO
             // ccEmailAddress ,bccEmailAddress UNAVAILABLE : TODO
             // save to , from in "," seperated and split at interface :TODO
+
             var mailObject = {
               doctype: 'Email',
               name: message.envelope['message-id'],
@@ -45,7 +58,7 @@ module.exports = {
               subject: message.envelope.subject,
               bodyHtml: parsed.html,
               bodyText: parsed.text,
-              sent: 0
+              sent: sent
             }
             if (await frappe.db.exists('Email', mailObject.name) == false) {
               await frappe.insert(mailObject);

From 7a5713034e242bb1d0393beeae77ab97fe940e63 Mon Sep 17 00:00:00 2001
From: inishchith <inishchith@gmail.com>
Date: Sun, 7 Oct 2018 20:01:15 +0530
Subject: [PATCH 29/57]  ref. accounting tabs

---
 email/receiver.js | 16 ++++++++++++----
 email/sender.js   |  3 ++-
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/email/receiver.js b/email/receiver.js
index 05d14d3c..411bd0ef 100644
--- a/email/receiver.js
+++ b/email/receiver.js
@@ -31,14 +31,20 @@ module.exports = {
       "SENT": "[Gmail]/Sent Mail",
       "INBOX": "INBOX", // TODO: FILTER to find only unseen
       "STARRED": "[Gmail]/Starred", // REM
+      "DRAFT": "[Gmail]/Drafts",
+      "SPAM": "[Gmail]/Spam",
+      "TRASH": "[Gmail]/Trash"
     };
 
     var sent = 0;
+    var read = "Unseen";
     // FIX THIS
-    if (syncOption == "SENT") {
+    if (syncOption != "INBOX") {
       sent = 1;
+      read = "Seen";
     }
-    console.log()
+
+
     client.connect().then(() => {
       client.listMessages(MailBoxMap[syncOption], '1:*', ['uid', 'flags', 'envelope', 'body[]']).then((messages) => {
         messages.forEach((message) => {
@@ -49,7 +55,7 @@ module.exports = {
 
             var mailObject = {
               doctype: 'Email',
-              name: message.envelope['message-id'],
+              name: message.envelope['message-id'] + syncOption,
               fromEmailAddress: message.envelope.from[0].address,
               toEmailAddress: message.envelope.to[0].address,
               // ccEmailAddress: message.envelope.cc[0].address,
@@ -58,7 +64,9 @@ module.exports = {
               subject: message.envelope.subject,
               bodyHtml: parsed.html,
               bodyText: parsed.text,
-              sent: sent
+              sent: sent,
+              read: read,
+              syncOption: syncOption,
             }
             if (await frappe.db.exists('Email', mailObject.name) == false) {
               await frappe.insert(mailObject);
diff --git a/email/sender.js b/email/sender.js
index 4a73d2bf..c00d3ad8 100644
--- a/email/sender.js
+++ b/email/sender.js
@@ -23,7 +23,8 @@ module.exports = {
             bcc: mailDetails.bccEmailAddress,
             subject: mailDetails.subject,
             text: mailDetails.bodyText,
-            //html:"",
+            read: "Seen",
+            sent: 1,
           };
           let transporter = nodemailer.createTransport({
             service: 'gmail',

From 2614ff82300699e005a869af9a1968ceb10b9764 Mon Sep 17 00:00:00 2001
From: sahil28297 <37302950+sahil28297@users.noreply.github.com>
Date: Wed, 10 Oct 2018 15:24:33 +0530
Subject: [PATCH 30/57] Removed Redundant files from client folder (#99)

* Removed redundant files from client folder

* removed console statement
---
 client/components/baseComponent.js   |  43 ----
 client/components/tree/index.html    |  11 -
 client/components/tree/index.js      |  19 --
 client/components/tree/treeNode.html |  58 -----
 client/components/tree/treeNode.js   |  94 --------
 client/desk/formmodal.js             |  47 ----
 client/desk/formpage.js              |  48 ----
 client/desk/index.js                 | 181 ---------------
 client/desk/listpage.js              |  41 ----
 client/desk/menu.js                  |  41 ----
 client/desk/navbar.js                |  40 ----
 client/desk/printpage.js             |  48 ----
 client/desk/reportpage.js            | 105 ---------
 client/desk/search.js                |  16 --
 client/desk/tablepage.js             |  71 ------
 client/desk/treepage.js              |  31 ---
 client/electron.js                   |  34 ---
 client/index.js                      |  52 -----
 client/pdf.js                        |  30 ---
 client/style/datatable.scss          |  34 ---
 client/style/indicators.scss         |  68 ------
 client/style/style.scss              | 278 ----------------------
 client/style/tree.scss               |   9 -
 client/style/variables.scss          |   8 -
 client/ui/dropdown.js                |  54 -----
 client/ui/index.js                   | 145 ------------
 client/ui/keyboard.js                |  40 ----
 client/ui/modal.js                   |  79 -------
 client/ui/modelTable.js              | 134 -----------
 client/view/controls/autocomplete.js |  33 ---
 client/view/controls/base.js         | 206 ----------------
 client/view/controls/check.js        |  38 ---
 client/view/controls/code.js         |  35 ---
 client/view/controls/currency.js     |  13 --
 client/view/controls/data.js         |  14 --
 client/view/controls/date.js         |  40 ----
 client/view/controls/dynamicLink.js  |   9 -
 client/view/controls/file.js         |  53 -----
 client/view/controls/float.js        |  20 --
 client/view/controls/index.js        |  28 ---
 client/view/controls/int.js          |  10 -
 client/view/controls/link.js         |  73 ------
 client/view/controls/password.js     |  10 -
 client/view/controls/select.js       |  52 -----
 client/view/controls/table.js        | 100 --------
 client/view/controls/text.js         |  14 --
 client/view/form.js                  | 336 ---------------------------
 client/view/formLayout.js            | 109 ---------
 client/view/index.js                 |  16 --
 client/view/list.js                  | 319 -------------------------
 client/view/page.js                  | 100 --------
 client/view/tree.js                  | 180 --------------
 52 files changed, 3667 deletions(-)
 delete mode 100644 client/components/baseComponent.js
 delete mode 100644 client/components/tree/index.html
 delete mode 100644 client/components/tree/index.js
 delete mode 100644 client/components/tree/treeNode.html
 delete mode 100644 client/components/tree/treeNode.js
 delete mode 100644 client/desk/formmodal.js
 delete mode 100644 client/desk/formpage.js
 delete mode 100644 client/desk/index.js
 delete mode 100644 client/desk/listpage.js
 delete mode 100644 client/desk/menu.js
 delete mode 100644 client/desk/navbar.js
 delete mode 100644 client/desk/printpage.js
 delete mode 100644 client/desk/reportpage.js
 delete mode 100644 client/desk/search.js
 delete mode 100644 client/desk/tablepage.js
 delete mode 100644 client/desk/treepage.js
 delete mode 100644 client/electron.js
 delete mode 100644 client/index.js
 delete mode 100644 client/pdf.js
 delete mode 100644 client/style/datatable.scss
 delete mode 100644 client/style/indicators.scss
 delete mode 100644 client/style/style.scss
 delete mode 100644 client/style/tree.scss
 delete mode 100644 client/style/variables.scss
 delete mode 100644 client/ui/dropdown.js
 delete mode 100644 client/ui/index.js
 delete mode 100644 client/ui/keyboard.js
 delete mode 100644 client/ui/modal.js
 delete mode 100644 client/ui/modelTable.js
 delete mode 100644 client/view/controls/autocomplete.js
 delete mode 100644 client/view/controls/base.js
 delete mode 100644 client/view/controls/check.js
 delete mode 100644 client/view/controls/code.js
 delete mode 100644 client/view/controls/currency.js
 delete mode 100644 client/view/controls/data.js
 delete mode 100644 client/view/controls/date.js
 delete mode 100644 client/view/controls/dynamicLink.js
 delete mode 100644 client/view/controls/file.js
 delete mode 100644 client/view/controls/float.js
 delete mode 100644 client/view/controls/index.js
 delete mode 100644 client/view/controls/int.js
 delete mode 100644 client/view/controls/link.js
 delete mode 100644 client/view/controls/password.js
 delete mode 100644 client/view/controls/select.js
 delete mode 100644 client/view/controls/table.js
 delete mode 100644 client/view/controls/text.js
 delete mode 100644 client/view/form.js
 delete mode 100644 client/view/formLayout.js
 delete mode 100644 client/view/index.js
 delete mode 100644 client/view/list.js
 delete mode 100644 client/view/page.js
 delete mode 100644 client/view/tree.js

diff --git a/client/components/baseComponent.js b/client/components/baseComponent.js
deleted file mode 100644
index 0b90ea65..00000000
--- a/client/components/baseComponent.js
+++ /dev/null
@@ -1,43 +0,0 @@
-let templates = {};
-
-class BaseComponent extends HTMLElement {
-    constructor(name) {
-        super();
-
-        this._name = name;
-        this._shadowRoot = this.attachShadow({ mode: 'open' });
-
-        if (!templates[name]) {
-            makeTemplate(name, this.templateHTML);
-        }
-
-        let template = getTemplate(name);
-        this._shadowRoot.appendChild(template);
-    }
-
-    triggerEvent(eventName, detail = {}) {
-        const event = new CustomEvent(eventName, {
-            bubbles: true,
-            composed: true,
-            detail
-        });
-        this.dispatchEvent(event);
-    }
-}
-
-
-function makeTemplate(name, html) {
-    if (!templates[name]) {
-        let template = document.createElement('template');
-        template.id = name;
-        template.innerHTML = html;
-
-        templates[name] = template;
-    }
-}
-
-function getTemplate(name) {
-    return templates[name].content.cloneNode(true);
-}
-
-module.exports = BaseComponent;
diff --git a/client/components/tree/index.html b/client/components/tree/index.html
deleted file mode 100644
index 17957bc7..00000000
--- a/client/components/tree/index.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- styles -->
-<style>
-    :host {
-        display: block;
-    }
-</style>
-
-<!-- template -->
-<div class="tree">
-    <slot></slot>
-</div>
diff --git a/client/components/tree/index.js b/client/components/tree/index.js
deleted file mode 100644
index 1f2d2e31..00000000
--- a/client/components/tree/index.js
+++ /dev/null
@@ -1,19 +0,0 @@
-const BaseComponent = require('../baseComponent');
-const TreeNode = require('./treeNode');
-
-class Tree extends BaseComponent {
-    get templateHTML() {
-        return require('./index.html');
-    }
-
-    constructor() {
-        super('Tree');
-    }
-}
-
-window.customElements.define('f-tree', Tree);
-
-module.exports = {
-    Tree,
-    TreeNode
-}
diff --git a/client/components/tree/treeNode.html b/client/components/tree/treeNode.html
deleted file mode 100644
index c8435088..00000000
--- a/client/components/tree/treeNode.html
+++ /dev/null
@@ -1,58 +0,0 @@
-<!-- styles -->
-<style>
-    :host {
-        display: block;
-    }
-
-    .tree-node {
-        display: flex;
-        align-items: center;
-    }
-
-    .tree-node:hover {
-        background-color: gray;
-        background-color: var(--tree-node-hover);
-        cursor: pointer;
-    }
-
-    .tree-node:hover .tree-node-actions {
-        display: block;
-    }
-
-    .tree-node-content {
-        display: flex;
-        align-items: center;
-    }
-
-    .tree-node-actions {
-        display: none;
-        margin-left: 2rem;
-    }
-
-    .tree-node-icon {
-        width: 2rem;
-        height: 2rem;
-    }
-
-    .tree-node-icon svg {
-        padding: 0.5rem;
-    }
-
-    .tree-node-children {
-        padding-left: 2rem;
-    }
-</style>
-
-<!-- template -->
-<div class="tree-node">
-    <div class="tree-node-content">
-        <div class="tree-node-icon"></div>
-        <div class="tree-node-label"></div>
-    </div>
-    <div class="tree-node-actions">
-        <slot name="actions"></slot>
-    </div>
-</div>
-<div class="tree-node-children">
-    <slot></slot>
-</div>
\ No newline at end of file
diff --git a/client/components/tree/treeNode.js b/client/components/tree/treeNode.js
deleted file mode 100644
index 7e56903f..00000000
--- a/client/components/tree/treeNode.js
+++ /dev/null
@@ -1,94 +0,0 @@
-const octicons = require('octicons');
-const BaseComponent = require('../baseComponent');
-
-const iconSet = {
-    open: octicons["triangle-down"].toSVG({ width: "12", height: "12", "class": "tree-icon-open" }),
-    close: octicons["triangle-right"].toSVG({ width: "12", height: "12", "class": "tree-icon-closed" })
-};
-
-class TreeNode extends BaseComponent {
-    static get observedAttributes() {
-        return ['label', 'expanded'];
-    }
-
-    get templateHTML() {
-        return require('./treeNode.html');
-    }
-
-    constructor() {
-        super('TreeNode');
-
-        let shadowRoot = this._shadowRoot;
-        this.iconEl = shadowRoot.querySelector('.tree-node-icon');
-        this.labelEl = shadowRoot.querySelector('.tree-node-label');
-        this.actionsEl = shadowRoot.querySelector('.tree-node-actions');
-        this.childrenEl = shadowRoot.querySelector('.tree-node-children');
-
-        this.addEventListener('click', e => {
-            e.stopImmediatePropagation();
-
-            if (e.target.matches('[slot="actions"]')) {
-                this.triggerEvent('tree-node-action', {
-                    actionEl: e.target
-                });
-                return;
-            }
-
-            if (this.expanded) {
-                this.removeAttribute('expanded');
-            } else {
-                this.setAttribute('expanded', '');
-            }
-        });
-        this.onExpand();
-    }
-
-    attributeChangedCallback(name, oldValue, newValue) {
-        switch(name) {
-            case 'label': {
-                this.labelEl.innerHTML = newValue || '';
-                break;
-            }
-
-            case 'expanded': {
-                const isExpanded = this.hasAttribute('expanded');
-                this.onExpand(isExpanded);
-                break;
-            }
-
-            default: break;
-        }
-    }
-
-    onExpand(isExpanded = false) {
-        if (this.isLeaf) return;
-
-        if (isExpanded) {
-            this.iconEl.innerHTML = iconSet.open;
-            this.childrenEl.style.display = '';
-        } else {
-            this.iconEl.innerHTML = iconSet.close;
-            this.childrenEl.style.display = 'none';
-        }
-
-        this.triggerEvent('tree-node-expand', {
-            expanded: isExpanded
-        });
-    }
-
-    get isRoot() {
-        return this.hasAttribute('is-root');
-    }
-
-    get expanded() {
-        return this.hasAttribute('expanded');
-    }
-
-    get isLeaf() {
-        return this.hasAttribute('is-leaf');
-    }
-}
-
-window.customElements.define('f-tree-node', TreeNode);
-
-module.exports = TreeNode;
\ No newline at end of file
diff --git a/client/desk/formmodal.js b/client/desk/formmodal.js
deleted file mode 100644
index ed2883a7..00000000
--- a/client/desk/formmodal.js
+++ /dev/null
@@ -1,47 +0,0 @@
-const Modal = require('frappejs/client/ui/modal');
-const view = require('frappejs/client/view');
-
-module.exports = class FormModal extends Modal {
-    constructor(doctype, name) {
-        super({title: doctype});
-        this.doctype = doctype;
-    }
-
-    async showWith(doctype, name) {
-        if (!name) name = doctype;
-        this.show();
-        await this.setDoc(doctype, name);
-    }
-
-    async setDoc(doctype, name) {
-        if (!this.form) {
-            this.makeForm();
-        }
-        await this.form.setDoc(doctype, name);
-        let input = this.modal.querySelector('input') || this.modal.querySelector('select');
-        input && input.focus();
-    }
-
-    makeForm() {
-        this.form = new (view.getFormClass(this.doctype))({
-            doctype: this.doctype,
-            parent: this.getBody(),
-            container: this,
-            actions: ['save']
-        });
-
-        this.form.on('save', async () => {
-            await this.trigger('save');
-            this.hide();
-        });
-    }
-
-    addButton(label, className, action) {
-        if (className === 'primary') {
-            return this.addPrimary(label, action).get(0);
-        } else {
-            return this.addSecondary(label, action).get(0);
-        }
-    }
-
-}
diff --git a/client/desk/formpage.js b/client/desk/formpage.js
deleted file mode 100644
index 58db93f8..00000000
--- a/client/desk/formpage.js
+++ /dev/null
@@ -1,48 +0,0 @@
-const Page = require('frappejs/client/view/page');
-const view = require('frappejs/client/view');
-const frappe = require('frappejs');
-
-module.exports = class FormPage extends Page {
-    constructor(doctype) {
-        let meta = frappe.getMeta(doctype);
-        super({title: `Edit ${meta.name}`, hasRoute: true});
-        this.wrapper.classList.add('page-form');
-        this.meta = meta;
-        this.doctype = doctype;
-
-        this.form = new (view.getFormClass(doctype))({
-            doctype: doctype,
-            parent: this.body,
-            container: this,
-            actions: ['save', 'delete', 'duplicate', 'settings', 'print']
-        });
-
-        if (this.meta.pageSettings && this.meta.pageSettings.hideTitle) {
-            this.titleElement.classList.add('hide');
-        }
-
-        // if name is different after saving, change the route
-        this.form.on('save', async (params) => {
-            let route = frappe.router.getRoute();
-            if (this.form.doc.name && !(route && route[2] === this.form.doc.name)) {
-                await frappe.router.setRoute('edit', this.form.doc.doctype, this.form.doc.name);
-                frappe.ui.showAlert({message: 'Added', color: 'green'});
-            }
-        });
-
-        this.form.on('delete', async (params) => {
-            this.hide();
-            await frappe.router.setRoute('list', this.form.doctype);
-        });
-    }
-
-    async show(params) {
-        super.show();
-        try {
-            await this.form.setDoc(params.doctype, params.name);
-            frappe.desk.setActiveDoc(this.form.doc);
-        } catch (e) {
-            this.renderError(e.statusCode, e.message);
-        }
-    }
-}
diff --git a/client/desk/index.js b/client/desk/index.js
deleted file mode 100644
index a4761a3d..00000000
--- a/client/desk/index.js
+++ /dev/null
@@ -1,181 +0,0 @@
-const frappe = require('frappejs');
-// const Search = require('./search');
-const Router = require('frappejs/common/router');
-const Page = require('frappejs/client/view/page');
-
-const views = {};
-views.Form = require('./formpage');
-views.List = require('./listpage');
-views.Tree = require('./treepage');
-views.Print = require('./printpage');
-views.FormModal = require('./formmodal');
-views.Table = require('./tablepage');
-const DeskMenu = require('./menu');
-
-module.exports = class Desk {
-    constructor(columns=2) {
-        frappe.router = new Router();
-        frappe.router.listen();
-
-        let body = document.querySelector('body');
-        //this.navbar = new Navbar();
-        frappe.ui.empty(body);
-        this.container = frappe.ui.add('div', '', body);
-        this.containerRow = frappe.ui.add('div', 'row no-gutters', this.container)
-        this.makeColumns(columns);
-
-        this.pages = {
-            formModals: {},
-            List: {}
-        };
-
-        this.routeItems = {};
-
-        this.initRoutes();
-        // this.search = new Search(this.nav);
-    }
-
-    makeColumns(columns) {
-        this.menu = null; this.center = null;
-        this.columnCount = columns;
-        if (columns === 3) {
-            this.makeMenu();
-            this.center = frappe.ui.add('div', 'col-md-4 desk-center', this.containerRow);
-            this.body = frappe.ui.add('div', 'col-md-6 desk-body', this.containerRow);
-        } else if (columns === 2) {
-            this.makeMenu();
-            this.body = frappe.ui.add('div', 'col-md-10 desk-body', this.containerRow);
-        } else if (columns === 1) {
-            this.makeMenuPage();
-            this.body = frappe.ui.add('div', 'col-md-12 desk-body', this.containerRow);
-        } else {
-            throw 'columns can be 1, 2 or 3'
-        }
-    }
-
-    makeMenu() {
-        this.menuColumn = frappe.ui.add('div', 'col-md-2 desk-menu', this.containerRow);
-        this.menu = new DeskMenu(this.menuColumn);
-    }
-
-    makeMenuPage() {
-        // make menu page for 1 column layout
-        this.menuPage = null;
-    }
-
-    initRoutes() {
-        frappe.router.add('not-found', async (params) => {
-            if (!this.notFoundPage) {
-                this.notFoundPage = new Page({title: 'Not Found'});
-            }
-            await this.notFoundPage.show();
-            this.notFoundPage.renderError('Not Found', params ? params.route : '');
-        })
-
-        frappe.router.add('list/:doctype', async (params) => {
-            await this.showViewPage('List', params.doctype);
-        });
-
-        frappe.router.add('tree/:doctype', async (params) => {
-            await this.showViewPage('Tree', params.doctype);
-        });
-
-        frappe.router.add('table/:doctype', async (params) => {
-            await this.showViewPage('Table', params.doctype, params);
-        })
-
-        frappe.router.add('edit/:doctype/:name', async (params) => {
-            await this.showViewPage('Form', params.doctype, params);
-        })
-
-        frappe.router.add('print/:doctype/:name', async (params) => {
-            await this.showViewPage('Print', params.doctype, params);
-        })
-
-        frappe.router.add('new/:doctype', async (params) => {
-            let doc = await frappe.getNewDoc(params.doctype);
-            // unset the name, its local
-            await frappe.router.setRoute('edit', doc.doctype, doc.name);
-
-            // focus on new page
-            frappe.desk.body.activePage.body.querySelector('input').focus();
-        });
-
-        frappe.router.on('change', () => {
-            if (this.menu) {
-                this.menu.setActive();
-            }
-        })
-    }
-
-    toggleCenter(show) {
-        const current = !frappe.desk.center.classList.contains('hide');
-        if (show===undefined) {
-            show = current;
-        } else if (!!show===!!current) {
-            // no change
-            return;
-        }
-
-        // add hide
-        frappe.desk.center.classList.toggle('hide', !show);
-
-        if (show) {
-            // set body to 6
-            frappe.desk.body.classList.toggle('col-md-6', true);
-            frappe.desk.body.classList.toggle('col-md-10', false);
-        } else {
-            // set body to 10
-            frappe.desk.body.classList.toggle('col-md-6', false);
-            frappe.desk.body.classList.toggle('col-md-10', true);
-        }
-    }
-
-    async showViewPage(view, doctype, params) {
-        if (!params) params = doctype;
-        if (!this.pages[view]) this.pages[view] = {};
-        if (!this.pages[view][doctype]) this.pages[view][doctype] = new views[view](doctype);
-        const page = this.pages[view][doctype];
-        await page.show(params);
-    }
-
-    async showFormModal(doctype, name) {
-        if (!this.pages.formModals[doctype]) {
-            this.pages.formModals[doctype] = new views.FormModal(doctype);
-        }
-        await this.pages.formModals[doctype].showWith(doctype, name);
-        return this.pages.formModals[doctype];
-    }
-
-    async setActiveDoc(doc) {
-        this.activeDoc = doc;
-        if (frappe.desk.center && !frappe.desk.center.activePage) {
-            await frappe.desk.showViewPage('List', doc.doctype);
-        }
-        if (frappe.desk.pages.List[doc.doctype]) {
-            frappe.desk.pages.List[doc.doctype].list.setActiveListRow(doc.name);
-        }
-    }
-
-    setActive(item) {
-        let className = 'list-group-item-secondary';
-        let activeItem = this.sidebarList.querySelector('.' + className);
-        if (activeItem) {
-            activeItem.classList.remove(className);
-        }
-        item.classList.add(className);
-    }
-
-    addSidebarItem(label, action) {
-        let item = frappe.ui.add('a', 'list-group-item list-group-item-action', this.sidebarList, label);
-        if (typeof action === 'string') {
-            item.href = action;
-            this.routeItems[action] = item;
-        } else {
-            item.addEventHandler('click', () => {
-                action();
-                this.setActive(item);
-            });
-        }
-    }
-}
\ No newline at end of file
diff --git a/client/desk/listpage.js b/client/desk/listpage.js
deleted file mode 100644
index ba9116be..00000000
--- a/client/desk/listpage.js
+++ /dev/null
@@ -1,41 +0,0 @@
-const frappe = require('frappejs');
-const Page = require('frappejs/client/view/page');
-const view = require('frappejs/client/view');
-
-module.exports = class ListPage extends Page {
-    constructor(name) {
-
-        // if center column is present, list does not have its route
-        const hasRoute = frappe.desk.center ? false : true;
-
-        super({
-            title: frappe._("List"),
-            parent: hasRoute ? frappe.desk.body : frappe.desk.center,
-            hasRoute: hasRoute
-        });
-
-        this.name = name;
-
-        this.list = new (view.getListClass(name))({
-            doctype: name,
-            parent: this.body,
-            page: this
-        });
-
-        frappe.docs.on('change', (params) => {
-            if (params.doc.doctype === this.list.meta.name) {
-                this.list.refreshRow(params.doc);
-            }
-        });
-    }
-
-    async show(params) {
-        super.show();
-
-        this.setTitle(this.name===this.list.meta.name ? (this.list.meta.label || this.list.meta.name) : this.name);
-        if (frappe.desk.body.activePage && frappe.router.getRoute()[0]==='list') {
-            frappe.desk.body.activePage.hide();
-        }
-        await this.list.refresh();
-    }
-}
diff --git a/client/desk/menu.js b/client/desk/menu.js
deleted file mode 100644
index a9514101..00000000
--- a/client/desk/menu.js
+++ /dev/null
@@ -1,41 +0,0 @@
-const frappe = require('frappejs');
-
-module.exports = class DeskMenu {
-    constructor(parent) {
-        this.parent = parent;
-        this.routeItems = {};
-        this.make();
-    }
-
-    make() {
-        this.listGroup = frappe.ui.add('div', 'list-body', this.parent);
-    }
-
-    addItem(label, action) {
-        let item = frappe.ui.add('div', 'list-row', this.listGroup, label);
-        if (typeof action === 'string') {
-            this.routeItems[action] = item;
-        }
-        item.addEventListener('click', async () => {
-            if (typeof action === 'string') {
-                await frappe.router.setRoute(action);
-            } else {
-                action();
-            }
-            this.setActive(item);
-        });
-    }
-
-    setActive() {
-        if (this.routeItems[window.location.hash]) {
-            let item = this.routeItems[window.location.hash];
-            let className = 'active';
-            let activeItem = this.listGroup.querySelector('.' + className);
-
-            if (activeItem) {
-                activeItem.classList.remove(className);
-            }
-            item.classList.add(className);
-        }
-    }
-}
\ No newline at end of file
diff --git a/client/desk/navbar.js b/client/desk/navbar.js
deleted file mode 100644
index fdef52e8..00000000
--- a/client/desk/navbar.js
+++ /dev/null
@@ -1,40 +0,0 @@
-const frappe = require('frappejs');
-
-module.exports = class Navbar {
-    constructor({brand_label = 'Home'} = {}) {
-        Object.assign(this, arguments[0]);
-        this.items = {};
-        this.navbar = frappe.ui.add('div', 'navbar navbar-expand-md border-bottom navbar-dark bg-dark', document.querySelector('body'));
-
-        this.brand = frappe.ui.add('a', 'navbar-brand', this.navbar, brand_label);
-        this.brand.href = '#';
-
-        this.toggler = frappe.ui.add('button', 'navbar-toggler', this.navbar);
-        this.toggler.setAttribute('type', 'button');
-        this.toggler.setAttribute('data-toggle', 'collapse');
-        this.toggler.setAttribute('data-target', 'desk-navbar');
-        this.toggler.innerHTML = `<span class="navbar-toggler-icon"></span>`;
-
-        this.navbar_collapse = frappe.ui.add('div', 'collapse navbar-collapse', this.navbar);
-        this.navbar_collapse.setAttribute('id', 'desk-navbar');
-
-        this.nav = frappe.ui.add('ul', 'navbar-nav mr-auto', this.navbar_collapse);
-    }
-
-    addItem(label, route) {
-        let item = frappe.ui.add('li', 'nav-item', this.nav);
-        item.link = frappe.ui.add('a', 'nav-link', item, label);
-        item.link.href = route;
-        this.items[label] = item;
-        return item;
-    }
-
-    add_dropdown(label) {
-
-    }
-
-    add_search() {
-        let form = frappe.ui.add('form', 'form-inline my-2 my-md-0', this.nav);
-
-    }
-}
\ No newline at end of file
diff --git a/client/desk/printpage.js b/client/desk/printpage.js
deleted file mode 100644
index 820590fe..00000000
--- a/client/desk/printpage.js
+++ /dev/null
@@ -1,48 +0,0 @@
-const frappe = require('frappejs');
-const Page = require('frappejs/client/view/page');
-const { getHTML } = require('frappejs/common/print');
-const nunjucks = require('nunjucks/browser/nunjucks');
-
-nunjucks.configure({ autoescape: false });
-
-module.exports = class PrintPage extends Page {
-    constructor(doctype) {
-        let meta = frappe.getMeta(doctype);
-        super({title: `${meta.name}`, hasRoute: true});
-        this.meta = meta;
-        this.doctype = doctype;
-        this.titleElement.classList.add('hide');
-
-        this.addButton(frappe._('Edit'), 'primary', () => {
-            frappe.router.setRoute('edit', this.doctype, this.name)
-        });
-
-        this.addButton(frappe._('PDF'), 'secondary', async () => {
-            frappe.getPDF(this.doctype, this.name);
-        });
-    }
-
-    async show(params) {
-        super.show();
-        this.name = params.name;
-        if (this.meta.print) {
-            // render
-            this.renderTemplate();
-        } else {
-            this.renderError('No Print Settings');
-        }
-    }
-
-    async renderTemplate() {
-        let doc = await frappe.getDoc(this.doctype, this.name);
-        frappe.desk.setActiveDoc(doc);
-        const html = await getHTML(this.doctype, this.name);
-        try {
-            this.body.innerHTML = html;
-            // this.setTitle(doc.name);
-        } catch (e) {
-            this.renderError('Template Error', e);
-            throw e;
-        }
-    }
-}
diff --git a/client/desk/reportpage.js b/client/desk/reportpage.js
deleted file mode 100644
index b2bf3605..00000000
--- a/client/desk/reportpage.js
+++ /dev/null
@@ -1,105 +0,0 @@
-const Page = require('frappejs/client/view/page');
-const FormLayout = require('frappejs/client/view/formLayout');
-const DataTable = require('frappe-datatable');
-const frappe = require('frappejs');
-const utils = require('frappejs/client/ui/utils');
-const Observable = require('frappejs/utils/observable');
-
-// baseclass for report
-// `url` url for report
-// `getColumns` return columns
-
-module.exports = class ReportPage extends Page {
-    constructor({title, filterFields = []}) {
-        super({title: title, hasRoute: true});
-
-        this.fullPage = true;
-        this.filterFields = filterFields;
-
-        this.filterWrapper = frappe.ui.add('div', 'filter-toolbar', this.body);
-        this.tableWrapper = frappe.ui.add('div', 'table-page-wrapper', this.body);
-
-        this.btnNew = this.addButton(frappe._('Refresh'), 'btn-primary', async () => {
-            await this.run();
-        });
-
-        this.makeFilters();
-        this.setDefaultFilterValues();
-    }
-
-    getColumns() {
-        // overrride
-    }
-
-    getRowsForDataTable(data) {
-        return data;
-    }
-
-    makeFilters() {
-        this.filters = new FormLayout({
-            parent: this.filterWrapper,
-            fields: this.filterFields,
-            doc: new Observable(),
-            inline: true
-        });
-
-        this.filterWrapper.appendChild(this.filters.form);
-    }
-
-    setDefaultFilterValues() {
-
-    }
-
-    getFilterValues() {
-        const values = {};
-        for (let control of this.filters.controlList) {
-            values[control.fieldname] = control.getInputValue();
-            if (control.required && !values[control.fieldname]) {
-                frappe.ui.showAlert({message: frappe._('{0} is mandatory', control.label), color: 'red'});
-                return false;
-            }
-        }
-        return values;
-    }
-
-    async show(params) {
-        super.show();
-        await this.run();
-    }
-
-    async run() {
-        if (frappe.params && frappe.params.filters) {
-            for (let key in frappe.params.filters) {
-                if (this.filters.controls[key]) {
-                    this.filters.controls[key].setInputValue(frappe.params.filters[key]);
-                }
-            }
-        }
-        frappe.params = null;
-
-
-        if (!this.datatable) {
-            this.makeDataTable();
-        }
-
-        const filterValues = this.getFilterValues();
-        if (filterValues === false) return;
-
-        let data = await frappe.call({
-            method: this.method,
-            args: filterValues
-        });
-
-        const rows = this.getRowsForDataTable(data);
-        const columns = utils.convertFieldsToDatatableColumns(this.getColumns(data), this.layout);
-        this.datatable.refresh(rows, columns);
-    }
-
-    makeDataTable() {
-        this.datatable = new DataTable(this.tableWrapper, Object.assign({
-            columns: utils.convertFieldsToDatatableColumns(this.getColumns(), this.layout),
-            data: [],
-            layout: this.layout || 'fluid',
-        }, this.datatableOptions || {}));
-    }
-}
diff --git a/client/desk/search.js b/client/desk/search.js
deleted file mode 100644
index 71c5612c..00000000
--- a/client/desk/search.js
+++ /dev/null
@@ -1,16 +0,0 @@
-const frappe = require('frappejs');
-
-module.exports = class Search {
-    constructor(parent) {
-        this.input = frappe.ui.add('input', 'form-control nav-search', parent);
-        this.input.addEventListener('keypress', function(event) {
-            if (event.keyCode===13) {
-                let list = frappe.router.current_page.list;
-                if (list) {
-                    list.search_text = this.value;
-                    list.run();
-                }
-            }
-        })
-    }
-}
\ No newline at end of file
diff --git a/client/desk/tablepage.js b/client/desk/tablepage.js
deleted file mode 100644
index a44e68ec..00000000
--- a/client/desk/tablepage.js
+++ /dev/null
@@ -1,71 +0,0 @@
-const Page = require('frappejs/client/view/page');
-const frappe = require('frappejs');
-const ModelTable = require('frappejs/client/ui/modelTable');
-
-module.exports = class TablePage extends Page {
-    constructor(doctype) {
-        let meta = frappe.getMeta(doctype);
-        super({title: `${meta.label || meta.name}`, hasRoute: true});
-        this.filterWrapper = frappe.ui.add('div', 'filter-toolbar', this.body);
-        this.fitlerButton = frappe.ui.add('button', 'btn btn-sm btn-outline-secondary', this.filterWrapper, 'Set Filters');
-        this.tableWrapper = frappe.ui.add('div', 'table-page-wrapper', this.body);
-        this.doctype = doctype;
-        this.fullPage = true;
-
-        this.fitlerButton.addEventListener('click', async () => {
-            const formModal = await frappe.desk.showFormModal('FilterSelector');
-            formModal.form.once('apply-filters', () => {
-                formModal.hide();
-                this.run();
-            })
-        });
-
-    }
-
-    async show(params) {
-        super.show();
-
-        if (!this.filterSelector) {
-            this.filterSelector = await frappe.getSingle('FilterSelector');
-            this.filterSelector.reset(this.doctype);
-        }
-
-        if (frappe.params && frappe.params.filters) {
-            this.filterSelector.setFilters(frappe.params.filters);
-        }
-        frappe.params = null;
-
-        if (!this.modelTable) {
-            this.modelTable = new ModelTable({
-                doctype: this.doctype,
-                parent: this.tableWrapper,
-                layout: 'fluid',
-                getRowData: async (rowIndex) => {
-                    return await frappe.getDoc(this.doctype, this.data[rowIndex].name);
-                },
-                setValue: async (control) => {
-                    await control.handleChange();
-                    await control.doc.update();
-                }
-            });
-        }
-
-        this.run();
-    }
-
-    async run() {
-        this.displayFilters();
-        this.data = await frappe.db.getAll({
-            doctype: this.doctype,
-            fields: ['*'],
-            filters: this.filterSelector.getFilters(),
-            start: this.start,
-            limit: 500
-        });
-        this.modelTable.refresh(this.data);
-    }
-
-    displayFilters() {
-        this.fitlerButton.textContent = this.filterSelector.getText();
-    }
-}
\ No newline at end of file
diff --git a/client/desk/treepage.js b/client/desk/treepage.js
deleted file mode 100644
index 456f593a..00000000
--- a/client/desk/treepage.js
+++ /dev/null
@@ -1,31 +0,0 @@
-const frappe = require('frappejs');
-const Page = require('frappejs/client/view/page');
-const view = require('frappejs/client/view');
-
-module.exports = class TreePage extends Page {
-    constructor(name) {
-        const hasRoute = true;
-
-        super({
-            title: frappe._("Tree"),
-            parent: hasRoute ? frappe.desk.body : frappe.desk.center,
-            hasRoute: hasRoute
-        });
-
-        this.fullPage = true;
-
-        this.name = name;
-
-        this.tree = new (view.getTreeClass(name))({
-            doctype: name,
-            parent: this.body,
-            page: this
-        });
-    }
-
-    async show(params) {
-        super.show();
-        this.setTitle(this.name===this.tree.meta.name ? (this.tree.meta.label || this.tree.meta.name) : this.name);
-        await this.tree.refresh();
-    }
-}
\ No newline at end of file
diff --git a/client/electron.js b/client/electron.js
deleted file mode 100644
index 92b9226e..00000000
--- a/client/electron.js
+++ /dev/null
@@ -1,34 +0,0 @@
-const common = require('frappejs/common');
-const sqlite = require('frappejs/backends/sqlite');
-const frappe = require('frappejs');
-frappe.ui = require('./ui');
-const Desk = require('./desk');
-const Observable = require('frappejs/utils/observable');
-
-module.exports = {
-    async start({dbPath, columns = 3, models}) {
-        window.frappe = frappe;
-        frappe.isServer = true;
-        frappe.init();
-        frappe.registerLibs(common);
-        frappe.registerModels(require('frappejs/models'));
-
-        if (models) {
-            frappe.registerModels(models);
-        }
-
-        frappe.db = await new sqlite({ dbPath });
-        await frappe.db.connect();
-        await frappe.db.migrate();
-
-        frappe.fetch = window.fetch.bind();
-
-        frappe.docs = new Observable();
-
-        await frappe.getSingle('SystemSettings');
-
-        frappe.desk = new Desk(columns);
-        await frappe.login('Administrator');
-    }
-};
-
diff --git a/client/index.js b/client/index.js
deleted file mode 100644
index cfaa656a..00000000
--- a/client/index.js
+++ /dev/null
@@ -1,52 +0,0 @@
-const common = require('frappejs/common');
-const HTTPClient = require('frappejs/backends/http');
-const frappe = require('frappejs');
-frappe.ui = require('./ui');
-const Desk = require('./desk');
-const Observable = require('frappejs/utils/observable');
-const { getPDF } = require('frappejs/client/pdf');
-
-module.exports = {
-    async start({server, columns = 2, makeDesk = false}) {
-        window.frappe = frappe;
-        frappe.init();
-        frappe.registerLibs(common);
-        frappe.registerModels(require('frappejs/models'), 'client');
-        frappe.fetch = window.fetch.bind();
-
-        frappe.db = await new HTTPClient({server: server});
-        this.socket = io.connect(`http://${server}`); // eslint-disable-line
-        frappe.db.bindSocketClient(this.socket);
-
-        frappe.docs = new Observable();
-        await frappe.getSingle('SystemSettings');
-
-        if(makeDesk) {
-            this.makeDesk(columns);
-        }
-    },
-
-    async makeDesk(columns) {
-        frappe.desk = new Desk(columns);
-        await frappe.login();
-    },
-
-    setCall() {
-        frappe.call = async (method, args) => {
-            let url = `/api/method/${method}`;
-            let response = await fetch(url, {
-                method: 'POST',
-                headers: {
-                    'Accept': 'application/json',
-                    'Content-Type': 'application/json'
-                },
-                body: JSON.stringify(args || {})
-            });
-
-            return await response.json();
-        }
-
-        frappe.getPDF = getPDF;
-    }
-};
-
diff --git a/client/pdf.js b/client/pdf.js
deleted file mode 100644
index f8c029e6..00000000
--- a/client/pdf.js
+++ /dev/null
@@ -1,30 +0,0 @@
-async function getPDF(doctype, name) {
-    const headers = {
-        'Accept': 'application/pdf',
-        'Content-Type': 'application/json'
-    }
-
-    const res = await fetch('/api/method/pdf', {
-        method: 'POST',
-        headers,
-        body: JSON.stringify({ doctype, name })
-    });
-
-    const blob = await res.blob();
-    showFile(blob);
-}
-
-
-function showFile(blob, filename='file.pdf') {
-    const newBlob = new Blob([blob], { type: "application/pdf" })
-    const data = window.URL.createObjectURL(newBlob);
-    const link = document.createElement('a');
-    link.href = data;
-    link.download = filename;
-    link.click();
-    setTimeout(() => window.URL.revokeObjectURL(data), 100);
-}
-
-module.exports = {
-    getPDF
-}
diff --git a/client/style/datatable.scss b/client/style/datatable.scss
deleted file mode 100644
index caf05132..00000000
--- a/client/style/datatable.scss
+++ /dev/null
@@ -1,34 +0,0 @@
-@import "./variables.scss";
-@import "node_modules/frappe-datatable/dist/frappe-datatable";
-
-.dt-header {
-    background-color: $gray-200 !important;
-}
-
-.dt-cell__edit {
-    padding: 0px;
-
-    input, textarea {
-        outline: none;
-        border-radius: none;
-        border: none;
-        margin: none;
-        padding: $spacer-2;
-
-        &:focus {
-            border: none;
-            box-shadow: none;
-        }
-    }
-
-    .awesomplete > ul {
-        position: fixed;
-        left: auto;
-        width: auto;
-        min-width: 120px;
-    }
-}
-
-.dt-cell--highlight {
-    background-color: $gray-200;
-}
diff --git a/client/style/indicators.scss b/client/style/indicators.scss
deleted file mode 100644
index 774771ae..00000000
--- a/client/style/indicators.scss
+++ /dev/null
@@ -1,68 +0,0 @@
-.indicator,
-.indicator-right {
-    background: none;
-    vertical-align: middle;
-}
-
-.indicator::before,
-.indicator-right::after {
-    content:'';
-    display: inline-block;
-    height: 8px;
-    width: 8px;
-    border-radius: 8px;
-    background: $gray-300;
-}
-
-.indicator::before {
-	margin:0 $spacer-2 0 0;
-}
-
-.indicator-right::after {
-	margin:0 0 0 $spacer-2;
-}
-
-.indicator.grey::before,
-.indicator-right.grey::after {
-    background: $gray-300;
-}
-.indicator.blue::before,
-.indicator-right.blue::after {
-    background: $blue;
-}
-.indicator.red::before,
-.indicator-right.red::after {
-    background: $red;
-}
-.indicator.green::before,
-.indicator-right.green::after {
-    background: $green;
-}
-.indicator.orange::before,
-.indicator-right.orange::after {
-    background: $orange;
-}
-.indicator.purple::before,
-.indicator-right.purple::after {
-    background: $purple;
-}
-.indicator.darkgrey::before,
-.indicator-right.darkgrey::after {
-    background: $gray-600;
-}
-
-.indicator.black::before,
-.indicator-right.black::after {
-    background: $gray-800;
-}
-
-.indicator.yellow::before,
-.indicator-right.yellow::after {
-    background: $yellow;
-}
-
-.modal-header .indicator {
-	float: left;
-	margin-top: 7.5px;
-	margin-right: 3px;
-}
diff --git a/client/style/style.scss b/client/style/style.scss
deleted file mode 100644
index 251cd829..00000000
--- a/client/style/style.scss
+++ /dev/null
@@ -1,278 +0,0 @@
-@import "node_modules/bootstrap/scss/bootstrap";
-@import "node_modules/awesomplete/awesomplete";
-@import "node_modules/flatpickr/dist/flatpickr";
-@import "node_modules/flatpickr/dist/themes/airbnb";
-@import "node_modules/codemirror/lib/codemirror";
-
-@import "./variables.scss";
-@import "./indicators.scss";
-
-html {
-	font-size: 12px;
-}
-
-.desk-body {
-	border-left: 1px solid $gray-300;
-	min-height: 100vh;
-}
-
-.desk-center {
-	border-left: 1px solid $gray-300;
-}
-
-.hide {
-	display: none !important;
-}
-
-.page {
-	padding-bottom: $spacer-4;
-
-	.page-nav {
-		padding: $spacer-2 $spacer-3;
-		background-color: $gray-100;
-		border-bottom: 1px solid $gray-300;
-
-		.btn {
-			margin-left: $spacer-2;
-		}
-	}
-
-	.page-title {
-		font-weight: bold;
-		padding: $spacer-4;
-		padding-bottom: 0;
-	}
-
-	.page-links {
-		padding: $spacer-3 $spacer-4;
-	}
-
-	.page-error {
-		text-align: center;
-		padding: 200px 0px;
-	}
-}
-
-.form-body {
-	padding: $spacer-3 $spacer-4;
-
-	.form-check {
-		margin-bottom: $spacer-2;
-
-		.form-check-input {
-			margin-top: $spacer-1;
-		}
-		.form-check-label {
-			margin-left: $spacer-1;
-		}
-	}
-
-	.form-control.font-weight-bold {
-		background-color: lightyellow;
-	}
-
-	.alert {
-		margin-top: $spacer-3;
-	}
-}
-
-.form-inline {
-	.form-group {
-		margin-right: $spacer-3;
-		margin-bottom: $spacer-3;
-	}
-}
-
-.list-search {
-	padding: $spacer-3 $spacer-4;
-}
-
-.list-body {
-	.list-row {
-		padding: $spacer-2 $spacer-4;
-		border-bottom: 1px solid $gray-200;
-		cursor: pointer;
-
-		.checkbox {
-			margin-right: $spacer-2;
-		}
-
-		a, a:hover, a:visited, a:active {
-			color: $gray-800;
-		}
-	}
-
-	.list-row:hover {
-		background-color: $gray-100;
-	}
-
-	.list-row.active {
-		background-color: $gray-200;
-	}
-}
-
-
-.dropdown-item {
-	padding: $spacer-2 $spacer-3;
-}
-
-.bottom-right-float {
-	position: fixed;
-	margin-bottom: 0px;
-	bottom: $spacer-3;
-	right: $spacer-3;
-	max-width: 200px;
-	padding: $spacer-2 $spacer-3;
-}
-
-.desk-menu {
-	background-color: $gray-200;
-
-	.list-row {
-		border-bottom: 1px solid $gray-200;
-	}
-
-	.list-row:hover {
-		background-color: $gray-300;
-	}
-
-	.list-row.active {
-		background-color: $gray-400;
-	}
-}
-
-.print-page {
-	padding: $spacer-5;
-	line-height: 1.8;
-
-	td, th {
-		padding: $spacer-2;
-	}
-}
-
-.table-page-wrapper {
-	width: 100%;
-	padding: $spacer-3 $spacer-4;
-}
-
-.filter-toolbar {
-	padding: $spacer-3 $spacer-4;
-}
-
-.table-wrapper {
-	margin-top: $spacer-4;
-	margin-bottom: $spacer-4;
-}
-
-.table-toolbar {
-	margin-top: $spacer-2;
-}
-
-.CodeMirror {
-	font-family: "SFMono-Regular",Consolas,"Liberation Mono",Menlo,Courier,monospace;
-	border: 1px solid $gray-300;
-	border-radius: 0.25rem;
-	padding: $spacer-2;
-}
-
-.awesomplete {
-	display: block;
-
-	ul {
-		max-height: 150px;
-		overflow: auto;
-	}
-
-	> ul > li {
-		padding: .75rem .375rem;
-	}
-
-	> ul > li:hover {
-		background: $gray-300;
-		color: $body-color;
-	}
-
-	> ul > li[aria-selected="true"] {
-		background: $gray-300;
-		color: $body-color;
-	}
-
-	> ul > li[aria-selected="true"]:hover {
-		background: $gray-300;
-		color: $body-color;
-	}
-
-	li[aria-selected="true"] mark, li[aria-selected="false"] mark {
-		background: inherit;
-		color: inherit;
-		padding: 0px;
-	}
-
-}
-
-
-mark {
-	padding: none;
-	background: inherit;
-}
-
-.align-right {
-	text-align: right;
-}
-
-.align-center {
-	text-align: center;
-}
-
-.btn-sm {
-	margin: $spacer-1;
-}
-
-.vertical-margin {
-	margin: $spacer-3 0px;
-}
-
-@import "./tree.scss";
-@import "./datatable.scss";
-
-// just for accounting
-
-.setup-container {
-	margin: 40px auto;
-	padding: 20px 0px;
-	width: 450px;
-
-	border: 1px solid $gray-300;
-	border-radius: 4px;
-
-	h3 {
-		text-align: center;
-	}
-
-	.form-section {
-		display: none;
-	}
-
-	.form-section.active {
-		display: block;
-	}
-
-	.setup-link-area {
-		margin: $spacer-1 $spacer-4;
-	}
-}
-
-// File Input
-
-input[type=file] {
-	width: 0.1px;
-	height: 0.1px;
-	opacity: 0;
-	overflow: hidden;
-	position: absolute;
-	z-index: -1;
-}
-
-.was-validated input[type=file]:invalid + button {
-	border-color: $red;
-}
diff --git a/client/style/tree.scss b/client/style/tree.scss
deleted file mode 100644
index eb8cad33..00000000
--- a/client/style/tree.scss
+++ /dev/null
@@ -1,9 +0,0 @@
-@import "./variables.scss";
-
-.tree-body {
-	padding: $spacer-3 $spacer-4;
-}
-
-f-tree-node {
-	--tree-node-hover: $gray-100;
-}
diff --git a/client/style/variables.scss b/client/style/variables.scss
deleted file mode 100644
index 5a25ce0a..00000000
--- a/client/style/variables.scss
+++ /dev/null
@@ -1,8 +0,0 @@
-$spacer-1: 0.25rem;
-$spacer-2: 0.5rem;
-$spacer-3: 1rem;
-$spacer-4: 2rem;
-$spacer-5: 3rem;
-$page-width: 500px;
-
-$shadow-width: 0.5rem;
\ No newline at end of file
diff --git a/client/ui/dropdown.js b/client/ui/dropdown.js
deleted file mode 100644
index 1b056c19..00000000
--- a/client/ui/dropdown.js
+++ /dev/null
@@ -1,54 +0,0 @@
-const frappe = require('frappejs');
-const bootstrap = require('bootstrap');
-const $ = require('jquery');
-
-class Dropdown {
-    constructor({parent, label, items = [], right, cssClass='btn-secondary'}) {
-        Object.assign(this, arguments[0]);
-        Dropdown.instances += 1;
-        this.id = 'dropdownMenuButton-' + Dropdown.instances;
-
-        this.make();
-
-        // init items
-        if (this.items) {
-            for (let item of this.items) {
-                this.addItem(item.label, item.action);
-            }
-        }
-    }
-
-    make() {
-        this.$dropdown = $(`<div class="dropdown ${this.right ? 'float-right' : ''}">
-            <button class="btn ${this.cssClass} dropdown-toggle"
-                type="button" id="${this.id}" data-toggle="dropdown"
-                aria-haspopup="true" aria-expanded="false">${this.label}
-            </button>
-            <div class="dropdown-menu ${this.right ? 'dropdown-menu-right' : ''}" aria-labelledby="${this.id}"></div>
-        </div>`).appendTo(this.parent)
-        this.dropdown = this.$dropdown.get(0);
-        this.dropdownMenu = this.dropdown.querySelector('.dropdown-menu');
-    }
-
-    addItem(label, action) {
-        let item = frappe.ui.add('button', 'dropdown-item', this.dropdownMenu, label);
-        item.setAttribute('type', 'button');
-        if (typeof action === 'string') {
-            item.addEventListener('click', async () => {
-                await frappe.router.setRoute(action);
-            });
-        } else {
-            item.addEventListener('click', async () => {
-                await action();
-            });
-        }
-    }
-
-    floatRight() {
-        frappe.ui.addClass(this.dropdown, 'float-right');
-    }
-}
-
-Dropdown.instances = 0;
-
-module.exports = Dropdown;
diff --git a/client/ui/index.js b/client/ui/index.js
deleted file mode 100644
index c37f805b..00000000
--- a/client/ui/index.js
+++ /dev/null
@@ -1,145 +0,0 @@
-const frappe = require('frappejs');
-const Dropdown = require('./dropdown');
-
-module.exports = {
-    create(tag, obj) {
-        if(tag.includes('<')) {
-            let div = document.createElement('div');
-            div.innerHTML = tag.trim();
-            return div.firstChild;
-        }
-        let element = document.createElement(tag);
-        obj = obj || {};
-
-        let $ = (expr, con) => {
-            return typeof expr === "string"
-                ? (con || document).querySelector(expr)
-                : expr || null;
-        }
-
-        for (var i in obj) {
-            let val = obj[i];
-
-            if (i === "inside") {
-                $(val).appendChild(element);
-            }
-            else if (i === "around") {
-                let ref = $(val);
-                ref.parentNode.insertBefore(element, ref);
-                element.appendChild(ref);
-
-            } else if (i === "styles") {
-                if(typeof val === "object") {
-                    Object.keys(val).map(prop => {
-                        element.style[prop] = val[prop];
-                    });
-                }
-            } else if (i in element ) {
-                element[i] = val;
-            }
-            else {
-                element.setAttribute(i, val);
-            }
-        }
-
-        return element;
-    },
-
-    add(tag, className, parent, textContent) {
-        let element = document.createElement(tag);
-        if (className) {
-            for (let c of className.split(' ')) {
-                this.addClass(element, c);
-            }
-        }
-        if (parent) {
-            parent.appendChild(element);
-        }
-        if (textContent) {
-            element.textContent = textContent;
-        }
-        return element;
-    },
-
-    remove(element) {
-        element.parentNode.removeChild(element);
-    },
-
-    on(element, event, selector, handler) {
-        if (!handler) {
-            handler = selector;
-            this.bind(element, event, handler);
-        } else {
-            this.delegate(element, event, selector, handler);
-        }
-    },
-
-    off(element, event, handler) {
-        element.removeEventListener(event, handler);
-    },
-
-    bind(element, event, callback) {
-        event.split(/\s+/).forEach(function (event) {
-            element.addEventListener(event, callback);
-        });
-    },
-
-    delegate(element, event, selector, callback) {
-        element.addEventListener(event, function (e) {
-            const delegatedTarget = e.target.closest(selector);
-            if (delegatedTarget) {
-                e.delegatedTarget = delegatedTarget;
-                callback.call(this, e, delegatedTarget);
-            }
-        });
-    },
-
-    empty(element) {
-        while (element.firstChild) {
-            element.removeChild(element.firstChild);
-        }
-    },
-
-    addClass(element, className) {
-        if (element.classList) {
-            element.classList.add(className);
-        } else {
-            element.className += " " + className;
-        }
-    },
-
-    removeClass(element, className) {
-        if (element.classList) {
-            element.classList.remove(className);
-        } else {
-            element.className = element.className.replace(new RegExp('(^|\\b)' + className.split(' ').join('|') + '(\\b|$)', 'gi'), ' ');
-        }
-    },
-
-    toggleClass(element, className, flag) {
-        if (flag === undefined) {
-            flag = !element.classList.contains(className);
-        }
-
-        if (!flag) {
-            this.removeClass(element, className);
-        } else {
-            this.addClass(element, className);
-        }
-    },
-
-    toggle(element, default_display = '') {
-        element.style.display = element.style.display === 'none' ? default_display : 'none';
-    },
-
-    make_dropdown(label, parent, btn_class = 'btn-secondary') {
-        return new Dropdown({parent: parent, label:label, btn_class:btn_class});
-    },
-
-    showAlert({message, color='yellow', timeout=4}) {
-        let alert = this.add('div', 'alert alert-warning bottom-right-float', document.body);
-        alert.innerHTML = `<span class='indicator ${color}'>${message}</span>`;
-        frappe.sleep(timeout).then(() => alert.remove());
-        return alert;
-    }
-}
\ No newline at end of file
diff --git a/client/ui/keyboard.js b/client/ui/keyboard.js
deleted file mode 100644
index 5bb1f472..00000000
--- a/client/ui/keyboard.js
+++ /dev/null
@@ -1,40 +0,0 @@
-module.exports = {
-    bindKey(element, key, listener) {
-        element.addEventListener('keydown', (e) => {
-            if (key === this.getKey(e)) {
-                listener(e);
-            }
-        })
-    },
-
-    getKey(e) {
-        var keycode = e.keyCode || e.which;
-        var key = this.keyMap[keycode] || String.fromCharCode(keycode);
-
-        if(e.ctrlKey || e.metaKey) {
-            // add ctrl+ the key
-            key = 'ctrl+' + key;
-        }
-        if(e.shiftKey) {
-            // add ctrl+ the key
-            key = 'shift+' + key;
-        }
-        return key.toLowerCase();
-    },
-
-    keyMap: {
-        8: 'backspace',
-        9: 'tab',
-        13: 'enter',
-        16: 'shift',
-        17: 'ctrl',
-        91: 'meta',
-        18: 'alt',
-        27: 'escape',
-        37: 'left',
-        39: 'right',
-        38: 'up',
-        40: 'down',
-        32: 'space'
-    },
-}
\ No newline at end of file
diff --git a/client/ui/modal.js b/client/ui/modal.js
deleted file mode 100644
index 5806ffc2..00000000
--- a/client/ui/modal.js
+++ /dev/null
@@ -1,79 +0,0 @@
-const $ = require('jquery');
-const bootstrap = require('bootstrap'); // eslint-disable-line
-const Observable = require('frappejs/utils/observable');
-
-module.exports = class Modal extends Observable {
-    constructor({ title, body, primary, secondary }) {
-        super();
-        Object.assign(this, arguments[0]);
-        this.make();
-        this.show();
-    }
-
-    make() {
-        this.$modal = $(`<div class="modal" tabindex="-1" role="dialog">
-            <div class="modal-dialog" role="document">
-                <div class="modal-content">
-                    <div class="modal-header">
-                        <h5 class="modal-title">${this.title}</h5>
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                            <span aria-hidden="true">&times;</span>
-                        </button>
-                    </div>
-                    <div class="modal-body">
-                        ${this.getBodyHTML()}
-                    </div>
-                    <div class="modal-footer">
-                    </div>
-                </div>
-            </div>
-        </div>`).appendTo(document.body);
-        this.modal = this.$modal.get(0);
-
-        if (this.primary) {
-            this.addPrimary(this.primary.label, this.primary.action);
-        }
-        if (this.secondary) {
-            this.addSecondary(this.secondary.label, this.secondary.action);
-        }
-
-        this.$modal.on('hidden.bs.modal', () => this.trigger('hide'));
-        this.$modal.on('shown.bs.modal', () => {
-            this.trigger('show');
-        });
-    }
-
-    getBodyHTML() {
-        return this.body || '';
-    }
-
-    addPrimary(label, action) {
-        return $(`<button type="button" class="btn btn-primary">
-            ${label}</button>`)
-            .appendTo(this.$modal.find('.modal-footer'))
-            .on('click', () => action(this));
-    }
-
-    addSecondary(label, action) {
-        return $(`<button type="button" class="btn btn-secondary">
-            ${label}</button>`)
-            .appendTo(this.$modal.find('.modal-footer'))
-            .on('click', () => action(this));
-    }
-
-    setTitle(title) {
-        this.$modal.find('.modal-title').text(title);
-    }
-
-    show() {
-        this.$modal.modal('show');
-    }
-
-    hide() {
-        this.$modal.modal('hide');
-    }
-
-    getBody() {
-        return this.$modal.find('.modal-body').get(0);
-    }
-}
\ No newline at end of file
diff --git a/client/ui/modelTable.js b/client/ui/modelTable.js
deleted file mode 100644
index cfaa19d5..00000000
--- a/client/ui/modelTable.js
+++ /dev/null
@@ -1,134 +0,0 @@
-const frappe = require('frappejs');
-const DataTable = require('frappe-datatable');
-
-const Modal = require('frappejs/client/ui/modal');
-const utils = require('./utils');
-
-module.exports = class ModelTable {
-    constructor({doctype, parent, layout, parentControl, getRowData,
-        isDisabled, getTableData}) {
-        Object.assign(this, arguments[0]);
-        this.meta = frappe.getMeta(this.doctype);
-        this.make();
-    }
-
-    make() {
-        this.datatable = new DataTable(this.parent, {
-            columns: this.getColumns(),
-            data: [],
-            layout: this.meta.layout || this.layout || 'fluid',
-            addCheckboxColumn: true,
-            getEditor: this.getTableInput.bind(this),
-        });
-    }
-
-    resize() {
-        this.datatable.setDimensions();
-    }
-
-    getColumns() {
-        return utils.convertFieldsToDatatableColumns(this.getTableFields(), this.layout);
-    }
-
-    getTableFields() {
-        return this.meta.fields.filter(f => f.hidden ? false : true);
-    }
-
-    getTableInput(colIndex, rowIndex, value, parent) {
-        let field = this.datatable.getColumn(colIndex).field;
-        if (field.disabled || (this.isDisabled && this.isDisabled())) {
-            return false;
-        }
-
-        if (field.fieldtype==='Text') {
-            // text in modal
-            parent = this.getControlModal(field).getBody();
-        }
-        const editor = this.getControl(field, parent);
-        return editor;
-    }
-
-    getControl(field, parent) {
-        field.onlyInput = true;
-        const controls = require('frappejs/client/view/controls');
-        const control = controls.makeControl({field: field, parent: parent});
-
-        // change will be triggered by datatable
-        control.skipChangeEvent = true;
-
-        return {
-            initValue: async (value, rowIndex, column) => {
-                column.activeControl = control;
-                control.parentControl = this.parentControl;
-                control.doc = await this.getRowData(rowIndex);
-                control.setFocus();
-                control.setInputValue(control.doc[column.id]);
-                return control;
-            },
-            setValue: async (value, rowIndex, column) => {
-                await this.setValue(control);
-            },
-            getValue: () => {
-                return control.getInputValue();
-            }
-        }
-
-    }
-
-    async setValue(control) {
-        await control.handleChange();
-    }
-
-    getControlModal(field) {
-        this.modal = new Modal({
-            title: frappe._('Edit {0}', field.label),
-            body: '',
-            primary: {
-                label: frappe._('Submit'),
-                action: (modal) => {
-                    this.datatable.cellmanager.submitEditing();
-                    modal.hide();
-                }
-            }
-        });
-        this.modal.on('hide', () => {
-            this.datatable.cellmanager.deactivateEditing();
-            this.datatable.cellmanager.$focusedCell.focus();
-        });
-
-        return this.modal;
-    }
-
-    checkValidity() {
-        if (!this.datatable) {
-            return true;
-        }
-        let data = this.getTableData();
-        for (let rowIndex=0; rowIndex < data.length; rowIndex++) {
-            let row = data[rowIndex];
-            for (let column of this.datatable.datamanager.columns) {
-                if (column.field && column.field.required) {
-                    let value = row[column.field.fieldname];
-                    if (value==='' || value===undefined || value===null) {
-                        let $cell = this.datatable.cellmanager.getCell$(column.colIndex, rowIndex);
-                        this.datatable.cellmanager.activateEditing($cell);
-                        return false;
-                    }
-                }
-            }
-        }
-        return true;
-    }
-
-    refresh(data) {
-        return this.datatable.refresh(data);
-    }
-
-    getChecked() {
-        return this.datatable.rowmanager.getCheckedRows();
-    }
-
-    checkAll(check) {
-        return this.datatable.rowmanager.checkAll(check);
-    }
-}
diff --git a/client/view/controls/autocomplete.js b/client/view/controls/autocomplete.js
deleted file mode 100644
index 1106eb52..00000000
--- a/client/view/controls/autocomplete.js
+++ /dev/null
@@ -1,33 +0,0 @@
-const BaseControl = require('./base');
-const Awesomplete = require('awesomplete');
-
-class AutocompleteControl extends BaseControl {
-    make() {
-        super.make();
-        this.input.setAttribute('type', 'text');
-        this.setupAwesomplete();
-    }
-
-    async setupAwesomplete() {
-        this.awesomplete = new Awesomplete(this.input, {
-            minChars: 0,
-            maxItems: 99
-        });
-
-        this.list = await this.getList();
-
-        // rebuild the list on input
-        this.input.addEventListener('input', (event) => {
-            this.awesomplete.list = this.list;
-        });
-    }
-
-    validate(value) {
-        if (this.list.includes(value)) {
-            return value;
-        }
-        return false;
-    }
-};
-
-module.exports = AutocompleteControl;
\ No newline at end of file
diff --git a/client/view/controls/base.js b/client/view/controls/base.js
deleted file mode 100644
index 6de0abd2..00000000
--- a/client/view/controls/base.js
+++ /dev/null
@@ -1,206 +0,0 @@
-const frappe = require('frappejs');
-
-class BaseControl {
-    constructor({field, parent, form}) {
-        BaseControl.count++;
-
-        Object.assign(this, field);
-        this.parent = parent;
-        this.form = form;
-        this.id = 'control-' + BaseControl.count;
-
-        if (!this.fieldname) {
-            this.fieldname = frappe.slug(this.label);
-        }
-        if (!this.parent) {
-            this.parent = this.form.form;
-        }
-        if (this.setup) {
-            this.setup();
-        }
-        if (this.template) {
-            this.wrapper = frappe.ui.add('div', 'field-template', this.parent);
-            this.renderTemplate();
-        } else {
-            this.make();
-        }
-    }
-
-    bind(doc) {
-        this.doc = doc;
-        this.refresh();
-    }
-
-    refresh() {
-        if (this.template) {
-            this.renderTemplate();
-        } else {
-            this.setDocValue();
-        }
-        this.setDisabled();
-    }
-
-    renderTemplate() {
-        if (this.form && this.form.doc) {
-            this.wrapper.innerHTML = this.template(this.form.doc, this.doc);
-        } else {
-            this.wrapper.innerHTML = '';
-        }
-    }
-
-    setDocValue() {
-        if (this.doc && !this.template) {
-            this.setInputValue(this.doc.get(this.fieldname));
-        }
-    }
-
-    make() {
-        if (!this.onlyInput) {
-            this.makeInputContainer();
-            this.makeLabel();
-        }
-        this.makeInput();
-        this.addChangeHandler();
-    }
-
-    makeInputContainer(className = 'form-group') {
-        this.inputContainer = frappe.ui.add('div', className, this.parent);
-    }
-
-    makeLabel(labelClass = null) {
-        this.labelElement = frappe.ui.add('label', labelClass, this.inputContainer, this.label);
-        this.labelElement.setAttribute('for', this.id);
-        if (this.inline) {
-            this.labelElement.classList.add("sr-only");
-        }
-    }
-
-    makeInput(inputClass='form-control') {
-        this.input = frappe.ui.add('input', inputClass, this.getInputParent());
-        this.input.autocomplete = "off";
-        this.input.id = this.id;
-
-        this.setInputName();
-        this.setRequiredAttribute();
-        this.setDisabled();
-        if (!this.onlyInput) {
-            this.makeDescription();
-        }
-        if (this.placeholder || this.inline) {
-            this.input.setAttribute('placeholder', this.placeholder || this.label);
-        }
-
-    }
-
-    isDisabled() {
-        let disabled = this.disabled;
-
-        if (this.doc && this.doc.submitted) {
-            disabled = true;
-        }
-
-        if (this.formula && this.fieldtype !== 'Table') {
-            disabled = true;
-        }
-
-        return disabled;
-    }
-
-    setDisabled() {
-        this.input.disabled = this.isDisabled();
-    }
-
-    getInputParent() {
-        return this.inputContainer || this.parent;
-    }
-
-    setInputName() {
-        this.input.setAttribute('name', this.fieldname);
-    }
-
-    setRequiredAttribute() {
-        if (this.required) {
-            this.input.required = true;
-            this.input.classList.add('font-weight-bold');
-        }
-    }
-
-    makeDescription() {
-        if (this.description) {
-            this.description_element = frappe.ui.add('small', 'form-text text-muted',
-                this.inputContainer, this.description);
-        }
-    }
-
-    setInputValue(value) {
-        this.input.value = this.format(value);
-    }
-
-    format(value) {
-        if (value === undefined || value === null) {
-            value = '';
-        }
-        return value;
-    }
-
-    async getParsedValue() {
-        return await this.parse(this.getInputValue());
-    }
-
-    getInputValue() {
-        return this.input.value;
-    }
-
-    async parse(value) {
-        return value;
-    }
-
-    async validate(value) {
-        return value;
-    }
-
-    addChangeHandler() {
-        this.input.addEventListener('change', () => {
-            if (this.skipChangeEvent) return;
-            this.handleChange();
-        });
-    }
-
-    async handleChange(event) {
-        let value = await this.parse(this.getInputValue());
-        value = await this.validate(value);
-        this.input.setCustomValidity(value === false ? 'error' : '');
-        await this.updateDocValue(value);
-    }
-
-    async updateDocValue(value) {
-        if (!this.doc) return;
-        if (this.doc[this.fieldname] !== value) {
-            if (this.parentControl) {
-                // its a child
-                this.doc[this.fieldname] = value;
-                this.parentControl.doc._dirty = true;
-                await this.parentControl.doc.applyChange(this.fieldname);
-            } else {
-                // parent
-                await this.doc.set(this.fieldname, value);
-            }
-        }
-    }
-
-    disable() {
-        this.input.setAttribute('disabled', 'disabled');
-    }
-
-    enable() {
-        this.input.removeAttribute('disabled');
-    }
-
-    setFocus() {
-        this.input.focus();
-    }
-}
-
-BaseControl.count = 0;
-
-module.exports = BaseControl;
\ No newline at end of file
diff --git a/client/view/controls/check.js b/client/view/controls/check.js
deleted file mode 100644
index 2c1e83ce..00000000
--- a/client/view/controls/check.js
+++ /dev/null
@@ -1,38 +0,0 @@
-const BaseControl = require('./base');
-
-class CheckControl extends BaseControl {
-    make() {
-        if (!this.onlyInput) {
-            this.makeInputContainer();
-        }
-        this.makeInput();
-        if (!this.onlyInput) {
-            this.makeLabel();
-        }
-        this.addChangeHandler();
-    }
-
-    makeInputContainer() {
-        super.makeInputContainer('form-check');
-    }
-
-    makeLabel() {
-        super.makeLabel('form-check-label');
-    }
-
-    makeInput() {
-        super.makeInput('form-check-input');
-        this.input.type = 'checkbox';
-    }
-
-    setInputValue(value) {
-        if (value === '0') value = 0;
-        this.input.checked = value ? true : false;
-    }
-
-    getInputValue() {
-        return this.input.checked ? 1 : 0
-    }
-};
-
-module.exports = CheckControl;
\ No newline at end of file
diff --git a/client/view/controls/code.js b/client/view/controls/code.js
deleted file mode 100644
index ce728e97..00000000
--- a/client/view/controls/code.js
+++ /dev/null
@@ -1,35 +0,0 @@
-const BaseControl = require('./base');
-// const frappe = require('frappejs');
-const CodeMirror = require('codemirror');
-const modeHTML = require('codemirror/mode/htmlmixed/htmlmixed'); // eslint-disable-line
-const modeJavascript = require('codemirror/mode/javascript/javascript'); // eslint-disable-line
-
-class CodeControl extends BaseControl {
-    makeInput() {
-        if (!this.options) {
-            this.options = {};
-        }
-        this.options.theme = 'default';
-        this.input = new CodeMirror(this.getInputParent(), this.options);
-    }
-
-    setInputValue(value) {
-        if (value !== this.input.getValue()) {
-            this.input.setValue(value || '');
-        }
-    }
-
-    getInputValue(value) {
-        return this.input.getValue();
-    }
-
-    addChangeHandler() {
-        this.input.on('blur', () => {
-            if (this.skipChangeEvent) return;
-            this.handleChange();
-        });
-    }
-
-};
-
-module.exports = CodeControl;
\ No newline at end of file
diff --git a/client/view/controls/currency.js b/client/view/controls/currency.js
deleted file mode 100644
index d4f48c51..00000000
--- a/client/view/controls/currency.js
+++ /dev/null
@@ -1,13 +0,0 @@
-const FloatControl = require('./float');
-const frappe = require('frappejs');
-
-class CurrencyControl extends FloatControl {
-    parse(value) {
-        return frappe.parse_number(value);
-    }
-    format(value) {
-        return frappe.format_number(value);
-    }
-};
-
-module.exports = CurrencyControl;
\ No newline at end of file
diff --git a/client/view/controls/data.js b/client/view/controls/data.js
deleted file mode 100644
index e7f70dc3..00000000
--- a/client/view/controls/data.js
+++ /dev/null
@@ -1,14 +0,0 @@
-const BaseControl = require('./base');
-
-class DataControl extends BaseControl {
-    make() {
-        super.make();
-
-        if (!this.inputType) {
-            this.inputType = 'text';
-        }
-        this.input.setAttribute('type', this.inputType);
-    }
-};
-
-module.exports = DataControl;
\ No newline at end of file
diff --git a/client/view/controls/date.js b/client/view/controls/date.js
deleted file mode 100644
index d7c1f461..00000000
--- a/client/view/controls/date.js
+++ /dev/null
@@ -1,40 +0,0 @@
-const flatpickr = require('flatpickr');
-const BaseControl = require('./base');
-const frappe = require('frappejs');
-
-class DateControl extends BaseControl {
-    make() {
-        let dateFormat = {
-            'yyyy-mm-dd': 'Y-m-d',
-            'dd/mm/yyyy': 'd/m/Y',
-            'dd-mm-yyyy': 'd-m-Y',
-            'mm/dd/yyyy': 'm/d/Y',
-            'mm-dd-yyyy': 'm-d-Y'
-        }
-        let altFormat = frappe.SystemSettings ?
-            dateFormat[frappe.SystemSettings.dateFormat] :
-            dateFormat['yyyy-mm-dd'];
-
-        super.make();
-        this.input.setAttribute('type', 'text');
-        this.flatpickr = flatpickr(this.input, {
-            altInput: true,
-            altFormat: altFormat,
-            dateFormat:'Y-m-d'
-        });
-    }
-
-    setDisabled() {
-        this.input.disabled = this.isDisabled();
-        if (this.flatpickr && this.flatpickr.altInput) {
-            this.flatpickr.altInput.disabled = this.isDisabled();
-        }
-    }
-
-    setInputValue(value) {
-        super.setInputValue(value);
-        this.flatpickr.setDate(value);
-    }
-};
-
-module.exports = DateControl;
\ No newline at end of file
diff --git a/client/view/controls/dynamicLink.js b/client/view/controls/dynamicLink.js
deleted file mode 100644
index e460e351..00000000
--- a/client/view/controls/dynamicLink.js
+++ /dev/null
@@ -1,9 +0,0 @@
-const LinkControl = require('./link');
-
-class DynamicLinkControl extends LinkControl {
-    getTarget() {
-        return this.doc[this.references];
-    }
-};
-
-module.exports = DynamicLinkControl;
\ No newline at end of file
diff --git a/client/view/controls/file.js b/client/view/controls/file.js
deleted file mode 100644
index 8cc6dd82..00000000
--- a/client/view/controls/file.js
+++ /dev/null
@@ -1,53 +0,0 @@
-const frappe = require('frappejs');
-const BaseControl = require('./base');
-
-class FileControl extends BaseControl {
-    make() {
-        super.make();
-        this.fileButton = frappe.ui.create('button', {
-            className: 'btn btn-outline-secondary btn-block',
-            inside: this.getInputParent(),
-            type: 'button',
-            textContent: 'Choose a file...',
-            onclick: () => {
-                this.input.click();
-            }
-        });
-
-        this.input.setAttribute('type', 'file');
-
-        if (this.directory) {
-            this.input.setAttribute('webkitdirectory', '');
-        }
-
-        if (this.allowMultiple) {
-            this.input.setAttribute('multiple', '');
-        }
-    }
-
-    async handleChange() {
-        await super.handleChange();
-        this.setDocValue();
-    }
-
-    getInputValue() {
-        return this.input.files;
-    }
-
-    setInputValue(files) {
-
-        let label;
-        if (!files || files.length === 0) {
-            label = 'Choose a file...'
-        } else if (files.length === 1) {
-            label = files[0].name;
-        } else {
-            label = `${files.length} files selected`;
-        }
-
-        this.fileButton.textContent = label;
-        this.input.files = files;
-    }
-};
-
-module.exports = FileControl;
\ No newline at end of file
diff --git a/client/view/controls/float.js b/client/view/controls/float.js
deleted file mode 100644
index ad1a275e..00000000
--- a/client/view/controls/float.js
+++ /dev/null
@@ -1,20 +0,0 @@
-const BaseControl = require('./base');
-
-class FloatControl extends BaseControl {
-    make() {
-        super.make();
-        this.input.setAttribute('type', 'text');
-        this.input.classList.add('text-right');
-        this.input.addEventListener('focus', () => {
-            setTimeout(() => {
-                this.input.select();
-            }, 100);
-        })
-    }
-    parse(value) {
-        value = parseFloat(value);
-        return isNaN(value) ? 0 : value;
-    }
-};
-
-module.exports = FloatControl;
\ No newline at end of file
diff --git a/client/view/controls/index.js b/client/view/controls/index.js
deleted file mode 100644
index 05e1dfcb..00000000
--- a/client/view/controls/index.js
+++ /dev/null
@@ -1,28 +0,0 @@
-const controlClasses = {
-    Autocomplete: require('./autocomplete'),
-    Check: require('./check'),
-    Code: require('./code'),
-    Data: require('./data'),
-    Date: require('./date'),
-    DynamicLink: require('./dynamicLink'),
-    Currency: require('./currency'),
-    Float: require('./float'),
-    File: require('./file'),
-    Int: require('./int'),
-    Link: require('./link'),
-    Password: require('./password'),
-    Select: require('./select'),
-    Table: require('./table'),
-    Text: require('./text')
-}
-
-module.exports = {
-    getControlClass(fieldtype) {
-        return controlClasses[fieldtype];
-    },
-    makeControl({field, form, parent}) {
-        const controlClass = this.getControlClass(field.fieldtype);
-        let control = new controlClass({field:field, form:form, parent:parent});
-        return control;
-    }
-}
\ No newline at end of file
diff --git a/client/view/controls/int.js b/client/view/controls/int.js
deleted file mode 100644
index 55bcadff..00000000
--- a/client/view/controls/int.js
+++ /dev/null
@@ -1,10 +0,0 @@
-const FloatControl = require('./float');
-
-class IntControl extends FloatControl {
-    parse(value) {
-        value = parseInt(value);
-        return isNaN(value) ? 0 : value;
-    }
-};
-
-module.exports = IntControl;
\ No newline at end of file
diff --git a/client/view/controls/link.js b/client/view/controls/link.js
deleted file mode 100644
index aa1f4ef1..00000000
--- a/client/view/controls/link.js
+++ /dev/null
@@ -1,73 +0,0 @@
-const frappe = require('frappejs');
-const BaseControl = require('./base');
-const Awesomplete = require('awesomplete');
-
-class LinkControl extends BaseControl {
-    make() {
-        super.make();
-        this.input.setAttribute('type', 'text');
-        this.setupAwesomplete();
-    }
-
-    setupAwesomplete() {
-        this.awesomplete = new Awesomplete(this.input, {
-            minChars: 0,
-            maxItems: 99,
-            filter: () => true,
-            sort: (a, b) => {
-                if (a.value === '__newitem' || b.value === '__newitem') {
-                    return -1;
-                }
-                return a.value > b.value;
-            }
-        });
-
-        // rebuild the list on input
-        this.input.addEventListener('input', async (event) => {
-            let list = await this.getList(this.input.value);
-
-            // action to add new item
-            list.push({
-                label: frappe._('+ New {0}', this.label),
-                value: '__newItem',
-            });
-
-            this.awesomplete.list = list;
-        });
-
-        // new item action
-        this.input.addEventListener('awesomplete-select', async (e) => {
-            if (e.text && e.text.value === '__newItem') {
-                e.preventDefault();
-                const newDoc = await frappe.getNewDoc(this.getTarget());
-                const formModal = await frappe.desk.showFormModal(this.getTarget(), newDoc.name);
-                if (formModal.form.doc.meta.hasField('name')) {
-                    formModal.form.doc.set('name', this.input.value);
-                }
-
-                formModal.once('save', async () => {
-                    await this.updateDocValue(formModal.form.doc.name);
-                });
-            }
-        });
-
-    }
-
-    async getList(query) {
-        return (await frappe.db.getAll({
-            doctype: this.getTarget(),
-            filters: this.getFilters(query, this),
-            limit: 50
-        })).map(d => d.name);
-    }
-
-    getFilters(query) {
-        return { keywords: ["like", query] }
-    }
-
-    getTarget() {
-        return this.target;
-    }
-};
-
-module.exports = LinkControl;
\ No newline at end of file
diff --git a/client/view/controls/password.js b/client/view/controls/password.js
deleted file mode 100644
index 27d7b9a4..00000000
--- a/client/view/controls/password.js
+++ /dev/null
@@ -1,10 +0,0 @@
-const BaseControl = require('./base');
-
-class PasswordControl extends BaseControl {
-    make() {
-        super.make();
-        this.input.setAttribute('type', 'password');
-    }
-};
-
-module.exports = PasswordControl;
\ No newline at end of file
diff --git a/client/view/controls/select.js b/client/view/controls/select.js
deleted file mode 100644
index 109181ae..00000000
--- a/client/view/controls/select.js
+++ /dev/null
@@ -1,52 +0,0 @@
-const BaseControl = require('./base');
-const frappe = require('frappejs');
-
-class SelectControl extends BaseControl {
-    makeInput() {
-        this.input = frappe.ui.add('select', 'form-control', this.getInputParent());
-        this.addOptions();
-    }
-
-    refresh() {
-        this.addOptions();
-        super.refresh();
-    }
-
-    addOptions() {
-        const options = this.getOptions();
-        if (this.areOptionsSame(options)) return;
-
-        frappe.ui.empty(this.input);
-        for (let value of options) {
-            let option = frappe.ui.add('option', null, this.input, value.label || value);
-            option.setAttribute('value', value.value || value);
-        }
-        this.lastOptions = options;
-    }
-
-    getOptions() {
-        let options = this.options;
-        if (typeof options==='string') {
-            options = options.split('\n');
-        }
-        return options;
-    }
-
-    areOptionsSame(options) {
-        let same = false;
-        if (this.lastOptions && options.length===this.lastOptions.length) {
-            same = options.every((v ,i) => {
-                const v1 = this.lastOptions[i];
-                return (v.value || v) === (v1.value || v1)
-            });
-        }
-        return same;
-    }
-
-    make() {
-        super.make();
-        this.input.setAttribute('row', '3');
-    }
-};
-
-module.exports = SelectControl;
\ No newline at end of file
diff --git a/client/view/controls/table.js b/client/view/controls/table.js
deleted file mode 100644
index 991e75b8..00000000
--- a/client/view/controls/table.js
+++ /dev/null
@@ -1,100 +0,0 @@
-const frappe = require('frappejs');
-const BaseControl = require('./base');
-const ModelTable = require('frappejs/client/ui/modelTable');
-
-class TableControl extends BaseControl {
-    make() {
-        this.makeWrapper();
-        this.modelTable = new ModelTable({
-            doctype: this.childtype,
-            parent: this.wrapper.querySelector('.datatable-wrapper'),
-            parentControl: this,
-            layout: this.layout || 'ratio',
-            getTableData: () => this.getTableData(),
-            getRowData: (rowIndex) => this.doc[this.fieldname][rowIndex],
-            isDisabled: () => this.isDisabled(),
-        });
-        this.setupToolbar();
-    }
-
-    makeWrapper() {
-        this.wrapper = frappe.ui.add('div', 'table-wrapper', this.getInputParent());
-        this.wrapper.innerHTML =
-        `<div class="datatable-wrapper" style="width: 100%"></div>
-        <div class="table-toolbar">
-            <button type="button" class="btn btn-sm btn-outline-secondary btn-add">
-                ${frappe._("Add")}</button>
-            <button type="button" class="btn btn-sm btn-outline-secondary btn-remove">
-                ${frappe._("Remove")}</button>
-        </div>`;
-    }
-
-    setupToolbar() {
-        this.wrapper.querySelector('.btn-add').addEventListener('click', async (event) => {
-            this.doc[this.fieldname].push({});
-            await this.doc.commit();
-            this.refresh();
-        });
-
-        this.wrapper.querySelector('.btn-remove').addEventListener('click', async (event) => {
-            let checked = this.modelTable.getChecked();
-            this.doc[this.fieldname] = this.doc[this.fieldname].filter(d => !checked.includes(d.idx + ''));
-            await this.doc.commit();
-            this.refresh();
-            this.modelTable.checkAll(false);
-        });
-    }
-
-    getInputValue() {
-        return this.doc[this.fieldname];
-    }
-
-    setInputValue(value) {
-        this.modelTable.refresh(this.getTableData(value));
-    }
-
-    setDisabled() {
-        this.refreshToolbar();
-    }
-
-    getToolbar() {
-        return this.wrapper.querySelector('.table-toolbar');
-    }
-
-    refreshToolbar() {
-        const toolbar = this.wrapper.querySelector('.table-toolbar');
-        if (toolbar) {
-            toolbar.classList.toggle('hide', this.isDisabled() ? true : false);
-        }
-    }
-
-    getTableData(value) {
-        return (value && value.length) ? value : this.getDefaultData();
-    }
-
-    getDefaultData() {
-        // build flat table
-        if (!this.doc) {
-            return [];
-        }
-
-        if (!this.doc[this.fieldname]) {
-            this.doc[this.fieldname] = [{idx: 0}];
-        }
-
-        if (this.doc[this.fieldname].length === 0 && this.neverEmpty) {
-            this.doc[this.fieldname] = [{idx: 0}];
-        }
-
-        return this.doc[this.fieldname];
-    }
-
-    checkValidity() {
-        if (!this.modelTable) {
-            return true;
-        }
-        return this.modelTable.checkValidity();
-    }
-};
-
-module.exports = TableControl;
\ No newline at end of file
diff --git a/client/view/controls/text.js b/client/view/controls/text.js
deleted file mode 100644
index 2699473b..00000000
--- a/client/view/controls/text.js
+++ /dev/null
@@ -1,14 +0,0 @@
-const BaseControl = require('./base');
-const frappe = require('frappejs');
-
-class TextControl extends BaseControl {
-    makeInput() {
-        this.input = frappe.ui.add('textarea', 'form-control', this.getInputParent());
-    }
-    make() {
-        super.make();
-        this.input.setAttribute('rows', '8');
-    }
-};
-
-module.exports = TextControl;
\ No newline at end of file
diff --git a/client/view/form.js b/client/view/form.js
deleted file mode 100644
index e5875e8f..00000000
--- a/client/view/form.js
+++ /dev/null
@@ -1,336 +0,0 @@
-const frappe = require('frappejs');
-const controls = require('./controls');
-const FormLayout = require('./formLayout');
-const Observable = require('frappejs/utils/observable');
-const keyboard = require('frappejs/client/ui/keyboard');
-const utils = require('frappejs/client/ui/utils');
-
-module.exports = class BaseForm extends Observable {
-    constructor({doctype, parent, submit_label='Submit', container, meta, inline=false}) {
-        super();
-        Object.assign(this, arguments[0]);
-        this.links = [];
-
-        if (!this.meta) {
-            this.meta = frappe.getMeta(this.doctype);
-        }
-
-        if (this.setup) {
-            this.setup();
-        }
-
-        this.make();
-        this.bindFormEvents();
-
-        if (this.doc) {
-            // bootstrapped with a doc
-            this.bindEvents(this.doc);
-        }
-    }
-
-    make() {
-        if (this.body || !this.parent) {
-            return;
-        }
-
-        if (this.inline) {
-            this.body = this.parent
-        } else {
-            this.body = frappe.ui.add('div', 'form-body', this.parent);
-        }
-
-        if (this.actions) {
-            this.makeToolbar();
-        }
-
-        this.form = frappe.ui.add('form', 'form-container', this.body);
-
-        if (this.inline) {
-            this.form.classList.add('form-inline');
-        }
-
-        this.form.onValidate = true;
-
-        this.formLayout = new FormLayout({
-            fields: this.meta.fields,
-            layout: this.meta.layout
-        });
-
-        this.form.appendChild(this.formLayout.form);
-
-        this.bindKeyboard();
-    }
-
-    bindFormEvents() {
-        if (this.meta.formEvents) {
-            for (let key in this.meta.formEvents) {
-                this.on(key, this.meta.formEvents[key]);
-            }
-        }
-    }
-
-    makeToolbar() {
-        if (this.actions.includes('save')) {
-            this.makeSaveButton();
-
-            if (this.meta.isSubmittable) {
-                this.makeSubmitButton();
-                this.makeRevertButton();
-            }
-        }
-
-        if (this.meta.print && this.actions.includes('print')) {
-            let menu = this.container.getDropdown(frappe._('Menu'));
-            menu.addItem(frappe._("Print"), async (e) => {
-                await frappe.router.setRoute('print', this.doctype, this.doc.name);
-            });
-        }
-
-        if (!this.meta.isSingle && this.actions.includes('delete')) {
-            let menu = this.container.getDropdown(frappe._('Menu'));
-            menu.addItem(frappe._("Delete"), async (e) => {
-                await this.delete();
-            });
-        }
-
-        if (!this.meta.isSingle && this.actions.includes('duplicate')) {
-            let menu = this.container.getDropdown(frappe._('Menu'));
-            menu.addItem(frappe._('Duplicate'), async () => {
-                let newDoc = await frappe.getDuplicate(this.doc);
-                await frappe.router.setRoute('edit', newDoc.doctype, newDoc.name);
-                newDoc.set('name', '');
-            });
-        }
-
-        if (this.meta.settings && this.actions.includes('settings')) {
-            let menu = this.container.getDropdown(frappe._('Menu'));
-            menu.addItem(frappe._('Settings...'), () => {
-                frappe.desk.showFormModal(this.meta.settings, this.meta.settings);
-            });
-        }
-
-    }
-
-    makeSaveButton() {
-        this.saveButton = this.container.addButton(frappe._("Save"), 'primary', async (event) => {
-            await this.save();
-        });
-        this.on('change', () => {
-            const show = this.doc._dirty && !this.doc.submitted;
-            this.saveButton.classList.toggle('hide', !show);
-        });
-    }
-
-    makeSubmitButton() {
-        this.submitButton = this.container.addButton(frappe._("Submit"), 'primary', async (event) => {
-            await this.submit();
-        });
-        this.on('change', () => {
-            const show = this.meta.isSubmittable && !this.doc._dirty && !this.doc.submitted;
-            this.submitButton.classList.toggle('hide', !show);
-        });
-    }
-
-    makeRevertButton() {
-        this.revertButton = this.container.addButton(frappe._("Revert"), 'secondary', async (event) => {
-            await this.revert();
-        });
-        this.on('change', () => {
-            const show = this.meta.isSubmittable && !this.doc._dirty && this.doc.submitted;
-            this.revertButton.classList.toggle('hide', !show);
-        });
-    }
-
-    bindKeyboard() {
-        keyboard.bindKey(this.form, 'ctrl+s', (e) => {
-            if (document.activeElement) {
-                document.activeElement.blur();
-            }
-            e.preventDefault();
-            if (this.doc._notInserted || this.doc._dirty) {
-                this.save();
-            } else {
-                if (this.meta.isSubmittable && !this.doc.submitted) this.submit();
-            }
-        });
-    }
-
-    async setDoc(doctype, name) {
-        this.doc = await frappe.getDoc(doctype, name);
-        this.bindEvents(this.doc);
-        if (this.doc._notInserted && !this.doc._nameCleared) {
-            this.doc._nameCleared = true;
-            // flag so that name is cleared only once
-            await this.doc.set('name', '');
-        }
-        this.setTitle();
-        frappe._curFrm = this;
-    }
-
-    setTitle() {
-        if (!this.container) return;
-
-        const doctypeLabel = this.doc.meta.label || this.doc.meta.name;
-
-        if (this.doc.meta.isSingle || this.doc.meta.naming === 'random') {
-            this.container.setTitle(doctypeLabel);
-        } else if (this.doc._notInserted) {
-            this.container.setTitle(frappe._('New {0}', doctypeLabel));
-        } else {
-            this.container.setTitle(this.doc.name);
-        }
-        if (this.doc.submitted) {
-            // this.container.addTitleBadge('✓', frappe._('Submitted'));
-        }
-    }
-
-    setLinks(label, options) {
-        // set links to helpful reports as identified by this.meta.links
-        if (this.meta.links) {
-            let links = this.getLinks();
-            if (!links.equals(this.links)) {
-                this.refreshLinks(links);
-                this.links = links;
-            }
-        }
-    }
-
-    getLinks() {
-        let links = [];
-        for (let link of this.meta.links) {
-            if (link.condition(this)) {
-                links.push(link);
-            }
-        }
-        return links;
-    }
-
-    refreshLinks(links) {
-        if (!(this.container && this.container.clearLinks)) return;
-
-        this.container.clearLinks();
-        for(let link of links) {
-            // make the link
-            utils.addButton(link.label, this.container.linksElement, () => {
-                let options = link.action(this);
-
-                if (options) {
-                    if (options.params) {
-                        // set route parameters
-                        frappe.params = options.params;
-                    }
-
-                    if (options.route) {
-                        // go to the given route
-                        frappe.router.setRoute(...options.route);
-                    }
-                }
-            });
-        }
-    }
-
-    async bindEvents(doc) {
-        if (this.doc && this.docListener) {
-            // stop listening to the old doc
-            this.doc.off(this.docListener);
-        }
-        this.doc = doc;
-        for (let control of this.formLayout.controlList) {
-            control.bind(this.doc);
-        }
-
-        this.refresh();
-        this.setupDocListener();
-        this.trigger('use', {doc:doc});
-    }
-
-    setupDocListener() {
-        // refresh value in control
-        this.docListener = (params) => {
-            if (params.fieldname) {
-                // only single value changed
-                let control = this.formLayout.controls[params.fieldname];
-                if (control && control.getInputValue() !== control.format(params.fieldname)) {
-                    control.refresh();
-                }
-            } else {
-                // multiple values changed
-                this.refresh();
-            }
-            this.trigger('change');
-            this.form.classList.remove('was-validated');
-        };
-
-        this.doc.on('change', this.docListener);
-        this.trigger('change');
-    }
-
-    checkValidity() {
-        let validity = this.form.checkValidity();
-        if (validity) {
-            for (let control of this.formLayout.controlList) {
-                // check validity in table
-                if (control.fieldtype==='Table') {
-                    validity = control.checkValidity();
-                    if (!validity) {
-                        break;
-                    }
-                }
-            }
-        }
-        return validity;
-    }
-
-    refresh() {
-        this.formLayout.refresh();
-        this.trigger('refresh', this);
-        this.setLinks();
-    }
-
-    async submit() {
-        this.doc.submitted = 1;
-        await this.save();
-    }
-
-    async revert() {
-        this.doc.submitted = 0;
-        await this.save();
-    }
-
-    async save() {
-        if (!this.checkValidity()) {
-            this.form.classList.add('was-validated');
-            return;
-        }
-        try {
-            let oldName = this.doc.name;
-            if (this.doc._notInserted) {
-                await this.doc.insert();
-            } else {
-                await this.doc.update();
-            }
-            frappe.ui.showAlert({message: frappe._('Saved'), color: 'green'});
-            if (oldName !== this.doc.name) {
-                frappe.router.setRoute('edit', this.doctype, this.doc.name);
-                return;
-            }
-            this.refresh();
-            this.trigger('change');
-        } catch (e) {
-            console.error(e);
-            frappe.ui.showAlert({message: frappe._('Failed'), color: 'red'});
-            return;
-        }
-        await this.trigger('save');
-    }
-
-    async delete() {
-        try {
-            await this.doc.delete();
-            frappe.ui.showAlert({message: frappe._('Deleted'), color: 'green'});
-            this.trigger('delete');
-        } catch (e) {
-            frappe.ui.showAlert({message: e, color: 'red'});
-        }
-    }
-}
\ No newline at end of file
diff --git a/client/view/formLayout.js b/client/view/formLayout.js
deleted file mode 100644
index b021c8f0..00000000
--- a/client/view/formLayout.js
+++ /dev/null
@@ -1,109 +0,0 @@
-const frappe = require('frappejs');
-const controls = require('./controls');
-const Observable = require('frappejs/utils/observable');
-
-module.exports = class FormLayout extends Observable {
-    constructor({fields, doc, layout, inline = false, events = []}) {
-        super();
-        Object.assign(this, arguments[0]);
-        this.controls = {};
-        this.controlList = [];
-        this.sections = [];
-        this.links = [];
-
-        this.form = document.createElement('div');
-        this.form.classList.add('form-body');
-
-        if (this.inline) {
-            this.form.classList.add('row');
-            this.form.classList.add('p-0');
-        }
-
-        this.makeLayout();
-
-        if (doc) {
-            this.bindEvents(doc);
-        }
-    }
-
-    makeLayout() {
-        if (this.layout) {
-            for (let section of this.layout) {
-                this.makeSection(section);
-            }
-        } else {
-            this.makeControls(this.fields);
-        }
-    }
-
-    makeSection(section) {
-        const sectionElement = frappe.ui.add('div', 'form-section', this.form);
-        const sectionHead = frappe.ui.add('div', 'form-section-head', sectionElement);
-        const sectionBody = frappe.ui.add('div', 'form-section-body', sectionElement);
-
-        if (section.title) {
-            const head = frappe.ui.add('h6', 'uppercase', sectionHead);
-            head.textContent = section.title;
-        }
-
-        if (section.columns) {
-            sectionBody.classList.add('row');
-            for (let column of section.columns) {
-                let columnElement = frappe.ui.add('div', 'col', sectionBody);
-                this.makeControls(this.getFieldsFromLayoutElement(column.fields), columnElement);
-            }
-        } else {
-            this.makeControls(this.getFieldsFromLayoutElement(section.fields), sectionBody);
-        }
-        this.sections.push(sectionBody);
-    }
-
-    getFieldsFromLayoutElement(fields) {
-        return this.fields.filter(d => fields.includes(d.fieldname));
-    }
-
-    makeControls(fields, parent) {
-        for(let field of fields) {
-            if (!field.hidden && controls.getControlClass(field.fieldtype)) {
-                let control = controls.makeControl({field: field, form: this, parent: parent});
-                this.controlList.push(control);
-                this.controls[field.fieldname] = control;
-                if (this.inline) {
-                    control.inputContainer.classList.add('col');
-                }
-            }
-        }
-    }
-
-    async bindEvents(doc) {
-        this.doc = doc;
-        this.controlList.forEach(control => {
-            control.bind(this.doc);
-        });
-
-        this.doc.on('change', ({doc, fieldname}) => {
-            this.controls[fieldname].refresh();
-        });
-
-        this.refresh();
-    }
-
-    setValue(key, value) {
-        if (!this.doc) return;
-        this.doc.set(key, value);
-    }
-
-    refresh() {
-        this.controlList.forEach(control => {
-            control.refresh();
-        });
-    }
-
-    bindFormEvents() {
-        if (this.events) {
-            for (let key in this.events) {
-                this.on(key, this.events[key]);
-            }
-        }
-    }
-}
\ No newline at end of file
diff --git a/client/view/index.js b/client/view/index.js
deleted file mode 100644
index e2c3ef57..00000000
--- a/client/view/index.js
+++ /dev/null
@@ -1,16 +0,0 @@
-const BaseList = require('frappejs/client/view/list');
-const BaseTree = require('frappejs/client/view/tree');
-const BaseForm = require('frappejs/client/view/form');
-const frappe = require('frappejs');
-
-module.exports = {
-    getFormClass(doctype) {
-        return (frappe.views['Form'] && frappe.views['Form'][doctype]) || BaseForm;
-    },
-    getListClass(doctype) {
-        return (frappe.views['List'] && frappe.views['List'][doctype]) || BaseList;
-    },
-    getTreeClass(doctype) {
-        return (frappe.views['Tree'] && frappe.views['Tree'][doctype] || BaseTree);
-    }
-}
\ No newline at end of file
diff --git a/client/view/list.js b/client/view/list.js
deleted file mode 100644
index abcdbbf6..00000000
--- a/client/view/list.js
+++ /dev/null
@@ -1,319 +0,0 @@
-const frappe = require('frappejs');
-const keyboard = require('frappejs/client/ui/keyboard');
-const Observable = require('frappejs/utils/observable');
-
-module.exports = class BaseList extends Observable {
-    constructor({doctype, parent, fields=[], page}) {
-        super();
-        Object.assign(this, arguments[0]);
-        this.init();
-    }
-
-    init() {
-        this.meta = frappe.getMeta(this.doctype);
-
-        this.start = 0;
-        this.pageLength = 20;
-
-        this.body = null;
-        this.rows = [];
-        this.data = [];
-
-        this.setupTreeSettings();
-
-        frappe.db.on(`change:${this.doctype}`, (params) => {
-            this.refresh();
-        });
-    }
-
-    setupTreeSettings() {
-        // list settings that can be overridden by meta
-        this.listSettings = {
-            getFields: list => list.fields,
-            getRowHTML: (list, data) => {
-                return `<div class="col-11">
-                    ${list.getNameHTML(data)}
-                </div>`;
-            }
-        }
-
-        if (this.meta.listSettings) {
-            Object.assign(this.listSettings, this.meta.listSettings);
-        }
-    }
-
-    makeBody() {
-        if (!this.body) {
-            this.makeToolbar();
-            this.parent.classList.add('list-page');
-            this.body = frappe.ui.add('div', 'list-body', this.parent);
-            this.body.setAttribute('data-doctype', this.doctype);
-            this.makeMoreBtn();
-            this.bindKeys();
-        }
-    }
-
-    async refresh() {
-        return await this.run();
-    }
-
-    async run() {
-        this.makeBody();
-        this.dirty = false;
-
-        let data = await this.getData();
-
-        for (let i=0; i< Math.min(this.pageLength, data.length); i++) {
-            let row = this.getRow(this.start + i);
-            this.renderRow(row, data[i]);
-        }
-
-        if (this.start > 0) {
-            this.data = this.data.concat(data);
-        } else {
-            this.data = data;
-        }
-
-        this.clearEmptyRows();
-        this.updateMore(data.length > this.pageLength);
-        this.selectDefaultRow();
-        this.setActiveListRow();
-        this.trigger('state-change');
-    }
-
-    async getData() {
-        let fields = this.listSettings.getFields(this) || [];
-        this.updateStandardFields(fields);
-        return await frappe.db.getAll({
-            doctype: this.doctype,
-            fields: fields,
-            filters: this.getFilters(),
-            start: this.start,
-            limit: this.pageLength + 1
-        });
-    }
-
-    updateStandardFields(fields) {
-        if (!fields.includes('name')) fields.push('name');
-        if (!fields.includes('modified')) fields.push('modified');
-        if (this.meta.isSubmittable && !fields.includes('submitted')) fields.push('submitted');
-    }
-
-    async append() {
-        this.start += this.pageLength;
-        await this.run();
-    }
-
-    getFilters() {
-        let filters = {};
-        if (this.searchInput.value) {
-            filters.keywords = ['like', '%' + this.searchInput.value + '%'];
-        }
-        return filters;
-    }
-
-    renderRow(row, data) {
-        row.innerHTML = this.getRowBodyHTML(data);
-        row.docName = data.name;
-        row.setAttribute('data-name', data.name);
-    }
-
-    getRowBodyHTML(data) {
-        return `<div class="col-1">
-            <input class="checkbox" type="checkbox" data-name="${data.name}">
-        </div>` + this.listSettings.getRowHTML(this, data);
-    }
-
-
-    getNameHTML(data) {
-        return `<span class="indicator ${this.meta.getIndicatorColor(data)}">${data[this.meta.titleField]}</span>`;
-    }
-
-    getRow(i) {
-        if (!this.rows[i]) {
-            let row = frappe.ui.add('div', 'list-row row no-gutters', this.body);
-
-            // open on click
-            let me = this;
-            row.addEventListener('click', async function(e) {
-                if (!e.target.tagName !== 'input') {
-                    await me.showItem(this.docName);
-                }
-            });
-            row.style.display = 'flex';
-
-            // make element focusable
-            row.setAttribute('tabindex', -1);
-            this.rows[i] = row;
-        }
-        return this.rows[i];
-    }
-
-    refreshRow(doc) {
-        let row = this.getRowByName(doc.name);
-        if (row) {
-            this.renderRow(row, doc);
-        }
-    }
-
-    async showItem(name) {
-        if (this.meta.print) {
-            await frappe.router.setRoute('print', this.doctype, name);
-        } else {
-            await frappe.router.setRoute('edit', this.doctype, name);
-        }
-    }
-
-    getCheckedRowNames() {
-        return [...this.body.querySelectorAll('.checkbox:checked')].map(check => check.getAttribute('data-name'));
-    }
-
-    clearEmptyRows() {
-        if (this.rows.length > this.data.length) {
-            for (let i=this.data.length; i < this.rows.length; i++) {
-                let row = this.getRow(i);
-                row.innerHTML = '';
-                row.style.display = 'none';
-            }
-        }
-    }
-
-    selectDefaultRow() {
-        if (!frappe.desk.body.activePage && this.rows.length) {
-            this.showItem(this.rows[0].docName);
-        }
-    }
-
-    makeToolbar() {
-        this.makeSearch();
-
-        this.btnNew = this.page.addButton(frappe._('New'), 'btn-primary', async () => {
-            await frappe.router.setRoute('new', this.doctype);
-        });
-
-        this.btnDelete = this.page.addButton(frappe._('Delete'), 'btn-secondary hide', async () => {
-            await frappe.db.deleteMany(this.doctype, this.getCheckedRowNames());
-            await this.refresh();
-        });
-
-        this.btnReport = this.page.addButton(frappe._('Report'), 'btn-outline-secondary hide', async () => {
-            await frappe.router.setRoute('table', this.doctype);
-        });
-
-        this.on('state-change', () => {
-            const checkedCount = this.getCheckedRowNames().length;
-            this.btnDelete.classList.toggle('hide', checkedCount ? false : true);
-            this.btnNew.classList.toggle('hide', checkedCount ? true : false);
-            this.btnReport.classList.toggle('hide', checkedCount ? true : false);
-        });
-
-        this.page.body.addEventListener('click', (event) => {
-            if(event.target.classList.contains('checkbox')) {
-                this.trigger('state-change');
-            }
-        })
-    }
-
-    makeSearch() {
-        this.toolbar = frappe.ui.add('div', 'list-toolbar', this.parent);
-        this.toolbar.innerHTML = `
-            <div class="input-group list-search">
-                <input class="form-control" type="text" placeholder="Search...">
-                <div class="input-group-append">
-                    <button class="btn btn-outline-secondary btn-search">Search</button>
-                </div>
-            </div>
-        `;
-
-        this.searchInput = this.toolbar.querySelector('input');
-        this.searchInput.addEventListener('keypress', (event) => {
-            if (event.keyCode===13) {
-                this.refresh();
-            }
-        });
-
-        this.btnSearch = this.toolbar.querySelector('.btn-search');
-        this.btnSearch.addEventListener('click', (event) => {
-            this.refresh();
-        });
-    }
-
-    bindKeys() {
-        keyboard.bindKey(this.body, 'up', () => this.move('up'));
-        keyboard.bindKey(this.body, 'down', () => this.move('down'))
-
-        keyboard.bindKey(this.body, 'right', () => {
-            if (frappe.desk.body.activePage) {
-                frappe.desk.body.activePage.body.querySelector('input').focus();
-            }
-        });
-
-        keyboard.bindKey(this.body, 'n', (e) => {
-            frappe.router.setRoute('new', this.doctype);
-            e.preventDefault();
-        });
-
-        keyboard.bindKey(this.body, 'x', async (e) => {
-            let activeListRow = this.getActiveListRow();
-            if (activeListRow && activeListRow.docName) {
-                e.preventDefault();
-                await frappe.db.delete(this.doctype, activeListRow.docName);
-                frappe.desk.body.activePage.hide();
-            }
-        });
-
-    }
-
-    async move(direction) {
-        let elementRef = direction === 'up' ? 'previousSibling' : 'nextSibling';
-        if (document.activeElement && document.activeElement.classList.contains('list-row')) {
-            let next = document.activeElement[elementRef];
-            if (next && next.docName) {
-                await this.showItem(next.docName);
-            }
-        }
-    }
-
-    makeMoreBtn() {
-        this.btnMore = frappe.ui.add('button', 'btn btn-secondary hide', this.parent, 'More');
-        this.btnMore.addEventListener('click', () => {
-            this.append();
-        })
-    }
-
-    updateMore(show) {
-        if (show) {
-            this.btnMore.classList.remove('hide');
-        } else {
-            this.btnMore.classList.add('hide');
-        }
-    }
-
-    setActiveListRow(name) {
-        let activeListRow = this.getActiveListRow();
-        if (activeListRow) {
-            activeListRow.classList.remove('active');
-        }
-
-        if (!name) {
-            // get name from active page
-            name = frappe.desk.activeDoc && frappe.desk.activeDoc.name;
-        }
-
-        if (name) {
-            let row = this.getRowByName(name);
-            if (row) {
-                row.classList.add('active');
-                row.focus();
-            }
-        }
-    }
-
-    getRowByName(name) {
-        return this.body.querySelector(`.list-row[data-name="${name}"]`);
-    }
-
-    getActiveListRow() {
-        return this.body.querySelector('.list-row.active');
-    }
-};
\ No newline at end of file
diff --git a/client/view/page.js b/client/view/page.js
deleted file mode 100644
index 07a4fb0e..00000000
--- a/client/view/page.js
+++ /dev/null
@@ -1,100 +0,0 @@
-const frappe = require('frappejs');
-const Observable = require('frappejs/utils/observable');
-const Dropdown = require('frappejs/client/ui/dropdown');
-
-module.exports = class Page extends Observable {
-    constructor({title, parent, hasRoute=true} = {}) {
-        super();
-        Object.assign(this, arguments[0]);
-        if (!this.parent) {
-            this.parent = frappe.desk.body;
-        }
-        this.make();
-        this.dropdowns = {};
-        if(this.title) {
-            this.wrapper.setAttribute('title', this.title);
-            this.setTitle(this.title);
-        }
-    }
-
-    make() {
-        this.wrapper = frappe.ui.add('div', 'page hide', this.parent);
-        this.head = frappe.ui.add('div', 'page-nav clearfix hide', this.wrapper);
-        this.titleElement = frappe.ui.add('h3', 'page-title', this.wrapper);
-        this.linksElement = frappe.ui.add('div', 'btn-group page-links hide', this.wrapper);
-        this.body = frappe.ui.add('div', 'page-body', this.wrapper);
-    }
-
-    setTitle(title) {
-        this.titleElement.textContent = title;
-        if (this.hasRoute) {
-            document.title = title;
-        }
-    }
-
-    addTitleBadge(message, title='', style='secondary') {
-        this.titleElement.innerHTML += ` <span class='badge badge-${style}' title='${title}'>
-            ${message}</span>`;
-    }
-
-    clearLinks() {
-        frappe.ui.empty(this.linksElement);
-    }
-
-    hide() {
-        this.parent.activePage = null;
-        this.wrapper.classList.add('hide');
-        this.trigger('hide');
-    }
-
-    addButton(label, className, action) {
-        this.head.classList.remove('hide');
-        this.button = frappe.ui.add('button', 'btn btn-sm float-right ' + this.getClassName(className), this.head);
-        this.button.innerHTML = label;
-        this.button.addEventListener('click', action);
-        return this.button;
-    }
-
-    getDropdown(label) {
-        if (!this.dropdowns[label]) {
-            this.dropdowns[label] = new Dropdown({parent: this.head, label: label,
-                right: true, cssClass: 'btn-secondary btn-sm'});
-        }
-        return this.dropdowns[label];
-    }
-
-    async show(params) {
-        if (this.parent.activePage) {
-            this.parent.activePage.hide();
-        }
-
-        this.wrapper.classList.remove('hide');
-        this.body.classList.remove('hide');
-
-        if (this.page_error) {
-            this.page_error.classList.add('hide');
-        }
-
-        this.parent.activePage = this;
-
-        frappe.desk.toggleCenter(this.fullPage ? false : true);
-    }
-
-    renderError(title, message) {
-        if (!this.page_error) {
-            this.page_error = frappe.ui.add('div', 'page-error', this.wrapper);
-        }
-        this.body.classList.add('hide');
-        this.page_error.classList.remove('hide');
-        this.page_error.innerHTML = `<h3 class="text-extra-muted">${title ? title : ""}</h3><p class="text-muted">${message ? message : ""}</p>`;
-    }
-
-    getClassName(className) {
-        const newName = {
-            'primary': 'btn-primary',
-            'secondary': 'btn-outline-secondary'
-        }[className];
-
-        return newName || className;
-    }
-}
\ No newline at end of file
diff --git a/client/view/tree.js b/client/view/tree.js
deleted file mode 100644
index e4325910..00000000
--- a/client/view/tree.js
+++ /dev/null
@@ -1,180 +0,0 @@
-const frappe = require('frappejs');
-const BaseList = require('./list');
-const Tree = require('frappejs/client/components/tree');
-// const keyboard = require('frappejs/client/ui/keyboard');
-
-module.exports = class BaseTree extends BaseList {
-
-    init() {
-        this.meta = frappe.getMeta(this.doctype);
-
-        this.body = null;
-        this.data = [];
-
-        this.setupTreeSettings();
-
-        frappe.db.on(`change:${this.doctype}`, (params) => {
-            this.refresh();
-        });
-    }
-
-    setupTreeSettings() {
-        // tree settings that can be overridden by meta
-        this.treeSettings = {
-            parentField: `parent${this.doctype}`
-        }
-
-        if (this.meta.treeSettings) {
-            Object.assign(this.treeSettings, this.meta.treeSettings);
-        }
-    }
-
-    async refresh() {
-        return await this.run();
-    }
-
-    async run() {
-        this.makeBody();
-        this.body.innerHTML = '';
-        this.dirty = false;
-
-        const rootLabel = this.treeSettings.getRootLabel ?
-            await this.treeSettings.getRootLabel() :
-            this.doctype;
-
-        this.renderTree(rootLabel);
-        this.trigger('state-change');
-    }
-
-    makeBody() {
-        if (!this.body) {
-            this.makeToolbar();
-            this.parent.classList.add('tree-page');
-            this.body = frappe.ui.add('div', 'tree-body', this.parent);
-            this.body.setAttribute('data-doctype', this.doctype);
-            this.bindKeys();
-        }
-    }
-
-    renderTree(rootLabel) {
-        this.rootNode = {
-            label: rootLabel,
-            value: rootLabel,
-            isRoot: true,
-            isGroup: true,
-            children: null
-        }
-
-        this.treeWrapper = frappe.ui.create(`
-            <f-tree>
-                ${this.getTreeNodeHTML(this.rootNode)}
-            </f-tree>
-        `);
-
-        const rootNode = this.treeWrapper.querySelector('f-tree-node[is-root]');
-        rootNode.props = this.rootNode;
-
-        this.body.appendChild(this.treeWrapper);
-
-        frappe.ui.on(this.treeWrapper, 'tree-node-expand', 'f-tree-node', async (e, treeNode) => {
-            if (!treeNode.expanded) return;
-
-            if (!treeNode.props.children) {
-                const data = await this.getData(treeNode.props);
-                const children = data.map(d => ({
-                    label: d.name,
-                    value: d.name,
-                    isGroup: d.isGroup,
-                    doc: d
-                }));
-                treeNode.props.children = children;
-
-                for (let child of children) {
-                    const childNode = frappe.ui.create(this.getTreeNodeHTML(child));
-                    childNode.props = child;
-                    treeNode.appendChild(childNode);
-                }
-            }
-        });
-
-        frappe.ui.on(this.treeWrapper, 'tree-node-action', 'f-tree-node', (e, treeNode) => {
-            if (treeNode.isRoot) return;
-
-            const button = e.detail.actionEl;
-            const action = button.getAttribute('data-action');
-
-            if (action === 'edit') {
-                this.edit(treeNode.props.doc.name);
-            } else if (action === 'addChild') {
-                this.addChildNode(treeNode.props.doc.name);
-            }
-        });
-
-        rootNode.click(); // open the root node
-    }
-
-    edit(name) {
-        frappe.desk.showFormModal(this.doctype, name);
-    }
-
-    async addChildNode(name) {
-        const newDoc = await frappe.getNewDoc(this.doctype);
-        const formModal = await frappe.desk.showFormModal(this.doctype, newDoc.name);
-        const parentField = this.treeSettings.parentField;
-        if (formModal.form.doc.meta.hasField(parentField)) {
-            formModal.form.doc.set(parentField, name);
-        }
-    }
-
-    async getData(node) {
-        let fields = this.getFields();
-        let filters = {};
-
-        if (node.isRoot) {
-            filters[this.treeSettings.parentField] = '';
-        } else {
-            filters[this.treeSettings.parentField] = node.value;
-        }
-
-        return await frappe.db.getAll({
-            doctype: this.doctype,
-            fields,
-            filters,
-            order_by: 'name',
-            order: 'asc'
-        });
-    }
-
-    getTreeNodeHTML(node) {
-        return (
-            `<f-tree-node
-                label="${node.label}"
-                value="${node.value}"
-                ${node.expanded ? 'expanded' : ''}
-                ${node.isRoot ? 'is-root' : ''}
-                ${node.isGroup ? '' : 'is-leaf'}
-            >
-                ${this.getActionButtonsHTML()}
-            </f-tree-node>`
-        );
-    }
-
-    getActionButtonsHTML() {
-        return [
-            { id: 'edit', label: frappe._('Edit') },
-            { id: 'addChild', label: frappe._('Add Child') },
-            // { id: 'delete', label: frappe._('Delete') },
-        ].map(button => {
-            return `<button class="btn btn-link btn-sm m-0" slot="actions" data-action="${button.id}">
-                ${button.label}
-            </button>`;
-        })
-        .join('');
-    }
-
-    getFields() {
-        let fields = [this.treeSettings.parentField, 'isGroup']
-        this.updateStandardFields(fields);
-        return fields;
-    }
-};

From e436f0c20e61acd2943456d823fda39c6a988794 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Mon, 15 Oct 2018 17:37:54 +0530
Subject: [PATCH 31/57] Scoped styles in Table.vue

---
 ui/components/controls/Table.vue | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/ui/components/controls/Table.vue b/ui/components/controls/Table.vue
index ddd7987f..28e074ac 100644
--- a/ui/components/controls/Table.vue
+++ b/ui/components/controls/Table.vue
@@ -290,32 +290,29 @@ export default {
   }
 };
 </script>
-<style>
-.table-cell .form-control {
+<style lang="scss" scoped>
+td {
   padding: 0;
-  border: none;
-  box-shadow: none;
   outline: none;
 }
 
-.table td {
-  padding: 0;
-}
-
 .table-cell {
   padding: 0.75rem;
   border: 1px solid transparent;
-}
 
-.table [data-fieldtype='Link'] .input-group-append {
-  display: none;
+  &.active {
+    border: 1px solid var(--blue);
+  }
 }
 
-td {
+.form-control, .form-group .form-control {
+  padding: 0;
+  border: none;
+  box-shadow: none;
   outline: none;
 }
 
-.table-cell.active {
-  border: 1px solid var(--blue);
+[data-fieldtype='Link'] .input-group-append {
+  display: none;
 }
 </style>

From 32209ed6616cf2a3fc57492f1e09a140e7bc2998 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Mon, 15 Oct 2018 17:38:07 +0530
Subject: [PATCH 32/57] Feather icon styling

---
 ui/components/FeatherIcon.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/components/FeatherIcon.vue b/ui/components/FeatherIcon.vue
index cc6ecb61..85e32a08 100644
--- a/ui/components/FeatherIcon.vue
+++ b/ui/components/FeatherIcon.vue
@@ -40,7 +40,7 @@ export default {
 </script>
 <style>
 .feather-icon {
-    display: inline-block;
+    display: inline-flex;
 }
 </style>
 

From 8a2f1613b58ff1df509e8aacb9952cfa344994d0 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Sat, 20 Oct 2018 18:00:58 +0530
Subject: [PATCH 33/57] Update webpack config for electron

---
 package.json      |  1 +
 webpack/config.js | 54 +++++++++++++++++++++++++++++++++++++++++------
 webpack/serve.js  |  3 ++-
 webpack/start.js  | 30 +++++++++++++-------------
 4 files changed, 66 insertions(+), 22 deletions(-)

diff --git a/package.json b/package.json
index 598564f4..d2e6abf9 100644
--- a/package.json
+++ b/package.json
@@ -24,6 +24,7 @@
     "css-loader": "^1.0.0",
     "deepmerge": "^2.1.0",
     "electron": "^3.0.2",
+    "electron-builder": "^20.28.4",
     "electron-debug": "^2.0.0",
     "electron-devtools-installer": "^2.2.4",
     "express": "^4.16.2",
diff --git a/webpack/config.js b/webpack/config.js
index 6f1a7464..6a3bb08b 100644
--- a/webpack/config.js
+++ b/webpack/config.js
@@ -1,6 +1,10 @@
 const path = require('path');
 const webpack = require('webpack');
 const { getAppConfig, resolveAppDir } = require('./utils');
+const appPackageJson = require(resolveAppDir('./package.json'));
+const appDependencies = appPackageJson.dependencies;
+const frappeDependencies = require('../package.json').dependencies;
+const allDependencies = Object.assign(frappeDependencies, appDependencies);
 
 const plugins = {
     NamedModules: webpack.NamedModulesPlugin,
@@ -15,16 +19,26 @@ const plugins = {
 
 const appConfig = getAppConfig();
 const isProduction = process.env.NODE_ENV === 'production';
+const isElectron = process.env.ELECTRON === 'true';
+const isMonoRepo = process.env.MONO_REPO === 'true' || true;
+
+const whiteListedModules = ['vue'];
+const externals = Object.keys(allDependencies).filter(d => !whiteListedModules.includes(d))
+
+console.log(externals);
 
 function getConfig() {
     const config = {
         mode: isProduction ? 'production' : 'development',
         context: resolveAppDir(),
-        entry: appConfig.dev.entry,
+        entry: isElectron ? appConfig.electron.entry : appConfig.dev.entry,
+        externals: isElectron ? externals : null,
+        target: isElectron ? 'electron-renderer' : 'web',
         output: {
-            path: path.resolve(appConfig.dev.outputDir),
+            path: isElectron ? resolveAppDir('./dist/electron') : resolveAppDir('./dist'),
             filename: '[name].js',
-            publicPath: appConfig.dev.assetsPublicPath
+            publicPath: appConfig.dev.assetsPublicPath,
+            libraryTarget: isElectron ? 'commonjs2' : null
         },
         devtool: 'cheap-module-eval-source-map',
         module: {
@@ -41,6 +55,10 @@ function getConfig() {
                         !/\.vue\.js/.test(file)
                     )
                 },
+                {
+                    test: /\.node$/,
+                    use: 'node-loader'
+                },
                 {
                     test: /\.css$/,
                     use: [
@@ -59,13 +77,13 @@ function getConfig() {
                 {
                     test: /\.(png|svg|jpg|gif)$/,
                     use: [
-                      'file-loader'
+                        'file-loader'
                     ]
                 }
             ]
         },
         resolve: {
-            extensions: ['.js', '.vue'],
+            extensions: ['.js', '.vue', '.json', '.css', '.node'],
             alias: {
                 'vue$': 'vue/dist/vue.esm.js',
                 'deepmerge$': 'deepmerge/dist/umd.js',
@@ -78,7 +96,10 @@ function getConfig() {
             }),
             new plugins.VueLoader(),
             new plugins.Html({
-                template: resolveAppDir(appConfig.dev.entryHtml)
+                template: resolveAppDir(appConfig.dev.entryHtml),
+                nodeModules: !isProduction
+                  ? isMonoRepo ? resolveAppDir('../../node_modules') : resolveAppDir('./node_modules')
+                  : false
             }),
             new plugins.CaseSensitivePaths(),
             new plugins.NamedModules(),
@@ -115,6 +136,27 @@ function getConfig() {
         }
     }
 
+    // if (process.env.NODE_ENV === 'production') {
+    //     config.devtool = ''
+
+    //     config.plugins.push(
+    //         new BabiliWebpackPlugin(),
+    //         new CopyWebpackPlugin([
+    //             {
+    //                 from: path.join(__dirname, '../static'),
+    //                 to: path.join(__dirname, '../dist/electron/static'),
+    //                 ignore: ['.*']
+    //             }
+    //         ]),
+    //         new webpack.DefinePlugin({
+    //             'process.env.NODE_ENV': '"production"'
+    //         }),
+    //         new webpack.LoaderOptionsPlugin({
+    //             minimize: true
+    //         })
+    //     )
+    // }
+
     return config;
 }
 
diff --git a/webpack/serve.js b/webpack/serve.js
index b13ea65c..c1f59c66 100644
--- a/webpack/serve.js
+++ b/webpack/serve.js
@@ -52,7 +52,8 @@ function startWebpackDevServer() {
 
 function addWebpackEntryPoints(webpackConfig, forDevServer) {
     const devServerEntryPoints = [
-        resolveAppDir('node_modules/webpack-dev-server/client/index.js') + '?http://localhost',
+        // resolveAppDir('node_modules/webpack-dev-server/client/index.js') + '?http://localhost',
+        'webpack-dev-server/client/index.js?http://localhost',
         'webpack/hot/dev-server'
     ];
     const middlewareEntryPoints = [
diff --git a/webpack/start.js b/webpack/start.js
index e2eeb98c..5357657f 100644
--- a/webpack/start.js
+++ b/webpack/start.js
@@ -4,22 +4,22 @@ const { getAppConfig, resolveAppDir } = require('./utils');
 const appConfig = getAppConfig();
 
 module.exports = function start(mode) {
-    process.env.NODE_ENV = 'development';
+  process.env.NODE_ENV = 'development';
 
-    if (mode === 'electron') {
-        const electron = require('electron');
-        const electronPaths = appConfig.electron.paths;
+  if (mode === 'electron') {
+    const electron = require('electron');
+    const electronPaths = appConfig.electron.paths;
 
-        startWebpackDevServer()
-            .then((devServer) => {
-                const p = spawn(electron, [resolveAppDir(electronPaths.mainDev)], { stdio: 'inherit' })
-                p.on('close', () => {
-                    devServer.close();
-                });
-            });
-    } else {
-        const nodePaths = appConfig.node.paths;
+    startWebpackDevServer()
+      .then((devServer) => {
+        const p = spawn(electron, [resolveAppDir(electronPaths.mainDev)], { stdio: 'inherit' })
+        p.on('close', () => {
+          devServer.close();
+        });
+      });
+  } else {
+    const nodePaths = appConfig.node.paths;
 
-        spawn('node', [resolveAppDir(nodePaths.main)], { stdio: 'inherit' })
-    }
+    spawn('node', [resolveAppDir(nodePaths.main)], { stdio: 'inherit' })
+  }
 }
\ No newline at end of file

From 85f9a5ff0256c9af7da73896a992edb8f7bc4f7c Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Sat, 20 Oct 2018 23:30:22 +0530
Subject: [PATCH 34/57] Lock electron version to 2.0.12 and upgrade sqlite3

---
 package.json      | 4 ++--
 webpack/config.js | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index d2e6abf9..2a661815 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,7 @@
     "cors": "^2.8.4",
     "css-loader": "^1.0.0",
     "deepmerge": "^2.1.0",
-    "electron": "^3.0.2",
+    "electron": "2.0.12",
     "electron-builder": "^20.28.4",
     "electron-debug": "^2.0.0",
     "electron-devtools-installer": "^2.2.4",
@@ -52,7 +52,7 @@
     "sharp": "^0.20.8",
     "showdown": "^1.8.6",
     "socket.io": "^2.0.4",
-    "sqlite3": "^3.1.13",
+    "sqlite3": "^4.0.2",
     "vue": "^2.5.16",
     "vue-flatpickr-component": "^7.0.4",
     "vue-loader": "^15.2.6",
diff --git a/webpack/config.js b/webpack/config.js
index 6a3bb08b..4a3c059a 100644
--- a/webpack/config.js
+++ b/webpack/config.js
@@ -20,7 +20,7 @@ const plugins = {
 const appConfig = getAppConfig();
 const isProduction = process.env.NODE_ENV === 'production';
 const isElectron = process.env.ELECTRON === 'true';
-const isMonoRepo = process.env.MONO_REPO === 'true' || true;
+const isMonoRepo = process.env.MONO_REPO === 'true';
 
 const whiteListedModules = ['vue'];
 const externals = Object.keys(allDependencies).filter(d => !whiteListedModules.includes(d))

From af5c34c6fde7c0378fe288351cbffadf662e2abe Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Sun, 21 Oct 2018 13:25:55 +0530
Subject: [PATCH 35/57] Modify config for production build, add build command

---
 cli.js            |   5 +
 package.json      |   1 +
 webpack/build.js  |  47 ++++++++
 webpack/config.js | 266 ++++++++++++++++++++++------------------------
 4 files changed, 182 insertions(+), 137 deletions(-)
 create mode 100644 webpack/build.js

diff --git a/cli.js b/cli.js
index 701c4652..caf76d2f 100755
--- a/cli.js
+++ b/cli.js
@@ -13,6 +13,11 @@ program
     .description('Start development server')
     .action(require('./webpack/start'))
 
+program
+    .command('build [mode]')
+    .description('Build assets for production')
+    .action(require('./webpack/build'))
+
 program
     .command('new-model <name>')
     .description('Create a new model in the `models/doctype` folder')
diff --git a/package.json b/package.json
index 2a661815..51a7aa62 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,7 @@
     "case-sensitive-paths-webpack-plugin": "^2.1.2",
     "codemirror": "^5.35.0",
     "commander": "^2.13.0",
+    "copy-webpack-plugin": "^4.5.4",
     "cors": "^2.8.4",
     "css-loader": "^1.0.0",
     "deepmerge": "^2.1.0",
diff --git a/webpack/build.js b/webpack/build.js
new file mode 100644
index 00000000..bff9b505
--- /dev/null
+++ b/webpack/build.js
@@ -0,0 +1,47 @@
+const webpack = require('webpack');
+const getWebpackConfig = require('./config');
+
+module.exports = function build(mode) {
+  const webpackConfig = getWebpackConfig();
+  process.env.NODE_ENV = 'production';
+
+  if (mode === 'electron') {
+    pack(webpackConfig)
+      .then(result => {
+        console.log(result);
+      }).catch(err => {
+        console.log(`\n  Failed to build renderer process`);
+        console.error(`\n${err}\n`);
+        process.exit(1)
+      })
+  }
+}
+
+function pack(config) {
+  return new Promise((resolve, reject) => {
+    webpack(config, (err, stats) => {
+      if (err) reject(err.stack || err)
+
+      else if (stats.hasErrors()) {
+        let err = ''
+
+        stats
+          .toString({
+            chunks: false,
+            colors: true
+          })
+          .split(/\r?\n/)
+          .forEach(line => {
+            err += `    ${line}\n`
+          });
+
+        reject(err);
+      } else {
+        resolve(stats.toString({
+          chunks: false,
+          colors: true
+        }));
+      }
+    });
+  });
+}
\ No newline at end of file
diff --git a/webpack/config.js b/webpack/config.js
index 4a3c059a..114c5951 100644
--- a/webpack/config.js
+++ b/webpack/config.js
@@ -1,12 +1,10 @@
-const path = require('path');
 const webpack = require('webpack');
 const { getAppConfig, resolveAppDir } = require('./utils');
-const appPackageJson = require(resolveAppDir('./package.json'));
-const appDependencies = appPackageJson.dependencies;
+const appDependencies = require(resolveAppDir('./package.json')).dependencies;
 const frappeDependencies = require('../package.json').dependencies;
-const allDependencies = Object.assign(frappeDependencies, appDependencies);
 
-const plugins = {
+function getConfig() {
+  const plugins = {
     NamedModules: webpack.NamedModulesPlugin,
     HotModuleReplacement: webpack.HotModuleReplacementPlugin,
     Define: webpack.DefinePlugin,
@@ -15,149 +13,143 @@ const plugins = {
     Html: require('html-webpack-plugin'),
     CaseSensitivePaths: require('case-sensitive-paths-webpack-plugin'),
     FriendlyErrors: require('friendly-errors-webpack-plugin'),
-}
-
-const appConfig = getAppConfig();
-const isProduction = process.env.NODE_ENV === 'production';
-const isElectron = process.env.ELECTRON === 'true';
-const isMonoRepo = process.env.MONO_REPO === 'true';
+    CopyWebpackPlugin: require('copy-webpack-plugin')
+  }
 
-const whiteListedModules = ['vue'];
-const externals = Object.keys(allDependencies).filter(d => !whiteListedModules.includes(d))
+  const appConfig = getAppConfig();
+  const isProduction = process.env.NODE_ENV === 'production';
+  const isElectron = process.env.ELECTRON === 'true';
+  const isMonoRepo = process.env.MONO_REPO === 'true';
 
-console.log(externals);
+  const whiteListedModules = ['vue'];
+  const allDependencies = Object.assign(frappeDependencies, appDependencies);
+  const externals = Object.keys(allDependencies).filter(d => !whiteListedModules.includes(d))
 
-function getConfig() {
-    const config = {
-        mode: isProduction ? 'production' : 'development',
-        context: resolveAppDir(),
-        entry: isElectron ? appConfig.electron.entry : appConfig.dev.entry,
-        externals: isElectron ? externals : null,
-        target: isElectron ? 'electron-renderer' : 'web',
-        output: {
-            path: isElectron ? resolveAppDir('./dist/electron') : resolveAppDir('./dist'),
-            filename: '[name].js',
-            publicPath: appConfig.dev.assetsPublicPath,
-            libraryTarget: isElectron ? 'commonjs2' : null
+  const config = {
+    mode: isProduction ? 'production' : 'development',
+    context: resolveAppDir(),
+    entry: isElectron ? appConfig.electron.entry : appConfig.dev.entry,
+    externals: isElectron ? externals : null,
+    target: isElectron ? 'electron-renderer' : 'web',
+    output: {
+      path: isElectron ? resolveAppDir('./dist/electron') : resolveAppDir('./dist'),
+      filename: '[name].js',
+      // publicPath: appConfig.dev.assetsPublicPath,
+      libraryTarget: isElectron ? 'commonjs2' : null
+    },
+    devtool: !isProduction ? 'cheap-module-eval-source-map' : '',
+    module: {
+      rules: [
+        {
+          test: /\.vue$/,
+          loader: 'vue-loader'
         },
-        devtool: 'cheap-module-eval-source-map',
-        module: {
-            rules: [
-                {
-                    test: /\.vue$/,
-                    loader: 'vue-loader'
-                },
-                {
-                    test: /\.js$/,
-                    loader: 'babel-loader',
-                    exclude: file => (
-                        /node_modules/.test(file) &&
-                        !/\.vue\.js/.test(file)
-                    )
-                },
-                {
-                    test: /\.node$/,
-                    use: 'node-loader'
-                },
-                {
-                    test: /\.css$/,
-                    use: [
-                        'vue-style-loader',
-                        'css-loader'
-                    ]
-                },
-                {
-                    test: /\.scss$/,
-                    use: [
-                        'vue-style-loader',
-                        'css-loader',
-                        'sass-loader'
-                    ]
-                },
-                {
-                    test: /\.(png|svg|jpg|gif)$/,
-                    use: [
-                        'file-loader'
-                    ]
-                }
-            ]
+        {
+          test: /\.js$/,
+          loader: 'babel-loader',
+          exclude: file => (
+            /node_modules/.test(file) &&
+            !/\.vue\.js/.test(file)
+          )
         },
-        resolve: {
-            extensions: ['.js', '.vue', '.json', '.css', '.node'],
-            alias: {
-                'vue$': 'vue/dist/vue.esm.js',
-                'deepmerge$': 'deepmerge/dist/umd.js',
-                '@': appConfig.dev.srcDir ? resolveAppDir(appConfig.dev.srcDir) : null
-            }
+        {
+          test: /\.node$/,
+          use: 'node-loader'
         },
-        plugins: [
-            new plugins.Define({
-                'process.env': appConfig.dev.env
-            }),
-            new plugins.VueLoader(),
-            new plugins.Html({
-                template: resolveAppDir(appConfig.dev.entryHtml),
-                nodeModules: !isProduction
-                  ? isMonoRepo ? resolveAppDir('../../node_modules') : resolveAppDir('./node_modules')
-                  : false
-            }),
-            new plugins.CaseSensitivePaths(),
-            new plugins.NamedModules(),
-            new plugins.HotModuleReplacement(),
-            new plugins.FriendlyErrors({
-                compilationSuccessInfo: {
-                    messages: [`FrappeJS server started at http://${appConfig.dev.devServerHost}:${appConfig.dev.devServerPort}`],
-                },
-            }),
-            new plugins.Progress()
-        ],
-        optimization: {
-            noEmitOnErrors: false
+        {
+          test: /\.css$/,
+          use: [
+            'vue-style-loader',
+            'css-loader'
+          ]
         },
-        devServer: {
-            // contentBase: './dist', // dist path is directly configured in express
-            hot: true,
-            quiet: true
+        {
+          test: /\.scss$/,
+          use: [
+            'vue-style-loader',
+            'css-loader',
+            'sass-loader'
+          ]
         },
-        node: {
-            // prevent webpack from injecting useless setImmediate polyfill because Vue
-            // source contains it (although only uses it if it's native).
-            setImmediate: false,
-            // process is injected via DefinePlugin, although some 3rd party
-            // libraries may require a mock to work properly (#934)
-            process: 'mock',
-            // prevent webpack from injecting mocks to Node native modules
-            // that does not make sense for the client
-            dgram: 'empty',
-            fs: 'empty',
-            net: 'empty',
-            tls: 'empty',
-            child_process: 'empty'
+        {
+          test: /\.(png|svg|jpg|gif)$/,
+          use: [
+            'file-loader'
+          ]
         }
+      ]
+    },
+    resolve: {
+      extensions: ['.js', '.vue', '.json', '.css', '.node'],
+      alias: {
+        'vue$': 'vue/dist/vue.esm.js',
+        'deepmerge$': 'deepmerge/dist/umd.js',
+        '@': appConfig.dev.srcDir ? resolveAppDir(appConfig.dev.srcDir) : null
+      }
+    },
+    plugins: [
+      new plugins.Define(Object.assign({
+        'process.env': appConfig.dev.env,
+        'process.env.NODE_ENV': isProduction ? '"production"' : '"development"',
+      }, !isProduction ? {
+        '__static': `"${resolveAppDir(appConfig.staticPath).replace(/\\/g, '\\\\')}"`
+      } : {})),
+      new plugins.VueLoader(),
+      new plugins.Html({
+        template: resolveAppDir(appConfig.dev.entryHtml),
+        nodeModules: !isProduction
+          ? isMonoRepo ? resolveAppDir('../../node_modules') : resolveAppDir('./node_modules')
+          : false
+      }),
+      new plugins.CaseSensitivePaths(),
+      new plugins.NamedModules(),
+      new plugins.HotModuleReplacement(),
+      new plugins.FriendlyErrors({
+        compilationSuccessInfo: {
+          messages: [`FrappeJS server started at http://${appConfig.dev.devServerHost}:${appConfig.dev.devServerPort}`],
+        },
+      }),
+      new plugins.Progress(),
+      isProduction ? new plugins.CopyWebpackPlugin([
+        {
+          from: resolveAppDir(appConfig.staticPath),
+          to: resolveAppDir('./dist/electron/static'),
+          ignore: ['.*']
+        },
+        {
+          from: resolveAppDir(appConfig.electron.paths.main),
+          to: resolveAppDir('./dist/electron/main.js')
+        }
+      ]) : null,
+      // isProduction ? new BabiliWebpackPlugin() : null,
+      // isProduction ? new webpack.LoaderOptionsPlugin({ minimize: true }) : null,
+    ],
+    optimization: {
+      noEmitOnErrors: false
+    },
+    devServer: {
+      // contentBase: './dist', // dist path is directly configured in express
+      hot: true,
+      quiet: true
+    },
+    node: {
+      // prevent webpack from injecting useless setImmediate polyfill because Vue
+      // source contains it (although only uses it if it's native).
+      setImmediate: false,
+      // process is injected via DefinePlugin, although some 3rd party
+      // libraries may require a mock to work properly (#934)
+      process: 'mock',
+      // prevent webpack from injecting mocks to Node native modules
+      // that does not make sense for the client
+      dgram: 'empty',
+      fs: 'empty',
+      net: 'empty',
+      tls: 'empty',
+      child_process: 'empty'
     }
+  }
 
-    // if (process.env.NODE_ENV === 'production') {
-    //     config.devtool = ''
-
-    //     config.plugins.push(
-    //         new BabiliWebpackPlugin(),
-    //         new CopyWebpackPlugin([
-    //             {
-    //                 from: path.join(__dirname, '../static'),
-    //                 to: path.join(__dirname, '../dist/electron/static'),
-    //                 ignore: ['.*']
-    //             }
-    //         ]),
-    //         new webpack.DefinePlugin({
-    //             'process.env.NODE_ENV': '"production"'
-    //         }),
-    //         new webpack.LoaderOptionsPlugin({
-    //             minimize: true
-    //         })
-    //     )
-    // }
-
-    return config;
+  return config;
 }
 
 module.exports = getConfig;

From 82f769dcfe3220e91193b02b5c0f0bfbd32ec3cd Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Sun, 21 Oct 2018 14:36:53 +0530
Subject: [PATCH 36/57] Separate config for electron main

---
 webpack/build.js  |  19 ++-
 webpack/config.js | 315 ++++++++++++++++++++++++++--------------------
 webpack/serve.js  |   2 +-
 3 files changed, 197 insertions(+), 139 deletions(-)

diff --git a/webpack/build.js b/webpack/build.js
index bff9b505..938162f4 100644
--- a/webpack/build.js
+++ b/webpack/build.js
@@ -1,19 +1,30 @@
 const webpack = require('webpack');
-const getWebpackConfig = require('./config');
+const { getConfig, getElectronMainConfig } = require('./config');
 
 module.exports = function build(mode) {
-  const webpackConfig = getWebpackConfig();
+  const rendererConfig = getConfig();
+  const mainConfig = getElectronMainConfig();
+
   process.env.NODE_ENV = 'production';
 
   if (mode === 'electron') {
-    pack(webpackConfig)
+    pack(rendererConfig)
       .then(result => {
         console.log(result);
       }).catch(err => {
         console.log(`\n  Failed to build renderer process`);
         console.error(`\n${err}\n`);
         process.exit(1)
-      })
+      });
+
+    pack(mainConfig)
+      .then(result => {
+        console.log(result);
+      }).catch(err => {
+        console.log(`\n  Failed to build main process`);
+        console.error(`\n${err}\n`);
+        process.exit(1)
+      });
   }
 }
 
diff --git a/webpack/config.js b/webpack/config.js
index 114c5951..858b5503 100644
--- a/webpack/config.js
+++ b/webpack/config.js
@@ -1,21 +1,19 @@
 const webpack = require('webpack');
+
+// plugins
+const VueLoaderPlugin = require('vue-loader/lib/plugin');
+const HtmlWebpackPlugin = require('html-webpack-plugin');
+const CaseSensitivePathsWebpackPlugin = require('case-sensitive-paths-webpack-plugin');
+const FriendlyErrorsWebpackPlugin = require('friendly-errors-webpack-plugin');
+const CopyWebpackPlugin = require('copy-webpack-plugin');
+
 const { getAppConfig, resolveAppDir } = require('./utils');
 const appDependencies = require(resolveAppDir('./package.json')).dependencies;
 const frappeDependencies = require('../package.json').dependencies;
 
-function getConfig() {
-  const plugins = {
-    NamedModules: webpack.NamedModulesPlugin,
-    HotModuleReplacement: webpack.HotModuleReplacementPlugin,
-    Define: webpack.DefinePlugin,
-    Progress: webpack.ProgressPlugin,
-    VueLoader: require('vue-loader/lib/plugin'),
-    Html: require('html-webpack-plugin'),
-    CaseSensitivePaths: require('case-sensitive-paths-webpack-plugin'),
-    FriendlyErrors: require('friendly-errors-webpack-plugin'),
-    CopyWebpackPlugin: require('copy-webpack-plugin')
-  }
+let getConfig, getElectronMainConfig;
 
+function makeConfig() {
   const appConfig = getAppConfig();
   const isProduction = process.env.NODE_ENV === 'production';
   const isElectron = process.env.ELECTRON === 'true';
@@ -23,133 +21,182 @@ function getConfig() {
 
   const whiteListedModules = ['vue'];
   const allDependencies = Object.assign(frappeDependencies, appDependencies);
-  const externals = Object.keys(allDependencies).filter(d => !whiteListedModules.includes(d))
+  const externals = Object.keys(allDependencies).filter(d => !whiteListedModules.includes(d));
 
-  const config = {
-    mode: isProduction ? 'production' : 'development',
-    context: resolveAppDir(),
-    entry: isElectron ? appConfig.electron.entry : appConfig.dev.entry,
-    externals: isElectron ? externals : null,
-    target: isElectron ? 'electron-renderer' : 'web',
-    output: {
-      path: isElectron ? resolveAppDir('./dist/electron') : resolveAppDir('./dist'),
-      filename: '[name].js',
-      // publicPath: appConfig.dev.assetsPublicPath,
-      libraryTarget: isElectron ? 'commonjs2' : null
-    },
-    devtool: !isProduction ? 'cheap-module-eval-source-map' : '',
-    module: {
-      rules: [
-        {
-          test: /\.vue$/,
-          loader: 'vue-loader'
-        },
-        {
-          test: /\.js$/,
-          loader: 'babel-loader',
-          exclude: file => (
-            /node_modules/.test(file) &&
-            !/\.vue\.js/.test(file)
-          )
-        },
-        {
-          test: /\.node$/,
-          use: 'node-loader'
-        },
-        {
-          test: /\.css$/,
-          use: [
-            'vue-style-loader',
-            'css-loader'
-          ]
-        },
-        {
-          test: /\.scss$/,
-          use: [
-            'vue-style-loader',
-            'css-loader',
-            'sass-loader'
-          ]
-        },
-        {
-          test: /\.(png|svg|jpg|gif)$/,
-          use: [
-            'file-loader'
-          ]
+  getConfig = function getConfig() {
+    const config = {
+      mode: isProduction ? 'production' : 'development',
+      context: resolveAppDir(),
+      entry: isElectron ? appConfig.electron.entry : appConfig.dev.entry,
+      externals: isElectron ? externals : null,
+      target: isElectron ? 'electron-renderer' : 'web',
+      output: {
+        path: isElectron ? resolveAppDir('./dist/electron') : resolveAppDir('./dist'),
+        filename: '[name].js',
+        // publicPath: appConfig.dev.assetsPublicPath,
+        libraryTarget: isElectron ? 'commonjs2' : null
+      },
+      devtool: !isProduction ? 'cheap-module-eval-source-map' : '',
+      module: {
+        rules: [
+          {
+            test: /\.vue$/,
+            loader: 'vue-loader'
+          },
+          {
+            test: /\.js$/,
+            loader: 'babel-loader',
+            exclude: file => (
+              /node_modules/.test(file) &&
+              !/\.vue\.js/.test(file)
+            )
+          },
+          {
+            test: /\.node$/,
+            use: 'node-loader'
+          },
+          {
+            test: /\.css$/,
+            use: [
+              'vue-style-loader',
+              'css-loader'
+            ]
+          },
+          {
+            test: /\.scss$/,
+            use: [
+              'vue-style-loader',
+              'css-loader',
+              'sass-loader'
+            ]
+          },
+          {
+            test: /\.(png|svg|jpg|gif)$/,
+            use: [
+              'file-loader'
+            ]
+          }
+        ]
+      },
+      resolve: {
+        extensions: ['.js', '.vue', '.json', '.css', '.node'],
+        alias: {
+          'vue$': 'vue/dist/vue.esm.js',
+          'deepmerge$': 'deepmerge/dist/umd.js',
+          '@': appConfig.dev.srcDir ? resolveAppDir(appConfig.dev.srcDir) : null
         }
-      ]
-    },
-    resolve: {
-      extensions: ['.js', '.vue', '.json', '.css', '.node'],
-      alias: {
-        'vue$': 'vue/dist/vue.esm.js',
-        'deepmerge$': 'deepmerge/dist/umd.js',
-        '@': appConfig.dev.srcDir ? resolveAppDir(appConfig.dev.srcDir) : null
+      },
+      plugins: [
+        new webpack.DefinePlugin(Object.assign({
+          'process.env': appConfig.dev.env,
+          'process.env.NODE_ENV': isProduction ? '"production"' : '"development"',
+        }, !isProduction ? {
+          '__static': `"${resolveAppDir(appConfig.staticPath).replace(/\\/g, '\\\\')}"`
+        } : {})),
+        new VueLoaderPlugin(),
+        new HtmlWebpackPlugin({
+          template: resolveAppDir(appConfig.dev.entryHtml),
+          nodeModules: !isProduction
+            ? isMonoRepo ? resolveAppDir('../../node_modules') : resolveAppDir('./node_modules')
+            : false
+        }),
+        new CaseSensitivePathsWebpackPlugin(),
+        new webpack.NamedModulesPlugin(),
+        new webpack.HotModuleReplacementPlugin(),
+        new FriendlyErrorsWebpackPlugin({
+          compilationSuccessInfo: {
+            messages: [`FrappeJS server started at http://${appConfig.dev.devServerHost}:${appConfig.dev.devServerPort}`],
+          },
+        }),
+        new webpack.ProgressPlugin(),
+        isProduction ? new CopyWebpackPlugin([
+          {
+            from: resolveAppDir(appConfig.staticPath),
+            to: resolveAppDir('./dist/electron/static'),
+            ignore: ['.*']
+          },
+          {
+            from: resolveAppDir(appConfig.electron.paths.main),
+            to: resolveAppDir('./dist/electron/main.js')
+          }
+        ]) : null,
+        // isProduction ? new BabiliWebpackPlugin() : null,
+        // isProduction ? new webpack.LoaderOptionsPlugin({ minimize: true }) : null,
+      ],
+      optimization: {
+        noEmitOnErrors: false
+      },
+      devServer: {
+        // contentBase: './dist', // dist path is directly configured in express
+        hot: true,
+        quiet: true
+      },
+      node: {
+        // prevent webpack from injecting useless setImmediate polyfill because Vue
+        // source contains it (although only uses it if it's native).
+        setImmediate: false,
+        // process is injected via DefinePlugin, although some 3rd party
+        // libraries may require a mock to work properly (#934)
+        process: 'mock',
+        // prevent webpack from injecting mocks to Node native modules
+        // that does not make sense for the client
+        dgram: 'empty',
+        fs: 'empty',
+        net: 'empty',
+        tls: 'empty',
+        child_process: 'empty'
       }
-    },
-    plugins: [
-      new plugins.Define(Object.assign({
-        'process.env': appConfig.dev.env,
-        'process.env.NODE_ENV': isProduction ? '"production"' : '"development"',
-      }, !isProduction ? {
-        '__static': `"${resolveAppDir(appConfig.staticPath).replace(/\\/g, '\\\\')}"`
-      } : {})),
-      new plugins.VueLoader(),
-      new plugins.Html({
-        template: resolveAppDir(appConfig.dev.entryHtml),
-        nodeModules: !isProduction
-          ? isMonoRepo ? resolveAppDir('../../node_modules') : resolveAppDir('./node_modules')
-          : false
-      }),
-      new plugins.CaseSensitivePaths(),
-      new plugins.NamedModules(),
-      new plugins.HotModuleReplacement(),
-      new plugins.FriendlyErrors({
-        compilationSuccessInfo: {
-          messages: [`FrappeJS server started at http://${appConfig.dev.devServerHost}:${appConfig.dev.devServerPort}`],
-        },
-      }),
-      new plugins.Progress(),
-      isProduction ? new plugins.CopyWebpackPlugin([
-        {
-          from: resolveAppDir(appConfig.staticPath),
-          to: resolveAppDir('./dist/electron/static'),
-          ignore: ['.*']
-        },
-        {
-          from: resolveAppDir(appConfig.electron.paths.main),
-          to: resolveAppDir('./dist/electron/main.js')
-        }
-      ]) : null,
-      // isProduction ? new BabiliWebpackPlugin() : null,
-      // isProduction ? new webpack.LoaderOptionsPlugin({ minimize: true }) : null,
-    ],
-    optimization: {
-      noEmitOnErrors: false
-    },
-    devServer: {
-      // contentBase: './dist', // dist path is directly configured in express
-      hot: true,
-      quiet: true
-    },
-    node: {
-      // prevent webpack from injecting useless setImmediate polyfill because Vue
-      // source contains it (although only uses it if it's native).
-      setImmediate: false,
-      // process is injected via DefinePlugin, although some 3rd party
-      // libraries may require a mock to work properly (#934)
-      process: 'mock',
-      // prevent webpack from injecting mocks to Node native modules
-      // that does not make sense for the client
-      dgram: 'empty',
-      fs: 'empty',
-      net: 'empty',
-      tls: 'empty',
-      child_process: 'empty'
     }
+
+    return config;
   }
 
-  return config;
+  getElectronMainConfig = function getElectronMainConfig() {
+    return {
+      entry: {
+        main: resolveAppDir(appConfig.electron.paths.main)
+      },
+      externals: externals,
+      module: {
+        rules: [
+          {
+            test: /\.js$/,
+            use: 'babel-loader',
+            exclude: /node_modules/
+          },
+          {
+            test: /\.node$/,
+            use: 'node-loader'
+          }
+        ]
+      },
+      node: {
+        __dirname: !isProduction,
+        __filename: !isProduction
+      },
+      output: {
+        filename: '[name].js',
+        libraryTarget: 'commonjs2',
+        path: resolveAppDir('./dist/electron')
+      },
+      plugins: [
+        new webpack.NoEmitOnErrorsPlugin(),
+        // isProduction && new BabiliWebpackPlugin(),
+        isProduction && new webpack.DefinePlugin({
+          'process.env.NODE_ENV': '"production"'
+        })
+      ],
+      resolve: {
+        extensions: ['.js', '.json', '.node']
+      },
+      target: 'electron-main'
+    }
+  }
 }
 
-module.exports = getConfig;
+makeConfig();
+
+module.exports = {
+  getConfig,
+  getElectronMainConfig
+};
diff --git a/webpack/serve.js b/webpack/serve.js
index c1f59c66..7f36da0b 100644
--- a/webpack/serve.js
+++ b/webpack/serve.js
@@ -5,7 +5,7 @@ const webpackHotMiddleware = require('webpack-hot-middleware');
 
 const logger = require('./logger');
 const { getAppConfig, resolveAppDir } = require('./utils');
-const getWebpackConfig = require('./config');
+const { getConfig: getWebpackConfig } = require('./config');
 
 const log = logger('serve');
 const warn = logger('serve', 'red');

From 40bc76b71386bcb446c6756e799e27b3896a0ef4 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Sun, 21 Oct 2018 18:02:40 +0530
Subject: [PATCH 37/57] Filter out falsy plugins

---
 webpack/config.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/webpack/config.js b/webpack/config.js
index 858b5503..9ae655c2 100644
--- a/webpack/config.js
+++ b/webpack/config.js
@@ -114,15 +114,11 @@ function makeConfig() {
             from: resolveAppDir(appConfig.staticPath),
             to: resolveAppDir('./dist/electron/static'),
             ignore: ['.*']
-          },
-          {
-            from: resolveAppDir(appConfig.electron.paths.main),
-            to: resolveAppDir('./dist/electron/main.js')
           }
         ]) : null,
         // isProduction ? new BabiliWebpackPlugin() : null,
         // isProduction ? new webpack.LoaderOptionsPlugin({ minimize: true }) : null,
-      ],
+      ].filter(Boolean),
       optimization: {
         noEmitOnErrors: false
       },
@@ -185,7 +181,7 @@ function makeConfig() {
         isProduction && new webpack.DefinePlugin({
           'process.env.NODE_ENV': '"production"'
         })
-      ],
+      ].filter(Boolean),
       resolve: {
         extensions: ['.js', '.json', '.node']
       },

From 3cd937d08fbf898230fa1d1c30fe0fe91af256cc Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Mon, 22 Oct 2018 23:25:59 +0530
Subject: [PATCH 38/57] Add env ELECTRON in config

---
 webpack/config.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/webpack/config.js b/webpack/config.js
index 9ae655c2..9f553257 100644
--- a/webpack/config.js
+++ b/webpack/config.js
@@ -90,6 +90,7 @@ function makeConfig() {
         new webpack.DefinePlugin(Object.assign({
           'process.env': appConfig.dev.env,
           'process.env.NODE_ENV': isProduction ? '"production"' : '"development"',
+          'process.env.ELECTRON': JSON.stringify(process.env.ELECTRON)
         }, !isProduction ? {
           '__static': `"${resolveAppDir(appConfig.staticPath).replace(/\\/g, '\\\\')}"`
         } : {})),

From b99519d86b4f43cd322ce4bb43799f3b47c39c0b Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Mon, 22 Oct 2018 23:26:23 +0530
Subject: [PATCH 39/57] Configurable destination for Electron PDF

---
 server/pdf.js                     | 4 ++--
 ui/components/Print/PrintView.vue | 8 +++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/server/pdf.js b/server/pdf.js
index 319c7f68..d4a9545e 100644
--- a/server/pdf.js
+++ b/server/pdf.js
@@ -17,10 +17,10 @@ async function makePDF(html, filepath) {
     await browser.close();
 }
 
-async function getPDFForElectron(doctype, name) {
+async function getPDFForElectron(doctype, name, destination) {
     const { shell } = require('electron');
     const html = await getHTML(doctype, name);
-    const filepath = path.join(frappe.electronSettings.directory, name + '.pdf');
+    const filepath = path.join(destination, name + '.pdf');
     await makePDF(html, filepath);
     shell.openItem(filepath);
 }
diff --git a/ui/components/Print/PrintView.vue b/ui/components/Print/PrintView.vue
index 82437b85..fbaccfda 100644
--- a/ui/components/Print/PrintView.vue
+++ b/ui/components/Print/PrintView.vue
@@ -35,7 +35,13 @@ export default {
     },
 
     getPDF() {
-      frappe.getPDF(this.doctype, this.name);
+      frappe.call({
+        method: 'print-pdf',
+        args: {
+          doctype: this.doctype,
+          name: this.name
+        }
+      });
     }
   }
 }

From 631cb61c314592218c77841b54a38273c982d2b8 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Mon, 22 Oct 2018 23:33:10 +0530
Subject: [PATCH 40/57] Formula fix for electron

---
 model/document.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/model/document.js b/model/document.js
index 6c7dbf77..b81607de 100644
--- a/model/document.js
+++ b/model/document.js
@@ -255,7 +255,7 @@ module.exports = class BaseDocument extends Observable {
             return true;
           }
 
-          if (!frappe.isServer) {
+          if (!frappe.isServer || frappe.isElectron) {
             if (doc[field.fieldname] == null || doc[field.fieldname] == '') {
               return true;
             }

From bd4c58146200a24f74fdb296457d5b101d09b9ce Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Mon, 22 Oct 2018 23:33:22 +0530
Subject: [PATCH 41/57] Pass doc in ReportFilters

---
 ui/pages/Report/ReportFilters.vue | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/ui/pages/Report/ReportFilters.vue b/ui/pages/Report/ReportFilters.vue
index c6a2f8b6..dc1cc5a2 100644
--- a/ui/pages/Report/ReportFilters.vue
+++ b/ui/pages/Report/ReportFilters.vue
@@ -5,6 +5,7 @@
             :key="docfield.fieldname"
             :docfield="docfield"
             :value="$data.filterValues[docfield.fieldname]"
+            :doc="$data.filterValues"
             @change="updateValue(docfield.fieldname, $event)"/>
     </div>
 </template>
@@ -30,13 +31,6 @@ export default {
       this.$emit('change', this.filterValues);
     }
   },
-  provide() {
-    return {
-      dynamicLinkTarget: reference => {
-        return this.filterValues[reference];
-      }
-    };
-  },
   methods: {
     updateValue(fieldname, value) {
       this.filterValues[fieldname] = value;

From b380812c57d0d1b76c48311c3c96320b9484f0a6 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Tue, 23 Oct 2018 02:20:35 +0530
Subject: [PATCH 42/57] Dont convert md to html in fieldtype Text

---
 utils/format.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/utils/format.js b/utils/format.js
index de80a707..e944fa25 100644
--- a/utils/format.js
+++ b/utils/format.js
@@ -1,5 +1,5 @@
 const numberFormat = require('./numberFormat');
-const markdown = new (require('showdown').Converter)();
+// const markdown = new (require('showdown').Converter)();
 const luxon = require('luxon');
 const frappe = require('frappejs');
 
@@ -13,7 +13,7 @@ module.exports = {
             value = numberFormat.formatNumber(value);
 
         } else if (field.fieldtype === 'Text') {
-            value = markdown.makeHtml(value || '');
+            // value = markdown.makeHtml(value || '');
 
         } else if (field.fieldtype === 'Date') {
             let dateFormat;

From 058011ebe998921bb191d206a4d90d825fd56430 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Tue, 23 Oct 2018 02:20:50 +0530
Subject: [PATCH 43/57] Get filters from docfield in Link

---
 ui/components/controls/Link.vue | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/ui/components/controls/Link.vue b/ui/components/controls/Link.vue
index e0de70fd..f37c5b15 100644
--- a/ui/components/controls/Link.vue
+++ b/ui/components/controls/Link.vue
@@ -10,13 +10,18 @@ export default {
   extends: Autocomplete,
   methods: {
     async getList(query) {
+      let filters = this.docfield.getFilters ?
+        this.docfield.getFilters(query) :
+        null;
+
+      if (query) {
+        if (!filters) filters = {};
+        filters.keywords = ['like', query];
+      }
+
       const list = await frappe.db.getAll({
         doctype: this.getTarget(),
-        filters: query
-          ? {
-              keywords: ['like', query]
-            }
-          : null,
+        filters,
         fields: ['name'],
         limit: 50
       });

From 9fdc94bd93cada675248bb106128a07ae3340439 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Tue, 23 Oct 2018 02:21:19 +0530
Subject: [PATCH 44/57] Link bootstrap css in puppeteer for generating pdf

---
 server/pdf.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/server/pdf.js b/server/pdf.js
index d4a9545e..bdf3aec9 100644
--- a/server/pdf.js
+++ b/server/pdf.js
@@ -10,6 +10,9 @@ async function makePDF(html, filepath) {
     const browser = await puppeteer.launch();
     const page = await browser.newPage();
     await page.setContent(html);
+    await page.addStyleTag({
+      url: 'https://stackpath.bootstrapcdn.com/bootstrap/4.1.3/css/bootstrap.min.css'
+    })
     await page.pdf({
         path: filepath,
         format: 'A4'
@@ -17,9 +20,9 @@ async function makePDF(html, filepath) {
     await browser.close();
 }
 
-async function getPDFForElectron(doctype, name, destination) {
+async function getPDFForElectron(doctype, name, destination, htmlContent) {
     const { shell } = require('electron');
-    const html = await getHTML(doctype, name);
+    const html = htmlContent || await getHTML(doctype, name);
     const filepath = path.join(destination, name + '.pdf');
     await makePDF(html, filepath);
     shell.openItem(filepath);

From 610d592310a41a82ffefcdb473467523c4faed35 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Tue, 23 Oct 2018 02:21:34 +0530
Subject: [PATCH 45/57] minor

---
 ui/components/Form/FormActions.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ui/components/Form/FormActions.vue b/ui/components/Form/FormActions.vue
index 1e3d9fe7..4e052997 100644
--- a/ui/components/Form/FormActions.vue
+++ b/ui/components/Form/FormActions.vue
@@ -34,13 +34,14 @@ export default {
   },
   created() {
     this.doc.on('change', () => {
-      this.isDirty = this.doc._dirty;
       this.updateShowSubmittable();
     });
     this.updateShowSubmittable();
   },
   methods: {
     updateShowSubmittable() {
+      this.isDirty = this.doc._dirty;
+
       this.showSubmit =
         this.meta.isSubmittable
         && !this.isDirty

From 2884c157ec06459fe5ed79c9c3323c6b9ac27ab4 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Tue, 23 Oct 2018 09:46:50 +0530
Subject: [PATCH 46/57] Emit updateDoc event from FormLayout

---
 ui/components/Form/FormLayout.vue | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/ui/components/Form/FormLayout.vue b/ui/components/Form/FormLayout.vue
index 58048f5f..7eed8b6c 100644
--- a/ui/components/Form/FormLayout.vue
+++ b/ui/components/Form/FormLayout.vue
@@ -66,6 +66,10 @@ export default {
     },
     updateDoc(fieldname, value) {
       this.doc.set(fieldname, value);
+      this.$emit('updateDoc', {
+        fieldname,
+        value
+      });
     },
     showSection(i) {
       if (this.layoutConfig.paginated) {

From 8ee664e81ed66c56f828cde910fe9f3bb9ff7433 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Tue, 23 Oct 2018 09:47:30 +0530
Subject: [PATCH 47/57] Report filters 4 column

---
 ui/pages/Report/ReportFilters.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/pages/Report/ReportFilters.vue b/ui/pages/Report/ReportFilters.vue
index dc1cc5a2..5e6dcd15 100644
--- a/ui/pages/Report/ReportFilters.vue
+++ b/ui/pages/Report/ReportFilters.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="row pb-4">
-        <frappe-control class="col-lg col-md-3 col-sm-6"
+        <frappe-control class="col-4"
             v-for="docfield in filters"
             :key="docfield.fieldname"
             :docfield="docfield"

From 1a2e70f5b0ad0671208bc9cf9e03c3be3ccf6cdd Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Tue, 23 Oct 2018 22:54:21 +0530
Subject: [PATCH 48/57] fix style for tree node

---
 ui/components/Tree/TreeNode.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ui/components/Tree/TreeNode.vue b/ui/components/Tree/TreeNode.vue
index 392c084e..0420b219 100644
--- a/ui/components/Tree/TreeNode.vue
+++ b/ui/components/Tree/TreeNode.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="tree-node">
     <div class="tree-label px-3 py-2" @click.self="toggleChildren">
-      <div @click="toggleChildren">
-        <feather-icon :name="iconName" v-show="iconName" />
+      <div class="d-flex align-items-center" @click="toggleChildren">
+        <feather-icon class="mr-1" :name="iconName" v-show="iconName" />
         <span>{{ label }}</span>
       </div>
     </div>
@@ -43,9 +43,9 @@ const TreeNode = {
     },
     async getChildren() {
       if (this.children) return;
-      
+
       this.children = [];
-      
+
       let filters = {
         [this.settings.parentField]: this.parentValue
       };

From 029bea1cfedda49f46d2efe88fb2d65c1586a6dd Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Tue, 23 Oct 2018 23:42:05 +0530
Subject: [PATCH 49/57] Table styles

---
 ui/components/controls/Table.vue | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/ui/components/controls/Table.vue b/ui/components/controls/Table.vue
index 28e074ac..4f4adeb0 100644
--- a/ui/components/controls/Table.vue
+++ b/ui/components/controls/Table.vue
@@ -47,9 +47,9 @@
                 :autofocus="true"
                 @change="onCellChange(i, column.fieldname, $event)"
               />
-              <span v-else>
+              <div class="text-truncate" v-else>
                 {{ row[column.fieldname] || '&nbsp;' }}
-              </span>
+              </div>
             </div>
           </td>
         </tr>
@@ -305,7 +305,14 @@ td {
   }
 }
 
-.form-control, .form-group .form-control {
+.form-control {
+  padding: 0;
+  border: none;
+  box-shadow: none;
+  outline: none;
+}
+
+.form-group /deep/ .form-control {
   padding: 0;
   border: none;
   box-shadow: none;

From c5beae43537cb9acd459702b084cefc0356b4582 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Wed, 24 Oct 2018 00:09:09 +0530
Subject: [PATCH 50/57] Add cross-env

---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index 51a7aa62..9273984c 100644
--- a/package.json
+++ b/package.json
@@ -22,6 +22,7 @@
     "commander": "^2.13.0",
     "copy-webpack-plugin": "^4.5.4",
     "cors": "^2.8.4",
+    "cross-env": "^5.2.0",
     "css-loader": "^1.0.0",
     "deepmerge": "^2.1.0",
     "electron": "2.0.12",

From c8b05140e90ba6138ac4c625c58135d66bc11cf5 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Wed, 24 Oct 2018 23:22:02 +0530
Subject: [PATCH 51/57] Use electron to generate pdf

---
 server/pdf.js | 32 +++++++++++++++++++++++++++++---
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/server/pdf.js b/server/pdf.js
index bdf3aec9..8864bf7f 100644
--- a/server/pdf.js
+++ b/server/pdf.js
@@ -21,11 +21,37 @@ async function makePDF(html, filepath) {
 }
 
 async function getPDFForElectron(doctype, name, destination, htmlContent) {
-    const { shell } = require('electron');
+    const { remote, shell } = require('electron');
+    const { BrowserWindow } = remote;
     const html = htmlContent || await getHTML(doctype, name);
     const filepath = path.join(destination, name + '.pdf');
-    await makePDF(html, filepath);
-    shell.openItem(filepath);
+
+    const fs = require('fs')
+    let printWindow = new BrowserWindow({width: 600, height: 800})
+    printWindow.loadURL(`file://${path.join(__static, 'print.html')}`);
+
+    printWindow.on('closed', () => {
+      printWindow = null;
+    });
+
+    const code = `
+      document.body.innerHTML = \`${html}\`;
+    `;
+
+    printWindow.webContents.executeJavaScript(code);
+
+    printWindow.webContents.on('did-finish-load', () => {
+      printWindow.webContents.printToPDF({}, (error, data) => {
+        if (error) throw error
+        printWindow.close();
+        fs.writeFile(filepath, data, (error) => {
+          if (error) throw error
+          console.log('Write PDF successfully.')
+          shell.openItem(filepath);
+        })
+      })
+    })
+    // await makePDF(html, filepath);
 }
 
 function setupExpressRoute() {

From cb731ba45f67287a350a5f79692ab8eedbffb483 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Wed, 24 Oct 2018 23:42:40 +0530
Subject: [PATCH 52/57] Load printwindow in background

---
 server/pdf.js | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/server/pdf.js b/server/pdf.js
index 8864bf7f..a342437e 100644
--- a/server/pdf.js
+++ b/server/pdf.js
@@ -27,7 +27,11 @@ async function getPDFForElectron(doctype, name, destination, htmlContent) {
     const filepath = path.join(destination, name + '.pdf');
 
     const fs = require('fs')
-    let printWindow = new BrowserWindow({width: 600, height: 800})
+    let printWindow = new BrowserWindow({
+      width: 600,
+      height: 800,
+      show: false
+    })
     printWindow.loadURL(`file://${path.join(__static, 'print.html')}`);
 
     printWindow.on('closed', () => {
@@ -40,17 +44,20 @@ async function getPDFForElectron(doctype, name, destination, htmlContent) {
 
     printWindow.webContents.executeJavaScript(code);
 
-    printWindow.webContents.on('did-finish-load', () => {
-      printWindow.webContents.printToPDF({}, (error, data) => {
-        if (error) throw error
-        printWindow.close();
-        fs.writeFile(filepath, data, (error) => {
+    const printPromise = new Promise(resolve => {
+      printWindow.webContents.on('did-finish-load', () => {
+        printWindow.webContents.printToPDF({}, (error, data) => {
           if (error) throw error
-          console.log('Write PDF successfully.')
-          shell.openItem(filepath);
+          printWindow.close();
+          fs.writeFile(filepath, data, (error) => {
+            if (error) throw error
+            resolve(shell.openItem(filepath));
+          })
         })
       })
     })
+
+    await printPromise;
     // await makePDF(html, filepath);
 }
 

From 9fd9452d27a2dc10fa7c22738e0cb86736ee217f Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Thu, 25 Oct 2018 00:06:27 +0530
Subject: [PATCH 53/57] Show Print only if doc is submitted and has printFormat

---
 ui/components/Form/FormActions.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/ui/components/Form/FormActions.vue b/ui/components/Form/FormActions.vue
index 4e052997..cae77d36 100644
--- a/ui/components/Form/FormActions.vue
+++ b/ui/components/Form/FormActions.vue
@@ -5,7 +5,7 @@
       <f-button primary v-if="showSave" :disabled="disableSave" @click="$emit('save')">{{ _('Save') }}</f-button>
       <f-button primary v-if="showSubmit" @click="$emit('submit')">{{ _('Submit') }}</f-button>
       <f-button secondary v-if="showRevert" @click="$emit('revert')">{{ _('Revert') }}</f-button>
-      <div class="ml-2">
+      <div class="ml-2" v-if="showPrint">
         <f-button secondary v-if="showNextAction" @click="$emit('print')">{{ _('Print') }}</f-button>
       </div>
       <dropdown class="ml-2" v-if="showNextAction" :label="_('Actions')" :options="links"></dropdown>
@@ -29,6 +29,7 @@ export default {
       showSubmit: false,
       showRevert: false,
       showNextAction: false,
+      showPrint: false,
       disableSave: false
     }
   },
@@ -60,6 +61,10 @@ export default {
         !this.doc._notInserted
         && this.links.length;
 
+      this.showPrint =
+        this.doc.submitted === 1
+        && this.meta.print
+
       this.showSave =
         this.doc._notInserted ?
           true :

From e8c2e5cca626b0d441ae004ec4da7c29c6e73fb9 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Fri, 26 Oct 2018 02:28:08 +0530
Subject: [PATCH 54/57] Make reportColumns a method

---
 ui/pages/Report/index.vue | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/ui/pages/Report/index.vue b/ui/pages/Report/index.vue
index e767b6c7..4efd0877 100644
--- a/ui/pages/Report/index.vue
+++ b/ui/pages/Report/index.vue
@@ -18,11 +18,6 @@ export default {
   name: 'Report',
   props: ['reportName', 'reportConfig', 'filters'],
   computed: {
-    reportColumns() {
-      return utils.convertFieldsToDatatableColumns(
-        this.reportConfig.getColumns()
-      );
-    },
     filtersExists() {
       return (this.reportConfig.filterFields || []).length;
     }
@@ -42,7 +37,7 @@ export default {
       }
 
       if (data.columns) {
-        columns = data.columns;
+        columns = this.getColumns(data);
       }
 
       if (!rows) {
@@ -50,7 +45,7 @@ export default {
       }
 
       if (!columns) {
-        columns = this.reportColumns;
+        columns = this.getColumns();
       }
 
       for(let column of columns) {
@@ -65,6 +60,10 @@ export default {
           data: rows
         });
       }
+    },
+    getColumns(data) {
+      const columns = this.reportConfig.getColumns(data);
+      return utils.convertFieldsToDatatableColumns(columns);
     }
   },
   components: {

From 48a3db73544d5f6b6d79c226788a43a7bab60f1c Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Fri, 26 Oct 2018 02:28:24 +0530
Subject: [PATCH 55/57] Default onClose value should be noop function

---
 ui/plugins/formModal.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/plugins/formModal.js b/ui/plugins/formModal.js
index 211b5d80..11a81854 100644
--- a/ui/plugins/formModal.js
+++ b/ui/plugins/formModal.js
@@ -8,7 +8,7 @@ export default function installFormModal(Vue) {
         let id;
 
         const open = (doc, options = {}) => {
-          const { defaultValues = null, onClose = null } = options;
+          const { defaultValues = null, onClose = () => {} } = options;
           id = this.$modal.show({
             component: Form,
             props: {

From 7be8302bc26b5ab98f29f93b889d4fd949362950 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Sat, 10 Nov 2018 00:36:59 +0530
Subject: [PATCH 56/57] Set undefined instead of null for web config to work

---
 webpack/config.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webpack/config.js b/webpack/config.js
index 9f553257..eedb1f70 100644
--- a/webpack/config.js
+++ b/webpack/config.js
@@ -28,13 +28,13 @@ function makeConfig() {
       mode: isProduction ? 'production' : 'development',
       context: resolveAppDir(),
       entry: isElectron ? appConfig.electron.entry : appConfig.dev.entry,
-      externals: isElectron ? externals : null,
+      externals: isElectron ? externals : undefined,
       target: isElectron ? 'electron-renderer' : 'web',
       output: {
         path: isElectron ? resolveAppDir('./dist/electron') : resolveAppDir('./dist'),
         filename: '[name].js',
         // publicPath: appConfig.dev.assetsPublicPath,
-        libraryTarget: isElectron ? 'commonjs2' : null
+        libraryTarget: isElectron ? 'commonjs2' : undefined
       },
       devtool: !isProduction ? 'cheap-module-eval-source-map' : '',
       module: {

From 3e6b741556b692e0bbed3152f4b1cd132766aec3 Mon Sep 17 00:00:00 2001
From: Faris Ansari <netchamp.faris@gmail.com>
Date: Sat, 10 Nov 2018 00:37:14 +0530
Subject: [PATCH 57/57] Use isNew() instead of _notInserted

---
 backends/database.js               |  4 ++--
 model/document.js                  |  6 +++++-
 ui/components/Form/Form.vue        |  4 ++--
 ui/components/Form/FormActions.vue | 12 ++++++------
 ui/components/Form/FormLayout.vue  |  2 +-
 5 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/backends/database.js b/backends/database.js
index dfe5a19b..67096c4c 100644
--- a/backends/database.js
+++ b/backends/database.js
@@ -195,8 +195,8 @@ module.exports = class Database extends Observable {
   }
 
   triggerChange(doctype, name) {
-    this.trigger(`change:${doctype}`, { name: name }, 500);
-    this.trigger(`change`, { doctype: name, name: name }, 500);
+    this.trigger(`change:${doctype}`, { name }, 500);
+    this.trigger(`change`, { doctype, name }, 500);
   }
 
   async insert(doctype, doc) {
diff --git a/model/document.js b/model/document.js
index b81607de..051a6459 100644
--- a/model/document.js
+++ b/model/document.js
@@ -188,7 +188,7 @@ module.exports = class BaseDocument extends Observable {
     }
 
     async compareWithCurrentDoc() {
-        if (frappe.isServer && !this._notInserted) {
+        if (frappe.isServer && !this.isNew()) {
             let currentDoc = await frappe.db.get(this.doctype, this.name);
 
             // check for conflict
@@ -347,4 +347,8 @@ module.exports = class BaseDocument extends Observable {
         }
         return _values[fieldname];
     }
+
+    isNew() {
+      return this._notInserted;
+    }
 };
diff --git a/ui/components/Form/Form.vue b/ui/components/Form/Form.vue
index e9ac15f0..64ea7839 100644
--- a/ui/components/Form/Form.vue
+++ b/ui/components/Form/Form.vue
@@ -56,7 +56,7 @@ export default {
     try {
       this.doc = await frappe.getDoc(this.doctype, this.name);
 
-      if (this.doc._notInserted && this.meta.fields.map(df => df.fieldname).includes('name')) {
+      if (this.doc.isNew() && this.meta.fields.map(df => df.fieldname).includes('name')) {
         // For a user editable name field,
         // it should be unset since it is autogenerated
         this.doc.set('name', '');
@@ -82,7 +82,7 @@ export default {
       if (this.invalid) return;
 
       try {
-        if (this.doc._notInserted) {
+        if (this.doc.isNew()) {
           await this.doc.insert();
         } else {
           await this.doc.update();
diff --git a/ui/components/Form/FormActions.vue b/ui/components/Form/FormActions.vue
index cae77d36..d3c0b75d 100644
--- a/ui/components/Form/FormActions.vue
+++ b/ui/components/Form/FormActions.vue
@@ -46,19 +46,19 @@ export default {
       this.showSubmit =
         this.meta.isSubmittable
         && !this.isDirty
-        && !this.doc._notInserted
+        && !this.doc.isNew()
         && this.doc.submitted === 0;
 
       this.showRevert =
         this.meta.isSubmittable
         && !this.isDirty
-        && !this.doc._notInserted
+        && !this.doc.isNew()
         && this.doc.submitted === 1;
 
       this.showNextAction = 1
 
       this.showNextAction =
-        !this.doc._notInserted
+        !this.doc.isNew()
         && this.links.length;
 
       this.showPrint =
@@ -66,14 +66,14 @@ export default {
         && this.meta.print
 
       this.showSave =
-        this.doc._notInserted ?
+        this.doc.isNew() ?
           true :
             this.meta.isSubmittable ?
               (this.isDirty ? true : false) :
               true;
 
       this.disableSave =
-        this.doc._notInserted ? false : !this.isDirty;
+        this.doc.isNew() ? false : !this.isDirty;
     }
   },
   computed: {
@@ -83,7 +83,7 @@ export default {
     title() {
       const _ = this._;
 
-      if (this.doc._notInserted) {
+      if (this.doc.isNew()) {
         return _('New {0}', _(this.doc.doctype));
       }
 
diff --git a/ui/components/Form/FormLayout.vue b/ui/components/Form/FormLayout.vue
index 7eed8b6c..6492a3e2 100644
--- a/ui/components/Form/FormLayout.vue
+++ b/ui/components/Form/FormLayout.vue
@@ -58,7 +58,7 @@ export default {
         return false;
       }
 
-      if (fieldname === 'name' && !this.doc._notInserted) {
+      if (fieldname === 'name' && !this.doc.isNew()) {
         return false;
       }