diff --git a/.gitignore b/.gitignore
index a5507d9..16c862a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,5 @@
/mode/*
/note-data/*
index.html
+/logs/*
+/node_modules/*
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..67c017b
--- /dev/null
+++ b/package.json
@@ -0,0 +1,18 @@
+{
+ "name": "courtsopen",
+ "version": "0.0.1",
+ "dependencies": {
+ "body-parser": "^1.12.4",
+ "express": "^4.12.4",
+ "express-hbs": "^0.8.4",
+ "handlebars-form-helpers": "^0.1.3",
+ "moment-timezone": "^0.4.0",
+ "nodemailer": "^1.3.4",
+ "pg": "^4.4.3",
+ "sqlite3": "^3.0.8",
+ "winston": "^2.1.1"
+ },
+ "scripts": {
+ "start": "node server.js"
+ }
+}
diff --git a/server.js b/server.js
index 6fc0bac..3105ad0 100644
--- a/server.js
+++ b/server.js
@@ -7,8 +7,7 @@ var winston = require('winston');
winston.add(winston.transports.File, { filename: './logs/notes.kaplon.us.log', maxsize: 5000000 }); // 5MB
var fileSystem = require('fs');
-app.use(bodyParser.json());
-app.use(bodyParser.urlencoded({ extended: false })); // Not sure if both needed here.
+app.use(bodyParser.text()); // Use defaults for now, size limit is 100kb.
// Use `.hbs` for extensions and find partials in `views/partials`.
app.engine('hbs', hbs.express4({
@@ -16,8 +15,11 @@ app.engine('hbs', hbs.express4({
}));
app.set('view engine', 'hbs');
app.set('views', __dirname + '/views');
+app.use('/lib', express.static('lib')); // these 3 seem hacky, but doing it here instead of view.
+app.use('/keymap', express.static('keymap'));
+app.use('/mode', express.static('mode'));
-var notePath = __dirname + '/allNotes.txt';
+var notePath = __dirname + '/note-data/allNotes.txt';
app.get('/', function(req, res){
winston.info("GET /");
@@ -26,18 +28,34 @@ app.get('/', function(req, res){
// i may be grokking it...need to keep handlebars, though.
// read contents of allNotes.txt into a variable.
// pass that variable as data to handlebars template, {{notetxt}}.
- res.render('index', {notetxt: noteTxt}, function(err, html) {
- if(err !== null) {
+ fileSystem.readFile(notePath, {encoding: 'utf-8'}, function(err,data){
+ if (!err){
+ winston.info('successful file read');
+ //response.writeHead(200, {'Content-Type': 'text/html'});
+ //response.write(data);
+ //response.end();
+ res.render('index', {notetxt: data}, function(err, html) {
+ if(err !== null) {
+ winston.error(err);
+ } else {
+ res.send(html);
+ }
+ });
+ }else{
winston.error(err);
- } else {
- res.send(html);
}
});
});
app.post('/', function(req, res){
- winston.info(req.body);
+ winston.info('POST received');
// Stage and commit changes to allNotes.txt.
+ // quick/dirty poc is to do a fileSystem.write to create a new file w/contents of req.body!
+ var now = Date.now();
+ fileSystem.writeFile(__dirname + '/note-data/test-' + now + '.txt', req.body, function(err){
+ if (err) { winston.error(err); }
+ winston.info('new test file written');
+ });
res.status(204).send('POST received');
});
diff --git a/views/index.hbs b/views/index.hbs
index c927d73..9f8d473 100644
--- a/views/index.hbs
+++ b/views/index.hbs
@@ -16,7 +16,7 @@