update user_id 3
This commit is contained in:
@ -25,6 +25,7 @@ const TheContent = () => {
|
||||
const [SsoSession, setSsoSession] = useState('');
|
||||
const [UserData, setUserData] = useState('');
|
||||
const [UserId, setUserId] = useState('');
|
||||
const [isDataFetched, setIsDataFetched] = useState(false);
|
||||
|
||||
async function fetchSession() {
|
||||
|
||||
@ -118,6 +119,8 @@ const TheContent = () => {
|
||||
let id = Math.floor(100000 + Math.random() * 900000)
|
||||
setUserId(id);
|
||||
}
|
||||
setIsDataFetched(true);
|
||||
|
||||
const _firstname = UserData.firstname;
|
||||
const _lastname = UserData.lastname;
|
||||
const _email = UserData.email;
|
||||
@ -146,6 +149,7 @@ const TheContent = () => {
|
||||
}
|
||||
});
|
||||
} else {
|
||||
setIsDataFetched(true);
|
||||
return null;
|
||||
}
|
||||
|
||||
@ -153,30 +157,28 @@ const TheContent = () => {
|
||||
|
||||
return (
|
||||
<main className="c-main">
|
||||
<CContainer fluid>
|
||||
<Suspense fallback={loading}>
|
||||
<Switch>
|
||||
{routes.map((route, idx) => {
|
||||
return route.component && (
|
||||
<Route
|
||||
key={idx}
|
||||
path={route.path}
|
||||
exact={route.exact}
|
||||
name={route.name}
|
||||
render={(props) =>
|
||||
get_token_from_storage_or_cookie() !== null ? (
|
||||
{isDataFetched ? ( // Render the component only when isDataFetched is true
|
||||
<CContainer fluid>
|
||||
<Suspense fallback={loading}>
|
||||
<Switch>
|
||||
{routes.map((route, idx) => {
|
||||
return route.component && (
|
||||
<Route
|
||||
key={idx}
|
||||
path={route.path}
|
||||
exact={route.exact}
|
||||
name={route.name}
|
||||
render={(props) =>
|
||||
<route.component {...props} userid={UserId} email={UserData.email} />
|
||||
) : (
|
||||
<Redirect to={{ pathname: "/sso" }} />
|
||||
)
|
||||
}
|
||||
/>
|
||||
);
|
||||
})}
|
||||
<Redirect from="/" to="/dashboard" />
|
||||
</Switch>
|
||||
</Suspense>
|
||||
</CContainer>
|
||||
}
|
||||
/>
|
||||
);
|
||||
})}
|
||||
<Redirect from="/" to="/dashboard" />
|
||||
</Switch>
|
||||
</Suspense>
|
||||
</CContainer>
|
||||
) : null}
|
||||
</main>
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user