suzanne.soy/travis-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #421 from travis-ci/lp-remove-deprecations

Browse Source 
Remove deprecations
This commit is contained in:
Piotr Sarnacki 2015-12-22 11:32:09 +01:00
commit 92935b626b
45 changed files with 175 additions and 349 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/components/org-item.coffee Normal file
View File

@ -0,0 +1,28 @@
`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: (->
@get('account.avatarUrl') || false
).property('account')
isUser: (->
@get('account.type') == 'user'
).property('account')
actions:
tokenVisibility: () ->
@toggleProperty('tokenIsVisible')
`export default OrgItemComponent`

4
app/components/repo-show-tabs.coffee
View File

@ -23,10 +23,6 @@ RepoShowTabsComponent = Ember.Component.extend
'active' if @get('tab') == 'branches'
).property('tab')
classEvents: (->
'active' if @get('tab') == 'events'
).property('tab')
classBuild: (->
tab = @get('tab')
classes = []

8
app/components/subscribe-button.coffee Normal file
View File

@ -0,0 +1,8 @@
`import Ember from 'ember'`
`import config from 'travis/config/environment'`
SubscribeButtonComponent = Ember.Component.extend
classNames: ['cta-btn']
`export default SubscribeButtonComponent`

10
app/controllers/account.coffee
View File

@ -50,9 +50,17 @@ Controller = Ember.Controller.extend
@config.show_repos_hint == 'public'
).property()
billingUrl: (->
billingUrl: ( ->
id = if @get('model.type') == 'user' then 'user' else @get('model.login')
"#{@config.billingEndpoint}/subscriptions/#{id}"
).property('model.name', 'model.login')
subscribeButtonInfo: (->
{
billingUrl: @get('billingUrl')
subscribed: @get('model.subscribed')
education: @get('model.education')
}
).property('model.login', 'model.type')
`export default Controller`

13
app/controllers/accounts.coffee
View File

@ -1,16 +1,5 @@
`import Ember from 'ember'`
Controller = Ember.ArrayController.extend
tab: 'accounts'
userName: (->
@get('user.name') || @get('user.login')
).property('user.login', 'user.name')
actions:
tokenVisibility: () ->
@toggleProperty('isVisible')
return false
Controller = Ember.ArrayController.extend()
`export default Controller`

2
app/controllers/build.coffee
View File

@ -14,7 +14,7 @@ Controller = Ember.Controller.extend GithubUrlPropertievs,
jobsLoaded: (->
if jobs = @get('build.jobs')
jobs.everyBy('config')
jobs.isEvery('config')
).property('build.jobs.@each.config')
loading: (->

1
app/controllers/job.coffee
View File

@ -6,7 +6,6 @@ Controller = Ember.Controller.extend
repoBinding: 'repoController.repo'
commitBinding: 'job.commit'
annotationsBinding: 'job.annotations'
currentUserBinding: 'auth.currentUser'
tabBinding: 'repoController.tab'

5
app/controllers/profile.coffee
View File

@ -21,9 +21,4 @@ Controller = Ember.Controller.extend
connectTab: (tab) ->
@set('tab', tab)
billingUrl: (->
id = if @get('account.type') == 'user' then 'user' else @get('account.login')
"#{@get('config').billingEndpoint}/subscriptions/#{id}"
).property('account.login', 'account.type')
`export default Controller`

3
app/controllers/top.coffee
View File

@ -13,7 +13,8 @@ Controller = Ember.Controller.extend
).property('user.login', 'user.name')
gravatarUrl: (->
"#{location.protocol}//www.gravatar.com/avatar/#{@get('user.gravatarId')}?s=48&d=mm"
if @get('user.gravatarId')
"#{location.protocol}//www.gravatar.com/avatar/#{@get('user.gravatarId')}?s=36&d=mm"
).property('user.gravatarId')
defineTowerColor: (broadcastArray) ->

33
app/helpers/label.coffee
View File

@ -1,33 +0,0 @@
`import Ember from 'ember'`
LabelView = Ember.View.extend(
tagName: 'label'
attributeBindings: ['for', 'accesskey', 'form']
classNameBindings: ['class']
)
label = (params, hash, options, env) ->
view = LabelView
controller = env.data.view.get('controller')
name = hash.for
if name
labels = controller.get('_labels')
unless labels
labels = Ember.Object.create()
controller.set('_labels', labels)
# for now I support only label + input in their own context
id = labels.get(name)
unless id
id = "#{name}-#{Math.round(Math.random() * 1000000)}"
labels.set(name, id)
hash.for = id
if hash.content
view = view.extend(templateName: 'helpers/label')
env.helpers.view.helperFunction.call(this, [view], hash, options, env)
`export default label`

7
app/routes/accounts.coffee
View File

@ -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`

