Moved profile module to settings

Author: mrsaicharan1

app/controllers/profile.js renamed to app/controllers/settings/profile.js

@@ -105,9 +105,8 @@ router.map(function() {
     this.route('list', { path: '/:event_state' });
     this.route('import');
   });
-  this.route('profile');
-
   this.route('settings', function() {
+    this.route('profile');
     this.route('contact-info');
     this.route('password');
     this.route('email-preferences');

app/router.js

@@ -21,8 +21,7 @@
             <a href="{{href-to 'my-sessions'}}" class="item">{{t 'My Sessions'}}</a>
             <a href="{{href-to 'events.list' 'live'}}" class="item">{{t 'Manage Events'}}</a>
             <div class="divider"></div>
-            <a href="{{href-to 'profile'}}" class="item">{{t 'Profile'}}</a>
-            <a href="{{href-to 'settings.contact-info'}}" class="item">{{t 'Settings'}}</a>
+            <a href="{{href-to 'settings.profile'}}" class="item">{{t 'Settings'}}</a>
             {{#if authManager.currentUser.isAnAdmin}}
               <a href="{{href-to 'admin'}}" class="item">{{t 'Admin'}}</a>
             {{/if}}

app/routes/profile.js renamed to app/routes/settings/profile.js

@@ -12,7 +12,7 @@
     <a href="{{href-to 'my-sessions'}}" class="item">{{t 'My Sessions'}}</a>
     <a href="{{href-to 'events.list' 'live'}}" class="item">{{t 'Manage Events'}}</a>
     <div class="divider"></div>
-    <a href="{{href-to 'profile'}}" class="item">{{t 'Profile'}}</a>
+    <a href="{{href-to 'settings.profile'}}" class="item">{{t 'Profile'}}</a>
     <a href="{{href-to 'settings.contact-info'}}" class="item">{{t 'Settings'}}</a>
     {{#if authManager.currentUser.isAnAdmin}}
       <a href="{{href-to 'admin'}}" class="item">{{t 'Admin'}}</a>

app/templates/components/nav-bar.hbs

@@ -1,6 +1,9 @@
 <div class="row">
   <div class="sixteen wide column">
     {{#tabbed-navigation}}
+      {{#link-to 'settings.profile' class='item'}}
+        {{t 'Profile'}}
+      {{/link-to}}
       {{#link-to 'settings.contact-info' class='item'}}
         {{t 'Contact Info'}}
       {{/link-to}}

app/templates/components/side-bar.hbs

@@ -6,14 +6,14 @@ import { login } from 'open-event-frontend/tests/helpers/custom-helpers';
 module('Acceptance | profile', function(hooks) {
   setupApplicationTest(hooks);
 
-  test('visiting /profile without login', async function(assert) {
-    await visit('/profile');
+  test('visiting settings/profile without login', async function(assert) {
+    await visit('/settings/profile');
     assert.equal(currentURL(), '/login');
   });
 
-  test('visiting /profile with login', async function(assert) {
+  test('visiting settings/profile with login', async function(assert) {
     await login(assert);
-    await visit('/profile');
-    assert.equal(currentURL(), '/profile');
+    await visit('/settings/profile');
+    assert.equal(currentURL(), '/settings/profile');
   });
 });