added team model, loading user with team
This commit is contained in:
parent
f602a22b1b
commit
5977aa8edf
5 changed files with 118 additions and 46 deletions
|
|
@ -10,6 +10,7 @@ import { pond } from "protobuf-ts/pond";
|
|||
import NavigationContainer from '../navigation/NavigationContainer'
|
||||
import { GlobalState, GlobalStateAction, StateProvider } from '../providers/StateContainer'
|
||||
import { User } from '../models/user'
|
||||
import { Team } from '../models/team'
|
||||
|
||||
const reducer = (state: GlobalState, action: GlobalStateAction): GlobalState => {
|
||||
return {
|
||||
|
|
@ -33,10 +34,12 @@ export default function UserWrapper() {
|
|||
const loadUser = useCallback(() => {
|
||||
if (hasFetched.current) return;
|
||||
setLoading(true)
|
||||
userAPI.getUser(user_id).then(resp => {
|
||||
setUser(resp)
|
||||
userAPI.getUserWithTeam(user_id).then(resp => {
|
||||
console.log(resp.data.team)
|
||||
if (resp.data.user) setUser(resp.data.user)
|
||||
setGlobal({
|
||||
user: User.create(resp),
|
||||
user: resp.data.user ? User.create(resp.data.user) : User.create(),
|
||||
team: resp.data.team ? Team.create(resp.data.team) : Team.create(),
|
||||
as: "",
|
||||
showErrors: false,
|
||||
userTeamPermissions: [],
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue