From 5aea8def3baf8890f0104e8f5233cc1a6374eee6 Mon Sep 17 00:00:00 2001
From: Alys <Alys@users.noreply.github.com>
Date: Sun, 24 Sep 2017 20:06:17 +1000
Subject: [PATCH] new client various fixes: Hall of Heroes is visible, Sort
 gear by Perception, etc (#9070)

* adjust wording and time format for Custom Day Start time confirmation

- explains that this is the EARLIEST possible time for cron
- allows user to see the exact earliest time

* remove unnecessary hyphen from login date in Profile; added whitespace after colons

* allow Hall of Heroes to be seen by non-admin users (except for admin interface)

Also removes a level of code indentation that seemed to be incorrect.

* clarify that Orb of Rebirth costs 0 gems after level 100

Previously, the modal showed just a gem icon with no number, which was misleading.
Now it shows explicitly 0 gems.

* fix spelling mistake (Challeges > Challenges)

* allow equipment to be sorted by Perception

Also change Con > CON, Per > PER, etc for consistency with abbreviations used in other locations.
---
 website/client/components/hall/heroes.vue     | 49 ++++++++++---------
 .../components/inventory/equipment/index.vue  |  1 +
 website/client/components/settings/site.vue   |  4 +-
 .../client/components/shops/market/index.vue  |  2 +-
 .../client/components/userMenu/profile.vue    |  6 +--
 website/common/locales/en/character.json      |  5 +-
 website/common/locales/en/gear.json           |  8 +--
 website/common/locales/en/settings.json       |  1 +
 8 files changed, 40 insertions(+), 36 deletions(-)

diff --git a/website/client/components/hall/heroes.vue b/website/client/components/hall/heroes.vue
index 241374e90b..0545a90f09 100644
--- a/website/client/components/hall/heroes.vue
+++ b/website/client/components/hall/heroes.vue
@@ -1,7 +1,8 @@
 <template lang="pug">
 .row.standard-page
   small.muted(v-html="$t('blurbHallContributors')")
-  .well(v-if='user.contributor.admin')
+  .well
+    div(v-if='user.contributor.admin')
       h2 {{ $t('rewardUser') }}
 
       .row
@@ -69,29 +70,29 @@
             button.form-control.btn.btn-primary(@click='saveHero()')
               | {{ $t('save') }}
 
-      .table-responsive
-        table.table.table-striped
-          thead
-            tr
-              th {{ $t('name') }}
-              th(v-if='user.contributor && user.contributor.admin') {{ $t('UUID') }}
-              th {{ $t('contribLevel') }}
-              th {{ $t('title') }}
-              th {{ $t('contributions') }}
-          tbody
-            tr(v-for='(hero, index) in heroes')
-              td
-                span(v-if='hero.contributor && hero.contributor.admin', :popover="$t('gamemaster')", popover-trigger='mouseenter', popover-placement='right')
-                  a.label.label-default(:class='userLevelStyle(hero)', @click='clickMember(hero, true)')
-                    | {{hero.profile.name}}&nbsp;
-                    //- span(v-class='userAdminGlyphiconStyle(hero)')
-                span(v-if='!hero.contributor || !hero.contributor.admin')
-                  a.label.label-default(v-if='hero.profile', v-class='userLevelStyle(hero)', @click='clickMember(hero, true)') {{hero.profile.name}}
-              td(v-if='user.contributor.admin', @click='populateContributorInput(hero._id, index)').btn-link {{hero._id}}
-              td {{hero.contributor.level}}
-              td {{hero.contributor.text}}
-              td
-                div(v-markdown='hero.contributor.contributions', target='_blank')
+    .table-responsive
+      table.table.table-striped
+        thead
+          tr
+            th {{ $t('name') }}
+            th(v-if='user.contributor && user.contributor.admin') {{ $t('UUID') }}
+            th {{ $t('contribLevel') }}
+            th {{ $t('title') }}
+            th {{ $t('contributions') }}
+        tbody
+          tr(v-for='(hero, index) in heroes')
+            td
+              span(v-if='hero.contributor && hero.contributor.admin', :popover="$t('gamemaster')", popover-trigger='mouseenter', popover-placement='right')
+                a.label.label-default(:class='userLevelStyle(hero)', @click='clickMember(hero, true)')
+                  | {{hero.profile.name}}&nbsp;
+                  //- span(v-class='userAdminGlyphiconStyle(hero)')
+              span(v-if='!hero.contributor || !hero.contributor.admin')
+                a.label.label-default(v-if='hero.profile', v-class='userLevelStyle(hero)', @click='clickMember(hero, true)') {{hero.profile.name}}
+            td(v-if='user.contributor.admin', @click='populateContributorInput(hero._id, index)').btn-link {{hero._id}}
+            td {{hero.contributor.level}}
+            td {{hero.contributor.text}}
+            td
+              div(v-markdown='hero.contributor.contributions', target='_blank')
 </template>
 
 <script>
diff --git a/website/client/components/inventory/equipment/index.vue b/website/client/components/inventory/equipment/index.vue
index 095d894f56..2f4111e539 100644
--- a/website/client/components/inventory/equipment/index.vue
+++ b/website/client/components/inventory/equipment/index.vue
@@ -156,6 +156,7 @@ const sortGearTypes = ['sortByName', 'sortByCon', 'sortByPer', 'sortByStr', 'sor
 const sortGearTypeMap = {
   sortByName: (i) => i.text(),
   sortByCon: 'con',
+  sortByPer: 'per',
   sortByStr: 'str',
   sortByInt: 'int',
 };
diff --git a/website/client/components/settings/site.vue b/website/client/components/settings/site.vue
index 54930b078e..76f704d9b8 100644
--- a/website/client/components/settings/site.vue
+++ b/website/client/components/settings/site.vue
@@ -313,12 +313,12 @@ export default {
         nextCron = nextCron.add(1, 'day');
       }
 
-      return nextCron.format(this.user.preferences.dateFormat.toUpperCase());
+      return nextCron.format(`${this.user.preferences.dateFormat.toUpperCase()} @ h:mm a`);
     },
     openDayStartModal () {
       let nextCron = this.calculateNextCron();
       // @TODO: Add generic modal
-      if (!confirm(`Are you sure you want to change cron? Next cron will be ${nextCron}`)) return;
+      if (!confirm(this.$t('sureChangeCustomDayStartTime', {time: nextCron}))) return;
       this.saveDayStart();
       // $rootScope.openModal('change-day-start', { scope: $scope });
     },
diff --git a/website/client/components/shops/market/index.vue b/website/client/components/shops/market/index.vue
index 6f63d9b4e6..e1be21df27 100644
--- a/website/client/components/shops/market/index.vue
+++ b/website/client/components/shops/market/index.vue
@@ -512,7 +512,7 @@ export default {
               text: this.$t('rebirthName'),
               notes: this.$t('rebirthPop'),
               currency: 'gems',
-              value: this.user.stats.lvl < 100 ? 6 : '',
+              value: this.user.stats.lvl < 100 ? 6 : 0,
             });
           }
 
