Skip to content

Commit

Permalink
sending an actual timestamp in addition to a timestring
Browse files Browse the repository at this point in the history
  • Loading branch information
ryanbagwell committed Jun 3, 2016
1 parent a09efe0 commit 7e7c63c
Show file tree
Hide file tree
Showing 6 changed files with 51 additions and 30 deletions.
2 changes: 0 additions & 2 deletions gulpfile.babel.js
Expand Up @@ -9,8 +9,6 @@ gulp.task('watchServer', () => {

let conf = webpackConfig(true);

console.log(conf);

webpack(conf).watch(100, (err, stats) => {

showStats(err, stats);
Expand Down
17 changes: 17 additions & 0 deletions npm-shrinkwrap.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
Expand Up @@ -14,12 +14,14 @@
"babel-loader": "^6.2.4",
"babel-plugin-transform-es2015-destructuring": "^6.9.0",
"babel-preset-es2015": "^6.9.0",
"backbonefire": "0.0.0",
"chalk": "^1.1.3",
"firebase": "3.0.3",
"gulp": "^3.9.1",
"gulp-livereload": "^3.8.1",
"gulp-webpack": "^1.5.0",
"livereload": "^0.4.1",
"moment": "^2.13.0",
"node-es6": "^0.3.1",
"promised-exec": "^1.0.1",
"q": "^1.4.1",
Expand Down
19 changes: 18 additions & 1 deletion src/index.js
@@ -1 +1,18 @@
import firebase from 'firebase';
import firebase from 'firebase';


var config = {
apiKey: "AIzaSyDm4pY8-iMZt5WuSzVHH1TZJogQxI48xJI",
databaseURL: "https://glaring-fire-6854.firebaseio.com",
};

firebase.initializeApp(config);

firebase.database().ref('meters').once('value').then(snapshot => {
console.log(snapshot.val());
});

firebase.database().ref('readings').orderByChild('timestamp').once('value').then(snapshot => {
console.log(snapshot.val());
})

15 changes: 12 additions & 3 deletions src/reader.js
Expand Up @@ -2,6 +2,7 @@ import childProcess from 'child_process';
import firebase from 'firebase';
import Q from 'q';
import config from 'conf/config';
import moment from 'moment';

const devices = [
{
Expand All @@ -20,7 +21,9 @@ firebase.initializeApp(config);

let db = firebase.database();

var reading = db.ref("reading");
let meters = db.ref('meters');

meters.set(devices);

let read = function(device) {

Expand Down Expand Up @@ -55,9 +58,15 @@ let save = function(data) {

let deferred = Q.defer();

data = Object.assign({timeStamp: data.Time, category: data.category}, data.Message);
data = Object.assign({
timeStamp: moment(data.Time).format('X'),
timeString: data.Time,
category: data.category,
}, data.Message);

let readings = db.ref('readings');

reading.set(data, (err) => {
readings.push(data, (err) => {
let dataStr = JSON.stringify(data);

if (err) {
Expand Down
26 changes: 2 additions & 24 deletions webpack.config.js
Expand Up @@ -31,30 +31,8 @@ const webpackConf = (isServer = false) => {

let serverConfig = {
...commonConfig,
externals: function() {

let modsToKeep = [
// 'firebase',
// 'faye-websocket',
// 'buffer',
// 'request',
// 'util',
// 'ms',
// 'xtend',
// 'websocket-driver',
// 'websocket-extensions',
// 'events',
//'Q',
];

let mods = fs.readdirSync(path.resolve('node_modules'))
.map(dir => {
if (modsToKeep.indexOf(dir) > -1) return;
return dir;
});

return mods;
}(),
externals: fs.readdirSync(path.resolve('node_modules'))
.map(dir => dir),
entry: {
reader: './src/reader.js',
},
Expand Down

0 comments on commit 7e7c63c

Please sign in to comment.