From be3fc29fe94e803321f285784f9b448745065f23 Mon Sep 17 00:00:00 2001
From: tobiaschielens <tobias.chielens@gmail.com>
Date: Thu, 10 Oct 2019 17:48:35 +0200
Subject: [PATCH 1/6] favorite works

---
 .../emaillistitem/emaillistitem.html          |  6 +++---
 src/components/emaillistitem/emaillistitem.js | 19 ++++++++++++++++---
 src/services/mailService.js                   | 10 ++++++++++
 src/store/mailStore.js                        | 10 ++++++++--
 4 files changed, 37 insertions(+), 8 deletions(-)

diff --git a/src/components/emaillistitem/emaillistitem.html b/src/components/emaillistitem/emaillistitem.html
index f3ab73b..49f4acc 100644
--- a/src/components/emaillistitem/emaillistitem.html
+++ b/src/components/emaillistitem/emaillistitem.html
@@ -2,9 +2,9 @@
   <v-list-item @click="$emit('click')"  @contextmenu.prevent="$refs.menu.open">
     <template v-slot:default="{ active, toggle }">
       <v-row align="center">
-        <v-col cols="2" align="center">
+        <v-col cols="2" align="center" @click="changePriority">
           <v-list-item-action>
-            <v-icon v-if="!email.star" color="grey lighten-1">
+            <v-icon v-if="!email.priority" color="grey lighten-1">
               far fa-star
             </v-icon>
             
@@ -31,7 +31,7 @@
   <vue-context ref="menu">
       <v-list three-line>
         <v-list-item v-for="(box, key) in boxes" :key=key>
-            <v-list-item-title @click=moveMail(email.id,box.name)>Move to {{box.name}}</v-list-item-title>
+            <v-list-item-title @click=moveMail(box.name)>Move to {{box.name}}</v-list-item-title>
           </v-list-item>
         </v-list>
       </vue-context>
diff --git a/src/components/emaillistitem/emaillistitem.js b/src/components/emaillistitem/emaillistitem.js
index dda0093..c114807 100644
--- a/src/components/emaillistitem/emaillistitem.js
+++ b/src/components/emaillistitem/emaillistitem.js
@@ -30,10 +30,23 @@ export default {
   },
   methods: {
     ...mapActions([
-      'updateFolder'
+      'updateFolder',
+      'updatePriority'
     ]),
-    moveMail (id, folder) {
-      this.updateFolder(id, folder)
+    moveMail (folder) {
+      console.log(this.email.id)
+      console.log(folder)
+      this.updateFolder({
+        mailId: this.email.id,
+        folder: folder
+      })
+    },
+    changePriority () {
+      this.updatePriority({
+        mailId: this.email.id,
+        priority: !this.email.priority
+      })
+      this.email.priority = !this.email.priority
     }
   }
 }
diff --git a/src/services/mailService.js b/src/services/mailService.js
index 461f784..aceb56e 100644
--- a/src/services/mailService.js
+++ b/src/services/mailService.js
@@ -33,5 +33,15 @@ export default ({
         folder_name: folder
       }
     })
+  },
+  updatePriority (id, priority) {
+    console.log("mailservice.js")
+    console.log(priority)
+    return Axios.post(`${config.jsApiUrl}mail/update_priority`, {
+      args: {
+        mail_id: id,
+        priority: priority
+      }
+    })
   }
 })
diff --git a/src/store/mailStore.js b/src/store/mailStore.js
index 75e720b..a1142f1 100644
--- a/src/store/mailStore.js
+++ b/src/store/mailStore.js
@@ -36,12 +36,18 @@ export default ({
         console.error(error)
       })
     },
