Merge branch 'next' of github.com:devforth/adminforth into next

Author: SerVitasik

adminforth/documentation/docs/tutorial/07-Plugins/19-user-soft-delete.md

@@ -44,22 +44,37 @@ import UserSoftDelete from "@adminforth/user-soft-delete";
 columns[
 
     ...
-
+    //diff-add
     {
+        //diff-add
         name: "is_active",
+        //diff-add
         type: AdminForthDataTypes.BOOLEAN,
+        //diff-add
         label: "Is Active",
+        //diff-add
         fillOnCreate: () => true,
+        //diff-add
         filterOptions: {
+            //diff-add
             multiselect: false,
+            //diff-add
         },
+        //diff-add
         showIn: {
+            //diff-add
             list: true,
+            //diff-add
             filter: true,
+            //diff-add
             show: true,
+            //diff-add
             create: false,
+            //diff-add
             edit: true,
+            //diff-add
         },
+        //diff-add
     },
 
     ...
@@ -71,16 +86,25 @@ columns[
 plugins: [
 
     ...
-
+//diff-add
     new UserSoftDelete({
+        //diff-add
         activeFieldName: "is_active",
+        //diff-add
         //in canDeactivate we pass a function, that specify adminusers roles, which can seactivate other adminusers  
+        //diff-add
         canDeactivate: async (adminUser: AdminUser) => {
+            //diff-add
         if (adminUser.dbUser.role === "superadmin") {
+            //diff-add
             return true;
+            //diff-add
         }
+        //diff-add
         return false;
+        //diff-add
         }
+        //diff-add
     }),
 
     ...

adminforth/modules/restApi.ts

@@ -405,10 +405,20 @@ export default class AdminForthRestAPI implements IAdminForthRestAPI {
           if (menuItem.children) {
             menuItem.children.forEach(processItem);
           }
+          if (menuItem.pageLabel) {
+            translateRoutines.push(
+              (async () => {
+                menuItem.pageLabel = await tr(menuItem.pageLabel, `UserMenu.${menuItem.pageLabel}`);
+              })()
+            );
+          }
         }
         newMenu.forEach((menuItem) => {
           processItem(menuItem);
         });
+        this.adminforth.config.auth.userMenuSettingsPages.forEach((page) => {
+          processItem(page);
+        });
         await Promise.all(translateRoutines);
 
         // strip all backendOnly fields or not described in adminForth fields from dbUser

adminforth/spa/src/components/AcceptModal.vue

@@ -1,6 +1,6 @@
 <template>
   <Teleport to="body">
-  <div ref="modalEl" tabindex="-1" aria-hidden="true" class="hidden fixed inset-0 z-50 w-full h-full overflow-y-auto overflow-x-hidden flex items-center justify-center">
+  <div ref="modalEl" tabindex="-1" aria-hidden="true" class="hidden fixed inset-0 z-[110] w-full h-full overflow-y-auto overflow-x-hidden flex items-center justify-center">
     <div class="relative p-4 w-full max-w-md max-h-full" >
             <div class="afcl-confirmation-container relative bg-lightAcceptModalBackground rounded-lg shadow dark:bg-darkAcceptModalBackground dark:shadow-black">
         <button type="button" @click="modalStore.togleModal" class="absolute top-3 end-2.5 text-lightAcceptModalCloseIcon bg-transparent hover:bg-lightAcceptModalCloseIconHoverBackground hover:text-lightAcceptModalCloseIconHover rounded-lg text-sm w-8 h-8 ms-auto inline-flex justify-center items-center dark:text-darkAcceptModalCloseIcon dark:hover:bg-darkAcceptModalCloseIconHoverBackground dark:hover:text-darkAcceptModalCloseIconHover" >
@@ -51,6 +51,7 @@ onMounted(async () => {
     {
       closable: true,
       backdrop: 'static',
+      backdropClasses: "bg-gray-900/50 dark:bg-gray-900/80 fixed inset-0 z-[100]"
     }
   );
 })

adminforth/spa/src/components/UserMenuSettingsButton.vue

@@ -7,7 +7,7 @@
       w-full select-none "
       @click="showDropdown = !showDropdown"
     >
-        <span>Settings</span>
+        <span>{{ $t('Settings') }}</span>
         <IconCaretDownSolid class="h-5 w-5 text-lightPrimary dark:text-gray-400 opacity-50 transition duration-150 ease-in"
             :class="{ 'transform rotate-180': showDropdown }"
       />
@@ -40,9 +40,11 @@ import { computed, ref, onMounted, watch } from 'vue';
 import { useCoreStore } from '@/stores/core';
 import { getIcon } from '@/utils';
 import { useRouter } from 'vue-router';
+import { useI18n } from 'vue-i18n';
 
 const router = useRouter();
 const coreStore = useCoreStore();
+const { t } = useI18n();
 
 const showDropdown = ref(false);
 const props = defineProps(['meta', 'resource']);

adminforth/spa/src/views/SettingsView.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="mt-20 h-full w-full" :class="{ 'hidden': initialTabSet === false }">
     <div v-if="!coreStore?.config?.settingPages || coreStore?.config?.settingPages.length === 0">
-      <p>No setting pages configured or still loading...</p>
+      <p>{{ $t('No setting pages configured or still loading...') }}</p>
     </div>
       <VerticalTabs v-else ref="VerticalTabsRef" v-model:active-tab="activeTab" @update:active-tab="setURL({slug: $event, pageLabel: ''})">
       <template v-for="(c,i) in coreStore?.config?.settingPages" :key="`tab:${settingPageSlotName(c,i)}`" v-slot:['tab:'+c.slug]>