Members view

src/components/Router.jsx

@@ -1,65 +1,52 @@
 import React, { useState } from 'react'
 import { Router as ReactRouter, Route, Switch } from 'react-router-dom'
 import history from '../history.js'
-// import { createBrowserHistory as createHistory } from 'history'
-
-/* Site */
 import Home from '../views/Home'
 import Team from '../views/Team'
-// import Member from '../views/Member'
+import Member from '../views/Member'
 
-// const history = createHistory()
 history.listen(location => {
 	window.scrollTo(0,0)
 })
 
 export default function Router(props) {
-	let [team, setTeam] = useState('Rodrigo')
+	let [team, setTeam] = useState([])
+	let [allTeams, setAllTeams] = useState([])
+	let [users, setUsers] = useState([])
+	let [userId, setUserId] = useState([])
 	
 	let teamCallback = (el) => {
 		setTeam(el)
 	}
 
+	let usersCallback = (el) => {
+		setUsers(el)
+	}
+
+	let userIdCallback = (el) => {
+		setUserId(el)
+	}
+
+	let allTeamsCallback = (el) => {
+		setAllTeams(el)
+	}
+
 	return (
 		<ReactRouter history = { history }>
 			<Switch>
-				<Route exact path='/' render={(props) => <Home teamCallback={teamCallback} {...props} />} />
-				<Route exact path='/team' render={(props) => <Team teamId={team} {...props} />} />
+				<Route 
+					exact path='/' 
+					render={(props) => <Home teamCallback={teamCallback} usersCallback={usersCallback} allTeamsCallback={allTeamsCallback} {...props} />}
+				/>
+				<Route 
+					exact path='/team' 
+					render={(props) => <Team teamProps={team} usersProps={users} userIdCallback={userIdCallback} {...props} />}
+				/>
+				<Route
+					exact path='/member'
+					render={(props) => <Member userId={userId} teams={allTeams} {...props} />}
+				/>
 			</Switch>
 		</ReactRouter>
 	)
 }
-
-// <Route exact path='/member' render={(props) => <Member {...props} />} />
-
-// class Router extends React.Component {
-//   constructor(props) {
-//     super(props)
-//   }
-
-// 	componentDidMount() {
-// 		ReactGA.pageview(window.location.pathname)
-// 	}
-
-//   render() {
-// 		return (
-// 			<ReactRouter history = { history }>
-// 				<Switch>
-// 					<Route exact path='/' component={Home} />
-// 					<Route exact path='/featured' component={Featured} />
-// 					<Route
-// 						path="/blog"
-// 						render={({ match: { path } }) => (
-// 							<div>
-// 								<Route exact path={path} render={(props) => <Blog {...props} />} />
-// 								<Route path={`${path}/why-we-need-to-do-more-to-protect-our-children`} render={PostDoMore} />
-// 							</div>
-// 						)}
-// 					/>
-// 				</Switch>
-// 			</ReactRouter>
-// 		)
-// 	}
-// }
-
-// export default Router

src/components/TeamList.jsx

@@ -1,13 +1,13 @@
 import React from 'react'
 
-export default function Team({ teams, users, selectTeam, selectUser }) {
+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 onClick={() => selectTeam(team.name)}>
+							<button onClick={() => selectTeam(team)}>
 								{ team.name }
 							</button>
 						</div>