From 99492f137fd8662999922b1eaca11acd020f2a19 Mon Sep 17 00:00:00 2001 From: Edin Dazdarevic Date: Tue, 2 Jun 2015 13:41:58 +0200 Subject: [PATCH] link banner centering --- front-api/db/schema.rb | 2 +- front-ui/app/components/cart/cartPage.js | 18 +++++++++---- .../app/components/linkBanner/linkBanner.js | 26 +++++++++---------- 3 files changed, 27 insertions(+), 19 deletions(-) diff --git a/front-api/db/schema.rb b/front-api/db/schema.rb index 6290743..cac306f 100644 --- a/front-api/db/schema.rb +++ b/front-api/db/schema.rb @@ -129,8 +129,8 @@ ActiveRecord::Schema.define(version: 20150420044444) do t.datetime "updated_at", null: false t.string "tags" t.json "traits" - t.integer "supplier_id" t.decimal "weight", precision: 5, scale: 3 + t.integer "supplier_id" t.integer "delivery_time_estimation_id" t.integer "brand_id" end diff --git a/front-ui/app/components/cart/cartPage.js b/front-ui/app/components/cart/cartPage.js index 08ca936..313ced2 100644 --- a/front-ui/app/components/cart/cartPage.js +++ b/front-ui/app/components/cart/cartPage.js @@ -29,7 +29,7 @@ var CartPage = React.createClass({ firstImage = firstImage || { resized_url: "https://res.cloudinary.com/lfvt7ps2n/image/upload/c_fit,h_172,w_226/v1421732950/http_www.asms.ru_bitrix_templates_main_images_nophoto_irnofq.png" } ; return ( - + product image @@ -122,11 +122,19 @@ var CartPage = React.createClass({ } return ( -
- -
KORPA
- {content} +
+
+
+ +
+
+
+
+
KORPA
+ {content} +
+
); diff --git a/front-ui/app/components/linkBanner/linkBanner.js b/front-ui/app/components/linkBanner/linkBanner.js index a9c0e8f..e137b3c 100644 --- a/front-ui/app/components/linkBanner/linkBanner.js +++ b/front-ui/app/components/linkBanner/linkBanner.js @@ -8,16 +8,16 @@ var Router = require('react-router'); var LinkBanner = React.createClass({ propTypes: { locationName: React.PropTypes.string.isRequired, - locationId: React.PropTypes.number, + locationId: React.PropTypes.number, }, render: function() { - var banners = this.state.banners.map(function (banner) { - - return
- + var banners = this.state.banners.map(function (banner) { + + return
+ }); return (
{ banners }
); @@ -25,27 +25,27 @@ var LinkBanner = React.createClass({ }, getInitialState: function () { - + var allBanners = InitializationStore.getBanners(); - var locationId = this.props.locationId; - var locationName = this.props.locationName; + var locationId = this.props.locationId; + var locationName = this.props.locationName; var bannersToShow = []; - + if (locationId) { bannersToShow = allBanners[locationName][locationId]; - + } else { bannersToShow = allBanners[locationName]; - + } bannersToShow = bannersToShow || []; - return { banners: bannersToShow }; + return { banners: bannersToShow }; } }); -module.exports = LinkBanner; +module.exports = LinkBanner;