From 302f0a18603fdcb178feb21cd50cb123dd9bbcbf Mon Sep 17 00:00:00 2001
From: Gregory Schier <gschier1990@gmail.com>
Date: Wed, 22 Feb 2023 16:15:25 -0800
Subject: [PATCH] Better URL bar

---
 src-web/components/Button.tsx        |  3 +-
 src-web/components/Editor/Editor.css |  5 ---
 src-web/components/Icon.tsx          |  7 +++-
 src-web/components/Input.tsx         | 54 +++++++++++++++++-----------
 src-web/components/Sidebar.tsx       |  2 +-
 src-web/components/UrlBar.tsx        | 30 ++++++++--------
 src-web/hooks/useCodemirror.ts       |  6 ++--
 tailwind.config.cjs                  |  1 +
 8 files changed, 60 insertions(+), 48 deletions(-)

diff --git a/src-web/components/Button.tsx b/src-web/components/Button.tsx
index 115c5668..831d1c65 100644
--- a/src-web/components/Button.tsx
+++ b/src-web/components/Button.tsx
@@ -31,7 +31,8 @@ export const Button = forwardRef<HTMLButtonElement, ButtonProps>(function Button
         justify === 'center' && 'justify-center',
         size === 'md' && 'h-10 px-4',
         size === 'sm' && 'h-8 px-3 text-sm',
-        color === undefined && 'hover:bg-gray-500/[0.1] active:bg-gray-500/[0.15] text-gray-700',
+        color === undefined &&
+          'hover:bg-gray-500/[0.1] active:bg-gray-500/[0.15] text-gray-800 hover:text-gray-900',
         color === 'primary' && 'bg-blue-500 hover:bg-blue-500/90 active:bg-blue-500/80 text-white',
         color === 'secondary' &&
           'bg-violet-500 hover:bg-violet-500/90 active:bg-violet-500/80 text-white',
diff --git a/src-web/components/Editor/Editor.css b/src-web/components/Editor/Editor.css
index e4a2bdea..6182457c 100644
--- a/src-web/components/Editor/Editor.css
+++ b/src-web/components/Editor/Editor.css
@@ -36,11 +36,6 @@
     cursor: text;
 }
 
-.cm-editor.cm-focused {
-    outline: 0;
-    box-shadow: 0 0 0 2pt rgba(180, 180, 180, 0.1);
-}
-
 .cm-editor .cm-cursor {
     border-left: 2px solid red;
 }
diff --git a/src-web/components/Icon.tsx b/src-web/components/Icon.tsx
index f742bf7f..d1b1c7a4 100644
--- a/src-web/components/Icon.tsx
+++ b/src-web/components/Icon.tsx
@@ -33,7 +33,12 @@ export function Icon({ icon, spin, size = 'md', className }: IconProps) {
   const Component = icons[icon];
   return (
     <Component
-      className={classnames(className, size === 'md' && 'h-4 w-4', spin && 'animate-spin')}
+      className={classnames(
+        className,
+        'text-gray-800',
+        size === 'md' && 'h-4 w-4',
+        spin && 'animate-spin',
+      )}
     />
   );
 }
diff --git a/src-web/components/Input.tsx b/src-web/components/Input.tsx
index c82d035f..63c53f7a 100644
--- a/src-web/components/Input.tsx
+++ b/src-web/components/Input.tsx
@@ -1,45 +1,57 @@
-import { InputHTMLAttributes } from 'react';
+import { InputHTMLAttributes, ReactNode } from 'react';
 import classnames from 'classnames';
-import { VStack } from './Stacks';
+import { HStack, VStack } from './Stacks';
 
 interface Props extends InputHTMLAttributes<HTMLInputElement> {
   name: string;
   label: string;
   hideLabel?: boolean;
   labelClassName?: string;
-  containerClassName?: string;
+  leftSlot?: ReactNode;
+  rightSlot?: ReactNode;
 }
 
 export function Input({
   label,
-  containerClassName,
   labelClassName,
   hideLabel,
   className,
   name,
+  leftSlot,
+  rightSlot,
   ...props
 }: Props) {
   const id = `input-${name}`;
   return (
-    <VStack className={classnames(containerClassName, 'w-full')}>
-      <label
-        htmlFor={name}
+    <HStack items="center" className="w-full bg-gray-50 h-10 rounded-md text-sm ">
+      {leftSlot}
+      <VStack
         className={classnames(
-          labelClassName,
-          'font-semibold text-sm uppercase text-gray-700',
-          hideLabel && 'sr-only',
+          'w-full border-gray-100/50',
+          leftSlot && 'border-l ml-0.5',
+          rightSlot && 'border-r mr-0.5',
         )}
       >
-        {label}
-      </label>
-      <input
-        id={id}
-        className={classnames(
-          className,
-          'w-0 min-w-[100%] bg-gray-50 h-10 pl-3 pr-2 rounded-md text-sm focus:outline-none',
-        )}
-        {...props}
-      />
-    </VStack>
+        <label
+          htmlFor={name}
+          className={classnames(
+            labelClassName,
+            'font-semibold text-sm uppercase text-gray-700',
+            hideLabel && 'sr-only',
+          )}
+        >
+          {label}
+        </label>
+        <input
+          id={id}
+          className={classnames(
+            className,
+            'bg-transparent pl-3 pr-2 h-full w-0 min-w-[100%] focus:outline-none',
+          )}
+          {...props}
+        />
+      </VStack>
+      {rightSlot}
+    </HStack>
   );
 }
