removed 'login' and 'register' pages

front-ui/app/components/cart/cartIcon.js

@@ -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>

front-ui/app/components/shared/menuItemListComponent.js

@@ -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">

front-ui/app/router.js

@@ -17,9 +17,8 @@ var ByCategory = require('./components/browsing/byCategory');
 var BySubCategory = require('./components/browsing/bySubCategory');
 var BySection = require('./components/browsing/bySection');
 var ThankYouPage = require('./components/thankyou/thankYouPage');
-
+// var Register = require('./components/account/register');
-var Register = require('./components/account/register');
+// var Login = require('./components/account/login');
-var Login = require('./components/account/login');
 var SearchResultsPage = require('./components/search/searchResultsPage');
 
 
@@ -30,11 +29,11 @@ var routes = (
       <Route name='grupa' path="grupa/:id/*" handler={ItemGroupPage} />
       <Route name='korpa' path="/korpa" handler={CartPage} />
       <Route name='dostava' path="/dostava" handler={CheckoutPage} />
-      <Route name='registracija' path="/registracija" handler={Register} />
+      {/*<Route name='registracija' path="/registracija" handler={Register} />*/}
-      <Route name='login' path="/login" handler={Login} />
+      {/*<Route name='login' path="/login" handler={Login} />*/}
       <Route name='podkategorija' path="/podkategorija/:id/*" handler={BySubCategory} />
       <Route name='byCat' path="sekcija/:sekcijaName/kategorija/:id/*" handler={ByCategory} />
-      <Route name='hvala' path="/hvala" handler={ThankYouPage} />  
+      <Route name='hvala' path="/hvala" handler={ThankYouPage} />
       <Route name='pretraga' path="/pretraga" handler={SearchResultsPage} />
       <DefaultRoute handler={StartPage}/>
     </Route>
@@ -45,4 +44,4 @@ var router = Router.create({
   location: Router.HistoryLocation
 });
 
-module.exports = router; 
+module.exports = router;