-    updateFolder: (context, mailId, folder) => {
-      mailService.updateFolder(mailId, folder).then((response) => {
+    updateFolder: (context, data) => {
+      mailService.updateFolder(data.mailId, data.folder).then((response) => {
         context.dispatch('getMails')
       }).catch((error) => {
         console.error(error)
       })
+    },
+    updatePriority: (context, data) => {
+      mailService.updatePriority(data.mailId, data.priority).then((response) => {
+      }).catch((error) => {
+        console.error(error)
+      })
     }
   },
   mutations: {

From 0397699c417ca13a512b0725abf5c1f6cb07c1e7 Mon Sep 17 00:00:00 2001
From: tobiaschielens <tobias.chielens@gmail.com>
Date: Thu, 10 Oct 2019 17:51:11 +0200
Subject: [PATCH 2/6] removed console.log

---
 src/components/emaillistitem/emaillistitem.js | 2 --
 src/services/mailService.js                   | 2 --
 2 files changed, 4 deletions(-)

diff --git a/src/components/emaillistitem/emaillistitem.js b/src/components/emaillistitem/emaillistitem.js
index c114807..c61381e 100644
--- a/src/components/emaillistitem/emaillistitem.js
+++ b/src/components/emaillistitem/emaillistitem.js
@@ -34,8 +34,6 @@ export default {
       'updatePriority'
     ]),
     moveMail (folder) {
-      console.log(this.email.id)
-      console.log(folder)
       this.updateFolder({
         mailId: this.email.id,
         folder: folder
diff --git a/src/services/mailService.js b/src/services/mailService.js
index aceb56e..dba77b2 100644
--- a/src/services/mailService.js
+++ b/src/services/mailService.js
@@ -35,8 +35,6 @@ export default ({
     })
   },
   updatePriority (id, priority) {
-    console.log("mailservice.js")
-    console.log(priority)
     return Axios.post(`${config.jsApiUrl}mail/update_priority`, {
       args: {
         mail_id: id,

From 5c13ca6b2526dbdd08c02bb3020ba24cad9a1b2c Mon Sep 17 00:00:00 2001
From: tobiaschielens <tobias.chielens@gmail.com>
Date: Fri, 11 Oct 2019 16:08:27 +0200
Subject: [PATCH 3/6] drag and drop works

---
 package.json                                   |  1 +
 .../emaillistitem/emaillistitem.html           |  3 +++
 src/components/emaillistitem/emaillistitem.js  |  4 ++--
 .../emailnavigation/emailnavigation.html       | 18 ++++++++++--------
 .../emailnavigation/emailnavigation.js         | 13 ++++++++++++-
 src/services/mailService.js                    |  2 +-
 6 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/package.json b/package.json
index b1e00d0..60ac3e8 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,7 @@
     "tweetnacl-util": "^0.15.0",
     "vue": "^2.6.10",
     "vue-context": "^4.0.3",
+    "vue-drag-drop": "^1.1.4",
     "vue-router": "^3.0.3",
     "vue-simple-context-menu": "^3.1.5",
     "vue-socket.io": "^3.0.7",
diff --git a/src/components/emaillistitem/emaillistitem.html b/src/components/emaillistitem/emaillistitem.html
index 49f4acc..ede9f01 100644
--- a/src/components/emaillistitem/emaillistitem.html
+++ b/src/components/emaillistitem/emaillistitem.html
@@ -1,4 +1,5 @@
 <section class="emaillistitem">
+  <drag :transfer-data="{emailId: email.id}" >
   <v-list-item @click="$emit('click')"  @contextmenu.prevent="$refs.menu.open">
     <template v-slot:default="{ active, toggle }">
       <v-row align="center">
@@ -28,6 +29,8 @@
       </v-row>
     </template>
   </v-list-item>
+</drag>
+
   <vue-context ref="menu">
       <v-list three-line>
         <v-list-item v-for="(box, key) in boxes" :key=key>
diff --git a/src/components/emaillistitem/emaillistitem.js b/src/components/emaillistitem/emaillistitem.js
index c61381e..121cd63 100644
--- a/src/components/emaillistitem/emaillistitem.js
+++ b/src/components/emaillistitem/emaillistitem.js
@@ -1,14 +1,14 @@
 import moment from 'moment'
 import { VueContext } from 'vue-context'
 import { mapActions, mapGetters } from 'vuex'
+import { Drag, Drop } from 'vue-drag-drop'
 
 export default {
   name: 'emaillistitem',
-  components: { VueContext },
+  components: { VueContext, Drag, Drop },
   props: ['email'],
   data () {
     return {
-
     }
   },
   computed: {
diff --git a/src/components/emailnavigation/emailnavigation.html b/src/components/emailnavigation/emailnavigation.html
index b8cc482..696cb17 100644
--- a/src/components/emailnavigation/emailnavigation.html
+++ b/src/components/emailnavigation/emailnavigation.html
@@ -10,14 +10,16 @@
   <v-navigation-drawer permanent class="transparent elevation-0 pl-3">
     <v-list dense class="pl-2">
       <v-list-item-group v-model="selectedBox" color="primary">
-      <v-list-item link v-for="(box, index) in boxes" :key="index" @click="setSelectedBox(box)">
-        <v-list-item-icon>
-          <v-icon small>fas fa-inbox</v-icon>
-        </v-list-item-icon>
-        <v-list-item-content>
-          <v-list-item-title>{{box.name}}</v-list-item-title>
-        </v-list-item-content>
-      </v-list-item>
+          <drop v-for="(box, index) in boxes" :key="index" class="drop pr-3" @drop="moveMail(...arguments, box)">
+            <v-list-item link  @click="setSelectedBox(box)">
+              <v-list-item-icon>
+                <v-icon small>fas fa-inbox</v-icon>
+              </v-list-item-icon>
+              <v-list-item-content>
+                <v-list-item-title>{{box.name}}</v-list-item-title>
+              </v-list-item-content>
+            </v-list-item>
+          </drop>
       </v-list-item-group>
     </v-list>
   </v-navigation-drawer>
diff --git a/src/components/emailnavigation/emailnavigation.js b/src/components/emailnavigation/emailnavigation.js
index 9c4e203..7cd1cae 100644
--- a/src/components/emailnavigation/emailnavigation.js
+++ b/src/components/emailnavigation/emailnavigation.js
@@ -1,8 +1,9 @@
 import { mapActions, mapGetters } from 'vuex'
+import { Drag, Drop } from 'vue-drag-drop'
 
 export default {
   name: 'emailnavigation',
-  components: {},
+  components: { Drag, Drop },
   props: [],
   data () {
     return {
@@ -13,13 +14,23 @@ export default {
     ...mapGetters([
       'boxes'
     ])
+    
   },
   mounted () {
 
   },
   methods: {
+    ...mapActions([
+      'updateFolder'
+    ]),
     setSelectedBox (box) {
       this.$emit('selectMailBox', box)
+    },
+    moveMail (mailArgument, event, folder) {
+      this.updateFolder({
+        mailId: mailArgument.emailId,
+        folder: folder.name
+      })
     }
   }
 }
diff --git a/src/services/mailService.js b/src/services/mailService.js
index dba77b2..daa472d 100644
--- a/src/services/mailService.js
+++ b/src/services/mailService.js
@@ -27,7 +27,7 @@ export default ({
     }, headers)
   },
   updateFolder (id, folder) {
-    return Axios.post(`${config.jsApiUrl}mail/update_folder`, {
+    return Axios.post(`${config.jsApiUrl}mail/move_message`, {
       args: {
         mail_id: id,
         folder_name: folder

From 4a2a8987862612ade018f06045b0ea0f6ca0c529 Mon Sep 17 00:00:00 2001
From: tobiaschielens <tobias.chielens@gmail.com>
Date: Mon, 14 Oct 2019 15:48:57 +0200
Subject: [PATCH 4/6] fixed drag image

---
 public/config/config.local                        | 2 +-
 src/components/emaillistitem/emaillistitem.html   | 2 --
 src/components/emaillistitem/emaillistitem.js     | 3 +--
 src/components/emailnavigation/emailnavigation.js | 1 -
 src/views/mails/mails.html                        | 8 +++++++-
 src/views/mails/mails.js                          | 4 +++-
 6 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/public/config/config.local b/public/config/config.local
index 028a526..d36e1e4 100644
--- a/public/config/config.local
+++ b/public/config/config.local
@@ -1,6 +1,6 @@
 export default ({
   tfApiUrl: 'https://radar.threefold.io/api/',
-  jsApiUrl: `http://172.17.0.2/api/actors/`,
+  jsApiUrl: `https://172.17.0.2/web/gedis/http/`,
 
   apiUrl: 'https://ffc-signaling.staging.jimber.org',
   janus: 'http://ffc-video.jimber.staging.org/janus',
diff --git a/src/components/emaillistitem/emaillistitem.html b/src/components/emaillistitem/emaillistitem.html
index ede9f01..56c7867 100644
--- a/src/components/emaillistitem/emaillistitem.html
+++ b/src/components/emaillistitem/emaillistitem.html
@@ -1,5 +1,4 @@
 <section class="emaillistitem">
-  <drag :transfer-data="{emailId: email.id}" >
   <v-list-item @click="$emit('click')"  @contextmenu.prevent="$refs.menu.open">
     <template v-slot:default="{ active, toggle }">
       <v-row align="center">
@@ -29,7 +28,6 @@
       </v-row>
     </template>
   </v-list-item>
-</drag>
 
   <vue-context ref="menu">
       <v-list three-line>
diff --git a/src/components/emaillistitem/emaillistitem.js b/src/components/emaillistitem/emaillistitem.js
index 121cd63..6434ee0 100644
--- a/src/components/emaillistitem/emaillistitem.js
+++ b/src/components/emaillistitem/emaillistitem.js
@@ -1,11 +1,10 @@
 import moment from 'moment'
 import { VueContext } from 'vue-context'
 import { mapActions, mapGetters } from 'vuex'
-import { Drag, Drop } from 'vue-drag-drop'
 
 export default {
   name: 'emaillistitem',
-  components: { VueContext, Drag, Drop },
+  components: { VueContext },
   props: ['email'],
   data () {
     return {
diff --git a/src/components/emailnavigation/emailnavigation.js b/src/components/emailnavigation/emailnavigation.js
index 7cd1cae..1e38eb9 100644
--- a/src/components/emailnavigation/emailnavigation.js
+++ b/src/components/emailnavigation/emailnavigation.js
@@ -14,7 +14,6 @@ export default {
     ...mapGetters([
       'boxes'
     ])
-    
   },
   mounted () {
 
diff --git a/src/views/mails/mails.html b/src/views/mails/mails.html
index 9c3e03d..b6be973 100644
--- a/src/views/mails/mails.html
+++ b/src/views/mails/mails.html
@@ -47,7 +47,13 @@
                   <v-list three-line>
                     <v-list-item-group v-model="selected">
                       <template v-for="(email, index) in filterMailbox">
-                        <email-list-item class="ml-3" :email="email" :key="index" @click="openMail = email" />
+                          <drag :transfer-data="{emailId: email.id}">
+                              <template slot="image" >
+                                  <email-list-item class="ml-3 grey" :email="email" :key="index" @click="openMail = email" />
+                              </template>
+                              <email-list-item class="ml-3" :email="email" :key="index" @click="openMail = email" />
+                          </drag>
+                        
                         <v-divider class="ml-3"/>
                       </template>
                     </v-list-item-group>
diff --git a/src/views/mails/mails.js b/src/views/mails/mails.js
index dcc1af1..1c4d3a5 100644
--- a/src/views/mails/mails.js
+++ b/src/views/mails/mails.js
@@ -5,9 +5,11 @@ import { mapGetters, mapActions } from 'vuex'
 import { VueEditor } from 'vue2-editor'
 import { timingSafeEqual } from 'crypto'
 
+import { Drag, Drop } from 'vue-drag-drop'
+
 export default {
   name: 'mails',
-  components: { VueEditor, emailNavigation, fullEmail, emailListItem },
+  components: { VueEditor, emailNavigation, fullEmail, emailListItem, Drag, Drop },
   props: [],
   data () {
     return {

From 01d1391006bf7b2cea8b9a380a02615732c597b3 Mon Sep 17 00:00:00 2001
From: tobiaschielens <tobias.chielens@gmail.com>
Date: Wed, 23 Oct 2019 10:35:44 +0200
Subject: [PATCH 5/6]  Fixed front-end to work with improved backend

---
 src/components/emaillistitem/emaillistitem.js | 2 +-
 src/services/mailService.js                   | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/components/emaillistitem/emaillistitem.js b/src/components/emaillistitem/emaillistitem.js
index 6434ee0..d366a75 100644
--- a/src/components/emaillistitem/emaillistitem.js
+++ b/src/components/emaillistitem/emaillistitem.js
@@ -21,7 +21,7 @@ export default {
       return div.textContent || div.innerText || ''
     },
     emailDate () {
-      return moment(moment.unix(this.email.date)).from(moment())
+      return moment(moment.unix(this.email.mtime)).from(moment())
     }
   },
   mounted () {
diff --git a/src/services/mailService.js b/src/services/mailService.js
index daa472d..8edbd59 100644
--- a/src/services/mailService.js
+++ b/src/services/mailService.js
@@ -9,10 +9,7 @@ export default ({
     return Axios.post(`${config.jsApiUrl}mail/list`)
   },
   sendMail (mail) {
-    mail.date = moment(moment.utc()).format('MM/DD/YYYY HH:mm')
     mail.attachments = []
-    mail.headers = ''
-    mail = JSON.stringify(mail)
     return Axios.post(`${config.jsApiUrl}mail/send`, {
       args: {
         mail

From 14fce667072701b9db8c5dd10c2e6ba671911d2a Mon Sep 17 00:00:00 2001
From: tobiaschielens <tobias.chielens@gmail.com>
Date: Thu, 24 Oct 2019 09:49:15 +0200
Subject: [PATCH 6/6] changed boxes icons

---
 src/components/emailnavigation/emailnavigation.html |  2 +-
 src/store/mailStore.js                              | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/components/emailnavigation/emailnavigation.html b/src/components/emailnavigation/emailnavigation.html
index 696cb17..505d9ad 100644
--- a/src/components/emailnavigation/emailnavigation.html
+++ b/src/components/emailnavigation/emailnavigation.html
@@ -13,7 +13,7 @@
           <drop v-for="(box, index) in boxes" :key="index" class="drop pr-3" @drop="moveMail(...arguments, box)">
             <v-list-item link  @click="setSelectedBox(box)">
               <v-list-item-icon>
-                <v-icon small>fas fa-inbox</v-icon>
+                <v-icon small>{{box.icon}}</v-icon>
               </v-list-item-icon>
               <v-list-item-content>
                 <v-list-item-title>{{box.name}}</v-list-item-title>
diff --git a/src/store/mailStore.js b/src/store/mailStore.js
index a1142f1..016411c 100644
--- a/src/store/mailStore.js
+++ b/src/store/mailStore.js
@@ -4,11 +4,11 @@ export default ({
   state: {
     mails: [],
     boxes: [
-      { name: 'Inbox' },
-      { name: 'Outbox' },
-      { name: 'Sent' },
-      { name: 'Spam' },
-      { name: 'Trash' }
+      { name: 'Inbox', icon: 'fas fa-envelope-open-text' },
+      { name: 'Outbox', icon: 'far fa-paper-plane' },
+      { name: 'Sent', icon: 'fas fa-paper-plane' },
+      { name: 'Spam', icon: 'far fa-times-circle' },
+      { name: 'Trash', icon: 'fas fa-trash' }
     ]
   },
   actions: {