From 9ec1917e6d322b5cbc21e2df0091059005ca434b Mon Sep 17 00:00:00 2001 From: SabreCat Date: Wed, 15 Feb 2023 16:54:46 -0600 Subject: [PATCH 01/15] feat(invites): provide link to inviting user in party notif Also changes basic links sitewide to purple-300 --- website/client/src/assets/scss/markdown.scss | 3 -- .../client/src/assets/scss/typography.scss | 20 +++++----- website/client/src/components/appFooter.vue | 14 +------ .../client/src/components/groups/tavern.vue | 16 +------- .../header/notifications/partyInvitation.vue | 32 +++++++++++++++- .../header/notificationsDropdown.vue | 2 +- .../payments/cancelModalConfirm.vue | 1 - website/client/src/store/actions/members.js | 38 ------------------- website/common/locales/en/groups.json | 1 + 9 files changed, 43 insertions(+), 84 deletions(-) diff --git a/website/client/src/assets/scss/markdown.scss b/website/client/src/assets/scss/markdown.scss index c1e517ed78..19f9e45bc1 100644 --- a/website/client/src/assets/scss/markdown.scss +++ b/website/client/src/assets/scss/markdown.scss @@ -50,10 +50,7 @@ h3.markdown { } a { - color: $blue-10; - &:hover, &:active, &:focus { - color: $blue-10; text-decoration: underline; } } diff --git a/website/client/src/assets/scss/typography.scss b/website/client/src/assets/scss/typography.scss index a15f2b7eae..970fd41737 100644 --- a/website/client/src/assets/scss/typography.scss +++ b/website/client/src/assets/scss/typography.scss @@ -26,19 +26,17 @@ a:not([href]), a:not([href]):hover { a, a:not([href]):not([tabindex]) { cursor: pointer; + color: $purple-300; - &.standard-link { - color: $blue-10; + &:hover, &:active, &:focus { + text-decoration: underline; + color: $purple-300; + } - &:hover, &:active, &:focus { - text-decoration: underline; - } - - &[disabled="disabled"] { - color: $gray-300; - text-decoration: none; - cursor: default; - } + &[disabled="disabled"] { + color: $gray-300; + text-decoration: none; + cursor: default; } &.small-link { diff --git a/website/client/src/components/appFooter.vue b/website/client/src/components/appFooter.vue index 371abef107..69ec6b0e2f 100644 --- a/website/client/src/components/appFooter.vue +++ b/website/client/src/components/appFooter.vue @@ -108,6 +108,7 @@ v-if="user" > @@ -479,10 +480,6 @@ footer { color: $purple-300; text-decoration: underline; } - a:not([href]):not([class]):hover { // needed to make "report a bug"'s hover state correct - color: $purple-300; - text-decoration: underline; - } column-gap: 1.5rem; display: grid; @@ -682,11 +679,6 @@ h3 { footer { padding: 24px 16px; - a:not([href]):not([class]):hover { // needed to make "report a bug"'s hover state correct - color: $purple-300; - text-decoration: underline; - } - column-gap: 1.5rem; display: grid; grid-template-areas: @@ -726,10 +718,6 @@ h3 { @media (max-width: 1024px) and (min-width: 768px) { footer { padding: 24px 24px; - a:not([href]):not([class]):hover { // needed to make "report a bug"'s hover state correct - color: $purple-300; - text-decoration: underline; - } } .desktop { diff --git a/website/client/src/components/groups/tavern.vue b/website/client/src/components/groups/tavern.vue index 5853384691..712eed7cb6 100644 --- a/website/client/src/components/groups/tavern.vue +++ b/website/client/src/components/groups/tavern.vue @@ -346,6 +346,7 @@
  • @@ -521,21 +522,6 @@ margin-left: .5em; } -// formats the report a bug link to match the others - a:not([href]) { - &:not([role=button]) { - color: #007bff; - text-decoration: none; - } - } - - a:not([href]):hover { - &:not([role=button]) { - color: #0056b3; - text-decoration: underline; - } - } - .tier1-icon, .tier2-icon { width: 11px; } diff --git a/website/client/src/components/header/notifications/partyInvitation.vue b/website/client/src/components/header/notifications/partyInvitation.vue index b454d02091..b919e9442a 100644 --- a/website/client/src/components/header/notifications/partyInvitation.vue +++ b/website/client/src/components/header/notifications/partyInvitation.vue @@ -5,7 +5,14 @@ :notification="notification" >
    -
    +
    +
    {{ $t('dismissAll') }} diff --git a/website/client/src/components/payments/cancelModalConfirm.vue b/website/client/src/components/payments/cancelModalConfirm.vue index 680e8919aa..d5e0823ac2 100644 --- a/website/client/src/components/payments/cancelModalConfirm.vue +++ b/website/client/src/components/payments/cancelModalConfirm.vue @@ -31,7 +31,6 @@ {{ $t('neverMind') }}
    diff --git a/website/client/src/store/actions/members.js b/website/client/src/store/actions/members.js index 4d045b9743..85e44251a2 100644 --- a/website/client/src/store/actions/members.js +++ b/website/client/src/store/actions/members.js @@ -1,8 +1,5 @@ import axios from 'axios'; -// import omit from 'lodash/omit'; -// import findIndex from 'lodash/findIndex'; - const apiv4Prefix = '/api/v4'; export async function getGroupMembers (store, payload) { @@ -117,38 +114,3 @@ export async function getPurchaseHistory (store, payload) { const response = await axios.get(`${apiv4Prefix}/members/${payload.memberId}/purchase-history`); return response.data.data; } - -// export async function selectMember (uid) { -// let memberIsReady = _checkIfMemberIsReady(members[uid]); -// -// if (memberIsReady) { -// _prepareMember(members[uid], self); -// return -// } else { -// fetchMember(uid) -// .then(function (response) { -// var member = response.data.data; -// addToMembersList(member); // lazy load for later -// _prepareMember(member, self); -// deferred.resolve(); -// }); -// } -// } - -// function addToMembersList (member) { -// if (member._id) { -// members[member._id] = member; -// } -// } - -// function _checkIfMemberIsReady (member) { -// return member && member.items && member.items.weapon; -// } -// -// function _prepareMember(member, self) { -// self.selectedMember = members[member._id]; -// } -// -// $rootScope.$on('userUpdated', function(event, user){ -// addToMembersList(user); -// }) diff --git a/website/common/locales/en/groups.json b/website/common/locales/en/groups.json index e6ab1a4db2..44cd96feeb 100644 --- a/website/common/locales/en/groups.json +++ b/website/common/locales/en/groups.json @@ -25,6 +25,7 @@ "invite": "Invite", "leave": "Leave", "invitedToParty": "You were invited to join the Party <%- party %>", + "invitedToPartyBy": "\" target=\"_blank\">@<%- userName %> has invited you to join the Party <%- party %>", "invitedToPrivateGuild": "You were invited to join the private Guild <%- guild %>", "invitedToPublicGuild": "You were invited to join the Guild <%- guild %>", "invitationAcceptedHeader": "Your Invitation has been Accepted", From 4a1011f1afc18a61cb0be18b8a1fc2f9be01147e Mon Sep 17 00:00:00 2001 From: SabreCat Date: Thu, 16 Feb 2023 12:57:35 -0600 Subject: [PATCH 02/15] fix(hyperlinks): remove some blue overrides --- website/client/src/components/tasks/approvalFooter.vue | 1 - website/client/src/components/tasks/user.vue | 1 - website/client/src/components/ui/purchaseHistoryTable.vue | 5 ----- 3 files changed, 7 deletions(-) diff --git a/website/client/src/components/tasks/approvalFooter.vue b/website/client/src/components/tasks/approvalFooter.vue index 511aea25e6..142c96994a 100644 --- a/website/client/src/components/tasks/approvalFooter.vue +++ b/website/client/src/components/tasks/approvalFooter.vue @@ -81,7 +81,6 @@ {{ $t('viewStatus') }} diff --git a/website/client/src/components/tasks/user.vue b/website/client/src/components/tasks/user.vue index 4c93b47259..633b8c8da0 100644 --- a/website/client/src/components/tasks/user.vue +++ b/website/client/src/components/tasks/user.vue @@ -276,7 +276,6 @@ a { font-size: 12px; line-height: 1.33; - color: $blue-10; margin-top: 4px; &:focus, &:hover, &:active { diff --git a/website/client/src/components/ui/purchaseHistoryTable.vue b/website/client/src/components/ui/purchaseHistoryTable.vue index 1da62cde1e..a8a863c613 100644 --- a/website/client/src/components/ui/purchaseHistoryTable.vue +++ b/website/client/src/components/ui/purchaseHistoryTable.vue @@ -182,7 +182,6 @@
    - @@ -296,10 +295,6 @@ width: 50%; } - .challenge-link, .user-link { - color: $blue-10 !important; - } - .entry-action { b { text-transform: uppercase; From 14f9debfdb99c521aed825efcb28ef600c51902b Mon Sep 17 00:00:00 2001 From: SabreCat Date: Thu, 16 Feb 2023 14:34:24 -0600 Subject: [PATCH 03/15] fix(css): remove yet more blue-10 overrides --- website/client/src/components/bugReportModal.vue | 1 - website/client/src/components/bugReportSuccessModal.vue | 1 - website/client/src/components/chat/reportFlagModal.vue | 1 - website/client/src/components/groups/inviteModal.vue | 1 - website/client/src/components/groups/questDetailModal.vue | 4 ---- website/client/src/components/groups/questSidebarSection.vue | 2 -- website/client/src/components/payments/selectUserModal.vue | 1 - website/client/src/components/tasks/approvalFooter.vue | 4 ---- website/client/src/components/tasks/taskModal.vue | 1 - 9 files changed, 16 deletions(-) diff --git a/website/client/src/components/bugReportModal.vue b/website/client/src/components/bugReportModal.vue index 92d096264d..8712c910d3 100644 --- a/website/client/src/components/bugReportModal.vue +++ b/website/client/src/components/bugReportModal.vue @@ -159,7 +159,6 @@ label { } .cancel-link { - color: $blue-10; line-height: 1.71; } diff --git a/website/client/src/components/bugReportSuccessModal.vue b/website/client/src/components/bugReportSuccessModal.vue index cc778de2b4..337e5580cd 100644 --- a/website/client/src/components/bugReportSuccessModal.vue +++ b/website/client/src/components/bugReportSuccessModal.vue @@ -107,7 +107,6 @@ label { } .cancel-link { - color: $blue-10; line-height: 1.71; } diff --git a/website/client/src/components/chat/reportFlagModal.vue b/website/client/src/components/chat/reportFlagModal.vue index 53b2f0f020..1860eec5b7 100644 --- a/website/client/src/components/chat/reportFlagModal.vue +++ b/website/client/src/components/chat/reportFlagModal.vue @@ -77,7 +77,6 @@ } a.cancel-link { - color: $blue-10; margin-right: .5em; } diff --git a/website/client/src/components/groups/inviteModal.vue b/website/client/src/components/groups/inviteModal.vue index 8dea93eaf9..81872c01cd 100644 --- a/website/client/src/components/groups/inviteModal.vue +++ b/website/client/src/components/groups/inviteModal.vue @@ -78,7 +78,6 @@ @import '~@/assets/scss/colors.scss'; a:not([href]) { - color: $blue-10; font-size: 16px; } diff --git a/website/client/src/components/groups/questDetailModal.vue b/website/client/src/components/groups/questDetailModal.vue index f5a08c5714..ecdc07b01a 100644 --- a/website/client/src/components/groups/questDetailModal.vue +++ b/website/client/src/components/groups/questDetailModal.vue @@ -245,10 +245,6 @@ text-align: center; color: $gray-100; - - a { - color: $blue-10; - } } #quest-detail-modal { diff --git a/website/client/src/components/groups/questSidebarSection.vue b/website/client/src/components/groups/questSidebarSection.vue index 994936bbd1..c8ff89e822 100644 --- a/website/client/src/components/groups/questSidebarSection.vue +++ b/website/client/src/components/groups/questSidebarSection.vue @@ -377,11 +377,9 @@ .members-invited { min-height: 1rem; - color: $blue-10; margin: 0; &:hover, &:focus { - color: $blue-10; text-decoration: underline; } } diff --git a/website/client/src/components/payments/selectUserModal.vue b/website/client/src/components/payments/selectUserModal.vue index 818b98c621..afe8181fb5 100644 --- a/website/client/src/components/payments/selectUserModal.vue +++ b/website/client/src/components/payments/selectUserModal.vue @@ -180,7 +180,6 @@ @import '~@/assets/scss/colors.scss'; a:not([href]) { - color: $blue-10; font-size: 0.875rem; line-height: 1.71; } diff --git a/website/client/src/components/tasks/approvalFooter.vue b/website/client/src/components/tasks/approvalFooter.vue index 142c96994a..4d738a6c01 100644 --- a/website/client/src/components/tasks/approvalFooter.vue +++ b/website/client/src/components/tasks/approvalFooter.vue @@ -127,10 +127,6 @@ padding-top: 0.25rem; z-index: 9; height: 24px; - - .blue-10 { - color: $blue-10; - } } .completion-row { diff --git a/website/client/src/components/tasks/taskModal.vue b/website/client/src/components/tasks/taskModal.vue index 0dae29e9a5..7d50493b46 100644 --- a/website/client/src/components/tasks/taskModal.vue +++ b/website/client/src/components/tasks/taskModal.vue @@ -593,7 +593,6 @@ a:not(.dropdown-item) { font-size: 12px; line-height: 1.33; - color: $blue-10; } .modal-dialog.modal-sm { From 3354ca048c23a851672d46062e05bcd9b84843ce Mon Sep 17 00:00:00 2001 From: SabreCat Date: Mon, 6 Mar 2023 15:36:17 -0600 Subject: [PATCH 04/15] fix(analytics): record missing group ID info also update subproject while I'm here --- habitica-images | 2 +- website/server/controllers/api-v3/groups.js | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/habitica-images b/habitica-images index 0393ffa0b9..973f84ead2 160000 --- a/habitica-images +++ b/habitica-images @@ -1 +1 @@ -Subproject commit 0393ffa0b95ce9ed4fa04646db56bf1882e29bb1 +Subproject commit 973f84ead2613073f301c1e2b5496d08163f7507 diff --git a/website/server/controllers/api-v3/groups.js b/website/server/controllers/api-v3/groups.js index c16ba61c7e..d6431e40cd 100644 --- a/website/server/controllers/api-v3/groups.js +++ b/website/server/controllers/api-v3/groups.js @@ -165,6 +165,7 @@ api.createGroup = { hitType: 'event', category: 'behavior', owner: true, + groupId: savedGroup._id, groupType: savedGroup.type, privacy: savedGroup.privacy, headers: req.headers, @@ -214,6 +215,7 @@ api.createGroupPlan = { hitType: 'event', category: 'behavior', owner: true, + groupId: savedGroup._id, groupType: savedGroup.type, privacy: savedGroup.privacy, headers: req.headers, @@ -736,6 +738,7 @@ api.joinGroup = { hitType: 'event', category: 'behavior', owner: false, + groupId: group._id, groupType: group.type, privacy: group.privacy, headers: req.headers, @@ -1205,6 +1208,7 @@ api.inviteToGroup = { uuid: user._id, hitType: 'event', category: 'behavior', + groupId: group._id, groupType: group.type, headers: req.headers, }; From f2fe83a469d16aa7f030b0bb62ac0a8b960242e3 Mon Sep 17 00:00:00 2001 From: Natalie L <78037386+CuriousMagpie@users.noreply.github.com> Date: Mon, 6 Mar 2023 17:16:23 -0500 Subject: [PATCH 05/15] feature(upgrade): copy Pause Damage button to Settings page (#14532) * feature(upgrade): copying Pause Damage button to Settings page * Removing duplicate string 'cause I can't search effectively. :sweat_smile: --- .../client/src/components/settings/site.vue | 39 +++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/website/client/src/components/settings/site.vue b/website/client/src/components/settings/site.vue index 671e94da39..c8021b9605 100644 --- a/website/client/src/components/settings/site.vue +++ b/website/client/src/components/settings/site.vue @@ -7,6 +7,38 @@ {{ $t('settings') }}
    +
    +
    {{ $t('pauseDailies') }}
    +

    {{ $t('sleepDescription') }}

    +
      +
    • + {{ $t('sleepBullet1') }} +
      • +
    • + {{ $t('sleepBullet2') }} +
      • +
    • + {{ $t('sleepBullet3') }} +
      • +
    + + +
    +
    {{ $t('language') }}