From 40fb1e6ad76e4c878bf7acc88b1cd93b4d6fcf38 Mon Sep 17 00:00:00 2001
From: Bilal Catic <bilal.catic@hotmail.com>
Date: Thu, 10 Oct 2019 00:49:48 +0200
Subject: [PATCH] create custom view for redirect and custom view for not found

---
 app/controllers/redirect.js | 28 ++++++++++++++++++++++++++--
 app/routes/index.js         |  4 ++--
 app/views/notFound.ejs      |  9 +++++++++
 app/views/redirect.ejs      | 28 ++++++++++++++++++++++++++++
 4 files changed, 65 insertions(+), 4 deletions(-)
 create mode 100644 app/views/notFound.ejs
 create mode 100644 app/views/redirect.ejs

diff --git a/app/controllers/redirect.js b/app/controllers/redirect.js
index 6cf5d35..49ea271 100644
--- a/app/controllers/redirect.js
+++ b/app/controllers/redirect.js
@@ -11,6 +11,30 @@ const redirect = async (req, res) => {
   }
 };
 
-module.exports = {
-  redirect
+const getRedirect = async (req, res) => {
+  const id = req.params.id || null;
+  let error = false;
+  let redirectUrl = undefined;
+  if (!id) {
+    error = true;
+  } else {
+    const realEstate = await getRealEstateById(id);
+    if (!realEstate) {
+      error = true;
+    } else {
+      redirectUrl = realEstate.url;
+    }
+  }
+
+  if (error) {
+    const title = "";
+    res.render("notFound", { title });
+  } else {
+    const title = "Preusmjeravanje";
+    res.render("redirect", { title, redirectUrl });
+  }
+};
+
+module.exports = {
+  getRedirect
 };
diff --git a/app/routes/index.js b/app/routes/index.js
index ef1fea9..807f594 100644
--- a/app/routes/index.js
+++ b/app/routes/index.js
@@ -18,7 +18,7 @@ const { getGoAgain } = require("../controllers/goAgain");
 const { getLocation, postLocation } = require("../controllers/location");
 const { getUnsubscribe } = require("../controllers/unsubscribe");
 const { getRealEstates } = require("../controllers/realEstates");
-const { redirect } = require("../controllers/redirect");
+const { getRedirect } = require("../controllers/redirect");
 
 const router = express.Router();
 
@@ -50,6 +50,6 @@ router.get("/ponovo", getGoAgain);
 
 router.get("/nekretnine/:searchRequestId", getRealEstates);
 
-router.get("/redirect/:id", redirect);
+router.get("/redirect/:id", getRedirect);
 
 module.exports = router;
diff --git a/app/views/notFound.ejs b/app/views/notFound.ejs
new file mode 100644
index 0000000..e66b342
--- /dev/null
+++ b/app/views/notFound.ejs
@@ -0,0 +1,9 @@
+<!--suppress HtmlUnknownAnchorTarget -->
+<% include partials/navBar %>
+
+<div class="row center">
+    <h4>Ups...stranica ne postoji</h4>
+</div>
+<div class="row center">
+    <h5><a href="/">Nova pretraga</a></h5>
+</div>
diff --git a/app/views/redirect.ejs b/app/views/redirect.ejs
new file mode 100644
index 0000000..db97191
--- /dev/null
+++ b/app/views/redirect.ejs
@@ -0,0 +1,28 @@
+<!--suppress HtmlUnknownAnchorTarget -->
+<% include partials/navBar %>
+
+<div class="center">
+    <div class="preloader-wrapper big active center">
+        <div class="spinner-layer spinner-green-only">
+            <div class="circle-clipper left">
+                <div class="circle"></div>
+            </div><div class="gap-patch">
+                <div class="circle"></div>
+            </div><div class="circle-clipper right">
+                <div class="circle"></div>
+            </div>
+        </div>
+    </div>
+</div>
+
+<br>
+<div class="center">
+    <h6>
+        <a href="<%= redirectUrl %>" rel="noreferrer" id="realEstateUrl">Kliknite ovdje ako Vas web preglednik ne preusmjeri automatski</a>
+    </h6>
+</div>
+<script>
+    window.onload = () => {
+        document.getElementById('realEstateUrl').click();
+    }
+</script>