From ceafdf18c9d9f0f8769d4a9e45c8a407179161c5 Mon Sep 17 00:00:00 2001
From: Nate Sesti <sestinj@gmail.com>
Date: Wed, 6 Sep 2023 23:02:59 -0700
Subject: feat: :lipstick: handful of UI improvements

---
 extension/react-app/src/components/Layout.tsx      |  54 ++++---
 extension/react-app/src/components/ModelSelect.tsx | 164 ++++++++++++++-------
 extension/react-app/src/components/TextDialog.tsx  |   2 +-
 .../src/components/UserInputContainer.tsx          |   4 +
 .../components/dialogs/AddContextGroupDialog.tsx   |   2 +-
 .../dialogs/SelectContextGroupDialog.tsx           |   2 +-
 extension/react-app/src/pages/gui.tsx              |   4 +-
 7 files changed, 150 insertions(+), 82 deletions(-)

(limited to 'extension')

diff --git a/extension/react-app/src/components/Layout.tsx b/extension/react-app/src/components/Layout.tsx
index de8b86d8..065b77c6 100644
--- a/extension/react-app/src/components/Layout.tsx
+++ b/extension/react-app/src/components/Layout.tsx
@@ -3,7 +3,7 @@ import { defaultBorderRadius, secondaryDark, vscForeground } from ".";
 import { Outlet } from "react-router-dom";
 import Onboarding from "./Onboarding";
 import TextDialog from "./TextDialog";
-import { useContext, useEffect } from "react";
+import { useContext, useEffect, useState } from "react";
 import { GUIClientContext } from "../App";
 import { useDispatch, useSelector } from "react-redux";
 import { RootStore } from "../redux/store";
