fix owner routes and tabs
This commit is contained in:
parent
ff107384c2
commit
1fb4a868be
|
@ -17,35 +17,19 @@ Controller = Ember.Controller.extend
|
||||||
|
|
||||||
owner: (->
|
owner: (->
|
||||||
data = @get('model')
|
data = @get('model')
|
||||||
|
|
||||||
{
|
{
|
||||||
login: data.login
|
login: data.login
|
||||||
name: data.name
|
name: data.name
|
||||||
isSyncing: data.is_syncing
|
isSyncing: data.is_syncing
|
||||||
avatarUrl: data.avatar_url
|
avatarUrl: data.avatar_url
|
||||||
syncedAt: data.synced_at
|
syncedAt: data.synced_at
|
||||||
|
builds: {
|
||||||
|
all: 'nope'
|
||||||
|
started: 'nope'
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
).property('model')
|
).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`
|
`export default Controller`
|
||||||
|
|
28
app/controllers/owner/repositories.coffee
Normal file
28
app/controllers/owner/repositories.coffee
Normal file
|
@ -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`
|
|
@ -4,8 +4,15 @@
|
||||||
Controller = Ember.Controller.extend
|
Controller = Ember.Controller.extend
|
||||||
isLoading: false
|
isLoading: false
|
||||||
|
|
||||||
test: ->
|
running: (->
|
||||||
console.log('CONTROLLER')
|
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`
|
`export default Controller`
|
||||||
|
|
|
@ -72,6 +72,7 @@ Router.map ->
|
||||||
@route 'info', path: '/info'
|
@route 'info', path: '/info'
|
||||||
|
|
||||||
@resource 'owner', path: '/:owner', ->
|
@resource 'owner', path: '/:owner', ->
|
||||||
|
@route 'repositories', path: '/'
|
||||||
@route 'running', path: '/running'
|
@route 'running', path: '/running'
|
||||||
|
|
||||||
@route 'error404', path: '/*path'
|
@route 'error404', path: '/*path'
|
||||||
|
|
|
@ -10,6 +10,6 @@ Route = TravisRoute.extend
|
||||||
"#{model.name}"
|
"#{model.name}"
|
||||||
|
|
||||||
model: (params) ->
|
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`
|
`export default Route`
|
||||||
|
|
15
app/routes/owner/repositories.coffee
Normal file
15
app/routes/owner/repositories.coffee
Normal file
|
@ -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`
|
|
@ -1,9 +1,15 @@
|
||||||
`import Ember from 'ember'`
|
`import Ember from 'ember'`
|
||||||
`import TravisRoute from 'travis/routes/basic'`
|
`import TravisRoute from 'travis/routes/basic'`
|
||||||
|
`import Ajax from 'travis/utils/ajax'`
|
||||||
`import config from 'travis/config/environment'`
|
`import config from 'travis/config/environment'`
|
||||||
|
|
||||||
Route = TravisRoute.extend
|
Route = TravisRoute.extend
|
||||||
model: ->
|
needsAuth: false
|
||||||
console.log('This is the RUNNING route')
|
|
||||||
|
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`
|
`export default Route`
|
||||||
|
|
|
@ -109,6 +109,21 @@
|
||||||
.tabs--owner
|
.tabs--owner
|
||||||
padding : 0 $column-gutter/2
|
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
|
.tabnav--owner
|
||||||
margin-bottom: 1.5rem
|
margin-bottom: 1.5rem
|
||||||
@media #{$medium-up}
|
@media #{$medium-up}
|
||||||
|
|
|
@ -12,34 +12,17 @@
|
||||||
<div class="tabs--owner">
|
<div class="tabs--owner">
|
||||||
<nav class="tabnav tabnav--owner row" role="tablist">
|
<nav class="tabnav tabnav--owner row" role="tablist">
|
||||||
<ul class="tab">
|
<ul class="tab">
|
||||||
<li role="presentational">{{#link-to 'owner' owner.login}}All Repositories{{/link-to}}</li>
|
<li role="presentational">{{#link-to 'owner.repositories' owner.login}}All Repositories{{/link-to}}</li>
|
||||||
<li role="presentational">{{#link-to 'owner.running' owner.login}}Running Builds (2/5){{/link-to}}</li>
|
<li role="presentational">{{#link-to 'owner.running' owner.login}}Running Builds ({{owner.builds.started}}/{{owner.builds.all}}){{/link-to}}</li>
|
||||||
{{!-- <li role="presentational"><a href="#" title="" role="tab">Members</a></li> --}}
|
{{!-- <li role="presentational"><a href="#" title="" role="tab">Members</a></li> --}}
|
||||||
</ul>
|
</ul>
|
||||||
</nav>
|
</nav>
|
||||||
|
|
||||||
<div class="tabbody">
|
<div class="tabbody">
|
||||||
|
|
||||||
<section role="tabpanel">
|
<section role="tabpanel">
|
||||||
<ul class="owner-tiles">
|
{{outlet}}
|
||||||
{{#each repo in repos}}
|
|
||||||
{{owner-repo-tile repo=repo}}
|
|
||||||
{{else}}
|
|
||||||
<li>No active repos</li>
|
|
||||||
{{/each}}
|
|
||||||
</ul>
|
|
||||||
</section>
|
</section>
|
||||||
|
|
||||||
{{!-- <section role="tabpanel">
|
|
||||||
<ul class="owner-tiles">
|
|
||||||
{{#each repo in running}}
|
|
||||||
{{owner-repo-tile repo=repo}}
|
|
||||||
{{else}}
|
|
||||||
<li>No running builds</li>
|
|
||||||
{{/each}}
|
|
||||||
</ul>
|
|
||||||
</section>
|
|
||||||
--}}
|
|
||||||
{{!-- <section role="tabpanel">
|
{{!-- <section role="tabpanel">
|
||||||
<ul class="memberlist">
|
<ul class="memberlist">
|
||||||
<li class="columns small-6 large-4">
|
<li class="columns small-6 large-4">
|
||||||
|
|
7
app/templates/owner/repositories.hbs
Normal file
7
app/templates/owner/repositories.hbs
Normal file
|
@ -0,0 +1,7 @@
|
||||||
|
<ul class="owner-tiles">
|
||||||
|
{{#each repo in repos}}
|
||||||
|
{{owner-repo-tile repo=repo}}
|
||||||
|
{{else}}
|
||||||
|
<li>No active repos</li>
|
||||||
|
{{/each}}
|
||||||
|
</ul>
|
|
@ -1 +1,7 @@
|
||||||
hello
|
<ul class="owner-tiles">
|
||||||
|
{{#each repo in running}}
|
||||||
|
{{owner-repo-tile repo=repo}}
|
||||||
|
{{else}}
|
||||||
|
<li>No running builds</li>
|
||||||
|
{{/each}}
|
||||||
|
</ul>
|
||||||
|
|
|
@ -1,7 +0,0 @@
|
||||||
`import Ember from 'ember'`
|
|
||||||
|
|
||||||
View = Ember.View.extend
|
|
||||||
layoutName: 'layouts/profile'
|
|
||||||
classNames: ['owner', 'running']
|
|
||||||
|
|
||||||
`export default View`
|
|
Loading…
Reference in New Issue
Block a user