From 6dc3dd357e395f883f09397d9b4aecefaf6a5038 Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Mon, 20 Apr 2015 15:37:34 +0200 Subject: [PATCH] add more owner functionality --- ...button.coffee => owner-sync-button.coffee} | 0 app/controllers/owner.coffee | 22 +++++++++++++++++++ app/router.coffee | 2 +- app/routes/owner.coffee | 20 +++++++++++++++++ ...-sync-button.hbs => owner-sync-button.hbs} | 4 ++-- app/templates/{ownerpage.hbs => owner.hbs} | 10 +++++---- app/views/{ownerpage.coffee => owner.coffee} | 2 +- 7 files changed, 52 insertions(+), 8 deletions(-) rename app/components/{ownerpage-sync-button.coffee => owner-sync-button.coffee} (100%) create mode 100644 app/controllers/owner.coffee create mode 100644 app/routes/owner.coffee rename app/templates/components/{ownerpage-sync-button.hbs => owner-sync-button.hbs} (76%) rename app/templates/{ownerpage.hbs => owner.hbs} (92%) rename app/views/{ownerpage.coffee => owner.coffee} (79%) diff --git a/app/components/ownerpage-sync-button.coffee b/app/components/owner-sync-button.coffee similarity index 100% rename from app/components/ownerpage-sync-button.coffee rename to app/components/owner-sync-button.coffee diff --git a/app/controllers/owner.coffee b/app/controllers/owner.coffee new file mode 100644 index 00000000..50c0a889 --- /dev/null +++ b/app/controllers/owner.coffee @@ -0,0 +1,22 @@ +`import Ember from 'ember'` +`import Ajax from 'travis/utils/ajax'` + +Controller = Ember.Controller.extend + isLoading: false + + githubProfile: (-> + "https://github.com/#{@get('model.login')}" + ).property() + + avatarURL: (-> + if @get('model.avatar_url') + "#{@get('model.avatar_url')}?s=128" + else + 'https://secure.gravatar.com/avatar/?d=mm&s=128' + ).property() + + owner: (-> + @get('model') + ).property('model') + +`export default Controller` diff --git a/app/router.coffee b/app/router.coffee index 0d43e7ed..547239e3 100644 --- a/app/router.coffee +++ b/app/router.coffee @@ -71,7 +71,7 @@ Router.map -> @resource 'account', path: '/:login' @route 'info', path: '/info' - @route 'ownerpage', path: 'ownerpage' + @resource 'owner', path: 'owner/:owner' @route 'error404', path: '/*path' diff --git a/app/routes/owner.coffee b/app/routes/owner.coffee new file mode 100644 index 00000000..512a707c --- /dev/null +++ b/app/routes/owner.coffee @@ -0,0 +1,20 @@ +`import Ember from 'ember'` +`import TravisRoute from 'travis/routes/basic'` +`import Ajax from 'travis/utils/ajax'` + +Route = TravisRoute.extend + needsAuth: true + # controllerName: 'owner' + + model: (params) -> + owner = {} + + $.get("https://api-staging.travis-ci.org/v3/owner/#{params.owner}").then( (data) -> + console.log('******************') + + owner = data + console.log(owner) + owner + ) + +`export default Route` diff --git a/app/templates/components/ownerpage-sync-button.hbs b/app/templates/components/owner-sync-button.hbs similarity index 76% rename from app/templates/components/ownerpage-sync-button.hbs rename to app/templates/components/owner-sync-button.hbs index a1be7504..3e77fa75 100644 --- a/app/templates/components/ownerpage-sync-button.hbs +++ b/app/templates/components/owner-sync-button.hbs @@ -1,5 +1,5 @@
- {{#if user.isSyncing }} + {{#if owner.is_syncing }}

-

last synced {{format-time user.syncedAt}}

+

last synced {{format-time owner.synced_at}}

{{/if}}
diff --git a/app/templates/ownerpage.hbs b/app/templates/owner.hbs similarity index 92% rename from app/templates/ownerpage.hbs rename to app/templates/owner.hbs index 2a04c360..325b8e82 100644 --- a/app/templates/ownerpage.hbs +++ b/app/templates/owner.hbs @@ -4,12 +4,14 @@
- +
-

Travis CI GmbH

-

travis-pro

- {{ownerpage-sync-button}} +

{{owner.name}}

+ + {{!-- TODO: only sync btn if user part of org --}} +

{{owner.login}}

+ {{owner-sync-button owner=owner}}
diff --git a/app/views/ownerpage.coffee b/app/views/owner.coffee similarity index 79% rename from app/views/ownerpage.coffee rename to app/views/owner.coffee index 538a538b..49b5bf65 100644 --- a/app/views/ownerpage.coffee +++ b/app/views/owner.coffee @@ -2,6 +2,6 @@ View = Ember.View.extend layoutName: 'layouts/profile' - classNames: ['ownerpage'] + classNames: ['owner'] `export default View`