From ee87e657637cc769a1e033feba051ac9ffb406bb Mon Sep 17 00:00:00 2001
From: Gregory Schier <gschier1990@gmail.com>
Date: Thu, 16 Nov 2023 18:53:34 -0800
Subject: [PATCH] Mostly move some stuff around

---
 .run/Build Desktop.run.xml             | 20 ++++++++++++++++++++
 .run/Dev Desktop.run.xml               | 12 ++++++++++++
 src-tauri/macos/entitlements.plist     |  2 +-
 src-tauri/tauri.conf.json              |  2 +-
 src-web/components/GlobalHooks.tsx     |  3 ++-
 src-web/components/Overlay.tsx         |  2 +-
 src-web/components/RequestResponse.tsx |  2 +-
 src-web/components/Workspace.tsx       | 13 +++++++------
 src-web/components/core/PairEditor.tsx |  4 ++--
 src-web/lib/constants.ts               |  2 --
 10 files changed, 47 insertions(+), 15 deletions(-)
 create mode 100644 .run/Build Desktop.run.xml
 create mode 100644 .run/Dev Desktop.run.xml
 delete mode 100644 src-web/lib/constants.ts

diff --git a/.run/Build Desktop.run.xml b/.run/Build Desktop.run.xml
new file mode 100644
index 00000000..f26f4d1f
--- /dev/null
+++ b/.run/Build Desktop.run.xml	
@@ -0,0 +1,20 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Build Desktop" type="ShConfigurationType">
+    <option name="SCRIPT_TEXT" value="npm run tauri build -- --target universal-apple-darwin" />
+    <option name="INDEPENDENT_SCRIPT_PATH" value="true" />
+    <option name="SCRIPT_PATH" value="" />
+    <option name="SCRIPT_OPTIONS" value="" />
+    <option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
+    <option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
+    <option name="INTERPRETER_PATH" value="/bin/zsh" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="EXECUTE_IN_TERMINAL" value="true" />
+    <option name="EXECUTE_SCRIPT_FILE" value="false" />
+    <envs>
+      <env name="TAURI_KEY_PASSWORD" value="fishhook-upstream-wash-assured" />
+      <env name="TAURI_PRIVATE_KEY" value="dW50cnVzdGVkIGNvbW1lbnQ6IHJzaWduIGVuY3J5cHRlZCBzZWNyZXQga2V5ClJXUlRZMEl5OGxWaytTa3dIa2xXVUltQzRGUXIzd2lYQ2NpV0ZhQURSbWJWZ1NrK0tnY0FBQkFBQUFBQUFBQUFBQUlBQUFBQUV2M1VKdVRyVHpHSzhQdGc2ZVFtOVNsMU5tNEVSN280cFNrbXhncW9tdjNXaFJZUTJqUzQ5Q01zWTJWRVhaY1pGNHNjR1NFR3JmcWFRN09NdWdGMXpZVXhzejR4V3lDV1JpZHlnbW5LNS9vMFFtRlZjbUl4YjZSNzhlMmk3ait5SExYcG5QZUkxOFE9Cg==" />
+    </envs>
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.run/Dev Desktop.run.xml b/.run/Dev Desktop.run.xml
new file mode 100644
index 00000000..d58c2f13
--- /dev/null
+++ b/.run/Dev Desktop.run.xml	
@@ -0,0 +1,12 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Dev Desktop" type="js.build_tools.npm">
+    <package-json value="$PROJECT_DIR$/package.json" />
+    <command value="run" />
+    <scripts>
+      <script value="start" />
+    </scripts>
+    <node-interpreter value="project" />
+    <envs />
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/src-tauri/macos/entitlements.plist b/src-tauri/macos/entitlements.plist
index 7b677ae2..13cb114c 100644
--- a/src-tauri/macos/entitlements.plist
+++ b/src-tauri/macos/entitlements.plist
@@ -2,7 +2,7 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-    <key>com.apple.security.cs.allow-unsigned-executable-memory</key>
+    <key>com.apple.security.app-sandbox</key>
     <true/>
 </dict>
 </plist>
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index fbc187ab..c682783b 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "Yaak",
-    "version": "2023.2.0-beta.0"
+    "version": "2023.3.0-beta.3"
   },
   "tauri": {
     "windows": [],
diff --git a/src-web/components/GlobalHooks.tsx b/src-web/components/GlobalHooks.tsx
index 3c1c7f37..424b559c 100644
--- a/src-web/components/GlobalHooks.tsx
+++ b/src-web/components/GlobalHooks.tsx
@@ -14,12 +14,13 @@ import { responsesQueryKey } from '../hooks/useResponses';
 import { useSyncWindowTitle } from '../hooks/useSyncWindowTitle';
 import { workspacesQueryKey } from '../hooks/useWorkspaces';
 import { trackPage } from '../lib/analytics';
-import { DEFAULT_FONT_SIZE } from '../lib/constants';
 import { NAMESPACE_NO_SYNC } from '../lib/keyValueStore';
 import type { HttpRequest, HttpResponse, Model, Workspace } from '../lib/models';
 import { modelsEq } from '../lib/models';
 import { setPathname } from '../lib/persistPathname';
 
+const DEFAULT_FONT_SIZE = 16;
+
 export function GlobalHooks() {
   // Include here so they always update, even
   // if no component references them
diff --git a/src-web/components/Overlay.tsx b/src-web/components/Overlay.tsx
index b764dbcf..8b904858 100644
--- a/src-web/components/Overlay.tsx
+++ b/src-web/components/Overlay.tsx
@@ -32,7 +32,7 @@ export function Overlay({
   return (
     <Portal name={portalName}>
       {open && (
-        <FocusTrap> 
+        <FocusTrap>
           <motion.div
             className={classNames('fixed inset-0', zIndexes[zIndex])}
             initial={{ opacity: 0 }}
diff --git a/src-web/components/RequestResponse.tsx b/src-web/components/RequestResponse.tsx
index 54e0a3e8..0d382e74 100644
--- a/src-web/components/RequestResponse.tsx
+++ b/src-web/components/RequestResponse.tsx
@@ -20,7 +20,7 @@ const drag = { gridArea: 'drag' };
 const DEFAULT = 0.5;
 const MIN_WIDTH_PX = 10;
 const MIN_HEIGHT_PX = 30;
-const STACK_VERTICAL_WIDTH = 650;
+const STACK_VERTICAL_WIDTH = 600;
 
 export const RequestResponse = memo(function RequestResponse({ style }: Props) {
   const containerRef = useRef<HTMLDivElement>(null);
diff --git a/src-web/components/Workspace.tsx b/src-web/components/Workspace.tsx
index 3b591ea6..8970d688 100644
--- a/src-web/components/Workspace.tsx
+++ b/src-web/components/Workspace.tsx
@@ -8,11 +8,10 @@ import type {
 } from 'react';
 import { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { useWindowSize } from 'react-use';
+import { useListenToTauriEvent } from '../hooks/useListenToTauriEvent';
 import { useOsInfo } from '../hooks/useOsInfo';
 import { useSidebarHidden } from '../hooks/useSidebarHidden';
 import { useSidebarWidth } from '../hooks/useSidebarWidth';
-import { useListenToTauriEvent } from '../hooks/useListenToTauriEvent';
-import { WINDOW_FLOATING_SIDEBAR_WIDTH } from '../lib/constants';
 import { Button } from './core/Button';
 import { HStack } from './core/Stacks';
 import { Overlay } from './Overlay';
@@ -27,6 +26,8 @@ const head = { gridArea: 'head' };
 const body = { gridArea: 'body' };
 const drag = { gridArea: 'drag' };
 
+const WINDOW_FLOATING_SIDEBAR_WIDTH = 600;
+
 export default function Workspace() {
   const { setWidth, width, resetWidth } = useSidebarWidth();
   const { hide, show, hidden, toggle } = useSidebarHidden();
@@ -66,9 +67,9 @@ export default function Workspace() {
           e.preventDefault(); // Prevent text selection and things
           const newWidth = startWidth + (e.clientX - mouseStartX);
           if (newWidth < 100) {
-            hide(); 
+            hide();
             resetWidth();
-          } else  {
+          } else {
             show();
             setWidth(newWidth);
           }
@@ -121,9 +122,9 @@ export default function Workspace() {
       )}
     >
       {floating ? (
-        <Overlay open={!hidden} portalName="sidebar" onClose={hide} zIndex={10}>
+        <Overlay open={!hidden} portalName="sidebar" onClose={hide}>
           <motion.div
-            initial={{ opacity: 0, x: -10 }}
+            initial={{ opacity: 0, x: -20 }}
             animate={{ opacity: 1, x: 0 }}
             className={classNames(
               'absolute top-0 left-0 bottom-0 bg-gray-100 border-r border-highlight w-[14rem]',
diff --git a/src-web/components/core/PairEditor.tsx b/src-web/components/core/PairEditor.tsx
index d44b2515..137dee8c 100644
--- a/src-web/components/core/PairEditor.tsx
+++ b/src-web/components/core/PairEditor.tsx
@@ -180,8 +180,8 @@ export const PairEditor = memo(function PairEditor({
               forceUpdateKey={forceUpdateKey}
               nameAutocomplete={nameAutocomplete}
               valueAutocomplete={valueAutocomplete}
-              namePlaceholder={isLast ? namePlaceholder : ''}
-              valuePlaceholder={isLast ? valuePlaceholder : ''}
+              namePlaceholder={namePlaceholder}
+              valuePlaceholder={valuePlaceholder}
               nameValidate={nameValidate}
               valueValidate={valueValidate}
               onChange={handleChange}
diff --git a/src-web/lib/constants.ts b/src-web/lib/constants.ts
deleted file mode 100644
index 412352af..00000000
--- a/src-web/lib/constants.ts
+++ /dev/null
@@ -1,2 +0,0 @@
-export const DEFAULT_FONT_SIZE = 16;
-export const WINDOW_FLOATING_SIDEBAR_WIDTH = 600;