-Prepare User-Filter

-Remove unnecessary code -Edit Pagination prop-naming
Bootstrap-Academy · Oct 28, 2023 · d90a439 · d90a439
1 parent 426675b
commit d90a439
Show file tree

Hide file tree

Showing 6 changed files with 134 additions and 177 deletions.
diff --git a/components/Pagination.vue b/components/Pagination.vue
@@ -17,7 +17,7 @@
         &lt;
       </button>
     </li>
-    <li v-for="index in getPageList">
+    <li v-for="index in getPages">
       <button
         @click="index !== 0 && emit('change', index)"
         :class="index === current ? active : notActive"
@@ -44,31 +44,31 @@
     </li>
     <li>
       <button
-        :class="pageSize === 10 ? active : notActive"
+        :class="perPage === 10 ? active : notActive"
         @click="emit('change-per-page', 10)"
       >
         10
       </button>
     </li>
     <li>
       <button
-        :class="pageSize === 20 ? active : notActive"
+        :class="perPage === 20 ? active : notActive"
         @click="emit('change-per-page', 20)"
       >
         20
       </button>
     </li>
     <li>
       <button
-        :class="pageSize === 50 ? active : notActive"
+        :class="perPage === 50 ? active : notActive"
         @click="emit('change-per-page', 50)"
       >
         50
       </button>
     </li>
     <li>
       <button
-        :class="pageSize === 100 ? active : notActive"
+        :class="perPage === 100 ? active : notActive"
         @click="emit('change-per-page', 100)"
       >
         100
@@ -81,12 +81,12 @@
 const props = defineProps<{
   current: number;
   total: number;
-  pageSize: number;
+  perPage: number;
 }>();
 
 const emit = defineEmits<{
   (e: 'change', page: number): void;
-  (e: 'change-per-page', pageSize: number): void;
+  (e: 'change-per-page', perPage: number): void;
 }>();
 
 const active = ref(
@@ -99,30 +99,29 @@ const notActive = ref(
 // Todo: space between button-groups
 // Todo: round corners of pageSize buttons
 
-const getPageList = computed(() => {
-  const { current, total } = props;
-  const array = [];
-
-  if (total <= 5) {
-    for (let i = 1; i <= total; i++) {
-      array.push(i);
-    }
-  } else if (current <= 3) {
-    for (let i = 1; i <= 5; i++) {
-      array.push(i);
-    }
-  } else if (current >= total - 2) {
-    for (let i = total - 4; i <= total; i++) {
-      array.push(i);
+const getPages = computed(() => {
+    const { current, total } = props;
+    const array = [];
+    
+    if (total <= 5) {
+        for (let i = 1; i <= total; i++) {
+        array.push(i);
+        }
+    } else if (current <= 3) {
+        for (let i = 1; i <= 5; i++) {
+        array.push(i);
+        }
+    } else if (current >= total - 2) {
+        for (let i = total - 4; i <= total; i++) {
+        array.push(i);
+        }
+    } else {
+        for (let i = current - 2; i <= current + 2; i++) {
+        array.push(i);
+        }
     }
-  } else {
-    for (let i = current - 2; i <= current + 2; i++) {
-      array.push(i);
-    }
-  }
-
-  return array;
-});
+    return array;
+}) 
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/composables/appUsers.ts b/composables/appUsers.ts
@@ -19,8 +19,10 @@ export const useBanUsers = () => useState('banUsers', () => []);
 export async function getUserTest(query: UserSearchRequestBody) {
   const response:UserSearchResponse | undefined =  await GET(`/auth/users`, query);
   let appUsers = useAppUsers();
+  let totalUsers = useTotalAppUsers();
   if (response) {
     appUsers.value = response.users;
+    totalUsers.value = response.total;
   }
   return response;
 }

diff --git a/locales/de.json b/locales/de.json
@@ -35,23 +35,26 @@
 		"ManageSkillTree": "Manage Skill Tree",
 		"CreateSubTree": "Create Sub Tree",
 		"DeleteUser": "Delete User?",
-		"User": "User",
+		"User": "Normale Benutzer",
 		"Nickname": "Nickname",
 		"Email": "Email",
 		"Role": "Role",
-		"Verified": "Verified",
-		"MFA": "MFA",
-		"Newsletter": "Newsletter",
-		"UserEnabled": "Normale User",
-		"UserDisabled": "Gebannte User",
+		"Verified": "Email verifiziert",
+		"NotVerified": "Email nicht verifiziert",
+		"MFA": "2FA Aktiviert",
+		"NOMFA": "2FA Deaktiviert",
+		"Newsletter": "Newsletter abonniert",
+		"NoNewsletter": "Newsletter nicht abonniert",
+		"UserEnabled": "Normale Benutzer",
+		"UserDisabled": "Gebannte Benutzer",
 		"Balance": "Balance",
 		"XP": "XP",
 		"Actions": "Actions",
 		"Result": "No Results | {n} Result | {n} Results",
 		"FilterBy": "Filter by",
-		"Admin": "Admin",
+		"Admin": "Admin Benutzer",
 		"All": "All",
-		"None": "None",
+		"None": "Kein Filter",
 		"Newbie": "Newbie",
 		"Novice": "Novice",
 		"Beginner": "Beginner",

diff --git a/locales/en-US.json b/locales/en-US.json
@@ -41,9 +41,12 @@
 		"Nickname": "Nickname",
 		"Email": "Email",
 		"Role": "Role",
-		"Verified": "Verified",
-		"MFA": "MFA",
-		"Newsletter": "Newsletter",
+		"Verified": "Email Verified",
+		"NotVerified": "Email not Verified",
+		"MFA": "MFA Enabled",
+		"NOMFA": "MFA Disabled",
+		"Newsletter": "Newsletter enabled",
+		"NoNewsletter": "Newsletter disabled",
 		"UserEnabled": "Normal User",
 		"UserDisabled": "Banned User",
 		"Balance": "Balance",