bug fixes due to merge

Author: omalk98

frontend/package-lock.json

@@ -13,7 +13,6 @@ export async function fetch(url: string, password: string = "") {
   );
 
   const data = (await res.json()) as Resource;
-  console.log(data);
   data.url = `/share${url}`;
 
   if (data.isDir) {

frontend/src/api/pub.ts

@@ -165,7 +165,7 @@ onMounted(() => {
 });
 
 const open = () => {
-  layoutStore.showHover("search");
+  !active.value && layoutStore.showHover("search");
 };
 
 const close = (event: Event) => {
@@ -209,7 +209,6 @@ const submit = async (event: Event) => {
 
   try {
     results.value = await search(path, prompt.value);
-    console.log("Search: ", results.value);
   } catch (error: any) {
     $showError(error);
   }

frontend/src/components/Search.vue

@@ -103,9 +103,6 @@ const isThumbsEnabled = computed(() => {
   return enableThumbs;
 });
 
-// ...mapActions(useFileStore, ["removeSelected"]),
-// ...mapActions(useLayoutStore, ["showHover", "closeHovers"]),
-
 const humanSize = () => {
   return props.type == "invalid_link" ? "invalid link" : filesize(props.size);
 };

frontend/src/components/files/ListingItem.vue

@@ -7,6 +7,7 @@
       initialFocus: '#focus-prompt',
       fallbackFocus: 'div.vfm__content',
     }"
+    style="z-index: 9999999"
   >
     <slot />
   </VueFinalModal>

frontend/src/components/prompts/BaseModal.vue

@@ -7,18 +7,21 @@
     </div>
     <div class="card-action">
       <button
-        @click="closeHovers()"
         class="button button--flat button--grey"
+        @click="closeHovers"
         :aria-label="$t('buttons.cancel')"
         :title="$t('buttons.cancel')"
+        tabindex="2"
       >
         {{ $t("buttons.cancel") }}
       </button>
       <button
+        id="focus-prompt"
         @click="submit"
         class="button button--flat button--red"
         :aria-label="$t('buttons.discardChanges')"
         :title="$t('buttons.discardChanges')"
+        tabindex="1"
       >
         {{ $t("buttons.discardChanges") }}
       </button>

frontend/src/components/prompts/DiscardEditorChanges.vue

@@ -62,14 +62,17 @@
           @click="closeHovers"
           :aria-label="$t('buttons.close')"
           :title="$t('buttons.close')"
+          tabindex="2"
         >
           {{ $t("buttons.close") }}
         </button>
         <button
+          id="focus-prompt"
           class="button button--flat button--blue"
           @click="() => switchListing()"
           :aria-label="$t('buttons.new')"
           :title="$t('buttons.new')"
+          tabindex="1"
         >
           {{ $t("buttons.new") }}
         </button>
@@ -81,14 +84,14 @@
         <p>{{ $t("settings.shareDuration") }}</p>
         <div class="input-group input">
           <vue-number-input
-            tabindex="1"
             center
             controls
             size="small"
             :max="2147483647"
             :min="0"
             @keyup.enter="submit"
             v-model="time"
+            tabindex="1"
           />
           <select
             class="right"

frontend/src/components/prompts/Share.vue

@@ -71,16 +71,16 @@ export default {
       "filesInUpload",
       "filesInUploadCount",
       "uploadSpeed",
-      "eta",
+      "getETA",
     ]),
     ...mapWritableState(useFileStore, ["reload"]),
     ...mapActions(useUploadStore, ["reset"]),
     formattedETA() {
-      if (!this.eta || this.eta === Infinity) {
+      if (!this.getETA || this.getETA === Infinity) {
         return "--:--:--";
       }
 
-      let totalSeconds = this.eta;
+      let totalSeconds = this.getETA;
       const hours = Math.floor(totalSeconds / 3600);
       totalSeconds %= 3600;
       const minutes = Math.floor(totalSeconds / 60);

frontend/src/components/prompts/UploadFiles.vue

@@ -330,7 +330,7 @@ main .spinner .bounce2 {
   left: 0;
   height: 100%;
   width: 100%;
-  z-index: 9999;
+  z-index: 9998;
   overflow: hidden;
 }
 

frontend/src/css/styles.css

@@ -78,7 +78,7 @@ export const useUploadStore = defineStore("upload", {
     uploadSpeed: (state) => {
       return state.speedMbyte;
     },
-    eta: (state) => state.eta,
+    getETA: (state) => state.eta,
   },
   actions: {
     // no context as first argument, use `this` instead

frontend/src/stores/upload.ts

@@ -141,8 +141,6 @@ export function handleFiles(
       path += "/";
     }
 
-    // console.log("File", file);
-
     const item: UploadItem = {
       id,
       path,

frontend/src/utils/upload.ts

@@ -7,7 +7,6 @@
     />
 
     <breadcrumbs base="/files" />
-    <listing />
     <errors v-if="error" :errorCode="error.status" />
     <component v-else-if="currentView" :is="currentView"></component>
     <div v-else-if="currentView !== null">

frontend/src/views/Files.vue

@@ -40,7 +40,7 @@
     </div>
     <div v-else-if="error">
       <div v-if="error.status === 401">
-        <div class="card floating" id="password">
+        <div class="card floating" id="password" style="z-index: 9999999">
           <div v-if="attemptedPasswordLogin" class="share__wrong__password">
             {{ t("login.wrongCredentials") }}
           </div>

frontend/src/views/Share.vue

@@ -326,18 +326,6 @@ const { t } = useI18n();
 
 const listing = ref<HTMLElement | null>(null);
 
-// ...mapStores(useClipboardStore),
-// ...mapState(useAuthStore, ["user"]),
-// ...mapState(useFileStore, ["selectedCount", "toggleMultiple"]),
-// ...mapState(useLayoutStore, ["show"]),
-// ...mapWritableState(useFileStore, [
-//   "req",
-//   "selected",
-//   "multiple",
-//   "loading",
-//   "reload",
-// ])
-
 const nameSorted = computed(() =>
   fileStore.req ? fileStore.req.sorting.by === "name" : false
 );
@@ -521,16 +509,14 @@ const keyEvent = (event: KeyboardEvent) => {
     return;
   }
 
-  let key = String.fromCharCode(event.which).toLowerCase();
-
-  switch (key) {
+  switch (event.key) {
     case "f":
       event.preventDefault();
       layoutStore.showHover("search");
       break;
     case "c":
     case "x":
-      copyCut(event, key);
+      copyCut(event);
       break;
     case "v":
       paste(event);
@@ -560,7 +546,7 @@ const preventDefault = (event: Event) => {
   event.preventDefault();
 };
 
-const copyCut = (event: Event, key: string): void => {
+const copyCut = (event: Event | KeyboardEvent): void => {
   if ((event.target as HTMLElement).tagName?.toLowerCase() === "input") return;
 
   if (fileStore.req === null) return;
@@ -579,7 +565,7 @@ const copyCut = (event: Event, key: string): void => {
   }
 
   clipboardStore.$patch({
-    key,
+    key: (event as KeyboardEvent).key,
     items,
     path: route.path,
   });
@@ -628,8 +614,7 @@ const paste = (event: Event) => {
     return;
   }
 
-  // @ts-ignore
-  let conflict = upload.checkConflict(items, fileStore.req.items);
+  let conflict = upload.checkConflict(items, fileStore.req!.items);
 
   let overwrite = false;
   let rename = false;