From 201a37aa7051336019c95d79fdb8a9b4613dff1e Mon Sep 17 00:00:00 2001
From: Lisa P <mail@lislis.de>
Date: Tue, 17 Nov 2015 17:51:30 +0100
Subject: [PATCH] refactor accounts, pt1

---
 app/components/org-item.coffee        | 29 +++++++++++++++
 app/controllers/accounts.coffee       |  6 ----
 app/routes/accounts.coffee            |  7 ++++
 app/templates/account.hbs             | 23 +++++++++---
 app/templates/components/org-item.hbs | 27 ++++++++++++++
 app/templates/profile/accounts.hbs    | 49 ++++++-------------------
 app/views/accounts-list.coffee        | 52 +++++++++++++--------------
 app/views/profile.coffee              |  5 +--
 8 files changed, 120 insertions(+), 78 deletions(-)
 create mode 100644 app/components/org-item.coffee
 create mode 100644 app/templates/components/org-item.hbs

diff --git a/app/components/org-item.coffee b/app/components/org-item.coffee
new file mode 100644
index 00000000..34b6a84f
--- /dev/null
+++ b/app/components/org-item.coffee
@@ -0,0 +1,29 @@
+`import Ember from 'ember'`
+
+OrgItemComponent = Ember.Component.extend
+
+  classNames: ['media', 'account']
+  tagName: 'li'
+  classNameBindings: ['type', 'selected']
+  typeBinding: 'account.type'
+  selectedBinding: 'account.selected'
+  tokenIsVisible: false
+
+  name: (->
+    @get('account.name') || @get('account.login')
+  ).property('account')
+
+  avatarUrl: (->
+    console.log(@get('account'))
+    @get('account.avatarUrl') || false
+  ).property('account')
+
+  isUser: (->
+    @get('account.type') == 'user'
+  ).property('account')
+
+  actions:
+    tokenVisibility: () ->
+      @toggleProperty('tokenIsVisible')
+
+`export default OrgItemComponent`
diff --git a/app/controllers/accounts.coffee b/app/controllers/accounts.coffee
index 90b871bd..d778bd6d 100644
--- a/app/controllers/accounts.coffee
+++ b/app/controllers/accounts.coffee
@@ -7,10 +7,4 @@ Controller = Ember.ArrayController.extend
     @get('user.name') || @get('user.login')
   ).property('user.login', 'user.name')
 
-
-  actions: 
-    tokenVisibility: () ->
-      @toggleProperty('isVisible')
-      return false
-
 `export default Controller`
diff --git a/app/routes/accounts.coffee b/app/routes/accounts.coffee
index 7753daba..dba38215 100644
--- a/app/routes/accounts.coffee
+++ b/app/routes/accounts.coffee
@@ -18,4 +18,11 @@ Route = TravisRoute.extend
     @render 'profile_accounts', outlet: 'left', into: 'profile'
 
 
+  organizations: ->
+    model.filterBy('type', 'organization')
+
+  user: ->
+    model.filterBy('type', 'user')[0]
+
+
 `export default Route`
