From c48ecbdc0bb57247445a8a593a603abdf32c1ed6 Mon Sep 17 00:00:00 2001 From: AndzejsP Date: Tue, 30 May 2023 13:09:22 +0300 Subject: [PATCH 01/10] drop box ready --- web/src/components/DragDrop.vue | 30 +++++++++-------- web/src/views/DiscussionsView.vue | 56 ++++++++++++++++++++----------- 2 files changed, 52 insertions(+), 34 deletions(-) diff --git a/web/src/components/DragDrop.vue b/web/src/components/DragDrop.vue index 6c75b7d4..893b8238 100644 --- a/web/src/components/DragDrop.vue +++ b/web/src/components/DragDrop.vue @@ -6,20 +6,22 @@ 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)">
+ 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'"> -
+
+ -
Drop your files here -
- -
+ + +
@@ -80,13 +82,13 @@ export default { }) }, methods: { - computedFileSize(size) { - return filesize(size) - }, - removeItem(file) { - this.fileList = this.fileList.filter((item) => item != file) - // console.log(this.fileList) - }, + // computedFileSize(size) { + // return filesize(size) + // }, + // removeItem(file) { + // this.fileList = this.fileList.filter((item) => item != file) + // // console.log(this.fileList) + // }, panelDrop(event) { this.dropRelease = true if (event.dataTransfer.files.length > 0) { diff --git a/web/src/views/DiscussionsView.vue b/web/src/views/DiscussionsView.vue index 33cacfc6..c7230f41 100644 --- a/web/src/views/DiscussionsView.vue +++ b/web/src/views/DiscussionsView.vue @@ -122,13 +122,18 @@
+ -
+ +
- -
+ Drop your discussion file here +
-
+
+ + +
+
-
@@ -230,8 +236,8 @@ export default { isDiscussionBottom: false, personalityAvatars: [], // object array of personality name: and avatar: props fileList: [], - isDropZoneVisible: true, - isDragOver: false + isDragOverDiscussion: false, + isDragOverChat: false } }, methods: { @@ -420,20 +426,20 @@ export default { async import_multiple_discussions(jArray) { try { if (jArray.length > 0) { - console.log('sending import',jArray) + console.log('sending import', jArray) const res = await axios.post('/import_multiple_discussions', { jArray }) if (res) { - console.log('import response',res.data) + console.log('import response', res.data) return res.data } } } catch (error) { console.log("Error: Could not import multiple discussions", error.message) - return + return } }, filterDiscussions() { @@ -960,15 +966,15 @@ export default { const obj = await this.parseJsonFile(event.target.files[0]) const res = await this.import_multiple_discussions(obj) - if(res){ - this.$refs.toast.showToast("Successfully imported ("+obj.length+")", 4, true) + if (res) { + this.$refs.toast.showToast("Successfully imported (" + obj.length + ")", 4, true) await this.list_discussions() - }else{ + } else { this.$refs.toast.showToast("Failed to import discussions", 4, false) } - - - + + + }, async getPersonalityAvatars() { @@ -1029,8 +1035,18 @@ export default { setDropZoneChat() { this.isDragOver = true this.$refs.dragdropChat.show = true - this.isDropZoneVisible = true - //console.log('is vis',this.isDropZoneVisible) + + }, + setFileListDiscussion(files) { + this.fileList = files + this.$refs.dragdropDiscussion.fileList = this.fileList + //console.log('dropppp', this.fileList) + this.isDragOverDiscussion = false + }, + setDropZoneDiscussion() { + this.isDragOverDiscussion = true + this.$refs.dragdropDiscussion.show = true + }, @@ -1040,7 +1056,7 @@ export default { // Constructor - + this.setPageTitle() await this.list_discussions() @@ -1058,7 +1074,7 @@ export default { }, async activated() { - //this.$refs.dragdropDiscussion.show = true + // This lifecycle hook runs every time you switch from other page back to this page (vue-router) // To fix scrolling back to last message, this hook is needed. // If anyone knows hor to fix scroll issue when changing pages, please do fix it :D From 3403232626bf78aa45071850dfdc8f1a2f77cae3 Mon Sep 17 00:00:00 2001 From: AndzejsP Date: Tue, 30 May 2023 13:29:49 +0300 Subject: [PATCH 02/10] added drag n drop for discussions --- web/src/views/DiscussionsView.vue | 36 +++++++++++++++++++++++++------ 1 file changed, 30 insertions(+), 6 deletions(-) diff --git a/web/src/views/DiscussionsView.vue b/web/src/views/DiscussionsView.vue index c7230f41..98412cbd 100644 --- a/web/src/views/DiscussionsView.vue +++ b/web/src/views/DiscussionsView.vue @@ -127,7 +127,7 @@
- Drop your discussion file here + Drop your discussion file here
@@ -909,10 +909,21 @@ export default { a.click(); document.body.removeChild(a); }, + parseJsonObj(obj){ + try { + const ret = JSON.parse(obj) + return ret + } catch (error) { + this.$refs.toast.showToast("Could not parse JSON. \n"+error.message, 4, false) + return null + } + + }, async parseJsonFile(file) { + return new Promise((resolve, reject) => { const fileReader = new FileReader() - fileReader.onload = event => resolve(JSON.parse(event.target.result)) + fileReader.onload = event => resolve(this.parseJsonObj(event.target.result)) fileReader.onerror = error => reject(error) fileReader.readAsText(file) }) @@ -1037,10 +1048,23 @@ export default { this.$refs.dragdropChat.show = true }, - setFileListDiscussion(files) { - this.fileList = files - this.$refs.dragdropDiscussion.fileList = this.fileList - //console.log('dropppp', this.fileList) + async setFileListDiscussion(files) { + + if(files.length > 1){ + this.$refs.toast.showToast("Failed to import discussions. Too many files", 4, false) + return + } + const obj = await this.parseJsonFile(files[0]) + + const res = await this.import_multiple_discussions(obj) + if (res) { + this.$refs.toast.showToast("Successfully imported (" + obj.length + ")", 4, true) + await this.list_discussions() + } else { + this.$refs.toast.showToast("Failed to import discussions", 4, false) + } + + this.isDragOverDiscussion = false }, setDropZoneDiscussion() { From 6e17cfaf0beb82e7dd2e05d1503fbfcbbc6a9708 Mon Sep 17 00:00:00 2001 From: AndzejsP Date: Tue, 30 May 2023 17:15:19 +0300 Subject: [PATCH 03/10] fixed remove --- web/src/views/DiscussionsView.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web/src/views/DiscussionsView.vue b/web/src/views/DiscussionsView.vue index 98412cbd..80a35ff6 100644 --- a/web/src/views/DiscussionsView.vue +++ b/web/src/views/DiscussionsView.vue @@ -720,7 +720,7 @@ export default { this.tempList = this.list this.isCheckbox = false this.$refs.toast.showToast("Removed (" + deleteList.length + ") items", 4, true) - + this.showConfirmation = false console.log("Multi delete done") }, async deleteMessage(msgId) { From 17184cc7eac2c605ccc82b9ba116d8401786458a Mon Sep 17 00:00:00 2001 From: AndzejsP Date: Tue, 30 May 2023 17:33:06 +0300 Subject: [PATCH 04/10] added template not usable --- web/src/components/BindingEntry.vue | 89 +++++++++++++++++------------ web/src/views/SettingsView.vue | 8 ++- 2 files changed, 59 insertions(+), 38 deletions(-) diff --git a/web/src/components/BindingEntry.vue b/web/src/components/BindingEntry.vue index 2d303537..a299d415 100644 --- a/web/src/components/BindingEntry.vue +++ b/web/src/components/BindingEntry.vue @@ -2,50 +2,52 @@
- -
- -

- {{ binding.name }} -

+
-
-
+
+ +

+ {{ binding.name }} +

+ + +
+
-
- - Author:  +
+ + Author:  - {{ binding.author }} + {{ binding.author }} +
+
+ + Folder:  + + {{ binding.folder }} +
+
+ + Version:  + {{ binding.version }} +
+ + + Link:  + {{ binding.link }} +
- - Folder:  + + Description: 
+
+

{{ binding.description }}

+ - {{ binding.folder }} -
-
- - Version:  - {{ binding.version }} -
- - - Link:  - {{ binding.link }} -
-
- - Description: 
-
-

{{ binding.description }}

- -
-
@@ -59,11 +61,12 @@ export default { props: { binding: {}, onSelected: Function, - selected: Boolean + selected: Boolean, + }, data() { return { - + isTemplate: false }; }, mounted() { @@ -72,6 +75,10 @@ export default { }) + + this.getStatus() + + }, methods: { getImgUrl() { @@ -83,7 +90,15 @@ export default { toggleSelected() { this.onSelected(this) }, + getStatus() { + if (this.binding.folder === 'backend_template' || this.binding.folder === 'binding_template') { + this.isTemplate = true + + + } + } + + }, - } }; diff --git a/web/src/views/SettingsView.vue b/web/src/views/SettingsView.vue index 57f26f69..5db921b9 100644 --- a/web/src/views/SettingsView.vue +++ b/web/src/views/SettingsView.vue @@ -771,6 +771,12 @@ export default { socket.emit('uninstall_model', { path: model_object.path }); }, onSelectedBinding(binding_object) { + + if(binding_object.binding.folder ==='backend_template' || binding_object.binding.folder==='binding_template'){ + this.$refs.toast.showToast("Cannot select template", 4, false) + + return + } this.update_binding(binding_object.binding.folder) //console.log('lol',binding_object) }, @@ -951,7 +957,7 @@ export default { const res = await axios.get("/" + endpoint); if (res) { - + return res.data } From 29569452438b99c764b7a5651299396073940577 Mon Sep 17 00:00:00 2001 From: AndzejsP Date: Tue, 30 May 2023 17:37:38 +0300 Subject: [PATCH 05/10] added binding zoo to collapse all and download ico --- web/src/components/ModelEntry.vue | 2 +- web/src/views/SettingsView.vue | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/web/src/components/ModelEntry.vue b/web/src/components/ModelEntry.vue index 8c4404a4..2fb5a23f 100644 --- a/web/src/components/ModelEntry.vue +++ b/web/src/components/ModelEntry.vue @@ -19,7 +19,7 @@
- + Manual download:  Date: Tue, 30 May 2023 18:04:31 +0300 Subject: [PATCH 06/10] more UI quality --- web/src/components/BindingEntry.vue | 24 ++++++++++++++++++++---- web/src/components/ModelEntry.vue | 2 +- web/src/components/PersonalityEntry.vue | 2 +- web/src/views/SettingsView.vue | 7 ++++++- 4 files changed, 28 insertions(+), 7 deletions(-) diff --git a/web/src/components/BindingEntry.vue b/web/src/components/BindingEntry.vue index a299d415..f9d42bf0 100644 --- a/web/src/components/BindingEntry.vue +++ b/web/src/components/BindingEntry.vue @@ -1,18 +1,34 @@