This commit is contained in:
Saifeddine ALOUI 2023-06-05 01:21:19 +02:00
commit d614affcc5
3 changed files with 366 additions and 232 deletions

View File

@ -1,5 +1,5 @@
<template>
<div class="sticky bottom-0 right-0 left-0 p-0 w-96">
<div class="absolute bottom-0 w-96 justify-center text-center p-4 ">
<div v-if="loading" class="flex items-center justify-center w-full">
<div class="flex flex-row p-2 rounded-t-lg ">
@ -12,27 +12,48 @@
</div>
<form>
<label for="chat" class="sr-only">Send message</label>
<div
class="px-3 py-3 rounded-t-lg bg-bg-light-tone-panel dark:bg-bg-dark-tone-panel shadow-lg ">
<!-- FILES -->
<div class="flex flex-col flex-grow">
<div v-if="fileList.length>0" class="flex flex-row overflow-x-scroll mb-2 gap-1 scrollbar-thin scrollbar-track-bg-light-tone-panel scrollbar-thumb-bg-light-tone-panel hover:scrollbar-thumb-primary dark:scrollbar-track-bg-dark-tone dark:scrollbar-thumb-bg-dark-tone-panel dark:hover:scrollbar-thumb-primary active:scrollbar-thumb-secondary">
<TransitionGroup name="list" tag="div" class="flex flex-row items-center p-2">
<div v-for="file in fileList" :key="file.name">
<div class="relative m-1 cursor-pointer">
<div class="px-3 py-3 rounded-lg bg-bg-light-tone-panel dark:bg-bg-dark-tone-panel shadow-lg ">
<span
class="inline-flex items-center px-2 py-1 mr-2 text-sm font-medium bg-bg-dark-tone-panel dark:bg-bg-dark-tone rounded-lg hover:bg-primary-light ">
<i data-feather="file" class="w-5 h-5 mr-1 truncate"></i>
<div class="flex flex-col gap-2">
<!-- FILES -->
<div v-if="fileList.length > 0" class="flex flex-col max-h-64 ">
<TransitionGroup name="list" tag="div"
class="flex flex-col flex-grow overflow-y-auto scrollbar-thin scrollbar-track-bg-light scrollbar-thumb-bg-light-tone hover:scrollbar-thumb-primary dark:scrollbar-track-bg-dark dark:scrollbar-thumb-bg-dark-tone dark:hover:scrollbar-thumb-primary active:scrollbar-thumb-secondary">
<div v-for="file in fileList" :key="file.name">
<div class=" m-1" :title="file.name">
<div
class="flex flex-row items-center gap-1 text-left p-2 text-sm font-medium bg-bg-dark-tone-panel dark:bg-bg-dark-tone rounded-lg hover:bg-primary dark:hover:bg-primary">
<div>
<i data-feather="file" class="w-5 h-5"></i>
</div>
<div class="line-clamp-1 w-3/5">
{{ file.name }}
({{ computedFileSize(file.size) }})
</div>
<div class="grow">
</div>
<div class="flex flex-row items-center">
<p class="whitespace-nowrap">
{{ computedFileSize(file.size) }}
</p>
<button type="button" title="Remove item"
class="inline-flex items-center p-0.5 ml-2 text-sm rounded-sm hover:text-red-600 active:scale-75"
class="flex items-center p-0.5 text-sm rounded-sm hover:text-red-600 active:scale-75"
@click="removeItem(file)">
<i data-feather="x" class="w-5 h-5 "></i>
</button>
</span>
</div>
</div>
</div>
@ -40,10 +61,32 @@
</TransitionGroup>
</div>
<div v-if="fileList.length > 0" class="flex items-center mx-1">
<!-- ADDITIONAL INFO PANEL -->
<div class="whitespace-nowrap flex flex-row gap-2">
<p class="font-bold ">
Total size:
</p>
{{ totalSize }}
({{ fileList.length }})
</div>
<div class="grow">
</div>
<button type="button" title="Clear all"
class="flex items-center p-0.5 text-sm rounded-sm hover:text-red-600 active:scale-75"
@click="fileList = []">
<i data-feather="trash" class="w-5 h-5 "></i>
</button>
</div>
<!-- CHAT BOX -->
<div class="flex flex-row flex-grow items-center gap-2 ">
<textarea id="chat" rows="1" v-model="message"
class="block min-h-11 no-scrollbar p-2.5 w-full text-sm text-gray-900 bg-bg-light rounded-lg border border-gray-300 focus:ring-blue-500 focus:border-blue-500 dark:bg-bg-dark dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
placeholder="Send message..." @keydown.enter.exact="submitOnEnter($event)"></textarea>
@ -61,8 +104,8 @@
<div v-if="loading" title="Waiting for reply">
<!-- SPINNER -->
<div role="status">
<svg aria-hidden="true" class="w-6 h-6 animate-spin fill-secondary" viewBox="0 0 100 101"
fill="none" xmlns="http://www.w3.org/2000/svg">
<svg aria-hidden="true" class="w-6 h-6 animate-spin fill-secondary"
viewBox="0 0 100 101" fill="none" xmlns="http://www.w3.org/2000/svg">
<path
d="M100 50.5908C100 78.2051 77.6142 100.591 50 100.591C22.3858 100.591 0 78.2051 0 50.5908C0 22.9766 22.3858 0.59082 50 0.59082C77.6142 0.59082 100 22.9766 100 50.5908ZM9.08144 50.5908C9.08144 73.1895 27.4013 91.5094 50 91.5094C72.5987 91.5094 90.9186 73.1895 90.9186 50.5908C90.9186 27.9921 72.5987 9.67226 50 9.67226C27.4013 9.67226 9.08144 27.9921 9.08144 50.5908Z"
fill="currentColor" />
@ -106,7 +149,7 @@
</style>
<script>
import { nextTick,TransitionGroup } from 'vue'
import { nextTick, TransitionGroup } from 'vue'
import feather from 'feather-icons'
import filesize from '../plugins/filesize'
export default {
@ -123,19 +166,24 @@ export default {
data() {
return {
message: "",
fileList:[]
fileList: [],
totalSize: 0
}
},
methods: {
computedFileSize(size) {
nextTick(() => {
feather.replace()
})
return filesize(size)
},
removeItem(file) {
this.fileList = this.fileList.filter((item) => item != file)
// console.log(this.fileList)
},
sendMessageEvent(msg) {
this.fileList=[]
this.$emit('messageSentEvent', msg)
},
@ -167,7 +215,26 @@ export default {
nextTick(() => {
feather.replace()
})
},
fileList: {
// Calculate total size
handler(val, oldVal) {
let total = 0
if (val.length > 0) {
for (let i = 0; i < val.length; i++) {
total = total + parseInt(val[i].size)
}
}
this.totalSize = filesize(total,false)
},
deep: true
},
},
computed: {
},
mounted() {
nextTick(() => {
@ -175,7 +242,9 @@ export default {
})
},
activated() {
nextTick(() => {
feather.replace()
})
}
}
</script>

View File

@ -5,11 +5,11 @@
<div key="dropmenu" v-if="show"
class="select-none text-slate-50 absolute top-0 left-0 right-0 bottom-0 flex flex-col items-center justify-center bg-black bg-opacity-50 duration-200 backdrop-blur-sm "
@dragleave.prevent="panelLeave($event)" @drop.stop.prevent="panelDrop($event)">
<div
class="flex flex-col items-center justify-center p-8 rounded-lg shadow-lg border-dashed border-4 border-secondary w-4/5 h-4/5 " :class="dropRelease?'':'pointer-events-none'">
<div class="flex flex-col items-center justify-center p-8 rounded-lg shadow-lg border-dashed border-4 border-secondary w-4/5 h-4/5 "
:class="dropRelease ? '' : 'pointer-events-none'">
<div class="text-4xl text-center" >
<div class="text-4xl text-center">
<slot>
Drop your files here
@ -89,11 +89,61 @@ export default {
// this.fileList = this.fileList.filter((item) => item != file)
// // console.log(this.fileList)
// },
panelDrop(event) {
async panelDrop(event) {
const supportsFileSystemAccessAPI =
'getAsFileSystemHandle' in DataTransferItem.prototype;
const supportsWebkitGetAsEntry =
'webkitGetAsEntry' in DataTransferItem.prototype;
if (!supportsFileSystemAccessAPI && !supportsWebkitGetAsEntry) {
// Cannot handle directories.
return;
}
const fileHandlesPromises = [...event.dataTransfer.items]
// by including only files (where file misleadingly means actual file _or_
// directory)
.filter((item) => item.kind === 'file')
// and, depending on previous feature detection
.map((item) =>
supportsFileSystemAccessAPI
// either get a modern `FileSystemHandle`
? item.getAsFileSystemHandle()
// or a classic `FileSystemFileEntry`.
: item.webkitGetAsEntry(),
);
let dirList =[]
// Loop over the array of promises.
for await (const handle of fileHandlesPromises) {
// This is where we can actually exclusively act on the directories.
if (handle.kind === 'directory' || handle.isDirectory) {
dirList.push(handle.name)
}
}
this.dropRelease = true
if (event.dataTransfer.files.length > 0) {
[...event.dataTransfer.files].forEach(element => {
if(!dirList.includes(element.name)){
this.fileList.push(element)
}
});
}
@ -101,7 +151,7 @@ export default {
feather.replace()
})
this.$emit('panelDrop', this.fileList)
this.fileList=[]
this.fileList = []
this.show = false
},

View File

@ -1,8 +1,10 @@
<template>
<div
class="overflow-y-scroll flex flex-col no-scrollbar shadow-lg min-w-[24rem] max-w-[24rem] bg-bg-light-tone dark:bg-bg-dark-tone">
class="relative flex flex-col no-scrollbar shadow-lg min-w-[24rem] max-w-[24rem] bg-bg-light-tone dark:bg-bg-dark-tone">
<!-- LEFT SIDE PANEL -->
<div class=" sticky top-0 flex-col bg-bg-light-tone dark:bg-bg-dark-tone shadow-md">
<div class="flex flex-col flex-grow overflow-y-scroll no-scrollbar"
@dragover.stop.prevent="setDropZoneDiscussion()">
<div class=" sticky z-10 top-0 bg-bg-light-tone dark:bg-bg-dark-tone shadow-md">
<!-- CONTROL PANEL -->
@ -52,7 +54,7 @@
</div>
<!-- SEARCH BAR -->
<!-- <Transition name="expand" > -->
<div key="1" v-if="isSearch" class="flex-row items-center gap-3 flex-0 w-full">
<div v-if="isSearch" class="flex-row items-center gap-3 flex-0 w-full">
@ -102,8 +104,8 @@
title="Confirm removal" type="button" @click.stop="deleteDiscussionMulti">
<i data-feather="check"></i>
</button>
<button class="text-2xl hover:text-red-600 duration-75 active:scale-90 " title="Cancel removal"
type="button" @click.stop="showConfirmation = false">
<button class="text-2xl hover:text-red-600 duration-75 active:scale-90 "
title="Cancel removal" type="button" @click.stop="showConfirmation = false">
<i data-feather="x"></i>
</button>
</div>
@ -124,23 +126,24 @@
</div>
</div>
<div class="relative overflow-y-scroll no-scrollbar flex flex-row flex-grow"
@dragover.stop.prevent="setDropZoneDiscussion()">
<div class="z-20">
<DragDrop ref="dragdropDiscussion" @panelDrop="setFileListDiscussion">Drop your discussion file here
</DragDrop>
</div>
<div class="relative flex flex-row flex-grow mb-10">
<!-- DISCUSSION LIST -->
<div class="mx-4 flex-grow" :class="isDragOverDiscussion ? 'pointer-events-none' : ''">
<div class="mx-4 flex flex-col flex-grow" :class="isDragOverDiscussion ? 'pointer-events-none' : ''">
<div :class="filterInProgress ? 'opacity-20 pointer-events-none' : ''">
<div :class="filterInProgress ? 'opacity-20 pointer-events-none' : ''"
class="flex flex-col flex-grow ">
<TransitionGroup v-if="list.length > 0" name="list">
<Discussion v-for="(item, index) in list" :key="item.id" :id="item.id" :title="item.title"
:selected="currentDiscussion.id == item.id" :loading="item.loading" :isCheckbox="isCheckbox"
:checkBoxValue="item.checkBoxValue" @select="selectDiscussion(item)"
@delete="deleteDiscussion(item.id)" @editTitle="editTitle" @checked="checkUncheckDiscussion" />
@delete="deleteDiscussion(item.id)" @editTitle="editTitle"
@checked="checkUncheckDiscussion" />
</TransitionGroup>
<div v-if="list.length < 1"
class="gap-2 py-2 my-2 hover:shadow-md hover:bg-primary-light dark:hover:bg-primary rounded-md p-2 duration-75 group cursor-pointer">
@ -154,22 +157,23 @@
</div>
</div>
</div>
<div id="messages-list"
class="flex relative flex-grow overflow-y-auto scrollbar-thin scrollbar-track-bg-light-tone scrollbar-thumb-bg-light-tone-panel hover:scrollbar-thumb-primary dark:scrollbar-track-bg-dark-tone dark:scrollbar-thumb-bg-dark-tone-panel dark:hover:scrollbar-thumb-primary active:scrollbar-thumb-secondary"
@dragover.stop.prevent="setDropZoneChat()">
<div class="z-20">
</div>
<div class="relative flex flex-col flex-grow " @dragover.stop.prevent="setDropZoneChat()">
<div class="z-20 h-max">
<DragDrop ref="dragdropChat" @panelDrop="setFileListChat"></DragDrop>
</div>
<div :class="isDragOverChat ? 'pointer-events-none' : ''" class="container flex flex-col flex-grow ">
<div id="messages-list"
class=" z-0 flex flex-col flex-grow overflow-y-auto scrollbar-thin scrollbar-track-bg-light-tone scrollbar-thumb-bg-light-tone-panel hover:scrollbar-thumb-primary dark:scrollbar-track-bg-dark-tone dark:scrollbar-thumb-bg-dark-tone-panel dark:hover:scrollbar-thumb-primary active:scrollbar-thumb-secondary"
:class="isDragOverChat ? 'pointer-events-none' : ''">
<!-- CHAT AREA -->
<div class="conainer flex flex-col flex-grow pt-4 pb-10 ">
<div class=" container pt-4 pb-10 mb-16">
<TransitionGroup v-if="discussionArr.length > 0" name="list">
<Message v-for="(msg, index) in discussionArr" :key="msg.id" :message="msg" :id="'msg-' + msg.id"
ref="messages" @copy="copyToClipBoard" @delete="deleteMessage" @rankUp="rankUpMessage"
@rankDown="rankDownMessage" @updateMessage="updateMessage" @resendMessage="resendMessage"
:avatar="getAvatar(msg.sender)" />
:avatar="getAvatar(msg.sender)" @click="scrollToElementInContainer($event.target, 'messages-list')" />
</TransitionGroup>
@ -177,14 +181,19 @@
</div>
<div
class="absolute w-full bottom-0 bg-transparent p-10 pt-16 bg-gradient-to-t from-bg-light dark:from-bg-dark from-5% via-bg-light dark:via-bg-dark via-10% to-transparent to-100%">
<div class="sticky bottom-0 flex flex-col items-center justify-center">
</div>
<div class=" bottom-0 container flex flex-row items-center justify-center ">
<ChatBox ref="chatBox" v-if="currentDiscussion.id" @messageSentEvent="sendMsg" :loading="isGenerating"
@stopGenerating="stopGenerating" />
</div>
<!-- CAN ADD FOOTER PANEL HERE -->
</div>
</div>
</div>
<Toast ref="toast">
</Toast>
</template>
@ -288,13 +297,7 @@ export default {
this.discussionArr = res.data.filter((item) => item.type == 0)
}
// nextTick(() => {
// const msgList = document.getElementById('messages-list')
// this.scrollBottom(msgList)
// })
}
} catch (error) {
console.log(error.message, 'load_discussion')
@ -504,6 +507,13 @@ export default {
console.log("Error: scrollToElement")
}
},
scrollToElementInContainer(el, containerId) {
// console.log(el)
// const topPos = el.offsetTop + el.clientHeight;
// const container = document.getElementById(containerId)
// container.scrollTop = topPos;
},
scrollBottom(el) {
if (el) {
@ -529,7 +539,7 @@ export default {
}
)
} else {
console.log("Error: scrollBottom")
console.log("Error: scrollTop")
}
},
@ -584,12 +594,12 @@ export default {
//type: msgObj.type
}
this.discussionArr.push(responseMessage)
nextTick(() => {
const msgList = document.getElementById('messages-list')
// nextTick(() => {
// const msgList = document.getElementById('messages-list')
this.scrollBottom(msgList)
// this.scrollBottom(msgList)
})
// })
if (this.currentDiscussion.title === '' || this.currentDiscussion.title === null) {
if (msgObj.type == "input_message_infos") {
@ -653,10 +663,11 @@ export default {
if (messageItem) {
messageItem.content = msgObj.data
}
nextTick(() => {
const msgList = document.getElementById('messages-list')
this.scrollBottom(msgList)
})
// // Disables as per request
// nextTick(() => {
// const msgList = document.getElementById('messages-list')
// this.scrollBottom(msgList)
// })
}
},
@ -1059,13 +1070,16 @@ export default {
return
},
setFileListChat(files) {
this.fileList = files
this.$refs.chatBox.fileList = this.fileList
//console.log('dropppp', this.fileList)
this.isDragOver = false
//this.fileList = files
this.$refs.chatBox.fileList = files
this.isDragOverChat = false
},
setDropZoneChat() {
this.isDragOver = true
this.isDragOverChat = true
this.$refs.dragdropChat.show = true
},
@ -1089,6 +1103,7 @@ export default {
this.isDragOverDiscussion = false
},
setDropZoneDiscussion() {
this.isDragOverDiscussion = true
this.$refs.dragdropDiscussion.show = true