Permalink
Browse files

Make things work with recent versions of...everything. Still a lot of…

… deprecation to deal with
  • Loading branch information...
Phoenixmatrix committed Dec 25, 2015
1 parent 1918dab commit 6ce5a5572a1413b6e2bce8e357df42059bd20930
Showing with 14 additions and 10 deletions.
  1. +6 −5 .gitignore
  2. +1 −1 index.js
  3. +2 −1 js/app.js
  4. +5 −3 package.json
View
@@ -1,5 +1,6 @@
node_modules
.idea
certificate
npm-debug.log
dist
node_modules
.idea
certificate
npm-debug.log
dist
git
View
@@ -27,7 +27,7 @@ app.on('ready', function() {
mainWindow = new BrowserWindow({width: 1000, height: 800, icon: "./icon.png"});
mainWindow.loadUrl('file://' + __dirname + '/index.html');
mainWindow.loadURL('file://' + __dirname + '/index.html');
mainWindow.on('closed', function() {
mainWindow = null;
});
View
@@ -1,13 +1,14 @@
import 'babel/polyfill';
import React from 'react';
import ReactDOM from 'react-dom';
import domready from "domready";
import PhoenixMatrixApp from './components/PhoenixMatrixApp';
import requestStore from './stores/request-store';
requestStore.init();
domready(function () {
React.render(
ReactDOM.render(
<PhoenixMatrixApp />,
document.body
);
View
@@ -14,7 +14,7 @@
"classnames": "^2.1.1",
"connect": "~3.1.1",
"domready": "^1.0.8",
"electron-prebuilt": "^0.25.2",
"electron-prebuilt": "^0.36.2",
"flux": "^2.0.3",
"gulp": "^3.8.10",
"gulp-babel": "^5.1.0",
@@ -25,11 +25,13 @@
"gulp-watch": "^4.1.0",
"keymirror": "^0.1.1",
"lodash": "^3.0.1",
"mkdirp": "^0.5.0",
"mkdirp": "^0.5.1",
"moment": "^2.10.2",
"node-forge": "^0.6.26",
"node-uuid": "~1.4.1",
"node-uuid": "^1.4.7",
"react": "^0.14.3",
"react-bootstrap": "^0.21.2",
"react-dom": "^0.14.3",
"run-sequence": "^1.0.2"
},
"eslintConfig": {

0 comments on commit 6ce5a55

Please sign in to comment.