moon
/
enigma-bbs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Better form submit format 

* Allow comments in menu.json
This commit is contained in:
Bryan Ashby 2015-03-25 23:23:14 -06:00
parent d1b0663b5d
commit 4c4b0de54c
7 changed files with 118 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
core/menu_util.js
View File

@ -1,44 +1,61 @@
/* jslint node: true */
'use strict';
// ENiGMA½
var moduleUtil = require('./module_util.js');
var theme = require('./theme.js');
var async = require('async');
var Log = require('./logger.js').log;
var conf = require('./config.js');
var menuJson = require('../mods/menu.json');
var fs = require('fs');
var paths = require('path');
var async = require('async');
var stripJsonComments = require('strip-json-comments');
exports.loadMenu = loadMenu;
function loadMenu(name, client, cb) {
// want client.loadMenu(...). Replace current "goto module"/etc. with "switchMenu(...)"
// load options/etc -> call menuModule.enter(client, options)
/*
* Ensure JSON section exists
TODO:
* check access / ACS
*
* ...MenuModule(menuSection) ... .enter(client)
*/
if('object' !== typeof menuJson[name] || null === menuJson[name]) {
cb(new Error('No menu by the name of \'' + name + '\''));
return;
}
async.waterfall(
[
function loadMenuConfig(callback) {
var configJsonPath = paths.join(conf.config.paths.mods, 'menu.json');
var menuConfig = menuJson[name];
Log.debug(menuConfig, 'Menu config');
fs.readFile(configJsonPath, { encoding : 'utf8' }, function onMenuConfig(err, data) {
try {
var menuJson = JSON.parse(stripJsonComments(data));
var moduleName = menuConfig.module || 'standard_menu';
if('object' !== typeof menuJson[name] || null === menuJson[name]) {
callback(new Error('No configuration entry for \'' + name + '\''));
} else {
callback(err, menuJson[name]);
}
} catch(e) {
callback(e);
}
});
},
function menuConfigLoaded(menuConfig, callback) {
Log.debug( { config : menuConfig }, 'Menu configuration loaded');
moduleUtil.loadModule(moduleName, 'mods', function onModule(err, mod) {
if(err) {
cb(err);
} else {
Log.debug( { moduleName : moduleName, moduleInfo : mod.moduleInfo }, 'Loading menu module');
var moduleName = menuConfig.module || 'standard_menu';
var modInst = new mod.getModule(menuConfig);
cb(null, modInst);
moduleUtil.loadModule(moduleName, 'mods', function onModule(err, mod) {
callback(err, mod, menuConfig, moduleName);
});
},
],
function complete(err, mod, menuConfig, moduleName) {
if(err) {
cb(err);
} else {
Log.debug( { moduleName : moduleName, moduleInfo : mod.moduleInfo }, 'Loading menu module instance');
cb(null, new mod.getModule(menuConfig));
}
}
});
);
}

13
core/misc_util.js
View File

@ -1,6 +1,7 @@
"use strict";
/* jslint node: true */
'use strict';
var paths = require('path');
var paths = require('path');
exports.isProduction = isProduction;
exports.isDevelopment = isDevelopment;
@ -10,19 +11,19 @@ exports.resolvePath = resolvePath;
function isProduction() {
var env = process.env.NODE_ENV || 'dev';
return 'production' === env;
};
}
function isDevelopment() {
return (!(isProduction()));
};
}
function valueWithDefault(val, defVal) {
return (typeof val !== 'undefined' ? val : defVal);
};
}
function resolvePath(path) {
if(path.substr(0, 2) === '~/') {
path = (process.env.HOME || process.env.HOMEPATH || process.env.HOMEDIR || process.cwd()) + path.substr(1);
}
return paths.resolve(path);
};
}

25
core/view_controller.js
View File

