gwegwgwgwawga

2017-06-25 16:22:38 -06:00 · 2017-06-25 16:22:38 -06:00 · 3bc7263322
commit 3bc7263322
parent 7ab2a42348
4 changed files with 19 additions and 5 deletions
--- a/dist/index.html
+++ b/dist/index.html
@ -1,6 +1,8 @@
 <html>
 	<head>
-		<title>Hello World</title>
+		<title>LCARS</title>
+		<link rel="stylesheet" type="text/css" href="./css/main.css">
+		<link href="https://fonts.googleapis.com/css?family=Open+Sans|Orbitron" rel="stylesheet">
 	</head>
 	<body>
 		<div id="root"></div>
--- 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",
--- 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 (
-			<div>
-				Hello React!
+			<div className="mainContainer">
+				<LeftColumn />
+				<RightContainer />
 			</div>
 		);
 	}
--- a/src/index.js
+++ b/src/index.js
@ -9,7 +9,7 @@ import App from './app';
 const render = Component => {
 	ReactDOM.render(
 		<AppContainer>
-			<Component />
+			<App />
 		</AppContainer>,
 		document.getElementById('root')
 	)