jody/notes.kaplon.us
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Try leader key work-around in vim config; clean up server code.

Browse Source
This commit is contained in:
jkaplon 2016-07-09 09:23:51 -04:00
parent 5af49362ad
commit 1792ebd08e
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
server.js
View File

@ -71,14 +71,12 @@ var isAuthenticated = function (req, res, next) {
} }
} }
//app.get('/', require('connect-ensure-login').ensureLoggedIn(), function(req, res){
app.get('/', isAuthenticated, function(req, res){ app.get('/', isAuthenticated, function(req, res){
winston.info("GET /"); winston.info("GET /");
// Get curent text from allNotes.txt and pass that data to handlebars template. // Get curent text from allNotes.txt and pass that data to handlebars template.
fileSystem.readFile(notePath, {encoding: 'utf-8'}, function(err,data){ fileSystem.readFile(notePath, {encoding: 'utf-8'}, function(err,data){
if (!err){ if (!err){
winston.info('successful file read'); winston.info('successful file read');
//res.render('index', {notetxt: data}, {user: req.user}, function(err, html) {
res.render('index', {notetxt: data}, function(err, html) { res.render('index', {notetxt: data}, function(err, html) {
if(err !== null) { if(err !== null) {
winston.error(err); winston.error(err);
@ -92,7 +90,7 @@ app.get('/', isAuthenticated, function(req, res){
}); });
}); });
app.post('/', function(req, res){ app.post('/', isAuthenticated, function(req, res){
winston.info('POST received'); winston.info('POST received');
var now = Date.now(); var now = Date.now();
// quick/dirty poc is to do a fileSystem.write to create a new file w/contents of req.body! // quick/dirty poc is to do a fileSystem.write to create a new file w/contents of req.body!
@ -139,19 +137,6 @@ app.get('/logout', function(req, res){
res.redirect('/'); res.redirect('/');
}); });
// This is broken due to permission error from bitbucket.
// Not sure how to auth container git user to bitbucket...comment it all out for now.
//setInterval(function() {
//// Push to bitbucker every 30min.
//var exec = require('child_process').exec;
//var cmd = 'cd note-data && git push';
//winston.info(cmd);
//exec(cmd, function(error, stdout, stderr) {
//if (error) { winston.error(error); }
//winston.info(stdout);
//});
//}, 30 * 60 * 1000);
app.listen(3000, function() { app.listen(3000, function() {
winston.info("Started on PORT 3000"); winston.info("Started on PORT 3000");
}); });

3
views/index.hbs
View File

@ -35,6 +35,9 @@
CodeMirror.Vim.map('jj', '<Esc>', 'insert') CodeMirror.Vim.map('jj', '<Esc>', 'insert')
CodeMirror.Vim.map(';', ':') CodeMirror.Vim.map(';', ':')
CodeMirror.Vim.map(':', ';') CodeMirror.Vim.map(':', ';')
// This no worky, there's no concept of <leader> in CodeMirror, but i was hoping this would work-around it.
//CodeMirror.Vim.map(' c', '<Esc>o- [ ] ', 'normal')
//CodeMirror.Vim.map(' x', '<ESC>;s/\[\s\]/[x]/g<CR>;noh<CR>', 'normal')
//CodeMirror.commands.save = function(){ alert("Saving"); } //CodeMirror.commands.save = function(){ alert("Saving"); }
var commandDisplay = document.getElementById('command-display'); var commandDisplay = document.getElementById('command-display');
var keys = '' var keys = ''