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

removed 'login' and 'register' pages

Browse Source
This commit is contained in:
Edin Dazdarevic
2015-06-01 12:39:15 +02:00
parent b5fdc6d173
commit 28e81c27ed
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
front-ui/app/components/cart/cartIcon.js
View File

@@ -2,7 +2,7 @@ var React = require('react');
var CartStore = require('../../stores/cartStore.js');
var CartActions = require('../../actions/cartActions.js');
var NavigationActions = require('../../actions/navigationActions.js');
var LoginStatus = require('../shared/loginStatus');
// var LoginStatus = require('../shared/loginStatus');
CartTotal = require('./cartTotal');
@@ -29,7 +29,6 @@ var CartIcon = React.createClass({
return (
<div>
<ul className="nav navbar-nav navbar-right hidden-md hidden-sm hidden-xs">
<li><LoginStatus /></li>
<li onClick={this._onClick} style={{borderTop: 'solid lightgray 1px', borderBottom: 'solid lightgray 1px', borderLeft: 'solid lightgray 1px', paddingBottom: 22}}><a ><div className="mycart"><span>{normalizeCount(this.state.count)}</span></div></a></li>
<li onClick={this._onClick} style={{borderTop: 'solid lightgray 1px', borderBottom: 'solid lightgray 1px', paddingBottom: 2}}><a href="#" style={{ paddingRight: '5px', backgroundColor: 'transparent' }}><CartTotal items={this.state.items} itemCounts={this.state.itemCounts} deliveryCosts={this.state.deliveryCosts} justMerchandise={true}/> </a></li>
<li onClick={this._onClick} style={{borderTop: 'solid lightgray 1px', borderBottom: 'solid lightgray 1px', borderRight: 'solid lightgray 1px'}}>
@@ -38,7 +37,6 @@ var CartIcon = React.createClass({
</ul>
<ul className="nav navbar-nav navbar-right hidden-lg">
<li><LoginStatus /></li>
<li onClick={this._onClick} style={{borderTop: 'solid lightgray 1px', borderBottom: 'solid lightgray 1px', borderLeft: 'solid lightgray 1px', paddingBottom: 22}}><a ><div className="mycart"><span>{normalizeCount(this.state.count)}</span></div></a></li>
<li onClick={this._onClick} style={{borderTop: 'solid lightgray 1px', borderBottom: 'solid lightgray 1px',borderRight: 'solid lightgray 1px', paddingBottom: 2}}><a href="#" style={{ paddingRight: '5px', backgroundColor: 'transparent'}}><CartTotal items={this.state.items} itemCounts={this.state.itemCounts} deliveryCosts={this.state.deliveryCosts} justMerchandise={true}/> </a></li>
</ul>

7
front-ui/app/components/shared/menuItemListComponent.js
View File

@@ -43,9 +43,12 @@ var MenuItemListComponent = React.createClass({
NavigationActions.goToMenuItem(menuItem);
e.preventDefault();
},
_onCartClick: function() {
_onCartClick: function(e) {
NavigationActions.goToCart();
e.preventDefault();
e.cancelImmediatePropagation();
},
render: function() {
var self = this;
var style = {
@@ -67,7 +70,7 @@ var MenuItemListComponent = React.createClass({
<a className="navbar-brand hidden-lg hidden-md" href="#"><img style={{marginTop: '-4px'}} height={24} src="https://res.cloudinary.com/du5pdibul/image/upload/v1428813560/logo_h5f9yp.png" /></a>
<ul className="mynav hidden-lg hidden-md " style={{listStyle: 'none'}}>
<li><a href="#">0,00 KM</a></li>
<li onClick={this._onCartClick}><a style={{marginLeft: 10}} className="mybutton" href="#">Završi narudžbu</a></li>
<li onClick={this._onCartClick}><a style={{marginLeft: 10}} className="mybutton" href="#" onClick={this._onCartClick}>Završi narudžbu</a></li>
</ul>
</div>
<div className="navbar-collapse collapse">