Merge branch 'master' of https://github.com/senaduka/ribica

front-api/controllers/cart.rb

@@ -66,4 +66,5 @@ post '/cart/confirmation' do
     cart.ordered = true
     cart.save!
   end
+  "OK".to_json
 end

front-ui/app/components/rootApp.js

@@ -17,8 +17,11 @@ var RootApp = React.createClass({
         <h1 className="main-heading">
         
         <Link to="app"><span style={{color: "#cd3071"}}>ribica.ba</span></Link>
-        </h1> <CartIcon />
+        </h1>
         <div style={{float:'right'}}>
+            <div style={{display: 'inline-block'}}>
+                <Link to="korpa">Završi narudžbu</Link><CartIcon /> | &nbsp;
+            </div>
             <LoginStatus />
         </div>
     </div>
@@ -31,7 +34,7 @@ var RootApp = React.createClass({
             <RouteHandler />
         </div>
         
-</div>
+    </div>
             
             );
     }

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

@@ -33,18 +33,16 @@ var LoginStatus = React.createClass({
     },
   render : function() {
 
+      
       var content; 
 
       if(this.state.loggedIn){
-content = (<div>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'}}>Dobrodosli, {this.state.user.first_name} {this.state.user.last_name} | <a onClick={this.logout}>Odjavite se</a></div>)
       } else {
-          content = (<div>
-      <Link to="registracija">Registracija</Link> | <Link to="login">Prijava</Link>
-      </div>)      
+          content = (<div style={{display: 'inline-block'}}><Link to="registracija">Registracija</Link> | <Link to="login">Prijava</Link></div>)      
       }
-      return (<div>{content}</div>)
+
+      return content;
   }
 })
 module.exports = LoginStatus;