Skip to content
This repository was archived by the owner on Jun 30, 2023. It is now read-only.

Commit 1fffec0

Browse files
authored
Merge pull request #311 from opensource-challenge/dependency-updates
update dependencies and resolve deprication warnings
2 parents 203a0d2 + ad01073 commit 1fffec0

File tree

12 files changed

+5284
-3464
lines changed

12 files changed

+5284
-3464
lines changed

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,5 @@ env:
2727
- PERCY_PROJECT=opensource-challenge/opensource-challenge-client
2828
- secure: PkKoqLSXvLiCmD8dzPVw/klJ6QfT4y4Unl6sWwDZZH5mrGDT1/vqdR8lS4G9X65ICQg27rRVwly6tv5o+sXQFQlXMpEiGO7RXncIHHMRD/sF3PTnGVopyQq1jFHqFEHOAbKXvwVRuIilUR+OGhdyLk6NHt+/9MgHSR2Y0+B1XxheC6eltRUsdzYCQiT7U5WBaeGpIznkCLithtc7VsZudbnsR3iVuKVvpKXOQ5MJabyrS3lR7onfyzRmqwQKx7Mc0DaLFalO0UnwO3z09K/ER30nzrHTR9hNEh8DUItsxELQKGU4AxOw3AsexJkbhpwdNSt3+4F5uOh0+YnqMYcn7EPXv4OWVK6bNpe/UUxppuwTSSdrnbM1EB79kZn5jyZLrC0Q6x+X1vF70mlz/GYQ3IySVk1zKny7GkxpCnmjoAM90CzK9NoqRhYYDKBegWeRXSGCG4P5nqyo73ic1JLmnOTWw/IYb97JEFXc1vIySTqleqUj+q6DHleJ+6Fls6IBUCMr3HXsj5VXfnwSlxRMB3gu9RgNQIr4Z8UK7zsWTgvmK6ZOzabeIyf74kMgrbmh8rJSY4vDEHnwxfq2DyVHc4/XjTVeJF40WgAdu2XjB75MefrZLLrTDDhdxCzL1vBiIWdpWsswp3gMkdCJaJ8EsThh7Luy5G6OreJb6Ibo3yw=
2929
matrix:
30-
- COVERAGE=true CODECLIMATE_REPO_TOKEN=9e087f07cf44e07584de87390bc3e55de61e1523afe675df9c8f4d6ba7fba38b
30+
# Disable coverage for now (See https://github.com/kategengler/ember-cli-code-coverage/issues/296)
31+
- COVERAGE=false CODECLIMATE_REPO_TOKEN=9e087f07cf44e07584de87390bc3e55de61e1523afe675df9c8f4d6ba7fba38b

app/adapters/application.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@ import { assign } from '@ember/polyfills'
22
import { inject as service } from '@ember/service'
33
import { isPresent } from '@ember/utils'
44
import ENV from '../config/environment'
5-
import DS from 'ember-data'
5+
import JSONAPIAdapter from '@ember-data/adapter/json-api'
66
import DataAdapterMixin from 'ember-simple-auth/mixins/data-adapter-mixin'
77

8-
const { JSONAPIAdapter } = DS
98
const TIMEOUT = 10000
109

1110
export default JSONAPIAdapter.extend(DataAdapterMixin, {

app/components/calendar-entry/component.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,6 @@ export default Component.extend({
88
'https://www.puzzle.ch/wp-content/uploads/2015/11/Tux-960x720.jpg',
99

1010
picture: computed('item.user.picture', function() {
11-
return this.getWithDefault('item.user.picture', this.fallbackPicture)
11+
return this.get('item.user.picture') || this.fallbackPicture
1212
}),
1313
})

app/components/calendar-entry/template.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{{#with this.item.user as |user|}}
22
<header>
33
{{#link-to "contributors.profile" user class="avatar-wrapper"}}
4-
<img class="avatar" src={{this.picture}} alt="">
4+
<img class="avatar" src={{this.picture}} alt="avatar">
55
<div class="username">{{user.name}}</div>
66
{{/link-to}}
77
</header>

app/components/contribution-calendar/component.js

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,18 @@ import groupBy from '../../utils/group-by-macro'
66

77
export default Component.extend({
88
archive: null,
9-
10-
challenge: computed(() => ({
11-
startsOn: '2100-12-01',
12-
endsOn: '2100-12-24',
13-
active: true,
14-
})),
9+
_challenge: null,
10+
11+
set challenge(value) {
12+
this._challenge = value
13+
},
14+
get challenge() {
15+
return this._challenge || {
16+
startsOn: '2100-12-01',
17+
endsOn: '2100-12-24',
18+
active: true,
19+
}
20+
},
1521

1622
sortedItems: sort(
1723
'items.[]',

app/components/contributor-list/template.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<img
1515
class="contributor__image hover-box__content"
1616
src={{contributor.picture}}
17-
alt=""
17+
alt="contributor"
1818
>
1919
{{/link-to}}
2020
</div>

app/components/display-error/template.hbs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{{#if this.messageIsHTMLDocument}}
2-
<iframe srcdoc={{this.error.message}}></iframe>
2+
<iframe srcdoc={{this.error.message}} title="error message"></iframe>
33
{{else if this.error.isAdapterError}}
44
<pre class="error">{{this.error.message}}</pre>
55
{{else if this.error.errors}}
@@ -18,7 +18,7 @@
1818
{{/if}}
1919

2020
{{#if this.error.stack}}
21-
<button class="btn-primary" onclick={{toggle "showStack" this}}>
21+
<button class="btn-primary" onclick={{toggle "showStack" this}} type="button">
2222
Show stack
2323
</button>
2424

app/models/challenge.js

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { not } from '@ember/object/computed'
2-
import { computed } from '@ember/object'
32
import DS from 'ember-data'
43

54
const { Model, attr, hasMany } = DS
@@ -11,10 +10,8 @@ export default Model.extend({
1110
startsOn: attr('date'),
1211
endsOn: attr('date'),
1312
closed: attr('boolean'),
14-
15-
active: computed('startsOn', function() {
13+
get active() {
1614
return Date.now() >= this.startsOn
17-
}).volatile(),
18-
15+
},
1916
open: not('closed').readOnly(),
2017
})

app/templates/contributors/profile.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<section class="content content-padding">
22
<div class="layout-row contributor-profile-details">
33
{{#with this.model.picture as |picture|}}
4-
<img class="contributor-profile-picture" src={{picture}} alt="">
4+
<img class="contributor-profile-picture" src={{picture}} alt="contributor">
55
{{/with}}
66
<div>
77
<h1>{{this.model.name}}</h1>

app/templates/login.hbs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
{{f.submit "Login"}}
77
{{/form-for--}}
88
<p class="text-center">
9-
<button class="btn-primary" onclick={{route-action "loginWithGithub"}}>
9+
<button class="btn-primary" onclick={{route-action "loginWithGithub"}} type="button">
1010
{{fa-icon "github"}} Login with Github
1111
</button>
1212
</p>

0 commit comments

Comments
 (0)