10
app/routes/env-vars.coffee
View File

@ -1,10 +0,0 @@
`import TravisRoute from 'travis/routes/basic'`
Route = TravisRoute.extend
titleToken: 'Environment variables'
model: (params) ->
repo = @modelFor('repo')
repo.get('envVars.promise')
`export default Route`

2
app/styles/app.scss
View File

@ -12,7 +12,6 @@
@import "app/forms";
@import "app/github";
@import "app/main/annotations";
@import "app/userlike";
@import "app/main/log";
@ -43,6 +42,7 @@
@import "app/modules/forms";
@import "app/modules/notice";
@import "app/modules/build-header";
@import "app/modules/avatar";
@import "app/layout";
@import "app/layouts/dashboard";

7
app/styles/app/layouts/profile.sass
View File

@ -25,7 +25,7 @@
color: $grey-light
text-decoration: underline
@media #{$medium-up}
.profile-header, .sync-button, .ember-view
.profile-header, .sync-button
display: inline-block
vertical-align: middle
.sync-button
@ -128,9 +128,7 @@ p.profile-user-last
.profile-orglist
@media #{$large-up}
padding-right: 10em
aside
padding: 0
padding: 0 3em 0 0
.profile-hooklist
@include resetul
@ -138,7 +136,6 @@ p.profile-user-last
li
clear: both
margin-bottom: .8em
// overflow: auto
.profile-hooks
width: grid-calc(10, 24)
display: inline-block

17
app/styles/app/main/annotations.sass
View File

@ -1,17 +0,0 @@
#annotations
@include clearfix
margin: 8px 0 25px 12px
padding: 12px 0 0 0
a
text-decoration: underline
img
border: none
.annotation
float: left
min-height: 25px
margin: 0

43
app/styles/app/modules/avatar.sass Normal file
View File

@ -0,0 +1,43 @@
%avatar
position: relative
background-color: #a0a0a0
border-radius: 50%
overflow: hidden
&:before
content: ""
display: block
width: 40%
height: 40%
border-radius: 50%
background: $cream-light
position: absolute
top: 20%
margin: auto
left: 0
right: 0
&:after
content: ""
display: block
width: 66%
height: 70%
border-radius: 50%
background: $cream-light
position: absolute
top: 55%
margin: auto
left: 0
right: 0
.default-avatar--profile
@extend %avatar
width: 2.6rem
height: 2.6rem
.default-avatar--topbar
@extend %avatar
width: 2.7rem
height: 2.7rem
display: inline-block
vertical-align: middle
margin-left: 0.3em

2
app/templates/account.hbs
View File

@ -126,5 +126,3 @@
{{else}}
{{loading-indicator}}
{{/if}}

1
app/templates/accounts-list/empty.hbs
View File

@ -1 +0,0 @@
{{loading-indicator}}

12
app/templates/annotations/list.hbs
View File

