@fy-/fws-vue 0.4.5 → 0.4.7

package/components/fws/UserProfile.vue

@@ -108,6 +108,9 @@ async function getCropResult() {
     uploader.value.addFile(file);
   }
   const fileUploadCallback = (response: any) => {
+    if (props.onCompleted) {
+      props.onCompleted(response);
+    }
     eventBus.emit("avCropModal", false);
     eventBus.emit("main-loading", false);
     eventBus.emit("user:refresh", true);

package/components/ui/DefaultPaging.vue

@@ -69,6 +69,11 @@ const page = (page: number) => {
   });
 };
 
+const currentUrl = computed(() => {
+  const url = getURL();
+  return `${url.Scheme}://${url.Host}${url.Path}?page=`;
+});
+
 const checkPageNumber = (page: number = 1) => {
   prevNextSeo.value.next = undefined;
   prevNextSeo.value.prev = undefined;
@@ -133,23 +138,22 @@ useFyHead({
       <nav aria-label="Pagination">
         <ul class="flex items-center -space-x-px h-8 text-sm">
           <li v-if="items.page_no >= 2">
-            <a
-              href="javascript:void(0);"
+            <button
+              type="button"
               @click="prev()"
               class="flex items-center justify-center px-1.5 h-8 leading-tight text-fv-neutral-500 bg-white border border-fv-neutral-300 hover:bg-fv-neutral-100 hover:text-fv-neutral-700 dark:bg-fv-neutral-800 dark:border-fv-neutral-700 dark:text-fv-neutral-400 dark:hover:bg-fv-neutral-700 dark:hover:text-white"
             >
               <span class="sr-only">{{ $t("previous_paging") }}</span>
               <ChevronLeftIcon class="w-4 h-4" />
-            </a>
+            </button>
           </li>
           <li v-if="items.page_no - 2 > 1">
-            <a
+            <router-link
               class="flex items-center justify-center px-3 h-8 leading-tight text-fv-neutral-500 bg-white border border-fv-neutral-300 hover:bg-fv-neutral-100 hover:text-fv-neutral-700 dark:bg-fv-neutral-800 dark:border-fv-neutral-700 dark:text-fv-neutral-400 dark:hover:bg-fv-neutral-700 dark:hover:text-white"
-              href="javascript:void(0);"
-              @click="page(1)"
+              :to="currentUrl + '1'"
             >
               1
-            </a>
+            </router-link>
           </li>
           <li v-if="items.page_no - 2 > 2">
             <div
@@ -161,33 +165,30 @@ useFyHead({
           </li>
           <template v-for="i in 2">
             <li v-if="items.page_no - (3 - i) >= 1" :key="`${i}-sm`">
-              <a
+              <router-link
                 class="flex items-center justify-center px-3 h-8 leading-tight text-fv-neutral-500 bg-white border border-fv-neutral-300 hover:bg-fv-neutral-100 hover:text-fv-neutral-700 dark:bg-fv-neutral-800 dark:border-fv-neutral-700 dark:text-fv-neutral-400 dark:hover:bg-fv-neutral-700 dark:hover:text-white"
-                href="javascript:void(0);"
-                @click="page(items.page_no - (3 - i))"
+                :to="currentUrl + (items.page_no - (3 - i))"
               >
                 {{ items.page_no - (3 - i) }}
-              </a>
+              </router-link>
             </li>
           </template>
           <li>
-            <a
-              href="#"
+            <div
               aria-current="page"
               class="z-10 flex items-center justify-center px-3 h-8 leading-tight text-primary-600 border border-primary-300 bg-primary-50 hover:bg-primary-100 hover:text-primary-700 dark:border-fv-neutral-700 dark:bg-fv-neutral-700 dark:text-white"
             >
               {{ items.page_no }}
-            </a>
+            </div>
           </li>
           <template v-for="i in 2">
             <li :key="`${i}-md`" v-if="items.page_no + i <= items.page_max">
-              <a
+              <router-link
                 class="flex items-center justify-center px-3 h-8 leading-tight text-fv-neutral-500 bg-white border border-fv-neutral-300 hover:bg-fv-neutral-100 hover:text-fv-neutral-700 dark:bg-fv-neutral-800 dark:border-fv-neutral-700 dark:text-fv-neutral-400 dark:hover:bg-fv-neutral-700 dark:hover:text-white"
-                href="javascript:void(0);"
-                @click="page(items.page_no + i)"
+                :to="currentUrl + (items.page_no + i)"
               >
                 {{ items.page_no + i }}
-              </a>
+              </router-link>
             </li>
           </template>
           <li v-if="items.page_no + 2 < items.page_max - 1">
@@ -198,23 +199,22 @@ useFyHead({
             </div>
           </li>
           <li v-if="items.page_no + 2 < items.page_max">
-            <a
+            <router-link
               class="flex items-center justify-center px-3 h-8 leading-tight text-fv-neutral-500 bg-white border border-fv-neutral-300 hover:bg-fv-neutral-100 hover:text-fv-neutral-700 dark:bg-fv-neutral-800 dark:border-fv-neutral-700 dark:text-fv-neutral-400 dark:hover:bg-fv-neutral-700 dark:hover:text-white"
-              href="javascript:void(0);"
-              @click="page(items.page_max)"
+              :to="currentUrl + items.page_max"
             >
               {{ items.page_max }}
-            </a>
+            </router-link>
           </li>
           <li v-if="items.page_no < items.page_max - 1">
-            <a
-              href="javascript:void(0);"
+            <button
               @click="next()"
+              type="button"
               class="flex items-center justify-center px-1.5 h-8 leading-tight text-fv-neutral-500 bg-white border border-fv-neutral-300 hover:bg-fv-neutral-100 hover:text-fv-neutral-700 dark:bg-fv-neutral-800 dark:border-fv-neutral-700 dark:text-fv-neutral-400 dark:hover:bg-fv-neutral-700 dark:hover:text-white"
             >
               <span class="sr-only">{{ $t("next_paging") }}</span>
               <ChevronRightIcon class="w-4 h-4" />
-            </a>
+            </button>
           </li>
         </ul>
       </nav>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fy-/fws-vue",
-  "version": "0.4.5",
+  "version": "0.4.7",
   "author": "Florian 'Fy' Gasquez <m@fy.to>",
   "license": "MIT",
   "repository": {