repair setup checks

ShMcK · ShMcK · commit ac7a74e3a2bc · 2016-05-05T18:50:30.000-07:00
diff --git a/ROADMAP.md b/ROADMAP.md
@@ -20,4 +20,5 @@
     1. Users
     1. Analytics
     1. Tutorial ratings/feedback
-1. Unit Test Coverage
+1. Improved Unit Test Coverage
+1. Improved parsing of markdown -> `coderoad.json`
diff --git a/lib/components/Start/Checks/index.js b/lib/components/Start/Checks/index.js
@@ -5,14 +5,19 @@ var SetupChecks_1 = require('./SetupChecks');
 var InstallGuide_1 = require('./InstallGuide');
 var index_1 = require('../../index');
 var styles = {
-    margin: '10px',
-    padding: '40px 20px',
+    margin: '5px',
+    padding: '10px',
 };
 var Checks = function (_a) {
     var checks = _a.checks;
-    return (React.createElement("div", {styles: styles}, checks
-        ? React.createElement("div", null, React.createElement(SystemChecks_1.default, {checks: checks}), React.createElement(SetupChecks_1.default, {checks: checks}))
-        : React.createElement(index_1.ContentCard, {title: 'Error Loading Package.json', content: ''}), React.createElement(InstallGuide_1.default, {checks: checks})));
+    if (!checks) {
+        return React.createElement(index_1.ContentCard, {title: 'Error Loading Package.json', content: ''});
+    }
+    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})));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = Checks;
diff --git a/lib/components/Start/index.js b/lib/components/Start/index.js
@@ -1,27 +1,18 @@
 "use strict";
-var __assign = (this && this.__assign) || Object.assign || function(t) {
-    for (var s, i = 1, n = arguments.length; i < n; i++) {
-        s = arguments[i];
-        for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-            t[p] = s[p];
-    }
-    return t;
-};
-var _this = this;
 var React = require('react');
 var Checks_1 = require('./Checks');
 var Welcome_1 = require('./Welcome');
 var headerStyles = {
     display: 'block',
-    height: '300px',
+    height: '100%',
     textAlign: 'center',
     color: '#f8f8f8',
 };
 exports.Start = function (_a) {
     var checks = _a.checks;
     return (React.createElement("section", {className: 'cr-start'}, React.createElement("div", {style: headerStyles}, checks.passed
         ? React.createElement(Welcome_1.default, null)
-        : React.createElement(Checks_1.default, __assign({}, _this.props)))));
+        : React.createElement(Checks_1.default, {checks: checks}))));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = exports.Start;
diff --git a/src/components/Start/Checks/index.tsx b/src/components/Start/Checks/index.tsx
@@ -5,26 +5,29 @@ import InstallGuide from './InstallGuide';
 import {ContentCard} from '../../index';
 
 const styles = {
-  margin: '10px',
-  padding: '40px 20px',
+  margin: '5px',
+  padding: '10px',
 };
 
 const Checks: React.StatelessComponent<{
   checks: CR.Checks
-}> = ({checks}) => (
-    <div styles={styles}>
-
-        {checks
-          ? <div>
-              <SystemChecks checks={checks} />
-              <SetupChecks checks={checks} />
-            </div>
-          : <ContentCard
-              title='Error Loading Package.json'
-              content=''
-            />
-        }
-        <InstallGuide checks={checks} />
+}> = ({checks}) => {
+  if (!checks) {
+    return <ContentCard
+        title='Error Loading Package.json'
+        content=''
+      />;
+  }
+  return (
+    <div style={styles}>
+    {!checks.system.passed
+      ? <SystemChecks checks={checks} />
+      : null}
+      {!checks.setup.passed
+        ? <SetupChecks checks={checks} />
+        : null}
+      <InstallGuide checks={checks} />
     </div>
-);
+  );
+};
 export default Checks;
diff --git a/src/components/Start/index.tsx b/src/components/Start/index.tsx
@@ -4,7 +4,7 @@ import Welcome from './Welcome';
 
 const headerStyles = {
   display: 'block',
-  height: '300px',
+  height: '100%',
   textAlign: 'center',
   color: '#f8f8f8',
 };
@@ -16,7 +16,7 @@ export const Start: React.StatelessComponent<{
     <div style={headerStyles}>
     {checks.passed
       ? <Welcome  />
-      : <Checks {...this.props}/>}
+      : <Checks checks={checks}/>}
     </div>
   </section>
 );
