From a125d2c356e080b91f39fd3c3488a6707d1c8921 Mon Sep 17 00:00:00 2001 From: Joep Date: Sat, 7 Oct 2023 13:15:40 +0200 Subject: [PATCH 1/8] Updated ExtendedImage to composition api & typescript. --- .../src/components/files/ExtendedImage.vue | 515 +++++++++--------- 1 file changed, 271 insertions(+), 244 deletions(-) diff --git a/frontend/src/components/files/ExtendedImage.vue b/frontend/src/components/files/ExtendedImage.vue index d9d9bf46..0a23cff3 100644 --- a/frontend/src/components/files/ExtendedImage.vue +++ b/frontend/src/components/files/ExtendedImage.vue @@ -13,261 +13,288 @@ - From baf204259bb71579f3bd07b7d0852d271fc3e292 Mon Sep 17 00:00:00 2001 From: Joep Date: Sat, 7 Oct 2023 13:56:51 +0200 Subject: [PATCH 4/8] Updated HeaderBar.vue to composition api & typescript. --- frontend/src/components/header/Action.vue | 10 ++-- frontend/src/components/header/HeaderBar.vue | 56 ++++++++++---------- 2 files changed, 32 insertions(+), 34 deletions(-) diff --git a/frontend/src/components/header/Action.vue b/frontend/src/components/header/Action.vue index 25d6d85a..9d8666cb 100644 --- a/frontend/src/components/header/Action.vue +++ b/frontend/src/components/header/Action.vue @@ -10,14 +10,14 @@ import { useLayoutStore } from "@/stores/layout"; defineProps<{ - icon: any; - label: any; - counter: any; - show: any; + icon?: string; + label?: any; + counter?: any; + show?: any; }>(); const emit = defineEmits<{ - (e: "action"): void; + (e: "action"): any; }>(); const layoutStore = useLayoutStore(); diff --git a/frontend/src/components/header/HeaderBar.vue b/frontend/src/components/header/HeaderBar.vue index 210080b3..6ebc2536 100644 --- a/frontend/src/components/header/HeaderBar.vue +++ b/frontend/src/components/header/HeaderBar.vue @@ -1,58 +1,56 @@ - From 723ace4dc2e4c417b8a5e5db5660809ee2844b37 Mon Sep 17 00:00:00 2001 From: Joep Date: Sat, 7 Oct 2023 14:00:33 +0200 Subject: [PATCH 5/8] Updated Breadcrumbs to composition api & typescript. --- frontend/src/components/Breadcrumbs.vue | 100 +++++++++++++----------- 1 file changed, 54 insertions(+), 46 deletions(-) diff --git a/frontend/src/components/Breadcrumbs.vue b/frontend/src/components/Breadcrumbs.vue index f0de33ea..d5e157bf 100644 --- a/frontend/src/components/Breadcrumbs.vue +++ b/frontend/src/components/Breadcrumbs.vue @@ -3,8 +3,8 @@ home @@ -18,58 +18,66 @@ - From 9cc0514464c51002281b2554d774944483a1432d Mon Sep 17 00:00:00 2001 From: Joep Date: Sat, 7 Oct 2023 14:01:57 +0200 Subject: [PATCH 6/8] Updated CustomToast.vue to composition api & typescript. --- frontend/src/components/CustomToast.vue | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/frontend/src/components/CustomToast.vue b/frontend/src/components/CustomToast.vue index ef61dee0..e4a55c4b 100644 --- a/frontend/src/components/CustomToast.vue +++ b/frontend/src/components/CustomToast.vue @@ -7,17 +7,15 @@ - From 70707fbd0e6f507f821722192dda67ab4ce954ab Mon Sep 17 00:00:00 2001 From: Joep Date: Sat, 7 Oct 2023 14:20:32 +0200 Subject: [PATCH 7/8] Updated Search & progressbar to composition api & typescript --- frontend/src/components/ProgressBar.vue | 1 + frontend/src/components/Search.vue | 244 ++++++++++++------------ 2 files changed, 128 insertions(+), 117 deletions(-) diff --git a/frontend/src/components/ProgressBar.vue b/frontend/src/components/ProgressBar.vue index dac55cfb..a31192b3 100644 --- a/frontend/src/components/ProgressBar.vue +++ b/frontend/src/components/ProgressBar.vue @@ -45,6 +45,7 @@ https://raw.githubusercontent.com/dzwillia/vue-simple-progress/master/src/compon From df9d1990440762a92f917b54954eab3879b67c7c Mon Sep 17 00:00:00 2001 From: Kloon ImKloon Date: Sat, 7 Oct 2023 17:06:57 +0200 Subject: [PATCH 8/8] Fix ts errors --- frontend/src/components/Breadcrumbs.vue | 4 ++-- frontend/src/components/files/ListingItem.vue | 14 +++++++------- frontend/src/components/header/HeaderBar.vue | 8 ++++---- frontend/src/types/file.d.ts | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/frontend/src/components/Breadcrumbs.vue b/frontend/src/components/Breadcrumbs.vue index d5e157bf..2ed43953 100644 --- a/frontend/src/components/Breadcrumbs.vue +++ b/frontend/src/components/Breadcrumbs.vue @@ -29,7 +29,7 @@ const route = useRoute(); const props = defineProps<{ base: string; - noLink: boolean; + noLink?: boolean; }>(); const items = computed(() => { @@ -72,7 +72,7 @@ const items = computed(() => { }); const element = computed(() => { - if (props.noLink !== undefined) { + if (props.noLink) { return "span"; } diff --git a/frontend/src/components/files/ListingItem.vue b/frontend/src/components/files/ListingItem.vue index 04b4ed60..d4b4465e 100644 --- a/frontend/src/components/files/ListingItem.vue +++ b/frontend/src/components/files/ListingItem.vue @@ -15,7 +15,7 @@ >
@@ -60,8 +60,8 @@ const props = defineProps<{ size: number; modified: string; index: number; - readOnly: boolean; - path: string; + readOnly?: boolean; + path?: string; }>(); const authStore = useAuthStore(); @@ -69,17 +69,17 @@ const fileStore = useFileStore(); const layoutStore = useLayoutStore(); const singleClick = computed( - () => props.readOnly == undefined && authStore.user?.singleClick + () => !props.readOnly && authStore.user?.singleClick ); const isSelected = computed( () => fileStore.selected.indexOf(props.index) !== -1 ); const isDraggable = computed( - () => props.readOnly == undefined && authStore.user?.perm.rename + () => !props.readOnly && authStore.user?.perm.rename ); const canDrop = computed(() => { - if (!props.isDir || props.readOnly !== undefined) return false; + if (!props.isDir || props.readOnly) return false; for (let i of fileStore.selected) { if (fileStore.req?.items[i].url === props.url) { @@ -111,7 +111,7 @@ const humanSize = () => { }; const humanTime = () => { - if (props.readOnly == undefined && authStore.user?.dateFormat) { + if (!props.readOnly && authStore.user?.dateFormat) { return dayjs(props.modified).format("L LT"); } return dayjs(props.modified).fromNow(); diff --git a/frontend/src/components/header/HeaderBar.vue b/frontend/src/components/header/HeaderBar.vue index 6ebc2536..c2c8a142 100644 --- a/frontend/src/components/header/HeaderBar.vue +++ b/frontend/src/components/header/HeaderBar.vue @@ -1,8 +1,8 @@