Skip to content

Fem 6 #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 8 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .eslintrc.json

This file was deleted.

45 changes: 0 additions & 45 deletions app.js

This file was deleted.

12 changes: 6 additions & 6 deletions index.html
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<title>svideo</title>
<link rel="stylesheet" href="/public/normalize.css">
<link rel="stylesheet" href="/public/style.css">
<meta charset="UTF-8">
<title>svideo</title>
<link rel="stylesheet" href="public/normalize.css">
<link rel="stylesheet" href="public/style.css">
</head>
<body>
<div id="app"><%= body %></div>
<script src="/public/bundle.js"></script>
<div id="app"></div>
<script src="public/bundle.js"></script>
</body>
</html>
5 changes: 0 additions & 5 deletions js/BrowserEntry.jsx

This file was deleted.

46 changes: 13 additions & 33 deletions js/ClientApp.jsx
Original file line number Diff line number Diff line change
@@ -1,35 +1,15 @@
const React = require('react')
const Landing = require('./Landing')
const Search = require('./Search')
const Layout = require('./Layout')
const Details = require('./Details')
const ReactRouter = require('react-router')
const { Router, Route, IndexRoute, browserHistory } = ReactRouter
const Store = require('./Store')
const { store } = Store
const reactRedux = require('react-redux')
const { Provider } = reactRedux

const myRoutes = (props) => (
<Route path='/' component={Layout}>
<IndexRoute component={Landing} />
<Route path='/search' component={Search} />
<Route path='/details/:id' component={Details} />
</Route>
)

class App extends React.Component {
render () {
return (
<Provider store={store}>
<Router history={browserHistory}>
{myRoutes()}
</Router>
</Provider>
)
}
var React = require('react')
var ReactDOM = require('react-dom')
var MyTitle = require('./MyTitle')

var MyFirstComponent = function () {
return (
<div>
<MyTitle title='Whatevs' color='rebeccapurple' />
<MyTitle title='LOL' color='papayawhip' />
<MyTitle title='OMGLOLWTFBBQ' color='#f06d06' />
</div>
)
}

App.Routes = myRoutes

module.exports = App
ReactDOM.render(<MyFirstComponent />, document.getElementById('app'))
54 changes: 0 additions & 54 deletions js/Details.jsx

This file was deleted.

48 changes: 0 additions & 48 deletions js/Header.jsx

This file was deleted.

39 changes: 0 additions & 39 deletions js/Landing.jsx

This file was deleted.

13 changes: 0 additions & 13 deletions js/Layout.jsx

This file was deleted.

21 changes: 14 additions & 7 deletions js/MyTitle.jsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,18 @@
const React = require('react')
const div = React.DOM.div
const h1 = React.DOM.h1

const MyTitle = (props) => (
<div>
<h1 style={{color: props.color}}>
{props.title}
</h1>
</div>
)
const MyTitle = React.createClass({
render () {
const style = {color: this.props.color}
return (
<div>
<h1 style={ style }>
{this.props.title}
</h1>
</div>
)
}
})

module.exports = MyTitle
30 changes: 0 additions & 30 deletions js/Search.jsx

This file was deleted.

26 changes: 0 additions & 26 deletions js/ShowCard.jsx

This file was deleted.

Loading