resolve conflict page #12 #33 #34

facg3 · Jan 24, 2018 · cd00dd8 · cd00dd8
2 parents 8c18a09 + c20ca06
commit cd00dd8
Show file tree

Hide file tree

Showing 11 changed files with 47 additions and 16 deletions.
diff --git a/public/image/error.png b/public/image/error.png
diff --git a/src/controllers/blogs.js b/src/controllers/blogs.js
@@ -1,8 +1,8 @@
 const view = require('../models/queries/viewBlogs.js');
 
-exports.get = (req, res) => {
+exports.get = (req, res ,next) => {
   view.viewAllBlogs((dataBaseConnectionError, blog) =>{
-    if (dataBaseConnectionError) return res.status(500).send({ error: dataBaseConnectionError });
+    if (dataBaseConnectionError) return next(dataBaseConnectionError);
     const newBlog = blog.map((element, i ) => {
       element.mod = i%3;
       return element;

diff --git a/src/controllers/error.js b/src/controllers/error.js
@@ -0,0 +1,6 @@
+exports.client = (req, res) => {
+  res.render('404',{layout:false});
+};
+exports.server = (err, req, res, next) => {
+    res.render('500',{layout:false});
+};
diff --git a/src/controllers/index.js b/src/controllers/index.js
diff --git a/src/controllers/men.js b/src/controllers/men.js
@@ -1,12 +1,10 @@
 const viewMenFa = require('../models/queries/viewMenFashion');
 const jwt = require('jsonwebtoken');
 
-exports.get = (req, res) => {
+exports.get = (req, res, next) => {
   viewMenFa.viewMenFashion((dataBaseConnectionError, menFashion) => {
     if (dataBaseConnectionError) {
-      return res.status(500).send({
-        error: dataBaseConnectionError,
-      });
+      return next(dataBaseConnectionError);
     }
     const { accessToken } = req.cookies;
     if (accessToken) {

diff --git a/src/controllers/menOutfits.js b/src/controllers/menOutfits.js
@@ -1,8 +1,8 @@
 const viewMenOutfits = require('../models/queries/viewMenOutfits');
 
-exports.get = (req, res) => {
+exports.get = (req, res ,next) => {
   viewMenOutfits((dataBaseConnectionError, menOutfits) => {
-    if (dataBaseConnectionError) return res.status(500).send({ error: dataBaseConnectionError });
+    if (dataBaseConnectionError) return next(dataBaseConnectionError);
     return res.render('menOutfits', {
       layout: 'fashion', menOutfits, style: 'style', title: 'Men Outfits',
     });

diff --git a/src/controllers/routes.js b/src/controllers/routes.js
@@ -18,6 +18,7 @@ const menOutfits = require('./menOutfits');
 const womenOutfits = require('./womenOutfits');
 const saved = require('./savedFashion');
 const unsaved = require('./unsaved');
+const error = require('./error');
 
 router.post('/signup', signup.post);
 router.post('/loginuser', login.post);
@@ -43,5 +44,8 @@ router.get('/women-fashion', women.get);
 router.get('/women-outfits', womenOutfits.get);
 router.get('/men-outfits', menOutfits.get);
 router.post('/unsaved', unsaved.post);
+router.use(error.client);
+router.use(error.server);
+
 
 module.exports = router;
diff --git a/src/controllers/women.js b/src/controllers/women.js
@@ -2,13 +2,9 @@ const viewWomenFa = require('../models/queries/viewWomenFashion');
 const viewMenFa = require('../models/queries/viewMenFashion');
 const jwt = require('jsonwebtoken');
 
-exports.get = (req, res) => {
+exports.get = (req, res, next) => {
   viewWomenFa((dataBaseConnectionError, womenFashion) => {
-    if (dataBaseConnectionError) {
-      return res.status(500).send({
-        error: dataBaseConnectionError,
-      });
-    }
+    if (dataBaseConnectionError) return next(dataBaseConnectionError);
     const { accessToken } = req.cookies;
     if (accessToken) {
       const verifyCookie = jwt.verify(accessToken, process.env.SECRET_COOKIE);
@@ -31,5 +27,6 @@ exports.get = (req, res) => {
         });
       }
     }
+    return null;
   });
 };
diff --git a/src/controllers/womenOutfits.js b/src/controllers/womenOutfits.js
@@ -1,8 +1,8 @@
 const viewWomenOutfits = require('../models/queries/viewWomenOutfits');
 
-exports.get = (req, res) => {
+exports.get = (req, res, next) => {
   viewWomenOutfits((dataBaseConnectionError, womenOutfits) => {
-    if (dataBaseConnectionError) return res.status(500).send({ error: dataBaseConnectionError });
+    if (dataBaseConnectionError) return next(dataBaseConnectionError);
     return res.render('womenOutfits', {
       layout: 'fashion', womenOutfits, style: 'style', title: 'Women Outfits',
     });

diff --git a/src/views/404.hbs b/src/views/404.hbs
@@ -0,0 +1,15 @@
+<main class="main">
+  <center>
+    <h2 class="error__desc">404. Page Not Found</2>
+      <br>
+      <a href="/" style="
+        text-decoration: none;
+        color:red;">
+        <h4>Go back! at the home page</h4>
+      </a>
+      <section class="error">
+        <img class="error__image" src="./image/error.png" alt="error">
+      </section>
+  </center>
+
+</main>
diff --git a/src/views/500.hbs b/src/views/500.hbs
@@ -0,0 +1,11 @@
+<main class="main">
+    <section class="error">
+      <a href="/" style="
+        text-decoration: none;
+        color:red;">
+        <h4>Go back! at the home page</h4>
+      </a>
+      <p class="error__desc">500. <span class="error__msg">Internal server error</span></p>
+      <img class="error__image" src="./image/error.png" alt="error">
+    </section>
+</main>