Merged contact info with profile (#3146)

mrsaicharan1 · mariobehling · commit b32c89f4485e · 2019-06-18T19:17:25.000+02:00
removed additional fields

Changed to async-await style

Removed finally clause

Updated UI
diff --git a/app/components/forms/user-profile-form.js b/app/components/forms/user-profile-form.js
@@ -1,5 +1,6 @@
 import Component from '@ember/component';
 import FormMixin from 'open-event-frontend/mixins/form';
+import { validPhoneNumber } from 'open-event-frontend/utils/validators';
 
 export default Component.extend(FormMixin, {
 
@@ -27,6 +28,33 @@ export default Component.extend(FormMixin, {
               prompt : this.l10n.t('Please enter your family name')
             }
           ]
+        },
+        email: {
+          identifier : 'email',
+          rules      : [
+            {
+              type   : 'empty',
+              prompt : this.l10n.t('Please enter your email ID')
+            },
+            {
+              type   : 'email',
+              prompt : this.l10n.t('Please enter a valid email ID')
+            }
+          ]
+        },
+        phone: {
+          identifier : 'phone',
+          rules      : [
+            {
+              type   : 'empty',
+              prompt : this.l10n.t('Please enter a phone number.')
+            },
+            {
+              type   : 'regExp',
+              value  : validPhoneNumber,
+              prompt : this.l10n.t('Please enter a valid phone number.')
+            }
+          ]
         }
       }
     };
diff --git a/app/controllers/account/contact-info.js b/app/controllers/account/contact-info.js
diff --git a/app/controllers/account/profile.js b/app/controllers/account/profile.js
@@ -1,4 +1,16 @@
 import Controller from '@ember/controller';
 
 export default Controller.extend({
+  actions: {
+    async updateContactInfo() {
+      this.set('isLoading', true);
+      try {
+        await this.model.save();
+        this.notify.success(this.l10n.t('Your Contact Info has been updated'));
+      }  catch (error) {
+        this.notify.error(this.l10n.t(error.message));
+      }
+      this.set('isLoading', false);
+    }
+  }
 });
