From c4b114bdb61ef6707c2aec94a65b0d937f4d30c6 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Wed, 25 Mar 2015 11:38:39 +0100
Subject: [PATCH 1/2] Divide user and organizations on accounts list

---
 app/controllers/accounts.coffee    | 4 ++++
 app/routes/accounts.coffee         | 7 +++++++
 app/templates/profile/accounts.hbs | 8 ++++----
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/app/controllers/accounts.coffee b/app/controllers/accounts.coffee
index 427549ec..d778bd6d 100644
--- a/app/controllers/accounts.coffee
+++ b/app/controllers/accounts.coffee
@@ -3,4 +3,8 @@
 Controller = Ember.ArrayController.extend
   tab: 'accounts'
 
+  userName: (->
+    @get('user.name') || @get('user.login')
+  ).property('user.login', 'user.name')
+
 `export default Controller`
diff --git a/app/routes/accounts.coffee b/app/routes/accounts.coffee
index cda2db79..f5ea8793 100644
--- a/app/routes/accounts.coffee
+++ b/app/routes/accounts.coffee
@@ -4,6 +4,13 @@ Route = TravisRoute.extend
   model: ->
     @store.find('account', { all: true })
 
+  setupController: (controller, model) ->
+    user = model.filterBy('type', 'user')[0]
+    orgs = model.filterBy('type', 'organization')
+
+    controller.set('user', user)
+    controller.set('organizations', orgs)
+
   renderTemplate: ->
     @_super.apply(this, arguments)
     @render 'profile_accounts', outlet: 'left', into: 'profile'
diff --git a/app/templates/profile/accounts.hbs b/app/templates/profile/accounts.hbs
index b31d60a3..fbf46e11 100644
--- a/app/templates/profile/accounts.hbs
+++ b/app/templates/profile/accounts.hbs
@@ -5,15 +5,15 @@
         <img src="//placehold.it/50x50" alt="">
       </div>
       <div class="media-body">
-        <h1>Justine Arreche</h1>
-        <p>Repositories <strong>12</strong></p>
-        <p class="profile-user-last">Token: <strong>dfigsd90u34r2hwa9ru239ur2</strong></p>
+        <h1>{{userName}}</h1>
+        <p>Repositories <strong>{{user.reposCount}}</strong></p>
+        <p class="profile-user-last">Token: <strong>{{user.token}}</strong></p>
       </div>
     </div>
   </section>
   <section class="profile-orgs">
     <h1>Organizations</h1>
-    {{#collection "accounts-list" contentBinding="controller"}}
+    {{#collection "accounts-list" contentBinding="organizations"}}
       {{#link-to "account" view.account class="name"}}
         <div class="media">
           <div class="media-elem">

From c2c5e7ff5cf28280080d63f2c9cf9b4f260d7bc3 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Wed, 25 Mar 2015 11:46:23 +0100
Subject: [PATCH 2/2] Use token from currentUser on profile accounts list

---
 app/templates/profile/accounts.hbs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/templates/profile/accounts.hbs b/app/templates/profile/accounts.hbs
index fbf46e11..e35f69d3 100644
--- a/app/templates/profile/accounts.hbs
+++ b/app/templates/profile/accounts.hbs
@@ -7,7 +7,7 @@
       <div class="media-body">
         <h1>{{userName}}</h1>
         <p>Repositories <strong>{{user.reposCount}}</strong></p>
-        <p class="profile-user-last">Token: <strong>{{user.token}}</strong></p>
+        <p class="profile-user-last">Token: <strong>{{auth.currentUser.token}}</strong></p>
       </div>
     </div>
   </section>