diff --git a/src-web/components/Sidebar.tsx b/src-web/components/Sidebar.tsx
index f008d45e..dadb15c1 100644
--- a/src-web/components/Sidebar.tsx
+++ b/src-web/components/Sidebar.tsx
@@ -11,7 +11,7 @@ type Props = HTMLAttributes<HTMLDivElement>;
 export function Sidebar({ className, ...props }: Props) {
   return (
     <div
-      className={classnames(className, 'w-52 bg-gray-50 h-full border-r border-gray-500/10')}
+      className={classnames(className, 'w-52 bg-gray-50/40 h-full border-gray-500/10')}
       {...props}
     >
       <HStack as={WindowDragRegion} className="pl-24 px-1" items="center" justify="end">
diff --git a/src-web/components/UrlBar.tsx b/src-web/components/UrlBar.tsx
index d21f4c23..640e548a 100644
--- a/src-web/components/UrlBar.tsx
+++ b/src-web/components/UrlBar.tsx
@@ -29,32 +29,30 @@ export function UrlBar({ sendRequest, onMethodChange, method, onUrlChange, url }
 
   return (
     <HStack as="form" className="items-end" onSubmit={handleSendRequest} space={2}>
-      <div className="w-full relative">
-        <div className="flex items-center absolute left-0 top-0 bottom-0">
+      <Input
+        hideLabel
+        name="url"
+        label="Enter URL"
+        className="font-mono pr-12"
+        onChange={(e) => onUrlChange(e.currentTarget.value)}
+        value={url}
+        placeholder="Enter a URL..."
+        leftSlot={
           <DropdownMenuRadio
             onValueChange={onMethodChange}
             value={method.value}
             items={[
               { label: 'GET', value: 'GET' },
               { label: 'PUT', value: 'PUT' },
-              { label: 'PST', value: 'POST' },
+              { label: 'POST', value: 'POST' },
             ]}
           >
             <Button disabled={loading} forDropdown size="sm" className="ml-1 w-22" justify="start">
               {method.label}
             </Button>
           </DropdownMenuRadio>
-        </div>
-        <Input
-          hideLabel
-          name="url"
-          label="Enter URL"
-          className="font-mono pr-12 !pl-20"
-          onChange={(e) => onUrlChange(e.currentTarget.value)}
-          value={url}
-          placeholder="Enter a URL..."
-        />
-        <div className="flex items-center absolute right-0 top-0 bottom-0">
+        }
+        rightSlot={
           <IconButton
             icon={loading ? 'update' : 'paper-plane'}
             spin={loading}
@@ -62,8 +60,8 @@ export function UrlBar({ sendRequest, onMethodChange, method, onUrlChange, url }
             size="sm"
             className="w-10 mr-1"
           />
-        </div>
-      </div>
+        }
+      />
     </HStack>
   );
 }
diff --git a/src-web/hooks/useCodemirror.ts b/src-web/hooks/useCodemirror.ts
index f7773724..63e8974f 100644
--- a/src-web/hooks/useCodemirror.ts
+++ b/src-web/hooks/useCodemirror.ts
@@ -12,11 +12,11 @@ const myHighlightStyle = HighlightStyle.define([
     tag: [tags.documentMeta, tags.blockComment, tags.lineComment, tags.docComment, tags.comment],
     color: '#757b93',
   },
-  { tag: tags.name, color: '#4dafff' },
-  { tag: tags.variableName, color: '#4bff4e' },
+  { tag: tags.name, color: '#4699de' },
+  { tag: tags.variableName, color: '#31c434' },
   { tag: tags.attributeName, color: '#b06fff' },
   { tag: tags.attributeValue, color: '#ff964b' },
-  { tag: [tags.keyword, tags.string], color: '#fc6' },
+  { tag: [tags.keyword, tags.string], color: '#e8b045' },
   { tag: tags.comment, color: '#f5d', fontStyle: 'italic' },
 ]);
 
diff --git a/tailwind.config.cjs b/tailwind.config.cjs
index 6fe86059..a87f6d09 100644
--- a/tailwind.config.cjs
+++ b/tailwind.config.cjs
@@ -15,6 +15,7 @@ module.exports = {
             full: '9999px',
         },
         colors: {
+            transparent: 'transparent',
             white: 'hsl(var(--color-white) / <alpha-value>)',
             background: 'hsl(var(--color-background) / <alpha-value>)',
             gray: color('gray'),