BloopAI · calyptobai · Jan 30, 2024 · Oct 30, 2023 · Nov 23, 2023 · Nov 24, 2023
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/apps/desktop/index.html b/apps/desktop/index.html
@@ -13,12 +13,9 @@
   <!--    </script>-->
 </head>
 
-<body data-theme="default">
+<body data-theme="system">
   <div id="root"></div>
   <script type="module" src="/src/main.tsx"></script>
-  <script>
-    document.body.dataset['theme'] = localStorage.getItem('theme');
-  </script>
 </body>
 
 </html>
diff --git a/apps/desktop/src-tauri/Cargo.toml b/apps/desktop/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "bloop"
-version = "0.5.12"
+version = "0.6.0"
 description = "Search code. Fast."
 authors = ["Bloop AI Developers"]
 license = "Apache-2.0"

diff --git a/apps/desktop/src-tauri/tauri.conf.json b/apps/desktop/src-tauri/tauri.conf.json
@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "bloop",
-    "version": "0.5.12"
+    "version": "0.6.0"
   },
   "tauri": {
     "allowlist": {
@@ -103,8 +103,9 @@
         "hiddenTitle": true,
         "titleBarStyle": "Overlay",
         "minHeight": 700,
-        "minWidth": 1000
+        "minWidth": 1000,
+        "fileDropEnabled": false
       }
     ]
   }
-}
+}
diff --git a/apps/desktop/src/App.tsx b/apps/desktop/src/App.tsx
@@ -32,6 +32,7 @@ import { polling } from '../../../client/src/utils/requestUtils';
 import ReportBugModal from '../../../client/src/components/ReportBugModal';
 import { UIContext } from '../../../client/src/context/uiContext';
 import { DeviceContextProvider } from '../../../client/src/context/providers/DeviceContextProvider';
+import { EnvContext } from '../../../client/src/context/envContext';
 import TextSearch from './TextSearch';
 import SplashScreen from './SplashScreen';
 
@@ -155,7 +156,8 @@ function App() {
   const handleKeyEvent = useCallback((e: KeyboardEvent) => {
     if (
       (e.key === '=' || e.key === '-' || e.key === '0') &&
-      (e.metaKey || e.ctrlKey)
+      (e.metaKey || e.ctrlKey) &&
+      !e.shiftKey
     ) {
       const root = document.querySelector(':root');
       if (!root) {
@@ -185,6 +187,19 @@ function App() {
     }
   }, []);
 
+  useEffect(() => {
+    const onContextMenu = (e: MouseEvent) => {
+      if (!import.meta.env.DEV) {
+        e.preventDefault();
+      }
+    };
+    document.addEventListener('contextmenu', onContextMenu);
+
+    return () => {
+      document.removeEventListener('contextmenu', onContextMenu);
+    };
+  }, []);
+
   useEffect(() => {
     let intervalId: number;
     if (!Object.keys(envConfig).length) {
@@ -226,12 +241,18 @@ function App() {
       isRepoManagementAllowed: true,
       forceAnalytics: false,
       isSelfServe: false,
-      envConfig,
-      setEnvConfig,
       showNativeMessage: message,
       relaunch,
     }),
-    [homeDirectory, indexFolder, os, release, envConfig],
+    [homeDirectory, indexFolder, os, release],
+  );
+
+  const envContextValue = useMemo(
+    () => ({
+      envConfig,
+      setEnvConfig,
+    }),
+    [envConfig],
   );
 
   const bugReportContextValue = useMemo(
@@ -244,26 +265,32 @@ function App() {
   );
 
   return (
-    <LocaleContext.Provider value={localeContextValue}>
-      <AnimatePresence initial={false}>
-        {shouldShowSplashScreen && <SplashScreen />}
-      </AnimatePresence>
-      {shouldShowSplashScreen && (
-        <DeviceContextProvider deviceContextValue={deviceContextValue}>
-          <UIContext.BugReport.Provider value={bugReportContextValue}>
-            <ReportBugModal errorBoundaryMessage={serverCrashedMessage} />
-          </UIContext.BugReport.Provider>
-        </DeviceContextProvider>
-      )}
-      <TextSearch contentRoot={contentContainer.current} />
-      <div ref={contentContainer}>
-        <BrowserRouter>
-          {!shouldShowSplashScreen && (
-            <ClientApp deviceContextValue={deviceContextValue} />
+    <DeviceContextProvider
+      deviceContextValue={deviceContextValue}
+      envConfig={envConfig}
+    >
+      <EnvContext.Provider value={envContextValue}>
+        <LocaleContext.Provider value={localeContextValue}>
+          <AnimatePresence initial={false}>
+            {shouldShowSplashScreen && <SplashScreen />}
+          </AnimatePresence>
+          {shouldShowSplashScreen && (
+            <UIContext.BugReport.Provider value={bugReportContextValue}>
+              <ReportBugModal errorBoundaryMessage={serverCrashedMessage} />
+            </UIContext.BugReport.Provider>
           )}
-        </BrowserRouter>
-      </div>
-    </LocaleContext.Provider>
+          <TextSearch contentRoot={contentContainer.current} />
+          <div
+            ref={contentContainer}
+            className="w-screen h-screen overflow-hidden"
+          >
+            <BrowserRouter>
+              {!shouldShowSplashScreen && <ClientApp />}
+            </BrowserRouter>
+          </div>
+        </LocaleContext.Provider>
+      </EnvContext.Provider>
+    </DeviceContextProvider>
   );
 }
 

diff --git a/apps/desktop/src/SplashScreen.tsx b/apps/desktop/src/SplashScreen.tsx
@@ -26,7 +26,7 @@ const SplashScreen = ({}: Props) => {
         <div className="animate-pulse-slow text-label-title">
           <LogoFull />
         </div>
-        <div className="flex gap-3 items-center rounded-lg shadow-high border border-bg-border bg-bg-shade px-4 py-2 absolute bottom-0 left-1/2 transform -translate-x-1/2 translate-y-1/2 body-s z-10 text-label-base">
+        <div className="flex gap-3 items-center rounded-lg shadow-high border border-bg-border bg-bg-shade px-4 py-2 absolute bottom-0 left-1/2 transform -translate-x-1/2 translate-y-1/2 body-s-b z-10 text-label-base">
           <Trans>Loading...</Trans>
         </div>
       </div>

diff --git a/apps/desktop/src/TextSearch.tsx b/apps/desktop/src/TextSearch.tsx
@@ -142,7 +142,7 @@ const TextSearch = ({
       currentResult={currentResult}
       setCurrentResult={setCurrentResult}
       searchValue={searchValue}
-      containerClassName="fixed top-[100px] right-[5px]"
+      containerClassName="fixed top-[100px] right-[5px] w-80"
     />
   );
 };

diff --git a/client/index.html b/client/index.html
@@ -8,7 +8,7 @@
   <title>bloop</title>
 </head>
 
-<body data-theme="default">
+<body data-theme="system">
   <div id="root"></div>
   <script type="module" src="/src/main.tsx"></script>
 </body>

diff --git a/client/package.json b/client/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@bloop/client",
   "private": true,
-  "version": "0.5.12",
+  "version": "0.6.0",
   "scripts": {
     "dev": "vite",
     "build": "tsc && vite build",

diff --git a/client/public/bloopHeadMascot.png b/client/public/bloopHeadMascot.png
diff --git a/client/public/bloopHeadMascotLight.png b/client/public/bloopHeadMascotLight.png
diff --git a/client/public/stripe_logo.png b/client/public/stripe_logo.png