refactor setup module

Author: ShMcK

lib/modules/setup/Checks/index.js

@@ -1,23 +1,28 @@
 "use strict";
-var React = require('react');
-var SystemChecks_1 = require('./SystemChecks');
-var SetupChecks_1 = require('./SetupChecks');
-var InstallGuide_1 = require('./InstallGuide');
-var index_1 = require('../../../components/index');
-var styles = {
-    margin: '5px',
-    padding: '10px',
-};
-var Checks = function (_a) {
-    var checks = _a.checks;
-    if (!checks) {
-        return React.createElement(index_1.ContentCard, {title: 'Error Loading Package.json', content: ''});
+var types_1 = require('../types');
+var verify_1 = require('../utils/verify');
+var _checks = {
+    passed: false,
+    system: {
+        node: false,
+        npm: false,
+        xcode: false,
+    },
+    setup: {
+        hasDir: false,
+        hasPackageJson: false,
+        hasTutorial: false,
     }
-    return (React.createElement("div", {style: styles}, !checks.system.passed
-        ? React.createElement(SystemChecks_1.default, {checks: checks})
-        : null, !checks.setup.passed
-        ? React.createElement(SetupChecks_1.default, {checks: checks})
-        : null, React.createElement(InstallGuide_1.default, {checks: checks})));
 };
+function checks(checks, action) {
+    if (checks === void 0) { checks = _checks; }
+    switch (action.type) {
+        case types_1.SETUP_VERIFY:
+            var _a = action.payload, dir = _a.dir, packageJson = _a.packageJson;
+            return verify_1.default(dir, packageJson);
+        default:
+            return checks;
+    }
+}
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = Checks;
+exports.default = checks;

lib/modules/setup/index.js

@@ -1,5 +1,5 @@
 "use strict";
-var reducer_1 = require('./reducer');
-exports.reducer = reducer_1.default;
+var checks_1 = require('./checks');
+exports.checks = checks_1.default;
 var package_json_1 = require('./package-json');
 exports.packageJson = package_json_1.default;

lib/reducers.js

@@ -13,7 +13,7 @@ var window_1 = require('core-coderoad/lib/window');
 var editor_1 = require('./modules/editor');
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = redux_1.combineReducers({
-    alert: alert_1.reducer, checks: setup_1.reducer, editor: editor_1.editor, dir: editor_1.dir, hintPosition: hints_1.reducer,
+    alert: alert_1.reducer, checks: setup_1.checks, editor: editor_1.editor, dir: editor_1.dir, hintPosition: hints_1.reducer,
     packageJson: setup_1.packageJson, page: page_1.page, pagePosition: page_1.pagePosition, progress: progress_1.reducer, route: route_1.reducer, tasks: page_1.tasks,
     tutorial: tutorial_1.reducer, tutorials: tutorials_1.reducer,
     taskActions: page_1.taskActions, taskPosition: tests_1.taskPosition, taskTests: page_1.taskTests, testRun: tests_1.testRun, windowToggle: window_1.reducer

src/modules/setup/reducer.ts renamed to src/modules/setup/checks/index.ts

@@ -1,5 +1,5 @@
-import {SETUP_VERIFY} from './types';
-import setupVerify from './utils/verify';
+import {SETUP_VERIFY} from '../types';
+import setupVerify from '../utils/verify';
 
 const _checks: CR.Checks = {
   passed: false,

src/modules/setup/index.ts

@@ -1,3 +1,2 @@
-export {default as Checks} from './Checks';
-export {default as reducer} from './reducer';
+export {default as checks} from './checks';
 export {default as packageJson} from './package-json';

src/modules/window/actions.ts

@@ -2,7 +2,7 @@ import {combineReducers} from 'redux';
 
 // module reducers
 import {reducer as alert} from './modules/alert';
-import {reducer as checks, packageJson} from './modules/setup';
+import {checks, packageJson} from './modules/setup';
 import {reducer as hintPosition} from './modules/hints';
 import {page, pagePosition, tasks, taskActions, taskTests} from './modules/page';
 import {reducer as progress} from './modules/progress';

src/modules/window/index.ts

@@ -1,12 +1,12 @@
+declare module 'core-coderoad/lib/polyfills' {
+  export default function loadPolyfills(): void;
+}
+
 declare module 'core-coderoad/lib/route' {
   export function reducer(route: string, action: Action): string;
   export function routeSet(route: string);
 }
 
-declare module 'core-coderoad/lib/polyfills' {
-  export default function loadPolyfills(): void;
-}
-
 declare module 'core-coderoad/lib/window' {
   export function reducer(open: boolean, action: Action): boolean;
   export function windowToggle();

src/modules/window/reducer.ts

@@ -91,21 +91,15 @@
         "src/modules/page/task-tests/index.ts",
         "src/modules/page/tasks/index.ts",
         "src/modules/page/types.ts",
-        "src/modules/polyfills/index.ts",
-        "src/modules/polyfills/object-values.ts",
         "src/modules/progress/actions.ts",
         "src/modules/progress/index.ts",
         "src/modules/progress/reducer.ts",
         "src/modules/progress/types.ts",
         "src/modules/progress/utils/local-storage.ts",
-        "src/modules/route/actions.ts",
-        "src/modules/route/index.ts",
-        "src/modules/route/reducer.ts",
-        "src/modules/route/types.ts",
         "src/modules/setup/actions.ts",
+        "src/modules/setup/checks/index.ts",
         "src/modules/setup/index.ts",
         "src/modules/setup/package-json/index.ts",
-        "src/modules/setup/reducer.ts",
         "src/modules/setup/types.ts",
         "src/modules/setup/utils/action-setup.ts",
         "src/modules/setup/utils/action-system.ts",
@@ -135,10 +129,6 @@
         "src/modules/tutorials/utils/check.ts",
         "src/modules/tutorials/utils/is-tutorial.ts",
         "src/modules/tutorials/utils/update.ts",
-        "src/modules/window/actions.ts",
-        "src/modules/window/index.ts",
-        "src/modules/window/reducer.ts",
-        "src/modules/window/types.ts",
         "src/reducers.ts",
         "src/store.ts",
         "src/subscriptions.ts",
@@ -186,7 +176,6 @@
         "src/modules/hints/Hints/HintButton.tsx",
         "src/modules/hints/Hints/index.tsx",
         "src/modules/page/Continue/index.tsx",
-        "src/modules/route/RouteButton.tsx",
         "src/modules/tutorials/Tutorials/index.tsx",
         "src/modules/tutorials/Tutorials/LoadTutorials/index.tsx",
         "src/modules/tutorials/Tutorials/SelectTutorial/index.tsx",