Skip to content
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

done search #5

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
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
18 changes: 18 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# See https://help.github.com/ignore-files/ for more about ignoring files.

# dependencies
/node_modules

# testing
/coverage

# production
/build

# misc
.DS_Store
.env
npm-debug.log*
yarn-debug.log*
yarn-error.log*

1,573 changes: 1,572 additions & 1 deletion README.md

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions README.old.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
# reduxify-hacktiv8-news
21 changes: 21 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"name": "reduxify-hacktiv8-news",
"version": "0.1.0",
"private": true,
"dependencies": {
"react": "15.4.2",
"react-dom": "15.4.2",
"react-redux": "^5.0.3",
"react-router-dom": "^4.0.0-beta.6",
"redux": "^3.6.0"
},
"devDependencies": {
"react-scripts": "0.9.3"
},
"scripts": {
"start": "react-scripts start",
"build": "react-scripts build",
"test": "react-scripts test --env=jsdom",
"eject": "react-scripts eject"
}
}
Binary file added public/favicon.ico
Binary file not shown.
31 changes: 31 additions & 0 deletions public/index.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="shortcut icon" href="%PUBLIC_URL%/favicon.ico">
<!--
Notice the use of %PUBLIC_URL% in the tag above.
It will be replaced with the URL of the `public` folder during the build.
Only files inside the `public` folder can be referenced from the HTML.

Unlike "/favicon.ico" or "favicon.ico", "%PUBLIC_URL%/favicon.ico" will
work correctly both with client-side routing and a non-root public URL.
Learn how to configure a non-root public URL by running `npm run build`.
-->
<title>React App</title>
</head>
<body>
<div id="root"></div>
<!--
This HTML file is a template.
If you open it directly in the browser, you will see an empty page.

You can add webfonts, meta tags, or analytics to this file.
The build step will place the bundled scripts into the <body> tag.

To begin the development, run `npm start`.
To create a production bundle, use `npm run build`.
-->
</body>
</html>
24 changes: 24 additions & 0 deletions src/App.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
.App {
text-align: center;
}

.App-logo {
animation: App-logo-spin infinite 20s linear;
height: 80px;
}

.App-header {
background-color: #222;
height: 150px;
padding: 20px;
color: white;
}

.App-intro {
font-size: large;
}

@keyframes App-logo-spin {
from { transform: rotate(0deg); }
to { transform: rotate(360deg); }
}
31 changes: 31 additions & 0 deletions src/App.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
import React from 'react';
import './App.css';
import {News,People} from './components';

import {
BrowserRouter as Router,
Route,
Link
} from 'react-router-dom'

const Routers = () => (
<Router>
<div>
<ul>
<li><Link to="/">News</Link></li>
<li><Link to="/peoples">peoples</Link></li>
</ul>

<hr/>

<Route exact path="/" component={News}/>
<Route exact path="/peoples" component={People}/>
</div>
</Router>
)





export default Routers;
8 changes: 8 additions & 0 deletions src/App.test.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
import React from 'react';
import ReactDOM from 'react-dom';
import App from './App';

it('renders without crashing', () => {
const div = document.createElement('div');
ReactDOM.render(<App />, div);
});
6 changes: 6 additions & 0 deletions src/actions/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
export const searchNews = (news) => {
return {
type:'NEWS_SEARCH',
payload: news
}
}
13 changes: 13 additions & 0 deletions src/components/News.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import React, { Component } from 'react';
import NewsList from './NewsList.js';
import NewsForm from './NewsForm'
export class News extends Component {
render() {
return (
<div>
<NewsForm />
<NewsList />
</div>
);
}
}
23 changes: 23 additions & 0 deletions src/components/NewsForm.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import React from 'react'
import {bindActionCreators} from 'redux'
import {connect} from 'react-redux'
import {searchNews} from '../actions/index.js'
const NewsForm= (props) => {
return (
<form>
<input type='text' onChange={(event)=> props.searchNews(event.target.value)} value={props.searchKey}/>
</form>
)
}

