From b9af3fb40e4e22993d5ecd04ec3405e6ea212a1c Mon Sep 17 00:00:00 2001
From: Glendon Solsberry <gms8994@users.noreply.github.com>
Date: Mon, 23 Dec 2019 11:45:42 -0500
Subject: [PATCH] Updates notifications screen to a more consistent UI (#11635)

---
 .../src/components/settings/notifications.vue | 69 +++++++++----------
 website/common/locales/en/settings.json       |  4 +-
 2 files changed, 36 insertions(+), 37 deletions(-)

diff --git a/website/client/src/components/settings/notifications.vue b/website/client/src/components/settings/notifications.vue
index 29017b4899..24a4b46d17 100644
--- a/website/client/src/components/settings/notifications.vue
+++ b/website/client/src/components/settings/notifications.vue
@@ -28,39 +28,38 @@
       <small>{{ $t('unsubscribeAllEmailsText') }}</small>
     </div>
     <div class="col-8">
-      <table class="table"></table>
-      <tr>
-        <td></td>
-        <th>
-          <span>{{ $t('email') }}</span>
-        </th>
-        <th>
-          <span>{{ $t('push') }}</span>
-        </th>
-      </tr>
-      <tr
-        v-for="notification in notificationsIds"
-        :key="notification"
-      >
-        <td>
-          <span>{{ $t(notification) }}</span>
-        </td>
-        <td>
-          <input
-            v-model="user.preferences.emailNotifications[notification]"
-            type="checkbox"
-            @change="set('emailNotifications', notification)"
-          >
-        </td>
-        <td v-if="onlyEmailsIds.indexOf(notification) === -1">
-          <input
-            v-model="user.preferences.pushNotifications[notification]"
-            type="checkbox"
-            @change="set('pushNotifications', notification)"
-          >
-          <hr>
-        </td>
-      </tr>
+      <table class="table">
+        <tr>
+          <td></td>
+          <th>
+            <span>{{ $t('email') }}</span>
+          </th>
+          <th>
+            <span>{{ $t('push') }}</span>
+          </th>
+        </tr>
+        <tr v-for="notification in notificationsIds" :key="notification">
+          <td>
+            <span>{{ $t(notification) }}</span>
+          </td>
+          <td>
+            <input
+              v-model="user.preferences.emailNotifications[notification]"
+              type="checkbox"
+              @change="set('emailNotifications', notification)"
+            >
+          </td>
+          <td v-if="onlyEmailsIds.indexOf(notification) === -1">
+            <input
+              v-model="user.preferences.pushNotifications[notification]"
+              type="checkbox"
+              @change="set('pushNotifications', notification)"
+            >
+          <td v-else>
+            &nbsp;
+          </td>
+        </tr>
+      </table>
     </div>
   </div>
 </template>
@@ -74,6 +73,8 @@ export default {
   data () {
     return {
       notificationsIds: Object.freeze([
+        'majorUpdates',
+        'onboarding',
         'newPM',
         'wonChallenge',
         'giftedGems',
@@ -85,8 +86,6 @@ export default {
         'invitedQuest',
         'importantAnnouncements',
         'weeklyRecaps',
-        'onboarding',
-        'majorUpdates',
         'subscriptionReminders',
       ]),
       // list of email-only notifications
diff --git a/website/common/locales/en/settings.json b/website/common/locales/en/settings.json
index e018b2a421..c60c370c98 100644
--- a/website/common/locales/en/settings.json
+++ b/website/common/locales/en/settings.json
@@ -120,7 +120,7 @@
     "giftedSubscriptionFull": "Hello <%= username %>, <%= sender %> has sent you <%= monthCount %> months of subscription!",
     "giftedSubscriptionWinterPromo": "Hello <%= username %>, you received <%= monthCount %> months of subscription as part of our holiday gift-giving promotion!",
     "invitedParty": "You were invited to a Party",
-    "invitedGuild": "You were invited to a  Guild",
+    "invitedGuild": "You were invited to a Guild",
     "importantAnnouncements": "Reminders to check in to complete tasks and receive prizes",
     "weeklyRecaps": "Summaries of your account activity in the past week (Note: this is currently disabled due to performance issues, but we hope to have this back up and sending e-mails again soon!)",
     "onboarding": "Guidance with setting up your Habitica account",
@@ -211,4 +211,4 @@
     "suggestMyUsername": "Suggest my username",
     "everywhere": "Everywhere",
     "onlyPrivateSpaces": "Only in private spaces"
-}
\ No newline at end of file
+}