Merge pull request #229 from parallaxinc/component-cleanup

Component cleanup

Author: 2fast2fourier

.travis.yml

@@ -4,6 +4,7 @@ node_js:
   - '0.10'
   - '0.12'
 before_install:
+  - 'npm install -g npm' # need latest npm for scoped modules
   - 'export DISPLAY=:99.0'
   - 'sh -e /etc/init.d/xvfb start'
 script: npm run ci

.zuul.yml

@@ -1,5 +1,5 @@
 # Parallax IDE
-Parallax microcontroller development environment based on Chrome applications.
+Write, compile, and download code to your Parallax BASIC Stamp microcontroller to drive your custom electronic creations.
 
 ## Quickstart
 

README.md

@@ -4,7 +4,7 @@
         "description": "The name of the application"
     },
     "appDescription": {
-        "message": "Parallax microcontroller development environment based on Chrome applications.",
+        "message": "Write, compile, and download code to your Parallax BASIC Stamp microcontroller to drive your custom electronic creations.",
         "description": "The description of the application"
     }
 }

_locales/en/messages.json

@@ -2,8 +2,6 @@
 
 const Irken = require('irken');
 
-const { loadFile, newFile } = require('./src/actions/file');
-
 const app = new Irken();
 
 const plugins = [
@@ -29,16 +27,31 @@ const plugins = [
     register: require('iggins')
   },
   {
-    register: require('./plugins/appbar')
+    register: require('./src/plugins/handlers')
+  },
+  {
+    register: require('./src/plugins/keyboard-shortcuts')
+  },
+  {
+    register: require('./src/plugins/appbar')
+  },
+  {
+    register: require('./src/plugins/notifications')
   },
   {
-    register: require('./plugins/editor')
+    register: require('./src/plugins/editor')
   },
   {
-    register: require('./plugins/sidebar')
+    register: require('./src/plugins/terminal')
   },
   {
-    register: require('./plugins/overlays')
+    register: require('./src/plugins/rxtx')
+  },
+  {
+    register: require('./src/plugins/sidebar')
+  },
+  {
+    register: require('./src/plugins/overlays')
   }
 ];
 
@@ -51,21 +64,31 @@ function onRender(err){
     return;
   }
 
-  const { userConfig, workspace } = app;
+  const {
+    userConfig,
+    handlers
+  } = app;
+
+  const {
+    newFile,
+    changeFile,
+    changeProject
+  } = handlers;
 
   // Finish Loading Plugin
+  // TODO: encapsulate into a startup handler?
   const cwd = userConfig.get('cwd') || defaultProject;
   const lastFile = userConfig.get('last-file');
-  workspace.changeDir(cwd, (err) => {
-    console.log(err);
-    if(lastFile){
-      loadFile(lastFile);
-    } else {
-      newFile();
-    }
-
-    console.log('file loaded');
-  });
+  console.log(cwd, lastFile);
+  changeProject(cwd)
+    .then(() => {
+      if(lastFile){
+        changeFile(lastFile);
+      } else {
+        newFile();
+      }
+    })
+    .catch(console.error.bind(console));
 }
 
 function onRegister(err){

client.js

@@ -1,19 +1,19 @@
 {
   "name": "parallax-ide",
   "version": "0.6.0",
-  "description": "Parallax microcontroller development environment based on Chrome applications.",
+  "description": "Write, compile, and download code to your Parallax BASIC Stamp microcontroller to drive your custom electronic creations.",
   "main": "index.js",
   "directories": {
     "test": "test"
   },
   "dependencies": {
-    "alt": "^0.16.7",
-    "bs2-serial": "^0.10.5",
+    "@phated/redux-create-store": "^0.1.1",
+    "bs2-serial": "^0.11.0",
     "codemirror": "^4.13.0",
-    "frylord": "^0.6.0",
+    "frylord": "^0.7.1",
     "holovisor": "^0.2.0",
-    "iggins": "^0.2.1",
-    "irken": "^0.7.1",
+    "iggins": "^0.3.0",
+    "irken": "^0.8.0",
     "lodash": "^3.9.1",
     "react": "^0.13.1",
     "react-loader": "^1.2.0",
@@ -22,36 +22,32 @@
     "react-style": "^0.4.0",
     "skrim": "0.0.3",
     "snacks": "^0.2.0",
-    "sovereign": "^0.1.1",
-    "through2": "^0.6.5",
+    "sovereign": "^0.3.0",
     "when": "^3.7.2"
   },
   "devDependencies": {
-    "babel": "^4.5.1",
     "babel-core": "^4.5.1",
     "babel-loader": "^4.0.0",
     "babel-runtime": "^4.7.16",
-    "babelify": "^5.0.4",
     "browser-serialport": "git://github.com/garrows/browser-serialport#update",
     "chalk": "^1.0.0",
-    "chrome-sync-fs": "git://github.com/2fast2fourier/chrome-sync-fs#sync-fs",
     "css-loader": "^0.9.1",
     "del": "^1.1.1",
-    "electron-prebuilt": "^0.29.2",
+    "electron-prebuilt": "^0.30.2",
     "eslint": "^0.24.0",
     "eslint-plugin-react": "^2.6.3",
-    "expect": "git://github.com/phated/expect",
+    "expect": "^1.8.0",
     "gulp": "git://github.com/gulpjs/gulp#4.0",
     "gulp-util": "^3.0.4",
     "gulp-zip": "^2.0.3",
     "html-loader": "^0.2.3",
     "json-loader": "^0.5.1",
     "level-js": "^2.1.6",
-    "mocha": "^2.2.1",
     "style-loader": "^0.8.3",
     "webpack": "^1.7.2",
     "webpack-dev-server": "^1.7.0",
-    "zuul": "^3.2.0"
+    "zuul": "^3.2.0",
+    "zuul-builder-webpack": "^1.1.0"
   },
   "scripts": {
     "test": "zuul test/*.js --local --open",