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

banners are show now !

Browse Source
This commit is contained in:
Senad Uka
2015-03-29 12:46:51 +02:00
parent b90b4035aa
commit 7acf1a8d6c
16 changed files with 187 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
front-ui/app/components/browsing/byCategory.js
View File

@@ -10,6 +10,7 @@ var React = require('react'),
NavigationStore = require('../../stores/navigationStore'),
ItemList = require('../items/itemList'),
NavigationActions = require('../../actions/navigationActions'),
LinkBanner = require('../linkBanner/linkBanner'),
Globals = require('../../globals');
var ByCategory = React.createClass({
@@ -50,6 +51,10 @@ var ByCategory = React.createClass({
render: function() {
var self = this;
return (
<div>
<div className='col-md-2'>
@@ -78,6 +83,8 @@ var ByCategory = React.createClass({
<div className='col-md-10'>
<LinkBanner locationName="category" locationId={Number(this.getParams().id)} />
<h3> Kategorija - {this.state.category.get('name')}</h3>
Number of items in this category: {this.state.items.length}
<div>

3
front-ui/app/components/browsing/bySection.js
View File

@@ -9,6 +9,7 @@ var React = require('react'),
SectionActions = require('../../actions/sectionActions.js'),
NavigationActions = require('../../actions/navigationActions'),
Section = require('../../models/section'),
LinkBanner = require('../linkBanner/linkBanner'),
Category = require('../../models/category');
var BySection = React.createClass({
@@ -28,6 +29,8 @@ var BySection = React.createClass({
Here goes section for refining search, by section
</div>
<div className='col-md-10'>
<LinkBanner locationName="section" locationId={Number(this.getParams().id)} />
<div className='h3'>
Najprodavanije u sekciji {this.state.section.get('name')}
</div>

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

@@ -5,6 +5,7 @@ var React = require('react'),
NavigationActions = require('../../actions/navigationActions'),
SingleItem = require('../items/singleItem'),
Globals = require('../../globals'),
LinkBanner = require('../linkBanner/linkBanner'),
CartTotal = require('./cartTotal');
@@ -35,7 +36,8 @@ var CartPage = React.createClass({
console.log("bla :" , this.state.items.length);
var cartTotal = (
<div className="row cart-total">
<div className="row cart-total">
<CartTotal items={this.state.items} itemCounts={this.state.itemCounts} deliveryCosts={this.state.deliveryCosts}/>
<div className="col-md-1 span1">
<button className="btn btn-warning" onClick={this._onOrderClick}>Izgleda OK</button>
@@ -56,6 +58,7 @@ var CartPage = React.createClass({
return (
<div className="cart-page center">
<LinkBanner locationName="thankYouPage" />
{cartTotal}
{displayedItems}
{buySomethingMessage}

1
front-ui/app/components/cart/checkoutPage.js
View File

@@ -6,6 +6,7 @@ var React = require('react'),
SingleItem = require('../items/singleItem'),
Globals = require('../../globals'),
CartTotal = require('./cartTotal'),
LinkBanner = require('../linkBanner/linkBanner'),
RibicaFormError = require('../shared/ribicaFormError');

51
front-ui/app/components/linkBanner/linkBanner.js Normal file
View File

@@ -0,0 +1,51 @@
var React = require('react');
var ItemActions = require('../../actions/itemActions');
var NavigationActions = require('../../actions/navigationActions');
var InitializationStore = require('../../stores/initializationStore')
var Router = require('react-router');
var LinkBanner = React.createClass({
propTypes: {
locationName: React.PropTypes.string.isRequired,
locationId: React.PropTypes.number,
},
render: function() {
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>{ banners }</div>);
},
getInitialState: function () {
var allBanners = InitializationStore.getBanners();
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 };
}
});
module.exports = LinkBanner;

2
front-ui/app/components/rootApp.js
View File

@@ -48,7 +48,7 @@ var RootApp = React.createClass({
<Link to="app"><img src="https://res.cloudinary.com/lfvt7ps2n/image/upload/c_scale,w_132/v1426226452/ribica-ispunjava-zelje_nng0gn.png" /></Link>
</h1>
<div style={{float:'right'}}>
<div style= {{float:'right'}}>
<div style={{display: 'inline-block'}}>
<Link to="korpa">Završi narudžbu</Link><CartIcon /> | &nbsp;
</div>

3
front-ui/app/components/search/searchResultsPage.js
View File

@@ -2,6 +2,7 @@ var React = require('react'),
NavigationActions = require('../../actions/navigationActions'),
Globals = require('../../globals')
Router = require("react-router"),
LinkBanner = require('../linkBanner/linkBanner'),
Link = Router.Link;
var SearchStore = require('../../stores/searchStore');
@@ -24,6 +25,8 @@ var SearchResultsPage = React.createClass({
}
return (
<div>
<LinkBanner locationName="searchResultPage" />
<h2>Rezultati pretrage za '{this.state.q}'</h2>
{content}

4
front-ui/app/components/startPage/startPage.js
View File

@@ -1,7 +1,8 @@
var React = require('react'),
Router = require('react-router'),
RouteHandler = Router.RouteHandler,
AllItems = require('../items/allItems');
AllItems = require('../items/allItems'),
LinkBanner = require('../linkBanner/linkBanner');
var StartPage = React.createClass({
render : function() {
@@ -13,6 +14,7 @@ var StartPage = React.createClass({
</div>
<div className='col-md-10'>
<h2>Ribica Start Page</h2>
<LinkBanner locationName="startPage" />
<AllItems />
<RouteHandler />
</div>

29
front-ui/app/components/thankyou/thankYouPage.js
View File

@@ -2,6 +2,7 @@ var React = require('react'),
CartStore = require('../../stores/cartStore'),
AddToCart = require('../cart/addToCart'),
CartActions = require('../../actions/cartActions'),
LinkBanner = require('../linkBanner/linkBanner'),
NavigationActions = require('../../actions/navigationActions'),
Globals = require('../../globals')
Router = require("react-router"),
@@ -17,6 +18,8 @@ var ThankYouPage = React.createClass({
<div className="thank-you-page center">
<h1>Roba je naručena!</h1>
<p>Hvala na narudžbi. Naša zaposlenica će vas kontaktirati da ugovori detalje o preuzimanju. </p>
<p><LinkBanner locationName="thankYouPage" /></p>
<p>Registrujte se kako biste dobili informaciju o popustima, imali pregled svih vaših narudžbi,
koristili Baby Shower, Predlagač poklona te kalendar događaja.</p>
@@ -28,31 +31,7 @@ var ThankYouPage = React.createClass({
);
},
// Add change listeners to stores
/*
,
componentDidMount: function() {
CartStore.addChangeListener(this._onChange);
CartActions.load();
},
componentWillUnmount: function () {
CartStore.removeChangeListener(this._onChange);
},
_onChange: function () {
if (this.isMounted()) {
this.setState(CartStore.getWholeCartState());
}
},
getInitialState: function () {
return CartStore.getWholeCartState();
}*/
}
});