Feature/delete account fix

core/client/navbar/navbar.html

@@ -13,8 +13,8 @@
           APInf
         </a>
         {{ else }}
-        <div class="project-name" href="/">
-          <a class="project-name-link">
+        <div class="project-name">
+          <a href="/" class="project-name-link">
             {{ branding.siteTitle }}
           </a>
         </div>

core/lib/i18n/en.i18n.json

@@ -1,4 +1,7 @@
 {
+  "account_delete_button_text": "Delete account",
+  "account_delete_warning": "There's no coming back from this one",
+  "account_delete_title": "Delete account",
   "account_details": "Account Details",
   "addApiBacklogItem_addBacklogItem_button": "Add backlog item",
   "addApiBacklogItem_modalTitle": "Add backlog item",
@@ -129,16 +132,18 @@
   "dashboardDataTable_timeStamp": "Date",
   "dashboardDataTable_title": "Analytics data",
   "dashboardDataTable_pageCount": "Page",
+  "deleteAccount_closeButton": "Close",
+  "deleteAccount_confirmDelete": "Delete",
+  "deleteAccount_success_message": "Account deleted",
   "deleteApiBackendConfirmation_CancelButton": "Cancel",
   "deleteApiBackendConfirmation_confirmDeleteInformation": "This action cannot be undone! The API Backend and all its related information, i.e. metadata, documentation, API backlog items and feedback will be removed.",
   "deleteApiBackendConfirmation_confirmDeleteMessage": "Are you sure you want to delete",
   "deleteApiBackendConfirmation_confirmDeleteNote": "NOTE:",
   "deleteApiBackendConfirmation_deleteButton": "Delete",
   "deleteApiBackendConfirmation_header": "Delete API",
   "deleteApiBackendConfirmation_successMessage": "Successfully deleted API:",
-  "delete_account": "Delete Account",
-  "delete_account_warn": "There's no coming back from this one",
-  "delete_account_warn2": "Are you sure you want to delete your account?",
+  "deleteAccount_title": "Delete Account",
+  "deleteAccount_confirm_text": "Are you sure you want to delete your account?",
   "deleteBacklogItem_modalTitle": "Delete backlog item",
   "deleteBacklogItem_confirmation_text": "Are you sure you want to delete this backlog item?",
   "deleteBacklogItem_cancelButton_text": "Cancel",

home/client/lib/router.js

@@ -1,6 +1,5 @@
 Router.route('/', {
-  layout: 'masterLayout',
-  template: 'home',
-}, {
   name: 'home',
+  template: 'home',
+  layout: 'masterLayout',
 });

users/client/account/account.html

@@ -7,37 +7,30 @@
       <div class="col-md-6">
         <div class="panel panel-default">
           <div class="panel-heading">
-            <h3 class="panel-title">{{_ "account_details"}}</h3>
+            <h3 class="panel-title">
+              {{_ "account_details"}}
+            </h3>
           </div>
           <div class="panel-body">
             {{> updatePassword}}
           </div>
         </div>
         <div class="panel panel-danger">
           <div class="panel-heading">
-            <h3 class="panel-title">{{_ "delete_account"}}</h3>
+            <h3 class="panel-title">
+              {{_ "account_delete_title" }}
+            </h3>
           </div>
           <div class="panel-body">
-            <p>{{_ "delete_account_warn"}}</p>
             <p>
-              <a class="btn btn-danger" data-toggle="modal" href='#delete-account'>{{_ "delete_account"}}</a>
-              <div class="modal fade" id="delete-account">
-                <div class="modal-dialog">
-                  <div class="modal-content">
-                    <div class="modal-header">
-                      <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-                      <h4 class="modal-title">{{_ "delete_account"}}</h4>
-                    </div>
-                    <div class="modal-body">
-                      {{_ "delete_account_warn2"}}
-                    </div>
-                    <div class="modal-footer">
-                      <button type="button" class="btn btn-default" data-dismiss="modal">{{_ "close"}}</button>
-                      <button type="button" class="btn btn-danger js-delete-account">{{_ "delete"}}</button>
-                    </div>
-                  </div>
-                </div>
-              </div>
+              {{_ "account_delete_warning"}}
+            </p>
+            <p>
+              <a class="btn btn-danger" id="delete-account-button">
+                <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
+                &nbsp;
+                {{_ "account_delete_button_text"}}
+              </a>
             </p>
           </div>
         </div>

users/client/account/account.js

@@ -1,5 +1,8 @@
+import { Template } from 'meteor/templating';
+
 Template.account.events({
-  'click .js-delete-account': function () {
-    return Meteor.call('deleteAccount', Meteor.userId());
+  'click #delete-account-button': function () {
+    // Show the delete account modal
+    Modal.show('deleteAccount');
   },
 });

users/client/account/delete/delete.html

@@ -0,0 +1,32 @@
+<template name="deleteAccount">
+  <div class="modal fade" id="delete-account">
+    <div class="modal-dialog">
+      <div class="modal-content">
+        <div class="modal-header">
+          <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+          <h4 class="modal-title">
+            {{_ "deleteAccount_title"}}
+          </h4>
+        </div>
+        <div class="modal-body">
+          {{_ "deleteAccount_confirm_text"}}
+        </div>
+        <div class="modal-footer">
+          <button
+            type="button"
+            class="btn btn-default"
+            data-dismiss="modal">
+            {{_ "deleteAccount_closeButton" }}
+          </button>
+          <button
+            type="button"
+            class="btn btn-danger"
+            id="delete-account-confirm"
+            data-dismiss="modal">
+            {{_ "deleteAccount_confirmDelete" }}
+          </button>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>

users/client/account/delete/delete.js

@@ -0,0 +1,25 @@
+import { Meteor } from 'meteor/meteor';
+import { Template } from 'meteor/templating';
+import { TAPi18n } from 'meteor/tap:i18n';
+
+Template.deleteAccount.events({
+  'click #delete-account-confirm': function () {
+    // Get user ID
+    const userId = Meteor.userId();
+
+    // Delete user account
+    Meteor.call('deleteAccount', userId, () => {
+      // Dismiss the delete account modal
+      Modal.hide('deleteAccount');
+
+      // Route to home page
+      Router.go('home');
+
+      // Get deletion message success translation
+      const message = TAPi18n.__('deleteAccount_success_message');
+
+      // Alert user of successful deletion
+      sAlert.success(message);
+    });
+  },
+});