From ecced2785352f29e8d25f1368f1346e298ae167a Mon Sep 17 00:00:00 2001 From: Prospector <6166773+Prospector@users.noreply.github.com> Date: Tue, 15 Nov 2022 11:41:38 -0800 Subject: [PATCH] CMP Update Hotfixes (#729) * Remove WIP for getting paid * Fix beta badge border * Update money formatting * Add required "not affiliated with Mojang" notice * Replace search video on home page --- assets/styles/components.scss | 4 ++-- components/ui/ModalTransfer.vue | 21 +++++++++++---------- layouts/default.vue | 32 ++++++++++++++++++++++++++------ pages/dashboard/index.vue | 6 +++--- pages/dashboard/revenue.vue | 6 +++--- pages/index.vue | 32 ++++++++++++++++---------------- plugins/shorthands.js | 1 + 7 files changed, 62 insertions(+), 40 deletions(-) diff --git a/assets/styles/components.scss b/assets/styles/components.scss index 4b558d654..6e378c961 100644 --- a/assets/styles/components.scss +++ b/assets/styles/components.scss @@ -920,7 +920,7 @@ h1 { .beta-badge { font-size: 0.7em; - padding: 0.25rem 0.5rem; + padding: 0.2rem 0.4rem; background-color: transparent; box-sizing: border-box; border: 2px solid var(--color-text); @@ -934,7 +934,7 @@ h1 { .beta-badge { background-color: var(--color-button-text-active); box-sizing: border-box; - outline: none; + border-color: transparent; color: var(--color-raised-bg); } } diff --git a/components/ui/ModalTransfer.vue b/components/ui/ModalTransfer.vue index 12aa741f8..e3dc047ac 100644 --- a/components/ui/ModalTransfer.vue +++ b/components/ui/ModalTransfer.vue @@ -4,7 +4,7 @@ You are initiating a transfer of your revenue from Modrinth's Creator Monetization Program. How much of your - ${{ balance }} balance would you like to + {{ $formatMoney(balance) }} balance would you like to transfer?
@@ -31,10 +31,11 @@ to cover {{ $formatWallet(wallet) }} processing fees. I acknowledge that an estimated + {{ $formatMoney(calcProcessingFees()) }} will be deducted from the + amount I receive to cover {{ $formatWallet(wallet) }} processing + fees and that any excess will be returned to my Modrinth + balance. - The amount must be at least ${{ minWithdraw }} - The amount must be no more than ${{ balance }} {{ amount }} is not a valid amount
+
+ NOT AN OFFICIAL MINECRAFT PRODUCT. NOT APPROVED BY OR ASSOCIATED WITH + MOJANG. +
@@ -1024,8 +1028,6 @@ export default { .beta-badge { background-color: var(--color-brand-inverted); - box-sizing: border-box; - outline: none; color: var(--color-text-dark); } } @@ -1081,9 +1083,10 @@ export default { text-align: center; display: grid; grid-template: - 'logo-info logo-info logo-info' auto - 'links-1 links-2 links-3' auto - 'buttons buttons buttons' auto + 'logo-info logo-info logo-info' auto + 'links-1 links-2 links-3' auto + 'buttons buttons buttons' auto + 'notice notice notice' auto / 1fr 1fr 1fr; .logo-info { @@ -1139,8 +1142,21 @@ export default { } } + .not-affiliated-notice { + grid-area: notice; + font-size: var(--font-size-xs); + text-align: center; + font-weight: 500; + margin-top: var(--spacing-card-md); + } + @media screen and (min-width: 1024px) { - display: flex; + display: grid; + margin-inline: auto; + width: fit-content; + grid-template: + 'logo-info links-1 links-2 links-3 buttons' auto + 'notice notice notice notice notice' auto; text-align: unset; .logo-info { @@ -1160,6 +1176,10 @@ export default { margin-right: unset; } } + + .not-affiliated-notice { + margin-top: 0; + } } } } diff --git a/pages/dashboard/index.vue b/pages/dashboard/index.vue index 6b48180df..5a82c0463 100644 --- a/pages/dashboard/index.vue +++ b/pages/dashboard/index.vue @@ -49,8 +49,8 @@
Total revenue
-
${{ $formatNumber(payouts.all_time) }}
- ${{ $formatNumber(payouts.last_month) }} this month +
{{ $formatMoney(payouts.all_time) }}
+ {{ $formatMoney(payouts.last_month) }} this month @@ -61,7 +61,7 @@
Current balance
- ${{ $formatNumber($auth.user.payout_data.balance) }} + {{ $formatMoney($auth.user.payout_data.balance) }}

You have - ${{ $auth.user.payout_data.balance }} + {{ $formatMoney($auth.user.payout_data.balance) }} available to withdraw. Enroll in the Creator Monetization Program to withdraw your @@ -37,13 +37,13 @@

You have made - ${{ $auth.user.payout_data.balance }}{{ $formatMoney($auth.user.payout_data.balance) }}, however you have not yet met the minimum of ${{ minWithdraw }} to withdraw.

You have made - ${{ $auth.user.payout_data.balance }}{{ $formatMoney($auth.user.payout_data.balance) }}, which is under the minimum of ${{ minWithdraw }} to withdraw.

diff --git a/pages/index.vue b/pages/index.vue index dc1850d42..574891208 100644 --- a/pages/index.vue +++ b/pages/index.vue @@ -13,8 +13,8 @@

Find enjoyable, quality content through our open-source - modding platform built for the community. Create stuff, get - paidWIP, and deploy your project with our + modding platform built for the community. Create stuff, get paid, and + deploy your project with our fully documented @@ -42,21 +42,20 @@
-
@@ -387,9 +386,9 @@ export default { height: unset; } - img, - video { + img { border-radius: var(--size-rounded-lg); + box-shadow: var(--shadow-floating); width: 40rem; } @@ -401,6 +400,7 @@ export default { font-family: monospace; font-size: 80%; line-height: 1.5rem; + box-shadow: var(--shadow-floating); .line-nums { display: flex; diff --git a/plugins/shorthands.js b/plugins/shorthands.js index 8f39ce0ec..acd7a049e 100644 --- a/plugins/shorthands.js +++ b/plugins/shorthands.js @@ -16,6 +16,7 @@ export default (ctx, inject) => { return obj }) inject('formatNumber', formatNumber) + inject('formatMoney', (number) => '$' + formatNumber(number.toFixed(2))) inject('formatVersion', (versionsArray) => formatVersions(versionsArray, ctx.store) )