Mirrors/send
1
0
Fork 0
mirror of https://gitlab.com/timvisee/send.git synced 2024-11-10 21:22:35 +01:00
Code Issues Releases Activity

Merge pull request #134 from mozilla/ui

Browse Source 
Load previous uploads
This commit is contained in:
Danny Coates 2017-06-23 17:13:24 -07:00 committed by GitHub
commit 7ee4af002c
9 changed files with 127 additions and 105 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/src/download.js
View File

@ -4,7 +4,6 @@ const $ = require('jquery');
const Raven = window.Raven;
$(document).ready(function() {
$('#download-progress').hide();
$('#send-file').click(() => {
@ -63,7 +62,7 @@ $(document).ready(function() {
document.body.appendChild(a);
a.click();
})
.catch(err => {
.catch(err => {
Raven.captureException(err);
return Promise.reject(err);
});

40
frontend/src/fileReceiver.js
View File

@ -64,26 +64,26 @@ class FileReceiver extends EventEmitter {
['encrypt', 'decrypt']
)
])
.then(([fdata, key]) => {
const salt = this.salt;
return Promise.all([
window.crypto.subtle.decrypt(
{
name: 'AES-CBC',
iv: salt
},
key,
fdata.data
),
new Promise((resolve, reject) => {
resolve(fdata.fname);
})
]);
})
.catch(err => {
Raven.captureException(err);
return Promise.reject(err);
});
.then(([fdata, key]) => {
const salt = this.salt;
return Promise.all([
window.crypto.subtle.decrypt(
{
name: 'AES-CBC',
iv: salt
},
key,
fdata.data
),
new Promise((resolve, reject) => {
resolve(fdata.fname);
})
]);
})
.catch(err => {
Raven.captureException(err);
return Promise.reject(err);
});
}
}

8
frontend/src/fileSender.js
View File

@ -66,10 +66,6 @@ class FileSender extends EventEmitter {
window.crypto.subtle.exportKey('jwk', secretKey)
]);
})
.catch(err => {
Raven.captureException(err)
return Promise.reject(err);
})
.then(([encrypted, keydata]) => {
return new Promise((resolve, reject) => {
const file = this.file;
@ -106,8 +102,8 @@ class FileSender extends EventEmitter {
xhr.send(fd);
});
})
.catch(err => {
Raven.captureException(err)
.catch(err => {
Raven.captureException(err);
return Promise.reject(err);
});
}

130
frontend/src/upload.js
View File

@ -2,8 +2,6 @@ const FileSender = require('./fileSender');
const { notify } = require('./utils');
const $ = require('jquery');
const Raven = window.Raven;
$(document).ready(function() {
// reset copy button
const $copyBtn = $('#copy-btn');
@ -11,10 +9,15 @@ $(document).ready(function() {
$copyBtn.html('Copy');
$('#page-one').show();
$('#file-list').hide();
$('#file-list').show();
$('#upload-progress').hide();
$('#share-link').hide();
for (let i = 0; i < localStorage.length; i++) {
const id = localStorage.key(i);
populateFileList(localStorage.getItem(id));
}
// copy link to clipboard
$copyBtn.click(() => {
const aux = document.createElement('input');
@ -52,7 +55,52 @@ $(document).ready(function() {
file = event.target.files[0];
}
const $fileList = $('#uploaded-files');
const fileSender = new FileSender(file);
fileSender.on('progress', percentComplete => {
$('#page-one').hide();
$('#file-list').hide();
$('#upload-progress').show();
$('#upload-filename').innerHTML += file.name;
// update progress bar
document
.querySelector('#progress-bar')
.style.setProperty('--progress', percentComplete + '%');
$('#progress-text').html(`${percentComplete}%`);
});
fileSender.upload().then(info => {
const url = info.url.trim() + `#${info.secretKey}`.trim();
$('#link').attr('value', url);
const fileData = {
name: file.name,
fileId: info.fileId,
url: info.url,
secretKey: info.secretKey,
deleteToken: info.deleteToken
};
localStorage.setItem(info.fileId, JSON.stringify(fileData));
$('#page-one').hide();
$('#file-list').hide();
$('#upload-progress').hide();
$('#share-link').show();
populateFileList(JSON.stringify(fileData));
notify('Your upload has finished.');
});
};
window.allowDrop = function(ev) {
ev.preventDefault();
};
//update file table with current files in localStorage
function populateFileList(file) {
try {
file = JSON.parse(file);
} catch (e) {
return;
}
const row = document.createElement('tr');
const name = document.createElement('td');
const link = document.createElement('td');
@ -69,6 +117,7 @@ $(document).ready(function() {
// create delete button
btn.innerHTML = 'x';
btn.classList.add('delete-btn');
link.innerHTML = file.url.trim() + `#${file.secretKey}`.trim();
// create popup
popupDiv.classList.add('popup');
@ -76,6 +125,14 @@ $(document).ready(function() {
'<span class="del-file">Delete</span><span class="nvm" > Nevermind</span>'
);
// delete file
$popupText.find('.del-file').click(e => {
FileSender.delete(file.fileId, file.deleteToken).then(() => {
$(e.target).parents('tr').remove();
localStorage.removeItem(file.fileId);
});
});
// add data cells to table row
row.appendChild(name);
row.appendChild(link);
@ -85,64 +142,21 @@ $(document).ready(function() {
del.appendChild(popupDiv);
row.appendChild(del);
const fileSender = new FileSender(file);
fileSender.on('progress', percentComplete => {
$('#page-one').hide();
$('#file-list').hide();
$('#upload-progress').show();
$('#upload-filename').innerHTML += file.name;
// update progress bar
document
.querySelector('#progress-bar')
.style.setProperty('--progress', percentComplete + '%');
$('#progress-text').html(`${percentComplete}%`);
if (percentComplete === 100) {
notify('Your upload has finished.');
}
// show popup
del.addEventListener('click', toggleShow);
// hide popup
$popupText.find('.nvm').click(function(e) {
e.stopPropagation();
toggleShow();
});
fileSender.upload().then(info => {
const url = info.url.trim() + `#${info.secretKey}`.trim();
$('#link').attr('value', url);
link.innerHTML = url;
localStorage.setItem(info.fileId, info.deleteToken);
// delete file
$popupText.find('.del-file').click(e => {
FileSender.delete(
info.fileId,
localStorage.getItem(info.fileId)
).then(() => {
$(e.target).parents('tr').remove();
localStorage.removeItem(info.fileId);
})
.catch(err => {
Raven.captureException(err);
return Promise.reject(err);
});
});
// show popup
del.addEventListener('click', toggleShow);
// hide popup
$popupText.find('.nvm').click(toggleShow);
$fileList.append(row); //add row to table
$('#page-one').hide();
$('#file-list').hide();
$('#upload-progress').hide();
$('#share-link').show();
})
.catch(err => {
Raven.captureException(err);
return Promise.reject(err);
$popupText.click(function(e) {
e.stopPropagation();
});
$('tbody').append(row); //add row to table
function toggleShow() {
$popupText.toggleClass('show');
}
};
window.allowDrop = function(ev) {
ev.preventDefault();
};
}
});

6
package-lock.json generated
View File

@ -198,9 +198,9 @@
"dev": true
},
"aws-sdk": {
"version": "2.76.0",
"resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.76.0.tgz",
"integrity": "sha1-LDe/BON6tKJrX/fHWD1ZYDTHYwk="
"version": "2.77.0",
"resolved": "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.77.0.tgz",
"integrity": "sha1-gJCQu4dNj0//ysUxZilYdjjnhlw="
},
"babel-code-frame": {
"version": "6.22.0",

3
server/config.js
View File

@ -24,7 +24,8 @@ const conf = convict({
},
sentry_id: {
format: String,
default: 'https://cdf9a4f43a584f759586af8ceb2194f2@sentry.prod.mozaws.net/238',
default:
'https://cdf9a4f43a584f759586af8ceb2194f2@sentry.prod.mozaws.net/238',
env: 'P2P_SENTRY_CLIENT'
},
sentry_dsn: {

9
server/portal_server.js
View File

@ -45,9 +45,12 @@ app.get('/', (req, res) => {
app.get('/exists/:id', (req, res) => {
const id = req.params.id;
storage.exists(id).then(() => {
res.sendStatus(200);
}).catch(err => res.sendStatus(404));
storage
.exists(id)
.then(() => {
res.sendStatus(200);
})
.catch(err => res.sendStatus(404));
});
app.get('/download/:id', (req, res) => {

14
test/local.storage.test.js
View File

@ -44,16 +44,18 @@ const storage = proxyquire('../server/storage', {
describe('Testing Exists from local filesystem', function() {
it('Exists returns true when file exists', function() {
exists.callsArgWith(1, null, 1);
return storage.exists('test')
.then(() => assert(1))
.catch(err => assert.fail())
return storage
.exists('test')
.then(() => assert(1))
.catch(err => assert.fail());
});
it('Exists returns false when file does not exist', function() {
exists.callsArgWith(1, null, 0);
return storage.exists('test')
.then(() => assert.fail())
.catch(err => assert(1))
return storage
.exists('test')
.then(() => assert.fail())
.catch(err => assert(1));
});
});

19
views/index.handlebars
View File

@ -38,12 +38,19 @@
<div id="file-list">
<table id="uploaded-files">
<tr>
<th width="30%">File</th>
<th width="45%">Copy URL</th>
<th width="18%">Expires in</th>
<th width="7%">Delete</th>
</tr>
<thead>
<tr>
<!-- htmllint attr-bans="false" -->
<th width="30%">File</th>
<th width="45%">Copy URL</th>
<th width="18%">Expires in</th>
<th width="7%">Delete</th>
<!-- htmllint tag-bans="$previous" -->
</tr>
</thead>
<tbody>
</tbody>
</table>
</div>