Merge branch 'Updated-UI' of https://github.com/Webifi/chatgpt-web
This commit is contained in:
		
						commit
						8fa18838b9
					
				| 
						 | 
					@ -33,9 +33,7 @@
 | 
				
			||||||
    faMicrophone,
 | 
					    faMicrophone,
 | 
				
			||||||
    faLightbulb,
 | 
					    faLightbulb,
 | 
				
			||||||
    faCommentSlash,
 | 
					    faCommentSlash,
 | 
				
			||||||
 | 
					 | 
				
			||||||
    faCircleCheck
 | 
					    faCircleCheck
 | 
				
			||||||
 | 
					 | 
				
			||||||
  } from '@fortawesome/free-solid-svg-icons/index'
 | 
					  } from '@fortawesome/free-solid-svg-icons/index'
 | 
				
			||||||
  import { v4 as uuidv4 } from 'uuid'
 | 
					  import { v4 as uuidv4 } from 'uuid'
 | 
				
			||||||
  import { getPrice } from './Stats.svelte'
 | 
					  import { getPrice } from './Stats.svelte'
 | 
				
			||||||
| 
						 | 
					@ -50,11 +48,6 @@
 | 
				
			||||||
  const chatId: number = parseInt(params.chatId)
 | 
					  const chatId: number = parseInt(params.chatId)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  let chatRequest = new ChatRequest()
 | 
					  let chatRequest = new ChatRequest()
 | 
				
			||||||
 | 
					 | 
				
			||||||
  // let controller:AbortController
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  // let updating: boolean|number = false
 | 
					 | 
				
			||||||
  // let updatingMessage: string = ''
 | 
					 | 
				
			||||||
  let input: HTMLTextAreaElement
 | 
					  let input: HTMLTextAreaElement
 | 
				
			||||||
  let recognition: any = null
 | 
					  let recognition: any = null
 | 
				
			||||||
  let recording = false
 | 
					  let recording = false
 | 
				
			||||||
| 
						 | 
					@ -98,6 +91,12 @@
 | 
				
			||||||
  
 | 
					  
 | 
				
			||||||
  $: onStateChange($checkStateChange, $showSetChatSettings, $submitExitingPromptsNow, $continueMessage)
 | 
					  $: onStateChange($checkStateChange, $showSetChatSettings, $submitExitingPromptsNow, $continueMessage)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  const afterChatLoad = (...args:any) => {
 | 
				
			||||||
 | 
					    scrollToBottom()
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					  $: afterChatLoad($currentChatId)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  setCurrentChat(0)
 | 
					  setCurrentChat(0)
 | 
				
			||||||
  // Make sure chat object is ready to go
 | 
					  // Make sure chat object is ready to go
 | 
				
			||||||
  updateChatSettings(chatId)
 | 
					  updateChatSettings(chatId)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -14,6 +14,6 @@
 | 
				
			||||||
 | 
					
 | 
				
			||||||
{#each messages as message, i}
 | 
					{#each messages as message, i}
 | 
				
			||||||
  {#if !((message.summarized) && $globalStorage.hideSummarized) && !(i === 0 && message.role === 'system' && !chatSettings.useSystemPrompt)}
 | 
					  {#if !((message.summarized) && $globalStorage.hideSummarized) && !(i === 0 && message.role === 'system' && !chatSettings.useSystemPrompt)}
 | 
				
			||||||
  <EditMessage bind:message={message} chatId={chatId} chat={chat} />
 | 
					  {#key message.uuid}<EditMessage bind:message={message} chatId={chatId} chat={chat} />{/key}
 | 
				
			||||||
  {/if}
 | 
					  {/if}
 | 
				
			||||||
{/each}
 | 
					{/each}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue