- convert folders into teams folders in convert/delete events

- composer update
This commit is contained in:
Čarodej
2021-11-04 10:05:29 +01:00
parent aec5b98313
commit ee86fbbe66
14 changed files with 135 additions and 48 deletions

View File

@@ -17,7 +17,7 @@
<FolderIcon v-if="isFolder" :item="entry" location="file-item-list" class="inline-block transform scale-150 lg:mt-2 lg:mb-8 mt-3 mb-5" />
<!--File Icon-->
<div v-if="isFile || isVideo || (isImage && !entry.data.attributes.thumbnail)" class="relative w-24 mx-auto">
<div v-if="isFile || isVideo || isAudio || (isImage && !entry.data.attributes.thumbnail)" class="relative w-24 mx-auto">
<!--Member thumbnail for team folders-->
<MemberAvatar
@@ -129,6 +129,9 @@
isClicked() {
return this.clipboard.some(element => element.data.id === this.entry.data.id)
},
isAudio() {
return this.entry.data.type === 'audio'
},
isVideo() {
return this.entry.data.type === 'video'
},

View File

@@ -20,7 +20,7 @@
<FolderIcon v-if="isFolder" :item="entry" location="file-item-list" />
<!--File Icon-->
<FileIconThumbnail v-if="isFile || isVideo || (isImage && !entry.data.attributes.thumbnail)" :entry="entry" class="pr-2" />
<FileIconThumbnail v-if="isFile || isVideo || isAudio || (isImage && !entry.data.attributes.thumbnail)" :entry="entry" class="pr-2" />
<!--Image thumbnail-->
<img v-if="isImage && entry.data.attributes.thumbnail" class="w-12 h-12 rounded ml-0.5 object-cover" :src="entry.data.attributes.thumbnail.xs" :alt="entry.data.attributes.name" loading="lazy" />
@@ -110,6 +110,9 @@
isVideo() {
return this.entry.data.type === 'video'
},
isAudio() {
return this.entry.data.type === 'audio'
},
isFile() {
return this.entry.data.type === 'file'
},

View File

@@ -36,7 +36,7 @@
created() {
this.isActive = 1
setTimeout(() => (this.isActive = 0), 5000)
setTimeout(() => (this.isActive = 0), 6000)
}
}
</script>
@@ -74,7 +74,7 @@
width: 0;
height: 3px;
display: block;
animation: progressbar 5s linear;
animation: progressbar 6s linear;
}
&.success span {

View File

@@ -166,6 +166,15 @@
this.$router.push({name: 'TeamFolders'})
}
let toasterMessage = this.isNewFolderTeamCreation
? this.$t('Your Team was invited successfully.')
: this.$t('Your Team was invited and folder was moved into Team Folders section.')
events.$emit('toaster', {
type: 'success',
message: toasterMessage,
})
this.$store.dispatch('getAppData')
})
.catch(() => this.$isSomethingWrong())

View File

@@ -247,6 +247,11 @@
} else {
this.$store.commit('REMOVE_ITEM', data.id)
}
events.$emit('toaster', {
type: 'success',
message: this.$t('Your Team Folder was moved into your files.'),
})
})
.catch(() => this.$isSomethingWrong())
})