cleanup and prepare for setup changes

Author: ShMcK

lib/actions/tutorials.js

@@ -1,6 +1,6 @@
 "use strict";
 var Type = require('./actionTypes');
-var tutorials_1 = require('../services/tutorials');
+var tutorials_1 = require('../services/setup/tutorials');
 function loadTutorials() {
     var tutorials = [];
     var packageJson = tutorials_1.loadRootPackageJson();

lib/components/_components.js

@@ -1,8 +1,6 @@
 "use strict";
 var app_1 = require('./app');
 exports.App = app_1.default;
-var theme_1 = require('./theme/theme');
-exports.Theme = theme_1.default;
 var routes_1 = require('./routes/routes');
 exports.Routes = routes_1.default;
 var page_1 = require('./page/page');
@@ -11,8 +9,6 @@ var chapter_1 = require('./page/chapter');
 exports.Chapter = chapter_1.default;
 var menu_1 = require('./menu/menu');
 exports.Menu = menu_1.default;
-var account_1 = require('./account/account');
-exports.Account = account_1.default;
 var progress_1 = require('./progress/progress');
 exports.Progress = progress_1.default;
 var start_1 = require('./start/start');

lib/components/app.js

@@ -16,8 +16,6 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var React = require('react');
 var react_redux_1 = require('react-redux');
 var _components_1 = require('./_components');
-var ThemeDecorator = require('material-ui/lib/styles/theme-decorator');
-var ThemeManager = require('material-ui/lib/styles/theme-manager');
 var height = atom.getSize().height;
 window.onresize = function () {
     height = atom.getSize().height;
@@ -29,11 +27,9 @@ var default_1 = (function (_super) {
     }
     default_1.prototype.render = function () {
         var state = this.props.state;
-        console.log(state);
         return (React.createElement("section", {className: 'cr', key: 'main', style: { height: height }}, React.createElement(_components_1.Menu, {route: state.route, position: state.position}), React.createElement(_components_1.Routes, {state: state, ref: 'route'}), React.createElement(_components_1.Alert, {alert: state.alert})));
     };
     default_1 = __decorate([
-        ThemeDecorator(ThemeManager.getMuiTheme(_components_1.Theme)),
         react_redux_1.connect(function (state) {
             return { state: state };
         }), 

lib/components/theme/theme.js

@@ -1,25 +0,0 @@
-"use strict";
-var Colors = require('material-ui/lib/styles/colors');
-var ColorManipulator = require('material-ui/lib/utils/color-manipulator');
-var spacing_1 = require('material-ui/lib/styles/spacing');
-var zIndex_1 = require('material-ui/lib/styles/zIndex');
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = {
-    spacing: spacing_1.default,
-    zIndex: zIndex_1.default,
-    fontFamily: 'Roboto, sans-serif',
-    palette: {
-        primary1Color: Colors.teal400,
-        primary2Color: Colors.teal700,
-        primary3Color: Colors.lightBlack,
-        accent1Color: Colors.pinkA200,
-        accent2Color: Colors.grey100,
-        accent3Color: Colors.grey500,
-        textColor: Colors.darkBlack,
-        alternateTextColor: Colors.white,
-        canvasColor: Colors.white,
-        borderColor: Colors.grey300,
-        disabledColor: ColorManipulator.fade(Colors.darkBlack, 0.3),
-        pickerHeaderColor: Colors.cyan500
-    }
-};

package.json

@@ -40,14 +40,14 @@
   "dependencies": {
     "classnames": "2.2.3",
     "highlights": "1.3.1",
-    "lodash": "4.7.0",
+    "lodash": "4.9.0",
     "marked": "0.3.5",
     "material-ui": "0.14.4",
-    "react": "0.14.8",
-    "react-dom": "0.14.8",
-    "react-redux": "4.4.1",
+    "react": "15.0.1",
+    "react-dom": "15.0.1",
+    "react-redux": "4.4.2",
     "react-tap-event-plugin": "0.2.2",
-    "redux": "3.3.1"
+    "redux": "3.4.0"
   },
   "scripts": {
     "test": "ava",

src/actions/tutorials.ts

@@ -4,7 +4,7 @@ import * as path from 'path';
 import * as fs from 'fs';
 import * as Type from './actionTypes';
 import {fileExists} from '../services/exists';
-import {loadRootPackageJson, searchForTutorials} from '../services/tutorials';
+import {loadRootPackageJson, searchForTutorials} from '../services/setup/tutorials';
 
 export function loadTutorials(): CR.Action {
   let tutorials = [];

src/components/_components.ts

@@ -1,6 +1,5 @@
 // Root App
 export {default as App} from './app';
-export {default as Theme} from './theme/theme';
 
 // Router
 export {default as Routes} from './routes/routes';
@@ -9,7 +8,6 @@ export {default as Routes} from './routes/routes';
 export {default as Page} from './page/page';
 export {default as Chapter} from './page/chapter';
 export {default as Menu} from './menu/menu';
-export {default as Account} from './account/account';
 export {default as Progress} from './progress/progress';
 export {Start} from './start/start';
 export {FinalPage} from './final-page/final-page';

src/components/account/account.tsx

@@ -1,29 +1,26 @@
 import * as React from 'react';
 import {connect} from 'react-redux';
-import {Menu, Routes, Alert, Theme} from './_components';
-import * as ThemeDecorator from 'material-ui/lib/styles/theme-decorator';
-import * as ThemeManager from 'material-ui/lib/styles/theme-manager';
+import {Menu, Routes, Alert} from './_components';
+// import {muiTheme} from './theme/theme';
+// import MuiThemeProvider from 'material-ui/lib/MuiThemeProvider';
 
 let height: number = atom.getSize().height;
 window.onresize = function() {
   height = atom.getSize().height;
 };
 
-@ThemeDecorator(ThemeManager.getMuiTheme(Theme))
 @connect((state: CR.State) => {
   return { state };
 })
 export default class extends React.Component<{state?: CR.State}, {}> {
   render(): React.ReactElement<{}> {
     const state = this.props.state;
-    console.log(state);
     return (
       <section className='cr' key='main' style={{height}}>
         <Menu route={state.route} position={state.position} />
         <Routes state={state} ref='route' />
         <Alert alert={state.alert} />
       </section>
-
     );
   }
 };

src/components/account/login.tsx

@@ -1,24 +1,11 @@
-import * as Colors from 'material-ui/lib/styles/colors';
-import * as ColorManipulator from 'material-ui/lib/utils/color-manipulator';
-import Spacing from 'material-ui/lib/styles/spacing';
-import zIndex from 'material-ui/lib/styles/zIndex';
-
-export default {
-  spacing: Spacing,
-  zIndex: zIndex,
-  fontFamily: 'Roboto, sans-serif',
-  palette: {
-    primary1Color: Colors.teal400,
-    primary2Color: Colors.teal700,
-    primary3Color: Colors.lightBlack,
-    accent1Color: Colors.pinkA200,
-    accent2Color: Colors.grey100,
-    accent3Color: Colors.grey500,
-    textColor: Colors.darkBlack,
-    alternateTextColor: Colors.white,
-    canvasColor: Colors.white,
-    borderColor: Colors.grey300,
-    disabledColor: ColorManipulator.fade(Colors.darkBlack, 0.3),
-    pickerHeaderColor: Colors.cyan500
-  }
-};
+// import {cyan500} from 'material-ui/lib/styles/colors';
+// import getMuiTheme from 'material-ui/lib/styles/getMuiTheme';
+//
+// export const muiTheme = getMuiTheme({
+//   palette: {
+//     textColor: cyan500,
+//   },
+//   appBar: {
+//     height: 33
+//   }
+// });

src/components/account/signup.tsx

@@ -98,9 +98,6 @@
         "src/services/write.ts",
         "src/store/initialState.ts",
         "src/store/store.ts",
-        "src/components/account/account.tsx",
-        "src/components/account/login.tsx",
-        "src/components/account/signup.tsx",
         "src/components/alert/alert.tsx",
         "src/components/app.tsx",
         "src/components/final-page/final-page.tsx",