edit error with pages

Relates #37
GSG-G7 · Oct 2, 2019 · 6762ea8 · 6762ea8
1 parent 6425e41
commit 6762ea8
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 22 deletions.
diff --git a/client/src/components/MealPage/MealList.js b/client/src/components/MealPage/MealList.js
@@ -6,22 +6,25 @@ import CardMeal from './CardMeal';
 import './style.css';
 
 const MealList = ({ data }) => {
-  const listItems = data.map(item => {
-    return (
-      <Link
-        className="link"
-        to={{
-          pathname: '/details',
-          state: { item },
-        }}
-      >
-        <li>
-          <CardMeal key={item.id} oneMeal={item} />
-        </li>
-      </Link>
-    );
-  });
-  return <ul className="menu">{listItems}</ul>;
+  if (data) {
+    const listItems = data.map(item => {
+      return (
+        <Link
+          className="link"
+          to={{
+            pathname: '/details',
+            state: { item },
+          }}
+        >
+          <li>
+            <CardMeal key={item.id} oneMeal={item} />
+          </li>
+        </Link>
+      );
+    });
+    return <ul className="menu">{listItems}</ul>;
+  }
+  return '';
 };
 MealList.propTypes = {
   data: PropTypes.isRequired,

diff --git a/client/src/components/MealPage/index.js b/client/src/components/MealPage/index.js
@@ -24,9 +24,11 @@ class MenuPage extends React.Component {
     fetch(`/api/v1/meals?category=${cat}`)
       .then(res => res.json())
       .then(result => {
-        this.setState({
-          data: result.data,
-        });
+        if (result.data) {
+          this.setState({
+            data: result.data,
+          });
+        }
       })
       .then(this.changeStateCat())
       .catch(() => history.push('/serverError'));

diff --git a/client/src/components/feedback/index.js b/client/src/components/feedback/index.js
@@ -89,7 +89,7 @@ export default class FeedbackComponent extends React.Component {
       <div>
         {this.feedbackPopUp()}
         <div className="bg">
-          <div className="card">
+          <div className="card-feedback">
             <h3 className="header-feedback"> feedback</h3>
             <div className="order-info">
               <div className="order-number">

diff --git a/client/src/components/feedback/style.css b/client/src/components/feedback/style.css
@@ -10,7 +10,7 @@
   padding:                         1.4rem;
 }
 
-.card{
+.card-feedback{
   margin:        1rem auto;
   background:         #000;
   font-family: Lato, sans-serif;

diff --git a/server/controllers/index.js b/server/controllers/index.js
@@ -9,8 +9,8 @@ const getMeals = require('./getMeals');
 const router = express.Router();
 
 router.post('/login', login);
-router.use(auth);
 router.get('/meals', getMeals);
+router.use(auth);
 router.post('/post-feedback', postFeedback);
 router.post('/order', addOrder);
 router.get('/logout', logout);