@@ -145,29 +145,37 @@ const Layout = () => {
         <GridDiv>
           <Outlet />
           <Footer>
-            {localStorage.getItem("hideFeature") === "true" || (
-              <SparklesIcon
-                className="mr-auto cursor-pointer"
-                onClick={() => {
-                  localStorage.setItem("hideFeature", "true");
-                }}
-                onMouseEnter={() => {
-                  dispatch(
-                    setBottomMessage(
-                      "🎁 New Feature: Use ⌘⇧R automatically debug errors in the terminal (you can click the sparkle icon to make it go away)"
-                    )
-                  );
-                }}
-                onMouseLeave={() => {
-                  dispatch(setBottomMessage(undefined));
-                }}
-                width="1.3em"
-                height="1.3em"
-                color="yellow"
-              />
+            {(localStorage.getItem("hideFeature") === "true" && false) || (
+              <div className="mr-auto flex gap-2 items-center">
+                <SparklesIcon
+                  className="cursor-pointer"
+                  onClick={() => {
+                    localStorage.setItem("hideFeature", "true");
+                  }}
+                  onMouseEnter={() => {
+                    dispatch(
+                      setBottomMessage(
+                        "🎁 New Feature: Use ⌘⇧R automatically debug errors in the terminal (you can click the sparkle icon to make it go away)"
+                      )
+                    );
+                  }}
+                  onMouseLeave={() => {
+                    dispatch(
+                      setBottomMessageCloseTimeout(
+                        setTimeout(() => {
+                          dispatch(setBottomMessage(undefined));
+                        }, 2000)
+                      )
+                    );
+                  }}
+                  width="1.3em"
+                  height="1.3em"
+                  color="yellow"
+                />
+
+                <ModelSelect />
+              </div>
             )}
-
-            <ModelSelect />
             <HeaderButtonWithText
               onClick={() => {
                 client?.loadSession(undefined);
diff --git a/extension/react-app/src/components/ModelSelect.tsx b/extension/react-app/src/components/ModelSelect.tsx
index 317c164a..dc58da9e 100644
--- a/extension/react-app/src/components/ModelSelect.tsx
+++ b/extension/react-app/src/components/ModelSelect.tsx
@@ -1,18 +1,21 @@
 import styled from "styled-components";
 import {
   defaultBorderRadius,
+  lightGray,
   secondaryDark,
   vscBackground,
   vscForeground,
 } from ".";
-import { useContext, useEffect } from "react";
+import { useContext } from "react";
 import { GUIClientContext } from "../App";
 import { RootStore } from "../redux/store";
-import { useSelector } from "react-redux";
+import { useDispatch, useSelector } from "react-redux";
+import { PlusIcon } from "@heroicons/react/24/outline";
+import { setDialogMessage, setShowDialog } from "../redux/slices/uiStateSlice";
 
 const MODEL_INFO: { title: string; class: string; args: any }[] = [
   {
-    title: "gpt-4",
+    title: "OpenAI",
     class: "OpenAI",
     args: {
       model: "gpt-4",
@@ -20,18 +23,13 @@ const MODEL_INFO: { title: string; class: string; args: any }[] = [
     },
   },
   {
-    title: "claude-2",
+    title: "Anthropic",
     class: "AnthropicLLM",
     args: {
       model: "claude-2",
       api_key: "<ANTHROPIC_API_KEY>",
     },
   },
-  {
-    title: "GGML",
-    class: "GGML",
-    args: {},
-  },
   {
     title: "Ollama",
     class: "Ollama",
@@ -39,6 +37,14 @@ const MODEL_INFO: { title: string; class: string; args: any }[] = [
       model: "codellama",
     },
   },
+  {
+    title: "TogetherAI",
+    class: "TogetherLLM",
+    args: {
+      model: "togethercomputer/CodeLlama-13b-Instruct",
+      api_key: "<TOGETHER_API_KEY>",
+    },
+  },
   {
     title: "Replicate",
     class: "ReplicateLLM",
@@ -48,21 +54,20 @@ const MODEL_INFO: { title: string; class: string; args: any }[] = [
       api_key: "<REPLICATE_API_KEY>",
     },
   },
-  {
-    title: "TogetherAI",
-    class: "TogetherLLM",
-    args: {
-      model: "togethercomputer/CodeLlama-13b-Instruct",
-      api_key: "<TOGETHER_API_KEY>",
-    },
-  },
   {
     title: "llama.cpp",
     class: "LlamaCpp",
     args: {},
   },
   {
-    title: "gpt-4 (limited free usage)",
+    title: "Other OpenAI-compatible API",
+    class: "GGML",
+    args: {
+      server_url: "<SERVER_URL>",
+    },
+  },
+  {
+    title: "Continue Free Trial (gpt-4)",
     class: "MaybeProxyOpenAI",
     args: {
       model: "gpt-4",
@@ -70,21 +75,56 @@ const MODEL_INFO: { title: string; class: string; args: any }[] = [
   },
 ];
 
+const GridDiv = styled.div`
+  display: grid;
+  grid-template-columns: 1fr auto;
+  align-items: center;
+  border: 0.5px solid ${lightGray};
+  border-radius: ${defaultBorderRadius};
+  overflow: hidden;
+`;
+
 const Select = styled.select`
   border: none;
-  width: 25vw;
-  background-color: ${secondaryDark};
+  max-width: 25vw;
+  background-color: ${vscBackground};
   color: ${vscForeground};
-  border-radius: ${defaultBorderRadius};
   padding: 6px;
   max-height: 35vh;
   overflow: scroll;
   cursor: pointer;
-  margin-right: auto;
 
   &:focus {
     outline: none;
   }
+  &:hover {
+    background-color: ${secondaryDark};
+  }
+`;
+
+const StyledPlusIcon = styled(PlusIcon)`
+  cursor: pointer;
+  margin: 0px;
+  padding-left: 4px;
+  padding-right: 4px;
+  height: 100%;
+
+  &:hover {
+    background-color: ${secondaryDark};
+  }
+  border-left: 0.5px solid ${lightGray};
+`;
+
+const NewProviderDiv = styled.div`
+  cursor: pointer;
+  padding: 8px;
+  padding-left: 16px;
+  padding-right: 16px;
+  border-top: 0.5px solid ${lightGray};
+
+  &:hover {
+    background-color: ${secondaryDark};
+  }
 `;
 
 function modelSelectTitle(model: any): string {
@@ -99,6 +139,7 @@ function modelSelectTitle(model: any): string {
 }
 
 function ModelSelect(props: {}) {
+  const dispatch = useDispatch();
   const client = useContext(GUIClientContext);
   const defaultModel = useSelector(
     (state: RootStore) => (state.serverState.config as any)?.models?.default
@@ -108,23 +149,20 @@ function ModelSelect(props: {}) {
   );
 
   return (
-    <Select
-      value={JSON.stringify({
-        t: "default",
-        idx: -1,
-      })}
-      defaultValue={0}
-      onChange={(e) => {
-        const value = JSON.parse(e.target.value);
-        if (value.t === "unused") {
-          client?.setModelForRoleFromIndex("*", value.idx);
-        } else if (value.t === "new") {
-          const model = MODEL_INFO[value.idx];
-          client?.addModelForRole("*", model.class, model.args);
-        }
-      }}
-    >
-      <optgroup label="My Saved Models">
+    <GridDiv>
+      <Select
+        value={JSON.stringify({
+          t: "default",
+          idx: -1,
+        })}
+        defaultValue={0}
+        onChange={(e) => {
+          const value = JSON.parse(e.target.value);
+          if (value.t === "unused") {
+            client?.setModelForRoleFromIndex("*", value.idx);
+          }
+        }}
+      >
         {defaultModel && (
           <option
             value={JSON.stringify({
@@ -147,22 +185,40 @@ function ModelSelect(props: {}) {
             </option>
           );
         })}
-      </optgroup>
-      <optgroup label="Add New Model">
-        {MODEL_INFO.map((model, idx) => {
-          return (
-            <option
-              value={JSON.stringify({
-                t: "new",
-                idx,
-              })}
-            >
-              {model.title}
-            </option>
+      </Select>
+
+      <StyledPlusIcon
+        width="1.3em"
+        height="1.3em"
+        onClick={() => {
+          dispatch(
+            setDialogMessage(
+              <div>
+                <div className="text-lg font-bold p-2">
+                  Setup a new model provider
+                </div>
+                <br />
+                {MODEL_INFO.map((model, idx) => {
+                  return (
+                    <NewProviderDiv
+                      onClick={() => {
+                        const model = MODEL_INFO[idx];
+                        client?.addModelForRole("*", model.class, model.args);
+                        dispatch(setShowDialog(false));
+                      }}
+                    >
+                      {model.title}
+                    </NewProviderDiv>
+                  );
+                })}
+                <br />
+              </div>
+            )
           );
-        })}
-      </optgroup>
-    </Select>
+          dispatch(setShowDialog(true));
+        }}
+      />
+    </GridDiv>
   );
 }
 
diff --git a/extension/react-app/src/components/TextDialog.tsx b/extension/react-app/src/components/TextDialog.tsx
index 44d25ae6..a9fcbb8f 100644
--- a/extension/react-app/src/components/TextDialog.tsx
+++ b/extension/react-app/src/components/TextDialog.tsx
@@ -25,12 +25,12 @@ const Dialog = styled.div`
   color: ${vscForeground};
   background-color: ${vscBackground};
   border-radius: 8px;
-  padding: 8px;
   display: flex;
   flex-direction: column;
   box-shadow: 0 0 10px 0 ${vscForeground};
   margin: auto;
   word-wrap: break-word;
+  overflow: hidden;
 `;
 
 const TextArea = styled.textarea`
diff --git a/extension/react-app/src/components/UserInputContainer.tsx b/extension/react-app/src/components/UserInputContainer.tsx
index 228c3530..866fef58 100644
--- a/extension/react-app/src/components/UserInputContainer.tsx
+++ b/extension/react-app/src/components/UserInputContainer.tsx
@@ -2,6 +2,7 @@ import React, { useContext, useEffect, useRef, useState } from "react";
 import styled from "styled-components";
 import {
   defaultBorderRadius,
+  lightGray,
   secondaryDark,
   vscBackground,
   vscForeground,
@@ -28,6 +29,9 @@ const StyledDiv = styled.div`
   padding: 8px;
   padding-top: 0px;
   padding-bottom: 0px;
+
+  border-bottom: 0.5px solid ${lightGray};
+  border-top: 0.5px solid ${lightGray};
 `;
 
 const DeleteButtonDiv = styled.div`
diff --git a/extension/react-app/src/components/dialogs/AddContextGroupDialog.tsx b/extension/react-app/src/components/dialogs/AddContextGroupDialog.tsx
index f6c7c626..9cd0a95e 100644
--- a/extension/react-app/src/components/dialogs/AddContextGroupDialog.tsx
+++ b/extension/react-app/src/components/dialogs/AddContextGroupDialog.tsx
@@ -26,7 +26,7 @@ function AddContextGroupDialog({
   };
 
   return (
-    <div>
+    <div className="p-4">
       <TextInput
         defaultValue="My Context Group"
         type="text"
diff --git a/extension/react-app/src/components/dialogs/SelectContextGroupDialog.tsx b/extension/react-app/src/components/dialogs/SelectContextGroupDialog.tsx
index b8fc2bb7..44095fc0 100644
--- a/extension/react-app/src/components/dialogs/SelectContextGroupDialog.tsx
+++ b/extension/react-app/src/components/dialogs/SelectContextGroupDialog.tsx
@@ -57,7 +57,7 @@ function SelectContextGroupDialog() {
   const client = useContext(GUIClientContext);
 
   return (
-    <div className="px-4">
+    <div className="p-4">
       <h2>Saved Context Groups</h2>
 
       {savedContextGroups && Object.keys(savedContextGroups).length > 0 ? (
diff --git a/extension/react-app/src/pages/gui.tsx b/extension/react-app/src/pages/gui.tsx
index 99e7cb7b..cb62f7ed 100644
--- a/extension/react-app/src/pages/gui.tsx
+++ b/extension/react-app/src/pages/gui.tsx
@@ -277,7 +277,7 @@ function GUI(props: GUIProps) {
         if (currentCount === 100) {
           dispatch(
             setDialogMessage(
-              <div className="text-center">
+              <div className="text-center p-4">
                 👋 Thanks for using Continue. We are a beta product and love
                 working closely with our first users. If you're interested in
                 speaking, enter your name and email. We won't use this
@@ -293,7 +293,7 @@ function GUI(props: GUIProps) {
                     });
                     dispatch(
                       setDialogMessage(
-                        <div className="text-center">
+                        <div className="text-center p-4">
                           Thanks! We'll be in touch soon.
                         </div>
                       )
-- 
cgit v1.2.3-70-g09d2