Skip to content

Open-source and local-first Slack and Notion alternative that puts you in control of your data

Move components and editor into renderer folder

Hakan Shehu615237b4a0f4
diff --git a/desktop/src/components/ui/calendar.tsx b/desktop/src/components/ui/calendar.tsx
deleted file mode 100644
index 66a23ccb..00000000
--- a/desktop/src/components/ui/calendar.tsx
+++ /dev/null
@@ -1,70 +0,0 @@
-import * as React from "react"
-import { ChevronLeftIcon, ChevronRightIcon } from "@radix-ui/react-icons"
-import { DayPicker } from "react-day-picker"
-
-import { cn } from "@/lib/utils"
-import { buttonVariants } from "@/components/ui/button"
-
-export type CalendarProps = React.ComponentProps<typeof DayPicker>
-
-function Calendar({
- className,
- classNames,
- showOutsideDays = true,
- ...props
-}: CalendarProps) {
- return (
- <DayPicker
- showOutsideDays={showOutsideDays}
- className={cn("p-3", className)}
- classNames={{
- months: "flex flex-col sm:flex-row space-y-4 sm:space-x-4 sm:space-y-0",
- month: "space-y-4",
- caption: "flex justify-center pt-1 relative items-center",
- caption_label: "text-sm font-medium",
- nav: "space-x-1 flex items-center",
- nav_button: cn(
- buttonVariants({ variant: "outline" }),
- "h-7 w-7 bg-transparent p-0 opacity-50 hover:opacity-100"
- ),
- nav_button_previous: "absolute left-1",
- nav_button_next: "absolute right-1",
- table: "w-full border-collapse space-y-1",
- head_row: "flex",
- head_cell:
- "text-muted-foreground rounded-md w-8 font-normal text-[0.8rem]",
- row: "flex w-full mt-2",
- cell: cn(
- "relative p-0 text-center text-sm focus-within:relative focus-within:z-20 [&:has([aria-selected])]:bg-accent [&:has([aria-selected].day-outside)]:bg-accent/50 [&:has([aria-selected].day-range-end)]:rounded-r-md",
- props.mode === "range"
- ? "[&:has(>.day-range-end)]:rounded-r-md [&:has(>.day-range-start)]:rounded-l-md first:[&:has([aria-selected])]:rounded-l-md last:[&:has([aria-selected])]:rounded-r-md"
- : "[&:has([aria-selected])]:rounded-md"
- ),
- day: cn(
- buttonVariants({ variant: "ghost" }),
- "h-8 w-8 p-0 font-normal aria-selected:opacity-100"
- ),
- day_range_start: "day-range-start",
- day_range_end: "day-range-end",
- day_selected:
- "bg-primary text-primary-foreground hover:bg-primary hover:text-primary-foreground focus:bg-primary focus:text-primary-foreground",
- day_today: "bg-accent text-accent-foreground",
- day_outside:
- "day-outside text-muted-foreground opacity-50 aria-selected:bg-accent/50 aria-selected:text-muted-foreground aria-selected:opacity-30",
- day_disabled: "text-muted-foreground opacity-50",
- day_range_middle:
- "aria-selected:bg-accent aria-selected:text-accent-foreground",
- day_hidden: "invisible",
- ...classNames,
- }}
- components={{
- IconLeft: ({ ...props }) => <ChevronLeftIcon className="h-4 w-4" />,
- IconRight: ({ ...props }) => <ChevronRightIcon className="h-4 w-4" />,
- }}
- {...props}
- />
- )
-}
-Calendar.displayName = "Calendar"
-
-export { Calendar }
diff --git a/desktop/src/editor/commands/index.tsx b/desktop/src/editor/commands/index.tsx
deleted file mode 100644
index f1101351..00000000
--- a/desktop/src/editor/commands/index.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import { BlockquoteCommand } from '@/editor/commands/blockquote';
-import { BulletListCommand } from '@/editor/commands/bullet-list';
-import { CodeBlockCommand } from '@/editor/commands/code-block';
-import { DividerCommand } from '@/editor/commands/divider';
-import { Heading1Command } from '@/editor/commands/heading1';
-import { Heading2Command } from '@/editor/commands/heading2';
-import { Heading3Command } from '@/editor/commands/heading3';
-import { OrderedListCommand } from '@/editor/commands/ordered-list';
-import { ParagraphCommand } from '@/editor/commands/paragraph';
-import { TodoCommand } from '@/editor/commands/todo';
-import { PageCommand } from '@/editor/commands/page';
-import { EditorCommand, EditorCommandProps } from '@/types/editor';
-
-export type { EditorCommand, EditorCommandProps };
-
-export {
- BlockquoteCommand,
- BulletListCommand,
- CodeBlockCommand,
- Heading1Command,
- Heading2Command,
- Heading3Command,
- OrderedListCommand,
- ParagraphCommand,
- DividerCommand,
- TodoCommand,
- PageCommand,
-};
diff --git a/desktop/src/editor/extensions/index.tsx b/desktop/src/editor/extensions/index.tsx
deleted file mode 100644
index 234aed38..00000000
--- a/desktop/src/editor/extensions/index.tsx
+++ /dev/null
@@ -1,68 +0,0 @@
-import BoldMark from '@tiptap/extension-bold';
-import DocumentNode from '@tiptap/extension-document';
-import ItalicMark from '@tiptap/extension-italic';
-import StrikethroughMark from '@tiptap/extension-strike';
-import TextNode from '@tiptap/extension-text';
-import UnderlineMark from '@tiptap/extension-underline';
-
-import { IdExtension } from '@/editor/extensions/id';
-import { BlockquoteNode } from '@/editor/extensions/blockquote';
-import { BulletListNode } from '@/editor/extensions/bullet-list';
-import { CodeMark } from '@/editor/extensions/code';
-import { CodeBlockNode } from '@/editor/extensions/code-block';
-import { ColorMark } from '@/editor/extensions/color';
-import { CommanderExtension } from '@/editor/extensions/commander';
-import { DeleteControlExtension } from '@/editor/extensions/delete-control';
-import { DividerNode } from '@/editor/extensions/divider';
-import { DropcursorExtension } from '@/editor/extensions/dropcursor';
-import { Heading1Node } from '@/editor/extensions/heading1';
-import { Heading2Node } from '@/editor/extensions/heading2';
-import { Heading3Node } from '@/editor/extensions/heading3';
-import { HighlightMark } from '@/editor/extensions/highlight';
-import { LinkMark } from '@/editor/extensions/link';
-import { ListItemNode } from '@/editor/extensions/list-item';
-import { ListKeymapExtension } from '@/editor/extensions/list-keymap';
-import { MessageNode } from '@/editor/extensions/message';
-import { OrderedListNode } from '@/editor/extensions/ordered-list';
-import { ParagraphNode } from '@/editor/extensions/paragraph';
-import { PlaceholderExtension } from '@/editor/extensions/placeholder';
-import { TabKeymapExtension } from '@/editor/extensions/tab-keymap';
-import { TaskItemNode } from '@/editor/extensions/task-item';
-import { TaskListNode } from '@/editor/extensions/task-list';
-import { TrailingNode } from '@/editor/extensions/trailing-node';
-import { PageNode } from '@/editor/extensions/page';
-
-export {
- IdExtension,
- BoldMark,
- BlockquoteNode,
- BulletListNode,
- TabKeymapExtension,
- CodeBlockNode,
- CodeMark,
- ColorMark,
- CommanderExtension,
- DeleteControlExtension,
- DividerNode,
- DocumentNode,
- Heading1Node,
- Heading2Node,
- Heading3Node,
- HighlightMark,
- ItalicMark,
- LinkMark,
- ListItemNode,
- ListKeymapExtension,
- MessageNode,
- PlaceholderExtension,
- OrderedListNode,
- ParagraphNode,
- StrikethroughMark,
- TaskItemNode,
- TaskListNode,
- TextNode,
- TrailingNode,
- UnderlineMark,
- DropcursorExtension,
- PageNode,
-};
diff --git a/desktop/src/editor/views/index.tsx b/desktop/src/editor/views/index.tsx
deleted file mode 100644
index 8f5bee51..00000000
--- a/desktop/src/editor/views/index.tsx
+++ /dev/null
@@ -1,4 +0,0 @@
-import { CodeBlockNodeView } from '@/editor/views/code-block';
-import { PageNodeView } from '@/editor/views/page';
-
-export { CodeBlockNodeView, PageNodeView };
diff --git a/desktop/src/electron/mutations/message-create.ts b/desktop/src/electron/mutations/message-create.ts
index 346b436a..0bedf61f 100644
--- a/desktop/src/electron/mutations/message-create.ts
+++ b/desktop/src/electron/mutations/message-create.ts
@@ -1,4 +1,4 @@
-import { mapContentsToEditorNodes } from '@/editor/mappers';
+import { mapContentsToEditorNodes } from '@/renderer/editor/mappers';
import { databaseContext } from '@/electron/database-context';
import { NodeTypes } from '@/lib/constants';
import { NeuronId } from '@/lib/id';
diff --git a/desktop/src/renderer.ts b/desktop/src/renderer.ts
index 243bba64..e7b506c8 100644
--- a/desktop/src/renderer.ts
+++ b/desktop/src/renderer.ts
@@ -27,4 +27,4 @@
*/
import './renderer/styles/index.css';
-import './components/root';
+import './renderer/components/root';
diff --git a/desktop/src/components/accounts/account-logout.tsx b/desktop/src/renderer/components/accounts/account-logout.tsx
similarity index 89%
rename from desktop/src/components/accounts/account-logout.tsx
rename to desktop/src/renderer/components/accounts/account-logout.tsx
index e9b87362..f0abcfa1 100644
--- a/desktop/src/components/accounts/account-logout.tsx
+++ b/desktop/src/renderer/components/accounts/account-logout.tsx
@@ -7,9 +7,9 @@ import {
AlertDialogFooter,
AlertDialogHeader,
AlertDialogTitle,
-} from '@/components/ui/alert-dialog';
-import { Button } from '@/components/ui/button';
-import { Spinner } from '@/components/ui/spinner';
+} from '@/renderer/components/ui/alert-dialog';
+import { Button } from '@/renderer/components/ui/button';
+import { Spinner } from '@/renderer/components/ui/spinner';
interface AccountLogoutProps {
id: string;
diff --git a/desktop/src/components/accounts/email-login.tsx b/desktop/src/renderer/components/accounts/email-login.tsx
similarity index 88%
rename from desktop/src/components/accounts/email-login.tsx
rename to desktop/src/renderer/components/accounts/email-login.tsx
index ade2b9ec..4bd3d263 100644
--- a/desktop/src/components/accounts/email-login.tsx
+++ b/desktop/src/renderer/components/accounts/email-login.tsx
@@ -1,19 +1,19 @@
import React from 'react';
-import { Input } from '@/components/ui/input';
-import { Button } from '@/components/ui/button';
-import { Spinner } from '@/components/ui/spinner';
+import { Input } from '@/renderer/components/ui/input';
+import { Button } from '@/renderer/components/ui/button';
+import { Spinner } from '@/renderer/components/ui/spinner';
import {
Form,
FormControl,
FormField,
FormItem,
FormMessage,
-} from '@/components/ui/form';
+} from '@/renderer/components/ui/form';
import { z } from 'zod';
import { useForm } from 'react-hook-form';
import { zodResolver } from '@hookform/resolvers/zod';
-import { toast } from '@/components/ui/use-toast';
-import { Icon } from '@/components/ui/icon';
+import { toast } from '@/renderer/components/ui/use-toast';
+import { Icon } from '@/renderer/components/ui/icon';
import { Server } from '@/types/servers';
import { useMutation } from '@/renderer/hooks/use-mutation';
diff --git a/desktop/src/components/accounts/email-register.tsx b/desktop/src/renderer/components/accounts/email-register.tsx
similarity index 89%
rename from desktop/src/components/accounts/email-register.tsx
rename to desktop/src/renderer/components/accounts/email-register.tsx
index 5d04cc88..8a74a7ab 100644
--- a/desktop/src/components/accounts/email-register.tsx
+++ b/desktop/src/renderer/components/accounts/email-register.tsx
@@ -1,19 +1,19 @@
import React from 'react';
-import { Input } from '@/components/ui/input';
-import { Button } from '@/components/ui/button';
-import { Spinner } from '@/components/ui/spinner';
+import { Input } from '@/renderer/components/ui/input';
+import { Button } from '@/renderer/components/ui/button';
+import { Spinner } from '@/renderer/components/ui/spinner';
import {
Form,
FormControl,
FormField,
FormItem,
FormMessage,
-} from '@/components/ui/form';
+} from '@/renderer/components/ui/form';
import { z } from 'zod';
import { useForm } from 'react-hook-form';
import { zodResolver } from '@hookform/resolvers/zod';
-import { toast } from '@/components/ui/use-toast';
-import { Icon } from '@/components/ui/icon';
+import { toast } from '@/renderer/components/ui/use-toast';
+import { Icon } from '@/renderer/components/ui/icon';
import { useMutation } from '@/renderer/hooks/use-mutation';
import { Server } from '@/types/servers';
diff --git a/desktop/src/components/accounts/login-form.tsx b/desktop/src/renderer/components/accounts/login-form.tsx
similarity index 79%
rename from desktop/src/components/accounts/login-form.tsx
rename to desktop/src/renderer/components/accounts/login-form.tsx
index b696aa2c..e6cb1204 100644
--- a/desktop/src/components/accounts/login-form.tsx
+++ b/desktop/src/renderer/components/accounts/login-form.tsx
@@ -1,8 +1,8 @@
import React from 'react';
import { Server } from '@/types/servers';
-import { EmailRegister } from '@/components/accounts/email-register';
-import { EmailLogin } from '@/components/accounts/email-login';
-import { ServerDropdown } from '@/components/servers/server-dropdown';
+import { EmailRegister } from '@/renderer/components/accounts/email-register';
+import { EmailLogin } from '@/renderer/components/accounts/email-login';
+import { ServerDropdown } from '@/renderer/components/servers/server-dropdown';
interface LoginFormProps {
servers: Server[];
diff --git a/desktop/src/components/accounts/login.tsx b/desktop/src/renderer/components/accounts/login.tsx
similarity index 93%
rename from desktop/src/components/accounts/login.tsx
rename to desktop/src/renderer/components/accounts/login.tsx
index c5a1f061..0ef788e7 100644
--- a/desktop/src/components/accounts/login.tsx
+++ b/desktop/src/renderer/components/accounts/login.tsx
@@ -1,5 +1,5 @@
import React from 'react';
-import { LoginForm } from '@/components/accounts/login-form';
+import { LoginForm } from '@/renderer/components/accounts/login-form';
import { useQuery } from '@/renderer/hooks/use-query';
export const Login = () => {
diff --git a/desktop/src/components/app-loading.tsx b/desktop/src/renderer/components/app-loading.tsx
similarity index 88%
rename from desktop/src/components/app-loading.tsx
rename to desktop/src/renderer/components/app-loading.tsx
index 3a344dd3..f9479312 100644
--- a/desktop/src/components/app-loading.tsx
+++ b/desktop/src/renderer/components/app-loading.tsx
@@ -1,5 +1,5 @@
import React from 'react';
-import { Spinner } from '@/components/ui/spinner';
+import { Spinner } from '@/renderer/components/ui/spinner';
export const AppLoading = () => {
return (
diff --git a/desktop/src/components/app.tsx b/desktop/src/renderer/components/app.tsx
similarity index 86%
rename from desktop/src/components/app.tsx
rename to desktop/src/renderer/components/app.tsx
index 089d7c45..ffec6cc7 100644
--- a/desktop/src/components/app.tsx
+++ b/desktop/src/renderer/components/app.tsx
@@ -1,12 +1,12 @@
import React from 'react';
import Axios from 'axios';
-import { Login } from '@/components/accounts/login';
-import { AppLoading } from '@/components/app-loading';
+import { Login } from '@/renderer/components/accounts/login';
+import { AppLoading } from '@/renderer/components/app-loading';
import { AccountContext } from '@/renderer/contexts/account';
import { AxiosContext } from '@/renderer/contexts/axios';
import { Outlet } from 'react-router-dom';
-import { AccountLogout } from '@/components/accounts/account-logout';
-import { DelayedComponent } from '@/components/ui/delayed-component';
+import { AccountLogout } from '@/renderer/components/accounts/account-logout';
+import { DelayedComponent } from '@/renderer/components/ui/delayed-component';
import { useQuery } from '@/renderer/hooks/use-query';
import { buildApiBaseUrl } from '@/lib/servers';
diff --git a/desktop/src/components/channels/channel-container-node.tsx b/desktop/src/renderer/components/channels/channel-container-node.tsx
similarity index 77%
rename from desktop/src/components/channels/channel-container-node.tsx
rename to desktop/src/renderer/components/channels/channel-container-node.tsx
index 06939575..d6f5889f 100644
--- a/desktop/src/components/channels/channel-container-node.tsx
+++ b/desktop/src/renderer/components/channels/channel-container-node.tsx
@@ -1,6 +1,6 @@
import React from 'react';
import { LocalNode } from '@/types/nodes';
-import { Conversation } from '@/components/messages/conversation';
+import { Conversation } from '@/renderer/components/messages/conversation';
interface ChannelContainerNodeProps {
node: LocalNode;
diff --git a/desktop/src/components/channels/channel-create-dialog.tsx b/desktop/src/renderer/components/channels/channel-create-dialog.tsx
similarity index 92%
rename from desktop/src/components/channels/channel-create-dialog.tsx
rename to desktop/src/renderer/components/channels/channel-create-dialog.tsx
index f62022f5..c715e97e 100644
--- a/desktop/src/components/channels/channel-create-dialog.tsx
+++ b/desktop/src/renderer/components/channels/channel-create-dialog.tsx
@@ -7,7 +7,7 @@ import {
DialogFooter,
DialogHeader,
DialogTitle,
-} from '@/components/ui/dialog';
+} from '@/renderer/components/ui/dialog';
import { z } from 'zod';
import {
Form,
@@ -16,10 +16,10 @@ import {
FormItem,
FormLabel,
FormMessage,
-} from '@/components/ui/form';
-import { Input } from '@/components/ui/input';
-import { Button } from '@/components/ui/button';
-import { Spinner } from '@/components/ui/spinner';
+} from '@/renderer/components/ui/form';
+import { Input } from '@/renderer/components/ui/input';
+import { Button } from '@/renderer/components/ui/button';
+import { Spinner } from '@/renderer/components/ui/spinner';
import { useForm } from 'react-hook-form';
import { zodResolver } from '@hookform/resolvers/zod';
import { useMutation } from '@/renderer/hooks/use-mutation';
diff --git a/desktop/src/components/chats/chat-create-command.tsx b/desktop/src/renderer/components/chats/chat-create-command.tsx
similarity index 95%
rename from desktop/src/components/chats/chat-create-command.tsx
rename to desktop/src/renderer/components/chats/chat-create-command.tsx
index 58b42c5a..607ac32f 100644
--- a/desktop/src/components/chats/chat-create-command.tsx
+++ b/desktop/src/renderer/components/chats/chat-create-command.tsx
@@ -6,11 +6,11 @@ import {
CommandInput,
CommandItem,
CommandList,
-} from '@/components/ui/command';
+} from '@/renderer/components/ui/command';
import { useWorkspace } from '@/renderer/contexts/workspace';
import { useQuery } from '@/renderer/hooks/use-query';
import { useMutation } from '@/renderer/hooks/use-mutation';
-import { Avatar } from '@/components/ui/avatar';
+import { Avatar } from '@/renderer/components/ui/avatar';
export const ChatCreateCommand = () => {
const workspace = useWorkspace();
diff --git a/desktop/src/components/chats/chat-create-popover.tsx b/desktop/src/renderer/components/chats/chat-create-popover.tsx
similarity index 73%
rename from desktop/src/components/chats/chat-create-popover.tsx
rename to desktop/src/renderer/components/chats/chat-create-popover.tsx
index 56c7b7aa..22291d7e 100644
--- a/desktop/src/components/chats/chat-create-popover.tsx
+++ b/desktop/src/renderer/components/chats/chat-create-popover.tsx
@@ -1,11 +1,11 @@
import React from 'react';
-import { Icon } from '@/components/ui/icon';
+import { Icon } from '@/renderer/components/ui/icon';
import {
Popover,
PopoverContent,
PopoverTrigger,
-} from '@/components/ui/popover';
-import { ChatCreateCommand } from '@/components/chats/chat-create-command';
+} from '@/renderer/components/ui/popover';
+import { ChatCreateCommand } from '@/renderer/components/chats/chat-create-command';
export const ChatCreatePopover = () => {
const [open, setOpen] = React.useState(false);
diff --git a/desktop/src/components/collaborators/node-collaborator-create.tsx b/desktop/src/renderer/components/collaborators/node-collaborator-create.tsx
similarity index 84%
rename from desktop/src/components/collaborators/node-collaborator-create.tsx
rename to desktop/src/renderer/components/collaborators/node-collaborator-create.tsx
index 1123bf1c..305ea23e 100644
--- a/desktop/src/components/collaborators/node-collaborator-create.tsx
+++ b/desktop/src/renderer/components/collaborators/node-collaborator-create.tsx
@@ -1,11 +1,11 @@
import React from 'react';
-import { NodeCollaboratorSearch } from '@/components/collaborators/node-collaborator-search';
+import { NodeCollaboratorSearch } from '@/renderer/components/collaborators/node-collaborator-search';
import { NodeCollaboratorNode } from '@/types/nodes';
-import { Button } from '@/components/ui/button';
-import { Spinner } from '@/components/ui/spinner';
-import { NodeCollaboratorRoleDropdown } from '@/components/collaborators/node-collaborator-role-dropdown';
+import { Button } from '@/renderer/components/ui/button';
+import { Spinner } from '@/renderer/components/ui/spinner';
+import { NodeCollaboratorRoleDropdown } from '@/renderer/components/collaborators/node-collaborator-role-dropdown';
import { useMutation } from '@/renderer/hooks/use-mutation';
-import { toast } from '@/components/ui/use-toast';
+import { toast } from '@/renderer/components/ui/use-toast';
import { useWorkspace } from '@/renderer/contexts/workspace';
interface NodeCollaboratorCreate {
diff --git a/desktop/src/components/collaborators/node-collaborator-role-dropdown.tsx b/desktop/src/renderer/components/collaborators/node-collaborator-role-dropdown.tsx
similarity index 95%
rename from desktop/src/components/collaborators/node-collaborator-role-dropdown.tsx
rename to desktop/src/renderer/components/collaborators/node-collaborator-role-dropdown.tsx
index 95539ccb..1605783e 100644
--- a/desktop/src/components/collaborators/node-collaborator-role-dropdown.tsx
+++ b/desktop/src/renderer/components/collaborators/node-collaborator-role-dropdown.tsx
@@ -4,8 +4,8 @@ import {
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuTrigger,
-} from '@/components/ui/dropdown-menu';
-import { Icon } from '@/components/ui/icon';
+} from '@/renderer/components/ui/dropdown-menu';
+import { Icon } from '@/renderer/components/ui/icon';
interface NodeCollaboratorRole {
name: string;
diff --git a/desktop/src/components/collaborators/node-collaborator-search.tsx b/desktop/src/renderer/components/collaborators/node-collaborator-search.tsx
similarity index 92%
rename from desktop/src/components/collaborators/node-collaborator-search.tsx
rename to desktop/src/renderer/components/collaborators/node-collaborator-search.tsx
index e4622d00..54bf90ac 100644
--- a/desktop/src/components/collaborators/node-collaborator-search.tsx
+++ b/desktop/src/renderer/components/collaborators/node-collaborator-search.tsx
@@ -4,8 +4,8 @@ import {
Popover,
PopoverContent,
PopoverTrigger,
-} from '@/components/ui/popover';
-import { Button } from '@/components/ui/button';
+} from '@/renderer/components/ui/popover';
+import { Button } from '@/renderer/components/ui/button';
import {
Command,
CommandEmpty,
@@ -13,10 +13,10 @@ import {
CommandInput,
CommandItem,
CommandList,
-} from '@/components/ui/command';
-import { Icon } from '@/components/ui/icon';
-import { Badge } from '@/components/ui/badge';
-import { Avatar } from '@/components/ui/avatar';
+} from '@/renderer/components/ui/command';
+import { Icon } from '@/renderer/components/ui/icon';
+import { Badge } from '@/renderer/components/ui/badge';
+import { Avatar } from '@/renderer/components/ui/avatar';
import { useQuery } from '@/renderer/hooks/use-query';
import { useWorkspace } from '@/renderer/contexts/workspace';
diff --git a/desktop/src/components/collaborators/node-collaborator.tsx b/desktop/src/renderer/components/collaborators/node-collaborator.tsx
similarity index 89%
rename from desktop/src/components/collaborators/node-collaborator.tsx
rename to desktop/src/renderer/components/collaborators/node-collaborator.tsx
index 33cff1cd..d3acf826 100644
--- a/desktop/src/components/collaborators/node-collaborator.tsx
+++ b/desktop/src/renderer/components/collaborators/node-collaborator.tsx
@@ -1,8 +1,8 @@
import React from 'react';
import { NodeCollaboratorNode } from '@/types/nodes';
-import { Avatar } from '@/components/ui/avatar';
-import { Icon } from '@/components/ui/icon';
-import { NodeCollaboratorRoleDropdown } from '@/components/collaborators/node-collaborator-role-dropdown';
+import { Avatar } from '@/renderer/components/ui/avatar';
+import { Icon } from '@/renderer/components/ui/icon';
+import { NodeCollaboratorRoleDropdown } from '@/renderer/components/collaborators/node-collaborator-role-dropdown';
import { useMutation } from '@/renderer/hooks/use-mutation';
import { useWorkspace } from '@/renderer/contexts/workspace';
diff --git a/desktop/src/components/collaborators/node-collaborators-popover.tsx b/desktop/src/renderer/components/collaborators/node-collaborators-popover.tsx
similarity index 75%
rename from desktop/src/components/collaborators/node-collaborators-popover.tsx
rename to desktop/src/renderer/components/collaborators/node-collaborators-popover.tsx
index 49c6426c..ada78f45 100644
--- a/desktop/src/components/collaborators/node-collaborators-popover.tsx
+++ b/desktop/src/renderer/components/collaborators/node-collaborators-popover.tsx
@@ -3,9 +3,9 @@ import {
Popover,
PopoverTrigger,
PopoverContent,
-} from '@/components/ui/popover';
-import { Icon } from '@/components/ui/icon';
-import { NodeCollaborators } from '@/components/collaborators/node-collaborators';
+} from '@/renderer/components/ui/popover';
+import { Icon } from '@/renderer/components/ui/icon';
+import { NodeCollaborators } from '@/renderer/components/collaborators/node-collaborators';
interface NodeCollaboratorsPopoverProps {
id: string;
diff --git a/desktop/src/components/collaborators/node-collaborators.tsx b/desktop/src/renderer/components/collaborators/node-collaborators.tsx
similarity index 88%
rename from desktop/src/components/collaborators/node-collaborators.tsx
rename to desktop/src/renderer/components/collaborators/node-collaborators.tsx
index 199e9c48..e90b1c4c 100644
--- a/desktop/src/components/collaborators/node-collaborators.tsx
+++ b/desktop/src/renderer/components/collaborators/node-collaborators.tsx
@@ -1,7 +1,7 @@
import React from 'react';
-import { Separator } from '@/components/ui/separator';
-import { NodeCollaborator } from '@/components/collaborators/node-collaborator';
-import { NodeCollaboratorCreate } from '@/components/collaborators/node-collaborator-create';
+import { Separator } from '@/renderer/components/ui/separator';
+import { NodeCollaborator } from '@/renderer/components/collaborators/node-collaborator';
+import { NodeCollaboratorCreate } from '@/renderer/components/collaborators/node-collaborator-create';
import { useQuery } from '@/renderer/hooks/use-query';
import { useWorkspace } from '@/renderer/contexts/workspace';
diff --git a/desktop/src/components/databases/boards/board-view-card.tsx b/desktop/src/renderer/components/databases/boards/board-view-card.tsx
similarity index 100%
rename from desktop/src/components/databases/boards/board-view-card.tsx
rename to desktop/src/renderer/components/databases/boards/board-view-card.tsx
diff --git a/desktop/src/components/databases/boards/board-view-column-header.tsx b/desktop/src/renderer/components/databases/boards/board-view-column-header.tsx
similarity index 80%
rename from desktop/src/components/databases/boards/board-view-column-header.tsx
rename to desktop/src/renderer/components/databases/boards/board-view-column-header.tsx
index ab107871..0d7f7fad 100644
--- a/desktop/src/components/databases/boards/board-view-column-header.tsx
+++ b/desktop/src/renderer/components/databases/boards/board-view-column-header.tsx
@@ -1,5 +1,5 @@
import React from 'react';
-import { SelectOptionBadge } from '@/components/databases/fields/select-option-badge';
+import { SelectOptionBadge } from '@/renderer/components/databases/fields/select-option-badge';
import { SelectOptionNode } from '@/types/databases';
interface BoardViewColumnHeaderProps {
diff --git a/desktop/src/components/databases/boards/board-view-column-records.tsx b/desktop/src/renderer/components/databases/boards/board-view-column-records.tsx
similarity index 95%
rename from desktop/src/components/databases/boards/board-view-column-records.tsx
rename to desktop/src/renderer/components/databases/boards/board-view-column-records.tsx
index bdf5d945..6391e57f 100644
--- a/desktop/src/components/databases/boards/board-view-column-records.tsx
+++ b/desktop/src/renderer/components/databases/boards/board-view-column-records.tsx
@@ -7,7 +7,7 @@ import {
SelectOptionNode,
ViewFilter,
} from '@/types/databases';
-import { BoardViewCard } from '@/components/databases/boards/board-view-card';
+import { BoardViewCard } from '@/renderer/components/databases/boards/board-view-card';
import { useWorkspace } from '@/renderer/contexts/workspace';
const RECORDS_PER_PAGE = 50;
diff --git a/desktop/src/components/databases/boards/board-view-column.tsx b/desktop/src/renderer/components/databases/boards/board-view-column.tsx
similarity index 85%
rename from desktop/src/components/databases/boards/board-view-column.tsx
rename to desktop/src/renderer/components/databases/boards/board-view-column.tsx
index aeb52dd3..946eb090 100644
--- a/desktop/src/components/databases/boards/board-view-column.tsx
+++ b/desktop/src/renderer/components/databases/boards/board-view-column.tsx
@@ -7,8 +7,8 @@ import {
SelectOptionNode,
} from '@/types/databases';
import { useDrop } from 'react-dnd';
-import { BoardViewColumnHeader } from '@/components/databases/boards/board-view-column-header';
-import { BoardViewColumnRecords } from '@/components/databases/boards/board-view-column-records';
+import { BoardViewColumnHeader } from '@/renderer/components/databases/boards/board-view-column-header';
+import { BoardViewColumnRecords } from '@/renderer/components/databases/boards/board-view-column-records';
interface BoardViewColumnProps {
view: BoardViewNode;
diff --git a/desktop/src/components/databases/boards/board-view.tsx b/desktop/src/renderer/components/databases/boards/board-view.tsx
similarity index 70%
rename from desktop/src/components/databases/boards/board-view.tsx
rename to desktop/src/renderer/components/databases/boards/board-view.tsx
index d82ef14c..95591aa9 100644
--- a/desktop/src/components/databases/boards/board-view.tsx
+++ b/desktop/src/renderer/components/databases/boards/board-view.tsx
@@ -1,12 +1,12 @@
import React from 'react';
import { BoardViewNode } from '@/types/databases';
-import { ViewTabs } from '@/components/databases/view-tabs';
+import { ViewTabs } from '@/renderer/components/databases/view-tabs';
import { useDatabase } from '@/renderer/contexts/database';
-import { BoardViewColumn } from '@/components/databases/boards/board-view-column';
-import { ViewSearchBar } from '@/components/databases/search/view-search-bar';
-import { ViewSortButton } from '@/components/databases/search/view-sort-button';
-import { ViewFilterButton } from '@/components/databases/search/view-filter-button';
-import { ViewSearchProvider } from '@/components/databases/search/view-search-provider';
+import { BoardViewColumn } from '@/renderer/components/databases/boards/board-view-column';
+import { ViewSearchBar } from '@/renderer/components/databases/search/view-search-bar';
+import { ViewSortButton } from '@/renderer/components/databases/search/view-sort-button';
+import { ViewFilterButton } from '@/renderer/components/databases/search/view-filter-button';
+import { ViewSearchProvider } from '@/renderer/components/databases/search/view-search-provider';
interface BoardViewProps {
node: BoardViewNode;
diff --git a/desktop/src/components/databases/calendars/calendar-view-card.tsx b/desktop/src/renderer/components/databases/calendars/calendar-view-card.tsx
similarity index 100%
rename from desktop/src/components/databases/calendars/calendar-view-card.tsx
rename to desktop/src/renderer/components/databases/calendars/calendar-view-card.tsx
diff --git a/desktop/src/components/databases/calendars/calendar-view-day.tsx b/desktop/src/renderer/components/databases/calendars/calendar-view-day.tsx
similarity index 89%
rename from desktop/src/components/databases/calendars/calendar-view-day.tsx
rename to desktop/src/renderer/components/databases/calendars/calendar-view-day.tsx
index 0629f83b..50367912 100644
--- a/desktop/src/components/databases/calendars/calendar-view-day.tsx
+++ b/desktop/src/renderer/components/databases/calendars/calendar-view-day.tsx
@@ -1,8 +1,8 @@
import React from 'react';
import { cn, isSameDay } from '@/lib/utils';
import { RecordNode } from '@/types/databases';
-import { Icon } from '@/components/ui/icon';
-import { CalendarViewCard } from '@/components/databases/calendars/calendar-view-card';
+import { Icon } from '@/renderer/components/ui/icon';
+import { CalendarViewCard } from '@/renderer/components/databases/calendars/calendar-view-card';
interface CalendarViewDayProps {
date: Date;
diff --git a/desktop/src/components/databases/calendars/calendar-view-grid.tsx b/desktop/src/renderer/components/databases/calendars/calendar-view-grid.tsx
similarity index 95%
rename from desktop/src/components/databases/calendars/calendar-view-grid.tsx
rename to desktop/src/renderer/components/databases/calendars/calendar-view-grid.tsx
index 14d0915e..596256b1 100644
--- a/desktop/src/components/databases/calendars/calendar-view-grid.tsx
+++ b/desktop/src/renderer/components/databases/calendars/calendar-view-grid.tsx
@@ -1,9 +1,9 @@
import React from 'react';
-import { buttonVariants } from '@/components/ui/button';
-import { Icon } from '@/components/ui/icon';
+import { buttonVariants } from '@/renderer/components/ui/button';
+import { Icon } from '@/renderer/components/ui/icon';
import { cn, getDisplayedDates, toUTCDate } from '@/lib/utils';
import { DayPicker, DayProps } from 'react-day-picker';
-import { CalendarViewDay } from '@/components/databases/calendars/calendar-view-day';
+import { CalendarViewDay } from '@/renderer/components/databases/calendars/calendar-view-day';
import { CalendarViewNode, FieldNode, ViewFilter } from '@/types/databases';
import { useInfiniteQuery } from '@/renderer/hooks/use-infinite-query';
import { useDatabase } from '@/renderer/contexts/database';
diff --git a/desktop/src/components/databases/calendars/calendar-view.tsx b/desktop/src/renderer/components/databases/calendars/calendar-view.tsx
similarity index 65%
rename from desktop/src/components/databases/calendars/calendar-view.tsx
rename to desktop/src/renderer/components/databases/calendars/calendar-view.tsx
index f866e919..e6d68003 100644
--- a/desktop/src/components/databases/calendars/calendar-view.tsx
+++ b/desktop/src/renderer/components/databases/calendars/calendar-view.tsx
@@ -1,12 +1,12 @@
import React from 'react';
import { CalendarViewNode } from '@/types/databases';
-import { ViewTabs } from '@/components/databases/view-tabs';
+import { ViewTabs } from '@/renderer/components/databases/view-tabs';
import { useDatabase } from '@/renderer/contexts/database';
-import { CalendarViewGrid } from '@/components/databases/calendars/calendar-view-grid';
-import { ViewSearchBar } from '@/components/databases/search/view-search-bar';
-import { ViewSortButton } from '@/components/databases/search/view-sort-button';
-import { ViewFilterButton } from '@/components/databases/search/view-filter-button';
-import { ViewSearchProvider } from '@/components/databases/search/view-search-provider';
+import { CalendarViewGrid } from '@/renderer/components/databases/calendars/calendar-view-grid';
+import { ViewSearchBar } from '@/renderer/components/databases/search/view-search-bar';
+import { ViewSortButton } from '@/renderer/components/databases/search/view-sort-button';
+import { ViewFilterButton } from '@/renderer/components/databases/search/view-filter-button';
+import { ViewSearchProvider } from '@/renderer/components/databases/search/view-search-provider';
interface CalendarViewProps {
node: CalendarViewNode;
diff --git a/desktop/src/components/databases/database-container-node.tsx b/desktop/src/renderer/components/databases/database-container-node.tsx
similarity index 85%
rename from desktop/src/components/databases/database-container-node.tsx
rename to desktop/src/renderer/components/databases/database-container-node.tsx
index e5fe14fb..d8b439bc 100644
--- a/desktop/src/components/databases/database-container-node.tsx
+++ b/desktop/src/renderer/components/databases/database-container-node.tsx
@@ -1,8 +1,8 @@
import React from 'react';
import { LocalNode } from '@/types/nodes';
import { useQuery } from '@/renderer/hooks/use-query';
-import { Database } from '@/components/databases/database';
-import { DatabaseViews } from '@/components/databases/database-views';
+import { Database } from '@/renderer/components/databases/database';
+import { DatabaseViews } from '@/renderer/components/databases/database-views';
import { useWorkspace } from '@/renderer/contexts/workspace';
interface DatabaseContainerNodeProps {
diff --git a/desktop/src/components/databases/database-create-dialog.tsx b/desktop/src/renderer/components/databases/database-create-dialog.tsx
similarity index 91%
rename from desktop/src/components/databases/database-create-dialog.tsx
rename to desktop/src/renderer/components/databases/database-create-dialog.tsx
index 38d553f9..4327fdf7 100644
--- a/desktop/src/components/databases/database-create-dialog.tsx
+++ b/desktop/src/renderer/components/databases/database-create-dialog.tsx
@@ -7,7 +7,7 @@ import {
DialogFooter,
DialogHeader,
DialogTitle,
-} from '@/components/ui/dialog';
+} from '@/renderer/components/ui/dialog';
import { z } from 'zod';
import {
Form,
@@ -16,10 +16,10 @@ import {
FormItem,
FormLabel,
FormMessage,
-} from '@/components/ui/form';
-import { Input } from '@/components/ui/input';
-import { Button } from '@/components/ui/button';
-import { Spinner } from '@/components/ui/spinner';
+} from '@/renderer/components/ui/form';
+import { Input } from '@/renderer/components/ui/input';
+import { Button } from '@/renderer/components/ui/button';
+import { Spinner } from '@/renderer/components/ui/spinner';
import { useForm } from 'react-hook-form';
import { zodResolver } from '@hookform/resolvers/zod';
import { useMutation } from '@/renderer/hooks/use-mutation';
diff --git a/desktop/src/components/databases/database-views.tsx b/desktop/src/renderer/components/databases/database-views.tsx
similarity index 87%
rename from desktop/src/components/databases/database-views.tsx
rename to desktop/src/renderer/components/databases/database-views.tsx
index 0ad9fb8b..a510f2c2 100644
--- a/desktop/src/components/databases/database-views.tsx
+++ b/desktop/src/renderer/components/databases/database-views.tsx
@@ -1,8 +1,8 @@
import React from 'react';
import { DatabaseViewsContext } from '@/renderer/contexts/database-views';
import { ViewNode } from '@/types/databases';
-import { View } from '@/components/databases/view';
-import { ScrollArea } from '@/components/ui/scroll-area';
+import { View } from '@/renderer/components/databases/view';
+import { ScrollArea } from '@/renderer/components/ui/scroll-area';
interface DatabaseViewsProps {
views: ViewNode[];
diff --git a/desktop/src/components/databases/database.tsx b/desktop/src/renderer/components/databases/database.tsx
similarity index 100%
rename from desktop/src/components/databases/database.tsx
rename to desktop/src/renderer/components/databases/database.tsx
diff --git a/desktop/src/components/databases/fields/field-attrs.tsx b/desktop/src/renderer/components/databases/fields/field-attrs.tsx
similarity index 100%
rename from desktop/src/components/databases/fields/field-attrs.tsx
rename to desktop/src/renderer/components/databases/fields/field-attrs.tsx
diff --git a/desktop/src/components/databases/fields/field-create-popover.tsx b/desktop/src/renderer/components/databases/fields/field-create-popover.tsx
similarity index 88%
rename from desktop/src/components/databases/fields/field-create-popover.tsx
rename to desktop/src/renderer/components/databases/fields/field-create-popover.tsx
index c2d703a0..d2342f50 100644
--- a/desktop/src/components/databases/fields/field-create-popover.tsx
+++ b/desktop/src/renderer/components/databases/fields/field-create-popover.tsx
@@ -3,7 +3,7 @@ import { zodResolver } from '@hookform/resolvers/zod';
import { useForm } from 'react-hook-form';
import * as z from 'zod';
-import { Button } from '@/components/ui/button';
+import { Button } from '@/renderer/components/ui/button';
import {
Form,
FormControl,
@@ -11,18 +11,18 @@ import {
FormItem,
FormLabel,
FormMessage,
-} from '@/components/ui/form';
-import { Input } from '@/components/ui/input';
+} from '@/renderer/components/ui/form';
+import { Input } from '@/renderer/components/ui/input';
import {
Popover,
PopoverContent,
PopoverTrigger,
-} from '@/components/ui/popover';
+} from '@/renderer/components/ui/popover';
import { useDatabase } from '@/renderer/contexts/database';
-import { FieldDataTypeSelect } from '@/components/databases/fields/field-type-select';
-import { FieldAttrs } from '@/components/databases/fields/field-attrs';
-import { Spinner } from '@/components/ui/spinner';
-import { Icon } from '@/components/ui/icon';
+import { FieldDataTypeSelect } from '@/renderer/components/databases/fields/field-type-select';
+import { FieldAttrs } from '@/renderer/components/databases/fields/field-attrs';
+import { Spinner } from '@/renderer/components/ui/spinner';
+import { Icon } from '@/renderer/components/ui/icon';
import { useMutation } from '@/renderer/hooks/use-mutation';
import { useWorkspace } from '@/renderer/contexts/workspace';
diff --git a/desktop/src/components/databases/fields/field-delete-dialog.tsx b/desktop/src/renderer/components/databases/fields/field-delete-dialog.tsx
similarity index 94%
rename from desktop/src/components/databases/fields/field-delete-dialog.tsx
rename to desktop/src/renderer/components/databases/fields/field-delete-dialog.tsx
index 5fc16dd6..fbefff5a 100644
--- a/desktop/src/components/databases/fields/field-delete-dialog.tsx
+++ b/desktop/src/renderer/components/databases/fields/field-delete-dialog.tsx
@@ -7,8 +7,8 @@ import {
AlertDialogFooter,
AlertDialogHeader,
AlertDialogTitle,
-} from '@/components/ui/alert-dialog';
-import { Button } from '@/components/ui/button';
+} from '@/renderer/components/ui/alert-dialog';
+import { Button } from '@/renderer/components/ui/button';
import { useMutation } from '@/renderer/hooks/use-mutation';
import { useWorkspace } from '@/renderer/contexts/workspace';
diff --git a/desktop/src/components/databases/fields/field-rename-input.tsx b/desktop/src/renderer/components/databases/fields/field-rename-input.tsx
similarity index 92%
rename from desktop/src/components/databases/fields/field-rename-input.tsx
rename to desktop/src/renderer/components/databases/fields/field-rename-input.tsx
index b14df945..f9cc6ab1 100644
--- a/desktop/src/components/databases/fields/field-rename-input.tsx
+++ b/desktop/src/renderer/components/databases/fields/field-rename-input.tsx
@@ -1,7 +1,7 @@
import React from 'react';
import { FieldNode } from '@/types/databases';
import { useMutation } from '@/renderer/hooks/use-mutation';
-import { SmartTextInput } from '@/components/ui/smart-text-input';
+import { SmartTextInput } from '@/renderer/components/ui/smart-text-input';
import { useWorkspace } from '@/renderer/contexts/workspace';
interface FieldRenameInputProps {
diff --git a/desktop/src/components/databases/fields/field-select.tsx b/desktop/src/renderer/components/databases/fields/field-select.tsx
similarity index 92%
rename from desktop/src/components/databases/fields/field-select.tsx
rename to desktop/src/renderer/components/databases/fields/field-select.tsx
index 8a194650..50127ca3 100644
--- a/desktop/src/components/databases/fields/field-select.tsx
+++ b/desktop/src/renderer/components/databases/fields/field-select.tsx
@@ -3,8 +3,8 @@ import {
Popover,
PopoverContent,
PopoverTrigger,
-} from '@/components/ui/popover';
-import { Button } from '@/components/ui/button';
+} from '@/renderer/components/ui/popover';
+import { Button } from '@/renderer/components/ui/button';
import {
Command,
CommandEmpty,
@@ -12,8 +12,8 @@ import {
CommandInput,
CommandItem,
CommandList,
-} from '@/components/ui/command';
-import { Icon } from '@/components/ui/icon';
+} from '@/renderer/components/ui/command';
+import { Icon } from '@/renderer/components/ui/icon';
import { getFieldIcon } from '@/lib/databases';
import { FieldDataType, FieldNode } from '@/types/databases';
import { cn } from '@/lib/utils';
diff --git a/desktop/src/components/databases/fields/field-type-select.tsx b/desktop/src/renderer/components/databases/fields/field-type-select.tsx
similarity index 94%
rename from desktop/src/components/databases/fields/field-type-select.tsx
rename to desktop/src/renderer/components/databases/fields/field-type-select.tsx
index f05f30c3..caa52e2b 100644
--- a/desktop/src/components/databases/fields/field-type-select.tsx
+++ b/desktop/src/renderer/components/databases/fields/field-type-select.tsx
@@ -3,8 +3,8 @@ import {
Popover,
PopoverContent,
PopoverTrigger,
-} from '@/components/ui/popover';
-import { Button } from '@/components/ui/button';
+} from '@/renderer/components/ui/popover';
+import { Button } from '@/renderer/components/ui/button';
import {
Command,
CommandEmpty,
@@ -12,8 +12,8 @@ import {
CommandInput,
CommandItem,
CommandList,
-} from '@/components/ui/command';
-import { Icon } from '@/components/ui/icon';
+} from '@/renderer/components/ui/command';
+import { Icon } from '@/renderer/components/ui/icon';
import { getFieldIcon } from '@/lib/databases';
import { FieldDataType } from '@/types/databases';
import { cn } from '@/lib/utils';
diff --git a/desktop/src/components/databases/fields/select-field-options.tsx b/desktop/src/renderer/components/databases/fields/select-field-options.tsx
similarity index 93%
rename from desktop/src/components/databases/fields/select-field-options.tsx
rename to desktop/src/renderer/components/databases/fields/select-field-options.tsx
index 6bcd433a..fe9bab91 100644
--- a/desktop/src/components/databases/fields/select-field-options.tsx
+++ b/desktop/src/renderer/components/databases/fields/select-field-options.tsx
@@ -6,12 +6,12 @@ import {
CommandInput,
CommandItem,
CommandList,
-} from '@/components/ui/command';
-import { SelectOptionBadge } from '@/components/databases/fields/select-option-badge';
-import { Icon } from '@/components/ui/icon';
+} from '@/renderer/components/ui/command';
+import { SelectOptionBadge } from '@/renderer/components/databases/fields/select-option-badge';
+import { Icon } from '@/renderer/components/ui/icon';
import { MultiSelectFieldNode, SelectFieldNode } from '@/types/databases';
import { getRandomSelectOptionColor } from '@/lib/databases';
-import { SelectOptionSettingsPopover } from '@/components/databases/fields/select-option-settings-popover';
+import { SelectOptionSettingsPopover } from '@/renderer/components/databases/fields/select-option-settings-popover';
import { useWorkspace } from '@/renderer/contexts/workspace';
import { useMutation } from '@/renderer/hooks/use-mutation';
diff --git a/desktop/src/components/databases/fields/select-option-badge.tsx b/desktop/src/renderer/components/databases/fields/select-option-badge.tsx
similarity index 100%
rename from desktop/src/components/databases/fields/select-option-badge.tsx
rename to desktop/src/renderer/components/databases/fields/select-option-badge.tsx
diff --git a/desktop/src/components/databases/fields/select-option-delete-dialog.tsx b/desktop/src/renderer/components/databases/fields/select-option-delete-dialog.tsx
similarity index 93%
rename from desktop/src/components/databases/fields/select-option-delete-dialog.tsx
rename to desktop/src/renderer/components/databases/fields/select-option-delete-dialog.tsx
index 1bd32e54..2d2e26dd 100644
--- a/desktop/src/components/databases/fields/select-option-delete-dialog.tsx
+++ b/desktop/src/renderer/components/databases/fields/select-option-delete-dialog.tsx
@@ -7,8 +7,8 @@ import {
AlertDialogFooter,
AlertDialogHeader,
AlertDialogTitle,
-} from '@/components/ui/alert-dialog';
-import { Button } from '@/components/ui/button';
+} from '@/renderer/components/ui/alert-dialog';
+import { Button } from '@/renderer/components/ui/button';
import { useMutation } from '@/renderer/hooks/use-mutation';
import { useWorkspace } from '@/renderer/contexts/workspace';
diff --git a/desktop/src/components/databases/fields/select-option-settings-popover.tsx b/desktop/src/renderer/components/databases/fields/select-option-settings-popover.tsx
similarity index 88%
rename from desktop/src/components/databases/fields/select-option-settings-popover.tsx
rename to desktop/src/renderer/components/databases/fields/select-option-settings-popover.tsx
index 0362c1fe..8d65b295 100644
--- a/desktop/src/components/databases/fields/select-option-settings-popover.tsx
+++ b/desktop/src/renderer/components/databases/fields/select-option-settings-popover.tsx
@@ -1,18 +1,18 @@
import React from 'react';
-import { Icon } from '@/components/ui/icon';
-import { Label } from '@/components/ui/label';
+import { Icon } from '@/renderer/components/ui/icon';
+import { Label } from '@/renderer/components/ui/label';
import {
Popover,
PopoverContent,
PopoverTrigger,
-} from '@/components/ui/popover';
-import { Separator } from '@/components/ui/separator';
+} from '@/renderer/components/ui/popover';
+import { Separator } from '@/renderer/components/ui/separator';
import { selectOptionColors } from '@/lib/databases';
import { cn } from '@/lib/utils';
import { SelectOptionNode } from '@/types/databases';
-import { SelectOptionDeleteDialog } from '@/components/databases/fields/select-option-delete-dialog';
+import { SelectOptionDeleteDialog } from '@/renderer/components/databases/fields/select-option-delete-dialog';
import { useMutation } from '@/renderer/hooks/use-mutation';
-import { SmartTextInput } from '@/components/ui/smart-text-input';
+import { SmartTextInput } from '@/renderer/components/ui/smart-text-input';
import { useWorkspace } from '@/renderer/contexts/workspace';
interface SelectOptionSettingsPopoverProps {
diff --git a/desktop/src/components/databases/search/view-boolean-field-filter.tsx b/desktop/src/renderer/components/databases/search/view-boolean-field-filter.tsx
similarity index 93%
rename from desktop/src/components/databases/search/view-boolean-field-filter.tsx
rename to desktop/src/renderer/components/databases/search/view-boolean-field-filter.tsx
index 2293ba77..7b9ee117 100644
--- a/desktop/src/components/databases/search/view-boolean-field-filter.tsx
+++ b/desktop/src/renderer/components/databases/search/view-boolean-field-filter.tsx
@@ -4,15 +4,15 @@ import {
Popover,
PopoverContent,
PopoverTrigger,
-} from '@/components/ui/popover';
+} from '@/renderer/components/ui/popover';
import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuTrigger,
-} from '@/components/ui/dropdown-menu';
-import { Button } from '@/components/ui/button';
-import { Icon } from '@/components/ui/icon';
+} from '@/renderer/components/ui/dropdown-menu';
+import { Button } from '@/renderer/components/ui/button';
+import { Icon } from '@/renderer/components/ui/icon';
import { getFieldIcon, booleanFieldFilterOperators } from '@/lib/databases';
import { useViewSearch } from '@/renderer/contexts/view-search';
diff --git a/desktop/src/components/databases/search/view-created-at-field-fitler.tsx b/desktop/src/renderer/components/databases/search/view-created-at-field-fitler.tsx
similarity index 93%
rename from desktop/src/components/databases/search/view-created-at-field-fitler.tsx
rename to desktop/src/renderer/components/databases/search/view-created-at-field-fitler.tsx
index 9f3b83f4..e51a845e 100644
--- a/desktop/src/components/databases/search/view-created-at-field-fitler.tsx
+++ b/desktop/src/renderer/components/databases/search/view-created-at-field-fitler.tsx
@@ -4,17 +4,17 @@ import {
Popover,
PopoverContent,
PopoverTrigger,
-} from '@/components/ui/popover';
+} from '@/renderer/components/ui/popover';
import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuTrigger,
-} from '@/components/ui/dropdown-menu';
-import { Button } from '@/components/ui/button';
-import { Icon } from '@/components/ui/icon';
+} from '@/renderer/components/ui/dropdown-menu';
+import { Button } from '@/renderer/components/ui/button';
+import { Icon } from '@/renderer/components/ui/icon';
import { getFieldIcon, dateFieldFilterOperators } from '@/lib/databases';
-import { DatePicker } from '@/components/ui/date-picker';
+import { DatePicker } from '@/renderer/components/ui/date-picker';
import { useViewSearch } from '@/renderer/contexts/view-search';
interface ViewCreatedAtFieldFilterProps {
diff --git a/desktop/src/components/databases/search/view-date-field-filter.tsx b/desktop/src/renderer/components/databases/search/view-date-field-filter.tsx
similarity index 93%
rename from desktop/src/components/databases/search/view-date-field-filter.tsx
rename to desktop/src/renderer/components/databases/search/view-date-field-filter.tsx
index 8ef85c5b..ada61ea5 100644
--- a/desktop/src/components/databases/search/view-date-field-filter.tsx
+++ b/desktop/src/renderer/components/databases/search/view-date-field-filter.tsx
@@ -4,17 +4,17 @@ import {
Popover,
PopoverContent,
PopoverTrigger,
-} from '@/components/ui/popover';
+} from '@/renderer/components/ui/popover';
import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuTrigger,
-} from '@/components/ui/dropdown-menu';
-import { Button } from '@/components/ui/button';
-import { Icon } from '@/components/ui/icon';
+} from '@/renderer/components/ui/dropdown-menu';
+import { Button } from '@/renderer/components/ui/button';
+import { Icon } from '@/renderer/components/ui/icon';
import { getFieldIcon, dateFieldFilterOperators } from '@/lib/databases';
-import { DatePicker } from '@/components/ui/date-picker';
+import { DatePicker } from '@/renderer/components/ui/date-picker';
import { useViewSearch } from '@/renderer/contexts/view-search';
interface ViewDateFieldFilterProps {
diff --git a/desktop/src/components/databases/search/view-email-field-filter.tsx b/desktop/src/renderer/components/databases/search/view-email-field-filter.tsx
similarity index 92%
rename from desktop/src/components/databases/search/view-email-field-filter.tsx
rename to desktop/src/renderer/components/databases/search/view-email-field-filter.tsx
index 71dbb454..35e92dc4 100644
--- a/desktop/src/components/databases/search/view-email-field-filter.tsx
+++ b/desktop/src/renderer/components/databases/search/view-email-field-filter.tsx
@@ -4,17 +4,17 @@ import {
Popover,
PopoverContent,
PopoverTrigger,
-} from '@/components/ui/popover';
+} from '@/renderer/components/ui/popover';
import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuTrigger,
-} from '@/components/ui/dropdown-menu';
-import { Button } from '@/components/ui/button';
-import { Icon } from '@/components/ui/icon';
+} from '@/renderer/components/ui/dropdown-menu';
+import { Button } from '@/renderer/components/ui/button';
+import { Icon } from '@/renderer/components/ui/icon';
import { getFieldIcon, emailFieldFilterOperators } from '@/lib/databases';
-import { SmartTextInput } from '@/components/ui/smart-text-input';
+import { SmartTextInput } from '@/renderer/components/ui/smart-text-input';
import { useViewSearch } from '@/renderer/contexts/view-search';
interface ViewEmailFieldFilterProps {
diff --git a/desktop/src/components/databases/search/view-filter-add-popover.tsx b/desktop/src/renderer/components/databases/search/view-filter-add-popover.tsx
similarity index 93%
rename from desktop/src/components/databases/search/view-filter-add-popover.tsx
rename to desktop/src/renderer/components/databases/search/view-filter-add-popover.tsx
index e5ed3493..2ae21e56 100644
--- a/desktop/src/components/databases/search/view-filter-add-popover.tsx
+++ b/desktop/src/renderer/components/databases/search/view-filter-add-popover.tsx
@@ -1,10 +1,10 @@
import React from 'react';
-import { Icon } from '@/components/ui/icon';
+import { Icon } from '@/renderer/components/ui/icon';
import {
Popover,
PopoverContent,
PopoverTrigger,
-} from '@/components/ui/popover';
+} from '@/renderer/components/ui/popover';
import {
Command,
CommandEmpty,
@@ -12,7 +12,7 @@ import {
CommandInput,
CommandItem,
CommandList,
-} from '@/components/ui/command';
+} from '@/renderer/components/ui/command';
import { useDatabase } from '@/renderer/contexts/database';
import { getFieldIcon } from '@/lib/databases';
import { useViewSearch } from '@/renderer/contexts/view-search';
diff --git a/desktop/src/components/databases/search/view-filter-button.tsx b/desktop/src/renderer/components/databases/search/view-filter-button.tsx
similarity index 80%
rename from desktop/src/components/databases/search/view-filter-button.tsx
rename to desktop/src/renderer/components/databases/search/view-filter-button.tsx
index fe731915..d1b21ab2 100644
--- a/desktop/src/components/databases/search/view-filter-button.tsx
+++ b/desktop/src/renderer/components/databases/search/view-filter-button.tsx
@@ -1,6 +1,6 @@
import React from 'react';
-import { ViewFilterAddPopover } from '@/components/databases/search/view-filter-add-popover';
-import { Icon } from '@/components/ui/icon';
+import { ViewFilterAddPopover } from '@/renderer/components/databases/search/view-filter-add-popover';
+import { Icon } from '@/renderer/components/ui/icon';
import { useViewSearch } from '@/renderer/contexts/view-search';
export const ViewFilterButton = () => {
diff --git a/desktop/src/components/databases/search/view-filters.tsx b/desktop/src/renderer/components/databases/search/view-filters.tsx
similarity index 74%
rename from desktop/src/components/databases/search/view-filters.tsx
rename to desktop/src/renderer/components/databases/search/view-filters.tsx
index fecc5e03..aa1a99bf 100644
--- a/desktop/src/components/databases/search/view-filters.tsx
+++ b/desktop/src/renderer/components/databases/search/view-filters.tsx
@@ -1,17 +1,17 @@
import React from 'react';
import { useDatabase } from '@/renderer/contexts/database';
-import { ViewTextFieldFilter } from '@/components/databases/search/view-text-field-filter';
-import { ViewNumberFieldFilter } from '@/components/databases/search/view-number-field-filter';
-import { ViewEmailFieldFilter } from '@/components/databases/search/view-email-field-filter';
-import { ViewUrlFieldFilter } from '@/components/databases/search/view-url-field-filter';
-import { ViewPhoneFieldFilter } from '@/components/databases/search/view-phone-field-filter';
-import { ViewBooleanFieldFilter } from '@/components/databases/search/view-boolean-field-filter';
-import { ViewSelectFieldFilter } from '@/components/databases/search/view-select-field-filter';
-import { ViewMultiSelectFieldFilter } from '@/components/databases/search/view-multi-select-field-filter';
-import { ViewDateFieldFilter } from '@/components/databases/search/view-date-field-filter';
-import { ViewCreatedAtFieldFilter } from '@/components/databases/search/view-created-at-field-fitler';
-import { ViewFilterAddPopover } from '@/components/databases/search/view-filter-add-popover';
-import { Icon } from '@/components/ui/icon';
+import { ViewTextFieldFilter } from '@/renderer/components/databases/search/view-text-field-filter';
+import { ViewNumberFieldFilter } from '@/renderer/components/databases/search/view-number-field-filter';
+import { ViewEmailFieldFilter } from '@/renderer/components/databases/search/view-email-field-filter';
+import { ViewUrlFieldFilter } from '@/renderer/components/databases/search/view-url-field-filter';
+import { ViewPhoneFieldFilter } from '@/renderer/components/databases/search/view-phone-field-filter';
+import { ViewBooleanFieldFilter } from '@/renderer/components/databases/search/view-boolean-field-filter';
+import { ViewSelectFieldFilter } from '@/renderer/components/databases/search/view-select-field-filter';
+import { ViewMultiSelectFieldFilter } from '@/renderer/components/databases/search/view-multi-select-field-filter';
+import { ViewDateFieldFilter } from '@/renderer/components/databases/search/view-date-field-filter';
+import { ViewCreatedAtFieldFilter } from '@/renderer/components/databases/search/view-created-at-field-fitler';
+import { ViewFilterAddPopover } from '@/renderer/components/databases/search/view-filter-add-popover';
+import { Icon } from '@/renderer/components/ui/icon';
import { useViewSearch } from '@/renderer/contexts/view-search';
export const ViewFilters = () => {
diff --git a/desktop/src/components/databases/search/view-multi-select-field-filter.tsx b/desktop/src/renderer/components/databases/search/view-multi-select-field-filter.tsx
similarity index 92%
rename from desktop/src/components/databases/search/view-multi-select-field-filter.tsx
rename to desktop/src/renderer/components/databases/search/view-multi-select-field-filter.tsx
index c37f9cc9..8870f2a2 100644
--- a/desktop/src/components/databases/search/view-multi-select-field-filter.tsx
+++ b/desktop/src/renderer/components/databases/search/view-multi-select-field-filter.tsx
@@ -4,18 +4,18 @@ import {
Popover,
PopoverContent,
PopoverTrigger,
-} from '@/components/ui/popover';
+} from '@/renderer/components/ui/popover';
import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuTrigger,
-} from '@/components/ui/dropdown-menu';
-import { Button } from '@/components/ui/button';
-import { Icon } from '@/components/ui/icon';
+} from '@/renderer/components/ui/dropdown-menu';
+import { Button } from '@/renderer/components/ui/button';
+import { Icon } from '@/renderer/components/ui/icon';
import { getFieldIcon, selectFieldFilterOperators } from '@/lib/databases';
-import { SelectFieldOptions } from '@/components/databases/fields/select-field-options';
-import { SelectOptionBadge } from '@/components/databases/fields/select-option-badge';
+import { SelectFieldOptions } from '@/renderer/components/databases/fields/select-field-options';
+import { SelectOptionBadge } from '@/renderer/components/databases/fields/select-option-badge';
import { useViewSearch } from '@/renderer/contexts/view-search';
interface ViewMultiSelectFieldFilterProps {
diff --git a/desktop/src/components/databases/search/view-number-field-filter.tsx b/desktop/src/renderer/components/databases/search/view-number-field-filter.tsx
similarity index 92%
rename from desktop/src/components/databases/search/view-number-field-filter.tsx
rename to desktop/src/renderer/components/databases/search/view-number-field-filter.tsx
index 91228939..f0091f8c 100644
--- a/desktop/src/components/databases/search/view-number-field-filter.tsx
+++ b/desktop/src/renderer/components/databases/search/view-number-field-filter.tsx
@@ -4,17 +4,17 @@ import {
Popover,
PopoverContent,
PopoverTrigger,
-} from '@/components/ui/popover';
+} from '@/renderer/components/ui/popover';
import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuTrigger,
-} from '@/components/ui/dropdown-menu';
-import { Button } from '@/components/ui/button';
-import { Icon } from '@/components/ui/icon';
+} from '@/renderer/components/ui/dropdown-menu';
+import { Button } from '@/renderer/components/ui/button';
+import { Icon } from '@/renderer/components/ui/icon';
import { getFieldIcon, numberFieldFilterOperators } from '@/lib/databases';
-import { SmartNumberInput } from '@/components/ui/smart-number-input';
+import { SmartNumberInput } from '@/renderer/components/ui/smart-number-input';
import { useViewSearch } from '@/renderer/contexts/view-search';
interface ViewNumberFieldFilterProps {
diff --git a/desktop/src/components/databases/search/view-phone-field-filter.tsx b/desktop/src/renderer/components/databases/search/view-phone-field-filter.tsx
similarity index 92%
rename from desktop/src/components/databases/search/view-phone-field-filter.tsx
rename to desktop/src/renderer/components/databases/search/view-phone-field-filter.tsx
index f520ad53..6bf96128 100644
--- a/desktop/src/components/databases/search/view-phone-field-filter.tsx
+++ b/desktop/src/renderer/components/databases/search/view-phone-field-filter.tsx
@@ -4,17 +4,17 @@ import {
Popover,
PopoverContent,
PopoverTrigger,
-} from '@/components/ui/popover';
+} from '@/renderer/components/ui/popover';
import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuTrigger,
-} from '@/components/ui/dropdown-menu';
-import { Button } from '@/components/ui/button';
-import { Icon } from '@/components/ui/icon';
+} from '@/renderer/components/ui/dropdown-menu';
+import { Button } from '@/renderer/components/ui/button';
+import { Icon } from '@/renderer/components/ui/icon';
import { phoneFieldFilterOperators } from '@/lib/databases';
-import { SmartTextInput } from '@/components/ui/smart-text-input';
+import { SmartTextInput } from '@/renderer/components/ui/smart-text-input';
import { useViewSearch } from '@/renderer/contexts/view-search';
interface ViewPhoneFieldFilterProps {
diff --git a/desktop/src/components/databases/search/view-search-bar.tsx b/desktop/src/renderer/components/databases/search/view-search-bar.tsx
similarity index 70%
rename from desktop/src/components/databases/search/view-search-bar.tsx
rename to desktop/src/renderer/components/databases/search/view-search-bar.tsx
index bb0ed9b7..bf710aaf 100644
--- a/desktop/src/components/databases/search/view-search-bar.tsx
+++ b/desktop/src/renderer/components/databases/search/view-search-bar.tsx
@@ -1,7 +1,7 @@
import React from 'react';
-import { ViewSorts } from '@/components/databases/search/view-sorts';
-import { ViewFilters } from '@/components/databases/search/view-filters';
-import { Separator } from '@/components/ui/separator';
+import { ViewSorts } from '@/renderer/components/databases/search/view-sorts';
+import { ViewFilters } from '@/renderer/components/databases/search/view-filters';
+import { Separator } from '@/renderer/components/ui/separator';
import { useViewSearch } from '@/renderer/contexts/view-search';
export const ViewSearchBar = () => {
diff --git a/desktop/src/components/databases/search/view-search-provider.tsx b/desktop/src/renderer/components/databases/search/view-search-provider.tsx
similarity index 100%
rename from desktop/src/components/databases/search/view-search-provider.tsx
rename to desktop/src/renderer/components/databases/search/view-search-provider.tsx
diff --git a/desktop/src/components/databases/search/view-select-field-filter.tsx b/desktop/src/renderer/components/databases/search/view-select-field-filter.tsx
similarity index 92%
rename from desktop/src/components/databases/search/view-select-field-filter.tsx
rename to desktop/src/renderer/components/databases/search/view-select-field-filter.tsx
index c3431bff..9a518981 100644
--- a/desktop/src/components/databases/search/view-select-field-filter.tsx
+++ b/desktop/src/renderer/components/databases/search/view-select-field-filter.tsx
@@ -4,18 +4,18 @@ import {
Popover,
PopoverContent,
PopoverTrigger,
-} from '@/components/ui/popover';
+} from '@/renderer/components/ui/popover';
import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuTrigger,
-} from '@/components/ui/dropdown-menu';
-import { Button } from '@/components/ui/button';
-import { Icon } from '@/components/ui/icon';
+} from '@/renderer/components/ui/dropdown-menu';
+import { Button } from '@/renderer/components/ui/button';
+import { Icon } from '@/renderer/components/ui/icon';
import { getFieldIcon, selectFieldFilterOperators } from '@/lib/databases';
-import { SelectFieldOptions } from '@/components/databases/fields/select-field-options';
-import { SelectOptionBadge } from '@/components/databases/fields/select-option-badge';
+import { SelectFieldOptions } from '@/renderer/components/databases/fields/select-field-options';
+import { SelectOptionBadge } from '@/renderer/components/databases/fields/select-option-badge';
import { useViewSearch } from '@/renderer/contexts/view-search';
interface ViewSelectFieldFilterProps {
diff --git a/desktop/src/components/databases/search/view-sort-add-popover.tsx b/desktop/src/renderer/components/databases/search/view-sort-add-popover.tsx
similarity index 93%
rename from desktop/src/components/databases/search/view-sort-add-popover.tsx
rename to desktop/src/renderer/components/databases/search/view-sort-add-popover.tsx
index 22de624c..9e54a315 100644
--- a/desktop/src/components/databases/search/view-sort-add-popover.tsx
+++ b/desktop/src/renderer/components/databases/search/view-sort-add-popover.tsx
@@ -1,10 +1,10 @@
import React from 'react';
-import { Icon } from '@/components/ui/icon';
+import { Icon } from '@/renderer/components/ui/icon';
import {
Popover,
PopoverContent,
PopoverTrigger,
-} from '@/components/ui/popover';
+} from '@/renderer/components/ui/popover';
import {
Command,
CommandEmpty,
@@ -12,7 +12,7 @@ import {
CommandInput,
CommandItem,
CommandList,
-} from '@/components/ui/command';
+} from '@/renderer/components/ui/command';
import { useDatabase } from '@/renderer/contexts/database';
import { getFieldIcon, isSortableField } from '@/lib/databases';
import { useViewSearch } from '@/renderer/contexts/view-search';
diff --git a/desktop/src/components/databases/search/view-sort-button.tsx b/desktop/src/renderer/components/databases/search/view-sort-button.tsx
similarity index 81%
rename from desktop/src/components/databases/search/view-sort-button.tsx
rename to desktop/src/renderer/components/databases/search/view-sort-button.tsx
index aec32f20..6234e040 100644
--- a/desktop/src/components/databases/search/view-sort-button.tsx
+++ b/desktop/src/renderer/components/databases/search/view-sort-button.tsx
@@ -1,6 +1,6 @@
import React from 'react';
-import { Icon } from '@/components/ui/icon';
-import { ViewSortAddPopover } from '@/components/databases/search/view-sort-add-popover';
+import { Icon } from '@/renderer/components/ui/icon';
+import { ViewSortAddPopover } from '@/renderer/components/databases/search/view-sort-add-popover';
import { useViewSearch } from '@/renderer/contexts/view-search';
export const ViewSortButton = () => {
diff --git a/desktop/src/components/databases/search/view-sort-row.tsx b/desktop/src/renderer/components/databases/search/view-sort-row.tsx
similarity index 93%
rename from desktop/src/components/databases/search/view-sort-row.tsx
rename to desktop/src/renderer/components/databases/search/view-sort-row.tsx
index 30a6407e..1ffde6a0 100644
--- a/desktop/src/components/databases/search/view-sort-row.tsx
+++ b/desktop/src/renderer/components/databases/search/view-sort-row.tsx
@@ -1,4 +1,4 @@
-import { Icon } from '@/components/ui/icon';
+import { Icon } from '@/renderer/components/ui/icon';
import { getFieldIcon } from '@/lib/databases';
import { FieldNode, ViewSort } from '@/types/databases';
import {
@@ -6,9 +6,9 @@ import {
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuTrigger,
-} from '@/components/ui/dropdown-menu';
+} from '@/renderer/components/ui/dropdown-menu';
import React from 'react';
-import { Button } from '@/components/ui/button';
+import { Button } from '@/renderer/components/ui/button';
import { SortDirections } from '@/lib/constants';
import { useViewSearch } from '@/renderer/contexts/view-search';
diff --git a/desktop/src/components/databases/search/view-sorts.tsx b/desktop/src/renderer/components/databases/search/view-sorts.tsx
similarity index 81%
rename from desktop/src/components/databases/search/view-sorts.tsx
rename to desktop/src/renderer/components/databases/search/view-sorts.tsx
index 2a9d7d95..40c646f1 100644
--- a/desktop/src/components/databases/search/view-sorts.tsx
+++ b/desktop/src/renderer/components/databases/search/view-sorts.tsx
@@ -3,12 +3,12 @@ import {
Popover,
PopoverContent,
PopoverTrigger,
-} from '@/components/ui/popover';
-import { Button } from '@/components/ui/button';
-import { ViewSortRow } from '@/components/databases/search/view-sort-row';
+} from '@/renderer/components/ui/popover';
+import { Button } from '@/renderer/components/ui/button';
+import { ViewSortRow } from '@/renderer/components/databases/search/view-sort-row';
import { useDatabase } from '@/renderer/contexts/database';
-import { ViewSortAddPopover } from '@/components/databases/search/view-sort-add-popover';
-import { Icon } from '@/components/ui/icon';
+import { ViewSortAddPopover } from '@/renderer/components/databases/search/view-sort-add-popover';
+import { Icon } from '@/renderer/components/ui/icon';
import { useViewSearch } from '@/renderer/contexts/view-search';
export const ViewSorts = () => {
diff --git a/desktop/src/components/databases/search/view-text-field-filter.tsx b/desktop/src/renderer/components/databases/search/view-text-field-filter.tsx
similarity index 92%
rename from desktop/src/components/databases/search/view-text-field-filter.tsx
rename to desktop/src/renderer/components/databases/search/view-text-field-filter.tsx
index 90536afb..a8ab34de 100644
--- a/desktop/src/components/databases/search/view-text-field-filter.tsx
+++ b/desktop/src/renderer/components/databases/search/view-text-field-filter.tsx
@@ -4,17 +4,17 @@ import {
Popover,
PopoverContent,
PopoverTrigger,
-} from '@/components/ui/popover';
+} from '@/renderer/components/ui/popover';
import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuTrigger,
-} from '@/components/ui/dropdown-menu';
-import { Button } from '@/components/ui/button';
-import { Icon } from '@/components/ui/icon';
+} from '@/renderer/components/ui/dropdown-menu';
+import { Button } from '@/renderer/components/ui/button';
+import { Icon } from '@/renderer/components/ui/icon';
import { getFieldIcon, textFieldFilterOperators } from '@/lib/databases';
-import { SmartTextInput } from '@/components/ui/smart-text-input';
+import { SmartTextInput } from '@/renderer/components/ui/smart-text-input';
import { useViewSearch } from '@/renderer/contexts/view-search';
interface ViewTextFieldFilterProps {
diff --git a/desktop/src/components/databases/search/view-url-field-filter.tsx b/desktop/src/renderer/components/databases/search/view-url-field-filter.tsx
similarity index 92%
rename from desktop/src/components/databases/search/view-url-field-filter.tsx
rename to desktop/src/renderer/components/databases/search/view-url-field-filter.tsx
index f69f1806..aec30a2b 100644
--- a/desktop/src/components/databases/search/view-url-field-filter.tsx
+++ b/desktop/src/renderer/components/databases/search/view-url-field-filter.tsx
@@ -4,17 +4,17 @@ import {
Popover,
PopoverContent,
PopoverTrigger,
-} from '@/components/ui/popover';
+} from '@/renderer/components/ui/popover';
import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuTrigger,
-} from '@/components/ui/dropdown-menu';
-import { Button } from '@/components/ui/button';
-import { Icon } from '@/components/ui/icon';
+} from '@/renderer/components/ui/dropdown-menu';
+import { Button } from '@/renderer/components/ui/button';
+import { Icon } from '@/renderer/components/ui/icon';
import { urlFieldFilterOperators } from '@/lib/databases';
-import { SmartTextInput } from '@/components/ui/smart-text-input';
+import { SmartTextInput } from '@/renderer/components/ui/smart-text-input';
import { useViewSearch } from '@/renderer/contexts/view-search';
interface ViewUrlFieldFilterProps {
diff --git a/desktop/src/components/databases/tables/cells/table-view-boolean-cell.tsx b/desktop/src/renderer/components/databases/tables/cells/table-view-boolean-cell.tsx
similarity index 96%
rename from desktop/src/components/databases/tables/cells/table-view-boolean-cell.tsx
rename to desktop/src/renderer/components/databases/tables/cells/table-view-boolean-cell.tsx
index f929c084..b1f35e9f 100644
--- a/desktop/src/components/databases/tables/cells/table-view-boolean-cell.tsx
+++ b/desktop/src/renderer/components/databases/tables/cells/table-view-boolean-cell.tsx
@@ -1,5 +1,5 @@
import React from 'react';
-import { Checkbox } from '@/components/ui/checkbox';
+import { Checkbox } from '@/renderer/components/ui/checkbox';
import { BooleanFieldNode, RecordNode } from '@/types/databases';
import { useMutation } from '@/renderer/hooks/use-mutation';
import { useWorkspace } from '@/renderer/contexts/workspace';
diff --git a/desktop/src/components/databases/tables/cells/table-view-created-at-cell.tsx b/desktop/src/renderer/components/databases/tables/cells/table-view-created-at-cell.tsx
similarity index 100%
rename from desktop/src/components/databases/tables/cells/table-view-created-at-cell.tsx
rename to desktop/src/renderer/components/databases/tables/cells/table-view-created-at-cell.tsx
diff --git a/desktop/src/components/databases/tables/cells/table-view-created-by-cell.tsx b/desktop/src/renderer/components/databases/tables/cells/table-view-created-by-cell.tsx
similarity index 91%
rename from desktop/src/components/databases/tables/cells/table-view-created-by-cell.tsx
rename to desktop/src/renderer/components/databases/tables/cells/table-view-created-by-cell.tsx
index a075c5c9..89a0582f 100644
--- a/desktop/src/components/databases/tables/cells/table-view-created-by-cell.tsx
+++ b/desktop/src/renderer/components/databases/tables/cells/table-view-created-by-cell.tsx
@@ -1,5 +1,5 @@
import React from 'react';
-import { Avatar } from '@/components/ui/avatar';
+import { Avatar } from '@/renderer/components/ui/avatar';
import { CreatedByFieldNode, RecordNode } from '@/types/databases';
interface TableViewCreatedByCellProps {
diff --git a/desktop/src/components/databases/tables/cells/table-view-date-cell.tsx b/desktop/src/renderer/components/databases/tables/cells/table-view-date-cell.tsx
similarity index 95%
rename from desktop/src/components/databases/tables/cells/table-view-date-cell.tsx
rename to desktop/src/renderer/components/databases/tables/cells/table-view-date-cell.tsx
index 9640447a..cf1feef8 100644
--- a/desktop/src/components/databases/tables/cells/table-view-date-cell.tsx
+++ b/desktop/src/renderer/components/databases/tables/cells/table-view-date-cell.tsx
@@ -1,7 +1,7 @@
import React from 'react';
import { RecordNode, DateFieldNode } from '@/types/databases';
import { useMutation } from '@/renderer/hooks/use-mutation';
-import { DatePicker } from '@/components/ui/date-picker';
+import { DatePicker } from '@/renderer/components/ui/date-picker';
import { useWorkspace } from '@/renderer/contexts/workspace';
interface TableViewDateCellProps {
diff --git a/desktop/src/components/databases/tables/cells/table-view-email-cell.tsx b/desktop/src/renderer/components/databases/tables/cells/table-view-email-cell.tsx
similarity index 94%
rename from desktop/src/components/databases/tables/cells/table-view-email-cell.tsx
rename to desktop/src/renderer/components/databases/tables/cells/table-view-email-cell.tsx
index 533e3825..91399af7 100644
--- a/desktop/src/components/databases/tables/cells/table-view-email-cell.tsx
+++ b/desktop/src/renderer/components/databases/tables/cells/table-view-email-cell.tsx
@@ -1,6 +1,6 @@
import React from 'react';
import { RecordNode, EmailFieldNode } from '@/types/databases';
-import { SmartTextInput } from '@/components/ui/smart-text-input';
+import { SmartTextInput } from '@/renderer/components/ui/smart-text-input';
import { useMutation } from '@/renderer/hooks/use-mutation';
import { useWorkspace } from '@/renderer/contexts/workspace';
diff --git a/desktop/src/components/databases/tables/cells/table-view-multi-select-cell.tsx b/desktop/src/renderer/components/databases/tables/cells/table-view-multi-select-cell.tsx
similarity index 91%
rename from desktop/src/components/databases/tables/cells/table-view-multi-select-cell.tsx
rename to desktop/src/renderer/components/databases/tables/cells/table-view-multi-select-cell.tsx
index 14bbb139..ce361f65 100644
--- a/desktop/src/components/databases/tables/cells/table-view-multi-select-cell.tsx
+++ b/desktop/src/renderer/components/databases/tables/cells/table-view-multi-select-cell.tsx
@@ -1,12 +1,12 @@
import React from 'react';
import { MultiSelectFieldNode, RecordNode } from '@/types/databases';
-import { SelectOptionBadge } from '@/components/databases/fields/select-option-badge';
+import { SelectOptionBadge } from '@/renderer/components/databases/fields/select-option-badge';
import {
Popover,
PopoverTrigger,
PopoverContent,
-} from '@/components/ui/popover';
-import { SelectFieldOptions } from '@/components/databases/fields/select-field-options';
+} from '@/renderer/components/ui/popover';
+import { SelectFieldOptions } from '@/renderer/components/databases/fields/select-field-options';
import { useMutation } from '@/renderer/hooks/use-mutation';
import { useWorkspace } from '@/renderer/contexts/workspace';
diff --git a/desktop/src/components/databases/tables/cells/table-view-number-cell.tsx b/desktop/src/renderer/components/databases/tables/cells/table-view-number-cell.tsx
similarity index 94%
rename from desktop/src/components/databases/tables/cells/table-view-number-cell.tsx
rename to desktop/src/renderer/components/databases/tables/cells/table-view-number-cell.tsx
index 477117d5..3291d437 100644
--- a/desktop/src/components/databases/tables/cells/table-view-number-cell.tsx
+++ b/desktop/src/renderer/components/databases/tables/cells/table-view-number-cell.tsx
@@ -1,7 +1,7 @@
import React from 'react';
import { RecordNode } from '@/types/databases';
import { NumberFieldNode } from '@/types/databases';
-import { SmartNumberInput } from '@/components/ui/smart-number-input';
+import { SmartNumberInput } from '@/renderer/components/ui/smart-number-input';
import { useMutation } from '@/renderer/hooks/use-mutation';
import { useWorkspace } from '@/renderer/contexts/workspace';
diff --git a/desktop/src/components/databases/tables/cells/table-view-phone-cell.tsx b/desktop/src/renderer/components/databases/tables/cells/table-view-phone-cell.tsx
similarity index 95%
rename from desktop/src/components/databases/tables/cells/table-view-phone-cell.tsx
rename to desktop/src/renderer/components/databases/tables/cells/table-view-phone-cell.tsx
index 54319c91..20e6b453 100644
--- a/desktop/src/components/databases/tables/cells/table-view-phone-cell.tsx
+++ b/desktop/src/renderer/components/databases/tables/cells/table-view-phone-cell.tsx
@@ -1,6 +1,6 @@
import React from 'react';
import { RecordNode, PhoneFieldNode } from '@/types/databases';
-import { SmartTextInput } from '@/components/ui/smart-text-input';
+import { SmartTextInput } from '@/renderer/components/ui/smart-text-input';
import { useMutation } from '@/renderer/hooks/use-mutation';
import { useWorkspace } from '@/renderer/contexts/workspace';
diff --git a/desktop/src/components/databases/tables/cells/table-view-select-cell.tsx b/desktop/src/renderer/components/databases/tables/cells/table-view-select-cell.tsx
similarity index 90%
rename from desktop/src/components/databases/tables/cells/table-view-select-cell.tsx
rename to desktop/src/renderer/components/databases/tables/cells/table-view-select-cell.tsx
index 1c2f5e65..7d22b46d 100644
--- a/desktop/src/components/databases/tables/cells/table-view-select-cell.tsx
+++ b/desktop/src/renderer/components/databases/tables/cells/table-view-select-cell.tsx
@@ -1,12 +1,12 @@
import React from 'react';
import { RecordNode, SelectFieldNode } from '@/types/databases';
-import { SelectOptionBadge } from '@/components/databases/fields/select-option-badge';
+import { SelectOptionBadge } from '@/renderer/components/databases/fields/select-option-badge';
import {
Popover,
PopoverTrigger,
PopoverContent,
-} from '@/components/ui/popover';
-import { SelectFieldOptions } from '@/components/databases/fields/select-field-options';
+} from '@/renderer/components/ui/popover';
+import { SelectFieldOptions } from '@/renderer/components/databases/fields/select-field-options';
import { useMutation } from '@/renderer/hooks/use-mutation';
import { useWorkspace } from '@/renderer/contexts/workspace';
diff --git a/desktop/src/components/databases/tables/cells/table-view-text-cell.tsx b/desktop/src/renderer/components/databases/tables/cells/table-view-text-cell.tsx
similarity index 95%
rename from desktop/src/components/databases/tables/cells/table-view-text-cell.tsx
rename to desktop/src/renderer/components/databases/tables/cells/table-view-text-cell.tsx
index 4a446128..02e6a8d7 100644
--- a/desktop/src/components/databases/tables/cells/table-view-text-cell.tsx
+++ b/desktop/src/renderer/components/databases/tables/cells/table-view-text-cell.tsx
@@ -1,6 +1,6 @@
import React from 'react';
import { RecordNode, TextFieldNode } from '@/types/databases';
-import { SmartTextInput } from '@/components/ui/smart-text-input';
+import { SmartTextInput } from '@/renderer/components/ui/smart-text-input';
import { useMutation } from '@/renderer/hooks/use-mutation';
import { useWorkspace } from '@/renderer/contexts/workspace';
diff --git a/desktop/src/components/databases/tables/cells/table-view-url-cell.tsx b/desktop/src/renderer/components/databases/tables/cells/table-view-url-cell.tsx
similarity index 93%
rename from desktop/src/components/databases/tables/cells/table-view-url-cell.tsx
rename to desktop/src/renderer/components/databases/tables/cells/table-view-url-cell.tsx
index 17467845..6c7aeeeb 100644
--- a/desktop/src/components/databases/tables/cells/table-view-url-cell.tsx
+++ b/desktop/src/renderer/components/databases/tables/cells/table-view-url-cell.tsx
@@ -5,9 +5,9 @@ import {
HoverCard,
HoverCardContent,
HoverCardTrigger,
-} from '@/components/ui/hover-card';
-import { Icon } from '@/components/ui/icon';
-import { SmartTextInput } from '@/components/ui/smart-text-input';
+} from '@/renderer/components/ui/hover-card';
+import { Icon } from '@/renderer/components/ui/icon';
+import { SmartTextInput } from '@/renderer/components/ui/smart-text-input';
import { useMutation } from '@/renderer/hooks/use-mutation';
import { useWorkspace } from '@/renderer/contexts/workspace';
diff --git a/desktop/src/components/databases/tables/table-view-body.tsx b/desktop/src/renderer/components/databases/tables/table-view-body.tsx
similarity index 86%
rename from desktop/src/components/databases/tables/table-view-body.tsx
rename to desktop/src/renderer/components/databases/tables/table-view-body.tsx
index 81fe6751..c5e7a9b5 100644
--- a/desktop/src/components/databases/tables/table-view-body.tsx
+++ b/desktop/src/renderer/components/databases/tables/table-view-body.tsx
@@ -1,8 +1,8 @@
import React from 'react';
import { useDatabase } from '@/renderer/contexts/database';
-import { TableViewRow } from '@/components/databases/tables/table-view-row';
-import { TableViewEmptyPlaceholder } from '@/components/databases/tables/table-view-empty-placeholder';
-import { TableViewLoadMoreRow } from '@/components/databases/tables/table-view-load-more-row';
+import { TableViewRow } from '@/renderer/components/databases/tables/table-view-row';
+import { TableViewEmptyPlaceholder } from '@/renderer/components/databases/tables/table-view-empty-placeholder';
+import { TableViewLoadMoreRow } from '@/renderer/components/databases/tables/table-view-load-more-row';
import { useInfiniteQuery } from '@/renderer/hooks/use-infinite-query';
import { useViewSearch } from '@/renderer/contexts/view-search';
import { useWorkspace } from '@/renderer/contexts/workspace';
diff --git a/desktop/src/components/databases/tables/table-view-empty-placeholder.tsx b/desktop/src/renderer/components/databases/tables/table-view-empty-placeholder.tsx
similarity index 100%
rename from desktop/src/components/databases/tables/table-view-empty-placeholder.tsx
rename to desktop/src/renderer/components/databases/tables/table-view-empty-placeholder.tsx
diff --git a/desktop/src/components/databases/tables/table-view-field-cell.tsx b/desktop/src/renderer/components/databases/tables/table-view-field-cell.tsx
similarity index 53%
rename from desktop/src/components/databases/tables/table-view-field-cell.tsx
rename to desktop/src/renderer/components/databases/tables/table-view-field-cell.tsx
index 4cd6b646..3dcd8dec 100644
--- a/desktop/src/components/databases/tables/table-view-field-cell.tsx
+++ b/desktop/src/renderer/components/databases/tables/table-view-field-cell.tsx
@@ -1,16 +1,16 @@
import React from 'react';
import { FieldNode, RecordNode } from '@/types/databases';
-import { TableViewTextCell } from '@/components/databases/tables/cells/table-view-text-cell';
-import { TableViewNumberCell } from '@/components/databases/tables/cells/table-view-number-cell';
-import { TableViewBooleanCell } from '@/components/databases/tables/cells/table-view-boolean-cell';
-import { TableViewCreatedAtCell } from '@/components/databases/tables/cells/table-view-created-at-cell';
-import { TableViewCreatedByCell } from '@/components/databases/tables/cells/table-view-created-by-cell';
-import { TableViewSelectCell } from '@/components/databases/tables/cells/table-view-select-cell';
-import { TableViewPhoneCell } from '@/components/databases/tables/cells/table-view-phone-cell';
-import { TableViewEmailCell } from '@/components/databases/tables/cells/table-view-email-cell';
-import { TableViewUrlCell } from '@/components/databases/tables/cells/table-view-url-cell';
-import { TableViewMultiSelectCell } from '@/components/databases/tables/cells/table-view-multi-select-cell';
-import { TableViewDateCell } from '@/components/databases/tables/cells/table-view-date-cell';
+import { TableViewTextCell } from '@/renderer/components/databases/tables/cells/table-view-text-cell';
+import { TableViewNumberCell } from '@/renderer/components/databases/tables/cells/table-view-number-cell';
+import { TableViewBooleanCell } from '@/renderer/components/databases/tables/cells/table-view-boolean-cell';
+import { TableViewCreatedAtCell } from '@/renderer/components/databases/tables/cells/table-view-created-at-cell';
+import { TableViewCreatedByCell } from '@/renderer/components/databases/tables/cells/table-view-created-by-cell';
+import { TableViewSelectCell } from '@/renderer/components/databases/tables/cells/table-view-select-cell';
+import { TableViewPhoneCell } from '@/renderer/components/databases/tables/cells/table-view-phone-cell';
+import { TableViewEmailCell } from '@/renderer/components/databases/tables/cells/table-view-email-cell';
+import { TableViewUrlCell } from '@/renderer/components/databases/tables/cells/table-view-url-cell';
+import { TableViewMultiSelectCell } from '@/renderer/components/databases/tables/cells/table-view-multi-select-cell';
+import { TableViewDateCell } from '@/renderer/components/databases/tables/cells/table-view-date-cell';
interface TableViewFieldCellProps {
record: RecordNode;
diff --git a/desktop/src/components/databases/tables/table-view-field-header.tsx b/desktop/src/renderer/components/databases/tables/table-view-field-header.tsx
similarity index 94%
rename from desktop/src/components/databases/tables/table-view-field-header.tsx
rename to desktop/src/renderer/components/databases/tables/table-view-field-header.tsx
index d149fb74..4e2308ac 100644
--- a/desktop/src/components/databases/tables/table-view-field-header.tsx
+++ b/desktop/src/renderer/components/databases/tables/table-view-field-header.tsx
@@ -1,5 +1,5 @@
import React from 'react';
-import { Icon } from '@/components/ui/icon';
+import { Icon } from '@/renderer/components/ui/icon';
import { cn } from '@/lib/utils';
import { getFieldIcon } from '@/lib/databases';
import { useDrag, useDrop } from 'react-dnd';
@@ -9,10 +9,10 @@ import {
Popover,
PopoverContent,
PopoverTrigger,
-} from '@/components/ui/popover';
-import { Separator } from '@/components/ui/separator';
-import { FieldDeleteDialog } from '@/components/databases/fields/field-delete-dialog';
-import { FieldRenameInput } from '@/components/databases/fields/field-rename-input';
+} from '@/renderer/components/ui/popover';
+import { Separator } from '@/renderer/components/ui/separator';
+import { FieldDeleteDialog } from '@/renderer/components/databases/fields/field-delete-dialog';
+import { FieldRenameInput } from '@/renderer/components/databases/fields/field-rename-input';
import { useTableView } from '@/renderer/contexts/table-view';
interface TableViewFieldHeaderProps {
diff --git a/desktop/src/components/databases/tables/table-view-header.tsx b/desktop/src/renderer/components/databases/tables/table-view-header.tsx
similarity index 61%
rename from desktop/src/components/databases/tables/table-view-header.tsx
rename to desktop/src/renderer/components/databases/tables/table-view-header.tsx
index 8bcecc18..ca7deccb 100644
--- a/desktop/src/components/databases/tables/table-view-header.tsx
+++ b/desktop/src/renderer/components/databases/tables/table-view-header.tsx
@@ -1,8 +1,8 @@
import React from 'react';
import { useTableView } from '@/renderer/contexts/table-view';
-import { TableViewNameHeader } from '@/components/databases/tables/table-view-name-header';
-import { TableViewFieldHeader } from '@/components/databases/tables/table-view-field-header';
-import { FieldCreatePopover } from '@/components/databases/fields/field-create-popover';
+import { TableViewNameHeader } from '@/renderer/components/databases/tables/table-view-name-header';
+import { TableViewFieldHeader } from '@/renderer/components/databases/tables/table-view-field-header';
+import { FieldCreatePopover } from '@/renderer/components/databases/fields/field-create-popover';
export const TableViewHeader = () => {
const tableView = useTableView();
diff --git a/desktop/src/components/databases/tables/table-view-load-more-row.tsx b/desktop/src/renderer/components/databases/tables/table-view-load-more-row.tsx
similarity index 84%
rename from desktop/src/components/databases/tables/table-view-load-more-row.tsx
rename to desktop/src/renderer/components/databases/tables/table-view-load-more-row.tsx
index 2fa9142a..ee27540a 100644
--- a/desktop/src/components/databases/tables/table-view-load-more-row.tsx
+++ b/desktop/src/renderer/components/databases/tables/table-view-load-more-row.tsx
@@ -1,6 +1,6 @@
import React from 'react';
-import { Icon } from '@/components/ui/icon';
-import { Spinner } from '@/components/ui/spinner';
+import { Icon } from '@/renderer/components/ui/icon';
+import { Spinner } from '@/renderer/components/ui/spinner';
interface TableViewLoadMoreRowProps {
isPending: boolean;
diff --git a/desktop/src/components/databases/tables/table-view-name-cell.tsx b/desktop/src/renderer/components/databases/tables/table-view-name-cell.tsx
similarity index 96%
rename from desktop/src/components/databases/tables/table-view-name-cell.tsx
rename to desktop/src/renderer/components/databases/tables/table-view-name-cell.tsx
index 0361019b..1b59fcd3 100644
--- a/desktop/src/components/databases/tables/table-view-name-cell.tsx
+++ b/desktop/src/renderer/components/databases/tables/table-view-name-cell.tsx
@@ -1,8 +1,8 @@
import React from 'react';
import isHotkey from 'is-hotkey';
-import { Icon } from '@/components/ui/icon';
+import { Icon } from '@/renderer/components/ui/icon';
import { useWorkspace } from '@/renderer/contexts/workspace';
-import { Spinner } from '@/components/ui/spinner';
+import { Spinner } from '@/renderer/components/ui/spinner';
import { RecordNode } from '@/types/databases';
import { useMutation } from '@/renderer/hooks/use-mutation';
diff --git a/desktop/src/components/databases/tables/table-view-name-header.tsx b/desktop/src/renderer/components/databases/tables/table-view-name-header.tsx
similarity index 94%
rename from desktop/src/components/databases/tables/table-view-name-header.tsx
rename to desktop/src/renderer/components/databases/tables/table-view-name-header.tsx
index 45bbe013..b235a2ca 100644
--- a/desktop/src/components/databases/tables/table-view-name-header.tsx
+++ b/desktop/src/renderer/components/databases/tables/table-view-name-header.tsx
@@ -1,13 +1,13 @@
import React from 'react';
-import { Icon } from '@/components/ui/icon';
+import { Icon } from '@/renderer/components/ui/icon';
import { Resizable } from 're-resizable';
import {
Popover,
PopoverContent,
PopoverTrigger,
-} from '@/components/ui/popover';
-import { Separator } from '@/components/ui/separator';
-import { Input } from '@/components/ui/input';
+} from '@/renderer/components/ui/popover';
+import { Separator } from '@/renderer/components/ui/separator';
+import { Input } from '@/renderer/components/ui/input';
import { useTableView } from '@/renderer/contexts/table-view';
import { useDrop } from 'react-dnd';
import { cn } from '@/lib/utils';
diff --git a/desktop/src/components/databases/tables/table-view-record-create-row.tsx b/desktop/src/renderer/components/databases/tables/table-view-record-create-row.tsx
similarity index 94%
rename from desktop/src/components/databases/tables/table-view-record-create-row.tsx
rename to desktop/src/renderer/components/databases/tables/table-view-record-create-row.tsx
index 3f9dde29..e408c2c9 100644
--- a/desktop/src/components/databases/tables/table-view-record-create-row.tsx
+++ b/desktop/src/renderer/components/databases/tables/table-view-record-create-row.tsx
@@ -1,5 +1,5 @@
import React from 'react';
-import { Icon } from '@/components/ui/icon';
+import { Icon } from '@/renderer/components/ui/icon';
import { useDatabase } from '@/renderer/contexts/database';
import { useMutation } from '@/renderer/hooks/use-mutation';
import { useWorkspace } from '@/renderer/contexts/workspace';
diff --git a/desktop/src/components/databases/tables/table-view-row.tsx b/desktop/src/renderer/components/databases/tables/table-view-row.tsx
similarity index 86%
rename from desktop/src/components/databases/tables/table-view-row.tsx
rename to desktop/src/renderer/components/databases/tables/table-view-row.tsx
index 3da5955e..fac47995 100644
--- a/desktop/src/components/databases/tables/table-view-row.tsx
+++ b/desktop/src/renderer/components/databases/tables/table-view-row.tsx
@@ -1,6 +1,6 @@
import React from 'react';
-import { TableViewNameCell } from '@/components/databases/tables/table-view-name-cell';
-import { TableViewFieldCell } from '@/components/databases/tables/table-view-field-cell';
+import { TableViewNameCell } from '@/renderer/components/databases/tables/table-view-name-cell';
+import { TableViewFieldCell } from '@/renderer/components/databases/tables/table-view-field-cell';
import { RecordNode } from '@/types/databases';
import { useTableView } from '@/renderer/contexts/table-view';
diff --git a/desktop/src/components/databases/tables/table-view-settings-popover.tsx b/desktop/src/renderer/components/databases/tables/table-view-settings-popover.tsx
similarity index 92%
rename from desktop/src/components/databases/tables/table-view-settings-popover.tsx
rename to desktop/src/renderer/components/databases/tables/table-view-settings-popover.tsx
index 6bb03be9..f4c13875 100644
--- a/desktop/src/components/databases/tables/table-view-settings-popover.tsx
+++ b/desktop/src/renderer/components/databases/tables/table-view-settings-popover.tsx
@@ -3,10 +3,10 @@ import {
Popover,
PopoverContent,
PopoverTrigger,
-} from '@/components/ui/popover';
-import { Icon } from '@/components/ui/icon';
+} from '@/renderer/components/ui/popover';
+import { Icon } from '@/renderer/components/ui/icon';
import { useTableView } from '@/renderer/contexts/table-view';
-import { Separator } from '@/components/ui/separator';
+import { Separator } from '@/renderer/components/ui/separator';
import { useDatabase } from '@/renderer/contexts/database';
import { cn } from '@/lib/utils';
import { getFieldIcon } from '@/lib/databases';
@@ -14,11 +14,11 @@ import {
Tooltip,
TooltipContent,
TooltipTrigger,
-} from '@/components/ui/tooltip';
-import { FieldDeleteDialog } from '@/components/databases/fields/field-delete-dialog';
+} from '@/renderer/components/ui/tooltip';
+import { FieldDeleteDialog } from '@/renderer/components/databases/fields/field-delete-dialog';
import { useMutation } from '@/renderer/hooks/use-mutation';
-import { ViewDeleteDialog } from '@/components/databases/view-delete-dialog';
-import { SmartTextInput } from '@/components/ui/smart-text-input';
+import { ViewDeleteDialog } from '@/renderer/components/databases/view-delete-dialog';
+import { SmartTextInput } from '@/renderer/components/ui/smart-text-input';
import { useWorkspace } from '@/renderer/contexts/workspace';
export const TableViewSettingsPopover = () => {
diff --git a/desktop/src/components/databases/tables/table-view.tsx b/desktop/src/renderer/components/databases/tables/table-view.tsx
similarity index 89%
rename from desktop/src/components/databases/tables/table-view.tsx
rename to desktop/src/renderer/components/databases/tables/table-view.tsx
index e99f035b..e02e9d24 100644
--- a/desktop/src/components/databases/tables/table-view.tsx
+++ b/desktop/src/renderer/components/databases/tables/table-view.tsx
@@ -1,20 +1,20 @@
import React from 'react';
-import { TableViewHeader } from '@/components/databases/tables/table-view-header';
-import { TableViewBody } from '@/components/databases/tables/table-view-body';
-import { TableViewRecordCreateRow } from '@/components/databases/tables/table-view-record-create-row';
+import { TableViewHeader } from '@/renderer/components/databases/tables/table-view-header';
+import { TableViewBody } from '@/renderer/components/databases/tables/table-view-body';
+import { TableViewRecordCreateRow } from '@/renderer/components/databases/tables/table-view-record-create-row';
import { TableViewContext } from '@/renderer/contexts/table-view';
import { useDatabase } from '@/renderer/contexts/database';
import { compareString } from '@/lib/utils';
import { FieldDataType, TableViewNode } from '@/types/databases';
-import { ViewTabs } from '@/components/databases/view-tabs';
-import { TableViewSettingsPopover } from '@/components/databases/tables/table-view-settings-popover';
+import { ViewTabs } from '@/renderer/components/databases/view-tabs';
+import { TableViewSettingsPopover } from '@/renderer/components/databases/tables/table-view-settings-popover';
import { getDefaultFieldWidth, getDefaultNameWidth } from '@/lib/databases';
import { generateNodeIndex } from '@/lib/nodes';
import { useMutation } from '@/renderer/hooks/use-mutation';
-import { ViewSearchBar } from '@/components/databases/search/view-search-bar';
-import { ViewFilterButton } from '@/components/databases/search/view-filter-button';
-import { ViewSortButton } from '@/components/databases/search/view-sort-button';
-import { ViewSearchProvider } from '@/components/databases/search/view-search-provider';
+import { ViewSearchBar } from '@/renderer/components/databases/search/view-search-bar';
+import { ViewFilterButton } from '@/renderer/components/databases/search/view-filter-button';
+import { ViewSortButton } from '@/renderer/components/databases/search/view-sort-button';
+import { ViewSearchProvider } from '@/renderer/components/databases/search/view-search-provider';
import { useWorkspace } from '@/renderer/contexts/workspace';
interface TableViewProps {
diff --git a/desktop/src/components/databases/view-create-button.tsx b/desktop/src/renderer/components/databases/view-create-button.tsx
similarity index 74%
rename from desktop/src/components/databases/view-create-button.tsx
rename to desktop/src/renderer/components/databases/view-create-button.tsx
index 546f75c9..4d3a8e40 100644
--- a/desktop/src/components/databases/view-create-button.tsx
+++ b/desktop/src/renderer/components/databases/view-create-button.tsx
@@ -1,6 +1,6 @@
import React from 'react';
-import { ViewCreateDialog } from '@/components/databases/view-create-dialog';
-import { Icon } from '@/components/ui/icon';
+import { ViewCreateDialog } from '@/renderer/components/databases/view-create-dialog';
+import { Icon } from '@/renderer/components/ui/icon';
export const ViewCreateButton = () => {
const [open, setOpen] = React.useState(false);
diff --git a/desktop/src/components/databases/view-create-dialog.tsx b/desktop/src/renderer/components/databases/view-create-dialog.tsx
similarity index 94%
rename from desktop/src/components/databases/view-create-dialog.tsx
rename to desktop/src/renderer/components/databases/view-create-dialog.tsx
index 9cd64592..7d3551ac 100644
--- a/desktop/src/components/databases/view-create-dialog.tsx
+++ b/desktop/src/renderer/components/databases/view-create-dialog.tsx
@@ -6,7 +6,7 @@ import {
DialogFooter,
DialogHeader,
DialogTitle,
-} from '@/components/ui/dialog';
+} from '@/renderer/components/ui/dialog';
import { z } from 'zod';
import {
Form,
@@ -15,17 +15,17 @@ import {
FormItem,
FormLabel,
FormMessage,
-} from '@/components/ui/form';
-import { Input } from '@/components/ui/input';
-import { Button } from '@/components/ui/button';
-import { Spinner } from '@/components/ui/spinner';
+} from '@/renderer/components/ui/form';
+import { Input } from '@/renderer/components/ui/input';
+import { Button } from '@/renderer/components/ui/button';
+import { Spinner } from '@/renderer/components/ui/spinner';
import { useForm } from 'react-hook-form';
import { zodResolver } from '@hookform/resolvers/zod';
import { cn } from '@/lib/utils';
-import { Icon } from '@/components/ui/icon';
+import { Icon } from '@/renderer/components/ui/icon';
import { useDatabase } from '@/renderer/contexts/database';
-import { FieldSelect } from '@/components/databases/fields/field-select';
-import { toast } from '@/components/ui/use-toast';
+import { FieldSelect } from '@/renderer/components/databases/fields/field-select';
+import { toast } from '@/renderer/components/ui/use-toast';
import { useMutation } from '@/renderer/hooks/use-mutation';
import { useWorkspace } from '@/renderer/contexts/workspace';
diff --git a/desktop/src/components/databases/view-delete-dialog.tsx b/desktop/src/renderer/components/databases/view-delete-dialog.tsx
similarity index 94%
rename from desktop/src/components/databases/view-delete-dialog.tsx
rename to desktop/src/renderer/components/databases/view-delete-dialog.tsx
index 93222567..442a408e 100644
--- a/desktop/src/components/databases/view-delete-dialog.tsx
+++ b/desktop/src/renderer/components/databases/view-delete-dialog.tsx
@@ -7,8 +7,8 @@ import {
AlertDialogFooter,
AlertDialogHeader,
AlertDialogTitle,
-} from '@/components/ui/alert-dialog';
-import { Button } from '@/components/ui/button';
+} from '@/renderer/components/ui/alert-dialog';
+import { Button } from '@/renderer/components/ui/button';
import { useMutation } from '@/renderer/hooks/use-mutation';
import { useWorkspace } from '@/renderer/contexts/workspace';
diff --git a/desktop/src/components/databases/view-settings-button.tsx b/desktop/src/renderer/components/databases/view-settings-button.tsx
similarity index 80%
rename from desktop/src/components/databases/view-settings-button.tsx
rename to desktop/src/renderer/components/databases/view-settings-button.tsx
index 6631dc5c..e1871067 100644
--- a/desktop/src/components/databases/view-settings-button.tsx
+++ b/desktop/src/renderer/components/databases/view-settings-button.tsx
@@ -1,5 +1,5 @@
import React from 'react';
-import { Icon } from '@/components/ui/icon';
+import { Icon } from '@/renderer/components/ui/icon';
export const ViewSettingsButton = () => {
return (
diff --git a/desktop/src/components/databases/view-tab.tsx b/desktop/src/renderer/components/databases/view-tab.tsx
similarity index 92%
rename from desktop/src/components/databases/view-tab.tsx
rename to desktop/src/renderer/components/databases/view-tab.tsx
index 9eb069d9..73077a1b 100644
--- a/desktop/src/components/databases/view-tab.tsx
+++ b/desktop/src/renderer/components/databases/view-tab.tsx
@@ -1,6 +1,6 @@
import React from 'react';
import { cn } from '@/lib/utils';
-import { Avatar } from '@/components/ui/avatar';
+import { Avatar } from '@/renderer/components/ui/avatar';
import { ViewNode } from '@/types/databases';
interface ViewTabProps {
diff --git a/desktop/src/components/databases/view-tabs.tsx b/desktop/src/renderer/components/databases/view-tabs.tsx
similarity index 77%
rename from desktop/src/components/databases/view-tabs.tsx
rename to desktop/src/renderer/components/databases/view-tabs.tsx
index 53e7257b..9088f43f 100644
--- a/desktop/src/components/databases/view-tabs.tsx
+++ b/desktop/src/renderer/components/databases/view-tabs.tsx
@@ -1,6 +1,6 @@
import React from 'react';
-import { ViewTab } from '@/components/databases/view-tab';
-import { ViewCreateButton } from '@/components/databases/view-create-button';
+import { ViewTab } from '@/renderer/components/databases/view-tab';
+import { ViewCreateButton } from '@/renderer/components/databases/view-create-button';
import { useDatabaseViews } from '@/renderer/contexts/database-views';
export const ViewTabs = () => {
diff --git a/desktop/src/components/databases/view.tsx b/desktop/src/renderer/components/databases/view.tsx
similarity index 63%
rename from desktop/src/components/databases/view.tsx
rename to desktop/src/renderer/components/databases/view.tsx
index b70bc453..df8d08c5 100644
--- a/desktop/src/components/databases/view.tsx
+++ b/desktop/src/renderer/components/databases/view.tsx
@@ -1,8 +1,8 @@
import React from 'react';
import { ViewNode } from '@/types/databases';
-import { TableView } from '@/components/databases/tables/table-view';
-import { BoardView } from '@/components/databases/boards/board-view';
-import { CalendarView } from '@/components/databases/calendars/calendar-view';
+import { TableView } from '@/renderer/components/databases/tables/table-view';
+import { BoardView } from '@/renderer/components/databases/boards/board-view';
+import { CalendarView } from '@/renderer/components/databases/calendars/calendar-view';
interface ViewProps {
node: ViewNode;
diff --git a/desktop/src/components/documents/document-editor.tsx b/desktop/src/renderer/components/documents/document-editor.tsx
similarity index 94%
rename from desktop/src/components/documents/document-editor.tsx
rename to desktop/src/renderer/components/documents/document-editor.tsx
index ce9e1144..3d32ba1b 100644
--- a/desktop/src/components/documents/document-editor.tsx
+++ b/desktop/src/renderer/components/documents/document-editor.tsx
@@ -13,7 +13,7 @@ import {
DividerCommand,
TodoCommand,
PageCommand,
-} from '@/editor/commands';
+} from '@/renderer/editor/commands';
import {
IdExtension,
DocumentNode,
@@ -46,12 +46,12 @@ import {
LinkMark,
DeleteControlExtension,
DropcursorExtension,
-} from '@/editor/extensions';
+} from '@/renderer/editor/extensions';
-import { EditorBubbleMenu } from '@/editor/menu/bubble-menu';
+import { EditorBubbleMenu } from '@/renderer/editor/menu/bubble-menu';
import { LocalNode } from '@/types/nodes';
import { useWorkspace } from '@/renderer/contexts/workspace';
-import { EditorObserver } from '@/editor/observer';
+import { EditorObserver } from '@/renderer/editor/observer';
interface DocumentEditorProps {
node: LocalNode;
diff --git a/desktop/src/components/documents/document.tsx b/desktop/src/renderer/components/documents/document.tsx
similarity index 87%
rename from desktop/src/components/documents/document.tsx
rename to desktop/src/renderer/components/documents/document.tsx
index aeb3da74..7e380466 100644
--- a/desktop/src/components/documents/document.tsx
+++ b/desktop/src/renderer/components/documents/document.tsx
@@ -1,6 +1,6 @@
import React from 'react';
import { LocalNode } from '@/types/nodes';
-import { DocumentEditor } from '@/components/documents/document-editor';
+import { DocumentEditor } from '@/renderer/components/documents/document-editor';
import { useQuery } from '@/renderer/hooks/use-query';
import { useWorkspace } from '@/renderer/contexts/workspace';
diff --git a/desktop/src/components/emojis/emoji-element.tsx b/desktop/src/renderer/components/emojis/emoji-element.tsx
similarity index 100%
rename from desktop/src/components/emojis/emoji-element.tsx
rename to desktop/src/renderer/components/emojis/emoji-element.tsx
diff --git a/desktop/src/components/emojis/emoji-picker-browser-row.tsx b/desktop/src/renderer/components/emojis/emoji-picker-browser-row.tsx
similarity index 90%
rename from desktop/src/components/emojis/emoji-picker-browser-row.tsx
rename to desktop/src/renderer/components/emojis/emoji-picker-browser-row.tsx
index eaede87a..f1e4f234 100644
--- a/desktop/src/components/emojis/emoji-picker-browser-row.tsx
+++ b/desktop/src/renderer/components/emojis/emoji-picker-browser-row.tsx
@@ -1,6 +1,6 @@
import React from 'react';
import { EmojiPickerRowData } from '@/lib/emojis';
-import { EmojiPickerItem } from '@/components/emojis/emoji-picker-item';
+import { EmojiPickerItem } from '@/renderer/components/emojis/emoji-picker-item';
interface EmojiPickerBrowserRowProps {
index: number;
diff --git a/desktop/src/components/emojis/emoji-picker-browser.tsx b/desktop/src/renderer/components/emojis/emoji-picker-browser.tsx
similarity index 93%
rename from desktop/src/components/emojis/emoji-picker-browser.tsx
rename to desktop/src/renderer/components/emojis/emoji-picker-browser.tsx
index ba9bb26e..7b284b0b 100644
--- a/desktop/src/components/emojis/emoji-picker-browser.tsx
+++ b/desktop/src/renderer/components/emojis/emoji-picker-browser.tsx
@@ -2,7 +2,7 @@ import { EmojiPickerRowData, categories, emojis } from '@/lib/emojis';
import React from 'react';
import AutoSizer from 'react-virtualized-auto-sizer';
import { FixedSizeList } from 'react-window';
-import { EmojiPickerBrowserRow } from '@/components/emojis/emoji-picker-browser-row';
+import { EmojiPickerBrowserRow } from '@/renderer/components/emojis/emoji-picker-browser-row';
const emojisPerRow = 10;
diff --git a/desktop/src/components/emojis/emoji-picker-item.tsx b/desktop/src/renderer/components/emojis/emoji-picker-item.tsx
similarity index 91%
rename from desktop/src/components/emojis/emoji-picker-item.tsx
rename to desktop/src/renderer/components/emojis/emoji-picker-item.tsx
index c3e98b0a..ef2c2d8b 100644
--- a/desktop/src/components/emojis/emoji-picker-item.tsx
+++ b/desktop/src/renderer/components/emojis/emoji-picker-item.tsx
@@ -1,6 +1,6 @@
import React from 'react';
import { Emoji } from '@/lib/emojis';
-import { EmojiElement } from '@/components/emojis/emoji-element';
+import { EmojiElement } from '@/renderer/components/emojis/emoji-element';
import { useEmojiPicker } from '@/renderer/contexts/emoji-picker';
interface EmojiPickerItemProps {
diff --git a/desktop/src/components/emojis/emoji-picker-search.tsx b/desktop/src/renderer/components/emojis/emoji-picker-search.tsx
similarity index 89%
rename from desktop/src/components/emojis/emoji-picker-search.tsx
rename to desktop/src/renderer/components/emojis/emoji-picker-search.tsx
index 9e37df18..a9fd7a13 100644
--- a/desktop/src/components/emojis/emoji-picker-search.tsx
+++ b/desktop/src/renderer/components/emojis/emoji-picker-search.tsx
@@ -1,6 +1,6 @@
import React from 'react';
import { searchEmojis } from '@/lib/emojis';
-import { EmojiPickerItem } from '@/components/emojis/emoji-picker-item';
+import { EmojiPickerItem } from '@/renderer/components/emojis/emoji-picker-item';
interface EmojiPickerSearchProps {
query: string;
diff --git a/desktop/src/components/emojis/emoji-picker.tsx b/desktop/src/renderer/components/emojis/emoji-picker.tsx
similarity index 82%
rename from desktop/src/components/emojis/emoji-picker.tsx
rename to desktop/src/renderer/components/emojis/emoji-picker.tsx
index 508cd4e1..f72ea179 100644
--- a/desktop/src/components/emojis/emoji-picker.tsx
+++ b/desktop/src/renderer/components/emojis/emoji-picker.tsx
@@ -1,9 +1,9 @@
import React from 'react';
-import { EmojiSkinToneSelector } from '@/components/emojis/emoji-skin-tone-selector';
+import { EmojiSkinToneSelector } from '@/renderer/components/emojis/emoji-skin-tone-selector';
import { Emoji } from '@/lib/emojis';
import { EmojiPickerContext } from '@/renderer/contexts/emoji-picker';
-import { EmojiPickerBrowser } from '@/components/emojis/emoji-picker-browser';
-import { EmojiPickerSearch } from '@/components/emojis/emoji-picker-search';
+import { EmojiPickerBrowser } from '@/renderer/components/emojis/emoji-picker-browser';
+import { EmojiPickerSearch } from '@/renderer/components/emojis/emoji-picker-search';
interface EmojiPickerProps {
onEmojiClick: (emoji: Emoji) => void;
diff --git a/desktop/src/components/emojis/emoji-skin-tone-selector.tsx b/desktop/src/renderer/components/emojis/emoji-skin-tone-selector.tsx
similarity index 93%
rename from desktop/src/components/emojis/emoji-skin-tone-selector.tsx
rename to desktop/src/renderer/components/emojis/emoji-skin-tone-selector.tsx
index a64e363c..616c18cc 100644
--- a/desktop/src/components/emojis/emoji-skin-tone-selector.tsx
+++ b/desktop/src/renderer/components/emojis/emoji-skin-tone-selector.tsx
@@ -1,11 +1,11 @@
import React from 'react';
import { getEmojiUrl } from '@/lib/emojis';
-import { EmojiElement } from '@/components/emojis/emoji-element';
+import { EmojiElement } from '@/renderer/components/emojis/emoji-element';
import {
Popover,
PopoverContent,
PopoverTrigger,
-} from '@/components/ui/popover';
+} from '@/renderer/components/ui/popover';
const skins: string[] = [
'01h37jbxq11hpcnw1mdfgmm70vem',
diff --git a/desktop/src/components/messages/conversation.tsx b/desktop/src/renderer/components/messages/conversation.tsx
similarity index 92%
rename from desktop/src/components/messages/conversation.tsx
rename to desktop/src/renderer/components/messages/conversation.tsx
index 39077d5c..8a220b9b 100644
--- a/desktop/src/components/messages/conversation.tsx
+++ b/desktop/src/renderer/components/messages/conversation.tsx
@@ -1,7 +1,7 @@
import React from 'react';
-import { MessageList } from '@/components/messages/message-list';
-import { MessageCreate } from '@/components/messages/message-create';
-import { ScrollArea } from '@/components/ui/scroll-area';
+import { MessageList } from '@/renderer/components/messages/message-list';
+import { MessageCreate } from '@/renderer/components/messages/message-create';
+import { ScrollArea } from '@/renderer/components/ui/scroll-area';
import { InView } from 'react-intersection-observer';
interface ConversationProps {
diff --git a/desktop/src/components/messages/message-create.tsx b/desktop/src/renderer/components/messages/message-create.tsx
similarity index 92%
rename from desktop/src/components/messages/message-create.tsx
rename to desktop/src/renderer/components/messages/message-create.tsx
index e94357f9..3b3b9e53 100644
--- a/desktop/src/components/messages/message-create.tsx
+++ b/desktop/src/renderer/components/messages/message-create.tsx
@@ -1,5 +1,5 @@
import React from 'react';
-import { MessageEditor } from '@/components/messages/message-editor';
+import { MessageEditor } from '@/renderer/components/messages/message-editor';
import { useMutation } from '@/renderer/hooks/use-mutation';
import { useWorkspace } from '@/renderer/contexts/workspace';
diff --git a/desktop/src/components/messages/message-delete-button.tsx b/desktop/src/renderer/components/messages/message-delete-button.tsx
similarity index 92%
rename from desktop/src/components/messages/message-delete-button.tsx
rename to desktop/src/renderer/components/messages/message-delete-button.tsx
index 9c6313f1..9a63d169 100644
--- a/desktop/src/components/messages/message-delete-button.tsx
+++ b/desktop/src/renderer/components/messages/message-delete-button.tsx
@@ -7,9 +7,9 @@ import {
AlertDialogFooter,
AlertDialogHeader,
AlertDialogTitle,
-} from '@/components/ui/alert-dialog';
-import { Button } from '@/components/ui/button';
-import { Icon } from '@/components/ui/icon';
+} from '@/renderer/components/ui/alert-dialog';
+import { Button } from '@/renderer/components/ui/button';
+import { Icon } from '@/renderer/components/ui/icon';
import { useMutation } from '@/renderer/hooks/use-mutation';
import { useWorkspace } from '@/renderer/contexts/workspace';
diff --git a/desktop/src/components/messages/message-editor.tsx b/desktop/src/renderer/components/messages/message-editor.tsx
similarity index 92%
rename from desktop/src/components/messages/message-editor.tsx
rename to desktop/src/renderer/components/messages/message-editor.tsx
index c81d6bc7..e16691d9 100644
--- a/desktop/src/components/messages/message-editor.tsx
+++ b/desktop/src/renderer/components/messages/message-editor.tsx
@@ -2,15 +2,15 @@ import React from 'react';
import type { JSONContent } from '@tiptap/core';
import { EditorContent, useEditor } from '@tiptap/react';
import isHotkey from 'is-hotkey';
-import { MessageGifPicker } from '@/components/messages/message-gif-picker';
+import { MessageGifPicker } from '@/renderer/components/messages/message-gif-picker';
import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuTrigger,
-} from '@/components/ui/dropdown-menu';
-import { Icon } from '@/components/ui/icon';
-import { Spinner } from '@/components/ui/spinner';
+} from '@/renderer/components/ui/dropdown-menu';
+import { Icon } from '@/renderer/components/ui/icon';
+import { Spinner } from '@/renderer/components/ui/spinner';
import {
MessageNode,
TextNode,
@@ -30,8 +30,8 @@ import {
LinkMark,
IdExtension,
DropcursorExtension,
-} from '@/editor/extensions';
-import { EditorBubbleMenu } from '@/editor/menu/bubble-menu';
+} from '@/renderer/editor/extensions';
+import { EditorBubbleMenu } from '@/renderer/editor/menu/bubble-menu';
interface MessageEditorProps {
conversationId: string;
diff --git a/desktop/src/components/messages/message-gif-picker.tsx b/desktop/src/renderer/components/messages/message-gif-picker.tsx
similarity index 77%
rename from desktop/src/components/messages/message-gif-picker.tsx
rename to desktop/src/renderer/components/messages/message-gif-picker.tsx
index 99a73c6e..a1ac5b36 100644
--- a/desktop/src/components/messages/message-gif-picker.tsx
+++ b/desktop/src/renderer/components/messages/message-gif-picker.tsx
@@ -1,11 +1,11 @@
import React from 'react';
-import { Icon } from '@/components/ui/icon';
+import { Icon } from '@/renderer/components/ui/icon';
import {
Popover,
PopoverContent,
PopoverTrigger,
-} from '@/components/ui/popover';
+} from '@/renderer/components/ui/popover';
export const MessageGifPicker = () => {
const [open, setOpen] = React.useState(false);
@@ -18,7 +18,7 @@ export const MessageGifPicker = () => {
</span>
</PopoverTrigger>
<PopoverContent
- className="h-128 w-128 mr-6 overflow-hidden p-2"
+ className="mr-6 h-128 w-128 overflow-hidden p-2"
side="bottom"
>
<p>coming soon.</p>
diff --git a/desktop/src/components/messages/message-list.tsx b/desktop/src/renderer/components/messages/message-list.tsx
similarity index 97%
rename from desktop/src/components/messages/message-list.tsx
rename to desktop/src/renderer/components/messages/message-list.tsx
index 18bb9ec0..b7017839 100644
--- a/desktop/src/components/messages/message-list.tsx
+++ b/desktop/src/renderer/components/messages/message-list.tsx
@@ -1,6 +1,6 @@
import React from 'react';
import { InView } from 'react-intersection-observer';
-import { Message } from '@/components/messages/message';
+import { Message } from '@/renderer/components/messages/message';
import { useInfiniteQuery } from '@/renderer/hooks/use-infinite-query';
import { useWorkspace } from '@/renderer/contexts/workspace';
import { compareString } from '@/lib/utils';
diff --git a/desktop/src/components/messages/message-reaction-create-popover.tsx b/desktop/src/renderer/components/messages/message-reaction-create-popover.tsx
similarity index 81%
rename from desktop/src/components/messages/message-reaction-create-popover.tsx
rename to desktop/src/renderer/components/messages/message-reaction-create-popover.tsx
index 22250444..ff5e400d 100644
--- a/desktop/src/components/messages/message-reaction-create-popover.tsx
+++ b/desktop/src/renderer/components/messages/message-reaction-create-popover.tsx
@@ -1,11 +1,11 @@
import React from 'react';
-import { Icon } from '@/components/ui/icon';
+import { Icon } from '@/renderer/components/ui/icon';
import {
Popover,
PopoverContent,
PopoverTrigger,
-} from '@/components/ui/popover';
-import { EmojiPicker } from '@/components/emojis/emoji-picker';
+} from '@/renderer/components/ui/popover';
+import { EmojiPicker } from '@/renderer/components/emojis/emoji-picker';
interface MessageReactionProps {
onReactionClick: (reaction: string) => void;
diff --git a/desktop/src/components/messages/message-reactions.tsx b/desktop/src/renderer/components/messages/message-reactions.tsx
similarity index 93%
rename from desktop/src/components/messages/message-reactions.tsx
rename to desktop/src/renderer/components/messages/message-reactions.tsx
index 611a1d66..da5516f5 100644
--- a/desktop/src/components/messages/message-reactions.tsx
+++ b/desktop/src/renderer/components/messages/message-reactions.tsx
@@ -1,6 +1,6 @@
import React from 'react';
import { MessageNode } from '@/types/messages';
-import { EmojiElement } from '@/components/emojis/emoji-element';
+import { EmojiElement } from '@/renderer/components/emojis/emoji-element';
import { cn } from '@/lib/utils';
interface MessageReactionsProps {
diff --git a/desktop/src/components/messages/message-reference.tsx b/desktop/src/renderer/components/messages/message-reference.tsx
similarity index 100%
rename from desktop/src/components/messages/message-reference.tsx
rename to desktop/src/renderer/components/messages/message-reference.tsx
diff --git a/desktop/src/components/messages/message.tsx b/desktop/src/renderer/components/messages/message.tsx
similarity index 91%
rename from desktop/src/components/messages/message.tsx
rename to desktop/src/renderer/components/messages/message.tsx
index fe4bd0fc..737ec2d3 100644
--- a/desktop/src/components/messages/message.tsx
+++ b/desktop/src/renderer/components/messages/message.tsx
@@ -1,18 +1,18 @@
import React from 'react';
-import { Avatar } from '@/components/ui/avatar';
+import { Avatar } from '@/renderer/components/ui/avatar';
import {
Tooltip,
TooltipContent,
TooltipTrigger,
-} from '@/components/ui/tooltip';
+} from '@/renderer/components/ui/tooltip';
import { formatDate, timeAgo } from '@/lib/utils';
import { InView } from 'react-intersection-observer';
-import { MessageReactionCreatePopover } from '@/components/messages/message-reaction-create-popover';
-import { Icon } from '@/components/ui/icon';
-import { MessageDeleteButton } from '@/components/messages/message-delete-button';
-import { NodeRenderer } from '@/editor/renderers/node';
+import { MessageReactionCreatePopover } from '@/renderer/components/messages/message-reaction-create-popover';
+import { Icon } from '@/renderer/components/ui/icon';
+import { MessageDeleteButton } from '@/renderer/components/messages/message-delete-button';
+import { NodeRenderer } from '@/renderer/editor/renderers/node';
import { MessageNode } from '@/types/messages';
-import { MessageReactions } from '@/components/messages/message-reactions';
+import { MessageReactions } from '@/renderer/components/messages/message-reactions';
import { useMutation } from '@/renderer/hooks/use-mutation';
import { useWorkspace } from '@/renderer/contexts/workspace';
diff --git a/desktop/src/components/pages/page-container-node.tsx b/desktop/src/renderer/components/pages/page-container-node.tsx
similarity index 72%
rename from desktop/src/components/pages/page-container-node.tsx
rename to desktop/src/renderer/components/pages/page-container-node.tsx
index ca074744..e15324b2 100644
--- a/desktop/src/components/pages/page-container-node.tsx
+++ b/desktop/src/renderer/components/pages/page-container-node.tsx
@@ -1,7 +1,7 @@
import React from 'react';
-import { ScrollArea } from '@/components/ui/scroll-area';
+import { ScrollArea } from '@/renderer/components/ui/scroll-area';
import { LocalNode } from '@/types/nodes';
-import { Document } from '@/components/documents/document';
+import { Document } from '@/renderer/components/documents/document';
interface PageContainerNodeProps {
node: LocalNode;
diff --git a/desktop/src/components/pages/page-create-dialog.tsx b/desktop/src/renderer/components/pages/page-create-dialog.tsx
similarity index 91%
rename from desktop/src/components/pages/page-create-dialog.tsx
rename to desktop/src/renderer/components/pages/page-create-dialog.tsx
index 152cca18..9fd00f2a 100644
--- a/desktop/src/components/pages/page-create-dialog.tsx
+++ b/desktop/src/renderer/components/pages/page-create-dialog.tsx
@@ -7,7 +7,7 @@ import {
DialogFooter,
DialogHeader,
DialogTitle,
-} from '@/components/ui/dialog';
+} from '@/renderer/components/ui/dialog';
import { z } from 'zod';
import {
Form,
@@ -16,10 +16,10 @@ import {
FormItem,
FormLabel,
FormMessage,
-} from '@/components/ui/form';
-import { Input } from '@/components/ui/input';
-import { Button } from '@/components/ui/button';
-import { Spinner } from '@/components/ui/spinner';
+} from '@/renderer/components/ui/form';
+import { Input } from '@/renderer/components/ui/input';
+import { Button } from '@/renderer/components/ui/button';
+import { Spinner } from '@/renderer/components/ui/spinner';
import { useForm } from 'react-hook-form';
import { zodResolver } from '@hookform/resolvers/zod';
import { useMutation } from '@/renderer/hooks/use-mutation';
diff --git a/desktop/src/components/records/record-attributes.tsx b/desktop/src/renderer/components/records/record-attributes.tsx
similarity index 80%
rename from desktop/src/components/records/record-attributes.tsx
rename to desktop/src/renderer/components/records/record-attributes.tsx
index b3790019..284b7a8f 100644
--- a/desktop/src/components/records/record-attributes.tsx
+++ b/desktop/src/renderer/components/records/record-attributes.tsx
@@ -1,9 +1,9 @@
import React from 'react';
import { RecordNode } from '@/types/databases';
-import { RecordName } from '@/components/records/record-name';
+import { RecordName } from '@/renderer/components/records/record-name';
import { useDatabase } from '@/renderer/contexts/database';
-import { RecordField } from '@/components/records/record-field';
-import { RecordFieldValue } from '@/components/records/record-field-value';
+import { RecordField } from '@/renderer/components/records/record-field';
+import { RecordFieldValue } from '@/renderer/components/records/record-field-value';
interface RecordAttributesProps {
record: RecordNode;
diff --git a/desktop/src/components/records/record-container-node.tsx b/desktop/src/renderer/components/records/record-container-node.tsx
similarity index 75%
rename from desktop/src/components/records/record-container-node.tsx
rename to desktop/src/renderer/components/records/record-container-node.tsx
index 9272df91..f5d3c10b 100644
--- a/desktop/src/components/records/record-container-node.tsx
+++ b/desktop/src/renderer/components/records/record-container-node.tsx
@@ -1,11 +1,11 @@
import React from 'react';
import { useQuery } from '@/renderer/hooks/use-query';
import { LocalNode } from '@/types/nodes';
-import { Database } from '@/components/databases/database';
-import { RecordAttributes } from '@/components/records/record-attributes';
-import { ScrollArea } from '@/components/ui/scroll-area';
-import { Document } from '@/components/documents/document';
-import { Separator } from '@/components/ui/separator';
+import { Database } from '@/renderer/components/databases/database';
+import { RecordAttributes } from '@/renderer/components/records/record-attributes';
+import { ScrollArea } from '@/renderer/components/ui/scroll-area';
+import { Document } from '@/renderer/components/documents/document';
+import { Separator } from '@/renderer/components/ui/separator';
import { useWorkspace } from '@/renderer/contexts/workspace';
interface RecordContainerNodeProps {
diff --git a/desktop/src/components/records/record-field-value.tsx b/desktop/src/renderer/components/records/record-field-value.tsx
similarity index 54%
rename from desktop/src/components/records/record-field-value.tsx
rename to desktop/src/renderer/components/records/record-field-value.tsx
index 20a57866..566fa5a5 100644
--- a/desktop/src/components/records/record-field-value.tsx
+++ b/desktop/src/renderer/components/records/record-field-value.tsx
@@ -1,15 +1,15 @@
import React from 'react';
import { FieldNode, RecordNode } from '@/types/databases';
-import { RecordTextValue } from '@/components/records/values/record-text-value';
-import { RecordNumberValue } from '@/components/records/values/record-number-value';
-import { RecordBooleanValue } from '@/components/records/values/record-boolean-value';
-import { RecordCreatedAtValue } from '@/components/records/values/record-created-at-value';
-import { RecordCreatedByValue } from '@/components/records/values/record-created-by-value';
-import { RecordSelectValue } from '@/components/records/values/record-select-value';
-import { RecordPhoneValue } from '@/components/records/values/record-phone-value';
-import { RecordEmailValue } from '@/components/records/values/record-email-value';
-import { RecordUrlValue } from '@/components/records/values/record-url-value';
-import { RecordMultiSelectValue } from '@/components/records/values/record-multi-select-value';
+import { RecordTextValue } from '@/renderer/components/records/values/record-text-value';
+import { RecordNumberValue } from '@/renderer/components/records/values/record-number-value';
+import { RecordBooleanValue } from '@/renderer/components/records/values/record-boolean-value';
+import { RecordCreatedAtValue } from '@/renderer/components/records/values/record-created-at-value';
+import { RecordCreatedByValue } from '@/renderer/components/records/values/record-created-by-value';
+import { RecordSelectValue } from '@/renderer/components/records/values/record-select-value';
+import { RecordPhoneValue } from '@/renderer/components/records/values/record-phone-value';
+import { RecordEmailValue } from '@/renderer/components/records/values/record-email-value';
+import { RecordUrlValue } from '@/renderer/components/records/values/record-url-value';
+import { RecordMultiSelectValue } from '@/renderer/components/records/values/record-multi-select-value';
interface RecordFieldValueProps {
record: RecordNode;
diff --git a/desktop/src/components/records/record-field.tsx b/desktop/src/renderer/components/records/record-field.tsx
similarity index 81%
rename from desktop/src/components/records/record-field.tsx
rename to desktop/src/renderer/components/records/record-field.tsx
index 515844c3..fa189d99 100644
--- a/desktop/src/components/records/record-field.tsx
+++ b/desktop/src/renderer/components/records/record-field.tsx
@@ -4,12 +4,12 @@ import {
Popover,
PopoverContent,
PopoverTrigger,
-} from '@/components/ui/popover';
-import { Icon } from '@/components/ui/icon';
+} from '@/renderer/components/ui/popover';
+import { Icon } from '@/renderer/components/ui/icon';
import { getFieldIcon } from '@/lib/databases';
-import { FieldRenameInput } from '@/components/databases/fields/field-rename-input';
-import { Separator } from '@/components/ui/separator';
-import { FieldDeleteDialog } from '@/components/databases/fields/field-delete-dialog';
+import { FieldRenameInput } from '@/renderer/components/databases/fields/field-rename-input';
+import { Separator } from '@/renderer/components/ui/separator';
+import { FieldDeleteDialog } from '@/renderer/components/databases/fields/field-delete-dialog';
interface RecordFieldProps {
field: FieldNode;
diff --git a/desktop/src/components/records/record-name.tsx b/desktop/src/renderer/components/records/record-name.tsx
similarity index 92%
rename from desktop/src/components/records/record-name.tsx
rename to desktop/src/renderer/components/records/record-name.tsx
index fb8a4178..b36dedd2 100644
--- a/desktop/src/components/records/record-name.tsx
+++ b/desktop/src/renderer/components/records/record-name.tsx
@@ -1,7 +1,7 @@
import React from 'react';
import { RecordNode } from '@/types/databases';
import { useMutation } from '@/renderer/hooks/use-mutation';
-import { SmartTextInput } from '@/components/ui/smart-text-input';
+import { SmartTextInput } from '@/renderer/components/ui/smart-text-input';
import { useWorkspace } from '@/renderer/contexts/workspace';
interface RecordNameProps {
diff --git a/desktop/src/components/records/values/record-boolean-value.tsx b/desktop/src/renderer/components/records/values/record-boolean-value.tsx
similarity index 96%
rename from desktop/src/components/records/values/record-boolean-value.tsx
rename to desktop/src/renderer/components/records/values/record-boolean-value.tsx
index 94a5ec02..8bf9f141 100644
--- a/desktop/src/components/records/values/record-boolean-value.tsx
+++ b/desktop/src/renderer/components/records/values/record-boolean-value.tsx
@@ -1,5 +1,5 @@
import React from 'react';
-import { Checkbox } from '@/components/ui/checkbox';
+import { Checkbox } from '@/renderer/components/ui/checkbox';
import { BooleanFieldNode, RecordNode } from '@/types/databases';
import { useMutation } from '@/renderer/hooks/use-mutation';
import { useWorkspace } from '@/renderer/contexts/workspace';
diff --git a/desktop/src/components/records/values/record-created-at-value.tsx b/desktop/src/renderer/components/records/values/record-created-at-value.tsx
similarity index 100%
rename from desktop/src/components/records/values/record-created-at-value.tsx
rename to desktop/src/renderer/components/records/values/record-created-at-value.tsx
diff --git a/desktop/src/components/records/values/record-created-by-value.tsx b/desktop/src/renderer/components/records/values/record-created-by-value.tsx
similarity index 91%
rename from desktop/src/components/records/values/record-created-by-value.tsx
rename to desktop/src/renderer/components/records/values/record-created-by-value.tsx
index c5c3d9a2..11d7dc07 100644
--- a/desktop/src/components/records/values/record-created-by-value.tsx
+++ b/desktop/src/renderer/components/records/values/record-created-by-value.tsx
@@ -1,5 +1,5 @@
import React from 'react';
-import { Avatar } from '@/components/ui/avatar';
+import { Avatar } from '@/renderer/components/ui/avatar';
import { CreatedByFieldNode, RecordNode } from '@/types/databases';
interface RecordCreatedByValueProps {
diff --git a/desktop/src/components/records/values/record-email-value.tsx b/desktop/src/renderer/components/records/values/record-email-value.tsx
similarity index 94%
rename from desktop/src/components/records/values/record-email-value.tsx
rename to desktop/src/renderer/components/records/values/record-email-value.tsx
index 3e2a0ed9..ecadef62 100644
--- a/desktop/src/components/records/values/record-email-value.tsx
+++ b/desktop/src/renderer/components/records/values/record-email-value.tsx
@@ -1,6 +1,6 @@
import React from 'react';
import { RecordNode, EmailFieldNode } from '@/types/databases';
-import { SmartTextInput } from '@/components/ui/smart-text-input';
+import { SmartTextInput } from '@/renderer/components/ui/smart-text-input';
import { useMutation } from '@/renderer/hooks/use-mutation';
import { useWorkspace } from '@/renderer/contexts/workspace';
diff --git a/desktop/src/components/records/values/record-multi-select-value.tsx b/desktop/src/renderer/components/records/values/record-multi-select-value.tsx
similarity index 91%
rename from desktop/src/components/records/values/record-multi-select-value.tsx
rename to desktop/src/renderer/components/records/values/record-multi-select-value.tsx
index 12c7bde8..5ba9069c 100644
--- a/desktop/src/components/records/values/record-multi-select-value.tsx
+++ b/desktop/src/renderer/components/records/values/record-multi-select-value.tsx
@@ -1,12 +1,12 @@
import React from 'react';
import { MultiSelectFieldNode, RecordNode } from '@/types/databases';
-import { SelectOptionBadge } from '@/components/databases/fields/select-option-badge';
+import { SelectOptionBadge } from '@/renderer/components/databases/fields/select-option-badge';
import {
Popover,
PopoverTrigger,
PopoverContent,
-} from '@/components/ui/popover';
-import { SelectFieldOptions } from '@/components/databases/fields/select-field-options';
+} from '@/renderer/components/ui/popover';
+import { SelectFieldOptions } from '@/renderer/components/databases/fields/select-field-options';
import { useMutation } from '@/renderer/hooks/use-mutation';
import { useWorkspace } from '@/renderer/contexts/workspace';
diff --git a/desktop/src/components/records/values/record-number-value.tsx b/desktop/src/renderer/components/records/values/record-number-value.tsx
similarity index 94%
rename from desktop/src/components/records/values/record-number-value.tsx
rename to desktop/src/renderer/components/records/values/record-number-value.tsx
index c44cc36c..ae0eaae7 100644
--- a/desktop/src/components/records/values/record-number-value.tsx
+++ b/desktop/src/renderer/components/records/values/record-number-value.tsx
@@ -1,7 +1,7 @@
import React from 'react';
import { RecordNode } from '@/types/databases';
import { NumberFieldNode } from '@/types/databases';
-import { SmartNumberInput } from '@/components/ui/smart-number-input';
+import { SmartNumberInput } from '@/renderer/components/ui/smart-number-input';
import { useMutation } from '@/renderer/hooks/use-mutation';
import { useWorkspace } from '@/renderer/contexts/workspace';
diff --git a/desktop/src/components/records/values/record-phone-value.tsx b/desktop/src/renderer/components/records/values/record-phone-value.tsx
similarity index 95%
rename from desktop/src/components/records/values/record-phone-value.tsx
rename to desktop/src/renderer/components/records/values/record-phone-value.tsx
index 1aa21600..58ca788c 100644
--- a/desktop/src/components/records/values/record-phone-value.tsx
+++ b/desktop/src/renderer/components/records/values/record-phone-value.tsx
@@ -1,6 +1,6 @@
import React from 'react';
import { RecordNode, PhoneFieldNode } from '@/types/databases';
-import { SmartTextInput } from '@/components/ui/smart-text-input';
+import { SmartTextInput } from '@/renderer/components/ui/smart-text-input';
import { useMutation } from '@/renderer/hooks/use-mutation';
import { useWorkspace } from '@/renderer/contexts/workspace';
diff --git a/desktop/src/components/records/values/record-select-value.tsx b/desktop/src/renderer/components/records/values/record-select-value.tsx
similarity index 90%
rename from desktop/src/components/records/values/record-select-value.tsx
rename to desktop/src/renderer/components/records/values/record-select-value.tsx
index 261d9fea..404c4f13 100644
--- a/desktop/src/components/records/values/record-select-value.tsx
+++ b/desktop/src/renderer/components/records/values/record-select-value.tsx
@@ -1,12 +1,12 @@
import React from 'react';
import { RecordNode, SelectFieldNode } from '@/types/databases';
-import { SelectOptionBadge } from '@/components/databases/fields/select-option-badge';
+import { SelectOptionBadge } from '@/renderer/components/databases/fields/select-option-badge';
import {
Popover,
PopoverTrigger,
PopoverContent,
-} from '@/components/ui/popover';
-import { SelectFieldOptions } from '@/components/databases/fields/select-field-options';
+} from '@/renderer/components/ui/popover';
+import { SelectFieldOptions } from '@/renderer/components/databases/fields/select-field-options';
import { useMutation } from '@/renderer/hooks/use-mutation';
import { useWorkspace } from '@/renderer/contexts/workspace';
diff --git a/desktop/src/components/records/values/record-text-value.tsx b/desktop/src/renderer/components/records/values/record-text-value.tsx
similarity index 95%
rename from desktop/src/components/records/values/record-text-value.tsx
rename to desktop/src/renderer/components/records/values/record-text-value.tsx
index 925475a5..7f54cf35 100644
--- a/desktop/src/components/records/values/record-text-value.tsx
+++ b/desktop/src/renderer/components/records/values/record-text-value.tsx
@@ -1,6 +1,6 @@
import React from 'react';
import { RecordNode, TextFieldNode } from '@/types/databases';
-import { SmartTextInput } from '@/components/ui/smart-text-input';
+import { SmartTextInput } from '@/renderer/components/ui/smart-text-input';
import { useMutation } from '@/renderer/hooks/use-mutation';
import { useWorkspace } from '@/renderer/contexts/workspace';
diff --git a/desktop/src/components/records/values/record-url-value.tsx b/desktop/src/renderer/components/records/values/record-url-value.tsx
similarity index 93%
rename from desktop/src/components/records/values/record-url-value.tsx
rename to desktop/src/renderer/components/records/values/record-url-value.tsx
index 4dc0d74c..56b098f9 100644
--- a/desktop/src/components/records/values/record-url-value.tsx
+++ b/desktop/src/renderer/components/records/values/record-url-value.tsx
@@ -5,9 +5,9 @@ import {
HoverCard,
HoverCardContent,
HoverCardTrigger,
-} from '@/components/ui/hover-card';
-import { Icon } from '@/components/ui/icon';
-import { SmartTextInput } from '@/components/ui/smart-text-input';
+} from '@/renderer/components/ui/hover-card';
+import { Icon } from '@/renderer/components/ui/icon';
+import { SmartTextInput } from '@/renderer/components/ui/smart-text-input';
import { useMutation } from '@/renderer/hooks/use-mutation';
import { useWorkspace } from '@/renderer/contexts/workspace';
diff --git a/desktop/src/components/root.tsx b/desktop/src/renderer/components/root.tsx
similarity index 85%
rename from desktop/src/components/root.tsx
rename to desktop/src/renderer/components/root.tsx
index a080338e..3f324452 100644
--- a/desktop/src/components/root.tsx
+++ b/desktop/src/renderer/components/root.tsx
@@ -1,13 +1,13 @@
import React from 'react';
import { createRoot } from 'react-dom/client';
-import { App } from '@/components/app';
-import { TooltipProvider } from '@/components/ui/tooltip';
-import { Toaster } from '@/components/ui/toaster';
-import { WorkspaceCreate } from '@/components/workspaces/workspace-create';
-import { Workspace } from '@/components/workspaces/workspace';
-import { WorkspaceRedirect } from '@/components/workspaces/workspace-redirect';
+import { App } from '@/renderer/components/app';
+import { TooltipProvider } from '@/renderer/components/ui/tooltip';
+import { Toaster } from '@/renderer/components/ui/toaster';
+import { WorkspaceCreate } from '@/renderer/components/workspaces/workspace-create';
+import { Workspace } from '@/renderer/components/workspaces/workspace';
+import { WorkspaceRedirect } from '@/renderer/components/workspaces/workspace-redirect';
import { createBrowserRouter, RouterProvider } from 'react-router-dom';
-import { Container } from '@/components/workspaces/containers/container';
+import { Container } from '@/renderer/components/workspaces/containers/container';
import { QueryClient, QueryClientProvider } from '@tanstack/react-query';
import { DndProvider } from 'react-dnd';
import { HTML5Backend } from 'react-dnd-html5-backend';
diff --git a/desktop/src/components/servers/server-create-dialog.tsx b/desktop/src/renderer/components/servers/server-create-dialog.tsx
similarity index 85%
rename from desktop/src/components/servers/server-create-dialog.tsx
rename to desktop/src/renderer/components/servers/server-create-dialog.tsx
index b4bd4e79..b913278f 100644
--- a/desktop/src/components/servers/server-create-dialog.tsx
+++ b/desktop/src/renderer/components/servers/server-create-dialog.tsx
@@ -6,12 +6,12 @@ import {
DialogFooter,
DialogHeader,
DialogTitle,
-} from '@/components/ui/dialog';
-import { Button } from '@/components/ui/button';
-import { Label } from '@/components/ui/label';
-import { Input } from '@/components/ui/input';
-import { Spinner } from '@/components/ui/spinner';
-import { toast } from '@/components/ui/use-toast';
+} from '@/renderer/components/ui/dialog';
+import { Button } from '@/renderer/components/ui/button';
+import { Label } from '@/renderer/components/ui/label';
+import { Input } from '@/renderer/components/ui/input';
+import { Spinner } from '@/renderer/components/ui/spinner';
+import { toast } from '@/renderer/components/ui/use-toast';
import { useMutation } from '@/renderer/hooks/use-mutation';
interface ServerCreateDialogProps {
diff --git a/desktop/src/components/servers/server-dropdown.tsx b/desktop/src/renderer/components/servers/server-dropdown.tsx
similarity index 90%
rename from desktop/src/components/servers/server-dropdown.tsx
rename to desktop/src/renderer/components/servers/server-dropdown.tsx
index f83c7fbb..9bcd7a63 100644
--- a/desktop/src/components/servers/server-dropdown.tsx
+++ b/desktop/src/renderer/components/servers/server-dropdown.tsx
@@ -4,11 +4,11 @@ import {
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuTrigger,
-} from '@/components/ui/dropdown-menu';
-import { Icon } from '@/components/ui/icon';
-import { Avatar } from '@/components/ui/avatar';
+} from '@/renderer/components/ui/dropdown-menu';
+import { Icon } from '@/renderer/components/ui/icon';
+import { Avatar } from '@/renderer/components/ui/avatar';
import { Server } from '@/types/servers';
-import { ServerCreateDialog } from '@/components/servers/server-create-dialog';
+import { ServerCreateDialog } from '@/renderer/components/servers/server-create-dialog';
import { DropdownMenuSeparator } from '@radix-ui/react-dropdown-menu';
interface ServerDropdownProps {
diff --git a/desktop/src/components/spaces/space-create-button.tsx b/desktop/src/renderer/components/spaces/space-create-button.tsx
similarity index 72%
rename from desktop/src/components/spaces/space-create-button.tsx
rename to desktop/src/renderer/components/spaces/space-create-button.tsx
index 0ba098d7..f3c3f23e 100644
--- a/desktop/src/components/spaces/space-create-button.tsx
+++ b/desktop/src/renderer/components/spaces/space-create-button.tsx
@@ -1,6 +1,6 @@
import React from 'react';
-import { SpaceCreateDialog } from '@/components/spaces/space-create-dialog';
-import { Icon } from '@/components/ui/icon';
+import { SpaceCreateDialog } from '@/renderer/components/spaces/space-create-dialog';
+import { Icon } from '@/renderer/components/ui/icon';
export const SpaceCreateButton = () => {
const [open, setOpen] = React.useState(false);
diff --git a/desktop/src/components/spaces/space-create-dialog.tsx b/desktop/src/renderer/components/spaces/space-create-dialog.tsx
similarity index 91%
rename from desktop/src/components/spaces/space-create-dialog.tsx
rename to desktop/src/renderer/components/spaces/space-create-dialog.tsx
index 13b40f8d..62d40311 100644
--- a/desktop/src/components/spaces/space-create-dialog.tsx
+++ b/desktop/src/renderer/components/spaces/space-create-dialog.tsx
@@ -6,7 +6,7 @@ import {
DialogFooter,
DialogHeader,
DialogTitle,
-} from '@/components/ui/dialog';
+} from '@/renderer/components/ui/dialog';
import { z } from 'zod';
import {
Form,
@@ -15,11 +15,11 @@ import {
FormItem,
FormLabel,
FormMessage,
-} from '@/components/ui/form';
-import { Input } from '@/components/ui/input';
-import { Textarea } from '@/components/ui/textarea';
-import { Button } from '@/components/ui/button';
-import { Spinner } from '@/components/ui/spinner';
+} from '@/renderer/components/ui/form';
+import { Input } from '@/renderer/components/ui/input';
+import { Textarea } from '@/renderer/components/ui/textarea';
+import { Button } from '@/renderer/components/ui/button';
+import { Spinner } from '@/renderer/components/ui/spinner';
import { useForm } from 'react-hook-form';
import { zodResolver } from '@hookform/resolvers/zod';
import { useMutation } from '@/renderer/hooks/use-mutation';
diff --git a/desktop/src/components/ui/alert-dialog.tsx b/desktop/src/renderer/components/ui/alert-dialog.tsx
similarity index 73%
rename from desktop/src/components/ui/alert-dialog.tsx
rename to desktop/src/renderer/components/ui/alert-dialog.tsx
index fa2b4429..5614011f 100644
--- a/desktop/src/components/ui/alert-dialog.tsx
+++ b/desktop/src/renderer/components/ui/alert-dialog.tsx
@@ -1,14 +1,14 @@
-import * as React from "react"
-import * as AlertDialogPrimitive from "@radix-ui/react-alert-dialog"
+import * as React from 'react';
+import * as AlertDialogPrimitive from '@radix-ui/react-alert-dialog';
-import { cn } from "@/lib/utils"
-import { buttonVariants } from "@/components/ui/button"
+import { cn } from '@/lib/utils';
+import { buttonVariants } from '@/renderer/components/ui/button';
-const AlertDialog = AlertDialogPrimitive.Root
+const AlertDialog = AlertDialogPrimitive.Root;
-const AlertDialogTrigger = AlertDialogPrimitive.Trigger
+const AlertDialogTrigger = AlertDialogPrimitive.Trigger;
-const AlertDialogPortal = AlertDialogPrimitive.Portal
+const AlertDialogPortal = AlertDialogPrimitive.Portal;
const AlertDialogOverlay = React.forwardRef<
React.ElementRef<typeof AlertDialogPrimitive.Overlay>,
@@ -16,14 +16,14 @@ const AlertDialogOverlay = React.forwardRef<
>(({ className, ...props }, ref) => (
<AlertDialogPrimitive.Overlay
className={cn(
- "fixed inset-0 z-50 bg-black/80 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0",
- className
+ 'fixed inset-0 z-50 bg-black/80 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0',
+ className,
)}
{...props}
ref={ref}
/>
-))
-AlertDialogOverlay.displayName = AlertDialogPrimitive.Overlay.displayName
+));
+AlertDialogOverlay.displayName = AlertDialogPrimitive.Overlay.displayName;
const AlertDialogContent = React.forwardRef<
React.ElementRef<typeof AlertDialogPrimitive.Content>,
@@ -34,14 +34,14 @@ const AlertDialogContent = React.forwardRef<
<AlertDialogPrimitive.Content
ref={ref}
className={cn(
- "fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border bg-background p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg",
- className
+ 'fixed left-[50%] top-[50%] z-50 grid w-full max-w-lg translate-x-[-50%] translate-y-[-50%] gap-4 border bg-background p-6 shadow-lg duration-200 data-[state=open]:animate-in data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=open]:fade-in-0 data-[state=closed]:zoom-out-95 data-[state=open]:zoom-in-95 data-[state=closed]:slide-out-to-left-1/2 data-[state=closed]:slide-out-to-top-[48%] data-[state=open]:slide-in-from-left-1/2 data-[state=open]:slide-in-from-top-[48%] sm:rounded-lg',
+ className,
)}
{...props}
/>
</AlertDialogPortal>
-))
-AlertDialogContent.displayName = AlertDialogPrimitive.Content.displayName
+));
+AlertDialogContent.displayName = AlertDialogPrimitive.Content.displayName;
const AlertDialogHeader = ({
className,
@@ -49,13 +49,13 @@ const AlertDialogHeader = ({
}: React.HTMLAttributes<HTMLDivElement>) => (
<div
className={cn(
- "flex flex-col space-y-2 text-center sm:text-left",
- className
+ 'flex flex-col space-y-2 text-center sm:text-left',
+ className,
)}
{...props}
/>
-)
-AlertDialogHeader.displayName = "AlertDialogHeader"
+);
+AlertDialogHeader.displayName = 'AlertDialogHeader';
const AlertDialogFooter = ({
className,
@@ -63,13 +63,13 @@ const AlertDialogFooter = ({
}: React.HTMLAttributes<HTMLDivElement>) => (
<div
className={cn(
- "flex flex-col-reverse sm:flex-row sm:justify-end sm:space-x-2",
- className
+ 'flex flex-col-reverse sm:flex-row sm:justify-end sm:space-x-2',
+ className,
)}
{...props}
/>
-)
-AlertDialogFooter.displayName = "AlertDialogFooter"
+);
+AlertDialogFooter.displayName = 'AlertDialogFooter';
const AlertDialogTitle = React.forwardRef<
React.ElementRef<typeof AlertDialogPrimitive.Title>,
@@ -77,11 +77,11 @@ const AlertDialogTitle = React.forwardRef<
>(({ className, ...props }, ref) => (
<AlertDialogPrimitive.Title
ref={ref}
- className={cn("text-lg font-semibold", className)}
+ className={cn('text-lg font-semibold', className)}
{...props}
/>
-))
-AlertDialogTitle.displayName = AlertDialogPrimitive.Title.displayName
+));
+AlertDialogTitle.displayName = AlertDialogPrimitive.Title.displayName;
const AlertDialogDescription = React.forwardRef<
React.ElementRef<typeof AlertDialogPrimitive.Description>,
@@ -89,12 +89,12 @@ const AlertDialogDescription = React.forwardRef<
>(({ className, ...props }, ref) => (
<AlertDialogPrimitive.Description
ref={ref}
- className={cn("text-sm text-muted-foreground", className)}
+ className={cn('text-sm text-muted-foreground', className)}
{...props}
/>
-))
+));
AlertDialogDescription.displayName =
- AlertDialogPrimitive.Description.displayName
+ AlertDialogPrimitive.Description.displayName;
const AlertDialogAction = React.forwardRef<
React.ElementRef<typeof AlertDialogPrimitive.Action>,
@@ -105,8 +105,8 @@ const AlertDialogAction = React.forwardRef<
className={cn(buttonVariants(), className)}
{...props}
/>
-))
-AlertDialogAction.displayName = AlertDialogPrimitive.Action.displayName
+));
+AlertDialogAction.displayName = AlertDialogPrimitive.Action.displayName;
const AlertDialogCancel = React.forwardRef<
React.ElementRef<typeof AlertDialogPrimitive.Cancel>,
@@ -115,14 +115,14 @@ const AlertDialogCancel = React.forwardRef<
<AlertDialogPrimitive.Cancel
ref={ref}
className={cn(
- buttonVariants({ variant: "outline" }),
- "mt-2 sm:mt-0",
- className
+ buttonVariants({ variant: 'outline' }),
+ 'mt-2 sm:mt-0',
+ className,
)}
{...props}
/>
-))
-AlertDialogCancel.displayName = AlertDialogPrimitive.Cancel.displayName
+));
+AlertDialogCancel.displayName = AlertDialogPrimitive.Cancel.displayName;
export {
AlertDialog,
@@ -136,4 +136,4 @@ export {
AlertDialogDescription,
AlertDialogAction,
AlertDialogCancel,
-}
+};
diff --git a/desktop/src/components/ui/avatar.tsx b/desktop/src/renderer/components/ui/avatar.tsx
similarity index 100%
rename from desktop/src/components/ui/avatar.tsx
rename to desktop/src/renderer/components/ui/avatar.tsx
diff --git a/desktop/src/components/ui/badge.tsx b/desktop/src/renderer/components/ui/badge.tsx
similarity index 100%
rename from desktop/src/components/ui/badge.tsx
rename to desktop/src/renderer/components/ui/badge.tsx
diff --git a/desktop/src/components/ui/breadcrumb.tsx b/desktop/src/renderer/components/ui/breadcrumb.tsx
similarity index 100%
rename from desktop/src/components/ui/breadcrumb.tsx
rename to desktop/src/renderer/components/ui/breadcrumb.tsx
diff --git a/desktop/src/components/ui/button.tsx b/desktop/src/renderer/components/ui/button.tsx
similarity index 100%
rename from desktop/src/components/ui/button.tsx
rename to desktop/src/renderer/components/ui/button.tsx
diff --git a/desktop/src/renderer/components/ui/calendar.tsx b/desktop/src/renderer/components/ui/calendar.tsx
new file mode 100644
index 00000000..87cf9dce
--- /dev/null
+++ b/desktop/src/renderer/components/ui/calendar.tsx
@@ -0,0 +1,70 @@
+import * as React from 'react';
+import { ChevronLeftIcon, ChevronRightIcon } from '@radix-ui/react-icons';
+import { DayPicker } from 'react-day-picker';
+
+import { cn } from '@/lib/utils';
+import { buttonVariants } from '@/renderer/components/ui/button';
+
+export type CalendarProps = React.ComponentProps<typeof DayPicker>;
+
+function Calendar({
+ className,
+ classNames,
+ showOutsideDays = true,
+ ...props
+}: CalendarProps) {
+ return (
+ <DayPicker
+ showOutsideDays={showOutsideDays}
+ className={cn('p-3', className)}
+ classNames={{
+ months: 'flex flex-col sm:flex-row space-y-4 sm:space-x-4 sm:space-y-0',
+ month: 'space-y-4',
+ caption: 'flex justify-center pt-1 relative items-center',
+ caption_label: 'text-sm font-medium',
+ nav: 'space-x-1 flex items-center',
+ nav_button: cn(
+ buttonVariants({ variant: 'outline' }),
+ 'h-7 w-7 bg-transparent p-0 opacity-50 hover:opacity-100',
+ ),
+ nav_button_previous: 'absolute left-1',
+ nav_button_next: 'absolute right-1',
+ table: 'w-full border-collapse space-y-1',
+ head_row: 'flex',
+ head_cell:
+ 'text-muted-foreground rounded-md w-8 font-normal text-[0.8rem]',
+ row: 'flex w-full mt-2',
+ cell: cn(
+ 'relative p-0 text-center text-sm focus-within:relative focus-within:z-20 [&:has([aria-selected])]:bg-accent [&:has([aria-selected].day-outside)]:bg-accent/50 [&:has([aria-selected].day-range-end)]:rounded-r-md',
+ props.mode === 'range'
+ ? '[&:has(>.day-range-end)]:rounded-r-md [&:has(>.day-range-start)]:rounded-l-md first:[&:has([aria-selected])]:rounded-l-md last:[&:has([aria-selected])]:rounded-r-md'
+ : '[&:has([aria-selected])]:rounded-md',
+ ),
+ day: cn(
+ buttonVariants({ variant: 'ghost' }),
+ 'h-8 w-8 p-0 font-normal aria-selected:opacity-100',
+ ),
+ day_range_start: 'day-range-start',
+ day_range_end: 'day-range-end',
+ day_selected:
+ 'bg-primary text-primary-foreground hover:bg-primary hover:text-primary-foreground focus:bg-primary focus:text-primary-foreground',
+ day_today: 'bg-accent text-accent-foreground',
+ day_outside:
+ 'day-outside text-muted-foreground opacity-50 aria-selected:bg-accent/50 aria-selected:text-muted-foreground aria-selected:opacity-30',
+ day_disabled: 'text-muted-foreground opacity-50',
+ day_range_middle:
+ 'aria-selected:bg-accent aria-selected:text-accent-foreground',
+ day_hidden: 'invisible',
+ ...classNames,
+ }}
+ components={{
+ IconLeft: ({ ...props }) => <ChevronLeftIcon className="h-4 w-4" />,
+ IconRight: ({ ...props }) => <ChevronRightIcon className="h-4 w-4" />,
+ }}
+ {...props}
+ />
+ );
+}
+Calendar.displayName = 'Calendar';
+
+export { Calendar };
diff --git a/desktop/src/components/ui/checkbox.tsx b/desktop/src/renderer/components/ui/checkbox.tsx
similarity index 100%
rename from desktop/src/components/ui/checkbox.tsx
rename to desktop/src/renderer/components/ui/checkbox.tsx
diff --git a/desktop/src/components/ui/command.tsx b/desktop/src/renderer/components/ui/command.tsx
similarity index 98%
rename from desktop/src/components/ui/command.tsx
rename to desktop/src/renderer/components/ui/command.tsx
index 47098e43..4799dfd4 100644
--- a/desktop/src/components/ui/command.tsx
+++ b/desktop/src/renderer/components/ui/command.tsx
@@ -4,7 +4,7 @@ import { MagnifyingGlassIcon } from '@radix-ui/react-icons';
import { Command as CommandPrimitive } from 'cmdk';
import { cn } from '@/lib/utils';
-import { Dialog, DialogContent } from '@/components/ui/dialog';
+import { Dialog, DialogContent } from '@/renderer/components/ui/dialog';
const Command = React.forwardRef<
React.ElementRef<typeof CommandPrimitive>,
diff --git a/desktop/src/components/ui/date-picker.tsx b/desktop/src/renderer/components/ui/date-picker.tsx
similarity index 92%
rename from desktop/src/components/ui/date-picker.tsx
rename to desktop/src/renderer/components/ui/date-picker.tsx
index 836e512d..717d5267 100644
--- a/desktop/src/components/ui/date-picker.tsx
+++ b/desktop/src/renderer/components/ui/date-picker.tsx
@@ -1,10 +1,10 @@
import React from 'react';
-import { Calendar } from '@/components/ui/calendar';
+import { Calendar } from '@/renderer/components/ui/calendar';
import {
Popover,
PopoverContent,
PopoverTrigger,
-} from '@/components/ui/popover';
+} from '@/renderer/components/ui/popover';
import { cn, toUTCDate } from '@/lib/utils';
interface DatePickerProps {
diff --git a/desktop/src/components/ui/delayed-component.tsx b/desktop/src/renderer/components/ui/delayed-component.tsx
similarity index 100%
rename from desktop/src/components/ui/delayed-component.tsx
rename to desktop/src/renderer/components/ui/delayed-component.tsx
diff --git a/desktop/src/components/ui/dialog.tsx b/desktop/src/renderer/components/ui/dialog.tsx
similarity index 100%
rename from desktop/src/components/ui/dialog.tsx
rename to desktop/src/renderer/components/ui/dialog.tsx
diff --git a/desktop/src/components/ui/dropdown-menu.tsx b/desktop/src/renderer/components/ui/dropdown-menu.tsx
similarity index 100%
rename from desktop/src/components/ui/dropdown-menu.tsx
rename to desktop/src/renderer/components/ui/dropdown-menu.tsx
diff --git a/desktop/src/components/ui/form.tsx b/desktop/src/renderer/components/ui/form.tsx
similarity index 65%
rename from desktop/src/components/ui/form.tsx
rename to desktop/src/renderer/components/ui/form.tsx
index f6afdaf2..d8a84db5 100644
--- a/desktop/src/components/ui/form.tsx
+++ b/desktop/src/renderer/components/ui/form.tsx
@@ -1,6 +1,6 @@
-import * as React from "react"
-import * as LabelPrimitive from "@radix-ui/react-label"
-import { Slot } from "@radix-ui/react-slot"
+import * as React from 'react';
+import * as LabelPrimitive from '@radix-ui/react-label';
+import { Slot } from '@radix-ui/react-slot';
import {
Controller,
ControllerProps,
@@ -8,27 +8,27 @@ import {
FieldValues,
FormProvider,
useFormContext,
-} from "react-hook-form"
+} from 'react-hook-form';
-import { cn } from "@/lib/utils"
-import { Label } from "@/components/ui/label"
+import { cn } from '@/lib/utils';
+import { Label } from '@/renderer/components/ui/label';
-const Form = FormProvider
+const Form = FormProvider;
type FormFieldContextValue<
TFieldValues extends FieldValues = FieldValues,
- TName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>
+ TName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>,
> = {
- name: TName
-}
+ name: TName;
+};
const FormFieldContext = React.createContext<FormFieldContextValue>(
- {} as FormFieldContextValue
-)
+ {} as FormFieldContextValue,
+);
const FormField = <
TFieldValues extends FieldValues = FieldValues,
- TName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>
+ TName extends FieldPath<TFieldValues> = FieldPath<TFieldValues>,
>({
...props
}: ControllerProps<TFieldValues, TName>) => {
@@ -36,21 +36,21 @@ const FormField = <
<FormFieldContext.Provider value={{ name: props.name }}>
<Controller {...props} />
</FormFieldContext.Provider>
- )
-}
+ );
+};
const useFormField = () => {
- const fieldContext = React.useContext(FormFieldContext)
- const itemContext = React.useContext(FormItemContext)
- const { getFieldState, formState } = useFormContext()
+ const fieldContext = React.useContext(FormFieldContext);
+ const itemContext = React.useContext(FormItemContext);
+ const { getFieldState, formState } = useFormContext();
- const fieldState = getFieldState(fieldContext.name, formState)
+ const fieldState = getFieldState(fieldContext.name, formState);
if (!fieldContext) {
- throw new Error("useFormField should be used within <FormField>")
+ throw new Error('useFormField should be used within <FormField>');
}
- const { id } = itemContext
+ const { id } = itemContext;
return {
id,
@@ -59,53 +59,54 @@ const useFormField = () => {
formDescriptionId: `${id}-form-item-description`,
formMessageId: `${id}-form-item-message`,
...fieldState,
- }
-}
+ };
+};
type FormItemContextValue = {
- id: string
-}
+ id: string;
+};
const FormItemContext = React.createContext<FormItemContextValue>(
- {} as FormItemContextValue
-)
+ {} as FormItemContextValue,
+);
const FormItem = React.forwardRef<
HTMLDivElement,
React.HTMLAttributes<HTMLDivElement>
>(({ className, ...props }, ref) => {
- const id = React.useId()
+ const id = React.useId();
return (
<FormItemContext.Provider value={{ id }}>
- <div ref={ref} className={cn("space-y-2", className)} {...props} />
+ <div ref={ref} className={cn('space-y-2', className)} {...props} />
</FormItemContext.Provider>
- )
-})
-FormItem.displayName = "FormItem"
+ );
+});
+FormItem.displayName = 'FormItem';
const FormLabel = React.forwardRef<
React.ElementRef<typeof LabelPrimitive.Root>,
React.ComponentPropsWithoutRef<typeof LabelPrimitive.Root>
>(({ className, ...props }, ref) => {
- const { error, formItemId } = useFormField()
+ const { error, formItemId } = useFormField();
return (
<Label
ref={ref}
- className={cn(error && "text-destructive", className)}
+ className={cn(error && 'text-destructive', className)}
htmlFor={formItemId}
{...props}
/>
- )
-})
-FormLabel.displayName = "FormLabel"
+ );
+});
+FormLabel.displayName = 'FormLabel';
const FormControl = React.forwardRef<
React.ElementRef<typeof Slot>,
React.ComponentPropsWithoutRef<typeof Slot>
>(({ ...props }, ref) => {
- const { error, formItemId, formDescriptionId, formMessageId } = useFormField()
+ const { error, formItemId, formDescriptionId, formMessageId } =
+ useFormField();
return (
<Slot
@@ -119,50 +120,50 @@ const FormControl = React.forwardRef<
aria-invalid={!!error}
{...props}
/>
- )
-})
-FormControl.displayName = "FormControl"
+ );
+});
+FormControl.displayName = 'FormControl';
const FormDescription = React.forwardRef<
HTMLParagraphElement,
React.HTMLAttributes<HTMLParagraphElement>
>(({ className, ...props }, ref) => {
- const { formDescriptionId } = useFormField()
+ const { formDescriptionId } = useFormField();
return (
<p
ref={ref}
id={formDescriptionId}
- className={cn("text-[0.8rem] text-muted-foreground", className)}
+ className={cn('text-[0.8rem] text-muted-foreground', className)}
{...props}
/>
- )
-})
-FormDescription.displayName = "FormDescription"
+ );
+});
+FormDescription.displayName = 'FormDescription';
const FormMessage = React.forwardRef<
HTMLParagraphElement,
React.HTMLAttributes<HTMLParagraphElement>
>(({ className, children, ...props }, ref) => {
- const { error, formMessageId } = useFormField()
- const body = error ? String(error?.message) : children
+ const { error, formMessageId } = useFormField();
+ const body = error ? String(error?.message) : children;
if (!body) {
- return null
+ return null;
}
return (
<p
ref={ref}
id={formMessageId}
- className={cn("text-[0.8rem] font-medium text-destructive", className)}
+ className={cn('text-[0.8rem] font-medium text-destructive', className)}
{...props}
>
{body}
</p>
- )
-})
-FormMessage.displayName = "FormMessage"
+ );
+});
+FormMessage.displayName = 'FormMessage';
export {
useFormField,
@@ -173,4 +174,4 @@ export {
FormDescription,
FormMessage,
FormField,
-}
+};
diff --git a/desktop/src/components/ui/hover-card.tsx b/desktop/src/renderer/components/ui/hover-card.tsx
similarity index 100%
rename from desktop/src/components/ui/hover-card.tsx
rename to desktop/src/renderer/components/ui/hover-card.tsx
diff --git a/desktop/src/components/ui/icon.tsx b/desktop/src/renderer/components/ui/icon.tsx
similarity index 100%
rename from desktop/src/components/ui/icon.tsx
rename to desktop/src/renderer/components/ui/icon.tsx
diff --git a/desktop/src/components/ui/icons.tsx b/desktop/src/renderer/components/ui/icons.tsx
similarity index 100%
rename from desktop/src/components/ui/icons.tsx
rename to desktop/src/renderer/components/ui/icons.tsx
diff --git a/desktop/src/components/ui/input.tsx b/desktop/src/renderer/components/ui/input.tsx
similarity index 100%
rename from desktop/src/components/ui/input.tsx
rename to desktop/src/renderer/components/ui/input.tsx
diff --git a/desktop/src/components/ui/label.tsx b/desktop/src/renderer/components/ui/label.tsx
similarity index 100%
rename from desktop/src/components/ui/label.tsx
rename to desktop/src/renderer/components/ui/label.tsx
diff --git a/desktop/src/components/ui/popover.tsx b/desktop/src/renderer/components/ui/popover.tsx
similarity index 100%
rename from desktop/src/components/ui/popover.tsx
rename to desktop/src/renderer/components/ui/popover.tsx
diff --git a/desktop/src/components/ui/scroll-area.tsx b/desktop/src/renderer/components/ui/scroll-area.tsx
similarity index 100%
rename from desktop/src/components/ui/scroll-area.tsx
rename to desktop/src/renderer/components/ui/scroll-area.tsx
diff --git a/desktop/src/components/ui/separator.tsx b/desktop/src/renderer/components/ui/separator.tsx
similarity index 100%
rename from desktop/src/components/ui/separator.tsx
rename to desktop/src/renderer/components/ui/separator.tsx
diff --git a/desktop/src/components/ui/smart-number-input.tsx b/desktop/src/renderer/components/ui/smart-number-input.tsx
similarity index 100%
rename from desktop/src/components/ui/smart-number-input.tsx
rename to desktop/src/renderer/components/ui/smart-number-input.tsx
diff --git a/desktop/src/components/ui/smart-text-input.tsx b/desktop/src/renderer/components/ui/smart-text-input.tsx
similarity index 100%
rename from desktop/src/components/ui/smart-text-input.tsx
rename to desktop/src/renderer/components/ui/smart-text-input.tsx
diff --git a/desktop/src/components/ui/spinner.tsx b/desktop/src/renderer/components/ui/spinner.tsx
similarity index 64%
rename from desktop/src/components/ui/spinner.tsx
rename to desktop/src/renderer/components/ui/spinner.tsx
index 42fe6c64..5b31d15d 100644
--- a/desktop/src/components/ui/spinner.tsx
+++ b/desktop/src/renderer/components/ui/spinner.tsx
@@ -1,7 +1,7 @@
import * as React from 'react';
import { cn } from '@/lib/utils';
-import {Icon} from "@/components/ui/icon";
+import { Icon } from '@/renderer/components/ui/icon';
export interface SpinnerProps {
className?: string;
@@ -10,7 +10,12 @@ export interface SpinnerProps {
const Spinner = React.forwardRef<SVGSVGElement, SpinnerProps>(
({ className, ...props }, ref) => (
- <Icon name="loader-4-line" className={cn('animate-spin', className)} ref={ref} {...props} />
+ <Icon
+ name="loader-4-line"
+ className={cn('animate-spin', className)}
+ ref={ref}
+ {...props}
+ />
),
);
Spinner.displayName = 'Spinner';
diff --git a/desktop/src/components/ui/tabs.tsx b/desktop/src/renderer/components/ui/tabs.tsx
similarity index 100%
rename from desktop/src/components/ui/tabs.tsx
rename to desktop/src/renderer/components/ui/tabs.tsx
diff --git a/desktop/src/components/ui/textarea.tsx b/desktop/src/renderer/components/ui/textarea.tsx
similarity index 100%
rename from desktop/src/components/ui/textarea.tsx
rename to desktop/src/renderer/components/ui/textarea.tsx
diff --git a/desktop/src/components/ui/toast.tsx b/desktop/src/renderer/components/ui/toast.tsx
similarity index 100%
rename from desktop/src/components/ui/toast.tsx
rename to desktop/src/renderer/components/ui/toast.tsx
diff --git a/desktop/src/components/ui/toaster.tsx b/desktop/src/renderer/components/ui/toaster.tsx
similarity index 77%
rename from desktop/src/components/ui/toaster.tsx
rename to desktop/src/renderer/components/ui/toaster.tsx
index d3c4ffc0..ca662e1a 100644
--- a/desktop/src/components/ui/toaster.tsx
+++ b/desktop/src/renderer/components/ui/toaster.tsx
@@ -1,4 +1,4 @@
-import React from "react";
+import React from 'react';
import {
Toast,
ToastClose,
@@ -6,11 +6,11 @@ import {
ToastProvider,
ToastTitle,
ToastViewport,
-} from "@/components/ui/toast"
-import { useToast } from "@/components/ui/use-toast"
+} from '@/renderer/components/ui/toast';
+import { useToast } from '@/renderer/components/ui/use-toast';
export const Toaster = () => {
- const { toasts } = useToast()
+ const { toasts } = useToast();
return (
<ToastProvider>
@@ -26,9 +26,9 @@ export const Toaster = () => {
{action}
<ToastClose />
</Toast>
- )
+ );
})}
<ToastViewport />
</ToastProvider>
- )
-}
+ );
+};
diff --git a/desktop/src/components/ui/tooltip.tsx b/desktop/src/renderer/components/ui/tooltip.tsx
similarity index 100%
rename from desktop/src/components/ui/tooltip.tsx
rename to desktop/src/renderer/components/ui/tooltip.tsx
diff --git a/desktop/src/components/ui/use-toast.ts b/desktop/src/renderer/components/ui/use-toast.ts
similarity index 97%
rename from desktop/src/components/ui/use-toast.ts
rename to desktop/src/renderer/components/ui/use-toast.ts
index b211c8d1..321364de 100644
--- a/desktop/src/components/ui/use-toast.ts
+++ b/desktop/src/renderer/components/ui/use-toast.ts
@@ -1,7 +1,10 @@
// Inspired by react-hot-toast library
import * as React from 'react';
-import type { ToastActionElement, ToastProps } from '@/components/ui/toast';
+import type {
+ ToastActionElement,
+ ToastProps,
+} from '@/renderer/components/ui/toast';
const TOAST_LIMIT = 1;
const TOAST_REMOVE_DELAY = 1000000;
diff --git a/desktop/src/components/workspaces/containers/breadcrumb-item-editor.tsx b/desktop/src/renderer/components/workspaces/containers/breadcrumb-item-editor.tsx
similarity index 92%
rename from desktop/src/components/workspaces/containers/breadcrumb-item-editor.tsx
rename to desktop/src/renderer/components/workspaces/containers/breadcrumb-item-editor.tsx
index ebf684b0..3bc15603 100644
--- a/desktop/src/components/workspaces/containers/breadcrumb-item-editor.tsx
+++ b/desktop/src/renderer/components/workspaces/containers/breadcrumb-item-editor.tsx
@@ -1,6 +1,6 @@
import React from 'react';
import { BreadcrumbNode } from '@/types/workspaces';
-import { SmartTextInput } from '@/components/ui/smart-text-input';
+import { SmartTextInput } from '@/renderer/components/ui/smart-text-input';
import { useMutation } from '@/renderer/hooks/use-mutation';
import { useWorkspace } from '@/renderer/contexts/workspace';
diff --git a/desktop/src/components/workspaces/containers/breadcrumb-item.tsx b/desktop/src/renderer/components/workspaces/containers/breadcrumb-item.tsx
similarity index 90%
rename from desktop/src/components/workspaces/containers/breadcrumb-item.tsx
rename to desktop/src/renderer/components/workspaces/containers/breadcrumb-item.tsx
index 580e2155..1e9c652b 100644
--- a/desktop/src/components/workspaces/containers/breadcrumb-item.tsx
+++ b/desktop/src/renderer/components/workspaces/containers/breadcrumb-item.tsx
@@ -1,6 +1,6 @@
import React from 'react';
import { cn } from '@/lib/utils';
-import { Avatar } from '@/components/ui/avatar';
+import { Avatar } from '@/renderer/components/ui/avatar';
import { BreadcrumbNode } from '@/types/workspaces';
interface BreadcrumbNodeProps {
diff --git a/desktop/src/components/workspaces/containers/breadcrumb.tsx b/desktop/src/renderer/components/workspaces/containers/breadcrumb.tsx
similarity index 91%
rename from desktop/src/components/workspaces/containers/breadcrumb.tsx
rename to desktop/src/renderer/components/workspaces/containers/breadcrumb.tsx
index 26a60389..63532e2d 100644
--- a/desktop/src/components/workspaces/containers/breadcrumb.tsx
+++ b/desktop/src/renderer/components/workspaces/containers/breadcrumb.tsx
@@ -6,22 +6,22 @@ import {
BreadcrumbItem as BreadcrumbItemWrapper,
BreadcrumbList,
BreadcrumbSeparator,
-} from '@/components/ui/breadcrumb';
+} from '@/renderer/components/ui/breadcrumb';
import {
DropdownMenu,
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuTrigger,
-} from '@/components/ui/dropdown-menu';
+} from '@/renderer/components/ui/dropdown-menu';
import {
Popover,
PopoverContent,
PopoverTrigger,
-} from '@/components/ui/popover';
+} from '@/renderer/components/ui/popover';
import { NodeTypes } from '@/lib/constants';
import { useWorkspace } from '@/renderer/contexts/workspace';
-import { BreadcrumbItem } from '@/components/workspaces/containers/breadcrumb-item';
-import { BreadcrumbItemEditor } from '@/components/workspaces/containers/breadcrumb-item-editor';
+import { BreadcrumbItem } from '@/renderer/components/workspaces/containers/breadcrumb-item';
+import { BreadcrumbItemEditor } from '@/renderer/components/workspaces/containers/breadcrumb-item-editor';
import { useQuery } from '@/renderer/hooks/use-query';
interface BreadcrumbProps {
diff --git a/desktop/src/components/workspaces/containers/container-header.tsx b/desktop/src/renderer/components/workspaces/containers/container-header.tsx
similarity index 67%
rename from desktop/src/components/workspaces/containers/container-header.tsx
rename to desktop/src/renderer/components/workspaces/containers/container-header.tsx
index f087cd3a..46c94ea1 100644
--- a/desktop/src/components/workspaces/containers/container-header.tsx
+++ b/desktop/src/renderer/components/workspaces/containers/container-header.tsx
@@ -1,7 +1,7 @@
import React from 'react';
import { LocalNode } from '@/types/nodes';
-import { Breadcrumb } from '@/components/workspaces/containers/breadcrumb';
-import { NodeCollaboratorsPopover } from '@/components/collaborators/node-collaborators-popover';
+import { Breadcrumb } from '@/renderer/components/workspaces/containers/breadcrumb';
+import { NodeCollaboratorsPopover } from '@/renderer/components/collaborators/node-collaborators-popover';
interface ContainerHeaderProps {
node: LocalNode;
diff --git a/desktop/src/components/workspaces/containers/container.tsx b/desktop/src/renderer/components/workspaces/containers/container.tsx
similarity index 67%
rename from desktop/src/components/workspaces/containers/container.tsx
rename to desktop/src/renderer/components/workspaces/containers/container.tsx
index 00229a58..041b5b26 100644
--- a/desktop/src/components/workspaces/containers/container.tsx
+++ b/desktop/src/renderer/components/workspaces/containers/container.tsx
@@ -2,13 +2,13 @@ import React from 'react';
import { match } from 'ts-pattern';
import { useParams } from 'react-router-dom';
import { NodeTypes } from '@/lib/constants';
-import { PageContainerNode } from '@/components/pages/page-container-node';
-import { ChannelContainerNode } from '@/components/channels/channel-container-node';
-import { ContainerHeader } from '@/components/workspaces/containers/container-header';
-import { Spinner } from '@/components/ui/spinner';
-import { DatabaseContainerNode } from '@/components/databases/database-container-node';
+import { PageContainerNode } from '@/renderer/components/pages/page-container-node';
+import { ChannelContainerNode } from '@/renderer/components/channels/channel-container-node';
+import { ContainerHeader } from '@/renderer/components/workspaces/containers/container-header';
+import { Spinner } from '@/renderer/components/ui/spinner';
+import { DatabaseContainerNode } from '@/renderer/components/databases/database-container-node';
import { useQuery } from '@/renderer/hooks/use-query';
-import { RecordContainerNode } from '@/components/records/record-container-node';
+import { RecordContainerNode } from '@/renderer/components/records/record-container-node';
import { useWorkspace } from '@/renderer/contexts/workspace';
export const Container = () => {
diff --git a/desktop/src/components/workspaces/modals/modal-content.tsx b/desktop/src/renderer/components/workspaces/modals/modal-content.tsx
similarity index 70%
rename from desktop/src/components/workspaces/modals/modal-content.tsx
rename to desktop/src/renderer/components/workspaces/modals/modal-content.tsx
index 3e2c9412..7e0e6ad4 100644
--- a/desktop/src/components/workspaces/modals/modal-content.tsx
+++ b/desktop/src/renderer/components/workspaces/modals/modal-content.tsx
@@ -1,12 +1,12 @@
import React from 'react';
-import { Spinner } from '@/components/ui/spinner';
+import { Spinner } from '@/renderer/components/ui/spinner';
import { useQuery } from '@/renderer/hooks/use-query';
import { match } from 'ts-pattern';
import { NodeTypes } from '@/lib/constants';
-import { ChannelContainerNode } from '@/components/channels/channel-container-node';
-import { PageContainerNode } from '@/components/pages/page-container-node';
-import { DatabaseContainerNode } from '@/components/databases/database-container-node';
-import { RecordContainerNode } from '@/components/records/record-container-node';
+import { ChannelContainerNode } from '@/renderer/components/channels/channel-container-node';
+import { PageContainerNode } from '@/renderer/components/pages/page-container-node';
+import { DatabaseContainerNode } from '@/renderer/components/databases/database-container-node';
+import { RecordContainerNode } from '@/renderer/components/records/record-container-node';
import { useWorkspace } from '@/renderer/contexts/workspace';
interface ModalContentProps {
diff --git a/desktop/src/components/workspaces/modals/modal-header.tsx b/desktop/src/renderer/components/workspaces/modals/modal-header.tsx
similarity index 90%
rename from desktop/src/components/workspaces/modals/modal-header.tsx
rename to desktop/src/renderer/components/workspaces/modals/modal-header.tsx
index 04049344..da7c8cc5 100644
--- a/desktop/src/components/workspaces/modals/modal-header.tsx
+++ b/desktop/src/renderer/components/workspaces/modals/modal-header.tsx
@@ -1,5 +1,5 @@
import React from 'react';
-import { Icon } from '@/components/ui/icon';
+import { Icon } from '@/renderer/components/ui/icon';
import { useWorkspace } from '@/renderer/contexts/workspace';
interface ModalHeaderProps {
diff --git a/desktop/src/components/workspaces/modals/modal.tsx b/desktop/src/renderer/components/workspaces/modals/modal.tsx
similarity index 72%
rename from desktop/src/components/workspaces/modals/modal.tsx
rename to desktop/src/renderer/components/workspaces/modals/modal.tsx
index b899fad3..5bea0c93 100644
--- a/desktop/src/components/workspaces/modals/modal.tsx
+++ b/desktop/src/renderer/components/workspaces/modals/modal.tsx
@@ -1,7 +1,11 @@
import React from 'react';
-import { Dialog, DialogContent, DialogTitle } from '@/components/ui/dialog';
-import { ModalHeader } from '@/components/workspaces/modals/modal-header';
-import { ModalContent } from '@/components/workspaces/modals/modal-content';
+import {
+ Dialog,
+ DialogContent,
+ DialogTitle,
+} from '@/renderer/components/ui/dialog';
+import { ModalHeader } from '@/renderer/components/workspaces/modals/modal-header';
+import { ModalContent } from '@/renderer/components/workspaces/modals/modal-content';
interface ModalProps {
nodeId: string;
diff --git a/desktop/src/components/workspaces/sidebars/sidebar-chat-item.tsx b/desktop/src/renderer/components/workspaces/sidebars/sidebar-chat-item.tsx
similarity index 92%
rename from desktop/src/components/workspaces/sidebars/sidebar-chat-item.tsx
rename to desktop/src/renderer/components/workspaces/sidebars/sidebar-chat-item.tsx
index 50858f61..2c208a3f 100644
--- a/desktop/src/components/workspaces/sidebars/sidebar-chat-item.tsx
+++ b/desktop/src/renderer/components/workspaces/sidebars/sidebar-chat-item.tsx
@@ -2,8 +2,8 @@ import React from 'react';
import { useWorkspace } from '@/renderer/contexts/workspace';
import { SidebarChatNode } from '@/types/workspaces';
import { cn } from '@/lib/utils';
-import { Avatar } from '@/components/ui/avatar';
-import { Icon } from '@/components/ui/icon';
+import { Avatar } from '@/renderer/components/ui/avatar';
+import { Icon } from '@/renderer/components/ui/icon';
interface SidebarChatItemProps {
node: SidebarChatNode;
diff --git a/desktop/src/components/workspaces/sidebars/sidebar-chats.tsx b/desktop/src/renderer/components/workspaces/sidebars/sidebar-chats.tsx
similarity index 79%
rename from desktop/src/components/workspaces/sidebars/sidebar-chats.tsx
rename to desktop/src/renderer/components/workspaces/sidebars/sidebar-chats.tsx
index 1ea60eb0..51f75d0b 100644
--- a/desktop/src/components/workspaces/sidebars/sidebar-chats.tsx
+++ b/desktop/src/renderer/components/workspaces/sidebars/sidebar-chats.tsx
@@ -1,7 +1,7 @@
import React from 'react';
-import { ChatCreatePopover } from '@/components/chats/chat-create-popover';
+import { ChatCreatePopover } from '@/renderer/components/chats/chat-create-popover';
import { useQuery } from '@/renderer/hooks/use-query';
-import { SidebarChatItem } from '@/components/workspaces/sidebars/sidebar-chat-item';
+import { SidebarChatItem } from '@/renderer/components/workspaces/sidebars/sidebar-chat-item';
import { useWorkspace } from '@/renderer/contexts/workspace';
export const SidebarChats = () => {
diff --git a/desktop/src/components/workspaces/sidebars/sidebar-header.tsx b/desktop/src/renderer/components/workspaces/sidebars/sidebar-header.tsx
similarity index 95%
rename from desktop/src/components/workspaces/sidebars/sidebar-header.tsx
rename to desktop/src/renderer/components/workspaces/sidebars/sidebar-header.tsx
index d7be26bc..5690fee2 100644
--- a/desktop/src/components/workspaces/sidebars/sidebar-header.tsx
+++ b/desktop/src/renderer/components/workspaces/sidebars/sidebar-header.tsx
@@ -4,9 +4,9 @@ import {
Popover,
PopoverContent,
PopoverTrigger,
-} from '@/components/ui/popover';
-import { Icon } from '@/components/ui/icon';
-import { Avatar } from '@/components/ui/avatar';
+} from '@/renderer/components/ui/popover';
+import { Icon } from '@/renderer/components/ui/icon';
+import { Avatar } from '@/renderer/components/ui/avatar';
import { useAccount } from '@/renderer/contexts/account';
import { useNavigate } from 'react-router-dom';
diff --git a/desktop/src/components/workspaces/sidebars/sidebar-item.tsx b/desktop/src/renderer/components/workspaces/sidebars/sidebar-item.tsx
similarity index 92%
rename from desktop/src/components/workspaces/sidebars/sidebar-item.tsx
rename to desktop/src/renderer/components/workspaces/sidebars/sidebar-item.tsx
index 8a427bee..99ffcfaf 100644
--- a/desktop/src/components/workspaces/sidebars/sidebar-item.tsx
+++ b/desktop/src/renderer/components/workspaces/sidebars/sidebar-item.tsx
@@ -2,8 +2,8 @@ import React from 'react';
import { useWorkspace } from '@/renderer/contexts/workspace';
import { SidebarNode } from '@/types/workspaces';
import { cn } from '@/lib/utils';
-import { Avatar } from '@/components/ui/avatar';
-import { Icon } from '@/components/ui/icon';
+import { Avatar } from '@/renderer/components/ui/avatar';
+import { Icon } from '@/renderer/components/ui/icon';
interface SidebarItemProps {
node: SidebarNode;
diff --git a/desktop/src/components/workspaces/sidebars/sidebar-space-item.tsx b/desktop/src/renderer/components/workspaces/sidebars/sidebar-space-item.tsx
similarity index 90%
rename from desktop/src/components/workspaces/sidebars/sidebar-space-item.tsx
rename to desktop/src/renderer/components/workspaces/sidebars/sidebar-space-item.tsx
index 9f022b00..62782fa6 100644
--- a/desktop/src/components/workspaces/sidebars/sidebar-space-item.tsx
+++ b/desktop/src/renderer/components/workspaces/sidebars/sidebar-space-item.tsx
@@ -1,7 +1,7 @@
import React from 'react';
import { cn } from '@/lib/utils';
-import { Avatar } from '@/components/ui/avatar';
-import { Icon } from '@/components/ui/icon';
+import { Avatar } from '@/renderer/components/ui/avatar';
+import { Icon } from '@/renderer/components/ui/icon';
import {
DropdownMenu,
DropdownMenuContent,
@@ -9,14 +9,14 @@ import {
DropdownMenuLabel,
DropdownMenuSeparator,
DropdownMenuTrigger,
-} from '@/components/ui/dropdown-menu';
+} from '@/renderer/components/ui/dropdown-menu';
import { getDefaultNodeIcon } from '@/lib/nodes';
import { NodeTypes } from '@/lib/constants';
-import { ChannelCreateDialog } from '@/components/channels/channel-create-dialog';
-import { PageCreateDialog } from '@/components/pages/page-create-dialog';
-import { DatabaseCreateDialog } from '@/components/databases/database-create-dialog';
+import { ChannelCreateDialog } from '@/renderer/components/channels/channel-create-dialog';
+import { PageCreateDialog } from '@/renderer/components/pages/page-create-dialog';
+import { DatabaseCreateDialog } from '@/renderer/components/databases/database-create-dialog';
import { SidebarSpaceNode } from '@/types/workspaces';
-import { SidebarItem } from '@/components/workspaces/sidebars/sidebar-item';
+import { SidebarItem } from '@/renderer/components/workspaces/sidebars/sidebar-item';
interface SettingsState {
open: boolean;
diff --git a/desktop/src/components/workspaces/sidebars/sidebar-spaces.tsx b/desktop/src/renderer/components/workspaces/sidebars/sidebar-spaces.tsx
similarity index 79%
rename from desktop/src/components/workspaces/sidebars/sidebar-spaces.tsx
rename to desktop/src/renderer/components/workspaces/sidebars/sidebar-spaces.tsx
index 7211800a..02b350f8 100644
--- a/desktop/src/components/workspaces/sidebars/sidebar-spaces.tsx
+++ b/desktop/src/renderer/components/workspaces/sidebars/sidebar-spaces.tsx
@@ -1,6 +1,6 @@
import React from 'react';
-import { SpaceCreateButton } from '@/components/spaces/space-create-button';
-import { SidebarSpaceItem } from '@/components/workspaces/sidebars/sidebar-space-item';
+import { SpaceCreateButton } from '@/renderer/components/spaces/space-create-button';
+import { SidebarSpaceItem } from '@/renderer/components/workspaces/sidebars/sidebar-space-item';
import { useQuery } from '@/renderer/hooks/use-query';
import { useWorkspace } from '@/renderer/contexts/workspace';
diff --git a/desktop/src/components/workspaces/sidebars/sidebar.tsx b/desktop/src/renderer/components/workspaces/sidebars/sidebar.tsx
similarity index 70%
rename from desktop/src/components/workspaces/sidebars/sidebar.tsx
rename to desktop/src/renderer/components/workspaces/sidebars/sidebar.tsx
index 8b9f3363..fc053043 100644
--- a/desktop/src/components/workspaces/sidebars/sidebar.tsx
+++ b/desktop/src/renderer/components/workspaces/sidebars/sidebar.tsx
@@ -1,8 +1,8 @@
import React from 'react';
-import { SidebarHeader } from '@/components/workspaces/sidebars/sidebar-header';
-import { SidebarSpaces } from '@/components/workspaces/sidebars/sidebar-spaces';
-import { SidebarChats } from '@/components/workspaces/sidebars/sidebar-chats';
-import { Icon } from '@/components/ui/icon';
+import { SidebarHeader } from '@/renderer/components/workspaces/sidebars/sidebar-header';
+import { SidebarSpaces } from '@/renderer/components/workspaces/sidebars/sidebar-spaces';
+import { SidebarChats } from '@/renderer/components/workspaces/sidebars/sidebar-chats';
+import { Icon } from '@/renderer/components/ui/icon';
export const Sidebar = () => {
return (
diff --git a/desktop/src/components/workspaces/workspace-create.tsx b/desktop/src/renderer/components/workspaces/workspace-create.tsx
similarity index 91%
rename from desktop/src/components/workspaces/workspace-create.tsx
rename to desktop/src/renderer/components/workspaces/workspace-create.tsx
index 36118c82..7b7d9447 100644
--- a/desktop/src/components/workspaces/workspace-create.tsx
+++ b/desktop/src/renderer/components/workspaces/workspace-create.tsx
@@ -7,14 +7,14 @@ import {
FormItem,
FormMessage,
FormLabel,
-} from '@/components/ui/form';
+} from '@/renderer/components/ui/form';
import { useForm } from 'react-hook-form';
import { zodResolver } from '@hookform/resolvers/zod';
-import { Button } from '@/components/ui/button';
-import { Spinner } from '@/components/ui/spinner';
-import { Input } from '@/components/ui/input';
-import { Textarea } from '@/components/ui/textarea';
-import { toast } from '@/components/ui/use-toast';
+import { Button } from '@/renderer/components/ui/button';
+import { Spinner } from '@/renderer/components/ui/spinner';
+import { Input } from '@/renderer/components/ui/input';
+import { Textarea } from '@/renderer/components/ui/textarea';
+import { toast } from '@/renderer/components/ui/use-toast';
import { useMutation } from '@/renderer/hooks/use-mutation';
import { useAccount } from '@/renderer/contexts/account';
import { useNavigate } from 'react-router-dom';
diff --git a/desktop/src/components/workspaces/workspace-redirect.tsx b/desktop/src/renderer/components/workspaces/workspace-redirect.tsx
similarity index 100%
rename from desktop/src/components/workspaces/workspace-redirect.tsx
rename to desktop/src/renderer/components/workspaces/workspace-redirect.tsx
diff --git a/desktop/src/components/workspaces/workspace-settings-dialog.tsx b/desktop/src/renderer/components/workspaces/workspace-settings-dialog.tsx
similarity index 87%
rename from desktop/src/components/workspaces/workspace-settings-dialog.tsx
rename to desktop/src/renderer/components/workspaces/workspace-settings-dialog.tsx
index 2b5ffe7a..59a1677c 100644
--- a/desktop/src/components/workspaces/workspace-settings-dialog.tsx
+++ b/desktop/src/renderer/components/workspaces/workspace-settings-dialog.tsx
@@ -1,11 +1,16 @@
import React from 'react';
-import { Dialog, DialogContent } from '@/components/ui/dialog';
-import { Tabs, TabsContent, TabsList, TabsTrigger } from '@/components/ui/tabs';
-import { Icon } from '@/components/ui/icon';
-import { Avatar } from '@/components/ui/avatar';
+import { Dialog, DialogContent } from '@/renderer/components/ui/dialog';
+import {
+ Tabs,
+ TabsContent,
+ TabsList,
+ TabsTrigger,
+} from '@/renderer/components/ui/tabs';
+import { Icon } from '@/renderer/components/ui/icon';
+import { Avatar } from '@/renderer/components/ui/avatar';
import { useWorkspace } from '@/renderer/contexts/workspace';
-import { WorkspaceUpdate } from '@/components/workspaces/workspace-update';
-import { WorkspaceUsers } from '@/components/workspaces/workspace-users';
+import { WorkspaceUpdate } from '@/renderer/components/workspaces/workspace-update';
+import { WorkspaceUsers } from '@/renderer/components/workspaces/workspace-users';
import { VisuallyHidden } from '@radix-ui/react-visually-hidden';
import { DialogTitle } from '@radix-ui/react-dialog';
diff --git a/desktop/src/components/workspaces/workspace-update.tsx b/desktop/src/renderer/components/workspaces/workspace-update.tsx
similarity index 89%
rename from desktop/src/components/workspaces/workspace-update.tsx
rename to desktop/src/renderer/components/workspaces/workspace-update.tsx
index 44ba91a9..02db901c 100644
--- a/desktop/src/components/workspaces/workspace-update.tsx
+++ b/desktop/src/renderer/components/workspaces/workspace-update.tsx
@@ -7,14 +7,14 @@ import {
FormItem,
FormMessage,
FormLabel,
-} from '@/components/ui/form';
+} from '@/renderer/components/ui/form';
import { useForm } from 'react-hook-form';
import { zodResolver } from '@hookform/resolvers/zod';
-import { Button } from '@/components/ui/button';
-import { Spinner } from '@/components/ui/spinner';
-import { Input } from '@/components/ui/input';
-import { Textarea } from '@/components/ui/textarea';
-import { toast } from '@/components/ui/use-toast';
+import { Button } from '@/renderer/components/ui/button';
+import { Spinner } from '@/renderer/components/ui/spinner';
+import { Input } from '@/renderer/components/ui/input';
+import { Textarea } from '@/renderer/components/ui/textarea';
+import { toast } from '@/renderer/components/ui/use-toast';
import { useMutation } from '@/renderer/hooks/use-mutation';
import { useWorkspace } from '@/renderer/contexts/workspace';
diff --git a/desktop/src/components/workspaces/workspace-user-invite.tsx b/desktop/src/renderer/components/workspaces/workspace-user-invite.tsx
similarity index 93%
rename from desktop/src/components/workspaces/workspace-user-invite.tsx
rename to desktop/src/renderer/components/workspaces/workspace-user-invite.tsx
index 5cd9f6b0..5f99f15a 100644
--- a/desktop/src/components/workspaces/workspace-user-invite.tsx
+++ b/desktop/src/renderer/components/workspaces/workspace-user-invite.tsx
@@ -1,10 +1,10 @@
import React from 'react';
-import { Icon } from '@/components/ui/icon';
+import { Icon } from '@/renderer/components/ui/icon';
import { isValidEmail } from '@/lib/utils';
-import { Button } from '@/components/ui/button';
+import { Button } from '@/renderer/components/ui/button';
import { useMutation } from '@/renderer/hooks/use-mutation';
-import { Spinner } from '@/components/ui/spinner';
-import { toast } from '@/components/ui/use-toast';
+import { Spinner } from '@/renderer/components/ui/spinner';
+import { toast } from '@/renderer/components/ui/use-toast';
import { useWorkspace } from '@/renderer/contexts/workspace';
export const WorkspaceUserInvite = () => {
diff --git a/desktop/src/components/workspaces/workspace-user-role-dropdown.tsx b/desktop/src/renderer/components/workspaces/workspace-user-role-dropdown.tsx
similarity index 93%
rename from desktop/src/components/workspaces/workspace-user-role-dropdown.tsx
rename to desktop/src/renderer/components/workspaces/workspace-user-role-dropdown.tsx
index 7d97a767..7eeb3c2c 100644
--- a/desktop/src/components/workspaces/workspace-user-role-dropdown.tsx
+++ b/desktop/src/renderer/components/workspaces/workspace-user-role-dropdown.tsx
@@ -4,12 +4,12 @@ import {
DropdownMenuContent,
DropdownMenuItem,
DropdownMenuTrigger,
-} from '@/components/ui/dropdown-menu';
+} from '@/renderer/components/ui/dropdown-menu';
import { WorkspaceRole } from '@/types/workspaces';
-import { Spinner } from '@/components/ui/spinner';
-import { Icon } from '@/components/ui/icon';
+import { Spinner } from '@/renderer/components/ui/spinner';
+import { Icon } from '@/renderer/components/ui/icon';
import { useMutation } from '@/renderer/hooks/use-mutation';
-import { toast } from '@/components/ui/use-toast';
+import { toast } from '@/renderer/components/ui/use-toast';
import { useWorkspace } from '@/renderer/contexts/workspace';
interface WorkspaceRoleItem {
diff --git a/desktop/src/components/workspaces/workspace-users.tsx b/desktop/src/renderer/components/workspaces/workspace-users.tsx
similarity index 87%
rename from desktop/src/components/workspaces/workspace-users.tsx
rename to desktop/src/renderer/components/workspaces/workspace-users.tsx
index 27f8f4c0..566aeba0 100644
--- a/desktop/src/components/workspaces/workspace-users.tsx
+++ b/desktop/src/renderer/components/workspaces/workspace-users.tsx
@@ -1,11 +1,11 @@
import React from 'react';
import { useInfiniteQuery } from '@/renderer/hooks/use-infinite-query';
-import { Separator } from '@/components/ui/separator';
-import { WorkspaceUserInvite } from '@/components/workspaces/workspace-user-invite';
-import { Avatar } from '@/components/ui/avatar';
-import { Spinner } from '@/components/ui/spinner';
+import { Separator } from '@/renderer/components/ui/separator';
+import { WorkspaceUserInvite } from '@/renderer/components/workspaces/workspace-user-invite';
+import { Avatar } from '@/renderer/components/ui/avatar';
+import { Spinner } from '@/renderer/components/ui/spinner';
import { InView } from 'react-intersection-observer';
-import { WorkspaceUserRoleDropdown } from '@/components/workspaces/workspace-user-role-dropdown';
+import { WorkspaceUserRoleDropdown } from '@/renderer/components/workspaces/workspace-user-role-dropdown';
import { WorkspaceRole } from '@/types/workspaces';
import { useWorkspace } from '@/renderer/contexts/workspace';
diff --git a/desktop/src/components/workspaces/workspace.tsx b/desktop/src/renderer/components/workspaces/workspace.tsx
similarity index 88%
rename from desktop/src/components/workspaces/workspace.tsx
rename to desktop/src/renderer/components/workspaces/workspace.tsx
index aa05c640..21476339 100644
--- a/desktop/src/components/workspaces/workspace.tsx
+++ b/desktop/src/renderer/components/workspaces/workspace.tsx
@@ -1,5 +1,5 @@
import React from 'react';
-import { Sidebar } from '@/components/workspaces/sidebars/sidebar';
+import { Sidebar } from '@/renderer/components/workspaces/sidebars/sidebar';
import { WorkspaceContext } from '@/renderer/contexts/workspace';
import {
Outlet,
@@ -8,8 +8,8 @@ import {
useSearchParams,
} from 'react-router-dom';
import { useAccount } from '@/renderer/contexts/account';
-import { Modal } from '@/components/workspaces/modals/modal';
-import { WorkspaceSettingsDialog } from '@/components/workspaces/workspace-settings-dialog';
+import { Modal } from '@/renderer/components/workspaces/modals/modal';
+import { WorkspaceSettingsDialog } from '@/renderer/components/workspaces/workspace-settings-dialog';
export const Workspace = () => {
const { workspaceId } = useParams<{ workspaceId: string }>();
diff --git a/desktop/src/editor/classes.tsx b/desktop/src/renderer/editor/classes.tsx
similarity index 100%
rename from desktop/src/editor/classes.tsx
rename to desktop/src/renderer/editor/classes.tsx
diff --git a/desktop/src/editor/commands/blockquote.tsx b/desktop/src/renderer/editor/commands/blockquote.tsx
similarity index 100%
rename from desktop/src/editor/commands/blockquote.tsx
rename to desktop/src/renderer/editor/commands/blockquote.tsx
diff --git a/desktop/src/editor/commands/bullet-list.tsx b/desktop/src/renderer/editor/commands/bullet-list.tsx
similarity index 100%
rename from desktop/src/editor/commands/bullet-list.tsx
rename to desktop/src/renderer/editor/commands/bullet-list.tsx
diff --git a/desktop/src/editor/commands/code-block.tsx b/desktop/src/renderer/editor/commands/code-block.tsx
similarity index 100%
rename from desktop/src/editor/commands/code-block.tsx
rename to desktop/src/renderer/editor/commands/code-block.tsx
diff --git a/desktop/src/editor/commands/divider.tsx b/desktop/src/renderer/editor/commands/divider.tsx
similarity index 100%
rename from desktop/src/editor/commands/divider.tsx
rename to desktop/src/renderer/editor/commands/divider.tsx
diff --git a/desktop/src/editor/commands/heading1.tsx b/desktop/src/renderer/editor/commands/heading1.tsx
similarity index 100%
rename from desktop/src/editor/commands/heading1.tsx
rename to desktop/src/renderer/editor/commands/heading1.tsx
diff --git a/desktop/src/editor/commands/heading2.tsx b/desktop/src/renderer/editor/commands/heading2.tsx
similarity index 100%
rename from desktop/src/editor/commands/heading2.tsx
rename to desktop/src/renderer/editor/commands/heading2.tsx
diff --git a/desktop/src/editor/commands/heading3.tsx b/desktop/src/renderer/editor/commands/heading3.tsx
similarity index 100%
rename from desktop/src/editor/commands/heading3.tsx
rename to desktop/src/renderer/editor/commands/heading3.tsx
diff --git a/desktop/src/renderer/editor/commands/index.tsx b/desktop/src/renderer/editor/commands/index.tsx
new file mode 100644
index 00000000..2f4865d6
--- /dev/null
+++ b/desktop/src/renderer/editor/commands/index.tsx
@@ -0,0 +1,28 @@
+import { BlockquoteCommand } from '@/renderer/editor/commands/blockquote';
+import { BulletListCommand } from '@/renderer/editor/commands/bullet-list';
+import { CodeBlockCommand } from '@/renderer/editor/commands/code-block';
+import { DividerCommand } from '@/renderer/editor/commands/divider';
+import { Heading1Command } from '@/renderer/editor/commands/heading1';
+import { Heading2Command } from '@/renderer/editor/commands/heading2';
+import { Heading3Command } from '@/renderer/editor/commands/heading3';
+import { OrderedListCommand } from '@/renderer/editor/commands/ordered-list';
+import { ParagraphCommand } from '@/renderer/editor/commands/paragraph';
+import { TodoCommand } from '@/renderer/editor/commands/todo';
+import { PageCommand } from '@/renderer/editor/commands/page';
+import { EditorCommand, EditorCommandProps } from '@/types/editor';
+
+export type { EditorCommand, EditorCommandProps };
+
+export {
+ BlockquoteCommand,
+ BulletListCommand,
+ CodeBlockCommand,
+ Heading1Command,
+ Heading2Command,
+ Heading3Command,
+ OrderedListCommand,
+ ParagraphCommand,
+ DividerCommand,
+ TodoCommand,
+ PageCommand,
+};
diff --git a/desktop/src/editor/commands/ordered-list.tsx b/desktop/src/renderer/editor/commands/ordered-list.tsx
similarity index 100%
rename from desktop/src/editor/commands/ordered-list.tsx
rename to desktop/src/renderer/editor/commands/ordered-list.tsx
diff --git a/desktop/src/editor/commands/page.tsx b/desktop/src/renderer/editor/commands/page.tsx
similarity index 100%
rename from desktop/src/editor/commands/page.tsx
rename to desktop/src/renderer/editor/commands/page.tsx
diff --git a/desktop/src/editor/commands/paragraph.tsx b/desktop/src/renderer/editor/commands/paragraph.tsx
similarity index 100%
rename from desktop/src/editor/commands/paragraph.tsx
rename to desktop/src/renderer/editor/commands/paragraph.tsx
diff --git a/desktop/src/editor/commands/todo.tsx b/desktop/src/renderer/editor/commands/todo.tsx
similarity index 100%
rename from desktop/src/editor/commands/todo.tsx
rename to desktop/src/renderer/editor/commands/todo.tsx
diff --git a/desktop/src/editor/extensions/blockquote.tsx b/desktop/src/renderer/editor/extensions/blockquote.tsx
similarity index 74%
rename from desktop/src/editor/extensions/blockquote.tsx
rename to desktop/src/renderer/editor/extensions/blockquote.tsx
index 6e76804b..da6d2160 100644
--- a/desktop/src/editor/extensions/blockquote.tsx
+++ b/desktop/src/renderer/editor/extensions/blockquote.tsx
@@ -1,10 +1,9 @@
import Blockquote from '@tiptap/extension-blockquote';
-import { defaultClasses } from '@/editor/classes';
+import { defaultClasses } from '@/renderer/editor/classes';
export const BlockquoteNode = Blockquote.configure({
HTMLAttributes: {
class: defaultClasses.blockquote,
},
});
-
diff --git a/desktop/src/editor/extensions/bullet-list.tsx b/desktop/src/renderer/editor/extensions/bullet-list.tsx
similarity index 74%
rename from desktop/src/editor/extensions/bullet-list.tsx
rename to desktop/src/renderer/editor/extensions/bullet-list.tsx
index 44fca053..74f94c1a 100644
--- a/desktop/src/editor/extensions/bullet-list.tsx
+++ b/desktop/src/renderer/editor/extensions/bullet-list.tsx
@@ -1,6 +1,6 @@
import BulletList from '@tiptap/extension-bullet-list';
-import { defaultClasses } from '@/editor/classes';
+import { defaultClasses } from '@/renderer/editor/classes';
export const BulletListNode = BulletList.configure({
HTMLAttributes: {
diff --git a/desktop/src/editor/extensions/code-block.tsx b/desktop/src/renderer/editor/extensions/code-block.tsx
similarity index 79%
rename from desktop/src/editor/extensions/code-block.tsx
rename to desktop/src/renderer/editor/extensions/code-block.tsx
index ff44553e..5b947fbc 100644
--- a/desktop/src/editor/extensions/code-block.tsx
+++ b/desktop/src/renderer/editor/extensions/code-block.tsx
@@ -1,8 +1,8 @@
import CodeBlockLowlight from '@tiptap/extension-code-block-lowlight';
import { ReactNodeViewRenderer } from '@tiptap/react';
-import { defaultClasses } from '@/editor/classes';
-import { CodeBlockNodeView } from '@/editor/views';
+import { defaultClasses } from '@/renderer/editor/classes';
+import { CodeBlockNodeView } from '@/renderer/editor/views';
import { lowlight } from '@/lib/lowlight';
export const CodeBlockNode = CodeBlockLowlight.extend({
diff --git a/desktop/src/editor/extensions/code.tsx b/desktop/src/renderer/editor/extensions/code.tsx
similarity index 71%
rename from desktop/src/editor/extensions/code.tsx
rename to desktop/src/renderer/editor/extensions/code.tsx
index b14e0628..15e79730 100644
--- a/desktop/src/editor/extensions/code.tsx
+++ b/desktop/src/renderer/editor/extensions/code.tsx
@@ -1,10 +1,9 @@
import Code from '@tiptap/extension-code';
-import { defaultClasses } from '@/editor/classes';
+import { defaultClasses } from '@/renderer/editor/classes';
export const CodeMark = Code.configure({
HTMLAttributes: {
class: defaultClasses.code,
},
});
-
diff --git a/desktop/src/editor/extensions/color.tsx b/desktop/src/renderer/editor/extensions/color.tsx
similarity index 100%
rename from desktop/src/editor/extensions/color.tsx
rename to desktop/src/renderer/editor/extensions/color.tsx
diff --git a/desktop/src/editor/extensions/commander.tsx b/desktop/src/renderer/editor/extensions/commander.tsx
similarity index 99%
rename from desktop/src/editor/extensions/commander.tsx
rename to desktop/src/renderer/editor/extensions/commander.tsx
index 86835518..d3da0928 100644
--- a/desktop/src/editor/extensions/commander.tsx
+++ b/desktop/src/renderer/editor/extensions/commander.tsx
@@ -8,7 +8,7 @@ import Suggestion, {
} from '@tiptap/suggestion';
import tippy from 'tippy.js';
-import { Icon } from '@/components/ui/icon';
+import { Icon } from '@/renderer/components/ui/icon';
import { EditorCommandContext, EditorCommand } from '@/types/editor';
import { updateScrollView } from '@/lib/utils';
diff --git a/desktop/src/editor/extensions/delete-control.tsx b/desktop/src/renderer/editor/extensions/delete-control.tsx
similarity index 100%
rename from desktop/src/editor/extensions/delete-control.tsx
rename to desktop/src/renderer/editor/extensions/delete-control.tsx
diff --git a/desktop/src/editor/extensions/divider.tsx b/desktop/src/renderer/editor/extensions/divider.tsx
similarity index 100%
rename from desktop/src/editor/extensions/divider.tsx
rename to desktop/src/renderer/editor/extensions/divider.tsx
diff --git a/desktop/src/editor/extensions/dropcursor.tsx b/desktop/src/renderer/editor/extensions/dropcursor.tsx
similarity index 100%
rename from desktop/src/editor/extensions/dropcursor.tsx
rename to desktop/src/renderer/editor/extensions/dropcursor.tsx
diff --git a/desktop/src/editor/extensions/heading1.tsx b/desktop/src/renderer/editor/extensions/heading1.tsx
similarity index 96%
rename from desktop/src/editor/extensions/heading1.tsx
rename to desktop/src/renderer/editor/extensions/heading1.tsx
index 43d044c1..ad611539 100644
--- a/desktop/src/editor/extensions/heading1.tsx
+++ b/desktop/src/renderer/editor/extensions/heading1.tsx
@@ -1,5 +1,5 @@
import { mergeAttributes, Node, textblockTypeInputRule } from '@tiptap/core';
-import { defaultClasses } from '@/editor/classes';
+import { defaultClasses } from '@/renderer/editor/classes';
export interface Heading1Options {
HTMLAttributes: Record<string, any>;
diff --git a/desktop/src/editor/extensions/heading2.tsx b/desktop/src/renderer/editor/extensions/heading2.tsx
similarity index 96%
rename from desktop/src/editor/extensions/heading2.tsx
rename to desktop/src/renderer/editor/extensions/heading2.tsx
index 9e4364cd..b791a56f 100644
--- a/desktop/src/editor/extensions/heading2.tsx
+++ b/desktop/src/renderer/editor/extensions/heading2.tsx
@@ -1,5 +1,5 @@
import { mergeAttributes, Node, textblockTypeInputRule } from '@tiptap/core';
-import { defaultClasses } from '@/editor/classes';
+import { defaultClasses } from '@/renderer/editor/classes';
export interface Heading2Options {
HTMLAttributes: Record<string, any>;
diff --git a/desktop/src/editor/extensions/heading3.tsx b/desktop/src/renderer/editor/extensions/heading3.tsx
similarity index 96%
rename from desktop/src/editor/extensions/heading3.tsx
rename to desktop/src/renderer/editor/extensions/heading3.tsx
index 81430ae6..54223d73 100644
--- a/desktop/src/editor/extensions/heading3.tsx
+++ b/desktop/src/renderer/editor/extensions/heading3.tsx
@@ -1,5 +1,5 @@
import { mergeAttributes, Node, textblockTypeInputRule } from '@tiptap/core';
-import { defaultClasses } from '@/editor/classes';
+import { defaultClasses } from '@/renderer/editor/classes';
export interface Heading3Options {
HTMLAttributes: Record<string, any>;
diff --git a/desktop/src/editor/extensions/highlight.tsx b/desktop/src/renderer/editor/extensions/highlight.tsx
similarity index 100%
rename from desktop/src/editor/extensions/highlight.tsx
rename to desktop/src/renderer/editor/extensions/highlight.tsx
diff --git a/desktop/src/editor/extensions/id.tsx b/desktop/src/renderer/editor/extensions/id.tsx
similarity index 100%
rename from desktop/src/editor/extensions/id.tsx
rename to desktop/src/renderer/editor/extensions/id.tsx
diff --git a/desktop/src/renderer/editor/extensions/index.tsx b/desktop/src/renderer/editor/extensions/index.tsx
new file mode 100644
index 00000000..701d9cd1
--- /dev/null
+++ b/desktop/src/renderer/editor/extensions/index.tsx
@@ -0,0 +1,68 @@
+import BoldMark from '@tiptap/extension-bold';
+import DocumentNode from '@tiptap/extension-document';
+import ItalicMark from '@tiptap/extension-italic';
+import StrikethroughMark from '@tiptap/extension-strike';
+import TextNode from '@tiptap/extension-text';
+import UnderlineMark from '@tiptap/extension-underline';
+
+import { IdExtension } from '@/renderer/editor/extensions/id';
+import { BlockquoteNode } from '@/renderer/editor/extensions/blockquote';
+import { BulletListNode } from '@/renderer/editor/extensions/bullet-list';
+import { CodeMark } from '@/renderer/editor/extensions/code';
+import { CodeBlockNode } from '@/renderer/editor/extensions/code-block';
+import { ColorMark } from '@/renderer/editor/extensions/color';
+import { CommanderExtension } from '@/renderer/editor/extensions/commander';
+import { DeleteControlExtension } from '@/renderer/editor/extensions/delete-control';
+import { DividerNode } from '@/renderer/editor/extensions/divider';
+import { DropcursorExtension } from '@/renderer/editor/extensions/dropcursor';
+import { Heading1Node } from '@/renderer/editor/extensions/heading1';
+import { Heading2Node } from '@/renderer/editor/extensions/heading2';
+import { Heading3Node } from '@/renderer/editor/extensions/heading3';
+import { HighlightMark } from '@/renderer/editor/extensions/highlight';
+import { LinkMark } from '@/renderer/editor/extensions/link';
+import { ListItemNode } from '@/renderer/editor/extensions/list-item';
+import { ListKeymapExtension } from '@/renderer/editor/extensions/list-keymap';
+import { MessageNode } from '@/renderer/editor/extensions/message';
+import { OrderedListNode } from '@/renderer/editor/extensions/ordered-list';
+import { ParagraphNode } from '@/renderer/editor/extensions/paragraph';
+import { PlaceholderExtension } from '@/renderer/editor/extensions/placeholder';
+import { TabKeymapExtension } from '@/renderer/editor/extensions/tab-keymap';
+import { TaskItemNode } from '@/renderer/editor/extensions/task-item';
+import { TaskListNode } from '@/renderer/editor/extensions/task-list';
+import { TrailingNode } from '@/renderer/editor/extensions/trailing-node';
+import { PageNode } from '@/renderer/editor/extensions/page';
+
+export {
+ IdExtension,
+ BoldMark,
+ BlockquoteNode,
+ BulletListNode,
+ TabKeymapExtension,
+ CodeBlockNode,
+ CodeMark,
+ ColorMark,
+ CommanderExtension,
+ DeleteControlExtension,
+ DividerNode,
+ DocumentNode,
+ Heading1Node,
+ Heading2Node,
+ Heading3Node,
+ HighlightMark,
+ ItalicMark,
+ LinkMark,
+ ListItemNode,
+ ListKeymapExtension,
+ MessageNode,
+ PlaceholderExtension,
+ OrderedListNode,
+ ParagraphNode,
+ StrikethroughMark,
+ TaskItemNode,
+ TaskListNode,
+ TextNode,
+ TrailingNode,
+ UnderlineMark,
+ DropcursorExtension,
+ PageNode,
+};
diff --git a/desktop/src/editor/extensions/link.tsx b/desktop/src/renderer/editor/extensions/link.tsx
similarity index 76%
rename from desktop/src/editor/extensions/link.tsx
rename to desktop/src/renderer/editor/extensions/link.tsx
index 9e60bdc9..b827041e 100644
--- a/desktop/src/editor/extensions/link.tsx
+++ b/desktop/src/renderer/editor/extensions/link.tsx
@@ -1,6 +1,6 @@
import Link from '@tiptap/extension-link';
-import { defaultClasses } from '@/editor/classes';
+import { defaultClasses } from '@/renderer/editor/classes';
export const LinkMark = Link.extend({
inclusive: false,
@@ -10,4 +10,3 @@ export const LinkMark = Link.extend({
class: defaultClasses.link,
},
});
-
diff --git a/desktop/src/editor/extensions/list-item.tsx b/desktop/src/renderer/editor/extensions/list-item.tsx
similarity index 73%
rename from desktop/src/editor/extensions/list-item.tsx
rename to desktop/src/renderer/editor/extensions/list-item.tsx
index 926937eb..c5285fa5 100644
--- a/desktop/src/editor/extensions/list-item.tsx
+++ b/desktop/src/renderer/editor/extensions/list-item.tsx
@@ -1,6 +1,6 @@
import ListItem from '@tiptap/extension-list-item';
-import { defaultClasses } from '@/editor/classes';
+import { defaultClasses } from '@/renderer/editor/classes';
export const ListItemNode = ListItem.configure({
HTMLAttributes: {
diff --git a/desktop/src/editor/extensions/list-keymap.tsx b/desktop/src/renderer/editor/extensions/list-keymap.tsx
similarity index 100%
rename from desktop/src/editor/extensions/list-keymap.tsx
rename to desktop/src/renderer/editor/extensions/list-keymap.tsx
diff --git a/desktop/src/editor/extensions/message.tsx b/desktop/src/renderer/editor/extensions/message.tsx
similarity index 100%
rename from desktop/src/editor/extensions/message.tsx
rename to desktop/src/renderer/editor/extensions/message.tsx
diff --git a/desktop/src/editor/extensions/ordered-list.tsx b/desktop/src/renderer/editor/extensions/ordered-list.tsx
similarity index 75%
rename from desktop/src/editor/extensions/ordered-list.tsx
rename to desktop/src/renderer/editor/extensions/ordered-list.tsx
index 48da0ab0..067e4e2a 100644
--- a/desktop/src/editor/extensions/ordered-list.tsx
+++ b/desktop/src/renderer/editor/extensions/ordered-list.tsx
@@ -1,6 +1,6 @@
import OrderedList from '@tiptap/extension-ordered-list';
-import { defaultClasses } from '@/editor/classes';
+import { defaultClasses } from '@/renderer/editor/classes';
export const OrderedListNode = OrderedList.configure({
HTMLAttributes: {
diff --git a/desktop/src/editor/extensions/page.tsx b/desktop/src/renderer/editor/extensions/page.tsx
similarity index 91%
rename from desktop/src/editor/extensions/page.tsx
rename to desktop/src/renderer/editor/extensions/page.tsx
index 8fbf246e..ecac011a 100644
--- a/desktop/src/editor/extensions/page.tsx
+++ b/desktop/src/renderer/editor/extensions/page.tsx
@@ -1,6 +1,6 @@
import { mergeAttributes, Node } from '@tiptap/core';
import { ReactNodeViewRenderer } from '@tiptap/react';
-import { PageNodeView } from '@/editor/views';
+import { PageNodeView } from '@/renderer/editor/views';
const PageNode = Node.create({
name: 'page',
diff --git a/desktop/src/editor/extensions/paragraph.tsx b/desktop/src/renderer/editor/extensions/paragraph.tsx
similarity index 74%
rename from desktop/src/editor/extensions/paragraph.tsx
rename to desktop/src/renderer/editor/extensions/paragraph.tsx
index 16c6d23c..9cd7090d 100644
--- a/desktop/src/editor/extensions/paragraph.tsx
+++ b/desktop/src/renderer/editor/extensions/paragraph.tsx
@@ -1,6 +1,6 @@
import Paragraph from '@tiptap/extension-paragraph';
-import { defaultClasses } from '@/editor/classes';
+import { defaultClasses } from '@/renderer/editor/classes';
export const ParagraphNode = Paragraph.configure({
HTMLAttributes: {
diff --git a/desktop/src/editor/extensions/placeholder.tsx b/desktop/src/renderer/editor/extensions/placeholder.tsx
similarity index 100%
rename from desktop/src/editor/extensions/placeholder.tsx
rename to desktop/src/renderer/editor/extensions/placeholder.tsx
diff --git a/desktop/src/editor/extensions/tab-keymap.tsx b/desktop/src/renderer/editor/extensions/tab-keymap.tsx
similarity index 100%
rename from desktop/src/editor/extensions/tab-keymap.tsx
rename to desktop/src/renderer/editor/extensions/tab-keymap.tsx
diff --git a/desktop/src/editor/extensions/task-item.tsx b/desktop/src/renderer/editor/extensions/task-item.tsx
similarity index 73%
rename from desktop/src/editor/extensions/task-item.tsx
rename to desktop/src/renderer/editor/extensions/task-item.tsx
index 53b6ae92..f6528c00 100644
--- a/desktop/src/editor/extensions/task-item.tsx
+++ b/desktop/src/renderer/editor/extensions/task-item.tsx
@@ -1,6 +1,6 @@
import TaskItem from '@tiptap/extension-task-item';
-import { defaultClasses } from '@/editor/classes';
+import { defaultClasses } from '@/renderer/editor/classes';
export const TaskItemNode = TaskItem.configure({
HTMLAttributes: {
diff --git a/desktop/src/editor/extensions/task-list.tsx b/desktop/src/renderer/editor/extensions/task-list.tsx
similarity index 73%
rename from desktop/src/editor/extensions/task-list.tsx
rename to desktop/src/renderer/editor/extensions/task-list.tsx
index 0a11b31d..d7ac2ffa 100644
--- a/desktop/src/editor/extensions/task-list.tsx
+++ b/desktop/src/renderer/editor/extensions/task-list.tsx
@@ -1,6 +1,6 @@
import TaskList from '@tiptap/extension-task-list';
-import { defaultClasses } from '@/editor/classes';
+import { defaultClasses } from '@/renderer/editor/classes';
export const TaskListNode = TaskList.configure({
HTMLAttributes: {
diff --git a/desktop/src/editor/extensions/trailing-node.tsx b/desktop/src/renderer/editor/extensions/trailing-node.tsx
similarity index 100%
rename from desktop/src/editor/extensions/trailing-node.tsx
rename to desktop/src/renderer/editor/extensions/trailing-node.tsx
diff --git a/desktop/src/editor/mappers.ts b/desktop/src/renderer/editor/mappers.ts
similarity index 100%
rename from desktop/src/editor/mappers.ts
rename to desktop/src/renderer/editor/mappers.ts
diff --git a/desktop/src/editor/menu/bubble-menu.tsx b/desktop/src/renderer/editor/menu/bubble-menu.tsx
similarity index 95%
rename from desktop/src/editor/menu/bubble-menu.tsx
rename to desktop/src/renderer/editor/menu/bubble-menu.tsx
index b02131e9..5a0595b2 100644
--- a/desktop/src/editor/menu/bubble-menu.tsx
+++ b/desktop/src/renderer/editor/menu/bubble-menu.tsx
@@ -6,9 +6,9 @@ import {
} from '@tiptap/react';
import { useState } from 'react';
-import { Icon } from '@/components/ui/icon';
-import { ColorButton } from '@/editor/menu/color-button';
-import { LinkButton } from '@/editor/menu/link-button';
+import { Icon } from '@/renderer/components/ui/icon';
+import { ColorButton } from '@/renderer/editor/menu/color-button';
+import { LinkButton } from '@/renderer/editor/menu/link-button';
import { cn } from '@/lib/utils';
type EditorBubbleMenuProps = Omit<BubbleMenuProps, 'children'>;
diff --git a/desktop/src/editor/menu/color-button.tsx b/desktop/src/renderer/editor/menu/color-button.tsx
similarity index 96%
rename from desktop/src/editor/menu/color-button.tsx
rename to desktop/src/renderer/editor/menu/color-button.tsx
index 33a83065..88c63139 100644
--- a/desktop/src/editor/menu/color-button.tsx
+++ b/desktop/src/renderer/editor/menu/color-button.tsx
@@ -1,12 +1,12 @@
import React from 'react';
import { Editor } from '@tiptap/core';
-import { Icon } from '@/components/ui/icon';
+import { Icon } from '@/renderer/components/ui/icon';
import {
Popover,
PopoverTrigger,
PopoverContent,
-} from '@/components/ui/popover';
+} from '@/renderer/components/ui/popover';
import { cn } from '@/lib/utils';
interface ColorItem {
@@ -74,9 +74,9 @@ const colors: ColorItem[] = [
];
export const ColorButton = ({
- editor,
- isOpen,
- setIsOpen,
+ editor,
+ isOpen,
+ setIsOpen,
}: {
editor: Editor;
isOpen: boolean;
diff --git a/desktop/src/editor/menu/link-button.tsx b/desktop/src/renderer/editor/menu/link-button.tsx
similarity index 90%
rename from desktop/src/editor/menu/link-button.tsx
rename to desktop/src/renderer/editor/menu/link-button.tsx
index 6d18a4e2..c78b2308 100644
--- a/desktop/src/editor/menu/link-button.tsx
+++ b/desktop/src/renderer/editor/menu/link-button.tsx
@@ -1,13 +1,13 @@
-import React from "react";
+import React from 'react';
import { Editor } from '@tiptap/core';
-import { Icon } from '@/components/ui/icon';
-import { Input } from '@/components/ui/input';
+import { Icon } from '@/renderer/components/ui/icon';
+import { Input } from '@/renderer/components/ui/input';
import {
Popover,
PopoverTrigger,
PopoverContent,
-} from '@/components/ui/popover';
+} from '@/renderer/components/ui/popover';
import { cn } from '@/lib/utils';
const isValidUrl = (url: string) => {
@@ -36,13 +36,9 @@ interface LinkButtonProps {
editor: Editor;
isOpen: boolean;
setIsOpen: (isOpen: boolean) => void;
-};
+}
-export const LinkButton = ({
- editor,
- isOpen,
- setIsOpen,
-}: LinkButtonProps) => {
+export const LinkButton = ({ editor, isOpen, setIsOpen }: LinkButtonProps) => {
return (
<Popover open={isOpen} onOpenChange={setIsOpen} modal={true}>
<PopoverTrigger>
diff --git a/desktop/src/editor/observer.ts b/desktop/src/renderer/editor/observer.ts
similarity index 99%
rename from desktop/src/editor/observer.ts
rename to desktop/src/renderer/editor/observer.ts
index ff6c6d58..850bf84e 100644
--- a/desktop/src/editor/observer.ts
+++ b/desktop/src/renderer/editor/observer.ts
@@ -5,7 +5,10 @@ import { Workspace } from '@/types/workspaces';
import { Editor, JSONContent } from '@tiptap/core';
import { CompiledQuery, Kysely } from 'kysely';
import { debounce, isEqual } from 'lodash';
-import { mapContentsToEditorNodes, mapNodesToContents } from '@/editor/mappers';
+import {
+ mapContentsToEditorNodes,
+ mapNodesToContents,
+} from '@/renderer/editor/mappers';
import { EditorNode } from '@/types/editor';
import * as Y from 'yjs';
import { fromUint8Array, toUint8Array } from 'js-base64';
diff --git a/desktop/src/editor/renderers/blockquote.tsx b/desktop/src/renderer/editor/renderers/blockquote.tsx
similarity index 75%
rename from desktop/src/editor/renderers/blockquote.tsx
rename to desktop/src/renderer/editor/renderers/blockquote.tsx
index 55792e1c..fc003de1 100644
--- a/desktop/src/editor/renderers/blockquote.tsx
+++ b/desktop/src/renderer/editor/renderers/blockquote.tsx
@@ -1,6 +1,6 @@
import React from 'react';
-import { defaultClasses } from '@/editor/classes';
-import { NodeChildrenRenderer } from '@/editor/renderers/node-children';
+import { defaultClasses } from '@/renderer/editor/classes';
+import { NodeChildrenRenderer } from '@/renderer/editor/renderers/node-children';
import { LocalNodeWithChildren } from '@/types/nodes';
interface BlockquoteRendererProps {
diff --git a/desktop/src/editor/renderers/bullet-list.tsx b/desktop/src/renderer/editor/renderers/bullet-list.tsx
similarity index 74%
rename from desktop/src/editor/renderers/bullet-list.tsx
rename to desktop/src/renderer/editor/renderers/bullet-list.tsx
index fdb9d9a6..94236c46 100644
--- a/desktop/src/editor/renderers/bullet-list.tsx
+++ b/desktop/src/renderer/editor/renderers/bullet-list.tsx
@@ -1,6 +1,6 @@
import React from 'react';
-import { defaultClasses } from '@/editor/classes';
-import { NodeChildrenRenderer } from '@/editor/renderers/node-children';
+import { defaultClasses } from '@/renderer/editor/classes';
+import { NodeChildrenRenderer } from '@/renderer/editor/renderers/node-children';
import { LocalNodeWithChildren } from '@/types/nodes';
interface BulletListRendererProps {
diff --git a/desktop/src/editor/renderers/code-block.tsx b/desktop/src/renderer/editor/renderers/code-block.tsx
similarity index 93%
rename from desktop/src/editor/renderers/code-block.tsx
rename to desktop/src/renderer/editor/renderers/code-block.tsx
index 40d454fc..7abb5b39 100644
--- a/desktop/src/editor/renderers/code-block.tsx
+++ b/desktop/src/renderer/editor/renderers/code-block.tsx
@@ -1,7 +1,7 @@
import React from 'react';
-import { Icon } from '@/components/ui/icon';
-import { defaultClasses } from '@/editor/classes';
+import { Icon } from '@/renderer/components/ui/icon';
+import { defaultClasses } from '@/renderer/editor/classes';
import { LocalNodeWithChildren } from '@/types/nodes';
import { highlightCode, languages } from '@/lib/lowlight';
diff --git a/desktop/src/editor/renderers/document.tsx b/desktop/src/renderer/editor/renderers/document.tsx
similarity index 80%
rename from desktop/src/editor/renderers/document.tsx
rename to desktop/src/renderer/editor/renderers/document.tsx
index fa90a32c..f72146ce 100644
--- a/desktop/src/editor/renderers/document.tsx
+++ b/desktop/src/renderer/editor/renderers/document.tsx
@@ -1,5 +1,5 @@
import React from 'react';
-import { NodeChildrenRenderer } from '@/editor/renderers/node-children';
+import { NodeChildrenRenderer } from '@/renderer/editor/renderers/node-children';
import { LocalNodeWithChildren } from '@/types/nodes';
interface DocumentRendererProps {
diff --git a/desktop/src/editor/renderers/heading1.tsx b/desktop/src/renderer/editor/renderers/heading1.tsx
similarity index 74%
rename from desktop/src/editor/renderers/heading1.tsx
rename to desktop/src/renderer/editor/renderers/heading1.tsx
index b8be0a34..012e735b 100644
--- a/desktop/src/editor/renderers/heading1.tsx
+++ b/desktop/src/renderer/editor/renderers/heading1.tsx
@@ -1,6 +1,6 @@
import React from 'react';
-import { defaultClasses } from '@/editor/classes';
-import { NodeChildrenRenderer } from '@/editor/renderers/node-children';
+import { defaultClasses } from '@/renderer/editor/classes';
+import { NodeChildrenRenderer } from '@/renderer/editor/renderers/node-children';
import { LocalNodeWithChildren } from '@/types/nodes';
interface Heading1RendererProps {
diff --git a/desktop/src/editor/renderers/heading2.tsx b/desktop/src/renderer/editor/renderers/heading2.tsx
similarity index 74%
rename from desktop/src/editor/renderers/heading2.tsx
rename to desktop/src/renderer/editor/renderers/heading2.tsx
index 8cb2285d..6348dc69 100644
--- a/desktop/src/editor/renderers/heading2.tsx
+++ b/desktop/src/renderer/editor/renderers/heading2.tsx
@@ -1,6 +1,6 @@
import React from 'react';
-import { defaultClasses } from '@/editor/classes';
-import { NodeChildrenRenderer } from '@/editor/renderers/node-children';
+import { defaultClasses } from '@/renderer/editor/classes';
+import { NodeChildrenRenderer } from '@/renderer/editor/renderers/node-children';
import { LocalNodeWithChildren } from '@/types/nodes';
interface Heading2RendererProps {
diff --git a/desktop/src/editor/renderers/heading3.tsx b/desktop/src/renderer/editor/renderers/heading3.tsx
similarity index 74%
rename from desktop/src/editor/renderers/heading3.tsx
rename to desktop/src/renderer/editor/renderers/heading3.tsx
index 78332427..f6331e2f 100644
--- a/desktop/src/editor/renderers/heading3.tsx
+++ b/desktop/src/renderer/editor/renderers/heading3.tsx
@@ -1,6 +1,6 @@
import React from 'react';
-import { defaultClasses } from '@/editor/classes';
-import { NodeChildrenRenderer } from '@/editor/renderers/node-children';
+import { defaultClasses } from '@/renderer/editor/classes';
+import { NodeChildrenRenderer } from '@/renderer/editor/renderers/node-children';
import { LocalNodeWithChildren } from '@/types/nodes';
interface Heading3RendererProps {
diff --git a/desktop/src/editor/renderers/list-item.tsx b/desktop/src/renderer/editor/renderers/list-item.tsx
similarity index 74%
rename from desktop/src/editor/renderers/list-item.tsx
rename to desktop/src/renderer/editor/renderers/list-item.tsx
index 5389edc9..c53cd27e 100644
--- a/desktop/src/editor/renderers/list-item.tsx
+++ b/desktop/src/renderer/editor/renderers/list-item.tsx
@@ -1,6 +1,6 @@
import React from 'react';
-import { defaultClasses } from '@/editor/classes';
-import { NodeChildrenRenderer } from '@/editor/renderers/node-children';
+import { defaultClasses } from '@/renderer/editor/classes';
+import { NodeChildrenRenderer } from '@/renderer/editor/renderers/node-children';
import { LocalNodeWithChildren } from '@/types/nodes';
interface ListItemRendererProps {
diff --git a/desktop/src/editor/renderers/mark.tsx b/desktop/src/renderer/editor/renderers/mark.tsx
similarity index 95%
rename from desktop/src/editor/renderers/mark.tsx
rename to desktop/src/renderer/editor/renderers/mark.tsx
index 0bbc7ced..8ea473e6 100644
--- a/desktop/src/editor/renderers/mark.tsx
+++ b/desktop/src/renderer/editor/renderers/mark.tsx
@@ -1,5 +1,5 @@
import React from 'react';
-import { defaultClasses } from '@/editor/classes';
+import { defaultClasses } from '@/renderer/editor/classes';
import { NodeBlock } from '@/types/nodes';
interface MarkRendererProps {
diff --git a/desktop/src/editor/renderers/message.tsx b/desktop/src/renderer/editor/renderers/message.tsx
similarity index 80%
rename from desktop/src/editor/renderers/message.tsx
rename to desktop/src/renderer/editor/renderers/message.tsx
index 2bafae83..fbe9ed3a 100644
--- a/desktop/src/editor/renderers/message.tsx
+++ b/desktop/src/renderer/editor/renderers/message.tsx
@@ -1,5 +1,5 @@
import React from 'react';
-import { NodeChildrenRenderer } from '@/editor/renderers/node-children';
+import { NodeChildrenRenderer } from '@/renderer/editor/renderers/node-children';
import { LocalNodeWithChildren } from '@/types/nodes';
interface MessageRendererProps {
diff --git a/desktop/src/editor/renderers/node-block.tsx b/desktop/src/renderer/editor/renderers/node-block.tsx
similarity index 71%
rename from desktop/src/editor/renderers/node-block.tsx
rename to desktop/src/renderer/editor/renderers/node-block.tsx
index e11f7c45..72900916 100644
--- a/desktop/src/editor/renderers/node-block.tsx
+++ b/desktop/src/renderer/editor/renderers/node-block.tsx
@@ -1,7 +1,7 @@
import React from 'react';
import { NodeBlock } from '@/types/nodes';
-import { TextRenderer } from '@/editor/renderers/text';
-import { MarkRenderer } from '@/editor/renderers/mark';
+import { TextRenderer } from '@/renderer/editor/renderers/text';
+import { MarkRenderer } from '@/renderer/editor/renderers/mark';
interface NodeBlockRendererProps {
node: NodeBlock;
diff --git a/desktop/src/editor/renderers/node-children.tsx b/desktop/src/renderer/editor/renderers/node-children.tsx
similarity index 84%
rename from desktop/src/editor/renderers/node-children.tsx
rename to desktop/src/renderer/editor/renderers/node-children.tsx
index 793f40c8..b2271b08 100644
--- a/desktop/src/editor/renderers/node-children.tsx
+++ b/desktop/src/renderer/editor/renderers/node-children.tsx
@@ -1,8 +1,8 @@
import React from 'react';
import { LocalNodeWithChildren } from '@/types/nodes';
-import { NodeBlockRenderer } from '@/editor/renderers/node-block';
-import { NodeRenderer } from '@/editor/renderers/node';
+import { NodeBlockRenderer } from '@/renderer/editor/renderers/node-block';
+import { NodeRenderer } from '@/renderer/editor/renderers/node';
interface NodeChildrenRendererProps {
node: LocalNodeWithChildren;
diff --git a/desktop/src/editor/renderers/node.tsx b/desktop/src/renderer/editor/renderers/node.tsx
similarity index 62%
rename from desktop/src/editor/renderers/node.tsx
rename to desktop/src/renderer/editor/renderers/node.tsx
index 2b9e63b7..43fcaaf4 100644
--- a/desktop/src/editor/renderers/node.tsx
+++ b/desktop/src/renderer/editor/renderers/node.tsx
@@ -1,18 +1,18 @@
import React, { ReactElement } from 'react';
-import { BlockquoteRenderer } from '@/editor/renderers/blockquote';
-import { BulletListRenderer } from '@/editor/renderers/bullet-list';
-import { CodeBlockRenderer } from '@/editor/renderers/code-block';
-import { DocumentRenderer } from '@/editor/renderers/document';
-import { Heading1Renderer } from '@/editor/renderers/heading1';
-import { Heading2Renderer } from '@/editor/renderers/heading2';
-import { Heading3Renderer } from '@/editor/renderers/heading3';
-import { ListItemRenderer } from '@/editor/renderers/list-item';
-import { MessageRenderer } from '@/editor/renderers/message';
-import { OrderedListRenderer } from '@/editor/renderers/ordered-list';
-import { ParagraphRenderer } from '@/editor/renderers/paragraph';
-import { TaskItemRenderer } from '@/editor/renderers/task-item';
-import { TaskListRenderer } from '@/editor/renderers/task-list';
-import { TextRenderer } from '@/editor/renderers/text';
+import { BlockquoteRenderer } from '@/renderer/editor/renderers/blockquote';
+import { BulletListRenderer } from '@/renderer/editor/renderers/bullet-list';
+import { CodeBlockRenderer } from '@/renderer/editor/renderers/code-block';
+import { DocumentRenderer } from '@/renderer/editor/renderers/document';
+import { Heading1Renderer } from '@/renderer/editor/renderers/heading1';
+import { Heading2Renderer } from '@/renderer/editor/renderers/heading2';
+import { Heading3Renderer } from '@/renderer/editor/renderers/heading3';
+import { ListItemRenderer } from '@/renderer/editor/renderers/list-item';
+import { MessageRenderer } from '@/renderer/editor/renderers/message';
+import { OrderedListRenderer } from '@/renderer/editor/renderers/ordered-list';
+import { ParagraphRenderer } from '@/renderer/editor/renderers/paragraph';
+import { TaskItemRenderer } from '@/renderer/editor/renderers/task-item';
+import { TaskListRenderer } from '@/renderer/editor/renderers/task-list';
+import { TextRenderer } from '@/renderer/editor/renderers/text';
import { LocalNodeWithChildren } from '@/types/nodes';
import { match } from 'ts-pattern';
diff --git a/desktop/src/editor/renderers/ordered-list.tsx b/desktop/src/renderer/editor/renderers/ordered-list.tsx
similarity index 74%
rename from desktop/src/editor/renderers/ordered-list.tsx
rename to desktop/src/renderer/editor/renderers/ordered-list.tsx
index 6df470dd..25884026 100644
--- a/desktop/src/editor/renderers/ordered-list.tsx
+++ b/desktop/src/renderer/editor/renderers/ordered-list.tsx
@@ -1,6 +1,6 @@
import React from 'react';
-import { defaultClasses } from '@/editor/classes';
-import { NodeChildrenRenderer } from '@/editor/renderers/node-children';
+import { defaultClasses } from '@/renderer/editor/classes';
+import { NodeChildrenRenderer } from '@/renderer/editor/renderers/node-children';
import { LocalNodeWithChildren } from '@/types/nodes';
interface OrderedListRendererProps {
diff --git a/desktop/src/editor/renderers/paragraph.tsx b/desktop/src/renderer/editor/renderers/paragraph.tsx
similarity index 79%
rename from desktop/src/editor/renderers/paragraph.tsx
rename to desktop/src/renderer/editor/renderers/paragraph.tsx
index 73702913..7a293d37 100644
--- a/desktop/src/editor/renderers/paragraph.tsx
+++ b/desktop/src/renderer/editor/renderers/paragraph.tsx
@@ -1,6 +1,6 @@
import React from 'react';
-import { defaultClasses } from '@/editor/classes';
-import { NodeChildrenRenderer } from '@/editor/renderers/node-children';
+import { defaultClasses } from '@/renderer/editor/classes';
+import { NodeChildrenRenderer } from '@/renderer/editor/renderers/node-children';
import { LocalNodeWithChildren } from '@/types/nodes';
import { cn } from '@/lib/utils';
diff --git a/desktop/src/editor/renderers/task-item.tsx b/desktop/src/renderer/editor/renderers/task-item.tsx
similarity index 74%
rename from desktop/src/editor/renderers/task-item.tsx
rename to desktop/src/renderer/editor/renderers/task-item.tsx
index 09f3b1c8..dcee4aeb 100644
--- a/desktop/src/editor/renderers/task-item.tsx
+++ b/desktop/src/renderer/editor/renderers/task-item.tsx
@@ -1,6 +1,6 @@
import React from 'react';
-import { defaultClasses } from '@/editor/classes';
-import { NodeChildrenRenderer } from '@/editor/renderers/node-children';
+import { defaultClasses } from '@/renderer/editor/classes';
+import { NodeChildrenRenderer } from '@/renderer/editor/renderers/node-children';
import { LocalNodeWithChildren } from '@/types/nodes';
interface TaskItemRendererProps {
diff --git a/desktop/src/editor/renderers/task-list.tsx b/desktop/src/renderer/editor/renderers/task-list.tsx
similarity index 74%
rename from desktop/src/editor/renderers/task-list.tsx
rename to desktop/src/renderer/editor/renderers/task-list.tsx
index 1e14023b..6f02ed29 100644
--- a/desktop/src/editor/renderers/task-list.tsx
+++ b/desktop/src/renderer/editor/renderers/task-list.tsx
@@ -1,6 +1,6 @@
import React from 'react';
-import { defaultClasses } from '@/editor/classes';
-import { NodeChildrenRenderer } from '@/editor/renderers/node-children';
+import { defaultClasses } from '@/renderer/editor/classes';
+import { NodeChildrenRenderer } from '@/renderer/editor/renderers/node-children';
import { LocalNodeWithChildren } from '@/types/nodes';
interface TaskListRendererProps {
diff --git a/desktop/src/editor/renderers/text.tsx b/desktop/src/renderer/editor/renderers/text.tsx
similarity index 100%
rename from desktop/src/editor/renderers/text.tsx
rename to desktop/src/renderer/editor/renderers/text.tsx
diff --git a/desktop/src/editor/views/code-block.tsx b/desktop/src/renderer/editor/views/code-block.tsx
similarity index 93%
rename from desktop/src/editor/views/code-block.tsx
rename to desktop/src/renderer/editor/views/code-block.tsx
index 91ed7cd2..cbb9b65a 100644
--- a/desktop/src/editor/views/code-block.tsx
+++ b/desktop/src/renderer/editor/views/code-block.tsx
@@ -10,14 +10,14 @@ import {
CommandInput,
CommandItem,
CommandList,
-} from '@/components/ui/command';
-import { Icon } from '@/components/ui/icon';
+} from '@/renderer/components/ui/command';
+import { Icon } from '@/renderer/components/ui/icon';
import {
Popover,
PopoverContent,
PopoverTrigger,
-} from '@/components/ui/popover';
-import { defaultClasses } from '@/editor/classes';
+} from '@/renderer/components/ui/popover';
+import { defaultClasses } from '@/renderer/editor/classes';
import { languages } from '@/lib/lowlight';
import { cn } from '@/lib/utils';
diff --git a/desktop/src/renderer/editor/views/index.tsx b/desktop/src/renderer/editor/views/index.tsx
new file mode 100644
index 00000000..edfba40e
--- /dev/null
+++ b/desktop/src/renderer/editor/views/index.tsx
@@ -0,0 +1,4 @@
+import { CodeBlockNodeView } from '@/renderer/editor/views/code-block';
+import { PageNodeView } from '@/renderer/editor/views/page';
+
+export { CodeBlockNodeView, PageNodeView };
diff --git a/desktop/src/editor/views/page.tsx b/desktop/src/renderer/editor/views/page.tsx
similarity index 93%
rename from desktop/src/editor/views/page.tsx
rename to desktop/src/renderer/editor/views/page.tsx
index febb0c53..606d59c6 100644
--- a/desktop/src/editor/views/page.tsx
+++ b/desktop/src/renderer/editor/views/page.tsx
@@ -1,7 +1,7 @@
import React from 'react';
import { type NodeViewProps } from '@tiptap/core';
import { NodeViewWrapper } from '@tiptap/react';
-import { Avatar } from '@/components/ui/avatar';
+import { Avatar } from '@/renderer/components/ui/avatar';
import { useWorkspace } from '@/renderer/contexts/workspace';
export const PageNodeView = ({ node }: NodeViewProps) => {