Merge pull request #277 from lewisl9029/feature-user-profile-edit

Feature user profile edit. Closes #225. Closes #231. Closes #272. Closes #273. Closes #274.

app/app-config.js

@@ -1,5 +1,6 @@
 import template from 'app.html!text';
 import menuTemplate from 'app-menu.html!text';
+import controller, { controllerName } from 'app-controller';
 
 export default /*@ngInject*/ function configApp(
   $ionicConfigProvider,
@@ -28,6 +29,7 @@ export default /*@ngInject*/ function configApp(
   $stateProvider.state('app.private', {
     url: '/private',
     abstract: true,
+    controller: controllerName + ' as appView',
     template: menuTemplate
   });
 }

app/app-controller.js

@@ -0,0 +1,16 @@
+export let controllerName = 'AppController';
+export default /*@ngInject*/ function AppController(
+  $ionicPopover
+) {
+  this.optionsMenuPopover = $ionicPopover.fromTemplate(
+    `
+    <ion-popover-view>
+      <toc-options-menu></toc-options-menu>
+    </ion-popover-view>
+    `
+  );
+
+  this.openOptionsMenuPopover = function openOptionsMenuPopover($event) {
+    this.optionsMenuPopover.show($event);
+  };
+}

app/app-menu.html

@@ -1,4 +1,7 @@
 <ion-side-menus enable-menu-with-back-views="false">
+  <ion-side-menu side="left" expose-aside-when="large">
+    <toc-conversations-menu></toc-conversations-menu>
+  </ion-side-menu>
   <ion-side-menu-content>
     <ion-nav-bar class="bar-positive">
       <ion-nav-back-button class="button-clear">
@@ -10,14 +13,16 @@
         </button>
       </ion-nav-buttons>
       <ion-nav-buttons side="right">
-        <button class="button button-icon button-clear ion-navicon">
+        <button
+          ng-click="appView.openOptionsMenuPopover($event)"
+          class="button button-icon button-clear ion-navicon">
         </button>
       </ion-nav-buttons>
     </ion-nav-bar>
     <toc-notification-overlay></toc-notification-overlay>
     <ion-nav-view></ion-nav-view>
   </ion-side-menu-content>
-  <ion-side-menu side="left" expose-aside-when="large">
-    <toc-conversations-menu></toc-conversations-menu>
+  <ion-side-menu side="right">
+    <toc-options-menu></toc-options-menu>
   </ion-side-menu>
 </ion-side-menus>

app/app.js

@@ -7,6 +7,7 @@ import views from './views/views';
 
 import run from './app-run';
 import config from './app-config';
+import controller, { controllerName } from './app-controller';
 
 let appName = 'toc';
 
@@ -17,7 +18,8 @@ export default angular.module(appName, [
     views.name,
   ])
   .config(config)
-  .run(run);
+  .run(run)
+  .controller(controllerName, controller);
 
 export function initialize() {
   angular.element(document)

app/app.scss

@@ -17,6 +17,7 @@ $button-border-radius: 0 !default;
 $button-bar-button-font-size: 15px !default;
 
 $card-border-radius: 0 !default;
+$popover-border-radius: 0 !default;
 
 $popup-button-border-radius: 0 !default;
 $popup-background-color: #fff !default;
@@ -44,6 +45,10 @@ form.ng-pristine button[type='submit'] {
   opacity: 1;
 }
 
+.popup-body {
+  text-align: center;
+}
+
 .item-input-wrapper {
   border-radius: 0;
 }

app/components/begin-conversation-modal/begin-conversation-modal-directive.js

@@ -6,7 +6,7 @@ export default /*@ngInject*/ function tocBeginConversationModal() {
     restrict: 'E',
     template: template,
     scope: {
-      hideModal: '&'
+      removeModal: '&'
     },
     controllerAs: 'beginConversationModal',
     controller: /*@ngInject*/ function BeginConversationModalController(
@@ -21,7 +21,7 @@ export default /*@ngInject*/ function tocBeginConversationModal() {
       identity,
       state
     ) {
-      this.hideModal = $scope.hideModal;
+      this.removeModal = $scope.removeModal;
       this.userInfo = state.cloud.identity.get().userInfo;
       this.userId = this.userInfo.id;
       this.isCordovaApp = devices.isCordovaApp();
@@ -40,7 +40,7 @@ export default /*@ngInject*/ function tocBeginConversationModal() {
           0
         ))
         .then(() => {
-          this.hideModal();
+          this.removeModal();
           return $q.when();
         });
       };
@@ -133,7 +133,7 @@ export default /*@ngInject*/ function tocBeginConversationModal() {
               '_system'
             );
 
-            this.hideModal();
+            this.removeModal();
           }
         }
       };

app/components/begin-conversation-modal/begin-conversation-modal.html

@@ -28,7 +28,7 @@ <h1 class="title">Start a Conversation</h1>
   <ion-footer-bar>
     <div class="col">
       <button class="button button-block button-outline button-calm"
-        ng-click="::beginConversationModal.hideModal()">
+        ng-click="::beginConversationModal.removeModal()">
         Cancel
       </button>
     </div>

app/components/channel-card/channel-card.html

@@ -8,7 +8,7 @@
   <div class="toc-channel-card-status-indicator"
     ng-class="'toc-contact-status-' + channelCard.contact.statusId">
   </div>
-  <h2>{{channelCard.contact.userInfo.displayName}}</h2>
+  <h2>{{channelCard.contact.userInfo.displayName || 'Anonymous'}}</h2>
   <p class="toc-channel-card-quote" ng-class="{
       'toc-channel-card-quote-unread': channelCard.channel.unreadMessageId
     }">

app/components/channel-list/channel-list-directive.js

@@ -44,7 +44,7 @@ export default /*@ngInject*/ function tocChannelList() {
           let contact =
             state.cloud.contacts.get([channel.channelInfo.contactIds[0]]);
           return $ionicPopup.show({
-            template: `Accept invite from ${contact.userInfo.displayName}?`,
+            template: `Accept invite from ${contact.userInfo.displayName || 'Anonymous'}?`,
             title: 'Accept Invite',
             buttons: [
               {