Merge pull request #156 from andzejsp/main

Todays last patch
This commit is contained in:
Saifeddine ALOUI 2023-05-06 23:09:54 +02:00 committed by GitHub
commit 8f748ea183
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 30 additions and 26 deletions

File diff suppressed because one or more lines are too long

11
web/dist/assets/index-1cbd4e52.js vendored Normal file

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

4
web/dist/index.html vendored
View File

@ -6,8 +6,8 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>GPT4All - WEBUI</title> <title>GPT4All - WEBUI</title>
<script type="module" crossorigin src="/assets/index-0a458d4e.js"></script> <script type="module" crossorigin src="/assets/index-1cbd4e52.js"></script>
<link rel="stylesheet" href="/assets/index-7a3ebd92.css"> <link rel="stylesheet" href="/assets/index-45119244.css">
</head> </head>
<body> <body>
<div id="app"></div> <div id="app"></div>

View File

@ -108,16 +108,16 @@
<div class="overflow-y-scroll flex flex-col no-scrollbar flex-grow " id="messages-list"> <div class="overflow-y-scroll flex flex-col no-scrollbar flex-grow " id="messages-list">
<!-- CHAT AREA --> <!-- CHAT AREA -->
<div> <div class="flex flex-col flex-grow">
<Message v-for="(msg, index) in discussionArr" :key="index" :message="msg" <Message v-for="(msg, index) in discussionArr" :key="index" :message="msg"
@click="scrollToElement($event.target)" :id="'msg-' + msg.id" ref="messages" /> @click="scrollToElement($event.target)" :id="'msg-' + msg.id" ref="messages" />
<WelcomeComponent v-if="discussionArr.length < 1" /> <WelcomeComponent v-if="!currentDiscussion.id" />
</div> </div>
<div class=" sticky bottom-0"> <div class=" sticky bottom-0">
<ChatBox v-if="discussionArr.length > 0" @messageSentEvent="sendMsg" :loading="isGenerating" <ChatBox v-if="currentDiscussion.id" @messageSentEvent="sendMsg" :loading="isGenerating"
@stopGenerating="stopGenerating" /> @stopGenerating="stopGenerating" />
</div> </div>
@ -212,7 +212,7 @@ export default {
if (id) { if (id) {
this.loading = true this.loading = true
this.setDiscussionLoading(id, this.loading) this.setDiscussionLoading(id, this.loading)
const res = await axios.post('/delete_discussion', { await axios.post('/delete_discussion', {
id: id id: id
}) })
this.loading = false this.loading = false
@ -365,7 +365,7 @@ export default {
}) })
if (this.currentDiscussion.title === '' || this.currentDiscussion.title === null) { if (this.currentDiscussion.title === '' || this.currentDiscussion.title === null) {
this.changeTitleUsingUserMSG(this.currentDiscussion.id, usrMessage.content) this.changeTitleUsingUserMSG(this.currentDiscussion.id, msgObj.content)
} }
}, },
@ -445,8 +445,8 @@ export default {
async deleteDiscussion(id) { async deleteDiscussion(id) {
// Deletes discussion from backend and frontend // Deletes discussion from backend and frontend
const index = this.list.findIndex((x) => x.id == id) //const index = this.list.findIndex((x) => x.id == id)
const discussionItem = this.list[index] //const discussionItem = this.list[index]
//discussionItem.loading = true //discussionItem.loading = true
await this.delete_discussion(id) await this.delete_discussion(id)
if (this.currentDiscussion.id == id) { if (this.currentDiscussion.id == id) {
@ -558,6 +558,9 @@ export default {
this.isGenerating = false this.isGenerating = false
this.setDiscussionLoading(this.currentDiscussion.id, this.isGenerating) this.setDiscussionLoading(this.currentDiscussion.id, this.isGenerating)
this.chime.play() this.chime.play()
},
copyToClipBoard(){
} }
}, },
async created() { async created() {
@ -597,14 +600,14 @@ export default {
WelcomeComponent WelcomeComponent
}, },
watch: { watch: {
filterTitle(newVal, oldVal) { filterTitle(newVal) {
if (newVal == '') { if (newVal == '') {
this.filterInProgress = true this.filterInProgress = true
this.list = this.tempList this.list = this.tempList
this.filterInProgress = false this.filterInProgress = false
} }
}, },
isCheckbox(newval, oldval) { isCheckbox(newval) {
nextTick(() => { nextTick(() => {
feather.replace() feather.replace()
}) })
@ -612,7 +615,7 @@ export default {
this.isSelectAll = false this.isSelectAll = false
} }
}, },
socketConnected(newval, oldval) { socketConnected(newval) {
console.log("Websocket connected (watch)", newval) console.log("Websocket connected (watch)", newval)
}, },
showConfirmation() { showConfirmation() {
@ -647,7 +650,7 @@ import WelcomeComponent from '../components/WelcomeComponent.vue'
import feather from 'feather-icons' import feather from 'feather-icons'
import axios from 'axios' import axios from 'axios'
import { nextTick, ref } from 'vue' import { nextTick } from 'vue'
import { socket, state } from '@/services/websocket.js' import { socket, state } from '@/services/websocket.js'

View File

@ -244,10 +244,11 @@
import axios from "axios"; import axios from "axios";
import MessageBox from "@/components/MessageBox.vue"; import MessageBox from "@/components/MessageBox.vue";
import YesNoDialog from "@/components/YesNoDialog.vue"; import YesNoDialog from "@/components/YesNoDialog.vue";
axios.defaults.baseURL = import.meta.env.VITE_GPT4ALL_API_BASEURL
export default { export default {
components: { components: {
MessageBox, MessageBox,
YesNoDialog
}, },
setup() { setup() {