css fix, url fix

2017-11-13 19:46:26 +01:00
parent 1c25fe6502
commit 02410a8c3c
5 changed files with 0 additions and 117 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -3,8 +3,3 @@ node_modules
 crawler/build
 backend/build
 npm-debug.log
-<<<<<<< HEAD
-crawler.out
-=======
-crawler.log
->>>>>>> 7f3f08c65c89235a21d037a370d73f4575a1fd0c
--- a/crawler/automatic_crawler.sh
+++ b/crawler/automatic_crawler.sh
@@ -1,5 +1 @@
-<<<<<<< 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
--- a/web/dist/app.bundle.js
+++ b/web/dist/app.bundle.js
@@ -2966,11 +2966,7 @@ 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() {
@@ -4722,10 +4718,6 @@ 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) {
@@ -25647,22 +25639,15 @@ 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);
@@ -27467,7 +27452,6 @@ module.exports = cloneDeep;
 /* 200 */
 /***/ (function(module, exports) {

-<<<<<<< HEAD
 var g;

 // This works in non-strict mode
@@ -27489,36 +27473,12 @@ 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() {};
@@ -27541,30 +27501,6 @@ 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


 /***/ }),
@@ -27603,13 +27539,7 @@ 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;
  }
@@ -27618,46 +27548,21 @@ 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,
@@ -27681,13 +27586,8 @@ 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',
--- a/web/src/lib/api.js
+++ b/web/src/lib/api.js
@@ -1,10 +1,6 @@
 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) => {
--- a/web/src/lib/helpers.js
+++ b/web/src/lib/helpers.js
@@ -34,11 +34,7 @@ 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