Split User Enabled vs Email verified in admin views

Author: lcharette

packages/sprinkle-core/app/locale/en_US/messages.php

@@ -119,7 +119,9 @@
     'TRY_AGAIN'                => 'Try again',
     'UNACTIVATED'              => 'Unactivated',
     'UNKNOWN'                  => 'Unknown',
+    'UNVERIFIED'               => 'Unverified',
     'UPDATE'                   => 'Update',
+    'VERIFIED'                 => 'Verified',
     'VIEW'                     => 'View',
     'WARNING_CANNOT_UNDONE'    => 'This action cannot be undone.',
     'YES'                      => 'Yes',

packages/sprinkle-core/app/locale/fr_FR/messages.php

@@ -119,7 +119,9 @@
     'TRY_AGAIN'                => 'Réessayer',
     'UNACTIVATED'              => 'Non activé',
     'UNKNOWN'                  => 'Inconnu',
+    'UNVERIFIED'               => 'Non vérifié',
     'UPDATE'                   => 'Mettre à jour',
+    'VERIFIED'                 => 'Vérifié',
     'VIEW'                     => 'Voir',
     'WARNING_CANNOT_UNDONE'    => 'Cette action ne peut être annulée.',
     'YES'                      => 'Oui',

packages/theme-pink-cupcake/src/components/Pages/Admin/Group/GroupUsers.vue

@@ -34,9 +34,6 @@ const { slug } = defineProps<{
                     <UFLabel :severity="Severity.Danger" v-if="item.flag_enabled == false">
                         {{ $t('DISABLED') }}
                     </UFLabel>
-                    <UFLabel :severity="Severity.Warning" v-else-if="item.flag_verified == false">
-                        {{ $t('UNACTIVATED') }}
-                    </UFLabel>
                     <UFLabel :severity="Severity.Success" v-else>
                         {{ $t('ENABLED') }}
                     </UFLabel>

packages/theme-pink-cupcake/src/components/Pages/Admin/User/UserInfo.vue

@@ -31,6 +31,14 @@ const emits = defineEmits(['updated'])
         <dl class="uk-description-list" v-if="$checkAccess('view_user_field')">
             <dt><font-awesome-icon icon="envelope" /> {{ $t('EMAIL') }}</dt>
             <dd class="uk-text-meta">{{ user.email }}</dd>
+            <dd class="uk-text-meta">
+                <UFLabel :severity="Severity.Warning" v-if="user.flag_verified == false">
+                    {{ $t('UNVERIFIED') }}
+                </UFLabel>
+                <UFLabel :severity="Severity.Success" v-else>
+                    {{ $t('VERIFIED') }}
+                </UFLabel>
+            </dd>
             <dt><font-awesome-icon icon="users" /> {{ $t('GROUP') }}</dt>
             <dd class="uk-text-meta" v-if="user.group">
                 <router-link :to="{ name: 'admin.group', params: { slug: user.group.slug } }">
@@ -47,9 +55,6 @@ const emits = defineEmits(['updated'])
                 <UFLabel :severity="Severity.Danger" v-if="user.flag_enabled == false">
                     {{ $t('DISABLED') }}
                 </UFLabel>
-                <UFLabel :severity="Severity.Warning" v-else-if="user.flag_verified == false">
-                    {{ $t('UNACTIVATED') }}
-                </UFLabel>
                 <UFLabel :severity="Severity.Success" v-else>
                     {{ $t('ACTIVE') }}
                 </UFLabel>

packages/theme-pink-cupcake/src/views/Admin/UsersPage.vue

@@ -22,6 +22,7 @@ import UserPasswordResetModal from '../../components/Pages/Admin/User/UserPasswo
                 <UFSprunjeHeader sort="name">{{ $t('USER') }}</UFSprunjeHeader>
                 <UFSprunjeHeader sort="last_activity">{{ $t('ACTIVITY.LAST') }}</UFSprunjeHeader>
                 <UFSprunjeHeader sort="status">{{ $t('STATUS') }}</UFSprunjeHeader>
+                <UFSprunjeHeader sort="status">{{ $t('EMAIL') }}</UFSprunjeHeader>
                 <UFSprunjeHeader>{{ $t('ACTIONS') }}</UFSprunjeHeader>
             </template>
 
@@ -46,13 +47,18 @@ import UserPasswordResetModal from '../../components/Pages/Admin/User/UserPasswo
                     <UFLabel :severity="Severity.Danger" v-if="item.flag_enabled == false">
                         {{ $t('DISABLED') }}
                     </UFLabel>
-                    <UFLabel :severity="Severity.Warning" v-else-if="item.flag_verified == false">
-                        {{ $t('UNACTIVATED') }}
-                    </UFLabel>
                     <UFLabel :severity="Severity.Success" v-else>
                         {{ $t('ACTIVE') }}
                     </UFLabel>
                 </UFSprunjeColumn>
+                <UFSprunjeColumn>
+                    <UFLabel :severity="Severity.Warning" v-if="item.flag_verified == false">
+                        {{ $t('UNVERIFIED') }}
+                    </UFLabel>
+                    <UFLabel :severity="Severity.Success" v-else>
+                        {{ $t('VERIFIED') }}
+                    </UFLabel>
+                </UFSprunjeColumn>
                 <UFSprunjeColumn>
                     <button class="uk-button uk-button-primary uk-text-nowrap" type="button">
                         {{ $t('ACTIONS') }} <span uk-drop-parent-icon></span>