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

gwegwgwgwawga

Browse Source
master
elijahlucian 7 years ago
parent 7ab2a42348
commit 3bc7263322
4 changed files with 19 additions and 5 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      dist/index.html
  2. 3
      package.json
  3. 15
      src/app.js
  4. 2
      src/index.js

4
dist/index.html vendored
Unescape 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
Unescape 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
Unescape 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
Unescape 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')
) )

Write Preview
Loading…
Cancel
Save