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

design in progress - very ugly now

Browse Source
This commit is contained in:
Senad Uka
2015-04-12 09:21:00 +02:00
parent 82f40de96b
commit 8197104040
5 changed files with 473 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,6 +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');
@@ -16,10 +17,13 @@ var CartIcon = React.createClass({
var textNotificationStyle = (this.state.count > 0) ? { display: 'inline-block'} : { display: 'none'} ;
return (
<div className="shopping-cart-icon" onClick={this._onClick}>
<i style={cartStyle} className="fa fa-shopping-cart"></i>
<div style={textNotificationStyle} className="shopping-cart-notification-text">{this.state.count}</div>
</div>
<ul className="nav navbar-nav navbar-right">
<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>{this.state.count}</span></div></a></li>
<li onClick={this._onClick} style={{borderTop: 'solid lightgray 1px', borderBottom: 'solid lightgray 1px', paddingBottom: 2}}><a href="#">0,00 KM</a></li>
<li onClick={this._onClick} style={{borderTop: 'solid lightgray 1px', borderBottom: 'solid lightgray 1px', borderRight: 'solid lightgray 1px'}}><a style={{marginLeft: 20, marginBottom: 10, marginRight: 15}} className="mybutton" href="#">Završi narudžbu</a></li>
</ul>
);
},

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

@@ -42,38 +42,36 @@ var RootApp = React.createClass({
return (<div>loading...</div>);
}
return (
<div className="container">
<div className='page-header'>
<h1 className="main-heading">
<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={{display: 'inline-block'}}>
<Link to="korpa">Završi narudžbu</Link><CartIcon /> | &nbsp;
return (
<div className="container-fluid">
<div>
<div className="col-lg-12 hidden-sm hidden-xs " style={{height: 80, background: 'none', marginBottom: '0px !important'}} id="mybody">
<div style={{padding: '15px 15px'}} className="col-lg-3 col-md-3 col-sm-3 col-xs-3">
<Link to="app"><img height={50} src="https://res.cloudinary.com/du5pdibul/image/upload/v1428813560/logo_h5f9yp.png" /></Link>
</div>
<LoginStatus />
<div style={{padding: '15px 15px'}} className="col-lg-9 col-md-9 hidden-sm hidden-xs">
<nav style={{background: 'none', border: 'none', marginBottom: '0px !important'}} className="navbar mytopnav">
<div className="container-fluid">
<CartIcon />
</div>
</nav>
</div>
</div>
<div style={{margin: '0 !important'}} className="clearfix" >
</div>
</div>
<div className='row'>
<div className='col-md-8' id='header'>
<MenuItemListComponent />
</div>
<div>
<MenuItemListComponent />
</div>
<div className="col-md-4">
<SearchBox />
</div>
</div>
<div className='row'>
<div className='row'>
<RouteHandler />
</div>
</div>
</div>
);
);
}
});

4
front-ui/app/components/shared/loginStatus.js
View File

@@ -37,9 +37,9 @@ var LoginStatus = React.createClass({
var content;
if(this.state.loggedIn){
content = (<div style={{display: 'inline-block'}}>Dobrodosli, {this.state.user.first_name} {this.state.user.last_name} | <a onClick={this.logout}>Odjavite se</a></div>)
content = (<div style={{display: 'inline-block', paddingTop: '18px', paddingRight: '30px'}}>{this.state.user.first_name} {this.state.user.last_name} <a onClick={this.logout} style={{ paddingLeft: '30px' }}>Odjavite se</a></div>)
} else {
content = (<div style={{display: 'inline-block'}}><Link to="registracija">Registracija</Link> | <Link to="login">Prijava</Link></div>)
content = (<div style={{display: 'inline-block', paddingTop: '18px', paddingRight: '30px'}}><Link to="registracija" style={{ paddingRight: '30px' }}>Registracija</Link> <Link to="login">Prijava</Link></div>)
}
return content;