@ -1,12 +0,0 @@
{{#if view.annotations}}
<div id="annotations">
{{#each annotation in view.annotations}}
<div class="annotation">
<a href={{annotation.url}}>
{{annotation.status}} {{annotation.providerName}}
</a>:
{{annotation.description}}
</div>
{{/each}}
</div>
{{/if}}

4
app/templates/build.hbs
View File

@ -4,10 +4,6 @@
{{build-header item=build user=auth.currentUser commit=commit repo=repo}}
{{#unless build.isMatrix}}
{{view 'annotations' annotations=build.jobs.firstObject.annotations}}
{{/unless}}
{{#if build.isMatrix}}
{{#if jobsLoaded}}
{{jobs-list jobs=build.requiredJobs repo=repo required="true"}}

2
app/templates/components/add-env-var.hbs
View File

@ -1,6 +1,6 @@
<form {{action "save" on="submit"}}>
<div class="form-elem">
{{input value=name class="env-name" on="key-up" action="nameChanged" placeholder="Name"}}
{{input value=name class="env-name" key-up="nameChanged" placeholder="Name"}}
{{#if nameIsBlank }}
<p class="form-error-message">Name cannot be blank</p>
{{/if}}

2
app/templates/components/limit-concurrent-builds.hbs
View File

@ -6,7 +6,7 @@
</a>
</div>
{{#if enabled}}
{{input pattern="/^[0-9]+$/" value=value on="key-up" action="limitChanged"}}
{{input pattern="/^[0-9]+$/" value=value key-up="limitChanged"}}
{{/if}}
{{#if isSaving}}
{{loading-indicator inline=true}}

27
app/templates/components/org-item.hbs Normal file
View File

@ -0,0 +1,27 @@
<div class="media-elem">
{{#if avatarUrl}}
<img src={{avatarUrl}} alt="{{name}} avatar">
{{else}}
<div class="default-avatar--profile"></div>
{{/if}}
</div>
<div class="media-body">
{{#link-to "account" account.login}}
<h2>{{name}}</h2>
{{#if account.reposCount}}<p>Repositories <strong>{{account.reposCount}}</strong></p>{{else}}No repositories{{/if}}
{{/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>

15
app/templates/components/subscribe-button.hbs Normal file
View File

@ -0,0 +1,15 @@
{{#if account.subscribed}}
<a class="btn btn-activated" href={{account.billingUrl}}>
Subscription active!
</a>
{{else}}
{{#if account.education}}
<a class="btn btn-activated" href={{account.billingUrl}}>
Educational account!
</a>
{{else}}
<a class="btn btn-activate" href={{account.billingUrl}}>
Sign up this account!
</a>
{{/if}}
{{/if}}

2
app/templates/dashboard/repositories.hbs
View File

@ -17,7 +17,7 @@
</section> --}}
<ul class="dashboard-active">
{{#each repo in filteredRepositories}}
{{#each filteredRepositories as |repo|}}
{{dashboard-row repo=repo}}
{{else}}
{{no-repos}}

34
app/templates/events/list.hbs
View File

@ -1,34 +0,0 @@
{{#if view.events.isLoaded}}
<table id="events" class="list">
<thead>
<tr>
<th>Time</th>
<th>Event</th>
<th>Result</th>
<th>Message</th>
</tr>
</thead>
<tbody>
{{#each event in view.events}}
{{#view "events-item" contextBinding="event"}}
<td class="created_at">
{{format-time createdAt}}
</td>
<td class="event">
{{event.event_}}
</td>
<td class="state">
{{event.state}}
</td>
<td class="message">
{{event.message}}
</td>
{{/view}}
{{/each}}
</tbody>
</table>
{{else}}
{{loading-indicator}}
{{/if}}

1
app/templates/helpers/label.hbs
View File

@ -1 +0,0 @@
{{view.content}}

2
app/templates/helpers/travis-errors.hbs
View File

@ -1 +1 @@
{{#each error in view.errors}}{{error.message}}{{/each}}
{{#each view.errors as |error|}}{{error.message}}{{/each}}

2
app/templates/job.hbs
View File

@ -2,8 +2,6 @@
{{build-header item=job user=auth.currentUser commit=job.commit repo=repo}}
{{view 'annotations' annotations=view.annotations}}
{{job-log job=job}}
{{else}}

85
app/templates/jobs.hbs
View File

@ -1,85 +0,0 @@
{{#if view.jobs.length}}
<section id={{view.jobTableId}}>
{{#if view.required}}
<h2 class="build-title">Build Jobs</h2>
{{else}}
<h2 class="build-title">Allowed Failures
<div class="tooltip--jobs">
<span class="icon icon--question"></span>
<p class="tooltip-bubble">These are jobs are allowed to fail, without failing your entire build.</p>
</div>
</h2>
{{/if}}
{{#each view.jobs as |job|}}
{{#view 'jobs-item' context=job}}
<div class="tile tile--jobs row {{job.state}}">
{{#if job.config}}
{{#link-to "job" job.repo job}}
<div class="tile-status tile-status--job">
<span class="icon icon--job {{job.state}}"></span>
</div>
<p class="job-id jobs-item build-status">
<span class="icon icon--hash-dark"></span>
{{#if job.id}}
{{#if job.repo.slug}}
{{number}}
{{/if}}
{{/if}}
</p>
<p class="job-os jobs-item build-os {{config.os}}">
<span class="icon {{config.os}}"></span>
{{!-- {{config.os}} --}}
</p>
{{#if view.languages}}
<p class="job-lang jobs-item build-lang">
<span class="icon icon--lang"></span>
{{view.languages}}
</p>
{{else}}
<p class="job-lang jobs-item build-lang is-empty">
<span class="icon icon--lang"></span>
no language set
</p>
{{/if}}
<div class="job-anchor jobs-item">
{{#if config.env}}
<p class="job-env jobs-item build-env">
<span class="icon icon--env"></span>
{{config.env}}
</p>
{{else}}
<p class="job-env jobs-item build-env is-empty">
<span class="icon icon--env"></span>
no environment variables set
</p>
{{/if}}
<p class="job-duration jobs-item" title={{startedAt}}>
<span class="icon icon--clock-dark"></span>
{{format-duration duration}}
</p>
</div>
{{!-- <p class="" title={{formattedFinishedAt}}>
<span class="icon icon--cal"></span>
{{format-time finishedAt}}
</p> --}}
{{/link-to}}
{{else}}
{{loading-indicator}}
{{/if}}
</div>
{{/view}}
{{!-- {{job.configKeys}} --}}
{{/each}}
</section>
{{/if}}

2
app/templates/owner/repositories.hbs
View File

@ -1,5 +1,5 @@
<ul class="owner-tiles">
{{#each repo in repos}}
{{#each repos as |repo|}}
{{owner-repo-tile repo=repo}}
{{else}}
{{no-repos}}

2
app/templates/owner/running.hbs
View File

@ -1,5 +1,5 @@
<ul class="owner-tiles">
{{#each repo in running}}
{{#each running as |repo|}}
{{owner-repo-tile repo=repo}}
{{else}}
<li>No running builds</li>

59
app/templates/profile/accounts.hbs
View File

@ -1,51 +1,20 @@
<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:
<section class="profile-orgs">
<ul>
{{org-item account=user}}
</ul>
<h1>Organizations</h1>
<ul>
{{#each organizations as |org|}}
{{org-item account=org}}
{{else}}
<li class="profile-text">You are not currently a member of <br> any organization.</li>
{{/each}}
</ul>
</section>
{{#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>
<section class="profile-orgs">
<h1>Organizations</h1>
{{#collection "accounts-list" contentBinding="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}}
{{else}}
<p class="profile-text">You are not currently a member of <br> any organization.</p>
{{/collection}}
</section>
{{#if config.githubOrgsOauthAccessSettingsUrl}}
<section class="profile-additional">
<p>Is an organization missing?<br>
<a href={{config.githubOrgsOauthAccessSettingsUrl}} title="Orgs Oauth Access Settings on GitHub">Review and add</a> your authorized organizations.</p>
<a href={{config.githubOrgsOauthAccessSettingsUrl}} title="Organizations Oauth Access Settings on GitHub">Review and add</a> your authorized organizations.</p>
</section>
{{/if}}
</aside>

3
app/templates/repo.hbs
View File

@ -1,4 +1,3 @@
{{#if view.isEmpty}}
{{repos-empty}}
{{else}}
@ -39,4 +38,4 @@
{{else}}
{{loading-indicator}}
{{/if}}
{{/if}}
{{/if}}

1
app/templates/repos/show/tabs.hbs
View File

@ -1 +0,0 @@

1
app/templates/repos/show/tools.hbs
View File

@ -1 +0,0 @@

6
app/templates/status-images.hbs
View File

@ -2,13 +2,13 @@
<p>
<label>Branch:</label>
{{#if view.branches.isLoaded}}
{{view Ember.Select contentBinding="view.branches" selectionBinding="view.statusImageBranch" optionLabelPath="content.commit.branch" optionValuePath="content.commit.branch"}}
{{view Ember.Select content="view.branches" selection="view.statusImageBranch" optionLabelPath="content.commit.branch" optionValuePath="content.commit.branch"}}
{{else}}
{{loading-indicator}}
{{/if}}
</p>
<p>
<label>{{view Ember.Select contentBinding="view.formats" selectionBinding="view.statusImageFormat"}}</label>
{{view 'status-image-input' valueBinding="view.statusString" class="url" rows=3}}
<label>{{view Ember.Select content="view.formats" selection="view.statusImageFormat"}}</label>
{{view 'status-image-input' value="view.statusString" class="url" rows=3}}
</p>

3
app/templates/top.hbs
View File

@ -56,7 +56,8 @@
<button class="signed-out button--signin" {{action "signIn" target="auth"}}>Sign in with GitHub</button>
{{/if}}
{{#if auth.signedIn}}
{{#link-to "profile" class="navigation-anchor signed-in"}}{{userName}}<img src={{gravatarUrl}} />
{{#link-to "profile" class="navigation-anchor signed-in"}}{{userName}}
{{#if gravatarUrl }}<img src={{gravatarUrl}} />{{else}}<div class="default-avatar--topbar"></div>{{/if}}
{{/link-to}}
{{/if}}
{{#if auth.signingIn}}

35
app/views/accounts-list.coffee
View File

@ -1,35 +0,0 @@
`import Ember from 'ember'`
`import { account as accountUrl } from 'travis/utils/urls'`
View = Ember.CollectionView.extend
elementId: 'accounts'
accountBinding: 'content'
tagName: 'ul'
emptyView: Ember.View.extend
templateName: 'accounts-list/empty'
itemViewClass: Ember.View.extend
accountBinding: 'content'
typeBinding: 'content.type'
selectedBinding: 'account.selected'
classNames: ['account']
classNameBindings: ['type', 'selected']
name: (->
@get('content.name') || @get('content.login')
).property('content.login', 'content.name')
urlAccount: (->
accountUrl(@get('account.login'))
).property('account.login')
avatarUrl: (->
@get('account.avatarUrl') || "//placehold.it/50x50"
).property('account.avatarUrl')
click: ->
@get('controller').transitionToRoute("account", @get('account.login'))
`export default View`

6
app/views/annotation.coffee
View File

@ -1,6 +0,0 @@
`import BasicView from 'travis/views/basic'`
View = BasicView.extend
templateName: 'annotations/list'
`export default View`

5
app/views/annotations.coffee
View File

@ -1,5 +0,0 @@
`import Ember from 'ember'`
View = Ember.View.extend()
`export default View`

1
app/views/job.coffee
View File

@ -9,7 +9,6 @@ View = Ember.View.extend Polling,
repoBinding: 'controller.repo'
jobBinding: 'controller.job'
commitBinding: 'job.commit'
annotationsBinding: 'job.annotations'
currentItemBinding: 'job'

7
app/views/profile-accounts.coffee
View File

@ -2,11 +2,8 @@
View = BasicView.extend
tabBinding: 'controller.tab'
classNames: ['profile-orglist']
classNames: ['profile-orglist', 'columns', 'medium-4']
tagName: 'aside'
templateName: 'profile/accounts'
classAccounts: (->
'active' if @get('tab') == 'accounts'
).property('tab')
`export default View`

5
app/views/profile.coffee
View File

@ -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')

4
app/views/repo-show-tabs.coffee
View File

@ -23,10 +23,6 @@ View = Ember.View.extend
'active' if @get('tab') == 'branches'
).property('tab')
classEvents: (->
'active' if @get('tab') == 'events'
).property('tab')
classBuild: (->
tab = @get('tab')
classes = []