@ -53,10 +53,24 @@ function ViewController(client, formId) {
};
this.submitForm = function() {
/*
Generate a form resonse. Example:
{
id : 0,
submitId : 1,
values : {
"1" : "hurp",
"2" : [ 'a', 'b', ... ],
"3 " 2,
}
}
*/
var formData = {
id : self.formId,
viewId : self.focusedView.id,
values : [],
id : self.formId,
submitId : self.focusedView.id,
values : {},
};
var viewData;
@ -64,10 +78,7 @@ function ViewController(client, formId) {
try {
viewData = self.views[id].getViewData();
if(typeof viewData !== 'undefined') {
formData.values.push({
id : id,
data : viewData,
});
formData.values[id] = viewData;
}
} catch(e) {
console.log(e);

39
mods/goodbye.js
View File

@ -1,39 +0,0 @@
/* jslint node: true */
'use strict';
var MenuModule = require('../core/menu_module.js').MenuModule;
var ansi = require('../core/ansi_term.js');
exports.moduleInfo = {
name : 'Goodbye',
desc : 'Log off / Goodbye Module',
author : 'NuSkooler',
};
exports.getModule = GoodbyeModule;
function GoodbyeModule(menuConfig) {
MenuModule.call(this, menuConfig);
}
require('util').inherits(GoodbyeModule, MenuModule);
GoodbyeModule.prototype.enter = function(client) {
GoodbyeModule.super_.prototype.enter.call(this, client);
};
GoodbyeModule.prototype.beforeArt = function() {
GoodbyeModule.super_.prototype.beforeArt.call(this);
this.client.term.write(ansi.resetScreen());
};
GoodbyeModule.prototype.mciReady = function(mciMap) {
GoodbyeModule.super_.prototype.mciReady.call(this, mciMap);
};
GoodbyeModule.prototype.finishedLoading = function() {
GoodbyeModule.super_.prototype.finishedLoading.call(this);
this.client.end();
};

39
mods/logoff.js Normal file
View File

@ -0,0 +1,39 @@
/* jslint node: true */
'use strict';
var MenuModule = require('../core/menu_module.js').MenuModule;
var ansi = require('../core/ansi_term.js');
exports.moduleInfo = {
name : 'LogOff',
desc : 'Log off / Goodbye Module',
author : 'NuSkooler',
};
exports.getModule = LogOffModule;
function LogOffModule(menuConfig) {
MenuModule.call(this, menuConfig);
}
require('util').inherits(LogOffModule, MenuModule);
LogOffModule.prototype.enter = function(client) {
LogOffModule.super_.prototype.enter.call(this, client);
};
LogOffModule.prototype.beforeArt = function() {
LogOffModule.super_.prototype.beforeArt.call(this);
this.client.term.write(ansi.resetScreen());
};
LogOffModule.prototype.mciReady = function(mciMap) {
LogOffModule.super_.prototype.mciReady.call(this, mciMap);
};
LogOffModule.prototype.finishedLoading = function() {
LogOffModule.super_.prototype.finishedLoading.call(this);
this.client.end();
};

12
mods/matrix.js
View File

@ -71,9 +71,15 @@ MatrixModule.prototype.mciReady = function(mciMap) {
vc.on('submit', function onSubmit(form) {
console.log(form);
if(0 === form.id && 1 === form.viewId) {
// :TODO: fix me. Need to finalize form data. Current is kinda... meh.
self.client.gotoMenuModule('goodbye');
var viewModuleMap = {
'0' : 'login',
'1' : 'new',
'2' : 'logoff',
};
if(0 === form.id && 1 === form.submitId) {
console.log(viewModuleMap[form.values[1]]);
self.client.gotoMenuModule(viewModuleMap[form.values[1]]);
}
});

7
mods/menu.json
View File

@ -1,4 +1,7 @@
{
/*
Menu Configuration
*/
"matrix" : {
"art" : "matrix",
"module" : "matrix"
@ -7,8 +10,8 @@
"art" : "login",
"module" : "login"
},
"goodbye" : {
"logoff" : {
"art" : "logoff",
"module" : "goodbye"
"module" : "logoff"
}
}