Merge pull request #50 from TrigenSoftware/cleanup

Cleanup

.storybook/config.js

@@ -1,10 +1,18 @@
 import '@trigen/scripts/storybook/config';
 import React from 'react';
-import { addDecorator } from '@storybook/react';
+import {
+	loadStories
+} from '@trigen/scripts/storybook/config';
+import {
+	addDecorator,
+	configure
+} from '@storybook/react';
 import stylesheet from '@flexis/ui/reboot.st.css';
 
 addDecorator(story => (
 	<div {...stylesheet('root')}>
 		{story()}
 	</div>
 ));
+
+configure(loadStories, module);

.travis.yml

@@ -1,7 +1,6 @@
 language: node_js
 node_js:
   - "lts/*"
-  - "node"
 cache:
   directories:
     - node_modules

package.json

@@ -4,7 +4,6 @@
   "description": "Architecture demo app.",
   "author": "dangreen",
   "license": "MIT",
-  "private": true,
   "repository": {
     "type": "git",
     "url": "https://github.com/TrigenSoftware/weather"
@@ -29,27 +28,29 @@
     "serve": "trigen-scripts serve"
   },
   "dependencies": {
-    "@babel/runtime": "^7.4.2",
+    "@babel/runtime": "^7.4.5",
     "@flexis/redux": "^0.3.1-alpha",
-    "@flexis/ui": "^0.6.2-alpha",
+    "@flexis/ui": "^0.14.9-alpha",
+    "@loadable/component": "^5.10.1",
     "@stylable/runtime": "^1.0.3",
-    "@types/prop-types": "^15.5.5",
-    "@types/qs": "^6.5.1",
-    "@types/react": "16.8.8",
-    "@types/react-router-dom": "^4.3.1",
+    "@types/loadable__component": "^5.9.0",
+    "@types/prop-types": "^15.7.1",
+    "@types/qs": "^6.5.3",
+    "@types/react": "16.8.18",
+    "@types/react-router-dom": "^4.3.3",
     "axios": "^0.18.0",
+    "date-fns": "^2.0.0-alpha.27",
+    "date-fns-timezone": "^0.1.4",
     "immutable": "4.0.0-rc.12",
-    "moment": "^2.22.2",
     "prop-types": "^15.6.0",
     "qs": "^6.7.0",
-    "react": "^16.8.5",
-    "react-dom": "^16.8.5",
-    "react-loadable": "^5.5.0",
-    "react-router-dom": "^4.3.1",
+    "react": "^16.8.6",
+    "react-dom": "^16.8.6",
+    "react-router-dom": "^5.0.0",
     "redux": "^4.0.0"
   },
   "devDependencies": {
-    "@trigen/scripts": "^1.7.2",
+    "@trigen/scripts": "^1.10.2",
     "@types/faker": "^4.1.4",
     "faker": "^4.1.0",
     "moxios": "^0.4.0"

src/App/App.tsx

@@ -2,7 +2,9 @@ import React, {
 	ReactChild,
 	PureComponent
 } from 'react';
-import { hot } from 'react-hot-loader';
+import {
+	hot
+} from 'react-hot-loader';
 import {
 	BrowserRouter as Router,
 	Route,
@@ -13,7 +15,7 @@ import Todo from '~/containers/Todo/loadable';
 import Navigator from '~/components/Navigator';
 import stylesheet from './App.st.css';
 
-interface IProps {
+export interface IProps {
 	disableRouter?: boolean;
 }
 

src/App/axios/index.ts

@@ -1,12 +1,16 @@
-import Axios, { CancelTokenSource } from 'axios';
+import Axios, {
+	CancelTokenSource
+} from 'axios';
 import qs from 'qs';
 
 export {
 	Axios as default,
 	qs
 };
 
-const { CancelToken } = Axios;
+const {
+	CancelToken
+} = Axios;
 
 Axios.defaults.responseType = 'json';
 

src/App/components/Navigator/Navigator.st.css

@@ -1,5 +1,16 @@
 
 .root {
+	/* Empty block */
+}
+
+.list {
+	margin: 0;
+	padding: 0;
+	list-style: none;
+}
+
+.root,
+.list {
 	display: flex;
 }
 

src/App/components/Navigator/Navigator.stories.tsx

@@ -1,6 +1,8 @@
 /* tslint:disable:no-magic-numbers */
 import React from 'react';
-import { storiesOf } from '@storybook/react';
+import {
+	storiesOf
+} from '@storybook/react';
 import {
 	button,
 	number
@@ -13,6 +15,7 @@ import Navigator from './';
 const stylableApi = `
 Stylable API
 ---
+- ::list
 - ::item
 `;
 

src/App/components/Navigator/Navigator.tsx

@@ -2,9 +2,6 @@ import React, {
 	Children,
 	Component
 } from 'react';
-import Menu, {
-	MenuItem
-} from '@flexis/ui/components/Menu';
 import stylesheet from './Navigator.st.css';
 
 export default class Navigator extends Component {
@@ -16,17 +13,21 @@ export default class Navigator extends Component {
 		} = this.props;
 
 		return (
-			<Menu
+			<nav
 				{...stylesheet('root', {}, this.props)}
 			>
-				{Children.map(children, child => child && (
-					<MenuItem
-						{...stylesheet('item')}
-					>
-						{child}
-					</MenuItem>
-				))}
-			</Menu>
+				<ul
+					{...stylesheet('list')}
+				>
+					{Children.map(children, child => child && (
+						<li
+							{...stylesheet('item')}
+						>
+							{child}
+						</li>
+					))}
+				</ul>
+			</nav>
 		);
 	}
 }

src/App/components/TodoList/TodoList.stories.tsx

@@ -1,7 +1,11 @@
 /* tslint:disable:no-magic-numbers */
 import React from 'react';
-import { storiesOf } from '@storybook/react';
-import { action } from '@storybook/addon-actions';
+import {
+	storiesOf
+} from '@storybook/react';
+import {
+	action
+} from '@storybook/addon-actions';
 import {
 	button,
 	number
@@ -22,6 +26,7 @@ const events = {
 const stylableApi = `
 Stylable API
 ---
+_Empty_
 `;
 
 storiesOf('TodoList', module)

src/App/components/TodoList/TodoList.tsx

@@ -5,10 +5,11 @@ import React, {
 	cloneElement
 } from 'react';
 import TodoListForm from './TodoListForm';
-import TodoListItem from './TodoListItem';
 import stylesheet from './TodoList.st.css';
 
-interface IProps {
+export * from './TodoListItem';
+
+export interface IProps {
 	children: ReactElement<any>|ReactElement<any>[];
 	onAdd?(text: string);
 	onChange?(id: string, text: string);
@@ -19,10 +20,6 @@ interface IState {
 	value: string;
 }
 
-export {
-	TodoListItem
-};
-
 export default class TodoList extends PureComponent<IProps, IState> {
 
 	constructor(props) {

src/App/components/TodoList/TodoListForm/TodoListForm.stories.tsx

@@ -1,7 +1,11 @@
 /* tslint:disable:no-magic-numbers */
 import React from 'react';
-import { storiesOf } from '@storybook/react';
-import { action } from '@storybook/addon-actions';
+import {
+	storiesOf
+} from '@storybook/react';
+import {
+	action
+} from '@storybook/addon-actions';
 import TodoListForm from './';
 
 const events = {

src/App/components/TodoList/TodoListForm/TodoListForm.tsx

@@ -1,20 +1,19 @@
 import React, {
 	FormEvent,
+	ChangeEvent,
 	PureComponent
  } from 'react';
 import stylesheet from './TodoListForm.st.css';
-import Button from '~/components/Button';
-import Input from '~/components/Input';
 
-interface IProps {
+export interface ITodoListFormProps {
 	onSubmit?(value: string);
 }
 
 interface IState {
 	value: string;
 }
 
-export default class TodoListForm extends PureComponent<IProps, IState> {
+export default class TodoListForm extends PureComponent<ITodoListFormProps, IState> {
 
 	state = {
 		value: ''
@@ -39,17 +38,17 @@ export default class TodoListForm extends PureComponent<IProps, IState> {
 				{...stylesheet('root', {}, this.props)}
 				onSubmit={this.onSubmit}
 			>
-				<Input
+				<input
 					{...stylesheet('input')}
 					type='text'
 					onChange={this.onChange}
 					value={value}
 				/>
-				<Button
+				<button
 					{...stylesheet('button')}
 				>
 					Add
-				</Button>
+				</button>
 			</form>
 		);
 	}
@@ -74,7 +73,11 @@ export default class TodoListForm extends PureComponent<IProps, IState> {
 		}));
 	}
 
-	private onChange(value: string) {
+	private onChange(event: ChangeEvent<HTMLInputElement>) {
+
+		const {
+			value
+		} = event.target;
 
 		this.setState(() => ({
 			value