tanner/protospace-lcars
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

gwegwgwgwawga

Browse Source
This commit is contained in:
elijahlucian 2017-06-25 16:22:38 -06:00
parent 7ab2a42348
commit 3bc7263322
4 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dist/index.html vendored
View File

@ -1,6 +1,8 @@
<html> <html>
<head> <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> </head>
<body> <body>
<div id="root"></div> <div id="root"></div>

3
package.json
View File

@ -15,9 +15,10 @@
"babel-preset-react": "^6.24.1", "babel-preset-react": "^6.24.1",
"react-hot-loader": "^3.0.0-beta.6", "react-hot-loader": "^3.0.0-beta.6",
"webpack": "^3.0.0", "webpack": "^3.0.0",
"webpack-dev-server": "^2.4.5" "webpack-dev-server": "^2.5.0"
}, },
"dependencies": { "dependencies": {
"ajv-keywords": "^2.1.0",
"cheerio": "^1.0.0-rc.1", "cheerio": "^1.0.0-rc.1",
"express": "^4.15.3", "express": "^4.15.3",
"react": "^15.6.1", "react": "^15.6.1",

15
src/app.js
View File

@ -1,10 +1,21 @@
import React from 'react'; import React from 'react';
import LeftColumn from './LeftColumn';
import RightContainer from './RightContainer';
export default class Site extends React.Component { export default class Site extends React.Component {
constructor(props){
super(props);
this.state = {};
}
render() { render() {
return ( return (
<div> <div className="mainContainer">
Hello React! <LeftColumn />
<RightContainer />
</div> </div>
); );
} }

2
src/index.js
View File

@ -9,7 +9,7 @@ import App from './app';
const render = Component => { const render = Component => {
ReactDOM.render( ReactDOM.render(
<AppContainer> <AppContainer>
<Component /> <App />
</AppContainer>, </AppContainer>,
document.getElementById('root') document.getElementById('root')
) )