diff --git a/website/client/components/userMenu/profile.vue b/website/client/components/userMenu/profile.vue
index 696507aa9a..10cf8b61cf 100644
--- a/website/client/components/userMenu/profile.vue
+++ b/website/client/components/userMenu/profile.vue
@@ -46,13 +46,13 @@ div
           .info
             h2 {{ $t('info') }}
             div
-              strong {{ $t('joined') }}:
+              strong {{ $t('joined') }}:&nbsp;
               | {{userJoinedDate}}
             div
-              strong {{ $t('lastLoggedIn') }}:
+              strong {{ $t('latestCheckin') }}:&nbsp;
               | {{userLastLoggedIn}}
             div
-              strong {{ $t('totalLogins') }}:
+              strong {{ $t('totalLogins') }}:&nbsp;
               span {{ $t('totalCheckins', {count: user.loginIncentives}) }}
             div
               | {{getProgressDisplay()}}
diff --git a/website/common/locales/en/character.json b/website/common/locales/en/character.json
index fdb817b84f..9c6aec8c20 100644
--- a/website/common/locales/en/character.json
+++ b/website/common/locales/en/character.json
@@ -203,9 +203,10 @@
   "photo": "Photo",
   "info": "Info",
   "joined": "Joined",
-  "totalLogins": "Total Log Ins",
+  "totalLogins": "Total Check Ins",
+  "latestCheckin": "Latest Check In",
   "editProfile": "Edit Profile",
-  "challengesWon": "Challeges Won",
+  "challengesWon": "Challenges Won",
   "questsCompleted": "Quests Completed",
   "equipment": "Equipment",
   "costume": "Costume",
diff --git a/website/common/locales/en/gear.json b/website/common/locales/en/gear.json
index 043543e388..4482bc753c 100644
--- a/website/common/locales/en/gear.json
+++ b/website/common/locales/en/gear.json
@@ -14,10 +14,10 @@
 
   "sortByType": "Type",
   "sortByPrice": "Price",
-  "sortByCon": "Con",
-  "sortByPer": "Per",
-  "sortByStr": "Str",
-  "sortByInt": "Int",
+  "sortByCon": "CON",
+  "sortByPer": "PER",
+  "sortByStr": "STR",
+  "sortByInt": "INT",
 
   "weapon": "weapon",
   "weaponCapitalized" : "Main-Hand Item",
diff --git a/website/common/locales/en/settings.json b/website/common/locales/en/settings.json
index 901a9d98f8..33a3e9b260 100644
--- a/website/common/locales/en/settings.json
+++ b/website/common/locales/en/settings.json
@@ -47,6 +47,7 @@
     "xml": "(XML)",
     "json": "(JSON)",
     "customDayStart": "Custom Day Start",
+    "sureChangeCustomDayStartTime": "Are you sure you want to change your Custom Day Start time? Your Dailies will next reset the first time you use Habitica after <%= time %>. Make sure you have completed your Dailies before then!",
     "changeCustomDayStart": "Change Custom Day Start?",
     "sureChangeCustomDayStart": "Are you sure you want to change your custom day start?",
     "customDayStartHasChanged": "Your custom day start has changed.",