Merge branch 'ollama-webui:main' into session-security

This commit is contained in:
Timothy Farrell 2024-02-02 09:04:21 -06:00 committed by GitHub
commit b8cc21a9f6
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 13 additions and 8 deletions

View file

@ -145,6 +145,7 @@
name: url, name: url,
collection_name: '', collection_name: '',
upload_status: false, upload_status: false,
url: url,
error: '' error: ''
}; };

View file

@ -82,8 +82,14 @@
{#if file.type === 'image'} {#if file.type === 'image'}
<img src={file.url} alt="input" class=" max-h-96 rounded-lg" draggable="false" /> <img src={file.url} alt="input" class=" max-h-96 rounded-lg" draggable="false" />
{:else if file.type === 'doc'} {:else if file.type === 'doc'}
<div <button
class="h-16 w-[15rem] flex items-center space-x-3 px-2.5 dark:bg-gray-600 rounded-xl border border-gray-200 dark:border-none" class="h-16 w-[15rem] flex items-center space-x-3 px-2.5 dark:bg-gray-600 rounded-xl border border-gray-200 dark:border-none text-left"
type="button"
on:click={() => {
if (file?.url) {
window.open(file?.url, '_blank').focus();
}
}}
> >
<div class="p-2.5 bg-red-400 text-white rounded-lg"> <div class="p-2.5 bg-red-400 text-white rounded-lg">
<svg <svg
@ -110,7 +116,7 @@
<div class=" text-gray-500 text-sm">Document</div> <div class=" text-gray-500 text-sm">Document</div>
</div> </div>
</div> </button>
{/if} {/if}
</div> </div>
{/each} {/each}

View file

@ -58,11 +58,9 @@
class=" self-center {selectedModelIdx === 0 class=" self-center {selectedModelIdx === 0
? 'mr-3' ? 'mr-3'
: 'mr-7'} disabled:text-gray-600 disabled:hover:text-gray-600" : 'mr-7'} disabled:text-gray-600 disabled:hover:text-gray-600"
disabled={selectedModels.length === 3 || disabled} {disabled}
on:click={() => { on:click={() => {
if (selectedModels.length < 3) {
selectedModels = [...selectedModels, '']; selectedModels = [...selectedModels, ''];
}
}} }}
> >
<svg <svg

View file

@ -548,7 +548,7 @@
{#if showDropdown} {#if showDropdown}
<div <div
id="dropdownDots" id="dropdownDots"
class="absolute z-10 bottom-[70px] 4.5rem rounded-lg shadow w-[240px] bg-gray-900" class="absolute z-40 bottom-[70px] 4.5rem rounded-lg shadow w-[240px] bg-gray-900"
> >
<div class="py-2 w-full"> <div class="py-2 w-full">
{#if $user.role === 'admin'} {#if $user.role === 'admin'}