Skip to content

Commit e0b933c

Browse files
chore: Release v1.10.0
2 parents 4862912 + 98f7251 commit e0b933c

File tree

155 files changed

+4749
-3292
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

155 files changed

+4749
-3292
lines changed

.eslintrc.js

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ module.exports = {
66
sourceType: 'module'
77
},
88
plugins: [
9-
'ember'
9+
'ember',
10+
'ember-suave'
1011
],
1112
extends: [
1213
'eslint:recommended',
@@ -66,10 +67,16 @@ module.exports = {
6667
'new-cap': 'off',
6768
'eqeqeq': ['error', 'smart'],
6869
'one-var': 'off',
70+
'padding-line-between-statements': 'off',
71+
'lines-between-class-members': ['error', "always", { exceptAfterSingleLine: true }],
6972
'ember-suave/no-const-outside-module-scope': 'off',
7073
'ember-suave/require-access-in-comments': 'off',
74+
'ember-suave/lines-between-object-properties': 'off',
7175
'ember/no-get': 'error',
72-
'ember/no-get-properties': 'error',
76+
// TODO: Re-enable later
77+
'no-duplicate-imports': 'warn',
78+
'no-await-in-loop': 'warn',
79+
'import/no-relative-parent-imports': 'warn',
7380
},
7481
globals: {
7582
module : true,

.template-lintrc.js

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,14 @@ module.exports = {
66
rules: {
77
'no-nested-interactive': {
88
ignoredTags: ['label'] // Allow label tag inside a or any other interactive element
9-
}
9+
},
10+
'link-rel-noopener': true,
11+
// TODO: Remove and fix
12+
'require-button-type': false,
13+
'no-partial': false,
14+
'require-valid-alt-text': false,
15+
'no-inline-styles': false,
16+
'no-negated-condition': false,
17+
'no-invalid-meta': false // Crashing the linter https://github.com/ember-template-lint/ember-template-lint/pull/1087
1018
}
1119
};

.travis.yml

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,6 @@ language: node_js
33
node_js:
44
- "12"
55

6-
7-
# sudo: required
8-
9-
# services:
10-
# - docker
11-
126
env:
137
- CXX=g++-4.8 JOBS=1 PATH=$PATH:${HOME}/google-cloud-sdk/bin CLOUDSDK_CORE_DISABLE_PROMPTS=1
148

@@ -25,10 +19,7 @@ addons:
2519

2620
before_install:
2721
- export PATH="$(yarn global bin):$PATH"
28-
- yarn global add greenkeeper-lockfile@1
2922

30-
before_script: greenkeeper-lockfile-update
31-
after_script: greenkeeper-lockfile-upload
3223
install: yarn
3324

3425
script:
@@ -37,11 +28,10 @@ script:
3728
- yarn lint:scss
3829
- COVERAGE=true yarn test
3930
- ROOT_URL=open-event-frontend ember build -prod
31+
- bash scripts/test_fastboot.sh
4032

4133
after_success:
4234
- 'bash <(curl -s https://codecov.io/bash)'
43-
- bash kubernetes/travis/docker-deploy.sh
44-
# - bash kubernetes/travis/k8s-deploy.sh
4535

4636
deploy:
4737
provider: pages
@@ -51,3 +41,8 @@ deploy:
5141
local-dir: dist/
5242
on:
5343
branch: development
44+
45+
branches:
46+
only:
47+
- master
48+
- development

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ COPY --from=builder /app/dist/ dist/
2929
RUN apk add --no-cache ca-certificates && \
3030
cp dist/package.json . && \
3131
yarn install && \
32-
yarn add fastboot-app-server dotenv lodash safe-eval && \
32+
yarn add fastboot-app-server dotenv lodash && \
3333
rm -rf yarn.lock && \
3434
yarn cache clean
3535

app/adapters/application.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { computed } from '@ember/object';
33
import ENV from 'open-event-frontend/config/environment';
44
import JSONAPIAdapter from 'ember-data/adapters/json-api';
55
import HasManyQueryAdapterMixin from 'ember-data-has-many-query/mixins/rest-adapter';
6-
import AdapterFetch from 'ember-fetch/mixins/adapter-fetch';
76
import FastbootAdapter from 'ember-data-storefront/mixins/fastboot-adapter';
87

98
/**
@@ -20,7 +19,7 @@ export const fixFilterQuery = query => {
2019
return query;
2120
};
2221

23-
export default JSONAPIAdapter.extend(HasManyQueryAdapterMixin, AdapterFetch, FastbootAdapter, {
22+
export default JSONAPIAdapter.extend(HasManyQueryAdapterMixin, FastbootAdapter, {
2423
host : ENV.APP.apiHost,
2524
namespace : ENV.APP.apiNamespace,
2625

app/components/account/application-section.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ export default Component.extend({
1515
this.loader.load(`/auth/oauth/login/${ provider }/${ authData.authorizationCode }/?redirect_uri=${ authData.redirectUri}`)
1616
.then(async response => {
1717
let credentials = {
18-
'identification' : response.email,
19-
'password' : response.facebook_login_hash
18+
'username' : response.email,
19+
'password' : response.facebook_login_hash
2020
};
2121

2222
let authenticator = 'authenticator:jwt';

app/components/account/password-section.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ export default Component.extend(FormMixin, {
4949
},
5050
submit() {
5151
this.onValid(() => {
52-
this.sendAction('changePassword', this.getProperties('passwordCurrent', 'passwordNew'));
52+
this.sendAction('changePassword', { passwordCurrent: this.passwordCurrent, passwordNew: this.passwordNew });
5353
});
5454
}
5555
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
import Component from '@ember/component';
2+
3+
export default Component.extend({
4+
});
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
import Component from '@ember/component';
2+
3+
export default Component.extend({
4+
});
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
import Component from '@ember/component';
2+
3+
export default Component.extend({
4+
});

0 commit comments

Comments
 (0)