Gifting modal design (#14124)

* update selectUserModal.vue * more updates to selectUserModal.vue, typo fix in subscriber.json * remove exact sizing for selectUserModal.vue * update to size for selectUserModal.vue * added sendGiftModal.vue file * updates to selectUser & sendGift modals * making the modals go & position cursor * working working working * added a return to method * avatar display & placeholder profile.name and username * subscription-options added * added menu row & started on gem options * Added selectPage function, have not tested. * updated habitica-images * state changes * bringing in gem counter * arranging elements * state changes, gem input boxes * styling sendGiftModal.vue * more sendGiftModal.vue styling and new close.svg icon * more styling! * and more styling of send own gems part of page * images update * more styling of own gems & some attempts to adjust :class on the menu * styling styling styling * replace +/- svg, styling * styling, mostly * new SVGs * stylin' * reverting svg changes * no more stylin' * finally got the +/- icons to show up...but they're the wrong color * solved svg icon color problem! :) * habitica-images * working on sendGift part of button * trying to make it do math, failing * more attempts at math * +/- buttons work on gem pages & cost calculation on buyGems * trying to get hover colors working on +/- svgs * formatted dollar amount as currency * css/html for subscription-options & payments-buttons simplified * swag at payments-buttons parameter (not tested) * send gems from own balance works! * working on starting page * increment gem amount limited to maxGems and not < 0 * uncommented onHide() * got bg color on sub options to work! yay! * payment buttons! * making g1g1 look good * position modal on page properly & code clean-up * Changes as requested! * small color update * fixed ternary function * chore(html): indentation and comments * fix(fn): correct catch for under-0 * chore(json): whitespace * update gem styling; add linebreak to notifications.vue bc linter * updating subscriptionOptions * snackbar css fix * reverting commit e16c12f * removing merge conflict markers * just a little comment * fixed some navigation, clear input field on selectPage, cleaned up code; another try at subscriptionOption.vue * merge upstream/develop * update selectPage() to disable Gems menu items when on 'ownGems' or 'buyGems' states * working on subscriptionOptions.vue logic * fix(script): changed props & added updateSubscriptionData() * fix(script): forgot to call updateSubscriptionData() * fix(scripts): corrected :userReceivingGift on sendGiftModal.vue * fix(scripts): correct props userReceivingGift to an Object * fix(scripts): corrected v-if & revised props * fix(style/html/whitespace): updated css for close.svg and added missing </div> * style(radio-buttons): updated focus states and added hover states * style(radio-buttons): refined focus and hover states * fix(function): changed buyGemsLink to buyGems; still working on menu * style(radio buttons): ensured consistent display of radio buttons through-out site; still struggling with hover states * style(radio buttons): updated focus/active/hover to match design & removed unnecessary code * fix: set default subscription option to 1 month * fix(function): add default amounts to gem states when modal selected from user profile * fix(build): use develop package json * fix: SCSS commenting & abstracted setGemsDefault() * fix(packages): revert to develop * fix: remove unnecessary console.log statement Co-authored-by: SabreCat <sabe@habitica.com>
2022-07-13 15:17:28 -04:00
parent 94b9bb1036
commit 3aa7b8b447
16 changed files with 956 additions and 60 deletions
@@ -129,6 +129,7 @@
  "sendGiftHeading": "Send Gift to <%= name %>",
  "sendGiftGemsBalance": "From <%= number %> Gems",
  "sendGiftCost": "Total: $<%= cost %> USD",
+  "sendGiftTotal": "Total:",
  "sendGiftFromBalance": "From Balance",
  "sendGiftPurchase": "Purchase",
  "sendGiftMessagePlaceholder": "Personal message (optional)",
@@ -125,6 +125,7 @@
    "unsubscribeAllPush": "Check to Unsubscribe from all Push Notifications",
    "correctlyUnsubscribedEmailType": "Correctly unsubscribed from \"<%= emailType %>\" emails.",
    "subscriptionRateText": "Recurring <strong>$<%= price %> USD</strong> every <strong><%= months %> months</strong>",
+    "giftSubscriptionRateText": "<strong>$<%= price %> USD</strong> for <strong><%= months %> months</strong>",
    "benefits": "Benefits",
    "coupon": "Coupon",
    "couponText": "We sometimes have events and give out promo codes for special gear. (eg, those who stop by our Wondercon booth)",
@@ -3,6 +3,10 @@
    "subscriptions": "Subscriptions",
    "viewSubscriptions": "View Subscriptions",
    "sendGems": "Send Gems",
+    "howManyGemsPurchase": "How many Gems would you like to purchase?",
+    "howManyGemsSend":"How many Gems would you like to send?",
+    "needToPurchaseGems": "Need to purchase Gems as a gift?",
+    "wantToSendOwnGems": "Want to send your own Gems?",
    "buyGemsGold": "Buy Gems with Gold",
    "mustSubscribeToPurchaseGems": "Must subscribe to purchase gems with GP",
    "reachedGoldToGemCapQuantity": "Your requested amount <%= quantity %> exceeds the amount you can buy for this month (<%= convCap %>). The full amount becomes available within the first three days of each month. Thanks for subscribing!",
@@ -198,5 +202,6 @@
    "needToUpdateCard": "Need to update your card?",
    "readyToResubscribe": "Are you ready to resubscribe?",
    "cancelYourSubscription": "Cancel your subscription?",
-    "cancelSubAlternatives": "If you're having technical problems or Habitica doesn't seem to be working out for you, please consider <a href='mailto:admin@habitica.com'>contacting us</a>. We want to help you get the most from Habitica."
+    "cancelSubAlternatives": "If you're having technical problems or Habitica doesn't seem to be working out for you, please consider <a href='mailto:admin@habitica.com'>contacting us</a>. We want to help you get the most from Habitica.",
+    "sendAGift": "Send Gift"
 }