senaduka/old-web
1
0
Fork 0
Code Issues Pull Requests 5 Actions Packages Projects Releases Wiki Activity

WIP Changed redirecting for VIP ads.

Browse Source
This commit is contained in:
Naida Vatric
2020-01-09 12:19:19 +01:00
parent d23ddf849f
commit 49161c1b60
4 changed files with 39 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/common/enums.js
View File

@@ -216,7 +216,8 @@ const AD_STATUS = {
STATUS_DELETED: 4, STATUS_DELETED: 4,
STATUS_URGENT: 5, STATUS_URGENT: 5,
STATUS_DISCOUNTED: 6, STATUS_DISCOUNTED: 6,
STATUS_RENTED: 7 STATUS_RENTED: 7,
STATUS_VIP: 8
}; };
const AD_AGENCY = { const AD_AGENCY = {

5
app/controllers/redirect.js
View File

@@ -1,9 +1,11 @@
const { getRealEstateById } = require("../helpers/db/realEstate"); const { getRealEstateById } = require("../helpers/db/realEstate");
const { AD_STATUS } = require("../common/enums");
const getRedirect = async (req, res) => { const getRedirect = async (req, res) => {
const id = req.params.id || null; const id = req.params.id || null;
let error = false; let error = false;
let redirectUrl = undefined; let redirectUrl = undefined;
let vipAd = undefined;
if (!id) { if (!id) {
error = true; error = true;
} else { } else {
@@ -13,6 +15,7 @@ const getRedirect = async (req, res) => {
error = true; error = true;
} else { } else {
redirectUrl = realEstate.url; redirectUrl = realEstate.url;
vipAd = realEstate.adStatus === AD_STATUS.STATUS_VIP;
} }
} catch (e) { } catch (e) {
error = true; error = true;
@@ -24,7 +27,7 @@ const getRedirect = async (req, res) => {
res.render("notFound", { title }); res.render("notFound", { title });
} else { } else {
const title = "Preusmjeravanje"; const title = "Preusmjeravanje";
res.render("redirect", { title, redirectUrl }); res.render("redirect", { title, redirectUrl, vipAd });
} }
}; };

6
app/crawler/specificCrawlers/prostor.js
View File

@@ -182,8 +182,8 @@ class ProstorCrawler {
async scrapeAd(realEstate) { async scrapeAd(realEstate) {
const { lat, lng, property_name, price, size, link, status } = realEstate; const { lat, lng, property_name, price, size, link, status } = realEstate;
const url = `https://prostor.ba${link}`;
// console.log("[PROSTOR] Scraping : ", url); //console.log("[PROSTOR] Scraping : ", url);
try { try {
const adPageSource = await fetch(url); const adPageSource = await fetch(url);
const body = await adPageSource.text(); const body = await adPageSource.text();
@@ -548,6 +548,8 @@ class ProstorCrawler {
return AD_STATUS.STATUS_SOLD; return AD_STATUS.STATUS_SOLD;
case "Iznajmljeno": case "Iznajmljeno":
return AD_STATUS.STATUS_RENTED; return AD_STATUS.STATUS_RENTED;
case "VIP ponuda":
return AD_STATUS.STATUS_VIP;
default: default:
console.log("[PROSTOR] Unknown AD_STATUS : [", statusText, "]"); console.log("[PROSTOR] Unknown AD_STATUS : [", statusText, "]");
return AD_STATUS.STATUS_NORMAL; return AD_STATUS.STATUS_NORMAL;

47
app/views/redirect.ejs
View File

@@ -1,26 +1,37 @@
<br><br> <br /><br />
<div class="center"> <div class="center">
<div class="preloader-wrapper big active center"> <div class="preloader-wrapper big active center">
<div class="kivi-spinner-color spinner-layer spinner-green-only"> <div class="kivi-spinner-color spinner-layer spinner-green-only">
<div class="circle-clipper left"> <div class="circle-clipper left">
<div class="circle"></div> <div class="circle"></div>
</div><div class="gap-patch"> </div>
<div class="circle"></div> <div class="gap-patch">
</div><div class="circle-clipper right"> <div class="circle"></div>
<div class="circle"></div> </div>
</div> <div class="circle-clipper right">
</div> <div class="circle"></div>
</div>
</div> </div>
</div>
</div> </div>
<br> <br />
<% if(vipAd) { %>
<div class="center"> <div class="center">
<h6> <h6>Work in progress....</h6>
<a href="<%= redirectUrl %>" rel="noreferrer" id="realEstateUrl">Kliknite ovdje ako Vas web preglednik ne preusmjeri automatski</a>
</h6>
</div> </div>
<% } else { %>
<div class="center">
<h6>
<a href="<%= redirectUrl %>" rel="noreferrer" id="realEstateUrl"
>Kliknite ovdje ako Vas web preglednik ne preusmjeri automatski</a
>
</h6>
</div>
<% }%>
<script> <script>
window.onload = function() { window.onload = function() {
document.getElementById('realEstateUrl').click(); document.getElementById("realEstateUrl").click();
} };
</script> </script>