From 959ab8e2d8bf09904bfdf4898ea2884bb71fbff6 Mon Sep 17 00:00:00 2001
From: ddang <ddang@pop-os.localdomain>
Date: Wed, 29 Nov 2023 01:58:57 -0800
Subject: [PATCH 1/4] Checking for clearing chat history

---
 src/lib/components/layout/Sidebar.svelte | 105 ++++++++++++++++++-----
 1 file changed, 84 insertions(+), 21 deletions(-)

diff --git a/src/lib/components/layout/Sidebar.svelte b/src/lib/components/layout/Sidebar.svelte
index 283621cad1..50d2f17d5a 100644
--- a/src/lib/components/layout/Sidebar.svelte
+++ b/src/lib/components/layout/Sidebar.svelte
@@ -24,6 +24,8 @@
 
 	let showDropdown = false;
 
+  let showWarningHistory = false;
+
 	onMount(async () => {
 		if (window.innerWidth > 1280) {
 			show = true;
@@ -447,30 +449,91 @@
 						<div class=" self-center">Export</div>
 					</button>
 				</div>
-				<button
+        {#if showWarningHistory}
+          <div class="flex justify-between rounded-md items-center py-3 px-3.5 w-full transition">
+            <div class="flex items-center">
+              <svg 
+                xmlns="http://www.w3.org/2000/svg"
+                fill="none"
+                viewBox="0 0 24 24"
+                stroke-width="1.5"
+                stroke="currentColor"
+                class="w-5 h-5 mr-3"
+              >
+                <path
+                  stroke-linecap="round"
+                  stroke-linejoin="round"
+                  d="M14.74 9l-.346 9m-4.788 0L9.26 9m9.968-3.21c.342.052.682.107 1.022.166m-1.022-.165L18.16 19.673a2.25 2.25 0 01-2.244 2.077H8.084a2.25 2.25 0 01-2.244-2.077L4.772 5.79m14.456 0a48.108 48.108 0 00-3.478-.397m-12 .562c.34-.059.68-.114 1.022-.165m0 0a48.11 48.11 0 013.478-.397m7.5 0v-.916c0-1.18-.91-2.164-2.09-2.201a51.964 51.964 0 00-3.32 0c-1.18.037-2.09 1.022-2.09 2.201v.916m7.5 0a48.667 48.667 0 00-7.5 0"
+                />
+              </svg>
+              <span class="text-red-500">Are you sure?</span>
+            </div>
+            
+            <div class="flex space-x-1.5 items-center">
+              <button
+                class="hover:text-white transition"
+                on:click={() => {
+                  deleteChatHistory();
+                  showWarningHistory = false;
+                }}
+              >
+                <svg
+                  xmlns="http://www.w3.org/2000/svg"
+                  viewBox="0 0 20 20"
+                  fill="currentColor"
+                  class="w-4 h-4"
+                >
+                  <path
+                    fill-rule="evenodd"
+                    d="M16.704 4.153a.75.75 0 01.143 1.052l-8 10.5a.75.75 0 01-1.127.075l-4.5-4.5a.75.75 0 011.06-1.06l3.894 3.893 7.48-9.817a.75.75 0 011.05-.143z"
+                    clip-rule="evenodd"
+                  />
+                </svg>
+              </button>
+              <button
+                class="hover:text-white transition"
+                on:click={() => {
+                  showWarningHistory = false;
+                }}
+              >
+                <svg
+                  xmlns="http://www.w3.org/2000/svg"
+                  viewBox="0 0 20 20"
+                  fill="currentColor"
+                  class="w-4 h-4"
+                >
+                  <path
+                    d="M6.28 5.22a.75.75 0 00-1.06 1.06L8.94 10l-3.72 3.72a.75.75 0 101.06 1.06L10 11.06l3.72 3.72a.75.75 0 101.06-1.06L11.06 10l3.72-3.72a.75.75 0 00-1.06-1.06L10 8.94 6.28 5.22z"
+                  />
+                </svg>
+              </button>
+            </div> 
+          </div>
+        {:else}
+          <button
 					class=" flex rounded-md py-3 px-3.5 w-full hover:bg-gray-900 transition"
 					on:click={() => {
-						deleteChatHistory();
-					}}
-				>
-					<div class=" self-center mr-3">
-						<svg
-							xmlns="http://www.w3.org/2000/svg"
-							fill="none"
-							viewBox="0 0 24 24"
-							stroke-width="1.5"
-							stroke="currentColor"
-							class="w-5 h-5"
-						>
-							<path
-								stroke-linecap="round"
-								stroke-linejoin="round"
-								d="M14.74 9l-.346 9m-4.788 0L9.26 9m9.968-3.21c.342.052.682.107 1.022.166m-1.022-.165L18.16 19.673a2.25 2.25 0 01-2.244 2.077H8.084a2.25 2.25 0 01-2.244-2.077L4.772 5.79m14.456 0a48.108 48.108 0 00-3.478-.397m-12 .562c.34-.059.68-.114 1.022-.165m0 0a48.11 48.11 0 013.478-.397m7.5 0v-.916c0-1.18-.91-2.164-2.09-2.201a51.964 51.964 0 00-3.32 0c-1.18.037-2.09 1.022-2.09 2.201v.916m7.5 0a48.667 48.667 0 00-7.5 0"
-							/>
-						</svg>
-					</div>
-					<div class=" self-center">Clear conversations</div>
+            showWarningHistory = true;
+					}}>
+            <div class="mr-3">
+              <svg
+                xmlns="http://www.w3.org/2000/svg"
+                fill="none"
+                viewBox="0 0 24 24"
+                stroke-width="1.5"
+                stroke="currentColor"
+                class="w-5 h-5"
+              >
+                <path
+                  stroke-linecap="round"
+                  stroke-linejoin="round"
+                  d="M14.74 9l-.346 9m-4.788 0L9.26 9m9.968-3.21c.342.052.682.107 1.022.166m-1.022-.165L18.16 19.673a2.25 2.25 0 01-2.244 2.077H8.084a2.25 2.25 0 01-2.244-2.077L4.772 5.79m14.456 0a48.108 48.108 0 00-3.478-.397m-12 .562c.34-.059.68-.114 1.022-.165m0 0a48.11 48.11 0 013.478-.397m7.5 0v-.916c0-1.18-.91-2.164-2.09-2.201a51.964 51.964 0 00-3.32 0c-1.18.037-2.09 1.022-2.09 2.201v.916m7.5 0a48.667 48.667 0 00-7.5 0"
+                />
+              </svg>
+            </div>
+            <span>Clear conversations</span>
 				</button>
+        {/if}
 
 				{#if $user !== undefined}
 					<button

From fb6003de84765e8d21ce136183446fe57bb66ce1 Mon Sep 17 00:00:00 2001
From: ddang <ddang@pop-os.localdomain>
Date: Wed, 29 Nov 2023 19:39:37 -0800
Subject: [PATCH 2/4] Comments resolved

---
 src/lib/components/layout/Sidebar.svelte | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/lib/components/layout/Sidebar.svelte b/src/lib/components/layout/Sidebar.svelte
index 50d2f17d5a..656d3f451f 100644
--- a/src/lib/components/layout/Sidebar.svelte
+++ b/src/lib/components/layout/Sidebar.svelte
@@ -24,7 +24,7 @@
 
 	let showDropdown = false;
 
-  let showWarningHistory = false;
+  let showDeleteHistoryConfirm = false;
 
 	onMount(async () => {
 		if (window.innerWidth > 1280) {
@@ -449,7 +449,7 @@
 						<div class=" self-center">Export</div>
 					</button>
 				</div>
-        {#if showWarningHistory}
+        {#if showDeleteHistoryConfirm}
           <div class="flex justify-between rounded-md items-center py-3 px-3.5 w-full transition">
             <div class="flex items-center">
               <svg 
@@ -466,7 +466,7 @@
                   d="M14.74 9l-.346 9m-4.788 0L9.26 9m9.968-3.21c.342.052.682.107 1.022.166m-1.022-.165L18.16 19.673a2.25 2.25 0 01-2.244 2.077H8.084a2.25 2.25 0 01-2.244-2.077L4.772 5.79m14.456 0a48.108 48.108 0 00-3.478-.397m-12 .562c.34-.059.68-.114 1.022-.165m0 0a48.11 48.11 0 013.478-.397m7.5 0v-.916c0-1.18-.91-2.164-2.09-2.201a51.964 51.964 0 00-3.32 0c-1.18.037-2.09 1.022-2.09 2.201v.916m7.5 0a48.667 48.667 0 00-7.5 0"
                 />
               </svg>
-              <span class="text-red-500">Are you sure?</span>
+              <span>Are you sure?</span>
             </div>
             
             <div class="flex space-x-1.5 items-center">
@@ -474,7 +474,7 @@
                 class="hover:text-white transition"
                 on:click={() => {
                   deleteChatHistory();
-                  showWarningHistory = false;
+                  showDeleteHistoryConfirm = false;
                 }}
               >
                 <svg
@@ -493,7 +493,7 @@
               <button
                 class="hover:text-white transition"
                 on:click={() => {
-                  showWarningHistory = false;
+                  showDeleteHistoryConfirm = false;
                 }}
               >
                 <svg
@@ -513,7 +513,7 @@
           <button
 					class=" flex rounded-md py-3 px-3.5 w-full hover:bg-gray-900 transition"
 					on:click={() => {
-            showWarningHistory = true;
+            showDeleteHistoryConfirm = true;
 					}}>
             <div class="mr-3">
               <svg

From c9aeeb4effacc1ab2cf307be61f0458c161d5c2d Mon Sep 17 00:00:00 2001
From: ntimo <git@nowitzki.me>
Date: Thu, 30 Nov 2023 20:09:55 +0000
Subject: [PATCH 3/4] feat: add PWA manifest.json

---
 src/app.html         |  1 +
 static/manifest.json | 16 ++++++++++++++++
 2 files changed, 17 insertions(+)
 create mode 100644 static/manifest.json

diff --git a/src/app.html b/src/app.html
index 5875db45ee..e5ed6aeb0b 100644
--- a/src/app.html
+++ b/src/app.html
@@ -3,6 +3,7 @@
 	<head>
 		<meta charset="utf-8" />
 		<link rel="icon" href="%sveltekit.assets%/favicon.png" />
+		<link rel="manifest" href="%sveltekit.assets%/manifest.json" />
 		<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
 		<script>
 			// On page load or when changing themes, best to add inline in `head` to avoid FOUC
diff --git a/static/manifest.json b/static/manifest.json
new file mode 100644
index 0000000000..e386dc56e1
--- /dev/null
+++ b/static/manifest.json
@@ -0,0 +1,16 @@
+{
+  "name": "Ollama Web UI",
+  "short_name": "Ollama",
+  "start_url": "/",
+  "display": "standalone",
+  "background_color": "#343541",
+  "theme_color": "#343541",
+  "orientation": "portrait-primary",
+  "icons": [
+    {
+      "src": "/favicon.png",
+      "type": "image/png",
+      "sizes": "844x884"
+    }
+  ]
+}
\ No newline at end of file

From b55ec6ce49d5505b806421ceffc514886ebc47a8 Mon Sep 17 00:00:00 2001
From: "Timothy J. Baek" <timothyjrbeck@gmail.com>
Date: Thu, 30 Nov 2023 15:59:33 -0800
Subject: [PATCH 4/4] fix: message input styling

---
 src/lib/components/chat/MessageInput.svelte | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/lib/components/chat/MessageInput.svelte b/src/lib/components/chat/MessageInput.svelte
index 668d24819a..9a2e0f6970 100644
--- a/src/lib/components/chat/MessageInput.svelte
+++ b/src/lib/components/chat/MessageInput.svelte
@@ -84,8 +84,8 @@
 	};
 </script>
 
-<div class="fixed bottom-0 w-full">
-	<div class="  pt-5">
+<div class="fixed bottom-0 w-full bg-white dark:bg-gray-800">
+	<div class=" absolute right-0 left-0 bottom-0 mb-20">
 		<div class="max-w-3xl px-2.5 pt-2.5 -mb-0.5 mx-auto inset-x-0">
 			{#if messages.length == 0 && suggestions !== 'false'}
 				<Suggestions {submitPrompt} />
@@ -115,7 +115,10 @@
 					</button>
 				</div>
 			{/if}
-
+		</div>
+	</div>
+	<div>
+		<div class="max-w-3xl px-2.5 -mb-0.5 mx-auto inset-x-0">
 			<div class="bg-gradient-to-t from-white dark:from-gray-800 from-40% pb-2">
 				<input
 					bind:this={filesInputElement}