From 41b3f0e5553d97b723b996b1af353922310a76a5 Mon Sep 17 00:00:00 2001
From: Senad Uka <senad.uka@gmail.com>
Date: Wed, 4 Mar 2015 06:47:07 +0100
Subject: [PATCH 1/2] moved cart to top right

---
 front-ui/app/components/rootApp.js            | 11 +++++++----
 front-ui/app/components/shared/loginStatus.js | 14 ++++++--------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/front-ui/app/components/rootApp.js b/front-ui/app/components/rootApp.js
index 61f96ba..46a477b 100644
--- a/front-ui/app/components/rootApp.js
+++ b/front-ui/app/components/rootApp.js
@@ -17,21 +17,24 @@ 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>
     <div className='row'>
         <div className='col-md-12' id='header'>
             <SectionsListComponent />
-        </div>
+            </div>
         </div>
         <div className='row'>
             <RouteHandler />
         </div>
-      
-</div>
+        
+    </div>
             
             );
     }
diff --git a/front-ui/app/components/shared/loginStatus.js b/front-ui/app/components/shared/loginStatus.js
index c19bde6..df7fa10 100644
--- a/front-ui/app/components/shared/loginStatus.js
+++ b/front-ui/app/components/shared/loginStatus.js
@@ -32,19 +32,17 @@ var LoginStatus = React.createClass({
         UserActions.userLogout();
     },
   render : function() {
+
       
-          var content; 
+      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;

From c682063d4fb31f3d4fdede05347b1f9e85a28e06 Mon Sep 17 00:00:00 2001
From: Senad Uka <senad.uka@gmail.com>
Date: Thu, 5 Mar 2015 05:24:56 +0100
Subject: [PATCH 2/2] thank you page is now accessed

---
 front-api/controllers/cart.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/front-api/controllers/cart.rb b/front-api/controllers/cart.rb
index ded9cab..17f36a4 100644
--- a/front-api/controllers/cart.rb
+++ b/front-api/controllers/cart.rb
@@ -66,4 +66,5 @@ post '/cart/confirmation' do
     cart.ordered = true
     cart.save!
   end
+  "OK".to_json
 end
\ No newline at end of file