Skip to content

Commit 9a0c54f

Browse files
authored
Merge pull request #34 from FACN1/Feature/SelectGHouse
Feature/select g house
2 parents accde53 + 01c2d4f commit 9a0c54f

File tree

4 files changed

+52
-15
lines changed

4 files changed

+52
-15
lines changed

src/components/search_bar.jsx

Lines changed: 0 additions & 12 deletions
This file was deleted.

src/components/search_button.jsx

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import React from 'react';
2+
3+
const SearchButton = (props) => {
4+
const handle = () => {
5+
props.clickHandler(props.currentGHouse);
6+
};
7+
8+
return (
9+
<button onClick={handle}>{props.currentGHouse}</button>
10+
);
11+
};
12+
export default SearchButton;

src/components/search_list.jsx

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
import React from 'react';
2+
import SearchButton from './search_button.jsx';
3+
4+
const SearchList = props =>
5+
(
6+
<div>
7+
{props.db.map(guestHouses =>
8+
// const boundItemClick = handleClick.bind(this, guestHouses.name);
9+
<SearchButton
10+
key={guestHouses.name}
11+
clickHandler={props.updateCurrent}
12+
currentGHouse={guestHouses.name}
13+
/>,
14+
)}
15+
</div>
16+
);
17+
18+
export default SearchList;

src/containers/select_guesthouse.jsx

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,37 @@ import axios from 'axios';
33

44
import Header from '../components/header.jsx';
55
import TextBox from '../components/text_box.jsx';
6-
import SearchBar from '../components/search_bar.jsx';
6+
import SearchList from '../components/search_list.jsx';
77

88

99
class SelectGuesthouse extends Component {
1010
constructor(props) {
1111
super(props);
1212
this.state = {
13-
db: {},
13+
title: 'PAS',
14+
tagLine: 'Park & Sleep',
15+
guestHouseList: [],
16+
currentGuestHouse: {},
1417
};
18+
this.currentGuestHouse = this.currentGuestHouse.bind(this);
19+
}
20+
21+
currentGuestHouse(guestHouse) {
22+
const current = this.state.db.filter((GHouse) => {
23+
if (GHouse.name === guestHouse) {
24+
return GHouse;
25+
}
26+
return current;
27+
});
28+
this.setState({
29+
currentGuestHouse: current,
30+
});
1531
}
1632

1733
componentDidMount() {
1834
axios.get('/api')
1935
.then((res) => {
36+
// console.log(res.data);
2037
this.setState({ db: res.data });
2138
});
2239
}
@@ -26,7 +43,9 @@ class SelectGuesthouse extends Component {
2643
<div>
2744
<Header />
2845
<TextBox />
29-
<SearchBar guesthouses={this.state.db} />
46+
<SearchList
47+
db={this.state.guestHouseList}
48+
updateCurrent={this.currentGuestHouse} />
3049
</div>
3150
);
3251
}

0 commit comments

Comments
 (0)