diff --git a/app/templates/account.hbs b/app/templates/account.hbs
index 790fc909..558189bc 100644
--- a/app/templates/account.hbs
+++ b/app/templates/account.hbs
@@ -1,10 +1,25 @@
 {{#if allHooks.isLoaded}}
 
   <header>
-
-    {{#if config.billingEndpoint}}
-      {{subscribe-button account=subscribeButtonInfo}}
+  {{#if config.billingEndpoint}}
+    <div class="cta-btn">
+    {{#if view.subscribed}}
+      <a class="btn btn-activated" href={{billingUrl}}>
+        Subscription active!
+      </a>
+    {{else}}
+      {{#if view.education}}
+        <a class="btn btn-activated" href={{billingUrl}}>
+          Educational account!
+        </a>
+      {{else}}
+        <a class="btn btn-activate" href={{billingUrl}}>
+          Sign up this account!
+        </a>
+      {{/if}}
     {{/if}}
+    </div>
+  {{/if}}
 
     <div class="profile-header">
       <h1>{{accountName}}</h1>
@@ -111,5 +126,3 @@
 {{else}}
   {{loading-indicator}}
 {{/if}}
-
-
diff --git a/app/templates/components/org-item.hbs b/app/templates/components/org-item.hbs
new file mode 100644
index 00000000..850ac31a
--- /dev/null
+++ b/app/templates/components/org-item.hbs
@@ -0,0 +1,27 @@
+<div class="media-elem">
+  {{#if avatarUrl}}
+    <img src={{avatarUrl}} alt="avatar">
+  {{else}}
+    <div class="default-avatar--profile"></div>
+  {{/if}}
+</div>
+<div class="media-body">
+  {{#link-to "account" account.login}}
+    <h2>{{account.login}}</h2>
+    <p>Repositories <strong>{{reposCount}}</strong></p>
+  {{/link-to}}
+
+  {{#if isUser}}
+    <p class="profile-user-last">Token: 
+    {{#if tokenIsVisible}}
+      <strong>{{auth.currentUser.token}}</strong>
+    {{/if}}
+    <a {{action 'tokenVisibility' prevenDefault=true}} class="profile-token-toggle tooltip--profile {{if tokenIsVisible 'is-visible'}} dropdown">
+      <span class="tooltip-bubble">
+        {{#if tokenIsVisible}}hide token{{else}}show token{{/if}}
+      </span>
+      {{eye-icon}}
+      </a>
+    </p>
+  {{/if}}
+</div>
diff --git a/app/templates/profile/accounts.hbs b/app/templates/profile/accounts.hbs
index 36e66626..66767295 100644
--- a/app/templates/profile/accounts.hbs
+++ b/app/templates/profile/accounts.hbs
@@ -1,46 +1,17 @@
-<aside class="columns medium-4">
-  <section class="profile-user">
-    <div class="media">
-      <div class="media-elem">
-        <img src={{auth.gravatarUrl}} alt="">
-      </div>
-      <div class="media-body">
-        {{#link-to 'profile'}}
-          <h1>{{userName}}</h1>
-          <p>Repositories <strong>{{user.reposCount}}</strong></p>
-        {{/link-to}}
-        <p class="profile-user-last">Token: 
 
-        {{#if isVisible}}
-          <strong>{{auth.currentUser.token}}</strong>
-        {{/if}}
-        <a {{action 'tokenVisibility'}} class="profile-token-toggle tooltip--profile {{if isVisible 'is-visible'}} dropdown">
-          <span class="tooltip-bubble">
-            {{#if isVisible}}hide token{{else}}show token{{/if}}
-          </span>
-          {{eye-icon}}
-          </a>
-        </p>
-      </div>
-    </div>
-  </section>
+<aside class="columns medium-4">
   <section class="profile-orgs">
+    <ul>
+      {{org-item account=user}}
+    </ul>
     <h1>Organizations</h1>
-    {{#collection "accounts-list" content="organizations"}}
-      {{#link-to "account" view.account class="name"}}
-        <div class="media">
-          <div class="media-elem">
-            <img src={{view.avatarUrl}} alt="">
-          </div>
-          <div class="media-body">
-            <h2>{{view.name}}</h2>
-            <p>Repositories <strong>{{view.account.reposCount}}</strong></p>
-          </div>
-        </div>
-      {{/link-to}}
+    <ul>
+    {{#each organizations as |org|}}
+      {{org-item account=org}}
     {{else}}
-      <p class="profile-text">You are not currently a member of <br> any organization.</p>
-    {{/collection}}
+      <li class="profile-text">You are not currently a member of <br> any organization.</li>
+    {{/each}}
+    </ul>
   </section>
 {{#if config.githubOrgsOauthAccessSettingsUrl}}
   <section class="profile-additional">
diff --git a/app/views/accounts-list.coffee b/app/views/accounts-list.coffee
index 1a628a46..421740b6 100644
--- a/app/views/accounts-list.coffee
+++ b/app/views/accounts-list.coffee
@@ -1,35 +1,35 @@
-`import Ember from 'ember'`
-`import { account as accountUrl } from 'travis/utils/urls'`
+# `import Ember from 'ember'`
+# `import { account as accountUrl } from 'travis/utils/urls'`
 
-View = Ember.CollectionView.extend
-  elementId: 'accounts'
-  accountBinding: 'content'
-  tagName: 'ul'
+# View = Ember.CollectionView.extend
+#   elementId: 'accounts'
+#   accountBinding: 'content'
+#   tagName: 'ul'
 
-  emptyView: Ember.View.extend
-    templateName: 'accounts-list/empty'
+#   emptyView: Ember.View.extend
+#     templateName: 'accounts-list/empty'
 
-  itemViewClass: Ember.View.extend
-    accountBinding: 'content'
-    typeBinding: 'content.type'
-    selectedBinding: 'account.selected'
+#   itemViewClass: Ember.View.extend
+#     accountBinding: 'content'
+#     typeBinding: 'content.type'
+#     selectedBinding: 'account.selected'
 
-    classNames: ['account']
-    classNameBindings: ['type', 'selected']
+#     classNames: ['account']
+#     classNameBindings: ['type', 'selected']
 
-    name: (->
-      @get('content.name') || @get('content.login')
-    ).property('content.login', 'content.name')
+#     name: (->
+#       @get('content.name') || @get('content.login')
+#     ).property('content.login', 'content.name')
 
-    urlAccount: (->
-      accountUrl(@get('account.login'))
-    ).property('account.login')
+#     urlAccount: (->
+#       accountUrl(@get('account.login'))
+#     ).property('account.login')
 
-    avatarUrl: (->
-      @get('account.avatarUrl') || "//placehold.it/50x50"
-    ).property('account.avatarUrl')
+#     avatarUrl: (->
+#       @get('account.avatarUrl') || "//placehold.it/50x50"
+#     ).property('account.avatarUrl')
 
-    click: ->
-      @get('controller').transitionToRoute("account", @get('account.login'))
+#     click: ->
+#       @get('controller').transitionToRoute("account", @get('account.login'))
 
-`export default View`
+# `export default View`
diff --git a/app/views/profile.coffee b/app/views/profile.coffee
index f9a218b3..51cd06fb 100644
--- a/app/views/profile.coffee
+++ b/app/views/profile.coffee
@@ -5,8 +5,9 @@ View = BasicView.extend
   layoutName: 'layouts/profile'
   classNames: ['profile-view']
   accountBinding: 'controller.account'
-  subscribedBinding: 'account.subscribed'
-  educationBinding: 'account.education'
+  # Can we remove these?
+  # subscribedBinding: 'account.subscribed'
+  # educationBinding: 'account.education'
 
   name: (->
     @get('account.name') || @get('account.login')