This commit is contained in:
2020-10-25 14:12:53 +01:00
parent 8325759c2f
commit 15fb6f5491
6 changed files with 13 additions and 15 deletions

View File

@@ -315,7 +315,6 @@ export default function EditDish() {
className={styles.textInput} className={styles.textInput}
label="Indeks glikemiczny" label="Indeks glikemiczny"
placeholder="np. 70" placeholder="np. 70"
type="number"
value={state.glicemicIndex} value={state.glicemicIndex}
variant="outlined" variant="outlined"
onChange={(event) => onChange={(event) =>

View File

@@ -310,7 +310,6 @@ export default function NewRestaurant() {
<TextField <TextField
className={styles.textInput} className={styles.textInput}
label="Porcja" label="Porcja"
type="number"
placeholder="np. 150g" placeholder="np. 150g"
value={state.weight} value={state.weight}
variant="outlined" variant="outlined"
@@ -329,7 +328,6 @@ export default function NewRestaurant() {
className={styles.textInput} className={styles.textInput}
label="Indeks glikemiczny" label="Indeks glikemiczny"
placeholder="np. 70" placeholder="np. 70"
type="number"
value={state.glicemicIndex} value={state.glicemicIndex}
variant="outlined" variant="outlined"
onChange={(event) => onChange={(event) =>

View File

@@ -18,12 +18,10 @@ export default function Restaurant(props) {
const showDishList = useSelector((state) => state.data.showDishList); const showDishList = useSelector((state) => state.data.showDishList);
useEffect(() => { useEffect(() => {
if (restaurant._id !== id) {
dispatch(fetchRestaurant(id)); dispatch(fetchRestaurant(id));
} else { }, [dispatch, id]);
document.title = restaurant.name;
} if (restaurant.name) document.title = restaurant.name;
});
return ( return (
<div className="restaurant-container"> <div className="restaurant-container">
@@ -74,7 +72,7 @@ export default function Restaurant(props) {
<h3>Lunch menu ({restaurant.lunchHours})</h3> <h3>Lunch menu ({restaurant.lunchHours})</h3>
)} )}
{!showDishList && <CircularProgress />} {!showDishList && <CircularProgress />}
{showDishList && <LunchMenu restaurant={restaurant} />} {(showDishList && restaurant.lunchMenu) && <LunchMenu restaurant={restaurant} />}
<h3>Menu</h3> <h3>Menu</h3>
{!showDishList && <CircularProgress />} {!showDishList && <CircularProgress />}
{showDishList && <DishList />} {showDishList && <DishList />}

View File

@@ -24,6 +24,7 @@
border-top-left-radius: 15px; border-top-left-radius: 15px;
border-bottom-left-radius: 15px; border-bottom-left-radius: 15px;
background-size: cover; background-size: cover;
background-position: center;
text-align: left; text-align: left;
} }

View File

@@ -8,17 +8,17 @@ h4 {
.carddish-container { .carddish-container {
background-color: #303030; background-color: #303030;
border-radius: 6px; border-radius: 12px;
margin: 2px auto 2px auto; margin: 2px auto 2px auto;
padding: 8px; padding: 8px;
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
width: 95%; width: 95%;
cursor: pointer; cursor: pointer;
transition: all 0.25s; transition: all 0.2s;
h2 { h2 {
font-weight: 300; font-weight: 500;
color: $main-color; color: $main-color;
margin-top: 1rem; margin-top: 1rem;
} }
@@ -30,20 +30,22 @@ h4 {
.carddish-img { .carddish-img {
background-color: $secondary-color; background-color: $secondary-color;
background-size: cover; background-size: cover;
background-position: center;
width: 120px; width: 120px;
height: 120px; height: 120px;
border-radius: 6px; border-radius: 12px;
margin: 0px 14px 0px 0px; margin: 0px 14px 0px 0px;
} }
.carddish-left { .carddish-left {
display: flex; display: flex;
h2 { h2 {
font-size: 1.2rem; font-size: 1rem;
margin: auto; margin: auto;
} }
p { p {
margin-left: auto; margin-left: auto;
color: $gray;
} }
} }

View File

@@ -1,6 +1,6 @@
.pictograms-container { .pictograms-container {
height: 30px; height: 30px;
margin: 8px 8px 0px 0px; margin: 0px 8px 8px 0px;
} }
.pictograms-container-separated { .pictograms-container-separated {