Skip to content

Commit fbc231d

Browse files
author
Jeffrey Biles
committed
Action bar + keyboard shortcuts on mail view
1 parent 562f2a8 commit fbc231d

File tree

2 files changed

+54
-5
lines changed

2 files changed

+54
-5
lines changed

src/components/MailTable.vue

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@
1919
</table>
2020

2121
<ModalView v-if="openedEmail" :closeModal="() => { openedEmail = null; }">
22-
<MailView v-if="openedEmail" :email="openedEmail" />
22+
<MailView v-if="openedEmail"
23+
:email="openedEmail"
24+
:changeEmail="(args) => changeEmail(openedEmail, args)" />
2325
</ModalView>
2426
</template>
2527

@@ -56,13 +58,28 @@
5658
},
5759
methods: {
5860
openEmail(email){
59-
email.read = true
60-
axios.put(`http://localhost:3000/emails/${email.id}`, email)
6161
this.openedEmail = email;
62+
63+
if(email) {
64+
email.read = true
65+
axios.put(`http://localhost:3000/emails/${email.id}`, email)
66+
}
6267
},
6368
archiveEmail(email){
6469
email.archived = true;
6570
axios.put(`http://localhost:3000/emails/${email.id}`, email)
71+
},
72+
changeEmail(email, {indexChange, toggleArchive, toggleRead, save, closeModal}) {
73+
if(toggleArchive) { email.archived = !email.archived }
74+
if(toggleRead) { email.read = !email.read }
75+
if(save) { axios.put(`http://localhost:3000/emails/${email.id}`, email) }
76+
if(closeModal) { this.openedEmail = null; return null; }
77+
78+
if(indexChange) {
79+
let emails = this.unarchivedEmails
80+
let index = emails.findIndex(e => e == email);
81+
this.openEmail(emails[index + indexChange])
82+
}
6683
}
6784
}
6885
}

src/components/MailView.vue

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
<template>
22
<div class="email-display">
3+
<div class="toolbar">
4+
<button @click="toggleArchive">{{email.archived ? 'Move to Inbox (e)' : 'Archive (e)'}}</button>
5+
<button @click="toggleRead">{{email.read ? 'Mark Unread (r)' : 'Mark Read (r)'}}</button>
6+
<button @click="goNewer">Newer (k)</button>
7+
<button @click="goOlder">Older (j)</button>
8+
</div>
9+
310
<h2 class="mb-0">Subject: <strong>{{email.subject}}</strong></h2>
411
<div><em>From {{email.from}} on {{format(new Date(email.sentAt), 'MMM do yyyy')}}</em></div>
512
<div v-html="marked(email.body)" />
@@ -9,18 +16,43 @@
916
<script>
1017
import { format } from 'date-fns';
1118
import marked from 'marked';
19+
import { useKeydown } from '../composition/useKeydown';
1220
1321
export default {
14-
setup(){
22+
setup({changeEmail}){
23+
let toggleArchive = () => changeEmail({toggleArchive: true, save: true, closeModal: true})
24+
let toggleRead = () => changeEmail({toggleRead: true, save: true})
25+
let goNewer = () => changeEmail({indexChange: -1})
26+
let goOlder = () => changeEmail({indexChange: 1})
27+
let goNewerAndArchive = () => changeEmail({indexChange: -1, toggleArchive: true})
28+
let goOlderAndArchive = () => changeEmail({indexChange: 1, toggleArchive: true})
29+
30+
useKeydown([
31+
{key: 'e', fn: toggleArchive},
32+
{key: 'r', fn: toggleRead},
33+
{key: 'k', fn: goNewer},
34+
{key: 'j', fn: goOlder},
35+
{key: '[', fn: goNewerAndArchive},
36+
{key: ']', fn: goOlderAndArchive}
37+
])
38+
1539
return {
1640
format,
17-
marked
41+
marked,
42+
goOlder,
43+
goNewer,
44+
toggleRead,
45+
toggleArchive
1846
}
1947
},
2048
props: {
2149
email: {
2250
type: Object,
2351
required: true
52+
},
53+
changeEmail: {
54+
type: Function,
55+
required: true
2456
}
2557
}
2658
}

0 commit comments

Comments
 (0)