labels fix

This commit is contained in:
Čarodej
2021-11-24 18:06:11 +01:00
parent f71a31ab78
commit 9503ecbd79
6 changed files with 34 additions and 24 deletions

View File

@@ -1,6 +1,6 @@
<template>
<div class="widget">
<div class="widget-content bg-white">
<div class="widget-content dark:bg-dark-foreground bg-white">
<div class="headline">
<div class="icon">
<users-icon v-if="icon === 'users'" size="19" class="text-theme dark-text-theme"/>
@@ -59,9 +59,6 @@
}
.dark {
.widget-content {
background: $dark_mode_foreground;
}
.headline {
.title {

View File

@@ -33,11 +33,11 @@
</div>
<!--Stripe notice-->
<InfoBox v-if="config.isSaaS && ! config.stripe_public_key" class="dashboard-notice">
<!-- <InfoBox v-if="config.isSaaS && ! config.stripe_public_key" class="dashboard-notice">
<i18n path="notice.stripe_activation">
<router-link :to="{name: 'AppPayments'}">{{ $t('notice.stripe_activation_button') }}</router-link>
</i18n>
</InfoBox>
</InfoBox>-->
<div class="widgets-total" :class="{'widgets-coll-3': config.isSaaS, 'widgets-coll-2': ! config.isSaaS}">
<WidgetTotals
@@ -47,7 +47,7 @@
:value="data.total_users"
link-route="Users"
:link-name="$t('admin_page_dashboard.w_total_users.link')"
></WidgetTotals>
/>
<WidgetTotals
class="widget"
icon="hard-drive"
@@ -55,7 +55,7 @@
:value="data.total_used_space"
link-route="Users"
:link-name="$t('admin_page_dashboard.w_total_space.link')"
></WidgetTotals>
/>
<WidgetTotals
v-if="config.isSaaS"
class="widget"
@@ -64,15 +64,15 @@
:value="data.total_premium_users"
link-route="Plans"
:link-name="$t('admin_page_dashboard.w_total_premium.link')"
></WidgetTotals>
/>
</div>
<div class="widget-users">
<!-- <div class="widget-users">
<WidgetLatestRegistrations
class="widget"
icon="users"
:title="$t('admin_page_dashboard.w_latest_users.title')"
/>
</div>
</div>-->
</div>
<div id="loader" v-if="isLoading">
<Spinner></Spinner>

View File

@@ -37,18 +37,15 @@
</ColorLabel>
</td>
<td v-if="config.isSaaS">
<span class="text-sm font-bold" v-if="row.data.attributes.subscription">
{{ $t('global.premium') }}
</span>
<span class="text-sm font-bold" v-else>
{{ $t('global.free') }}
<span class="text-sm font-bold">
{{ row.data.relationships.subscription ? $t('global.premium') : $t('global.free') }}
</span>
</td>
<td>
<span v-if="row.data.attributes.storage.capacity !== 0" class="text-sm font-bold">
{{ row.data.attributes.storage.used_formatted }}
</span>
<span v-if="row.data.attributes.storage.capacity == 0" class="text-sm font-bold">
<span v-if="row.data.attributes.storage.capacity === 0" class="text-sm font-bold">
-
</span>
</td>
@@ -56,7 +53,7 @@
<span v-if="row.data.attributes.storage.capacity !== 0" class="text-sm font-bold">
{{ row.data.attributes.storage.capacity_formatted }}
</span>
<span v-if="row.data.attributes.storage.capacity == 0" class="text-sm font-bold">
<span v-if="row.data.attributes.storage.capacity === 0" class="text-sm font-bold">
-
</span>
</td>

View File

@@ -107,10 +107,14 @@
'config'
]),
subscriptionStatus() {
return this.user.data.attributes.subscription ? this.$t('global.premium') : this.$t('global.free')
return this.user.data.relationships.subscription
? this.$t('global.premium')
: this.$t('global.free')
},
subscriptionColor() {
return this.user.data.attributes.subscription ? 'green' : 'purple'
return this.user.data.relationships.subscription
? 'green'
: 'purple'
},
canShowUpgradeWarning() {
return this.config.storageLimit && this.user.data.attributes.storage.used > 95