feat: ui fixes

AykutSarac · Dec 17, 2023 · 1d59b2f · 1d59b2f
1 parent d4ce0b1
commit 1d59b2f
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/package.json b/package.json
@@ -9,7 +9,7 @@
     "dev": "next dev",
     "build": "next build",
     "start": "next start",
-    "lint": "tsc && eslint src && prettier --check src",
+    "lint": "tsc --project tsconfig.json && eslint src && prettier --check src",
     "lint:fix": "eslint --fix src & prettier --write src",
     "analyze": "ANALYZE=true npm run build"
   },
@@ -20,7 +20,7 @@
     "@mantine/hooks": "^6.0.17",
     "@mantine/next": "^6.0.21",
     "@mantine/prism": "^6.0.21",
-    "@monaco-editor/react": "^4.6.0",
+    "@monaco-editor/react": "^4.5.2",
     "@sentry/nextjs": "^7.72.0",
     "@supabase/auth-helpers-nextjs": "^0.8.1",
     "@supabase/auth-helpers-react": "^0.4.2",

diff --git a/src/containers/Editor/LiveEditor/Tools.tsx b/src/containers/Editor/LiveEditor/Tools.tsx
@@ -473,6 +473,12 @@ export const Tools: React.FC<{ isWidget?: boolean }> = ({ isWidget = false }) =>
               >
                 <Text size="xs">Show Expand/Collapse</Text>
               </Menu.Item>
+              <Menu.Item
+                icon={<BsCheck2 opacity={darkmodeEnabled ? 100 : 0} />}
+                onClick={() => toggleDarkMode(!darkmodeEnabled)}
+              >
+                <Text size="xs">Dark Mode</Text>
+              </Menu.Item>
             </Menu.Dropdown>
           </Menu>
         )}
@@ -527,12 +533,6 @@ export const Tools: React.FC<{ isWidget?: boolean }> = ({ isWidget = false }) =>
                   </Text>
                 </Menu.Item>
               )}
-              <Menu.Item
-                icon={<BsCheck2 opacity={darkmodeEnabled ? 100 : 0} />}
-                onClick={() => toggleDarkMode(!darkmodeEnabled)}
-              >
-                <Text size="xs">Dark Mode</Text>
-              </Menu.Item>
               {user && (
                 <>
                   <Menu.Divider />

diff --git a/src/containers/Modals/TypeModal/index.tsx b/src/containers/Modals/TypeModal/index.tsx
@@ -1,10 +1,17 @@
 import React from "react";
-import { Stack, Modal, ModalProps, ScrollArea } from "@mantine/core";
+import { Stack, Modal, ModalProps, ScrollArea, Select } from "@mantine/core";
 import { Prism } from "@mantine/prism";
 import vsDark from "prism-react-renderer/themes/vsDark";
 import vsLight from "prism-react-renderer/themes/vsLight";
 import useJsonQuery from "src/hooks/useJsonQuery";
 
+const typeOptions = [
+  {
+    label: "TypeScript",
+    value: "typescript",
+  },
+];
+
 export const TypeModal: React.FC<ModalProps> = ({ opened, onClose }) => {
   const { getJsonType } = useJsonQuery();
   const [type, setType] = React.useState("");
@@ -18,6 +25,7 @@ export const TypeModal: React.FC<ModalProps> = ({ opened, onClose }) => {
   return (
     <Modal title="Generate Types" size="auto" opened={opened} onClose={onClose} centered>
       <Stack py="sm">
+        <Select value="typescript" data={typeOptions} />
         <ScrollArea>
           <Prism
             miw={350}

diff --git a/yarn.lock b/yarn.lock
@@ -506,7 +506,7 @@
   dependencies:
     state-local "^1.0.6"
 
-"@monaco-editor/react@^4.6.0":
+"@monaco-editor/react@^4.5.2":
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/@monaco-editor/react/-/react-4.6.0.tgz#bcc68671e358a21c3814566b865a54b191e24119"
   integrity sha512-RFkU9/i7cN2bsq/iTkurMWOEErmYcY6JiQI3Jn+WeR/FGISH8JbHERjpS9oRuSOPvDMJI0Z8nJeKkbOs9sBYQw==