Merge branch 'development' into side-menu

.eslintrc.js

@@ -6,7 +6,8 @@ module.exports = {
     sourceType: 'module'
   },
   plugins: [
-    'ember'
+    'ember',
+    'ember-suave'
   ],
   extends: [
     'eslint:recommended',
@@ -66,9 +67,16 @@ module.exports = {
     'new-cap': 'off',
     'eqeqeq': ['error', 'smart'],
     'one-var': 'off',
+    'padding-line-between-statements': 'off',
+    'lines-between-class-members': ['error', "always", { exceptAfterSingleLine: true }],
     'ember-suave/no-const-outside-module-scope': 'off',
     'ember-suave/require-access-in-comments': 'off',
+    'ember-suave/lines-between-object-properties': 'off',
     'ember/no-get': 'error',
+    // TODO: Re-enable later
+    'no-duplicate-imports': 'warn',
+    'no-await-in-loop': 'warn',
+    'import/no-relative-parent-imports': 'warn',
   },
   globals: {
     module     : true,

.template-lintrc.js

@@ -6,6 +6,14 @@ module.exports = {
   rules: {
     'no-nested-interactive': {
       ignoredTags: ['label'] // Allow label tag inside a or any other interactive element
-    }
+    },
+    'link-rel-noopener': true,
+    // TODO: Remove and fix
+    'require-button-type': false,
+    'no-partial': false,
+    'require-valid-alt-text': false,
+    'no-inline-styles': false,
+    'no-negated-condition': false,
+    'no-invalid-meta': false // Crashing the linter https://github.com/ember-template-lint/ember-template-lint/pull/1087
   }
 };

.travis.yml

@@ -28,6 +28,7 @@ script:
   - yarn lint:scss
   - COVERAGE=true yarn test
   - ROOT_URL=open-event-frontend ember build -prod
+  - bash scripts/test_fastboot.sh
 
 after_success:
   - 'bash <(curl -s https://codecov.io/bash)'

app/adapters/application.js

@@ -3,7 +3,6 @@ import { computed } from '@ember/object';
 import ENV from 'open-event-frontend/config/environment';
 import JSONAPIAdapter from 'ember-data/adapters/json-api';
 import HasManyQueryAdapterMixin from 'ember-data-has-many-query/mixins/rest-adapter';
-import AdapterFetch from 'ember-fetch/mixins/adapter-fetch';
 import FastbootAdapter from 'ember-data-storefront/mixins/fastboot-adapter';
 
 /**
@@ -20,7 +19,7 @@ export const fixFilterQuery = query  => {
   return query;
 };
 
-export default JSONAPIAdapter.extend(HasManyQueryAdapterMixin, AdapterFetch, FastbootAdapter, {
+export default JSONAPIAdapter.extend(HasManyQueryAdapterMixin, FastbootAdapter, {
   host      : ENV.APP.apiHost,
   namespace : ENV.APP.apiNamespace,
 

app/components/account/application-section.js

@@ -15,8 +15,8 @@ export default Component.extend({
             this.loader.load(`/auth/oauth/login/${  provider  }/${  authData.authorizationCode  }/?redirect_uri=${  authData.redirectUri}`)
               .then(async response => {
                 let credentials = {
-                  'identification' : response.email,
-                  'password'       : response.facebook_login_hash
+                  'username' : response.email,
+                  'password' : response.facebook_login_hash
                 };
 
                 let authenticator = 'authenticator:jwt';

app/components/event-invoice/billing-info.js

@@ -0,0 +1,4 @@
+import Component from '@ember/component';
+
+export default Component.extend({
+});

app/components/event-invoice/event-info.js

@@ -0,0 +1,4 @@
+import Component from '@ember/component';
+
+export default Component.extend({
+});

app/components/event-invoice/invoice-summary.js

@@ -0,0 +1,4 @@
+import Component from '@ember/component';
+
+export default Component.extend({
+});

app/components/event-invoice/payee-info.js

@@ -0,0 +1,4 @@
+import Component from '@ember/component';
+
+export default Component.extend({
+});

app/components/forms/admin/settings/system/captcha-form.js

@@ -2,4 +2,4 @@ import Component from '@ember/component';
 
 export default class extends Component {
 
-}
+}

app/components/forms/admin/settings/system/order-expiry-form.js

@@ -2,4 +2,4 @@ import Component from '@ember/component';
 
 export default class extends Component {
 
-}
+}

app/components/forms/login-form.js

@@ -44,7 +44,7 @@ export default class extends Component.extend(FormMixin) {
   @action
   async submit() {
     this.onValid(async() => {
-      let credentials = { identification: this.identification, password: this.password },
+      let credentials = { username: this.identification, password: this.password },
           authenticator = 'authenticator:jwt';
       this.setProperties({
         errorMessage : null,
@@ -60,8 +60,8 @@ export default class extends Component.extend(FormMixin) {
 
         }
       } catch (e) {
-        if (e.error) {
-          this.set('errorMessage', this.l10n.tVar(e.error));
+        if (e.json && e.json.error) {
+          this.set('errorMessage', this.l10n.tVar(e.json.error));
         } else {
           this.set('errorMessage', this.l10n.t('An unexpected error occurred.'));
         }

app/components/forms/wizard/basic-details-step.js

@@ -12,6 +12,7 @@ import { inject as service } from '@ember/service';
 import EventWizardMixin from 'open-event-frontend/mixins/event-wizard';
 import { protocolLessValidUrlPattern } from 'open-event-frontend/utils/validators';
 import ENV from 'open-event-frontend/config/environment';
+import $ from 'jquery';
 
 export default Component.extend(FormMixin, EventWizardMixin, {
 
@@ -128,6 +129,12 @@ export default Component.extend(FormMixin, EventWizardMixin, {
 
   // TODO: Removing the Event Time Validations due to the weird and buggy behaviour. Will be restored once a perfect solution is found. Please check issue: https://github.com/fossasia/open-event-frontend/issues/3667
   getValidationRules() {
+    $.fn.form.settings.rules.checkMaxMinPrice = () => {
+      return $('.ui.form').form('get value', 'min_price') <= $('.ui.form').form('get value', 'max_price');
+    };
+    $.fn.form.settings.rules.checkMaxMinOrder = () => {
+      return $('.ui.form').form('get value', 'ticket_min_order') <= $('.ui.form').form('get value', 'ticket_max_order');
+    };
 
     let validationRules = {
       inline : true,
@@ -257,6 +264,10 @@ export default Component.extend(FormMixin, EventWizardMixin, {
             {
               type   : 'number',
               prompt : this.l10n.t('Invalid number')
+            },
+            {
+              type   : 'checkMaxMinOrder',
+              prompt : this.l10n.t('Minimum order should not be greater than maximum')
             }
           ]
         },
@@ -274,6 +285,10 @@ export default Component.extend(FormMixin, EventWizardMixin, {
             {
               type   : 'integer[1..]',
               prompt : this.l10n.t('Maximum tickets per order should be greater than 0')
+            },
+            {
+              type   : 'checkMaxMinOrder',
+              prompt : this.l10n.t('Maximum order should not be less than minimum')
             }
           ]
         },
@@ -287,6 +302,10 @@ export default Component.extend(FormMixin, EventWizardMixin, {
             {
               type   : 'integer[1..]',
               prompt : this.l10n.t('Minimum price needs to be greater than zero')
+            },
+            {
+              type   : 'checkMaxMinPrice',
+              prompt : this.l10n.t('Minimum price should not be greater than maximum')
             }
           ]
         },
@@ -300,6 +319,10 @@ export default Component.extend(FormMixin, EventWizardMixin, {
             {
               type   : 'integer[1..]',
               prompt : this.l10n.t('Maximum price needs to be greater than zero')
+            },
+            {
+              type   : 'checkMaxMinPrice',
+              prompt : this.l10n.t('Maximum price should not be less than minimum')
             }
           ]
         },

app/components/modals/cropper-modal.js

@@ -27,11 +27,13 @@ export default class extends ModalBase {
     }
 
   }
+
   @action
   resetImage() {
     this.onHide();
     this.onVisible();
   }
+
   @action
   cropImage() {
     $('img', this.element).croppie('result', { type: 'base64', size: 'original', quality: 1, format: 'jpeg' }).then(result => {

app/components/orders/organizer-info.js

@@ -0,0 +1,4 @@
+import Component from '@ember/component';
+
+export default Component.extend({
+});

app/components/paypal-button.js

@@ -136,4 +136,4 @@ export default Component.extend({
 
     }
   }
-});
+});

app/components/public/ticket-list.js

@@ -2,9 +2,8 @@ import Component from '@ember/component';
 import { computed } from '@ember/object';
 import FormMixin from 'open-event-frontend/mixins/form';
 import { inject as service } from '@ember/service';
-import { sumBy } from 'lodash-es';
+import { sumBy, merge } from 'lodash-es';
 import { A } from '@ember/array';
-import { merge } from 'lodash-es';
 
 export default Component.extend(FormMixin, {
   store: service(),

app/components/tables/utilities/pagination.js

@@ -35,6 +35,7 @@ export default class extends Component {
     return this.currentPage <= 1;
 
   }
+
   @computed('currentPage', 'pageCount')
   get moveToNextPageDisabled() {
     return this.currentPage >= this.pageCount;

app/components/ui-table-server.js

@@ -83,8 +83,7 @@ export default ModelsTable.extend({
     if (!get(this.data, 'query')) {
       console.warn('You must use https://emberjs.com/api/data/classes/DS.Store.html#method_query for loading data');
       query = merge({}, this.query);
-      store = this.store;
-      modelName = this.modelName;
+      ({ store, modelName } = this);
     } else {
       query = merge({}, get(this.data, 'query'));
       store = get(this.data, 'store');

app/components/ui-table/cell/admin/events/event-is-featured.js

@@ -0,0 +1,4 @@
+import Component from '@ember/component';
+
+export default Component.extend({
+});

app/components/ui-table/cell/admin/events/event-is-promoted.js

@@ -0,0 +1,4 @@
+import Component from '@ember/component';
+
+export default Component.extend({
+});

app/components/ui-table/cell/admin/messages/cell-options.js

@@ -0,0 +1,4 @@
+import Component from '@ember/component';
+
+export default Component.extend({
+});

app/components/ui-table/cell/cell-event-date.js

@@ -0,0 +1,4 @@
+import Component from '@ember/component';
+
+export default Component.extend({
+});

app/components/ui-table/cell/cell-event-state.js

@@ -0,0 +1,4 @@
+import Component from '@ember/component';
+
+export default Component.extend({
+});

app/components/ui-table/cell/cell-sessions-dashboard.js

@@ -0,0 +1,4 @@
+import Component from '@ember/component';
+
+export default Component.extend({
+});

app/components/ui-table/cell/cell-speakers-dashboard.js

@@ -0,0 +1,4 @@
+import Component from '@ember/component';
+
+export default Component.extend({
+});

app/components/ui-table/cell/cell-sponsor-image.js

@@ -0,0 +1,4 @@
+import Component from '@ember/component';
+
+export default Component.extend({
+});

app/components/ui-table/cell/cell-sponsor-sanitize.js

@@ -0,0 +1,4 @@
+import Component from '@ember/component';
+
+export default Component.extend({
+});

app/components/ui-table/cell/events/cell-action.js

@@ -0,0 +1,4 @@
+import Component from '@ember/component';
+
+export default Component.extend({
+});

app/components/ui-table/cell/events/cell-amount.js

@@ -0,0 +1,4 @@
+import Component from '@ember/component';
+
+export default Component.extend({
+});

app/components/ui-table/cell/events/cell-event-invoice.js

@@ -0,0 +1,4 @@
+import Component from '@ember/component';
+
+export default Component.extend({
+});

app/components/ui-table/cell/events/view/speakers/cell-buttons.js

@@ -0,0 +1,4 @@
+import Component from '@ember/component';
+
+export default Component.extend({
+});

app/components/ui-table/cell/events/view/speakers/cell-is-featured.js

@@ -0,0 +1,4 @@
+import Component from '@ember/component';
+
+export default Component.extend({
+});

app/components/ui-table/cell/events/view/speakers/cell-simple-sessions.js

@@ -0,0 +1,4 @@
+import Component from '@ember/component';
+
+export default Component.extend({
+});

app/components/ui-table/cell/events/view/speakers/speaker-logo.js

@@ -0,0 +1,4 @@
+import Component from '@ember/component';
+
+export default Component.extend({
+});

app/components/ui-table/cell/events/view/speakers/speaker-mobile.js

@@ -0,0 +1,4 @@
+import Component from '@ember/component';
+
+export default Component.extend({
+});

app/components/ui-table/cell/events/view/tickets/access-codes/cell-actions.js

@@ -0,0 +1,4 @@
+import Component from '@ember/component';
+
+export default Component.extend({
+});

app/components/ui-table/cell/events/view/tickets/access-codes/cell-url.js

@@ -0,0 +1,4 @@
+import Component from '@ember/component';
+
+export default Component.extend({
+});

app/components/ui-table/expand-row-cell.js

@@ -0,0 +1,4 @@
+import Component from '@ember/component';
+
+export default Component.extend({
+});

app/components/ui-table/header-row-filtering.js

@@ -0,0 +1,4 @@
+import Component from '@ember/component';
+
+export default Component.extend({
+});

app/components/ui-table/header-row-sorting.js

@@ -0,0 +1,4 @@
+import Component from '@ember/component';
+
+export default Component.extend({
+});

app/components/ui-table/header-rows-grouped.js

@@ -0,0 +1,4 @@
+import Component from '@ember/component';
+
+export default Component.extend({
+});

app/components/ui-table/header-sorting-icons.js

@@ -0,0 +1,4 @@
+import Component from '@ember/component';
+
+export default Component.extend({
+});

app/components/widgets/forms/billing-info.js

@@ -7,4 +7,4 @@ export default Component.extend({
   countries: computed(function() {
     return orderBy(countries, 'name');
   })
-});
+});

app/controllers/account/billing/invoices/list.js

@@ -139,4 +139,4 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
     }
     return columns;
   }
-}
+}