diff --git a/app/router.js b/app/router.js
@@ -107,7 +107,6 @@ router.map(function() {
   });
   this.route('account', function() {
     this.route('profile');
-    this.route('contact-info');
     this.route('password');
     this.route('email-preferences');
     this.route('applications');
@@ -160,7 +159,7 @@ router.map(function() {
         });
         this.route('account', function() {
           this.route('applications');
-          this.route('contact-info');
+          this.route('profile');
           this.route('email-preferences');
         });
         this.route('tickets', function() {
diff --git a/app/routes/account/contact-info.js b/app/routes/account/contact-info.js
diff --git a/app/routes/account/index.js b/app/routes/account/index.js
@@ -3,6 +3,6 @@ import Route from '@ember/routing/route';
 export default Route.extend({
   beforeModel() {
     this._super(...arguments);
-    this.transitionTo('account.contact-info');
+    this.transitionTo('account.profile');
   }
 });
diff --git a/app/templates/account.hbs b/app/templates/account.hbs
@@ -4,9 +4,6 @@
       {{#link-to 'account.profile' class='item'}}
         {{t 'Profile'}}
       {{/link-to}}
-      {{#link-to 'account.contact-info' class='item'}}
-        {{t 'Contact Info'}}
-      {{/link-to}}
       {{#link-to 'account.billing-info' class='item'}}
         {{t 'Billing Info'}}
       {{/link-to}}
diff --git a/app/templates/account/contact-info.hbs b/app/templates/account/contact-info.hbs
diff --git a/app/templates/account/profile.hbs b/app/templates/account/profile.hbs
@@ -1,8 +1,4 @@
-<div class="ui stackable grid">
-  <div class="sixteen wide column">
-    {{unverified-user-message}}
-  </div>
-</div>
-<div class="ui container">
+<div class="sixteen wide column">
+  {{unverified-user-message}}
   {{forms/user-profile-form user=model isLoading=isLoading}}
 </div>
diff --git a/app/templates/admin/users/view/account.hbs b/app/templates/admin/users/view/account.hbs
@@ -4,7 +4,7 @@
     <div class="sixteen wide column">
       {{#tabbed-navigation}}
         {{#link-to 'admin.users.view.account.contact-info' model.user.id class='item'}}
-          {{t 'Contact Info'}}
+          {{t 'Profile Info'}}
         {{/link-to}}
         {{#link-to 'admin.users.view.account.email-preferences' model.user.id class='item'}}
           {{t 'Email-Preferences'}}
diff --git a/app/templates/components/forms/user-profile-form.hbs b/app/templates/components/forms/user-profile-form.hbs
@@ -1,16 +1,18 @@
 <form class="ui form {{if isLoading 'loading'}}" autocomplete="off" {{action 'submit' on='submit'}}>
   <div class="ui stackable grid">
-    <div class="four wide column">
-      {{widgets/forms/image-upload
-        imageUrl=user.avatarUrl
-        needsCropper=true
-        label=(t 'User Image')
-        id='user_image'
-        icon='photo'
-        hint=(t 'Select User Image')
-        maxSizeInKb=10000
-        aspectRatio=(array 1 1)
-        helpText=(t 'We recommend using at least a 1000x1000px (1:1 ratio) image')}}
+    <div class="three wide column">
+      <div class="ui left floated eight wide column">
+        {{widgets/forms/image-upload
+          imageUrl=user.avatarUrl
+          needsCropper=true
+          label=(t 'User Image')
+          id='user_image'
+          icon='photo'
+          hint=(t 'Select User Image')
+          maxSizeInKb=10000
+          aspectRatio=(array 1 1)
+          helpText=(t 'We recommend using at least a 1000x1000px (1:1 ratio) image')}}
+      </div>
       <div class="ui hidden divider"></div>
       <div class="field">
         <h3>{{user.firstName}} {{user.lastName}}</h3>
@@ -19,7 +21,7 @@
         <h4>{{user.email}}</h4>
       </div>
     </div>
-    <div class="twelve wide column">
+    <div class="thirteen wide column">
       <div class="field">
         <label class="required" for="name">{{t 'Name'}}</label>
         {{input type='text' id='name' value=user.firstName}}
@@ -29,9 +31,17 @@
         {{input type='text' id='last_name' value=user.lastName}}
       </div>
       <div class="field">
-        <label for="details">{{t 'Details of the user'}}</label>
+        <label for="details">{{t 'Bio'}}</label>
         {{widgets/forms/rich-text-editor id='details' value=user.details}}
       </div>
+      <div class="field">
+        <label class="required">{{t 'Email'}}</label>
+        {{input type='email' name='email' value=user.email}}
+      </div>
+      <div class="field">
+        <label class="details">{{t 'Phone'}}</label>
+        {{input type='text' name='phone' value=user.contact}}
+      </div>
       <button type="submit" class="ui teal submit button update-changes">
         {{t 'Update Changes'}}
       </button>
diff --git a/app/templates/components/side-bar.hbs b/app/templates/components/side-bar.hbs
@@ -13,7 +13,6 @@
     <a href="{{href-to 'events.list' 'live'}}" class="item">{{t 'Manage Events'}}</a>
     <div class="divider"></div>
     <a href="{{href-to 'account.profile'}}" class="item">{{t 'Profile'}}</a>
-    <a href="{{href-to 'account.contact-info'}}" class="item">{{t 'Settings'}}</a>
     {{#if authManager.currentUser.isAnAdmin}}
       <a href="{{href-to 'admin'}}" class="item">{{t 'Admin'}}</a>
     {{/if}}
diff --git a/tests/acceptance/settings-test.js b/tests/acceptance/settings-test.js
@@ -11,8 +11,8 @@ module('Acceptance | account', function(hooks) {
     assert.equal(currentURL(), '/login');
   });
 
-  test('visiting /account/contact-info without login', async function(assert) {
-    await visit('/account/contact-info');
+  test('visiting /account/profile without login', async function(assert) {
+    await visit('/account/profile');
     assert.equal(currentURL(), '/login');
   });
 
@@ -26,10 +26,10 @@ module('Acceptance | account', function(hooks) {
     assert.equal(currentURL(), '/login');
   });
 
-  test('visiting /account/contact-info with login', async function(assert) {
+  test('visiting /account/profile with login', async function(assert) {
     await login(assert);
-    await visit('/account/contact-info');
-    assert.equal(currentURL(), '/account/contact-info');
+    await visit('/account/profile');
+    assert.equal(currentURL(), '/account/profile');
   });
 
   test('visiting /account/password with login', async function(assert) {

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,6 @@ import Route from '@ember/routing/route';`
`3`	`3`	`export default Route.extend({`
`4`	`4`	`beforeModel() {`
`5`	`5`	`this._super(...arguments);`
`6`		`- this.transitionTo('account.contact-info');`
	`6`	`+ this.transitionTo('account.profile');`
`7`	`7`	`}`
`8`	`8`	`});`