-
diff --git a/website/client/src/components/inventory/items/index.vue b/website/client/src/components/inventory/items/index.vue
index a0e745b2f5..b634c25666 100644
--- a/website/client/src/components/inventory/items/index.vue
+++ b/website/client/src/components/inventory/items/index.vue
@@ -146,7 +146,10 @@
- {{ $t(popoverTextKey, { [translationKey]: itemText() }) }}
-
+ class="draggedItemInfo mouse"
+ @mouseMoved="mouseMoved($event)"
+ >
+
+
+ {{ $t(popoverTextKey, { [translationKey]: itemText() }) }}
+
{{ context.item.text }}
-
+
diff --git a/website/client/src/components/inventory/stable/index.vue b/website/client/src/components/inventory/stable/index.vue
index df651129b5..1e9f2edbe9 100644
--- a/website/client/src/components/inventory/stable/index.vue
+++ b/website/client/src/components/inventory/stable/index.vue
@@ -265,8 +265,9 @@
{{ context.item.notes }}
@@ -224,12 +227,14 @@
-
@@ -41,14 +42,18 @@ v-if="gemCap > 24" class="w-100 green-gradient mb-3 text-center" > -
+
-
{{ $t('gemCap') }}
- {{ gemCap }} / 50
+
+ {{ $t('gemCap') }}
+
+
+ {{ gemCap }} / 50
+
@@ -147,7 +159,8 @@
v-if="hasSubscription && !hasCanceledSubscription"
class="d-flex flex-column align-items-center"
>
-
![]()
diff --git a/website/client/src/components/userMenu/profileStats.vue b/website/client/src/components/userMenu/profileStats.vue
index 05a4762d11..a40e561cb2 100644
--- a/website/client/src/components/userMenu/profileStats.vue
+++ b/website/client/src/components/userMenu/profileStats.vue
@@ -20,7 +20,10 @@
class="gear box"
:class="{white: isUsed(equippedItems, key)}"
>
-
-
-
diff --git a/website/client/src/components/static/subscriptionBenefitsFaq.vue b/website/client/src/components/static/subscriptionBenefitsFaq.vue
index 4e9f6084f9..37959c7715 100644
--- a/website/client/src/components/static/subscriptionBenefitsFaq.vue
+++ b/website/client/src/components/static/subscriptionBenefitsFaq.vue
@@ -54,30 +54,30 @@
{{ $t('subscriptionDetail33') }}
@@ -76,8 +76,8 @@
>
-
{{ $t('difficulty') + ':' }}
diff --git a/website/client/src/components/static/groupPlans.vue b/website/client/src/components/static/groupPlans.vue
index c0a4766e09..aa74449f0b 100644
--- a/website/client/src/components/static/groupPlans.vue
+++ b/website/client/src/components/static/groupPlans.vue
@@ -12,9 +12,21 @@
class="party"
src="../../assets/images/group-plans-static/party@3x.png"
>
-
@@ -56,16 +74,26 @@
class="big-gem mb-3 mx-auto"
src="../../assets/images/group-plans-static/big-gem@3x.png"
>
-
@@ -105,8 +135,13 @@
class="bottom-banner text-center"
:class="{ static: isStaticPage }"
>
-
{{ $t('readyToResubscribe') }}
-
-
-
{{ itemText }}
diff --git a/website/client/src/components/shops/quests/questInfo.vue b/website/client/src/components/shops/quests/questInfo.vue
index ce46a8f5e3..8441bf83e3 100644
--- a/website/client/src/components/shops/quests/questInfo.vue
+++ b/website/client/src/components/shops/quests/questInfo.vue
@@ -26,8 +26,8 @@
@@ -288,7 +307,8 @@
{{ $t('subMonths') }}
@@ -317,7 +337,10 @@
v-html="icons.hourglassLeft"
>
-
+
@@ -125,7 +134,9 @@
class="btn btn-primary"
:class="[canceled ? 'mt-4' : 'mt-3', userReceivingGift?._id ? 'mx-4' : 'w-100']"
@click="$root.$emit('bv::show::modal', 'buy-subscription')"
- > {{ userReceivingGift?._id ? $t('selectPayment') : $t('subscribe') }}
+ >
+ {{ userReceivingGift?._id ? $t('selectPayment') : $t('subscribe') }}
+
@@ -326,11 +349,14 @@
-
+ >
{{ $t('nextHourglass') }}
+
{{ $t('subscribeAgainContinueHourglasses') }}
{{ $t('giftSubscription') }}
-
diff --git a/website/client/src/components/settings/subscriptionOptions.vue b/website/client/src/components/settings/subscriptionOptions.vue
index 8669d2deb0..3c53fb5c40 100644
--- a/website/client/src/components/settings/subscriptionOptions.vue
+++ b/website/client/src/components/settings/subscriptionOptions.vue
@@ -42,12 +42,14 @@
${{ block.price }}.00 USD
+ > + ${{ block.price }}.00 USD + @@ -83,8 +85,12 @@ :class="{ round: userReceivingGift?._id }" >
- $60.00 USD
+
+ $60.00 USD
+
{{ recurrenceText(block.months) }}
@@ -113,10 +119,13 @@
${{ block.price }}.00 USD
-+ ${{ block.price }}.00 USD +
+
{{ itemText }}
diff --git a/website/client/src/components/shops/quests/questInfo.vue b/website/client/src/components/shops/quests/questInfo.vue
index ce46a8f5e3..8441bf83e3 100644
--- a/website/client/src/components/shops/quests/questInfo.vue
+++ b/website/client/src/components/shops/quests/questInfo.vue
@@ -26,8 +26,8 @@
{{ quest.boss.hp }}
{{ $t('upgradeYourCrew') }}
-{{ $t('groupPlanTitle') }}
-{{ $t('groupPlanDesc') }}
++ {{ $t('upgradeYourCrew') }} +
++ {{ $t('groupPlanTitle') }} +
++ {{ $t('groupPlanDesc') }} +
Just
$9
@@ -30,12 +42,16 @@
{{ $t('getStarted') }}
- {{ $t('billedMonthly') }}
++ {{ $t('billedMonthly') }} +
-
{{ $t('teamBasedTasksList') }}
++ {{ $t('teamBasedTasksList') }} +
{{ $t('teamBasedTasksListDesc') }}
@@ -47,7 +63,9 @@
-
{{ $t('groupManagementControls') }}
++ {{ $t('groupManagementControls') }} +
{{ $t('groupManagementControlsDesc') }}
{{ $t('inGameBenefits') }}
-{{ $t('inGameBenefitsDesc') }}
++ {{ $t('inGameBenefits') }} +
++ {{ $t('inGameBenefitsDesc') }} +
-
+
+
{{ $t('readyToUpgrade') }}
-
+
{{ $t('createGroupToday') }}
@@ -83,7 +111,9 @@
{{ $t('getStarted') }}
-
{{ $t('createGroupToday') }}
@@ -83,7 +111,9 @@
{{ $t('getStarted') }}
- {{ $t('billedMonthly') }}
++ {{ $t('billedMonthly') }} +
{{ $t('interestedLearningMore') }}
- ++ {{ $t('interestedLearningMore') }} +
+{{ $t('commonQuestions') }}
-{{ $t('subscriptionDetail40')}}
-{{ $t('subscriptionDetail400')}}
-{{ $t('subscriptionDetail41')}}
-{{ $t('subscriptionDetail410')}}
-{{ $t('subscriptionDetail42')}}
-{{ $t('subscriptionDetail420')}}
-{{ $t('subscriptionDetail43')}}
-{{ $t('subscriptionDetail430')}}
-{{ $t('subscriptionDetail44')}}
-{{ $t('subscriptionDetail440')}}
+{{ $t('subscriptionDetail40') }}
+{{ $t('subscriptionDetail400') }}
+{{ $t('subscriptionDetail41') }}
+{{ $t('subscriptionDetail410') }}
+{{ $t('subscriptionDetail42') }}
+{{ $t('subscriptionDetail420') }}
+{{ $t('subscriptionDetail43') }}
+{{ $t('subscriptionDetail430') }}
+{{ $t('subscriptionDetail44') }}
+{{ $t('subscriptionDetail440') }}
- {{ $t('subscriptionDetail4400', { initialNumber: 25, roundedNumber: 26 }) }}
- {{ $t('subscriptionDetail4400', { initialNumber: 35, roundedNumber: 36 }) }}
- {{ $t('subscriptionDetail4400', { initialNumber: 45, roundedNumber: 46 }) }}
{{ $t('subscriptionDetail45')}}
-{{ $t('subscriptionDetail450')}}
-{{ $t('subscriptionDetail451')}}
-{{ $t('subscriptionDetail46')}}
-{{ $t('subscriptionDetail460')}}
-{{ $t('subscriptionDetail47')}}
-{{ $t('subscriptionDetail470')}}
-{{ $t('subscriptionDetail48')}}
-{{ $t('subscriptionDetail480')}}
+{{ $t('subscriptionDetail45') }}
+{{ $t('subscriptionDetail450') }}
+{{ $t('subscriptionDetail451') }}
+{{ $t('subscriptionDetail46') }}
+{{ $t('subscriptionDetail460') }}
+{{ $t('subscriptionDetail47') }}
+{{ $t('subscriptionDetail470') }}
+{{ $t('subscriptionDetail48') }}
+{{ $t('subscriptionDetail480') }}
parsedURL.hostname.includes(domain.hostname));
}
-console.log(import.meta)
+console.log(import.meta);
const TRUSTED_DOMAINS = import.meta.env.TRUSTED_DOMAINS.split(',')
.map(u => (u === 'localhost' ? new URL('http://localhost') : new URL(u)));
diff --git a/website/client/src/pages/settings-overview.vue b/website/client/src/pages/settings-overview.vue
index b543005110..65e7710cff 100644
--- a/website/client/src/pages/settings-overview.vue
+++ b/website/client/src/pages/settings-overview.vue
@@ -49,10 +49,12 @@
class="col-12 d-flex"
:class="{'justify-content-center': applyNarrowView || maxWidthView}"
>
-
+
diff --git a/website/client/src/router/index.js b/website/client/src/router/index.js
index 7113048308..c0b6f2b765 100644
--- a/website/client/src/router/index.js
+++ b/website/client/src/router/index.js
@@ -40,22 +40,22 @@ const EquipmentPage = () => import('@/components/inventory/equipment/index');
const StablePage = () => import('@/components/inventory/stable/index');
// Guilds & Parties
-const GroupPage = () => import( '@/components/groups/group');
-const GroupPlansAppPage = () => import( '@/components/static/groupPlans');
-const LookingForParty = () => import( '@/components/groups/lookingForParty');
+const GroupPage = () => import('@/components/groups/group');
+const GroupPlansAppPage = () => import('@/components/static/groupPlans');
+const LookingForParty = () => import('@/components/groups/lookingForParty');
// Group Plans
-const GroupPlanIndex = () => import( '@/components/group-plans/index');
-const GroupPlanTaskInformation = () => import( '@/components/group-plans/taskInformation');
-const GroupPlanBilling = () => import( '@/components/group-plans/billing');
+const GroupPlanIndex = () => import('@/components/group-plans/index');
+const GroupPlanTaskInformation = () => import('@/components/group-plans/taskInformation');
+const GroupPlanBilling = () => import('@/components/group-plans/billing');
-const MessagesIndex = () => import( '@/pages/private-messages/index.vue');
+const MessagesIndex = () => import('@/pages/private-messages/index.vue');
// Challenges
-const ChallengeIndex = () => import( '@/components/challenges/index');
-const MyChallenges = () => import( '@/components/challenges/myChallenges');
-const FindChallenges = () => import( '@/components/challenges/findChallenges');
-const ChallengeDetail = () => import( '@/components/challenges/challengeDetail');
+const ChallengeIndex = () => import('@/components/challenges/index');
+const MyChallenges = () => import('@/components/challenges/myChallenges');
+const FindChallenges = () => import('@/components/challenges/findChallenges');
+const ChallengeDetail = () => import('@/components/challenges/challengeDetail');
// Shops
const ShopsContainer = () => import('@/components/shops/index');