diff --git a/.gitignore b/.gitignore index 52477e5..af02350 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,8 @@ node_modules crawler/build backend/build npm-debug.log +<<<<<<< HEAD crawler.out +======= +crawler.log +>>>>>>> 7f3f08c65c89235a21d037a370d73f4575a1fd0c diff --git a/backend/build/server.js b/backend/build/server.js index c28ab06..cf6f4c2 100644 --- a/backend/build/server.js +++ b/backend/build/server.js @@ -752,7 +752,7 @@ router.get('/search/listings', function () { //Get only ads with location query = Object.assign(query, { - has_map: true + hasMap: true }); //AND diff --git a/crawler/automatic_crawler.sh b/crawler/automatic_crawler.sh index a0fe228..e799b8e 100644 --- a/crawler/automatic_crawler.sh +++ b/crawler/automatic_crawler.sh @@ -1 +1,5 @@ +<<<<<<< HEAD RENTAL_FROM_PAGE=1 RENTAL_TO_PAGE=1 PROSTOR_FROM_PAGE=1 PROSTOR_TO_PAGE=1 MONGO_URL=mongodb://localhost:27017/kivi node /home/bilal/Saburly/kivi/crawler/build/crawler.js > /home/bilal/Saburly/kivi/crawler/crawler.out +======= +RENTAL_FROM_PAGE=1 RENTAL_TO_PAGE=45 PROSTOR_FROM_PAGE=1 PROSTOR_TO_PAGE=26 MONGO_URL=mongodb://localhost:27017/kivi node /home/bilal/kivi/crawler/build/crawler.js > /home/bilal/crawler.log +>>>>>>> 7f3f08c65c89235a21d037a370d73f4575a1fd0c diff --git a/web/dist/app.bundle.js b/web/dist/app.bundle.js index a74f450..b0391f0 100644 --- a/web/dist/app.bundle.js +++ b/web/dist/app.bundle.js @@ -2966,7 +2966,11 @@ var defaultContactMessage = exports.defaultContactMessage = function defaultCont var listingUrl = exports.listingUrl = function listingUrl(id) { // TODO: fix this once removing hardcoded values +<<<<<<< HEAD return 'http://138.68.67.31:8080/?listingId=' + id; +======= + return 'http://http://138.68.67.31/?listingId=' + id; +>>>>>>> 7f3f08c65c89235a21d037a370d73f4575a1fd0c }; var isMobile = exports.isMobile = function isMobile() { @@ -4718,6 +4722,10 @@ var _isomorphicFetch2 = _interopRequireDefault(_isomorphicFetch); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } //const BASE_URL = 'localhost'; +<<<<<<< HEAD +======= +//const BASE_URL = '192.168.0.13'; +>>>>>>> 7f3f08c65c89235a21d037a370d73f4575a1fd0c var BASE_URL = '138.68.67.31'; var saveContactRequest = exports.saveContactRequest = function saveContactRequest(listingId, params) { @@ -25639,15 +25647,22 @@ var Router = function () { rooms = _state$rooms === undefined ? {} : _state$rooms, _state$category = _state.category, category = _state$category === undefined ? {} : _state$category, +<<<<<<< HEAD zoom = _state.zoom, adType = _state.adType; +======= + zoom = _state.zoom; +>>>>>>> 7f3f08c65c89235a21d037a370d73f4575a1fd0c if (listingId) { params.push('listingId=' + listingId); } +<<<<<<< HEAD params.push('adType=' + adType); +======= +>>>>>>> 7f3f08c65c89235a21d037a370d73f4575a1fd0c params.push('sort=' + sort); params.push('bounds=' + bounds); params.push('zoom=' + zoom); @@ -27452,6 +27467,7 @@ module.exports = cloneDeep; /* 200 */ /***/ (function(module, exports) { +<<<<<<< HEAD var g; // This works in non-strict mode @@ -27473,12 +27489,36 @@ try { // easier to handle this case. if(!global) { ...} module.exports = g; +======= +var g; + +// This works in non-strict mode +g = (function() { + return this; +})(); + +try { + // This works if eval is allowed (see CSP) + g = g || Function("return this")() || (1,eval)("this"); +} catch(e) { + // This works if the window reference is available + if(typeof window === "object") + g = window; +} + +// g can still be undefined, but nothing to do about it... +// We return undefined, instead of nothing here, so it's +// easier to handle this case. if(!global) { ...} + +module.exports = g; +>>>>>>> 7f3f08c65c89235a21d037a370d73f4575a1fd0c /***/ }), /* 201 */ /***/ (function(module, exports) { +<<<<<<< HEAD module.exports = function(module) { if(!module.webpackPolyfill) { module.deprecate = function() {}; @@ -27501,6 +27541,30 @@ module.exports = function(module) { } return module; }; +======= +module.exports = function(module) { + if(!module.webpackPolyfill) { + module.deprecate = function() {}; + module.paths = []; + // module.parent = undefined by default + if(!module.children) module.children = []; + Object.defineProperty(module, "loaded", { + enumerable: true, + get: function() { + return module.l; + } + }); + Object.defineProperty(module, "id", { + enumerable: true, + get: function() { + return module.i; + } + }); + module.webpackPolyfill = 1; + } + return module; +}; +>>>>>>> 7f3f08c65c89235a21d037a370d73f4575a1fd0c /***/ }), @@ -27539,7 +27603,13 @@ var Welcome = function (_React$Component) { var _this = _possibleConstructorReturn(this, (Welcome.__proto__ || Object.getPrototypeOf(Welcome)).call(this, props)); _this.state = { +<<<<<<< HEAD type: _enums.AD_TYPE_SALE +======= + type: _enums.AD_TYPE_SALE, + buyButtonImg: 'static/images/sale_1_mobile.png', + rentButtonImg: 'static/images/rent_0_mobile.png' +>>>>>>> 7f3f08c65c89235a21d037a370d73f4575a1fd0c }; return _this; } @@ -27548,21 +27618,46 @@ var Welcome = function (_React$Component) { key: 'onSaleClick', value: function onSaleClick() { this.setState({ +<<<<<<< HEAD type: _enums.AD_TYPE_SALE +======= + type: _enums.AD_TYPE_SALE, + buyButtonImg: 'static/images/sale_1_mobile.png', + rentButtonImg: 'static/images/rent_0_mobile.png' +>>>>>>> 7f3f08c65c89235a21d037a370d73f4575a1fd0c }); } }, { key: 'onRentClick', value: function onRentClick() { this.setState({ +<<<<<<< HEAD type: _enums.AD_TYPE_RENT }); } }, { +======= + type: _enums.AD_TYPE_RENT, + buyButtonImg: 'static/images/sale_0_mobile.png', + rentButtonImg: 'static/images/rent_1_mobile.png' + }); + } + }, { + key: 'onSearchClick', + value: function onSearchClick() {} + }, { +>>>>>>> 7f3f08c65c89235a21d037a370d73f4575a1fd0c key: 'render', value: function render() { var _this2 = this; +<<<<<<< HEAD +======= + var style1 = { + background: 'url(' + this.state.buyButtonImg + ')', + backgrounSize: 'cover' + }; +>>>>>>> 7f3f08c65c89235a21d037a370d73f4575a1fd0c return _react2.default.createElement( 'div', null, @@ -27586,8 +27681,13 @@ var Welcome = function (_React$Component) { _react2.default.createElement( 'div', null, +<<<<<<< HEAD _react2.default.createElement('button', { className: this.state.type === _enums.AD_TYPE_SALE ? 'buy-button-active' : 'buy-button-inactive', onClick: this.onSaleClick.bind(this) }), _react2.default.createElement('button', { className: this.state.type === _enums.AD_TYPE_RENT ? 'rent-button-active' : 'rent-button-inactive', onClick: this.onRentClick.bind(this) }) +======= + _react2.default.createElement('button', { className: 'buy-button', style: { background: "url(" + this.state.buyButtonImg + ") no-repeat" }, onClick: this.onSaleClick.bind(this) }), + _react2.default.createElement('button', { className: 'rent-button', style: { background: "url(" + this.state.rentButtonImg + ") no-repeat" }, onClick: this.onRentClick.bind(this) }) +>>>>>>> 7f3f08c65c89235a21d037a370d73f4575a1fd0c ), _react2.default.createElement( 'button', diff --git a/web/src/lib/api.js b/web/src/lib/api.js index 26c1d72..a62d70d 100644 --- a/web/src/lib/api.js +++ b/web/src/lib/api.js @@ -1,6 +1,10 @@ import fetch from 'isomorphic-fetch' //const BASE_URL = 'localhost'; +<<<<<<< HEAD +======= +//const BASE_URL = '192.168.0.13'; +>>>>>>> 7f3f08c65c89235a21d037a370d73f4575a1fd0c const BASE_URL = '138.68.67.31'; export const saveContactRequest = (listingId, params) => { diff --git a/web/src/lib/helpers.js b/web/src/lib/helpers.js index 287492b..bf08dc1 100644 --- a/web/src/lib/helpers.js +++ b/web/src/lib/helpers.js @@ -34,7 +34,11 @@ S poĊĦtovanjem export const listingUrl = (id) => { // TODO: fix this once removing hardcoded values +<<<<<<< HEAD return `http://138.68.67.31:8080/?listingId=${id}` +======= + return `http://http://138.68.67.31/?listingId=${id}` +>>>>>>> 7f3f08c65c89235a21d037a370d73f4575a1fd0c } export const isMobile = () => window.matchMedia("(max-width: 768px)").matches