restructure components, style fixes

ShMcK · ShMcK · commit 4e46600bd258 · 2016-04-21T07:51:41.000-07:00
diff --git a/lib/components/AppMenu/MenuLink/index.js b/lib/components/AppMenu/MenuLink/index.js
@@ -16,7 +16,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var React = require('react');
 var react_redux_1 = require('react-redux');
 var MenuItem_1 = require('material-ui/MenuItem');
-var actions_1 = require('../../actions');
+var actions_1 = require('../../../actions');
 var MenuLink = (function (_super) {
     __extends(MenuLink, _super);
     function MenuLink() {
diff --git a/lib/components/AppMenu/Quit/index.js b/lib/components/AppMenu/Quit/index.js
@@ -15,8 +15,8 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 var React = require('react');
 var react_redux_1 = require('react-redux');
-var mount_1 = require('../mount');
-var subscriptions_1 = require('../../atom/subscriptions');
+var mount_1 = require('../../mount');
+var subscriptions_1 = require('../../../atom/subscriptions');
 var MenuItem_1 = require('material-ui/MenuItem');
 var Quit = (function (_super) {
     __extends(Quit, _super);
diff --git a/lib/components/Page/EditPage/index.js b/lib/components/Page/EditPage/index.js
@@ -1,6 +1,6 @@
 "use strict";
 var React = require('react');
-var path = require('path');
+var path_1 = require('path');
 var mode_edit_1 = require('material-ui/svg-icons/editor/mode-edit');
 var editStyle = {
     position: 'absolute',
@@ -10,7 +10,7 @@ var editStyle = {
 exports.EditPage = function (_a) {
     var tutorial = _a.tutorial;
     if (tutorial && tutorial.edit && tutorial.repo) {
-        var repoPath = path.join(tutorial.repo, 'edit', 'master', tutorial.repo);
+        var repoPath = path_1.join(tutorial.repo, 'edit', 'master', tutorial.repo);
         return (React.createElement("a", {href: repoPath}, React.createElement(mode_edit_1.default, {style: editStyle})));
     }
 };
diff --git a/lib/components/Page/PageComplete/index.js b/lib/components/Page/PageComplete/index.js
@@ -5,6 +5,7 @@ var index_1 = require('../../index');
 var colors_1 = require('material-ui/styles/colors');
 var styles = {
     backgroundColor: colors_1.cyan500,
+    zIndex: '0',
     position: 'fixed',
     bottom: '20px',
     padding: '10px 15px 30px',
diff --git a/lib/components/Page/PageContent/index.js b/lib/components/Page/PageContent/index.js
@@ -1,6 +1,6 @@
 "use strict";
 var React = require('react');
-var index_1 = require('../index');
+var index_1 = require('../../index');
 var Card_1 = require('material-ui/Card');
 var styles = {
     margin: '5px'
diff --git a/lib/components/Page/PageToolbar/Continue/index.js b/lib/components/Page/PageToolbar/Continue/index.js
@@ -16,14 +16,17 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var React = require('react');
 var react_redux_1 = require('react-redux');
 var FlatButton_1 = require('material-ui/FlatButton');
-var actions_1 = require('../../../actions');
+var actions_1 = require('../../../../actions');
+var styles = {
+    zIndex: '10000',
+};
 var Continue = (function (_super) {
     __extends(Continue, _super);
     function Continue() {
         _super.apply(this, arguments);
     }
     Continue.prototype.render = function () {
-        return (React.createElement(FlatButton_1.default, {label: 'Continue', primary: true, onTouchTap: this.props.callNextPage}));
+        return (React.createElement(FlatButton_1.default, {style: styles, label: 'Continue', secondary: true, onTouchTap: this.props.callNextPage}));
     };
     Continue = __decorate([
         react_redux_1.connect(null, function (dispatch, state) {
diff --git a/lib/components/Page/PageToolbar/Save/index.js b/lib/components/Page/PageToolbar/Save/index.js
@@ -1,5 +1,5 @@
 "use strict";
 var React = require('react');
 var FlatButton_1 = require('material-ui/FlatButton');
-var editor_1 = require('../../../atom/editor');
+var editor_1 = require('../../../../atom/editor');
 exports.Save = function () { return (React.createElement(FlatButton_1.default, {label: 'Save', secondary: true, onTouchTap: editor_1.save})); };
diff --git a/lib/components/Page/PageToolbar/ToggleLog/index.js b/lib/components/Page/PageToolbar/ToggleLog/index.js
@@ -1,6 +1,6 @@
 "use strict";
 var React = require('react');
 var code_1 = require('material-ui/svg-icons/action/code');
-var actions_1 = require('../../../atom/actions');
+var actions_1 = require('../../../../atom/actions');
 var FlatButton_1 = require('material-ui/FlatButton');
 exports.ToggleLog = function () { return (React.createElement(FlatButton_1.default, {icon: React.createElement(code_1.default, null), onTouchTap: actions_1.toggleDevTools})); };
diff --git a/lib/components/Page/PageToolbar/index.js b/lib/components/Page/PageToolbar/index.js
@@ -5,7 +5,7 @@ var ToggleLog_1 = require('./ToggleLog');
 var Save_1 = require('./Save');
 var Continue_1 = require('./Continue');
 var styles = {
-    zIndex: '10000',
+    zIndex: '1000',
     position: 'fixed',
     bottom: '0',
     right: '0',
diff --git a/lib/components/Page/ProgressBar/index.js b/lib/components/Page/ProgressBar/index.js
diff --git a/lib/components/Progress/ProgresPage/index.js b/lib/components/Progress/ProgresPage/index.js
@@ -15,9 +15,9 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 var React = require('react');
 var react_redux_1 = require('react-redux');
-var actions_1 = require('../../actions');
+var actions_1 = require('../../../actions');
 var List_1 = require('material-ui/List');
-var progressIcon_1 = require('./progressIcon');
+var progressIcon_1 = require('../progressIcon');
 var colors_1 = require('material-ui/styles/colors');
 var styles = {
     paddingLeft: '15px',
diff --git a/lib/components/Progress/ProgressChapter/index.js b/lib/components/Progress/ProgressChapter/index.js
@@ -1,8 +1,8 @@
 "use strict";
 var React = require('react');
 var List_1 = require('material-ui/List');
-var ProgressPage_1 = require('./ProgressPage');
-var index_1 = require('../index');
+var ProgressPage_1 = require('../ProgressPage');
+var index_1 = require('../../index');
 var styles = {
     marginBottom: '0'
 };
diff --git a/lib/components/Progress/progressIcon.js b/lib/components/Progress/progressIcon.js
@@ -6,7 +6,7 @@ var play_circle_filled_1 = require('material-ui/svg-icons/av/play-circle-filled'
 var check_box_outline_blank_1 = require('material-ui/svg-icons/toggle/check-box-outline-blank');
 function progressIcon(completed, current) {
     if (completed) {
-        return React.createElement(check_box_1.default, null);
+        return React.createElement(check_box_1.default, {color: colors_1.green300});
     }
     else if (current) {
         return React.createElement(play_circle_filled_1.default, {color: colors_1.pink500});
diff --git a/lib/components/Tutorials/LoadTutorials/index.js b/lib/components/Tutorials/LoadTutorials/index.js
@@ -15,7 +15,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 };
 var React = require('react');
 var react_redux_1 = require('react-redux');
-var actions_1 = require('../../actions');
+var actions_1 = require('../../../actions');
 var FlatButton_1 = require('material-ui/FlatButton');
 var LoadTutorials = (function (_super) {
     __extends(LoadTutorials, _super);
diff --git a/lib/components/Tutorials/SelectTutorial/index.js b/lib/components/Tutorials/SelectTutorial/index.js
@@ -16,7 +16,7 @@ var __metadata = (this && this.__metadata) || function (k, v) {
 var React = require('react');
 var react_redux_1 = require('react-redux');
 var FlatButton_1 = require('material-ui/FlatButton');
-var actions_1 = require('../../actions');
+var actions_1 = require('../../../actions');
 function displayName(name) {
     if (name.match(/^coderoad-tutorial-/)) {
         return name.slice(18);
diff --git a/lib/components/Tutorials/UpdateTutorial/index.js b/lib/components/Tutorials/UpdateTutorial/index.js
diff --git a/src/components/AppMenu/MenuLink/index.tsx b/src/components/AppMenu/MenuLink/index.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import {connect} from 'react-redux';
 import MenuItem from 'material-ui/MenuItem';
-import {pageSet, routeSet} from '../../actions';
+import {pageSet, routeSet} from '../../../actions';
 
 @connect(null, (dispatch) => {
   return {
diff --git a/src/components/AppMenu/Quit/index.tsx b/src/components/AppMenu/Quit/index.tsx
@@ -1,7 +1,7 @@
 import * as React from 'react';
 import {connect} from 'react-redux';
-import {togglePanel} from '../mount';
-import {onDeactivate} from '../../atom/subscriptions';
+import {togglePanel} from '../../mount';
+import {onDeactivate} from '../../../atom/subscriptions';
 import MenuItem from 'material-ui/MenuItem';
 
 @connect(null, (dispatch) => {
diff --git a/src/components/Page/EditPage/index.tsx b/src/components/Page/EditPage/index.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
-import * as path from 'path';
-import {store} from '../../store';
+import {join} from 'path';
+import {store} from '../../../store';
 
 import NavigationClose from 'material-ui/svg-icons/navigation/close';
 import ModeEdit from 'material-ui/svg-icons/editor/mode-edit';
@@ -14,7 +14,7 @@ export const EditPage: React.StatelessComponent<{
   tutorial: Tutorial.Config
 }> = ({tutorial}) => {
   if (tutorial && tutorial.edit && tutorial.repo) {
-    const repoPath = path.join(tutorial.repo, 'edit', 'master', tutorial.repo);
+    const repoPath = join(tutorial.repo, 'edit', 'master', tutorial.repo);
     return (
       <a href={repoPath}>
         <ModeEdit style={editStyle}/>
diff --git a/src/components/Page/PageComplete/index.tsx b/src/components/Page/PageComplete/index.tsx
@@ -5,6 +5,7 @@ import {cyan500, grey100} from 'material-ui/styles/colors';
 
 const styles = {
   backgroundColor: cyan500,
+  zIndex: '0',
   position: 'fixed',
   bottom: '20px',
   padding: '10px 15px 30px',
@@ -23,12 +24,12 @@ export const PageComplete: React.StatelessComponent<{
 }> = ({page}) => (
   <div className='cr-page-onComplete'>
     {page.completed && page.onPageComplete
-        ? <Card style={styles}>
-            <CardText>
-                <Markdown style={textStyles}>{page.onPageComplete}</Markdown>
-            </CardText>
-          </Card>
-        : null
+      ? <Card style={styles}>
+          <CardText>
+            <Markdown style={textStyles}>{page.onPageComplete}</Markdown>
+          </CardText>
+        </Card>
+      : null
     }
   </div>
 );
diff --git a/src/components/Page/PageContent/index.tsx b/src/components/Page/PageContent/index.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import {Markdown} from '../index';
+import {Markdown} from '../../index';
 import {Card, CardHeader, CardText} from 'material-ui/Card';
 
 const styles = {
diff --git a/src/components/Page/PageToolbar/Continue/index.tsx b/src/components/Page/PageToolbar/Continue/index.tsx
@@ -1,7 +1,11 @@
 import * as React from 'react';
 import {connect} from 'react-redux';
 import FlatButton from 'material-ui/FlatButton';
-import {pageNext, testsLoad} from '../../../actions';
+import {pageNext, testsLoad} from '../../../../actions';
+
+const styles = {
+  zIndex: '10000',
+};
 
 @connect(null, (dispatch, state) => {
   return {
@@ -17,8 +21,9 @@ export class Continue extends React.Component<{
   render() {
     return (
       <FlatButton
+        style={styles}
         label='Continue'
-        primary={true}
+        secondary={true}
         onTouchTap={this.props.callNextPage}
       />
     );
diff --git a/src/components/Page/PageToolbar/Save/index.tsx b/src/components/Page/PageToolbar/Save/index.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import FlatButton from 'material-ui/FlatButton';
-import {save} from '../../../atom/editor';
+import {save} from '../../../../atom/editor';
 
 export const Save = () => (
   <FlatButton
diff --git a/src/components/Page/PageToolbar/ToggleLog/index.tsx b/src/components/Page/PageToolbar/ToggleLog/index.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import Code from 'material-ui/svg-icons/action/code';
-import {toggleDevTools} from '../../../atom/actions';
+import {toggleDevTools} from '../../../../atom/actions';
 import FlatButton from 'material-ui/FlatButton';
 
 export const ToggleLog = () => (
diff --git a/src/components/Page/PageToolbar/index.tsx b/src/components/Page/PageToolbar/index.tsx
@@ -5,7 +5,7 @@ import {Save} from './Save';
 import {Continue} from './Continue';
 
 const styles = {
-    zIndex: '10000',
+    zIndex: '1000',
     position: 'fixed',
     bottom: '0',
     right: '0',
diff --git a/src/components/Page/ProgressBar/index.tsx b/src/components/Page/ProgressBar/index.tsx
diff --git a/src/components/Progress/ProgresPage/index.tsx b/src/components/Progress/ProgresPage/index.tsx
@@ -1,9 +1,9 @@
 import * as React from 'react';
 import {connect} from 'react-redux';
-import {pageSet, routeSet, testsLoad} from '../../actions';
+import {pageSet, routeSet, testsLoad} from '../../../actions';
 import * as classnames from 'classnames';
 import {ListItem} from 'material-ui/List';
-import {progressIcon} from './progressIcon';
+import {progressIcon} from '../progressIcon';
 import {grey400} from 'material-ui/styles/colors';
 
 const styles = {
diff --git a/src/components/Progress/ProgressChapter/index.tsx b/src/components/Progress/ProgressChapter/index.tsx
@@ -1,8 +1,8 @@
 import * as React from 'react';
 import {ListItem} from 'material-ui/List';
-import {ProgressPage} from './ProgressPage';
-import {progressIcon} from './progressIcon';
-import {Markdown} from '../index';
+import {ProgressPage} from '../ProgressPage';
+import {progressIcon} from '../progressIcon';
+import {Markdown} from '../../index';
 
 const styles = {
   marginBottom: '0'
diff --git a/src/components/Progress/progressIcon.tsx b/src/components/Progress/progressIcon.tsx
@@ -1,12 +1,12 @@
 import * as React from 'react';
-import {pink500} from 'material-ui/styles/colors';
+import {pink500, green300} from 'material-ui/styles/colors';
 import CheckBox from 'material-ui/svg-icons/toggle/check-box';
 import PlayCircleFilled from 'material-ui/svg-icons/av/play-circle-filled';
 import CheckBoxOutlineBlank from 'material-ui/svg-icons/toggle/check-box-outline-blank';
 
 export function progressIcon(completed: boolean, current?: boolean) {
   if (completed) {
-    return <CheckBox />;
+    return <CheckBox color={green300} />;
   } else if (current) {
     return <PlayCircleFilled color={pink500} />;
   } else {
diff --git a/src/components/Tutorials/LoadTutorials/index.tsx b/src/components/Tutorials/LoadTutorials/index.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import {connect} from 'react-redux';
-import {tutorialsFind} from '../../actions';
+import {tutorialsFind} from '../../../actions';
 import FlatButton from 'material-ui/FlatButton';
 
 @connect(null, (dispatch) => {
diff --git a/src/components/Tutorials/SelectTutorial/index.tsx b/src/components/Tutorials/SelectTutorial/index.tsx
@@ -3,7 +3,7 @@ import {connect} from 'react-redux';
 import FlatButton from 'material-ui/FlatButton';
 import {
   positionSet, tutorialSet, progressLoad, routeSet
-} from '../../actions';
+} from '../../../actions';
 
 function displayName(name: string): string {
   if (name.match(/^coderoad-tutorial-/)) {
diff --git a/src/components/Tutorials/UpdateTutorial/index.tsx b/src/components/Tutorials/UpdateTutorial/index.tsx
diff --git a/tsconfig.json b/tsconfig.json
@@ -112,32 +112,32 @@
         "src/components/AppMenu/issuesLink.tsx",
         "src/components/AppMenu/menuIconLeft.tsx",
         "src/components/AppMenu/menuIconRight.tsx",
-        "src/components/AppMenu/MenuLink.tsx",
+        "src/components/AppMenu/MenuLink/index.tsx",
         "src/components/AppMenu/menuRight.tsx",
         "src/components/AppMenu/menuRightRouteOptions.tsx",
-        "src/components/AppMenu/Quit.tsx",
+        "src/components/AppMenu/Quit/index.tsx",
         "src/components/Common/RouteButton.tsx",
         "src/components/FinalPage/index.tsx",
         "src/components/Markdown/index.tsx",
         "src/components/Page/Chapter/index.tsx",
-        "src/components/Page/EditPage.tsx",
+        "src/components/Page/EditPage/index.tsx",
         "src/components/Page/Hints/HintButton.tsx",
         "src/components/Page/Hints/index.tsx",
         "src/components/Page/index.tsx",
         "src/components/Page/PageComplete/index.tsx",
-        "src/components/Page/PageContent.tsx",
-        "src/components/Page/PageToolbar/Continue.tsx",
+        "src/components/Page/PageContent/index.tsx",
+        "src/components/Page/PageToolbar/Continue/index.tsx",
         "src/components/Page/PageToolbar/index.tsx",
-        "src/components/Page/PageToolbar/Save.tsx",
-        "src/components/Page/PageToolbar/ToggleLog.tsx",
-        "src/components/Page/ProgressBar.tsx",
+        "src/components/Page/PageToolbar/Save/index.tsx",
+        "src/components/Page/PageToolbar/ToggleLog/index.tsx",
+        "src/components/Page/ProgressBar/index.tsx",
         "src/components/Page/Tasks/index.tsx",
         "src/components/Page/Tasks/Task.tsx",
         "src/components/Page/Tasks/TaskCheckbox.tsx",
         "src/components/Progress/index.tsx",
-        "src/components/Progress/ProgressChapter.tsx",
+        "src/components/Progress/ProgresPage/index.tsx",
+        "src/components/Progress/ProgressChapter/index.tsx",
         "src/components/Progress/progressIcon.tsx",
-        "src/components/Progress/ProgressPage.tsx",
         "src/components/render.tsx",
         "src/components/Routes/index.tsx",
         "src/components/Start/Checks/DynamicStepper.tsx",
@@ -150,9 +150,9 @@
         "src/components/Start/index.tsx",
         "src/components/Start/Welcome/index.tsx",
         "src/components/Tutorials/index.tsx",
-        "src/components/Tutorials/LoadTutorials.tsx",
-        "src/components/Tutorials/SelectTutorial.tsx",
-        "src/components/Tutorials/UpdateTutorial.tsx"
+        "src/components/Tutorials/LoadTutorials/index.tsx",
+        "src/components/Tutorials/SelectTutorial/index.tsx",
+        "src/components/Tutorials/UpdateTutorial/index.tsx"
     ],
     "exclude": [
         "node_modules"
