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

link banner centering

Browse Source
This commit is contained in:
Edin Dazdarevic
2015-06-02 13:41:58 +02:00
parent 1db13308ef
commit 99492f137f
3 changed files with 27 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
front-api/db/schema.rb
View File

@@ -129,8 +129,8 @@ ActiveRecord::Schema.define(version: 20150420044444) do
t.datetime "updated_at", null: false t.datetime "updated_at", null: false
t.string "tags" t.string "tags"
t.json "traits" t.json "traits"
t.integer "supplier_id"
t.decimal "weight", precision: 5, scale: 3 t.decimal "weight", precision: 5, scale: 3
t.integer "supplier_id"
t.integer "delivery_time_estimation_id" t.integer "delivery_time_estimation_id"
t.integer "brand_id" t.integer "brand_id"
end end

18
front-ui/app/components/cart/cartPage.js
View File

@@ -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" } ; 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 ( return (
<tr key={i.get('id')}> <tr key={i.get('id')}>
<td> <td className='text-center'>
<img style={{maxWidth: '90px', maxHeight: '90px'}} src={firstImage.url} alt="product image"/> <img style={{maxWidth: '90px', maxHeight: '90px'}} src={firstImage.url} alt="product image"/>
</td> </td>
<td> <td>
@@ -122,11 +122,19 @@ var CartPage = React.createClass({
} }
return ( return (
<div className="col-lg-12">
<LinkBanner locationName="thankYouPage" />
<div className="cart-title">KORPA</div>
{content}
<div className="col-lg-12">
<div className="row">
<div className="col-lg-12">
<LinkBanner locationName="checkoutPage"/>
</div>
</div>
<div className="row">
<div className="col-lg-12">
<div className="cart-title">KORPA</div>
{content}
</div>
</div>
</div> </div>
); );

26
front-ui/app/components/linkBanner/linkBanner.js
View File

@@ -8,16 +8,16 @@ var Router = require('react-router');
var LinkBanner = React.createClass({ var LinkBanner = React.createClass({
propTypes: { propTypes: {
locationName: React.PropTypes.string.isRequired, locationName: React.PropTypes.string.isRequired,
locationId: React.PropTypes.number, locationId: React.PropTypes.number,
}, },
render: function() { render: function() {
var banners = this.state.banners.map(function (banner) { var banners = this.state.banners.map(function (banner) {
return <div key={"banner" + banner.get('id')}><a href={banner.get('link_url')}><img src={banner.get('image_url')} /></a></div> return <div key={"banner" + banner.get('id')}><a href={banner.get('link_url')}><img className='img-responsive center-block' src={banner.get('image_url')} /></a></div>
}); });
return (<div>{ banners }</div>); return (<div>{ banners }</div>);
@@ -25,27 +25,27 @@ var LinkBanner = React.createClass({
}, },
getInitialState: function () { getInitialState: function () {
var allBanners = InitializationStore.getBanners(); var allBanners = InitializationStore.getBanners();
var locationId = this.props.locationId; var locationId = this.props.locationId;
var locationName = this.props.locationName; var locationName = this.props.locationName;
var bannersToShow = []; var bannersToShow = [];
if (locationId) { if (locationId) {
bannersToShow = allBanners[locationName][locationId]; bannersToShow = allBanners[locationName][locationId];
} else { } else {
bannersToShow = allBanners[locationName]; bannersToShow = allBanners[locationName];
} }
bannersToShow = bannersToShow || []; bannersToShow = bannersToShow || [];
return { banners: bannersToShow }; return { banners: bannersToShow };
} }
}); });
module.exports = LinkBanner; module.exports = LinkBanner;