From 1fb4a868be2b1d93fa20616f2807a5630c7ef07b Mon Sep 17 00:00:00 2001 From: Lisa Passing Date: Tue, 12 May 2015 13:24:01 +0200 Subject: [PATCH] fix owner routes and tabs --- app/controllers/owner.coffee | 26 ++++----------------- app/controllers/owner/repositories.coffee | 28 +++++++++++++++++++++++ app/controllers/owner/running.coffee | 11 +++++++-- app/router.coffee | 1 + app/routes/owner.coffee | 2 +- app/routes/owner/repositories.coffee | 15 ++++++++++++ app/routes/owner/running.coffee | 10 ++++++-- app/styles/app/layouts/owner.sass | 15 ++++++++++++ app/templates/owner.hbs | 23 +++---------------- app/templates/owner/repositories.hbs | 7 ++++++ app/templates/owner/running.hbs | 8 ++++++- app/views/owner/running.coffee | 7 ------ 12 files changed, 99 insertions(+), 54 deletions(-) create mode 100644 app/controllers/owner/repositories.coffee create mode 100644 app/routes/owner/repositories.coffee create mode 100644 app/templates/owner/repositories.hbs delete mode 100644 app/views/owner/running.coffee diff --git a/app/controllers/owner.coffee b/app/controllers/owner.coffee index a60b6544..0e9339a8 100644 --- a/app/controllers/owner.coffee +++ b/app/controllers/owner.coffee @@ -17,35 +17,19 @@ Controller = Ember.Controller.extend owner: (-> data = @get('model') + { login: data.login name: data.name isSyncing: data.is_syncing avatarUrl: data.avatar_url syncedAt: data.synced_at + builds: { + all: 'nope' + started: 'nope' + } } ).property('model') - repos: (-> - data = @get('model') - - repos = data.repositories.filter (item, index) -> - if item.default_branch.last_build - item - repos.sortBy('default_branch.last_build.finished_at').reverse() - - ).property('model') - - running: (-> - data = @get('model') - - repos = data.repositories.filter (item, index) -> - if item.default_branch.last_build != null - if item.default_branch.last_build.state == 'started' - item - repos - - ).property('model') - `export default Controller` diff --git a/app/controllers/owner/repositories.coffee b/app/controllers/owner/repositories.coffee new file mode 100644 index 00000000..7a3d4664 --- /dev/null +++ b/app/controllers/owner/repositories.coffee @@ -0,0 +1,28 @@ +`import Ember from 'ember'` +`import Ajax from 'travis/utils/ajax'` + +Controller = Ember.Controller.extend + isLoading: false + + repos: (-> + data = @get('model') + + repos = data.repositories.filter (item, index) -> + if item.default_branch.last_build + item + repos.sortBy('default_branch.last_build.finished_at').reverse() + + ).property('model') + + # running: (-> + # data = @get('model') + + # repos = data.repositories.filter (item, index) -> + # if item.default_branch.last_build != null + # if item.default_branch.last_build.state == 'started' + # item + # repos + + # ).property('model') + +`export default Controller` diff --git a/app/controllers/owner/running.coffee b/app/controllers/owner/running.coffee index ea9b639d..33f2ac9f 100644 --- a/app/controllers/owner/running.coffee +++ b/app/controllers/owner/running.coffee @@ -4,8 +4,15 @@ Controller = Ember.Controller.extend isLoading: false - test: -> - console.log('CONTROLLER') + running: (-> + data = @get('model') + repos = data.repositories.filter (item, index) -> + if item.default_branch.last_build != null + if item.default_branch.last_build.state == 'started' + item + repos + + ).property('model') `export default Controller` diff --git a/app/router.coffee b/app/router.coffee index ad35425b..2e8c93c2 100644 --- a/app/router.coffee +++ b/app/router.coffee @@ -72,6 +72,7 @@ Router.map -> @route 'info', path: '/info' @resource 'owner', path: '/:owner', -> + @route 'repositories', path: '/' @route 'running', path: '/running' @route 'error404', path: '/*path' diff --git a/app/routes/owner.coffee b/app/routes/owner.coffee index fdf1343e..6ad01e2a 100644 --- a/app/routes/owner.coffee +++ b/app/routes/owner.coffee @@ -10,6 +10,6 @@ Route = TravisRoute.extend "#{model.name}" model: (params) -> - $.get(config.apiEndpoint + "/v3/owner/#{params.owner}?include=user.repositories,organization.repositories,build.commit,repository.active") + $.get(config.apiEndpoint + "/v3/owner/#{params.owner}") `export default Route` diff --git a/app/routes/owner/repositories.coffee b/app/routes/owner/repositories.coffee new file mode 100644 index 00000000..11fca69b --- /dev/null +++ b/app/routes/owner/repositories.coffee @@ -0,0 +1,15 @@ +`import Ember from 'ember'` +`import TravisRoute from 'travis/routes/basic'` +`import Ajax from 'travis/utils/ajax'` +`import config from 'travis/config/environment'` + +Route = TravisRoute.extend + needsAuth: false + + titleToken: (model) -> + "#{model.name}" + + model: (params, transition) -> + $.get(config.apiEndpoint + "/v3/owner/#{transition.params.owner.owner}?include=user.repositories,organization.repositories,build.commit,repository.active") + +`export default Route` diff --git a/app/routes/owner/running.coffee b/app/routes/owner/running.coffee index 3ac10169..11fca69b 100644 --- a/app/routes/owner/running.coffee +++ b/app/routes/owner/running.coffee @@ -1,9 +1,15 @@ `import Ember from 'ember'` `import TravisRoute from 'travis/routes/basic'` +`import Ajax from 'travis/utils/ajax'` `import config from 'travis/config/environment'` Route = TravisRoute.extend - model: -> - console.log('This is the RUNNING route') + needsAuth: false + + titleToken: (model) -> + "#{model.name}" + + model: (params, transition) -> + $.get(config.apiEndpoint + "/v3/owner/#{transition.params.owner.owner}?include=user.repositories,organization.repositories,build.commit,repository.active") `export default Route` diff --git a/app/styles/app/layouts/owner.sass b/app/styles/app/layouts/owner.sass index 5f6a9f6b..be87cf57 100644 --- a/app/styles/app/layouts/owner.sass +++ b/app/styles/app/layouts/owner.sass @@ -109,6 +109,21 @@ .tabs--owner padding : 0 $column-gutter/2 + .active, + .active:hover, + position: relative + color: $teal2 + &:after + content: "" + position: absolute + left: 0 + bottom: -0.25em + width: 100% + height: 2px + background-color: $teal1 + .active + font-weight: 600 + .tabnav--owner margin-bottom: 1.5rem @media #{$medium-up} diff --git a/app/templates/owner.hbs b/app/templates/owner.hbs index 5ac2f1ae..fb733fc4 100644 --- a/app/templates/owner.hbs +++ b/app/templates/owner.hbs @@ -12,34 +12,17 @@
-
-
    - {{#each repo in repos}} - {{owner-repo-tile repo=repo}} - {{else}} -
  • No active repos
    • - {{/each}} -
+ {{outlet}}
-{{!--
-
    - {{#each repo in running}} - {{owner-repo-tile repo=repo}} - {{else}} -
  • No running builds
    • - {{/each}} -
-
- --}} {{!--
  • diff --git a/app/templates/owner/repositories.hbs b/app/templates/owner/repositories.hbs new file mode 100644 index 00000000..82d8a85e --- /dev/null +++ b/app/templates/owner/repositories.hbs @@ -0,0 +1,7 @@ +
      + {{#each repo in repos}} + {{owner-repo-tile repo=repo}} + {{else}} +
    • No active repos
      • + {{/each}} +
    diff --git a/app/templates/owner/running.hbs b/app/templates/owner/running.hbs index b6fc4c62..29ba999a 100644 --- a/app/templates/owner/running.hbs +++ b/app/templates/owner/running.hbs @@ -1 +1,7 @@ -hello \ No newline at end of file +
      + {{#each repo in running}} + {{owner-repo-tile repo=repo}} + {{else}} +
    • No running builds
      • + {{/each}} +
    diff --git a/app/views/owner/running.coffee b/app/views/owner/running.coffee deleted file mode 100644 index 400a4bc5..00000000 --- a/app/views/owner/running.coffee +++ /dev/null @@ -1,7 +0,0 @@ -`import Ember from 'ember'` - -View = Ember.View.extend - layoutName: 'layouts/profile' - classNames: ['owner', 'running'] - -`export default View`