web client v1.0 (production)

src/components/Output/Contact.js

@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useEffect } from "react";
 import Paper from "@material-ui/core/Paper";
 import List from "@material-ui/core/List";
 import ListItem from "@material-ui/core/ListItem";
@@ -21,6 +21,9 @@ const useStyles = makeStyles((theme) => ({
 }));
 
 export default function Contact() {
+  useEffect(() => {
+    document.title = "Menui - Kontakt";
+  });
   const style = useStyles();
   return (
     <Paper style={{ backgroundColor: "#262626", color: "#bbbbbb" }}>

src/components/Output/DishList.js

@@ -8,6 +8,8 @@ function extractCategories(dishes) {
   if (typeof dishes !== "undefined" && dishes.length > 0) {
     dishes.map((dish) => categories.add(dish.category));
     return Array.from(categories);
+  } else {
+    return [];
   }
 }
 
@@ -36,5 +38,10 @@ export default function DishList(props) {
     );
   });
 
-  return <div className="dishlist-container">{categories}</div>;
+  return (
+    <div className="dishlist-container">
+      {categories}
+      {categoriesArray.length === 0 && <h2>Menu jest puste :(</h2>}
+    </div>
+  );
 }

src/components/Output/LunchMenu.js

@@ -8,13 +8,17 @@ export default function LunchMenu(props) {
   const lunchMenu = restaurant.lunchMenu;
   function filterDishes(dishes, set) {
     var result = [];
-    dishes.map((dish) => {
-      if (set.lunchSetDishes.includes(dish._id)) {
-        result.push(dish);
-      }
-      return true;
-    });
-    return result;
+    if (dishes.length !== 0) {
+      dishes.map((dish) => {
+        if (set.lunchSetDishes.includes(dish._id)) {
+          result.push(dish);
+        }
+        return true;
+      });
+      return result;
+    } else {
+      return [];
+    }
   }
   const sets = lunchMenu.map((set) => {
     return (
@@ -28,5 +32,5 @@ export default function LunchMenu(props) {
     );
   });
 
-  return <div className="dishlist-container">{sets}</div>;
+  return <div className="dishlist-container">{sets && sets}</div>;
 }

src/components/Output/Pictograms.js

@@ -19,13 +19,8 @@ import vegetarian from "../../public/i_vegetarian.svg";
 
 export default function (props) {
   const pictograms = props.pictograms.map((pictogram, index) => (
-    <Tooltip title={getTooltip(pictogram)}>
-      <img
-        key={index}
-        className="pictogram"
-        src={getImage(pictogram)}
-        alt={pictogram}
-      />
+    <Tooltip key={index} title={getTooltip(pictogram)}>
+      <img className="pictogram" src={getImage(pictogram)} alt={pictogram} />
     </Tooltip>
   ));
 

src/components/Output/Restaurant.js

@@ -73,11 +73,11 @@ export default function Restaurant(props) {
           {restaurant.lunchHours && (
             <h3>Lunch menu ({restaurant.lunchHours})</h3>
           )}
-          {showDishList === false && <CircularProgress />}
-          {showDishList === true && <LunchMenu restaurant={restaurant} />}
+          {!showDishList && <CircularProgress />}
+          {showDishList && <LunchMenu restaurant={restaurant} />}
           <h3>Menu</h3>
-          {showDishList === false && <CircularProgress />}
-          {showDishList === true && <DishList />}
+          {!showDishList && <CircularProgress />}
+          {showDishList && <DishList />}
         </div>
       </div>
     </div>