kenmirrors/MagicMirror
1
0
Fork 0
mirror of https://github.com/MichMich/MagicMirror.git synced 2025-08-21 12:55:22 +00:00
Code Issues Projects Releases Wiki Activity

Register the express app to allow registration of urls.

Browse Source
This commit is contained in:
Michael Teeuw
2016-04-05 14:22:34 +02:00
parent f1dad4c9fb
commit 5420314784
3 changed files with 31 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
js/electron.js
View File

@@ -7,6 +7,7 @@ const Server = require(__dirname + '/server.js');
const spawn = require('child_process').spawn;
const electron = require('electron');
const defaultModules = require(__dirname + '/../modules/default/defaultmodules.js');
const path = require('path');
// Config
var config = {};
@@ -80,6 +81,7 @@ function loadModule(module) {
var Module = require(helperPath);
var m = new Module();
m.setName(moduleName);
m.setPath(path.resolve(moduleFolder));
nodeHelpers.push(m);
}
}
@@ -108,11 +110,12 @@ loadConfig(function(c) {
loadModules(modules);
var server = new Server(config, function(io) {
var server = new Server(config, function(app, io) {
console.log('Server started ...');
for (var h in nodeHelpers) {
var nodeHelper = nodeHelpers[h];
nodeHelper.setExpressApp(app);
nodeHelper.setSocketIO(io);
nodeHelper.start();
}