Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions app/datasetParser.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
module.exports = {
uploadJSONtoFirebase: function (userID, datasetname, jsonData) {
//setup connecyion to fireabse
var firebase = require('firebase');

//Get a new static firebase reference key
let newDatasetKey = firebase.database().ref('datasets').push().key;

let datasetDetails = {
name: datasetname,
userID: userID
};

//Upload the users data to firebase
var updates = {};
updates['/datasets/' + newDatasetKey + '/data'] = jsonData;
updates['/datasets-metadata/'+newDatasetKey] = datasetDetails;
updates['/users/' + userID + '/datasets/' + newDatasetKey] = true;

return firebase.database().ref().update(updates);
}
};

65 changes: 46 additions & 19 deletions app/routes.js
Original file line number Diff line number Diff line change
@@ -1,31 +1,46 @@
const express = require('express');
let multer = require('multer');
let multer = require('multer');
var upload = multer({dest: 'uploads'});
const csv = require('csvtojson');
var datasetParser = require('./datasetParser');
var fs = require('fs');

const path = require('path');
let router = express.Router();

let router = express.Router();
router.post('/api/dataset', upload.any(), function (req, res, next) {
//Check if we have a userid associated with the file
if (req.body.userid) {
let userid = req.body.userid;
let dsName = req.body.datasetname;
let csvFilePath = req.files[0].path;

let storage = multer.diskStorage({
destination: function (req, file, callback) {
callback(null, './uploads');
},
filename: function (req, file, callback) {
callback(null, file.fieldname + '-' + Date.now() + '.csv');
}
});
console.log(userid, dsName);

let upload = multer({storage: storage}).array('userDataset',1);
let csvData = [];

router.post('/api/dataset',function(req,res){
upload(req,res,function(err) {
if(err) {
return res.end("Error uploading file.");
}
res.end("File is uploaded");
});
//Convert csv into json object
csv({checkType:true}).fromFile(csvFilePath).on('json', (jsonObj) => {
csvData.push(jsonObj);
}).on('done', (error) => {
//Once we have all the csv data as json upload to firabse
datasetParser.uploadJSONtoFirebase(userid,dsName,csvData);

//Delete the uploaded file after the data is in firebase
fs.unlink(csvFilePath, function(err) {
if (err) {
return console.error(err);
}
res.sendStatus(200, "SUCCESS");
});
});
} else {
res.end('Missing user id');
}
});

router.get('/', function (req, res) {
res.sendFile(path.join(__dirname,'../public/index.html'));
res.sendFile(path.join(__dirname, '../public/index.html'));
});

router.get('/project', function (req, res) {
Expand All @@ -36,4 +51,16 @@ router.get('/downloadGlobalTemplate', function (req, res) {
res.download(path.join(__dirname, '../templates/GlobalCountiresTemplate.csv'));
});

router.get('/downloadUSCANTemplate', function (req, res) {
res.download(path.join(__dirname, '../templates/UnitedStatesCanadaTemplate.csv'));
});

router.get('/downloadUSATemplate', function (req, res) {
res.download(path.join(__dirname, '../templates/UnitedStatesTemplate.csv'));
});

router.get('/downloadCANTemplate', function (req, res) {
res.download(path.join(__dirname, '../templates/CanadaTemplate.csv'));
});

module.exports = router;
9 changes: 9 additions & 0 deletions node_modules/mongoose/History.md

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion node_modules/mongoose/lib/aggregate.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 11 additions & 3 deletions node_modules/mongoose/lib/model.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions node_modules/mongoose/lib/query.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions node_modules/mongoose/lib/schema.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions node_modules/mongoose/lib/services/query/castUpdate.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

38 changes: 19 additions & 19 deletions node_modules/mongoose/package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
"version": "0.0.1",
"description": "",
"dependencies": {
"body-parser": "^1.17.1",
"compute-covariance": "^1.0.1",
"csvtojson": "^1.1.4",
"express": "^4.14.1",
"express-fileupload": "^0.1.2",
"firebase": "^3.7.4",
Expand Down
3 changes: 2 additions & 1 deletion public/css/project.css
Original file line number Diff line number Diff line change
Expand Up @@ -737,4 +737,5 @@ input[type="radio"]:checked:before {

dataset-card{

}
}

Loading