diff --git a/src/components/Dialogs/Dish.js b/src/components/Dialogs/Dish.js index bd0a3ff..3ec05e5 100644 --- a/src/components/Dialogs/Dish.js +++ b/src/components/Dialogs/Dish.js @@ -75,7 +75,7 @@ export default function Dish(props) {
Cena
- + {dish.prices && }

diff --git a/src/components/Input/Checkboxes.js b/src/components/Input/Checkboxes.js index ddcf393..fcdc791 100644 --- a/src/components/Input/Checkboxes.js +++ b/src/components/Input/Checkboxes.js @@ -5,7 +5,6 @@ import FormControl from "@material-ui/core/FormControl"; import FormGroup from "@material-ui/core/FormGroup"; import FormControlLabel from "@material-ui/core/FormControlLabel"; import Checkbox from "@material-ui/core/Checkbox"; -import FormHelperText from "@material-ui/core/FormHelperText"; const useStyles = makeStyles((theme) => ({ root: { diff --git a/src/components/Output/CardDish.js b/src/components/Output/CardDish.js index 4a4eccc..da4407b 100644 --- a/src/components/Output/CardDish.js +++ b/src/components/Output/CardDish.js @@ -8,7 +8,7 @@ export default function CardDish(props) { const history = useHistory(); const { name, - price, + prices, imgUrl, weight, vegan, @@ -17,6 +17,22 @@ export default function CardDish(props) { _id, } = props.dish; + const FormatPrices = () => { + if (prices.price1.priceName === "") { + return( +
{ prices.price1.price }zł
+ ) + } else { + return ( +
+ {prices.price1.priceName !== "" &&
{prices.price1.price}zł ({ prices.price1.priceName })
} + {prices.price2.priceName !== "" &&
{prices.price2.price}zł ({prices.price2.priceName})
} + {prices.price3.priceName !== "" &&
{prices.price3.price}zł ({ prices.price3.priceName })
} +
+ ) + } + } + return (

{name}

-

Porcja: {weight}

-

- {vegan && "Danie wegańskie | "} - {vegetarian && "Danie wegetariańskie"} -

+
+

Porcja: {weight}

+

+ {(vegan & vegetarian) ? "wegańskie | wegetariańskie" : ""} + {(vegan & !vegetarian) ? "wegańskie" : ""} + {(!vegan & vegetarian) ? "wegetariańskie" : ""} +

+
-
{!props.hidePrice && `${price} zł`}
+
diff --git a/src/components/Output/Restaurant.js b/src/components/Output/Restaurant.js index 0605d81..3fb0955 100644 --- a/src/components/Output/Restaurant.js +++ b/src/components/Output/Restaurant.js @@ -59,6 +59,10 @@ export default function Restaurant(props) { /> )} + {restaurant.lunchHours &&
Lunch menu
} + {restaurant.lunchHours && ( +

{restaurant.lunchHours}

+ )}
Lokalizacja
{restaurant.location && ( @@ -68,9 +72,6 @@ export default function Restaurant(props) {
- {restaurant.lunchHours && ( -

Lunch menu ({restaurant.lunchHours})

- )} {!showDishList && } {(showDishList && restaurant.lunchMenu) && }

Menu

diff --git a/src/styles/DishList.scss b/src/styles/DishList.scss index 87526be..7da45c4 100644 --- a/src/styles/DishList.scss +++ b/src/styles/DishList.scss @@ -40,12 +40,13 @@ h4 { .carddish-left { display: flex; h2 { - font-size: 1.1rem; + font-size: 16px; font-weight: 500; margin: auto; } p { font-size: 13px; + font-weight: 500; margin-left: auto; color: $gray; } @@ -57,15 +58,31 @@ h4 { justify-content: space-between; } +.carddish-left-middle { + margin-top: 8px; + p { + margin: auto; + margin-bottom: 3px; + } +} + .carddish-right { display: flex; flex-direction: column; - margin-right: 1rem; + margin-right: 5px; align-items: flex-end; justify-content: space-between; h5 { font-weight: 500; - font-size: 1rem; + font-size: 14px; margin-top: 4px; } } + +.carddish-prices-multi { + text-align: end; + h5 { + margin-top: 0; + margin-bottom: 4px; + } +} diff --git a/src/styles/Pictograms.scss b/src/styles/Pictograms.scss index 7cc983b..9e4a485 100644 --- a/src/styles/Pictograms.scss +++ b/src/styles/Pictograms.scss @@ -1,6 +1,10 @@ .pictograms-container { height: 30px; - margin: 0px 8px 8px 0px; + margin: 0px 8px 0px 0px; + background-color: #444444; + border-radius: 24px; + padding: 2px; + width: fit-content; } .pictograms-container-separated { @@ -11,8 +15,8 @@ .pictogram { margin: 6px; - height: 20px; - width: 20px; + height: 16px; + width: 16px; } .separate-pictogram {