Merge pull request #106 from paviro/v2-beta

This seems to be working perfect. I didn't test it yet on a Pi, but since you say this works I merge the pull request. Thanks for your contribution!
This commit is contained in:
Michael Teeuw 2016-03-28 12:17:51 +02:00
commit 4675bae804
4 changed files with 109 additions and 1 deletions

View File

@ -1,4 +1,5 @@
# MagicMirror V2
This version of the Magic Mirror software focusses on a modular plugin system.
This version of the Magic Mirror software focusses on a modular plugin system.
To start the software run `npm install && npm start`.
#WARNING: THIS VERSION IS IN A VERY EARLY STAGE. IT IS NOT COMPLETED YET. PLEASE USE THE MASTER BRANCH.

73
js/electron.js Executable file
View File

@ -0,0 +1,73 @@
'use strict';
//for searching modules
const walk = require('walk');
const electron = require('electron');
// Module to control application life.
const app = electron.app;
// Module to create native browser window.
const BrowserWindow = electron.BrowserWindow;
// Keep a global reference of the window object, if you don't, the window will
// be closed automatically when the JavaScript object is garbage collected.
let mainWindow;
function createWindow () {
// Create the browser window.
mainWindow = new BrowserWindow({width: 800, height: 600, fullscreen: true, "auto-hide-menu-bar": true, "node-integration": false});
// and load the index.html of the app.
mainWindow.loadURL('file://' + __dirname + '../../index.html');
// Open the DevTools.
//mainWindow.webContents.openDevTools();
// Emitted when the window is closed.
mainWindow.on('closed', function() {
// Dereference the window object, usually you would store windows
// in an array if your app supports multi windows, this is the time
// when you should delete the corresponding element.
mainWindow = null;
});
}
//Walk module folder and get file names
var module_loader = walk.walk(__dirname + '/../modules', { followLinks: false });
//for each file in modules
module_loader.on('file', function(root, stat, next) {
//if file is called node_helper.js load it
if (stat.name == "node_helper.js"){
require(root + '/' + stat.name);
//Log module name
var module = (root + '/' + stat.name).split("/")
console.log("Started helper script for module " + module[module.length-2] + ".");
}
next();
});
module_loader.on('end', function() {
console.log("All helpers started.");
});
// This method will be called when Electron has finished
// initialization and is ready to create browser windows.
app.on('ready', createWindow);
// Quit when all windows are closed.
app.on('window-all-closed', function () {
// On OS X it is common for applications and their menu bar
// to stay active until the user quits explicitly with Cmd + Q
if (process.platform !== 'darwin') {
app.quit();
}
});
app.on('activate', function () {
// On OS X it's common to re-create a window in the app when the
// dock icon is clicked and there are no other windows open.
if (mainWindow === null) {
createWindow();
}
});

View File

@ -0,0 +1,2 @@
'use strict';
console.log("test");

32
package.json Executable file
View File

@ -0,0 +1,32 @@
{
"name": "Magic-Mirror",
"version": "2.0.0",
"description": "A modular interface for smart mirrors.",
"main": "js/electron.js",
"scripts": {
"start": "electron js/electron.js"
},
"repository": {
"type": "git",
"url": "git+https://github.com/MichMich/MagicMirror.git"
},
"keywords": [
"magic mirror",
"smart mirror",
"mirror UI",
"modular"
],
"author": "Michael Teeuw",
"contributors": "https://github.com/MichMich/MagicMirror/graphs/contributors",
"license": "MIT",
"bugs": {
"url": "https://github.com/MichMich/MagicMirror/issues"
},
"homepage": "https://github.com/MichMich/MagicMirror#readme",
"devDependencies": {
"electron-prebuilt": "latest"
},
"dependencies": {
"walk": "latest"
}
}