diff options
| -rw-r--r-- | package-lock.json | 19 | ||||
| -rw-r--r-- | package.json | 3 | ||||
| -rw-r--r-- | public/scripts/chat.js | 43 | ||||
| -rw-r--r-- | public/styles/style.sass | 3 | ||||
| -rw-r--r-- | views/index.pug | 14 |
5 files changed, 62 insertions, 20 deletions
diff --git a/package-lock.json b/package-lock.json index 741998b..95ae99f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2706,6 +2706,11 @@ "is-symbol": "^1.0.2" } }, + "es6-object-assign": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/es6-object-assign/-/es6-object-assign-1.1.0.tgz", + "integrity": "sha1-wsNYJlYkfDnqEHyx5mUrb58kUjw=" + }, "es6-promise": { "version": "3.3.1", "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz", @@ -8634,6 +8639,11 @@ "asap": "~2.0.3" } }, + "promise-polyfill": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-6.1.0.tgz", + "integrity": "sha1-36lpQ+qcEh/KTem1hoyznTRy4Fc=" + }, "prompts": { "version": "0.1.14", "resolved": "https://registry.npmjs.org/prompts/-/prompts-0.1.14.tgz", @@ -10681,6 +10691,15 @@ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=" }, + "sweetalert": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/sweetalert/-/sweetalert-2.1.2.tgz", + "integrity": "sha512-iWx7X4anRBNDa/a+AdTmvAzQtkN1+s4j/JJRWlHpYE8Qimkohs8/XnFcWeYHH2lMA8LRCa5tj2d244If3S/hzA==", + "requires": { + "es6-object-assign": "^1.1.0", + "promise-polyfill": "^6.0.2" + } + }, "symbol-tree": { "version": "3.2.2", "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.2.tgz", diff --git a/package.json b/package.json index caf6d6d..2e39cae 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ }, "scripts": { "dev": "npm run watch & nodemon src/index.js --exec \"node -r dotenv/config -r babel-register\"", - "watch": "npm run debug && onchange public/styles/* -- npm run css & onchange public/scripts/* -- browserify public/scripts/main.js -o dist/app.js", + "watch": "npm run debug && onchange public/styles/* -- npm run css & onchange public/scripts/* -- npm run debug", "css": "node-sass public/styles/main.sass dist/app.css --output-style compressed", "debug": "rm -r dist/* && npm run css && browserify public/scripts/main.js -o dist/app.js", "build": "rm -r dist/* && npm run css && browserify public/scripts/main.js -o dist/temp.js && minify dist/temp.js > dist/app.js && rm dist/temp.js && pug views/index.pug --out dist" @@ -53,6 +53,7 @@ "pug": "^2.0.0-beta11", "pug-cli": "^1.0.0-alpha6", "rimraf": "^2.6.2", + "sweetalert": "^2.1.2", "webrtc-adapter": "^7.2.0", "xkcd-password": "^2.0.0" }, diff --git a/public/scripts/chat.js b/public/scripts/chat.js index 9a01a0e..54775ae 100644 --- a/public/scripts/chat.js +++ b/public/scripts/chat.js @@ -11,6 +11,7 @@ const crypto = require('crypto'); const encryption = require('./encryption'); const wordList = require('./wordlist'); const pinInput = require('./input_pin'); +const swal = require('sweetalert'); const xkcdPassword = require('xkcd-password'); // setup vars @@ -54,7 +55,7 @@ async function evaluateKeyGeneration() { encryption.reset(); console.error('Too many tries!'); pinInput.failure('This account got removed, the site will reload.'); - setTimeout(() => location.reload(), 1500) + setTimeout(() => location.reload(true), 1500) } else if (e === 'Not verified!') { console.error(e); pinInput.failure(e); @@ -86,12 +87,16 @@ function chat() { const peer = new Peer(peerId, {host: host, port: 8080, path: '/api', debug: 0}); // Peer events - peer.on('open', id => console.log('[LOG] Your ID is', id)); + peer.on('open', id => { + console.log('[LOG] Your ID is', id); + swal('Hello world!', 'Your ID is "' + id + '".\nYou can share this ID with your friends so they can chat with you!', 'success') + }); peer.on('error', err => console.error(err)); peer.on('call', call => getMediaStream(stream => call.answer(stream))); // TODO: Ask for call accept peer.on('connection', async conn => { connectedPeer = conn; console.log('[LOG] Connected with', connectedPeer.peer); + swal('New connection!', `You have successfully connected to the user ${connectedPeer.peer}!`, 'success'); encryption.getMsgs(connectedPeer.peer, await encryption.get(connectedPeer.peer), await encryption.getPrivate(), passphrase).then(messages => messages.forEach(async data => await receivedMessage(`${data.message} - ${data.time}`, true)) ); @@ -173,6 +178,24 @@ function chat() { return await sendMessage($('#message').val()) & $('#message').val('') } + /*+ + * Shows warning message and deleted account + */ + function deleteAccount() { + swal({ + title: 'Are you sure?', + text: 'Once deleted, you will not be able to recover any messages or connections!', + icon: 'warning', + buttons: true, + dangerMode: true, + }).then(willDelete => { + if (willDelete) { + encryption.reset(); + swal('Successfully deleted your data.', '', 'success').then(() => location.reload(true)); + } + }); + } + /** * Click events */ @@ -183,15 +206,23 @@ function chat() { }); // FABs - $('#add_peer_id').on('click', async () => await connect($('#peer_id').val())); - $('#logout').on('click', () => location.reload()); - $('#delete').on('click', () => encryption.reset() & location.reload()); + $('#logout').on('click', () => location.reload(true)); + $('#delete').on('click', () => deleteAccount()); $('#call').on('click', () => getMediaStream(stream => { call = peer.call(peerId, stream); // TODO: Encrypt call initCall(call) })); - $('[toggle-contact-modal]').on('click', () => $('#add_contact_modal').toggleClass('is-active')) + $('#add_contact').on('click', () => { + swal('Add a contact', { + content: 'input', + attributes: { + placeholder: 'Contact ID', + }, + }).then(contactId => connect(contactId).then(() => + swal(`Successfully connected to "${contactId}"`, '', 'success') + )); + }) }); } diff --git a/public/styles/style.sass b/public/styles/style.sass index 34e4a5c..01d9223 100644 --- a/public/styles/style.sass +++ b/public/styles/style.sass @@ -17,6 +17,9 @@ html, body .main align-items: flex-start +.swal-text + text-align: center + .action-button height: 50px width: 50px diff --git a/views/index.pug b/views/index.pug index a585063..38d4d2d 100644 --- a/views/index.pug +++ b/views/index.pug @@ -8,7 +8,7 @@ block content See https://github.com/texxme/Texx/blob/master/LICENSE .chat#chat - button.button.action-button.is-big.is-outlined.is-info(toggle-contact-modal) + button.button.action-button.is-big.is-outlined.is-info#add_contact i.fas.fa-plus button.button.action-button.is-big.is-outlined.is-success#call i.fas.fa-phone @@ -26,18 +26,6 @@ block content button#send_message.message-button.button.is-success(type=submit) i.fas.fa-paper-plane - .modal#add_contact_modal - .modal-background - .modal-card - header.modal-card-head - p.modal-card-title Add a contact - button.delete(aria-label='close', toggle-contact-modal) - section.modal-card-body - input#peer_id.input.is-focused(placeholder='Contact ID') - footer.modal-card-foot - button#add_peer_id.button.is-success(toggle-contact-modal) Add - button.button(aria-label='close', toggle-contact-modal) Cancel - .enter-pin#enter_pin .title.has-text-centered Enter a passphrase: .subtitle.has-text-centered#pin_message |