Adjusting transfer of data on callbacks
This commit is contained in:
parent
97509a85d7
commit
31cf73a501
7 changed files with 108 additions and 194 deletions
|
@ -2,11 +2,11 @@ import React from 'react'
|
|||
import './FilterForm.scss'
|
||||
|
||||
export default function FilterForm({ filterCallback }) {
|
||||
return (
|
||||
<form>
|
||||
<div className='form-group'>
|
||||
<input placeholder='Filter' onChange={filterCallback} />
|
||||
</div>
|
||||
</form>
|
||||
)
|
||||
return (
|
||||
<form>
|
||||
<div className="form-group">
|
||||
<input placeholder="Filter" onChange={filterCallback} />
|
||||
</div>
|
||||
</form>
|
||||
)
|
||||
}
|
||||
|
|
|
@ -12,19 +12,19 @@ history.listen(() => {
|
|||
|
||||
export default function Router() {
|
||||
// let [team, setTeam] = useState([])
|
||||
let [allTeams, setAllTeams] = useState([])
|
||||
// let [users, setUsers] = useState([])
|
||||
let [users, setUsers] = useState([])
|
||||
let [memberProps, setMemberProps] = useState({})
|
||||
let [teamProps, setTeamProps] = useState({})
|
||||
|
||||
let teamCallback = (teamId, users) => {
|
||||
let teamCallback = (teamId, users, teams) => {
|
||||
// Remove this:
|
||||
// setTeam(teamId)
|
||||
|
||||
// Leave:
|
||||
setTeamProps({
|
||||
url: config.api + '/team/' + teamId,
|
||||
url: config.api + '/team/' + teamId.id,
|
||||
team: teamId,
|
||||
teams: teams,
|
||||
users: users,
|
||||
cb: userIdCallback
|
||||
})
|
||||
|
@ -34,17 +34,13 @@ export default function Router() {
|
|||
setUsers(el)
|
||||
}
|
||||
|
||||
let userIdCallback = el => {
|
||||
let userIdCallback = (el, teams) => {
|
||||
setMemberProps({
|
||||
url: config.api + '/user/' + el,
|
||||
teams: allTeams
|
||||
teams: teams
|
||||
})
|
||||
}
|
||||
|
||||
let allTeamsCallback = el => {
|
||||
setAllTeams(el)
|
||||
}
|
||||
|
||||
// <Route
|
||||
// exact
|
||||
// path="/team"
|
||||
|
@ -57,14 +53,7 @@ export default function Router() {
|
|||
<Route
|
||||
exact
|
||||
path="/"
|
||||
render={props => (
|
||||
<Home
|
||||
teamCallback={teamCallback}
|
||||
usersCallback={usersCallback}
|
||||
allTeamsCallback={allTeamsCallback}
|
||||
{...props}
|
||||
/>
|
||||
)}
|
||||
render={props => <Home teamCallback={teamCallback} usersCallback={usersCallback} {...props} />}
|
||||
/>
|
||||
|
||||
<Route exact path="/team" render={() => <Team props={teamProps} />} />
|
||||
|
|
|
@ -1,19 +1,19 @@
|
|||
import React from 'react'
|
||||
|
||||
export default function TeamList({ teams, users, selectTeam, selectUser }) {
|
||||
return (
|
||||
<div className='teams'>
|
||||
<ul className='list'>
|
||||
{teams.map(team => (
|
||||
<li className = 'list-item' key={team.id}>
|
||||
<div>
|
||||
<button className='selector-btn' onClick={() => selectTeam(team)}>
|
||||
{ team.name }
|
||||
</button>
|
||||
</div>
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
</div>
|
||||
)
|
||||
return (
|
||||
<div className="teams">
|
||||
<ul className="list">
|
||||
{teams.map(team => (
|
||||
<li className="list-item" key={team.id}>
|
||||
<div>
|
||||
<button className="selector-btn" onClick={() => selectTeam(team)}>
|
||||
{team.name}
|
||||
</button>
|
||||
</div>
|
||||
</li>
|
||||
))}
|
||||
</ul>
|
||||
</div>
|
||||
)
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue