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

new structure; code polish

Browse Source
This commit is contained in:
GotPPay
2017-10-31 20:20:09 +01:00
parent a63c108259
commit 7a5f7242ac
25 changed files with 1670 additions and 6108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
backend/.babelrc
View File

@@ -1,3 +0,0 @@
{
"presets": ["es2015", "es2017"],
}

56
backend/build/server.js
View File

@@ -726,7 +726,7 @@ router.get('/search/listings/:id', function () {
router.get('/search/listings', function () {
var _ref3 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3(req, res, next) {
var bounds, minPrice, maxPrice, minSize, maxSize, rooms, adType, category, sort, page, pins, properties, query, _bounds$split$map, _bounds$split$map2, lat1, lng1, lat2, lng2, box, price, room_count, four_plus, allRooms, size, category_count, allCategories, cnt, getSort, all, isPins;
var bounds, minPrice, maxPrice, minSize, maxSize, rooms, adType, category, sort, page, pins, properties, query, _bounds$split$map, _bounds$split$map2, lat1, lng1, lat2, lng2, box, price, roomCount, fourPlus, allRooms, size, categoryCount, allCategories, cnt, getSort, all, isPins;
return regeneratorRuntime.wrap(function _callee3$(_context3) {
while (1) {
@@ -734,7 +734,7 @@ router.get('/search/listings', function () {
case 0:
_context3.prev = 0;
console.log("Search listings");
console.log('Search listings');
bounds = req.query.bounds || '';
minPrice = req.query.minPrice;
maxPrice = req.query.maxPrice;
@@ -772,8 +772,8 @@ router.get('/search/listings', function () {
query = Object.assign(query, {
loc: {
"$geoWithin": {
"$box": box
$geoWithin: {
$box: box
}
}
});
@@ -795,11 +795,11 @@ router.get('/search/listings', function () {
price = {};
if (minPrice) {
price["$gte"] = parseFloat(minPrice);
price['$gte'] = parseFloat(minPrice);
}
if (maxPrice) {
price["$lte"] = parseFloat(maxPrice);
price['$lte'] = parseFloat(maxPrice);
}
query = Object.assign(query, {
@@ -811,42 +811,41 @@ router.get('/search/listings', function () {
//Match number of rooms
if (rooms) {
room_count = [];
four_plus = false;
roomCount = [];
fourPlus = false;
allRooms = rooms.split(',');
allRooms.map(function (val) {
if (parseInt(val) !== 4) {
room_count.push(parseInt(val));
roomCount.push(parseInt(val));
} else {
four_plus = true;
fourPlus = true;
}
});
if (four_plus) {
if (fourPlus) {
query = Object.assign(query, {
rooms: { '$gte': 4 }
rooms: { $gte: 4 }
});
} else {
query = Object.assign(query, {
rooms: { '$in': room_count }
rooms: { $in: roomCount }
});
}
}
//AND
//Match size
if (minSize || maxSize) {
size = {};
if (minSize) {
size["$gte"] = parseFloat(minSize);
size['$gte'] = parseFloat(minSize);
}
if (maxSize) {
size["$lte"] = parseFloat(maxSize);
size['$lte'] = parseFloat(maxSize);
}
query = Object.assign(query, {
@@ -858,14 +857,14 @@ router.get('/search/listings', function () {
//Match category
if (category) {
category_count = [];
categoryCount = [];
allCategories = category.split(',').map(function (val) {
category_count.push(parseInt(val));
categoryCount.push(parseInt(val));
});
query = Object.assign(query, {
category: { '$in': category_count }
category: { $in: categoryCount }
});
}
@@ -894,9 +893,9 @@ router.get('/search/listings', function () {
all = properties.find(query, {
//"sort": [['field1','asc'], ['field2','desc']]
"sort": getSort()
sort: getSort()
});
isPins = pins === "true";
isPins = pins === 'true';
if (isPins) {
_context3.next = 37;
@@ -932,7 +931,6 @@ router.get('/search/listings', function () {
};
}));
} else {
res.json(all.map(function (_ref4) {
var _id = _ref4._id,
address = _ref4.address,
@@ -948,7 +946,9 @@ router.get('/search/listings', function () {
price: price,
rooms: rooms,
size: size,
time: (0, _distance_in_words_to_now2.default)((0, _moment2.default)(time, 'DD.MM.YYYY'), { locale: hr }),
time: (0, _distance_in_words_to_now2.default)((0, _moment2.default)(time, 'DD.MM.YYYY'), {
locale: hr
}),
realTime: time
};
}));
@@ -982,10 +982,10 @@ var app = (0, _express2.default)();
app.use(_bodyParser2.default.json());
app.use(function (req, res, next) {
res.header("Access-Control-Allow-Origin", "*");
res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept, X-Last-Record-Id, X-Total-Count");
res.header("Access-Control-Expose-Headers", "X-Last-Record-Id, X-Total-Count");
res.header("Access-Control-Allow-Methods", "GET, POST, OPTIONS");
res.header('Access-Control-Allow-Origin', '*');
res.header('Access-Control-Allow-Headers', 'Origin, X-Requested-With, Content-Type, Accept, X-Last-Record-Id, X-Total-Count');
res.header('Access-Control-Expose-Headers', 'X-Last-Record-Id, X-Total-Count');
res.header('Access-Control-Allow-Methods', 'GET, POST, OPTIONS');
res.header('Access-Control-Allow-Credentials', 'true');
next();
});
@@ -994,7 +994,7 @@ app.use('/api', router);
MongoClient.connect(url).then(function (database) {
db = database;
db.collection('listings').createIndex({ loc: "2d" });
db.collection('listings').createIndex({ loc: '2d' });
app.listen(PORT, function () {
return console.log('Express server running at localhost: ' + PORT);
});

16
backend/enums.js
View File

@@ -1,16 +0,0 @@
export const AD_TYPE_SALE = 1;
export const AD_TYPE_RENT = 2;
export const IGNORED_USERNAMES = ['rental']
export const CATEGORY_FLAT = 0;
export const CATEGORY_HOUSE = 1;
export const CATEGORY_OFFICE = 2;
export const CATEGORY_LAND = 3;
export const CATEGORY_APARTMENT = 4;
export const CATEGORY_GARAGE = 5;
export const STATUS_NORMAL = 0;
export const STATUS_RESERVED = 1;
export const STATUS_SOLD = 2;

1441
backend/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

26
backend/package.json
View File

@@ -1,26 +0,0 @@
{
"name": "backend",
"version": "1.0.0",
"description": "",
"main": "server.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1",
"start": "node server.js"
},
"author": "",
"license": "ISC",
"dependencies": {
"babel-core": "^6.24.0",
"babel-loader": "^6.4.1",
"babel-polyfill": "^6.23.0",
"babel-preset-es2015": "^6.24.0",
"babel-preset-es2017": "^6.22.0",
"body-parser": "^1.17.1",
"cookie-parser": "^1.4.3",
"date-fns": "^1.28.2",
"express": "^4.15.2",
"isomorphic-fetch": "^2.2.1",
"moment": "^2.18.1",
"mongodb": "^2.2.25"
}
}

298
backend/server.js
View File

@@ -1,131 +1,125 @@
import express from 'express'
import express from 'express';
import bodyParser from 'body-parser';
import distanceInWordsToNow from 'date-fns/distance_in_words_to_now';
import parseDate from 'date-fns/format';
import moment from 'moment';
import {
STATUS_NORMAL,
STATUS_RESERVED,
STATUS_SOLD
} from "./enums";
import {STATUS_NORMAL, STATUS_RESERVED, STATUS_SOLD} from '../common/enums';
var hr = require('date-fns/locale/hr');
var hr = require ('date-fns/locale/hr');
var MongoClient = require('mongodb').MongoClient;
var ObjectID = require('mongodb').ObjectID;
var MongoClient = require ('mongodb').MongoClient;
var ObjectID = require ('mongodb').ObjectID;
var url = 'mongodb://localhost:27017/kivi';
require("babel-polyfill");
require ('babel-polyfill');
const router = express.Router({mergeParams: true})
const router = express.Router ({mergeParams: true});
const PORT = process.env.PORT || 3001;
const AGENTURA_KEY = process.env.AGENTURA_KEY || '1somethingverysecret';
let db;
router.post('/contact/:listingId', async (req, res, next) => {
router.post ('/contact/:listingId', async (req, res, next) => {
try {
const listingId = req.params.listingId;
const body = req.body;
const contactRequests = db.collection('contact_requests');
const contactRequests = db.collection ('contact_requests');
if (!body.email) {
res.status(422);
res.end('Email is required');
return
res.status (422);
res.end ('Email is required');
return;
}
if (!body.name) {
res.status(422);
res.end('Name is required');
return
res.status (422);
res.end ('Name is required');
return;
}
const result = await contactRequests.insertOne({
name : body.name,
email : body.email,
const result = await contactRequests.insertOne ({
name: body.name,
email: body.email,
listingId,
message : body.message,
phone : body.phone,
alert : body.alert
message: body.message,
phone: body.phone,
alert: body.alert,
});
res.status(200);
res.end();
res.status (200);
res.end ();
} catch (e) {
console.log('error:', e);
next(e);
console.log ('error:', e);
next (e);
}
});
router.get('/search/listings/:id', async (req, res, next) => {
router.get ('/search/listings/:id', async (req, res, next) => {
try {
const id = req.params.id;
const listings = db.collection('listings');
const listing = await listings.findOne({_id: new ObjectID(id)});
const listings = db.collection ('listings');
const listing = await listings.findOne ({_id: new ObjectID (id)});
if (listing) {
res.json(listing);
res.json (listing);
} else {
res.status(404);
res.status (404);
}
res.end();
res.end ();
} catch (e) {
console.log('error:', e);
next(e);
console.log ('error:', e);
next (e);
}
});
router.get('/search/listings', async (req, res, next) => {
router.get ('/search/listings', async (req, res, next) => {
try {
console.log("Search listings");
const bounds = req.query.bounds || '';
const minPrice = req.query.minPrice;
const maxPrice = req.query.maxPrice;
const minSize = req.query.minSize;
const maxSize = req.query.maxSize;
const rooms = req.query.rooms;
const adType = req.query.adType;
const category = req.query.category;
const sort = req.query.sort;
const page = req.query.page || 0;
const pins = req.query.pins || false;
const properties = db.collection('listings');
let query = {};
console.log ('Search listings');
const bounds = req.query.bounds || '';
const minPrice = req.query.minPrice;
const maxPrice = req.query.maxPrice;
const minSize = req.query.minSize;
const maxSize = req.query.maxSize;
const rooms = req.query.rooms;
const adType = req.query.adType;
const category = req.query.category;
const sort = req.query.sort;
const page = req.query.page || 0;
const pins = req.query.pins || false;
const properties = db.collection ('listings');
let query = {};
//Get only ads with location
query = Object.assign(query, {
has_map: true
query = Object.assign (query, {
has_map: true,
});
//AND
//Do not show sold or reserved properity
query = Object.assign(query, {
status: STATUS_NORMAL
query = Object.assign (query, {
status: STATUS_NORMAL,
});
//AND
//Show ads that fall inside visible map
if (bounds) {
const [lat1, lng1, lat2, lng2] = bounds.split(',').map(parseFloat)
const box = [[lat1, lng1], [lat2, lng2]];
const [lat1, lng1, lat2, lng2] = bounds.split (',').map (parseFloat);
const box = [[lat1, lng1], [lat2, lng2]];
query = Object.assign(query, {
query = Object.assign (query, {
loc: {
"$geoWithin": {
"$box": box
}
}
$geoWithin: {
$box: box,
},
},
});
}
@@ -133,8 +127,8 @@ router.get('/search/listings', async (req, res, next) => {
//Show only selected type of ads (selling or renting)
if (adType) {
query = Object.assign(query, {
adType: parseInt(adType)
query = Object.assign (query, {
adType: parseInt (adType),
});
}
@@ -142,17 +136,17 @@ router.get('/search/listings', async (req, res, next) => {
//Match price
if (minPrice || maxPrice) {
const price = {}
const price = {};
if (minPrice) {
price["$gte"] = parseFloat(minPrice);
price['$gte'] = parseFloat (minPrice);
}
if (maxPrice) {
price["$lte"] = parseFloat(maxPrice);
price['$lte'] = parseFloat (maxPrice);
}
query = Object.assign(query, {
price
query = Object.assign (query, {
price,
});
}
@@ -160,45 +154,44 @@ router.get('/search/listings', async (req, res, next) => {
//Match number of rooms
if (rooms) {
const room_count = [];
let four_plus = false;
const roomCount = [];
let fourPlus = false;
const allRooms = rooms.split(',');
allRooms.map((val)=>{
if (parseInt(val)!==4){
room_count.push(parseInt(val));
}else{
four_plus=true;
const allRooms = rooms.split (',');
allRooms.map (val => {
if (parseInt (val) !== 4) {
roomCount.push (parseInt (val));
} else {
fourPlus = true;
}
});
if (four_plus){
query = Object.assign(query,{
rooms: {'$gte' : 4}
if (fourPlus) {
query = Object.assign (query, {
rooms: {$gte: 4},
});
}else{
query = Object.assign(query,{
rooms: {'$in' : room_count}
} else {
query = Object.assign (query, {
rooms: {$in: roomCount},
});
}
}
//AND
//Match size
if (minSize || maxSize) {
const size = {}
const size = {};
if (minSize) {
size["$gte"] = parseFloat(minSize);
size['$gte'] = parseFloat (minSize);
}
if (maxSize) {
size["$lte"] = parseFloat(maxSize);
size['$lte'] = parseFloat (maxSize);
}
query = Object.assign(query, {
size
query = Object.assign (query, {
size,
});
}
@@ -206,23 +199,21 @@ router.get('/search/listings', async (req, res, next) => {
//Match category
if (category) {
const category_count = [];
const categoryCount = [];
const allCategories = category.split(',').map(val => {
category_count.push(parseInt(val));
const allCategories = category.split (',').map (val => {
categoryCount.push (parseInt (val));
});
query = Object.assign(query, {
category: {'$in' : category_count}
query = Object.assign (query, {
category: {$in: categoryCount},
});
}
console.log('QUERY: ', query);
const cnt = await properties.find(query).count();
console.log ('QUERY: ', query);
const cnt = await properties.find (query).count ();
res.header('X-Total-Count', cnt);
res.header ('X-Total-Count', cnt);
const getSort = () => {
if (sort === 'price-min') {
@@ -237,79 +228,80 @@ router.get('/search/listings', async (req, res, next) => {
}
};
let all = properties.find(query, {
let all = properties.find (query, {
//"sort": [['field1','asc'], ['field2','desc']]
"sort": getSort()
sort: getSort (),
});
const isPins = pins === "true";
const isPins = pins === 'true';
if (!isPins) {
all = await all.skip(20 * page).limit(20).toArray();
all = await all.skip (20 * page).limit (20).toArray ();
} else {
all = await all.toArray();
all = await all.toArray ();
}
if (all.length > 0) {
res.header('X-Last-Record-Id', [...all].pop()._id);
res.header ('X-Last-Record-Id', [...all].pop ()._id);
}
if (isPins) {
res.json(all.map(val => {
return {
_id: val._id,
loc: val.loc
}
}));
res.json (
all.map (val => {
return {
_id: val._id,
loc: val.loc,
};
})
);
} else {
res.json(all.map(({_id,
address,
images,
price,
rooms,
size,
time
}) => ({
_id,
address,
images: [images[0]],
price,
rooms,
size,
time: distanceInWordsToNow(
moment(time, 'DD.MM.YYYY'),
{locale: hr}
),
realTime: time
})));
res.json (
all.map (({_id, address, images, price, rooms, size, time}) => ({
_id,
address,
images: [images[0]],
price,
rooms,
size,
time: distanceInWordsToNow (moment (time, 'DD.MM.YYYY'), {
locale: hr,
}),
realTime: time,
}))
);
}
res.end();
res.end ();
} catch (e) {
console.log('error:', e);
next(e);
console.log ('error:', e);
next (e);
}
});
const app = express ();
app.use (bodyParser.json ());
const app = express()
app.use(bodyParser.json());
app.use(function(req, res, next) {
res.header("Access-Control-Allow-Origin", "*");
res.header("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept, X-Last-Record-Id, X-Total-Count");
res.header("Access-Control-Expose-Headers", "X-Last-Record-Id, X-Total-Count");
res.header("Access-Control-Allow-Methods", "GET, POST, OPTIONS");
res.header('Access-Control-Allow-Credentials', 'true');
next();
app.use (function (req, res, next) {
res.header ('Access-Control-Allow-Origin', '*');
res.header (
'Access-Control-Allow-Headers',
'Origin, X-Requested-With, Content-Type, Accept, X-Last-Record-Id, X-Total-Count'
);
res.header (
'Access-Control-Expose-Headers',
'X-Last-Record-Id, X-Total-Count'
);
res.header ('Access-Control-Allow-Methods', 'GET, POST, OPTIONS');
res.header ('Access-Control-Allow-Credentials', 'true');
next ();
});
app.use('/api', router);
app.use ('/api', router);
MongoClient.connect(url).then((database) => {
MongoClient.connect (url).then (database => {
db = database;
db.collection('listings').createIndex({loc: "2d"});
app.listen(PORT, () => console.log('Express server running at localhost: ' + PORT));
db.collection ('listings').createIndex ({loc: '2d'});
app.listen (PORT, () =>
console.log ('Express server running at localhost: ' + PORT)
);
});

2
backend/webpack.config.js
View File

@@ -7,7 +7,7 @@ module.exports = {
filename: 'build/server.js'
},
target: 'node',
externals: fs.readdirSync(path.resolve(__dirname, 'node_modules')).reduce((ext, mod) => {
externals: fs.readdirSync(path.resolve(__dirname, '../node_modules')).reduce((ext, mod) => {
ext[mod] = 'commonjs ' + mod
return ext
}, {}),

1128
backend/yarn.lock
View File

File diff suppressed because it is too large Load Diff