Merge branch 'development' into cfs-editspeaker

Author: maze-runnar

app/components/forms/orders/guest-order-form.js

@@ -1,8 +1,14 @@
 import Component from '@ember/component';
+import { computed } from '@ember/object';
 import FormMixin from 'open-event-frontend/mixins/form';
 
 export default Component.extend(FormMixin, {
-  autoScrollToErrors: false,
+  autoScrollToErrors : false,
+  showPasswordForm   : false,
+
+  nextStep: computed('userExists', 'showPasswordForm', function() {
+    return this.userExists || this.showPasswordForm;
+  }),
 
   getValidationRules() {
     return {
@@ -23,12 +29,27 @@ export default Component.extend(FormMixin, {
             }
           ]
         },
+
         password: {
           identifier : 'password',
           rules      : [
             {
               type   : 'empty',
               prompt : this.l10n.t('Please enter your password')
+            },
+            {
+              type   : 'minLength[8]',
+              prompt : this.l10n.t('Your password must have at least {ruleValue} characters')
+            }
+          ]
+        },
+
+        passwordRepeat: {
+          identifier : 'password_repeat',
+          rules      : [
+            {
+              type   : 'match[password]',
+              prompt : this.l10n.t('Passwords do not match')
             }
           ]
         }
@@ -37,13 +58,24 @@ export default Component.extend(FormMixin, {
   },
   actions: {
     submit() {
-      this.onValid(() => {
+      this.onValid(async() => {
         if (this.userExists) {
           this.loginExistingUser(this.email, this.password);
+        } else if (this.password) {
+          this.createNewUserViaEmail(this.email, this.password);
         } else {
-          this.createNewUserViaEmail(this.email);
+          const result = await this.loader.post('users/check_email', { email: this.email });
+          this.set('userExists', result.exists);
+          if (!result.exists) {
+            this.set('showPasswordForm', true);
+          }
         }
       });
+    },
+    reset() {
+      this.set('userExists', false);
+      this.set('showPasswordForm', false);
+      this.set('password', null);
     }
   }
 });

app/components/forms/wizard/custom-form-input.hbs

@@ -1,10 +1,10 @@
 <div class="ui hidden divider"></div>
-<h3 class="ui dividing header">
+<div class="ui dividing">
   <i class="checkmark box icon"></i>
-  <div class="content">
+  <span class="content">
     {{t 'Add Custom Form Field'}}
-  </div>
-</h3>
+  </span>
+</div>
 <div {{did-update this.updated @field}} class="ui action input" style="width: inherit;">
   <Input type="text" placeholder="Field Name" @value={{this.name}} />
   <UiDropdown class="ui selection dropdown" @selected={{this.type}} @onChange={{action (mut this.type)}}>

app/components/modals/tax-info-modal.js

@@ -6,7 +6,7 @@ import { countries } from 'open-event-frontend/utils/dictionary/demography';
 import { orderBy } from 'lodash-es';
 
 export default ModalBase.extend(FormMixin, {
-  isSmall : false,
+  isSmall: false,
 
   autoScrollToErrors   : true,
   isTaxIncludedInPrice : 'include',

app/components/nav-bar.js

@@ -1,9 +1,14 @@
 import classic from 'ember-classic-decorator';
-import { action } from '@ember/object';
+import { action, computed } from '@ember/object';
 import Component from '@ember/component';
 
 @classic
 export default class NavBar extends Component {
+  @computed('session.currentRouteName')
+  get isNotEventPageRoute() {
+    return !(String(this.session.currentRouteName).includes('public'));
+  }
+
   @action
   logout() {
     this.authManager.logout();

app/components/public/add-to-calender.hbs

@@ -0,0 +1,15 @@
+<div class="ui list basic segment m-0 pb-0">
+  <div class="item">
+    <i class="clock alternate outline icon pt-1"></i>
+    <div class="content">
+      {{#if this.isSingleDay}}
+        {{general-date @event.startsAt @event.timezone "dddd, MMMM DD, YYYY"}}<br>{{general-date @event.startsAt @event.timezone "h:mm A"}} {{t 'to'}} {{general-date @event.endsAt @event.timezone "h:mm A"}} 
+      {{else}}
+        {{general-date @event.startsAt @event.timezone "dddd, MMMM DD, YYYY h:mm A"}} {{t 'to'}} {{general-date @event.endsAt @event.timezone "dddd, MMMM DD, YYYY h:mm A"}} 
+      {{/if}}
+      ({{this.timezone}})
+      <br>
+      <a href={{this.calendarUrl}} target="_blank" rel="noreferrer nofollow">{{t 'Add to Google Calendar'}}</a>
+    </div>
+  </div>
+</div>

app/components/public/add-to-calender.ts

@@ -0,0 +1,37 @@
+import Component from '@glimmer/component';
+import moment, { Moment } from 'moment';
+import Event from 'open-event-frontend/models/event';
+
+interface Args {
+  event: Event,
+  location: string
+}
+
+export default class AddToCalender extends Component<Args> {
+
+  get timezone(): string {
+    return moment.tz(this.args.event.timezone).format('z');
+  }
+
+  get startsAt(): Moment {
+    const { event } = this.args;
+    return moment(event.startsAt).tz(event.timezone);
+  }
+
+  get endsAt(): Moment {
+    const { event } = this.args;
+    return moment(event.endsAt).tz(event.timezone);
+  }
+
+  get isSingleDay(): boolean {
+    return this.startsAt.isSame(this.endsAt, 'day');
+  }
+
+  get calendarUrl(): string {
+    const { event } = this.args;
+    const startTime = this.startsAt.utc().format('YYYYMMDD[T]HHmmSS[Z]');
+    const endTime = this.endsAt.utc().format('YYYYMMDD[T]HHmmSS[Z]');
+    return `https://calendar.google.com/calendar/render?action=TEMPLATE&dates=${startTime}/${endTime}&text=${event.name}&location=${this.args.location}&ctz=${event.timezone}&details=${event.description}`;
+  }
+
+}

app/components/public/social-links.js

@@ -3,7 +3,7 @@ import Component from '@ember/component';
 import { computed } from '@ember/object';
 
 export default Component.extend({
-  classNames: ['ui', 'basic', 'segment'],
+  classNames: ['ui', 'basic', 'segment', 'm-0', 'pt-0'],
 
   socialLinks: A(),
 

app/controllers/events/view/speakers/list.js

@@ -15,7 +15,7 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
       {
         name            : 'Name',
         valuePath       : 'name',
-        extraValuePaths : ['id'],
+        extraValuePaths : ['id', 'event'],
         isSortable      : true,
         headerComponent : 'tables/headers/sort',
         cellComponent   : 'ui-table/cell/events/view/speakers/cell-buttons',
@@ -90,8 +90,8 @@ export default class extends Controller.extend(EmberTableControllerMixin) {
   }
 
   @action
-  viewSpeaker(id) {
-    this.transitionToRoute('events.view.speakers.edit', id);
+  viewSpeaker(speaker) {
+    this.transitionToRoute('public.speaker.view', speaker.event.get('identifier'), speaker.id);
   }
 
   @action

app/controllers/events/view/tickets/add-order.js

@@ -20,7 +20,9 @@ export default class AddOrderController extends Controller {
       const { orderInput } = this;
       try {
         const order = await this.loader.post('/orders/create-order', orderInput);
-        this.notify.success(this.l10n.t(`Order details saved. Please fill further details within ${this.settings.orderExpiryTime} minutes.`));
+        this.notify.success(this.l10n.t('Order details saved. Please fill further details within {{time}} minutes.', {
+          time: this.settings.orderExpiryTime
+        }));
         this.transitionToRoute('orders.new', order.data.attributes.identifier);
       } catch (e) {
         console.error('Error while saving order', e);

app/controllers/public/index.js

@@ -16,12 +16,12 @@ export default class IndexController extends Controller {
   }
 
   @action
-  async createNewUserViaEmail(email) {
+  async createNewUserViaEmail(email, password) {
     this.set('isLoading', true);
     const newUser = this.store.createRecord('user', {
       email,
-      'password'               : (Math.random() * 10).toString(16),
-      'wasRegisteredWithOrder' : true
+      password,
+      'wasRegisteredWithOrder': true
     });
     newUser.save()
       .then(() => {