krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-17 14:47:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Updates notifications screen to a more consistent UI (#11635)

Browse Source
This commit is contained in:
Glendon Solsberry
2019-12-23 11:45:42 -05:00
committed by Matteo Pagliazzi
parent 6b072f0f8f
commit b9af3fb40e
2 changed files with 36 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

69
website/client/src/components/settings/notifications.vue
View File

@@ -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

4
website/common/locales/en/settings.json
View File

@@ -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"
}
}