const mapStateToProp = (state) => {
return {
searchKey : state.searchKey
}
}

const mapDispatchToProp = (dispatch) => {
return bindActionCreators({searchNews},dispatch)
}

export default connect(mapStateToProp,mapDispatchToProp)(NewsForm)
9 changes: 9 additions & 0 deletions src/components/NewsItem.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import React from 'react'

export const NewsItem= (props) => {
return (
<li>
<a href={props.url} target="_blank">{props.title}</a>
</li>
)
}
27 changes: 27 additions & 0 deletions src/components/NewsList.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import React from 'react'
import {NewsItem} from './NewsItem.js'
import {connect} from 'react-redux'
// import {bindActionCreators} from 'redux'

const NewsList = (props) => {
return (
<ul>
{
props.news.map((item,index)=>{
return(
<NewsItem key={index} {...item}/>
)
})
}
</ul>
)
}

const toProp = (state) => {
return {
news : state.news.filter((x)=>{return x.title.match(new RegExp(state.searchKey,'i'))})

}
}

export default connect(toProp)(NewsList)
11 changes: 11 additions & 0 deletions src/components/People.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import React, { Component } from 'react';
import PeopleList from './PeopleList';
export class People extends Component {
render() {
return (
<div>
<PeopleList />
</div>
);
}
}
9 changes: 9 additions & 0 deletions src/components/PeopleCount.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
import React from 'react'

export const PeopleCount= (props) => {
return (
<li>
<p>{props.name}</p>
</li>
)
}
25 changes: 25 additions & 0 deletions src/components/PeopleList.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import React from 'react'
import {PeopleCount} from './PeopleCount.js'
import {connect} from 'react-redux'

export const PeopleList = (props) => {
return (
<ul>
{
props.peoples.map((item,index)=>{
return(
<PeopleCount key={index} {...item}/>
)
})
}
</ul>
)
}

const toProp = (state) => {
return {
peoples : state.peoples
}
}

export default connect(toProp)(PeopleList)
2 changes: 2 additions & 0 deletions src/components/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
export {News} from './News.js'
export {People} from './People.js'
5 changes: 5 additions & 0 deletions src/index.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
body {
margin: 0;
padding: 0;
font-family: sans-serif;
}
15 changes: 15 additions & 0 deletions src/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
import React from 'react';
import ReactDOM from 'react-dom';
import Routers from './App';
import './index.css';
import {Provider} from 'react-redux'
import {createStore,applyMiddleware} from 'redux'
import reducers from './reducers/index.js'
const createStoreMiddleware = applyMiddleware()(createStore)

ReactDOM.render(
<Provider store={createStoreMiddleware(reducers)}>
<Routers />
</Provider>,
document.getElementById('root')
);
7 changes: 7 additions & 0 deletions src/logo.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions src/reducers/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import {combineReducers} from 'redux'
import NewsReducer from './reducer_news.js'
import PeopleReducer from './reducer_people.js'
import SearchNewsReducer from './reducer_searchNews.js'
const rootReducers = combineReducers({
news: NewsReducer,
peoples: PeopleReducer,
searchKey: SearchNewsReducer
})

export default rootReducers
20 changes: 20 additions & 0 deletions src/reducers/reducer_news.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
export default () => {
return [
{
title: 'React',
url:'https://facebook.github.io/react/',
author:'jordan wilke',
num_comments:3,
points:4,
objectID:0
},
{
title: 'Redux',
url:'https://github.com/reactjs/redux',
author:'Dan Abramov,Andrew Clark',
num_comments:2,
points:5,
objectID:1
}
]
}
13 changes: 13 additions & 0 deletions src/reducers/reducer_people.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
export default () => {
return [
{
name:"anakin skywalker",
alliances:"jedi"
},
{
name:"darth vader",
alliances: "sith"

}
]
}
8 changes: 8 additions & 0 deletions src/reducers/reducer_searchNews.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
export default (state='' , action) => {
switch(action.type){
case 'NEWS_SEARCH' :
return action.payload
default:
return state
}
}