diff --git a/dist/index.html b/dist/index.html index 0f39519..ee85520 100644 --- a/dist/index.html +++ b/dist/index.html @@ -1,6 +1,8 @@ - Hello World + LCARS + +
diff --git a/package.json b/package.json index 8f94a4f..dc37923 100644 --- a/package.json +++ b/package.json @@ -15,9 +15,10 @@ "babel-preset-react": "^6.24.1", "react-hot-loader": "^3.0.0-beta.6", "webpack": "^3.0.0", - "webpack-dev-server": "^2.4.5" + "webpack-dev-server": "^2.5.0" }, "dependencies": { + "ajv-keywords": "^2.1.0", "cheerio": "^1.0.0-rc.1", "express": "^4.15.3", "react": "^15.6.1", diff --git a/src/app.js b/src/app.js index 9ab2d13..7b819f7 100644 --- a/src/app.js +++ b/src/app.js @@ -1,10 +1,21 @@ import React from 'react'; +import LeftColumn from './LeftColumn'; +import RightContainer from './RightContainer'; + export default class Site extends React.Component { + + constructor(props){ + super(props); + + this.state = {}; + } + render() { return ( -
- Hello React! +
+ +
); } diff --git a/src/index.js b/src/index.js index 09a1d7b..6afc356 100644 --- a/src/index.js +++ b/src/index.js @@ -9,7 +9,7 @@ import App from './app'; const render = Component => { ReactDOM.render( - + , document.getElementById('root') )