|
@@ -12,6 +12,7 @@ import { useAuth0 } from "@auth0/auth0-react";
|
|
|
import MealImportButton from "./MealImportButton";
|
|
|
import { useLocation, useNavigate, useParams } from "react-router-dom";
|
|
|
import PlanMealButton from "../util/PlanMealButton";
|
|
|
+import { getUserById } from "../Settings/settings.util";
|
|
|
|
|
|
const useStyles = makeStyles((theme) => ({
|
|
|
content: {
|
|
@@ -40,8 +41,8 @@ const MealDetailView = () => {
|
|
|
|
|
|
const [own, setOwn] = useState(false);
|
|
|
const [meal, setMeal] = useState();
|
|
|
+ const [nameOfOtherUser, setNameOfOtherUser] = useState(null);
|
|
|
const [comingFromPlans, setComingFromPlans] = useState(false);
|
|
|
- // const [/*mealUser*/, setMealUser] = useState(null);
|
|
|
|
|
|
/* useEffect(() => {
|
|
|
if (meal) {
|
|
@@ -55,6 +56,12 @@ const MealDetailView = () => {
|
|
|
} else {
|
|
|
setOwn(false);
|
|
|
}
|
|
|
+ if (!own && meal && meal.userId) {
|
|
|
+ getUserById(meal.userId, (user) => {
|
|
|
+ console.log(user);
|
|
|
+ setNameOfOtherUser(user && user.user_metadata && user.user_metadata.username ? user.user_metadata.username : user.given_name);
|
|
|
+ });
|
|
|
+ }
|
|
|
}, [user, meal]);
|
|
|
|
|
|
// set the meal that is given in state as a temporary option while the one from the server is loaded
|
|
@@ -96,7 +103,10 @@ const MealDetailView = () => {
|
|
|
<>
|
|
|
{meal ?
|
|
|
<>
|
|
|
- <Navbar secondary={!own} pageTitle={t('Meal')} rightSideComponent={rightSideComponent()} leftSideComponent={isAuthenticated && <BackButton onClick={goBack} />} />
|
|
|
+ <Navbar secondary={!own}
|
|
|
+ pageTitle={own || !nameOfOtherUser ? t('Meal') : t('Meal of {{name}}', { name: nameOfOtherUser })}
|
|
|
+ rightSideComponent={rightSideComponent()}
|
|
|
+ leftSideComponent={isAuthenticated && <BackButton onClick={goBack} />} />
|
|
|
<Box className={classes.content}>
|
|
|
<Grid container spacing={0} justifyContent="space-between" alignItems="flex-start" wrap="nowrap">
|
|
|
<Grid item xs className={classes.mealTitle}>
|