Open-source and local-first Slack and Notion alternative that puts you in control of your data
TypeScript chatchat-applicationcrdteditorelectronknowledge-baselocal-firstnotionnotion-alternativerealtime-collaborationself-hostedslacksqliteteam-collaborationwikiyjs
UI improvements
Hakan Shehu5541bbecc6f3
diff --git a/desktop/src/components/messages/message-create.tsx b/desktop/src/components/messages/message-create.tsxindex 98dc7fa9..6b9c51ef 100644--- a/desktop/src/components/messages/message-create.tsx+++ b/desktop/src/components/messages/message-create.tsx@@ -9,7 +9,7 @@ interface MessageCreateProps {export const MessageCreate = ({ nodeId, onSubmit }: MessageCreateProps) => {return (- <div className="mt-1 px-10">+ <div className="container mt-1 px-10"><div className="flex flex-col"><MessageEditornodeId={nodeId}diff --git a/desktop/src/components/messages/message-list.tsx b/desktop/src/components/messages/message-list.tsxindex 643bca26..ad97df4e 100644--- a/desktop/src/components/messages/message-list.tsx+++ b/desktop/src/components/messages/message-list.tsx@@ -75,7 +75,7 @@ export const MessageList = ({ conversationId, messages }: MessageListProps) => {{/* {isLoadingPrevious && <Loader />}*/}{/*</div>*/}</InView>- <div className="" ref={containerRef}>+ <div className="container" ref={containerRef}>{messages.map((message, index) => {const previousMessage = index > 0 ? messages[index - 1] : null;diff --git a/desktop/src/components/workspaces/container-header.tsx b/desktop/src/components/workspaces/container-header.tsxindex f6bf6764..3ce5eb1d 100644--- a/desktop/src/components/workspaces/container-header.tsx+++ b/desktop/src/components/workspaces/container-header.tsx@@ -152,7 +152,7 @@ export const ContainerHeader = ({ node }: ContainerHeaderProps) => {const isClickable = (node: LocalNode) => node.type !== NodeTypes.Space;return (- <Breadcrumb className="mx-1 flex h-12 items-center justify-between border-b-2 border-gray-100 p-2 text-foreground/80">+ <Breadcrumb className="mx-1 flex h-12 justify-between p-2 text-foreground/80"><BreadcrumbList>{firstNodes.map((breadcrumbNode) => {return (diff --git a/desktop/src/components/workspaces/sidebar-spaces.tsx b/desktop/src/components/workspaces/sidebar-spaces.tsxindex 7a025853..0b878d9b 100644--- a/desktop/src/components/workspaces/sidebar-spaces.tsx+++ b/desktop/src/components/workspaces/sidebar-spaces.tsx@@ -8,7 +8,7 @@ export const SidebarSpaces = () => {const spaces = sidebar.nodes.filter((node) => node.type === 'space');return (- <div className="pt-3 first:pt-0">+ <div className="pt-2 first:pt-0"><div className="flex items-center justify-between p-1 pb-2 text-xs text-muted-foreground"><span>Spaces</span><SpaceCreateButton />diff --git a/desktop/src/components/workspaces/sidebar.tsx b/desktop/src/components/workspaces/sidebar.tsxindex 47b8c7a4..d9b81e50 100644--- a/desktop/src/components/workspaces/sidebar.tsx+++ b/desktop/src/components/workspaces/sidebar.tsx@@ -1,7 +1,5 @@import React from 'react';import { SidebarHeader } from '@/components/workspaces/sidebar-header';-import { cn } from '@/lib/utils';-import { Icon } from '@/components/ui/icon';import { SidebarSpaces } from '@/components/workspaces/sidebar-spaces';import { LocalNode } from '@/types/nodes';import { SidebarContext } from '@/contexts/sidebar';@@ -9,25 +7,8 @@ import { Spinner } from '@/components/ui/spinner';import { mapNode } from '@/lib/nodes';import { useQuery } from '@tanstack/react-query';import { useWorkspace } from '@/contexts/workspace';--interface LayoutItem {- name: string;- alias: string;- icon: string;-}--const layouts: LayoutItem[] = [- {- name: 'Chats',- alias: 'chat',- icon: 'chat-1-line',- },- {- name: 'Spaces',- alias: 'space',- icon: 'apps-line',- },-];+import { Icon } from '@/components/ui/icon';+import { SpacebarChats } from '@/components/workspaces/spacebar-chats';export const Sidebar = () => {const workspace = useWorkspace();@@ -58,48 +39,25 @@ export const Sidebar = () => {return <Spinner />;}- const currentLayout = 'spaces';const nodes: LocalNode[] = data?.rows.map((row) => mapNode(row)) ?? [];-return (<SidebarContext.Providervalue={{nodes: nodes,}}>- <div className="grid h-full max-h-screen w-full grid-cols-[4rem_1fr] grid-rows-[auto_1fr_auto] border-r border-gray-200">- <div className="col-span-2 h-12">- <SidebarHeader />- </div>- <ul className="mt-2 w-16 border-r border-gray-100 px-1">- {layouts.map((layout) => {- return (- <li- role="presentation"- key={layout.alias}- className={cn(- 'relative mb-1 flex cursor-pointer flex-col items-center justify-center gap-1 rounded-md p-2 hover:bg-gray-100',- currentLayout === layout.alias && 'bg-gray-100',- )}- onClick={() => {}}- >- <Icon- name={layout.icon}- className={cn(- 'h-5 w-5',- currentLayout === layout.alias- ? 'font-bold shadow-sm'- : 'text-muted-foreground',- )}- />- <span className="py-0.5 text-xs text-muted-foreground">- {layout.name}- </span>- </li>- );- })}- </ul>- <div className="relative mt-2 max-h-full flex-grow overflow-hidden px-1">+ <div className="h-full max-h-screen w-full border-r border-gray-200">+ <SidebarHeader />+ <div className="relative mt-2 max-h-full flex-grow overflow-hidden px-2">+ <div className="flex cursor-pointer items-center rounded-md p-1 text-sm text-foreground/80 hover:bg-gray-100">+ <Icon name="search-line" className="mr-2 h-4 w-4" />+ <span>Search</span>+ </div>+ <div className="flex cursor-pointer items-center rounded-md p-1 text-sm text-foreground/80 hover:bg-gray-100">+ <Icon name="inbox-line" className="mr-2 h-4 w-4" />+ <span>Inbox</span>+ </div>+ <SpacebarChats /><SidebarSpaces /></div></div>diff --git a/desktop/src/components/workspaces/spacebar-chats.tsx b/desktop/src/components/workspaces/spacebar-chats.tsxnew file mode 100644index 00000000..6d6aac54--- /dev/null+++ b/desktop/src/components/workspaces/spacebar-chats.tsx@@ -0,0 +1,12 @@+import React from 'react';++export const SpacebarChats = () => {+ return (+ <div className="pt-2 first:pt-0">+ <div className="flex items-center justify-between p-1 pb-2 text-xs text-muted-foreground">+ <span>Chats</span>+ </div>+ <div className="flex flex-col gap-0.5"></div>+ </div>+ );+};