change mobile breadcrumb icon

* minore fixes

apps/client/package.json

@@ -1,7 +1,7 @@
 {
   "name": "client",
   "private": true,
-  "version": "0.20.3",
+  "version": "0.10.2",
   "scripts": {
     "dev": "vite",
     "build": "tsc && vite build",

apps/client/public/locales/de-DE/translation.json

@@ -362,26 +362,5 @@
   "Move page to a different space.": "Seite in einen anderen Bereich verschieben.",
   "Real-time editor connection lost. Retrying...": "Echtzeit-Editor-Verbindung verloren. Wiederholen...",
   "Table of contents": "Inhaltsverzeichnis",
-  "Add headings (H1, H2, H3) to generate a table of contents.": "Fügen Sie Überschriften (H1, H2, H3) hinzu, um ein Inhaltsverzeichnis zu erstellen.",
-  "Share": "Teilen",
-  "Public sharing": "Öffentliches Teilen",
-  "Shared by": "Geteilt von",
-  "Shared at": "Geteilt am",
-  "Inherits public sharing from": "Erbt das öffentliche Teilen von",
-  "Share to web": "Im Web teilen",
-  "Shared to web": "Im Web geteilt",
-  "Anyone with the link can view this page": "Jeder mit dem Link kann diese Seite ansehen",
-  "Make this page publicly accessible": "Diese Seite öffentlich zugänglich machen",
-  "Include sub-pages": "Unterseiten einbeziehen",
-  "Make sub-pages public too": "Unterseiten auch öffentlich machen",
-  "Allow search engines to index page": "Suchmaschinen erlauben, die Seite zu indexieren",
-  "Open page": "Seite öffnen",
-  "Page": "Seite",
-  "Delete public share link": "Öffentlichen Freigabelink löschen",
-  "Delete share": "Freigabe löschen",
-  "Are you sure you want to delete this shared link?": "Möchten Sie diesen Freigabelink wirklich löschen?",
-  "Publicly shared pages from spaces you are a member of will appear here": "Öffentlich geteilte Seiten aus Bereichen, in denen Sie Mitglied sind, erscheinen hier",
-  "Share deleted successfully": "Freigabe erfolgreich gelöscht",
-  "Share not found": "Freigabe nicht gefunden",
-  "Failed to share page": "Fehler beim Teilen der Seite"
+  "Add headings (H1, H2, H3) to generate a table of contents.": "Fügen Sie Überschriften (H1, H2, H3) hinzu, um ein Inhaltsverzeichnis zu erstellen."
 }

apps/client/public/locales/es-ES/translation.json

@@ -94,7 +94,7 @@
   "Invited members will be granted access to spaces the groups can access": "Los miembros invitados recibirán acceso a los espacios a los que los grupos pueden acceder",
   "Join the workspace": "Unirse al espacio de trabajo",
   "Language": "Idioma",
-  "Light": "Claro",
+  "Light": "Ligero",
   "Link copied": "Enlace copiado",
   "Login": "Iniciar sesión",
   "Logout": "Cerrar sesión",
@@ -362,26 +362,5 @@
   "Move page to a different space.": "Mover página a un espacio diferente.",
   "Real-time editor connection lost. Retrying...": "Conexión del editor en tiempo real perdida. Reintentando...",
   "Table of contents": "Índice de contenidos",
-  "Add headings (H1, H2, H3) to generate a table of contents.": "Añadir encabezados (H1, H2, H3) para generar un índice de contenidos.",
-  "Share": "Compartir",
-  "Public sharing": "Compartición pública",
-  "Shared by": "Compartido por",
-  "Shared at": "Compartido en",
-  "Inherits public sharing from": "Hereda la compartición pública de",
-  "Share to web": "Compartir en la web",
-  "Shared to web": "Compartido en la web",
-  "Anyone with the link can view this page": "Cualquiera con el enlace puede ver esta página",
-  "Make this page publicly accessible": "Hacer esta página accesible públicamente",
-  "Include sub-pages": "Incluir subpáginas",
-  "Make sub-pages public too": "Hacer públicas también las subpáginas",
-  "Allow search engines to index page": "Permitir a los motores de búsqueda indexar la página",
-  "Open page": "Abrir página",
-  "Page": "Página",
-  "Delete public share link": "Eliminar enlace de compartición pública",
-  "Delete share": "Eliminar compartición",
-  "Are you sure you want to delete this shared link?": "¿Está seguro de que desea eliminar este enlace compartido?",
-  "Publicly shared pages from spaces you are a member of will appear here": "Las páginas compartidas públicamente de los espacios a los que pertenece aparecerán aquí",
-  "Share deleted successfully": "Compartición eliminada con éxito",
-  "Share not found": "Compartición no encontrada",
-  "Failed to share page": "Error al compartir la página"
+  "Add headings (H1, H2, H3) to generate a table of contents.": "Añadir encabezados (H1, H2, H3) para generar un índice de contenidos."
 }

apps/client/public/locales/fr-FR/translation.json

@@ -362,26 +362,5 @@
   "Move page to a different space.": "Déplacer la page vers un autre espace.",
   "Real-time editor connection lost. Retrying...": "Connexion avec l'éditeur en temps réel perdue. Nouvelle tentative...",
   "Table of contents": "",
-  "Add headings (H1, H2, H3) to generate a table of contents.": "Ajoutez des titres (H1, H2, H3) pour générer une table des matières.",
-  "Share": "Partager",
-  "Public sharing": "Partage public",
-  "Shared by": "Partagé par",
-  "Shared at": "Partagé à",
-  "Inherits public sharing from": "Hérite du partage public de",
-  "Share to web": "Partager sur le web",
-  "Shared to web": "Partagé sur le web",
-  "Anyone with the link can view this page": "Toute personne avec le lien peut voir cette page",
-  "Make this page publicly accessible": "Rendre cette page accessible au public",
-  "Include sub-pages": "Inclure les sous-pages",
-  "Make sub-pages public too": "Rendre également les sous-pages publiques",
-  "Allow search engines to index page": "Autoriser les moteurs de recherche à indexer la page",
-  "Open page": "Ouvrir la page",
-  "Page": "Page",
-  "Delete public share link": "Supprimer le lien de partage public",
-  "Delete share": "Supprimer le partage",
-  "Are you sure you want to delete this shared link?": "Êtes-vous sûr de vouloir supprimer ce lien partagé ?",
-  "Publicly shared pages from spaces you are a member of will appear here": "Les pages partagées publiquement des espaces dont vous êtes membre apparaîtront ici",
-  "Share deleted successfully": "Partage supprimé avec succès",
-  "Share not found": "Partage non trouvé",
-  "Failed to share page": "Échec du partage de la page"
+  "Add headings (H1, H2, H3) to generate a table of contents.": "Ajoutez des titres (H1, H2, H3) pour générer une table des matières."
 }

apps/client/public/locales/it-IT/translation.json

@@ -362,26 +362,5 @@
   "Move page to a different space.": "Sposta la pagina in un altro spazio.",
   "Real-time editor connection lost. Retrying...": "Connessione all'editor in tempo reale persa. Riprovo...",
   "Table of contents": "Indice dei contenuti",
-  "Add headings (H1, H2, H3) to generate a table of contents.": "Aggiungi intestazioni (H1, H2, H3) per generare un sommario.",
-  "Share": "Condividi",
-  "Public sharing": "Condivisione pubblica",
-  "Shared by": "Condiviso da",
-  "Shared at": "Condiviso il",
-  "Inherits public sharing from": "Eredita la condivisione pubblica da",
-  "Share to web": "Condividi su web",
-  "Shared to web": "Condiviso su web",
-  "Anyone with the link can view this page": "Chiunque abbia il link può visualizzare questa pagina",
-  "Make this page publicly accessible": "Rendi questa pagina accessibile pubblicamente",
-  "Include sub-pages": "Includi sotto-pagine",
-  "Make sub-pages public too": "Rendi pubbliche anche le sotto-pagine",
-  "Allow search engines to index page": "Permetti ai motori di ricerca di indicizzare la pagina",
-  "Open page": "Apri pagina",
-  "Page": "Pagina",
-  "Delete public share link": "Elimina il link di condivisione pubblica",
-  "Delete share": "Elimina condivisione",
-  "Are you sure you want to delete this shared link?": "Sei sicuro di voler eliminare questo link condiviso?",
-  "Publicly shared pages from spaces you are a member of will appear here": "Le pagine condivise pubblicamente dagli spazi di cui sei membro appariranno qui",
-  "Share deleted successfully": "Condivisione eliminata con successo",
-  "Share not found": "Condivisione non trovata",
-  "Failed to share page": "Condivisione della pagina fallita"
+  "Add headings (H1, H2, H3) to generate a table of contents.": "Aggiungi intestazioni (H1, H2, H3) per generare un sommario."
 }

apps/client/public/locales/ja-JP/translation.json

@@ -362,26 +362,5 @@
   "Move page to a different space.": "ページを別のスペースに移動します。",
   "Real-time editor connection lost. Retrying...": "リアルタイムエディターの接続が失われました。再試行しています…",
   "Table of contents": "目次",
-  "Add headings (H1, H2, H3) to generate a table of contents.": "見出し（H1、H2、H3）を追加して目次を生成します。",
-  "Share": "共有",
-  "Public sharing": "公開共有",
-  "Shared by": "共有者",
-  "Shared at": "共有日時",
-  "Inherits public sharing from": "から公開共有を継承する",
-  "Share to web": "ウェブで共有",
-  "Shared to web": "ウェブに共有済み",
-  "Anyone with the link can view this page": "リンクを持っている人はこのページを閲覧できます",
-  "Make this page publicly accessible": "このページを公開します",
-  "Include sub-pages": "サブページを含む",
-  "Make sub-pages public too": "サブページも公開する",
-  "Allow search engines to index page": "検索エンジンにページのインデックス作成を許可する",
-  "Open page": "ページを開く",
-  "Page": "ページ",
-  "Delete public share link": "公開リンクを削除",
-  "Delete share": "共有を削除",
-  "Are you sure you want to delete this shared link?": "この共有リンクを削除してもよろしいですか?",
-  "Publicly shared pages from spaces you are a member of will appear here": "メンバーであるスペースからの公開ページがここに表示されます",
-  "Share deleted successfully": "共有が正常に削除されました",
-  "Share not found": "共有が見つかりません",
-  "Failed to share page": "ページの共有に失敗しました"
+  "Add headings (H1, H2, H3) to generate a table of contents.": "見出し（H1、H2、H3）を追加して目次を生成します。"
 }

apps/client/public/locales/ko-KR/translation.json

@@ -362,26 +362,5 @@
   "Move page to a different space.": "페이지를 다른 공간으로 이동합니다.",
   "Real-time editor connection lost. Retrying...": "실시간 편집기 연결이 끊어졌습니다. 재시도 중...",
   "Table of contents": "목차",
-  "Add headings (H1, H2, H3) to generate a table of contents.": "목차를 생성하려면 제목 (H1, H2, H3)을 추가하세요.",
-  "Share": "공유",
-  "Public sharing": "공개 공유",
-  "Shared by": "공유자",
-  "Shared at": "공유 시간",
-  "Inherits public sharing from": "로부터 공개 공유를 상속함",
-  "Share to web": "웹에 공유",
-  "Shared to web": "웹에 공유됨",
-  "Anyone with the link can view this page": "링크가 있는 사람은 이 페이지를 볼 수 있습니다",
-  "Make this page publicly accessible": "이 페이지를 공개적으로 접근 가능하게 만들기",
-  "Include sub-pages": "하위 페이지 포함",
-  "Make sub-pages public too": "하위 페이지도 공개로 설정",
-  "Allow search engines to index page": "검색 엔진이 페이지를 색인할 수 있도록 허용",
-  "Open page": "페이지 열기",
-  "Page": "페이지",
-  "Delete public share link": "공유 링크 삭제",
-  "Delete share": "공유 삭제",
-  "Are you sure you want to delete this shared link?": "이 공유 링크를 삭제하시겠습니까?",
-  "Publicly shared pages from spaces you are a member of will appear here": "회원인 공간의 공개 공유된 페이지가 여기에 표시됩니다",
-  "Share deleted successfully": "공유가 성공적으로 삭제되었습니다",
-  "Share not found": "공유를 찾을 수 없습니다",
-  "Failed to share page": "페이지 공유에 실패했습니다"
+  "Add headings (H1, H2, H3) to generate a table of contents.": "목차를 생성하려면 제목 (H1, H2, H3)을 추가하세요."
 }

apps/client/public/locales/nl-NL/translation.json

@@ -362,26 +362,5 @@
   "Move page to a different space.": "Verplaats pagina naar een andere ruimte.",
   "Real-time editor connection lost. Retrying...": "Realtime editorverbinding verloren. Opnieuw proberen...",
   "Table of contents": "Inhoudsopgave",
-  "Add headings (H1, H2, H3) to generate a table of contents.": "Voeg koppen (H1, H2, H3) toe om een inhoudsopgave te genereren.",
-  "Share": "Delen",
-  "Public sharing": "Openbaar delen",
-  "Shared by": "Gedeeld door",
-  "Shared at": "Gedeeld op",
-  "Inherits public sharing from": "Erft openbaar delen van",
-  "Share to web": "Delen naar web",
-  "Shared to web": "Gedeeld naar web",
-  "Anyone with the link can view this page": "Iedereen met de link kan deze pagina bekijken",
-  "Make this page publicly accessible": "Maak deze pagina openbaar toegankelijk",
-  "Include sub-pages": "Inclusief subpagina's",
-  "Make sub-pages public too": "Maak subpagina's ook openbaar",
-  "Allow search engines to index page": "Sta zoekmachines toe om pagina te indexeren",
-  "Open page": "Pagina openen",
-  "Page": "Pagina",
-  "Delete public share link": "Verwijder openbare deel-link",
-  "Delete share": "Verwijder deel",
-  "Are you sure you want to delete this shared link?": "Weet u zeker dat u deze gedeelde link wilt verwijderen?",
-  "Publicly shared pages from spaces you are a member of will appear here": "Openbaar gedeelde pagina's van ruimtes waarvan u lid bent, verschijnen hier",
-  "Share deleted successfully": "Delen succesvol verwijderd",
-  "Share not found": "Delen niet gevonden",
-  "Failed to share page": "Pagina delen mislukt"
+  "Add headings (H1, H2, H3) to generate a table of contents.": "Voeg koppen (H1, H2, H3) toe om een inhoudsopgave te genereren."
 }

apps/client/public/locales/pt-BR/translation.json

@@ -362,26 +362,5 @@
   "Move page to a different space.": "Mover página para um espaço diferente.",
   "Real-time editor connection lost. Retrying...": "Conexão do editor em tempo real perdida. Tentando novamente...",
   "Table of contents": "Tabela de conteúdos",
-  "Add headings (H1, H2, H3) to generate a table of contents.": "Adicionar títulos (H1, H2, H3) para gerar uma tabela de conteúdo.",
-  "Share": "Compartilhar",
-  "Public sharing": "Compartilhamento público",
-  "Shared by": "Compartilhado por",
-  "Shared at": "Compartilhado em",
-  "Inherits public sharing from": "Herdado do compartilhamento público de",
-  "Share to web": "Compartilhar na web",
-  "Shared to web": "Compartilhado na web",
-  "Anyone with the link can view this page": "Qualquer um com o link pode ver esta página",
-  "Make this page publicly accessible": "Tornar esta página publicamente acessível",
-  "Include sub-pages": "Incluir sub-páginas",
-  "Make sub-pages public too": "Tornar as sub-páginas públicas também",
-  "Allow search engines to index page": "Permitir que mecanismos de busca indexem a página",
-  "Open page": "Abrir página",
-  "Page": "Página",
-  "Delete public share link": "Excluir o link público compartilhado",
-  "Delete share": "Excluir compartilhamento",
-  "Are you sure you want to delete this shared link?": "Tem certeza de que deseja excluir este link compartilhado?",
-  "Publicly shared pages from spaces you are a member of will appear here": "Páginas compartilhadas publicamente de espaços que você é membro aparecerão aqui",
-  "Share deleted successfully": "Compartilhamento excluído com sucesso",
-  "Share not found": "Compartilhamento não encontrado",
-  "Failed to share page": "Falha ao compartilhar página"
+  "Add headings (H1, H2, H3) to generate a table of contents.": "Adicionar títulos (H1, H2, H3) para gerar uma tabela de conteúdo."
 }

apps/client/public/locales/ru-RU/translation.json

@@ -13,11 +13,11 @@
   "Are you sure you want to remove this user from the group? The user will lose access to resources this group has access to.": "Вы уверены, что хотите удалить этого пользователя из группы? Пользователь потеряет доступ к материалам, к которым у этой группы есть доступ.",
   "Are you sure you want to remove this user from the space? The user will lose all access to this space.": "Вы уверены, что хотите удалить этого пользователя из пространства? Пользователь потеряет весь доступ к этому пространству.",
   "Are you sure you want to restore this version? Any changes not versioned will be lost.": "Вы уверены, что хотите восстановить эту версию? Все не зафиксированные изменения будут потеряны.",
-  "Can become members of groups and spaces in workspace": "Могут становиться участниками групп и пространств в рабочей области",
+  "Can become members of groups and spaces in workspace": "Могут становиться участниками групп и пространств в рабочем пространстве",
   "Can create and edit pages in space.": "Может создавать и редактировать страницы в пространстве.",
   "Can edit": "Может изменять",
-  "Can manage workspace": "Может управлять рабочей областью",
-  "Can manage workspace but cannot delete it": "Может управлять рабочей областью, но не может ее удалить",
+  "Can manage workspace": "Может управлять рабочим пространством",
+  "Can manage workspace but cannot delete it": "Может управлять рабочим пространством, но не может его удалить",
   "Can view": "Может просматривать",
   "Can view pages in space but not edit.": "Может просматривать страницы в пространстве, но не может их редактировать.",
   "Cancel": "Отменить",
@@ -34,7 +34,7 @@
   "Create group": "Создать группу",
   "Create page": "Создать страницу",
   "Create space": "Создать пространство",
-  "Create workspace": "Создать рабочую область",
+  "Create workspace": "Создать рабочее пространство",
   "Current password": "Текущий пароль",
   "Dark": "Темная",
   "Date": "Дата",
@@ -92,7 +92,7 @@
   "Invite new members": "Пригласить новых участников",
   "Invited members who are yet to accept their invitation will appear here.": "Приглашённые участники, которые ещё не приняли приглашение, появятся здесь.",
   "Invited members will be granted access to spaces the groups can access": "Приглашённые участники получат доступ к пространствам, доступ к которым есть у группы",
-  "Join the workspace": "Присоединиться к рабочей области",
+  "Join the workspace": "Присоединиться к рабочему пространству",
   "Language": "Язык",
   "Light": "Светлая",
   "Link copied": "Ссылка скопирована",
@@ -150,7 +150,7 @@
   "Send invitation": "Отправить приглашение",
   "Invitation sent": "Приглашение отправлено",
   "Settings": "Настройки",
-  "Setup workspace": "Настроить рабочую область",
+  "Setup workspace": "Настроить рабочее пространство",
   "Sign In": "Вход",
   "Sign Up": "Регистрация",
   "Slug": "Slug",
@@ -177,9 +177,9 @@
   "Untitled": "Без названия",
   "Updated successfully": "Обновлено успешно",
   "User": "Пользователь",
-  "Workspace": "Рабочая область",
-  "Workspace Name": "Имя рабочей области",
-  "Workspace settings": "Настройки рабочей области",
+  "Workspace": "Рабочее пространство",
+  "Workspace Name": "Имя рабочего пространства",
+  "Workspace settings": "Настройки рабочего пространства",
   "You can change your password here.": "Вы можете изменить свой пароль здесь.",
   "Your Email": "Ваш адрес электронной почты",
   "Your import is complete.": "Ваш импорт завершен.",
@@ -217,9 +217,9 @@
   "Revoke invitation": "Отозвать приглашение",
   "Revoke": "Отозвать",
   "Don't": "Нет",
-  "Are you sure you want to revoke this invitation? The user will not be able to join the workspace.": "Вы уверены, что хотите отозвать это приглашение? Пользователь не сможет присоединиться к рабочей области.",
+  "Are you sure you want to revoke this invitation? The user will not be able to join the workspace.": "Вы уверены, что хотите отозвать это приглашение? Пользователь не сможет присоединиться к рабочему пространству.",
   "Resend invitation": "Отправить приглашение повторно",
-  "Anyone with this link can join this workspace.": "Любой, у кого есть данная ссылка, может присоединиться к этой рабочей области.",
+  "Anyone with this link can join this workspace.": "Любой, у кого есть эта ссылка, может присоединиться к этому рабочему пространству.",
   "Invite link": "Ссылка для приглашения",
   "Copy": "Копировать",
   "Copied": "Скопировано",
@@ -362,26 +362,5 @@
   "Move page to a different space.": "Переместите страницу в другое пространство.",
   "Real-time editor connection lost. Retrying...": "Соединение с редактором в реальном времени потеряно. Повторная попытка...",
   "Table of contents": "Содержание",
-  "Add headings (H1, H2, H3) to generate a table of contents.": "Добавьте заголовки (H1, H2, H3), чтобы создать оглавление.",
-  "Share": "Поделиться",
-  "Public sharing": "Общий доступ",
-  "Shared by": "Поделился",
-  "Shared at": "Поделился в",
-  "Inherits public sharing from": "Наследует общий доступ от",
-  "Share to web": "Поделиться в интернете",
-  "Shared to web": "Размещено в интернете",
-  "Anyone with the link can view this page": "Любой, у кого есть ссылка, может просмотреть эту страницу",
-  "Make this page publicly accessible": "Сделать эту страницу общедоступной",
-  "Include sub-pages": "Включить подстраницы",
-  "Make sub-pages public too": "Сделать подстраницы также общедоступными",
-  "Allow search engines to index page": "Разрешить поисковым системам индексировать страницу",
-  "Open page": "Открыть страницу",
-  "Page": "Страница",
-  "Delete public share link": "Удалить ссылку на общий доступ",
-  "Delete share": "Удалить общий доступ",
-  "Are you sure you want to delete this shared link?": "Вы уверены, что хотите удалить эту ссылку общего доступа?",
-  "Publicly shared pages from spaces you are a member of will appear here": "Общие страницы из пространств, участником которых вы являетесь, появятся здесь",
-  "Share deleted successfully": "Общий доступ успешно удален",
-  "Share not found": "Общий доступ не найден",
-  "Failed to share page": "Не удалось поделиться страницей"
+  "Add headings (H1, H2, H3) to generate a table of contents.": "Добавьте заголовки (H1, H2, H3), чтобы создать оглавление."
 }

apps/client/public/locales/zh-CN/translation.json

@@ -298,7 +298,7 @@
   "Heading 2": "2 级标题",
   "Heading 3": "3 级标题",
   "To-do List": "代办列表",
-  "Bullet List": "无序列表",
+  "Bullet List": "无需列表",
   "Numbered List": "有序列表",
   "Blockquote": "引用块",
   "Just start typing with plain text.": "只需开始键入纯文本",
@@ -362,26 +362,5 @@
   "Move page to a different space.": "将页面移动到不同的空间。",
   "Real-time editor connection lost. Retrying...": "实时编辑器连接丢失。重试中……",
   "Table of contents": "目录",
-  "Add headings (H1, H2, H3) to generate a table of contents.": "添加标题（H1，H2，H3）以生成目录。",
-  "Share": "分享",
-  "Public sharing": "公开分享",
-  "Shared by": "分享者",
-  "Shared at": "分享时间",
-  "Inherits public sharing from": "继承自的公开分享",
-  "Share to web": "分享到网页",
-  "Shared to web": "已分享到网页",
-  "Anyone with the link can view this page": "任何有链接的人都可以查看此页面",
-  "Make this page publicly accessible": "使此页面可公开访问",
-  "Include sub-pages": "包括子页面",
-  "Make sub-pages public too": "将子页面也设为公开",
-  "Allow search engines to index page": "允许搜索引擎索引页面",
-  "Open page": "打开页面",
-  "Page": "页面",
-  "Delete public share link": "删除公开分享链接",
-  "Delete share": "删除分享",
-  "Are you sure you want to delete this shared link?": "您确定要删除此分享链接吗？",
-  "Publicly shared pages from spaces you are a member of will appear here": "您所在空间的公开共享页面会显示在此处",
-  "Share deleted successfully": "分享已成功删除",
-  "Share not found": "未找到分享",
-  "Failed to share page": "页面分享失败"
+  "Add headings (H1, H2, H3) to generate a table of contents.": "添加标题（H1，H2，H3）以生成目录。"
 }

apps/client/src/App.tsx

@@ -30,12 +30,10 @@ import SharedPage from "@/pages/share/shared-page.tsx";
 import Shares from "@/pages/settings/shares/shares.tsx";
 import ShareLayout from "@/features/share/components/share-layout.tsx";
 import ShareRedirect from '@/pages/share/share-redirect.tsx';
-import { useTrackOrigin } from "@/hooks/use-track-origin";
 
 export default function App() {
   const { t } = useTranslation();
   useRedirectToCloudSelect();
-  useTrackOrigin();
 
   return (
     <>
@@ -61,7 +59,7 @@ export default function App() {
           <Route path={"/share/:shareId/p/:pageSlug"} element={<SharedPage />} />
           <Route path={"/share/p/:pageSlug"} element={<SharedPage />} />
         </Route>
-
+        
         <Route path={"/share/:shareId"} element={<ShareRedirect />} />
         <Route path={"/p/:pageSlug"} element={<PageRedirect />} />
 

apps/client/src/components/layouts/global/global-app-shell.tsx

@@ -14,6 +14,7 @@ import { AppHeader } from "@/components/layouts/global/app-header.tsx";
 import Aside from "@/components/layouts/global/aside.tsx";
 import classes from "./app-shell.module.css";
 import { useTrialEndAction } from "@/ee/hooks/use-trial-end-action.tsx";
+import { useClickOutside, useMergedRef } from "@mantine/hooks";
 import { useToggleSidebar } from "@/components/layouts/global/hooks/hooks/use-toggle-sidebar.ts";
 
 export default function GlobalAppShell({
@@ -29,6 +30,13 @@ export default function GlobalAppShell({
   const [sidebarWidth, setSidebarWidth] = useAtom(sidebarWidthAtom);
   const [isResizing, setIsResizing] = useState(false);
   const sidebarRef = useRef(null);
+  const navbarOutsideRef = useClickOutside(() => {
+    if (mobileOpened) {
+      toggleMobile();
+    }
+  });
+
+  const mergedRef = useMergedRef(sidebarRef, navbarOutsideRef);
 
   const startResizing = React.useCallback((mouseDownEvent) => {
     mouseDownEvent.preventDefault();
@@ -104,7 +112,7 @@ export default function GlobalAppShell({
         <AppShell.Navbar
           className={classes.navbar}
           withBorder={false}
-          ref={sidebarRef}
+          ref={mergedRef}
         >
           <div className={classes.resizeHandle} onMouseDown={startResizing} />
           {isSpaceRoute && <SpaceSidebar />}

apps/client/src/components/settings/atoms/settings-origin-atom.ts

@@ -1,10 +0,0 @@
-import { atom, WritableAtom } from "jotai";
-
-export const settingsOriginAtom: WritableAtom<string | null, [string | null], void> = atom(
-  null,
-  (get, set, newValue) => {
-    if (get(settingsOriginAtom) !== newValue) {
-      set(settingsOriginAtom, newValue);
-    }
-  }
-);

apps/client/src/components/settings/settings-sidebar.tsx

@@ -13,7 +13,7 @@ import {
   IconKey,
   IconWorld,
 } from "@tabler/icons-react";
-import { Link, useLocation } from "react-router-dom";
+import { Link, useLocation, useNavigate } from "react-router-dom";
 import classes from "./settings.module.css";
 import { useTranslation } from "react-i18next";
 import { isCloud } from "@/lib/config.ts";
@@ -32,7 +32,6 @@ import {
 import AppVersion from "@/components/settings/app-version.tsx";
 import { mobileSidebarAtom } from "@/components/layouts/global/hooks/atoms/sidebar-atom.ts";
 import { useToggleSidebar } from "@/components/layouts/global/hooks/hooks/use-toggle-sidebar.ts";
-import { useSettingsNavigation } from "@/hooks/use-settings-navigation";
 
 interface DataItem {
   label: string;
@@ -106,7 +105,7 @@ export default function SettingsSidebar() {
   const { t } = useTranslation();
   const location = useLocation();
   const [active, setActive] = useState(location.pathname);
-  const { goBack } = useSettingsNavigation();
+  const navigate = useNavigate();
   const { isAdmin } = useUserRole();
   const [workspace] = useAtom(workspaceAtom);
   const [mobileSidebarOpened] = useAtom(mobileSidebarAtom);
@@ -211,12 +210,7 @@ export default function SettingsSidebar() {
     <div className={classes.navbar}>
       <Group className={classes.title} justify="flex-start">
         <ActionIcon
-          onClick={() => {
-            goBack();
-            if (mobileSidebarOpened) {
-              toggleMobileSidebar();
-            }
-          }}
+          onClick={() => navigate(-1)}
           variant="transparent"
           c="gray"
           aria-label="Back"

apps/client/src/ee/billing/components/billing-trial.tsx

@@ -1,7 +1,6 @@
 import { Alert } from "@mantine/core";
 import { useBillingQuery } from "@/ee/billing/queries/billing-query.ts";
 import useTrial from "@/ee/hooks/use-trial.tsx";
-import { getBillingTrialDays } from '@/lib/config.ts';
 
 export default function BillingTrial() {
   const { data: billing, isLoading } = useBillingQuery();
@@ -16,14 +15,14 @@ export default function BillingTrial() {
       {trialDaysLeft > 0 && !billing && (
         <Alert title="Your Trial is Active 🎉" color="blue" radius="md">
           You have {trialDaysLeft} {trialDaysLeft === 1 ? "day" : "days"} left
-          in your {getBillingTrialDays()}-day free trial. Please subscribe to a paid plan before your trial
+          in your 7-day trial. Please subscribe to a plan before your trial
           ends.
         </Alert>
       )}
 
       {trialDaysLeft === 0 && (
         <Alert title="Your Trial has ended" color="red" radius="md">
-          Your {getBillingTrialDays()}-day free trial has come to an end. Please subscribe to a paid plan to
+          Your 7-day trial has come to an end. Please subscribe to a plan to
           continue using this service.
         </Alert>
       )}

apps/client/src/ee/hooks/use-trial-end-action.tsx

@@ -1,6 +1,6 @@
 import { useEffect } from "react";
 import { useLocation, useNavigate } from "react-router-dom";
-import { getBillingTrialDays, isCloud } from "@/lib/config.ts";
+import { isCloud } from "@/lib/config.ts";
 import APP_ROUTE from "@/lib/app-route.ts";
 import useUserRole from "@/hooks/use-user-role.tsx";
 import { notifications } from "@mantine/notifications";
@@ -18,7 +18,7 @@ export const useTrialEndAction = () => {
         notifications.show({
           position: "top-right",
           color: "red",
-          title: `Your ${getBillingTrialDays()}-day trial has ended`,
+          title: "Your 7-day trial has ended",
           message:
             "Please upgrade to a paid plan or contact your workspace admin.",
           autoClose: false,

apps/client/src/features/editor/components/table-of-contents/table-of-contents.tsx

@@ -143,12 +143,6 @@ export const TableOfContents: FC<TableOfContentsProps> = (props) => {
             {t("Add headings (H1, H2, H3) to generate a table of contents.")}
           </Text>
         )}
-
-        {props.isShare && (
-          <Text size="sm" c="dimmed">
-            {t("No table of contents.")}
-          </Text>
-        )}
       </>
     );
   }

apps/client/src/features/search/components/search-control.module.css

@@ -1,44 +0,0 @@
-.root {
-    height: 34px;
-    padding-left: var(--mantine-spacing-sm);
-    padding-right: 4px;
-    border-radius: var(--mantine-radius-md);
-    color: var(--mantine-color-placeholder);
-    border: 1px solid;
-
-    @mixin light {
-        border-color: var(--mantine-color-gray-3);
-        background-color: var(--mantine-color-white);
-    }
-
-    @mixin dark {
-        border-color: var(--mantine-color-dark-4);
-        background-color: var(--mantine-color-dark-6);
-    }
-
-    @mixin rtl {
-        padding-left: 4px;
-        padding-right: var(--mantine-spacing-sm);
-    }
-}
-
-.shortcut {
-    font-size: 11px;
-    line-height: 1;
-    padding: 4px 7px;
-    border-radius: var(--mantine-radius-sm);
-    border: 1px solid;
-    font-weight: bold;
-
-    @mixin light {
-        color: var(--mantine-color-gray-7);
-        border-color: var(--mantine-color-gray-2);
-        background-color: var(--mantine-color-gray-0);
-    }
-
-    @mixin dark {
-        color: var(--mantine-color-dark-0);
-        border-color: var(--mantine-color-dark-7);
-        background-color: var(--mantine-color-dark-7);
-    }
-}

apps/client/src/features/search/components/search-control.tsx

@@ -1,56 +0,0 @@
-import { IconSearch } from "@tabler/icons-react";
-import cx from "clsx";
-import {
-  ActionIcon,
-  BoxProps,
-  ElementProps,
-  Group,
-  rem,
-  Text,
-  Tooltip,
-  UnstyledButton,
-} from "@mantine/core";
-import classes from "./search-control.module.css";
-import React from "react";
-import { useTranslation } from "react-i18next";
-
-interface SearchControlProps extends BoxProps, ElementProps<"button"> {}
-
-export function SearchControl({ className, ...others }: SearchControlProps) {
-  const { t } = useTranslation();
-
-  return (
-    <UnstyledButton {...others} className={cx(classes.root, className)}>
-      <Group gap="xs" wrap="nowrap">
-        <IconSearch style={{ width: rem(15), height: rem(15) }} stroke={1.5} />
-        <Text fz="sm" c="dimmed" pr={80}>
-          {t("Search")}
-        </Text>
-        <Text fw={700} className={classes.shortcut}>
-          Ctrl + K
-        </Text>
-      </Group>
-    </UnstyledButton>
-  );
-}
-
-interface SearchMobileControlProps {
-  onSearch: () => void;
-}
-
-export function SearchMobileControl({ onSearch }: SearchMobileControlProps) {
-  const { t } = useTranslation();
-
-  return (
-    <Tooltip label={t("Search")} withArrow>
-      <ActionIcon
-        variant="default"
-        style={{ border: "none" }}
-        onClick={onSearch}
-        size="sm"
-      >
-        <IconSearch size={20} stroke={2} />
-      </ActionIcon>
-    </Tooltip>
-  );
-}

apps/client/src/features/search/constants.ts

@@ -1,7 +0,0 @@
-import { createSpotlight } from '@mantine/spotlight';
-
-export const [searchSpotlightStore, searchSpotlight] = createSpotlight();
-
-export const [shareSearchSpotlightStore, shareSearchSpotlight] =
-  createSpotlight();
-

apps/client/src/features/search/queries/search-query.ts

@@ -1,7 +1,6 @@
 import { useQuery, UseQueryResult } from "@tanstack/react-query";
 import {
   searchPage,
-  searchShare,
   searchSuggestions,
 } from "@/features/search/services/search-service";
 import {
@@ -31,13 +30,3 @@ export function useSearchSuggestionsQuery(
     enabled: !!params.query,
   });
 }
-
-export function useShareSearchQuery(
-  params: IPageSearchParams,
-): UseQueryResult<IPageSearch[], Error> {
-  return useQuery({
-    queryKey: ["share-search", params],
-    queryFn: () => searchShare(params),
-    enabled: !!params.query,
-  });
-}

apps/client/src/features/search/search-spotlight.tsx

@@ -2,36 +2,36 @@ import { Group, Center, Text } from "@mantine/core";
 import { Spotlight } from "@mantine/spotlight";
 import { IconSearch } from "@tabler/icons-react";
 import React, { useState } from "react";
-import { Link } from "react-router-dom";
+import { useNavigate } from "react-router-dom";
 import { useDebouncedValue } from "@mantine/hooks";
 import { usePageSearchQuery } from "@/features/search/queries/search-query";
 import { buildPageUrl } from "@/features/page/page.utils.ts";
 import { getPageIcon } from "@/lib";
 import { useTranslation } from "react-i18next";
-import { searchSpotlightStore } from "./constants";
 
 interface SearchSpotlightProps {
   spaceId?: string;
 }
 export function SearchSpotlight({ spaceId }: SearchSpotlightProps) {
   const { t } = useTranslation();
+  const navigate = useNavigate();
   const [query, setQuery] = useState("");
   const [debouncedSearchQuery] = useDebouncedValue(query, 300);
 
-  const { data: searchResults } = usePageSearchQuery({
-    query: debouncedSearchQuery,
-    spaceId,
-  });
+  const {
+    data: searchResults,
+    isLoading,
+    error,
+  } = usePageSearchQuery({ query: debouncedSearchQuery, spaceId });
 
   const pages = (
     searchResults && searchResults.length > 0 ? searchResults : []
   ).map((page) => (
     <Spotlight.Action
       key={page.id}
-      component={Link}
-      //@ts-ignore
-      to={buildPageUrl(page.space.slug, page.slugId, page.title)}
-      style={{ userSelect: "none" }}
+      onClick={() =>
+        navigate(buildPageUrl(page.space.slug, page.slugId, page.title))
+      }
     >
       <Group wrap="nowrap" w="100%">
         <Center>{getPageIcon(page?.icon)}</Center>
@@ -54,7 +54,6 @@ export function SearchSpotlight({ spaceId }: SearchSpotlightProps) {
   return (
     <>
       <Spotlight.Root
-        store={searchSpotlightStore}
         query={query}
         onQueryChange={setQuery}
         scrollable

apps/client/src/features/search/services/search-service.ts

@@ -19,10 +19,3 @@ export async function searchSuggestions(
   const req = await api.post<ISuggestionResult>("/search/suggest", params);
   return req.data;
 }
-
-export async function searchShare(
-  params: IPageSearchParams,
-): Promise<IPageSearch[]> {
-  const req = await api.post<IPageSearch[]>("/search/share-search", params);
-  return req.data;
-}

apps/client/src/features/search/share-search-spotlight.tsx

@@ -1,87 +0,0 @@
-import { Group, Center, Text } from "@mantine/core";
-import { Spotlight } from "@mantine/spotlight";
-import { IconSearch } from "@tabler/icons-react";
-import React, { useState } from "react";
-import { Link } from "react-router-dom";
-import { useDebouncedValue } from "@mantine/hooks";
-import { useShareSearchQuery } from "@/features/search/queries/search-query";
-import { buildSharedPageUrl } from "@/features/page/page.utils.ts";
-import { getPageIcon } from "@/lib";
-import { useTranslation } from "react-i18next";
-import { shareSearchSpotlightStore } from "@/features/search/constants.ts";
-
-interface ShareSearchSpotlightProps {
-  shareId?: string;
-}
-export function ShareSearchSpotlight({ shareId }: ShareSearchSpotlightProps) {
-  const { t } = useTranslation();
-  const [query, setQuery] = useState("");
-  const [debouncedSearchQuery] = useDebouncedValue(query, 300);
-
-  const { data: searchResults } = useShareSearchQuery({
-    query: debouncedSearchQuery,
-    shareId,
-  });
-
-  const pages = (
-    searchResults && searchResults.length > 0 ? searchResults : []
-  ).map((page) => (
-    <Spotlight.Action
-      key={page.id}
-      component={Link}
-      //@ts-ignore
-      to={buildSharedPageUrl({
-        shareId: shareId,
-        pageTitle: page.title,
-        pageSlugId: page.slugId,
-      })}
-      style={{ userSelect: "none" }}
-    >
-      <Group wrap="nowrap" w="100%">
-        <Center>{getPageIcon(page?.icon)}</Center>
-
-        <div style={{ flex: 1 }}>
-          <Text>{page.title}</Text>
-
-          {page?.highlight && (
-            <Text
-              opacity={0.6}
-              size="xs"
-              dangerouslySetInnerHTML={{ __html: page.highlight }}
-            />
-          )}
-        </div>
-      </Group>
-    </Spotlight.Action>
-  ));
-
-  return (
-    <>
-      <Spotlight.Root
-        store={shareSearchSpotlightStore}
-        query={query}
-        onQueryChange={setQuery}
-        scrollable
-        overlayProps={{
-          backgroundOpacity: 0.55,
-        }}
-      >
-        <Spotlight.Search
-          placeholder={t("Search...")}
-          leftSection={<IconSearch size={20} stroke={1.5} />}
-        />
-        <Spotlight.ActionsList>
-          {query.length === 0 && pages.length === 0 && (
-            <Spotlight.Empty>{t("Start typing to search...")}</Spotlight.Empty>
-          )}
-
-          {query.length > 0 && pages.length === 0 && (
-            <Spotlight.Empty>{t("No results found...")}</Spotlight.Empty>
-          )}
-
-          {pages.length > 0 && pages}
-        </Spotlight.ActionsList>
-      </Spotlight.Root>
-    </>
-  );
-}

apps/client/src/features/search/types/search.types.ts

@@ -35,5 +35,4 @@ export interface ISuggestionResult {
 export interface IPageSearchParams {
   query: string;
   spaceId?: string;
-  shareId?: string;
 }

apps/client/src/features/share/components/share-shell.tsx

@@ -1,4 +1,4 @@
-import React from "react";
+import React, { useState } from "react";
 import {
   ActionIcon,
   Affix,
@@ -30,12 +30,7 @@ import {
 import { IconList } from "@tabler/icons-react";
 import { useToggleToc } from "@/features/share/hooks/use-toggle-toc.ts";
 import classes from "./share.module.css";
-import {
-  SearchControl,
-  SearchMobileControl,
-} from "@/features/search/components/search-control.tsx";
-import { ShareSearchSpotlight } from "@/features/search/share-search-spotlight";
-import { shareSearchSpotlight } from "@/features/search/constants";
+import { useClickOutside } from "@mantine/hooks";
 
 const MemoizedSharedTree = React.memo(SharedTree);
 
@@ -59,9 +54,25 @@ export default function ShareShell({
   const { data } = useGetSharedPageTreeQuery(shareId);
   const readOnlyEditor = useAtomValue(readOnlyEditorAtom);
 
+  const [navbarOutside, setNavbarOutside] = useState<HTMLElement | null>(null);
+  const [asideOutside, setAsideOutside] = useState<HTMLElement | null>(null);
+
+  useClickOutside(
+    () => {
+      if (mobileOpened) {
+        toggleMobile();
+      }
+      if (mobileTocOpened) {
+        toggleTocMobile();
+      }
+    },
+    null,
+    [navbarOutside, asideOutside],
+  );
+
   return (
     <AppShell
-      header={{ height: 50 }}
+      header={{ height: 48 }}
       {...(data?.pageTree?.length > 1 && {
         navbar: {
           width: 300,
@@ -84,7 +95,7 @@ export default function ShareShell({
     >
       <AppShell.Header>
         <Group wrap="nowrap" justify="space-between" py="sm" px="xl">
-          <Group wrap="nowrap">
+          <Group>
             {data?.pageTree?.length > 1 && (
               <>
                 <Tooltip label={t("Sidebar toggle")}>
@@ -109,21 +120,8 @@ export default function ShareShell({
               </>
             )}
           </Group>
-
-          {shareId && (
-            <Group visibleFrom="sm">
-              <SearchControl onClick={shareSearchSpotlight.open} />
-            </Group>
-          )}
-
           <Group>
             <>
-              {shareId && (
-                <Group hiddenFrom="sm">
-                  <SearchMobileControl onSearch={shareSearchSpotlight.open} />
-                </Group>
-              )}
-
               <Tooltip label={t("Table of contents")} withArrow>
                 <ActionIcon
                   variant="default"
@@ -155,7 +153,11 @@ export default function ShareShell({
       </AppShell.Header>
 
       {data?.pageTree?.length > 1 && (
-        <AppShell.Navbar p="md" className={classes.navbar}>
+        <AppShell.Navbar
+          p="md"
+          className={classes.navbar}
+          ref={setNavbarOutside}
+        >
           <MemoizedSharedTree sharedPageTree={data} />
         </AppShell.Navbar>
       )}
@@ -179,6 +181,7 @@ export default function ShareShell({
         p="md"
         withBorder={mobileTocOpened}
         className={classes.aside}
+        ref={setAsideOutside}
       >
         <ScrollArea style={{ height: "80vh" }} scrollbarSize={5} type="scroll">
           <div style={{ paddingBottom: "50px" }}>
@@ -188,8 +191,6 @@ export default function ShareShell({
           </div>
         </ScrollArea>
       </AppShell.Aside>
-
-      <ShareSearchSpotlight shareId={shareId} />
     </AppShell>
   );
 }

apps/client/src/features/share/components/shared-tree.tsx

@@ -15,7 +15,6 @@ import clsx from "clsx";
 import {
   IconChevronDown,
   IconChevronRight,
-  IconFileDescription,
   IconPointFilled,
 } from "@tabler/icons-react";
 import { ActionIcon, Box } from "@mantine/core";
@@ -24,7 +23,6 @@ import { OpenMap } from "react-arborist/dist/main/state/open-slice";
 import classes from "@/features/page/tree/styles/tree.module.css";
 import styles from "./share.module.css";
 import { mobileSidebarAtom } from "@/components/layouts/global/hooks/atoms/sidebar-atom.ts";
-import EmojiPicker from "@/components/ui/emoji-picker.tsx";
 
 interface SharedTree {
   sharedPageTree: ISharedPageTree;
@@ -143,20 +141,6 @@ function Node({ node, style, tree }: NodeRendererProps<any>) {
         }}
       >
         <PageArrow node={node} />
-        <div style={{ marginRight: "4px" }}>
-          <EmojiPicker
-            onEmojiSelect={() => {}}
-            icon={
-              node.data.icon ? (
-                node.data.icon
-              ) : (
-                <IconFileDescription size="18" />
-              )
-            }
-            readOnly={true}
-            removeEmojiAction={() => {}}
-          />
-        </div>
         <span className={classes.text}>{node.data.name || t("untitled")}</span>
       </Box>
     </>

apps/client/src/features/share/utils.ts

@@ -11,13 +11,11 @@ export type SharedPageTreeNode = {
   parentPageId: string;
   hasChildren: boolean;
   children: SharedPageTreeNode[];
-  label: string;
-  value: string;
+  label: string,
+  value: string,
 };
 
-export function buildSharedPageTree(
-  pages: Partial<IPage[]>,
-): SharedPageTreeNode[] {
+export function buildSharedPageTree(pages: Partial<IPage[]>): SharedPageTreeNode[] {
   const pageMap: Record<string, SharedPageTreeNode> = {};
 
   // Initialize each page as a tree node and store it in a map.
@@ -32,7 +30,7 @@ export function buildSharedPageTree(
       hasChildren: false,
       spaceId: page.spaceId,
       parentPageId: page.parentPageId,
-      label: page.title || "untitled",
+      label: page.title || 'untitled',
       value: page.id,
       children: [],
     };
@@ -57,12 +55,6 @@ export function buildSharedPageTree(
     }
   });
 
-  function sortTree(nodes: SharedPageTreeNode[]): SharedPageTreeNode[] {
-    return sortPositionKeys(nodes).map((node: SharedPageTreeNode) => ({
-      ...node,
-      children: sortTree(node.children),
-    }));
-  }
-
-  return sortTree(tree);
+  // Return the sorted tree.
+  return sortPositionKeys(tree);
 }

apps/client/src/features/space/components/sidebar/space-sidebar.tsx

@@ -6,6 +6,7 @@ import {
   Tooltip,
   UnstyledButton,
 } from "@mantine/core";
+import { spotlight } from "@mantine/spotlight";
 import {
   IconArrowDown,
   IconDots,
@@ -15,8 +16,9 @@ import {
   IconSearch,
   IconSettings,
 } from "@tabler/icons-react";
+
 import classes from "./space-sidebar.module.css";
-import React from "react";
+import React, { useMemo } from "react";
 import { useAtom } from "jotai";
 import { SearchSpotlight } from "@/features/search/search-spotlight.tsx";
 import { treeApiAtom } from "@/features/page/tree/atoms/tree-api-atom.ts";
@@ -38,7 +40,6 @@ import { SwitchSpace } from "./switch-space";
 import ExportModal from "@/components/common/export-modal";
 import { mobileSidebarAtom } from "@/components/layouts/global/hooks/atoms/sidebar-atom.ts";
 import { useToggleSidebar } from "@/components/layouts/global/hooks/hooks/use-toggle-sidebar.ts";
-import { searchSpotlight } from "@/features/search/constants";
 
 export function SpaceSidebar() {
   const { t } = useTranslation();
@@ -50,7 +51,7 @@ export function SpaceSidebar() {
   const toggleMobileSidebar = useToggleSidebar(mobileSidebarAtom);
 
   const { spaceSlug } = useParams();
-  const { data: space } = useGetSpaceBySlugQuery(spaceSlug);
+  const { data: space, isLoading, isError } = useGetSpaceBySlugQuery(spaceSlug);
 
   const spaceRules = space?.membership?.permissions;
   const spaceAbility = useSpaceAbility(spaceRules);
@@ -99,10 +100,7 @@ export function SpaceSidebar() {
               </div>
             </UnstyledButton>
 
-            <UnstyledButton
-              className={classes.menu}
-              onClick={searchSpotlight.open}
-            >
+            <UnstyledButton className={classes.menu} onClick={spotlight.open}>
               <div className={classes.menuItemInner}>
                 <IconSearch
                   size={18}

apps/client/src/hooks/use-settings-navigation.ts

@@ -1,14 +0,0 @@
-import { settingsOriginAtom } from "@/components/settings/atoms/settings-origin-atom";
-import { useAtomValue } from "jotai";
-import { useNavigate } from "react-router-dom";
-
-export function useSettingsNavigation() {
-  const navigate = useNavigate();
-  const origin = useAtomValue(settingsOriginAtom);
-
-  const goBack = () => {
-    navigate(origin ?? "/home", { replace: true });
-  };
-
-  return { goBack };
-}

apps/client/src/hooks/use-track-origin.ts

@@ -1,16 +0,0 @@
-import { settingsOriginAtom } from "@/components/settings/atoms/settings-origin-atom";
-import { useAtomValue, useSetAtom } from "jotai";
-import { useEffect } from "react";
-import { useLocation } from "react-router-dom";
-
-export function useTrackOrigin() {
-  const location = useLocation();
-  const setOrigin = useSetAtom(settingsOriginAtom);
-
-  useEffect(() => {
-    const isInSettings = location.pathname.startsWith("/settings");
-    if (!isInSettings) {
-      setOrigin(location.pathname);
-    }
-  }, [location.pathname, setOrigin]);
-}

apps/client/src/lib/config.ts

@@ -74,10 +74,6 @@ export function getDrawioUrl() {
   return getConfigValue("DRAWIO_URL", "https://embed.diagrams.net");
 }
 
-export function getBillingTrialDays() {
-  return getConfigValue("BILLING_TRIAL_DAYS");
-}
-
 function getConfigValue(key: string, defaultValue: string = undefined): string {
   const rawValue = import.meta.env.DEV
     ? process?.env?.[key]

apps/client/vite.config.ts

@@ -12,7 +12,6 @@ export default defineConfig(({ mode }) => {
     CLOUD,
     SUBDOMAIN_HOST,
     COLLAB_URL,
-    BILLING_TRIAL_DAYS,
   } = loadEnv(mode, envPath, "");
 
   return {
@@ -24,7 +23,6 @@ export default defineConfig(({ mode }) => {
         CLOUD,
         SUBDOMAIN_HOST,
         COLLAB_URL,
-        BILLING_TRIAL_DAYS,
       },
       APP_VERSION: JSON.stringify(process.env.npm_package_version),
     },

apps/server/package.json

@@ -1,6 +1,6 @@
 {
   "name": "server",
-  "version": "0.20.3",
+  "version": "0.10.2",
   "description": "",
   "author": "",
   "private": true,

apps/server/src/collaboration/collaboration.module.ts

@@ -1,4 +1,4 @@
-import { Logger, Module, OnModuleDestroy, OnModuleInit } from '@nestjs/common';
+import { Module, OnModuleDestroy, OnModuleInit } from '@nestjs/common';
 import { AuthenticationExtension } from './extensions/authentication.extension';
 import { PersistenceExtension } from './extensions/persistence.extension';
 import { CollaborationGateway } from './collaboration.gateway';
@@ -22,7 +22,6 @@ import { LoggerExtension } from './extensions/logger.extension';
   imports: [TokenModule],
 })
 export class CollaborationModule implements OnModuleInit, OnModuleDestroy {
-  private readonly logger = new Logger(CollaborationModule.name);
   private collabWsAdapter: CollabWsAdapter;
   private path = '/collab';
 
@@ -39,15 +38,7 @@ export class CollaborationModule implements OnModuleInit, OnModuleDestroy {
 
     wss.on('connection', (client: WebSocket, request: IncomingMessage) => {
       this.collaborationGateway.handleConnection(client, request);
-
-      client.on('error', (error) => {
-        this.logger.error('WebSocket client error:', error);
-      });
     });
-
-    wss.on('error', (error) =>
-      this.logger.log('WebSocket server error:', error),
-    );
   }
 
   async onModuleDestroy(): Promise<void> {

apps/server/src/collaboration/extensions/persistence.extension.ts

@@ -130,7 +130,7 @@ export class PersistenceExtension implements Extension {
           );
           this.contributors.delete(documentName);
         } catch (err) {
-          this.logger.debug('Contributors error:' + err?.['message']);
+          this.logger.log('Contributors error:' + err?.['message']);
         }
 
         await this.pageRepo.updatePage(

apps/server/src/common/helpers/prosemirror/utils.ts

@@ -1,7 +1,6 @@
 import { Node } from '@tiptap/pm/model';
 import { jsonToNode } from '../../../collaboration/collaboration.util';
 import { validate as isValidUUID } from 'uuid';
-import { Transform } from '@tiptap/pm/transform';
 
 export interface MentionNode {
   id: string;
@@ -95,16 +94,4 @@ export function getAttachmentIds(prosemirrorJson: any) {
   });
 
   return attachmentIds;
-}
-
-export function removeMarkTypeFromDoc(doc: Node, markName: string): Node {
-  const { schema } = doc.type;
-  const markType = schema.marks[markName];
-
-  if (!markType) {
-    return doc;
-  }
-
-  const tr = new Transform(doc).removeMark(0, doc.content.size, markType);
-  return tr.doc;
 }

apps/server/src/core/search/dto/search.dto.ts

@@ -5,11 +5,8 @@ import {
   IsOptional,
   IsString,
 } from 'class-validator';
-import { PartialType } from '@nestjs/mapped-types';
-import { CreateWorkspaceDto } from '../../workspace/dto/create-workspace.dto';
 
 export class SearchDTO {
-  @IsNotEmpty()
   @IsString()
   query: string;
 
@@ -17,10 +14,6 @@ export class SearchDTO {
   @IsString()
   spaceId: string;
 
-  @IsOptional()
-  @IsString()
-  shareId?: string;
-
   @IsOptional()
   @IsString()
   creatorId?: string;
@@ -34,16 +27,6 @@ export class SearchDTO {
   offset?: number;
 }
 
-export class SearchShareDTO extends SearchDTO {
-  @IsNotEmpty()
-  @IsString()
-  shareId: string;
-
-  @IsOptional()
-  @IsString()
-  spaceId: string;
-}
-
 export class SearchSuggestionDTO {
   @IsString()
   query: string;

apps/server/src/core/search/search.controller.ts

@@ -1,19 +1,15 @@
 import {
-  BadRequestException,
   Body,
   Controller,
   ForbiddenException,
   HttpCode,
   HttpStatus,
+  NotImplementedException,
   Post,
   UseGuards,
 } from '@nestjs/common';
 import { SearchService } from './search.service';
-import {
-  SearchDTO,
-  SearchShareDTO,
-  SearchSuggestionDTO,
-} from './dto/search.dto';
+import { SearchDTO, SearchSuggestionDTO } from './dto/search.dto';
 import { AuthWorkspace } from '../../common/decorators/auth-workspace.decorator';
 import { JwtAuthGuard } from '../../common/guards/jwt-auth.guard';
 import { User, Workspace } from '@docmost/db/types/entity.types';
@@ -23,7 +19,6 @@ import {
   SpaceCaslSubject,
 } from '../casl/interfaces/space-ability.type';
 import { AuthUser } from '../../common/decorators/auth-user.decorator';
-import { Public } from 'src/common/decorators/public.decorator';
 
 @UseGuards(JwtAuthGuard)
 @Controller('search')
@@ -35,13 +30,7 @@ export class SearchController {
 
   @HttpCode(HttpStatus.OK)
   @Post()
-  async pageSearch(
-    @Body() searchDto: SearchDTO,
-    @AuthUser() user: User,
-    @AuthWorkspace() workspace: Workspace,
-  ) {
-    delete searchDto.shareId;
-
+  async pageSearch(@Body() searchDto: SearchDTO, @AuthUser() user: User) {
     if (searchDto.spaceId) {
       const ability = await this.spaceAbility.createForUser(
         user,
@@ -51,12 +40,12 @@ export class SearchController {
       if (ability.cannot(SpaceCaslAction.Read, SpaceCaslSubject.Page)) {
         throw new ForbiddenException();
       }
+
+      return this.searchService.searchPage(searchDto.query, searchDto);
     }
 
-    return this.searchService.searchPage(searchDto.query, searchDto, {
-      userId: user.id,
-      workspaceId: workspace.id,
-    });
+    // TODO: search all spaces user is a member of if no spaceId provided
+    throw new NotImplementedException();
   }
 
   @HttpCode(HttpStatus.OK)
@@ -68,21 +57,4 @@ export class SearchController {
   ) {
     return this.searchService.searchSuggestions(dto, user.id, workspace.id);
   }
-
-  @Public()
-  @HttpCode(HttpStatus.OK)
-  @Post('share-search')
-  async searchShare(
-    @Body() searchDto: SearchShareDTO,
-    @AuthWorkspace() workspace: Workspace,
-  ) {
-    delete searchDto.spaceId;
-    if (!searchDto.shareId) {
-      throw new BadRequestException('shareId is required');
-    }
-
-    return this.searchService.searchPage(searchDto.query, searchDto, {
-      workspaceId: workspace.id,
-    });
-  }
 }

apps/server/src/core/search/search.service.ts

@@ -6,7 +6,6 @@ import { KyselyDB } from '@docmost/db/types/kysely.types';
 import { sql } from 'kysely';
 import { PageRepo } from '@docmost/db/repos/page/page.repo';
 import { SpaceMemberRepo } from '@docmost/db/repos/space/space-member.repo';
-import { ShareRepo } from '@docmost/db/repos/share/share.repo';
 
 // eslint-disable-next-line @typescript-eslint/no-require-imports
 const tsquery = require('pg-tsquery')();
@@ -16,24 +15,19 @@ export class SearchService {
   constructor(
     @InjectKysely() private readonly db: KyselyDB,
     private pageRepo: PageRepo,
-    private shareRepo: ShareRepo,
     private spaceMemberRepo: SpaceMemberRepo,
   ) {}
 
   async searchPage(
     query: string,
     searchParams: SearchDTO,
-    opts: {
-      userId?: string;
-      workspaceId: string;
-    },
   ): Promise<SearchResponseDto[]> {
     if (query.length < 1) {
       return;
     }
     const searchQuery = tsquery(query.trim() + '*');
 
-    let queryResults = this.db
+    const queryResults = await this.db
       .selectFrom('pages')
       .select([
         'id',
@@ -49,71 +43,18 @@ export class SearchService {
           'highlight',
         ),
       ])
+      .select((eb) => this.pageRepo.withSpace(eb))
+      .where('spaceId', '=', searchParams.spaceId)
       .where('tsv', '@@', sql<string>`to_tsquery(${searchQuery})`)
       .$if(Boolean(searchParams.creatorId), (qb) =>
         qb.where('creatorId', '=', searchParams.creatorId),
       )
       .orderBy('rank', 'desc')
       .limit(searchParams.limit | 20)
-      .offset(searchParams.offset || 0);
+      .offset(searchParams.offset || 0)
+      .execute();
 
-    if (!searchParams.shareId) {
-      queryResults = queryResults.select((eb) => this.pageRepo.withSpace(eb));
-    }
-
-    if (searchParams.spaceId) {
-      // search by spaceId
-      queryResults = queryResults.where('spaceId', '=', searchParams.spaceId);
-    } else if (opts.userId && !searchParams.spaceId) {
-      // only search spaces the user is a member of
-      const userSpaceIds = await this.spaceMemberRepo.getUserSpaceIds(
-        opts.userId,
-      );
-      if (userSpaceIds.length > 0) {
-        queryResults = queryResults
-          .where('spaceId', 'in', userSpaceIds)
-          .where('workspaceId', '=', opts.workspaceId);
-      } else {
-        return [];
-      }
-    } else if (searchParams.shareId && !searchParams.spaceId && !opts.userId) {
-      // search in shares
-      const shareId = searchParams.shareId;
-      const share = await this.shareRepo.findById(shareId);
-      if (!share || share.workspaceId !== opts.workspaceId) {
-        return [];
-      }
-
-      const pageIdsToSearch = [];
-      if (share.includeSubPages) {
-        const pageList = await this.pageRepo.getPageAndDescendants(
-          share.pageId,
-          {
-            includeContent: false,
-          },
-        );
-
-        pageIdsToSearch.push(...pageList.map((page) => page.id));
-      } else {
-        pageIdsToSearch.push(share.pageId);
-      }
-
-      if (pageIdsToSearch.length > 0) {
-        queryResults = queryResults
-          .where('id', 'in', pageIdsToSearch)
-          .where('workspaceId', '=', opts.workspaceId);
-      } else {
-        return [];
-      }
-    } else {
-      return [];
-    }
-
-    //@ts-ignore
-    queryResults = await queryResults.execute();
-
-    //@ts-ignore
-    const searchResults = queryResults.map((result: SearchResponseDto) => {
+    const searchResults = queryResults.map((result) => {
       if (result.highlight) {
         result.highlight = result.highlight
           .replace(/\r\n|\r|\n/g, ' ')

apps/server/src/core/share/share.service.ts

@@ -15,7 +15,6 @@ import {
   getAttachmentIds,
   getProsemirrorContent,
   isAttachmentNode,
-  removeMarkTypeFromDoc,
 } from '../../common/helpers/prosemirror/utils';
 import { Node } from '@tiptap/pm/model';
 import { ShareRepo } from '@docmost/db/repos/share/share.repo';
@@ -224,7 +223,11 @@ export class ShareService {
                   .end()
                   .as('found'),
             ])
-            .where(isValidUUID(childPageId) ? 'id' : 'slugId', '=', childPageId)
+            .where(
+              isValidUUID(childPageId) ? 'id' : 'slugId',
+              '=',
+              childPageId,
+            )
             .unionAll((exp) =>
               exp
                 .selectFrom('pages as p')
@@ -289,7 +292,6 @@ export class ShareService {
       updateAttachmentAttr(node, 'url', token);
     });
 
-    const removeCommentMarks = removeMarkTypeFromDoc(doc, 'comment');
-    return removeCommentMarks.toJSON();
+    return doc.toJSON();
   }
 }

apps/server/src/database/repos/page/page.repo.ts

@@ -244,7 +244,7 @@ export class PageRepo {
                 'p.spaceId',
                 'p.workspaceId',
               ])
-              .$if(opts?.includeContent, (qb) => qb.select('p.content'))
+              .$if(opts?.includeContent, (qb) => qb.select('content'))
               .innerJoin('page_hierarchy as ph', 'p.parentPageId', 'ph.id'),
           ),
       )

apps/server/src/integrations/export/turndown-utils.ts

@@ -68,7 +68,7 @@ function taskList(turndownService: TurndownService) {
       ) as HTMLInputElement;
       const isChecked = checkbox.checked;
 
-      return `- ${isChecked ? '[x]' : '[ ]'} ${content.trim()} \n`;
+      return `- ${isChecked ? '[x]' : '[ ]'}  ${content.trim()} \n`;
     },
   });
 }

apps/server/src/integrations/static/static.module.ts

@@ -42,9 +42,6 @@ export class StaticModule implements OnModuleInit {
           ? this.environmentService.getSubdomainHost()
           : undefined,
         COLLAB_URL: this.environmentService.getCollabUrl(),
-        BILLING_TRIAL_DAYS: this.environmentService.isCloud()
-          ? this.environmentService.getBillingTrialDays()
-          : undefined,
       };
 
       const windowScriptContent = `<script>window.CONFIG=${JSON.stringify(configString)};</script>`;

apps/server/src/main.ts

@@ -4,7 +4,12 @@ import {
   FastifyAdapter,
   NestFastifyApplication,
 } from '@nestjs/platform-fastify';
-import { Logger, NotFoundException, ValidationPipe } from '@nestjs/common';
+import {
+  Logger,
+  NotFoundException,
+  RequestMethod,
+  ValidationPipe,
+} from '@nestjs/common';
 import { TransformHttpResponseInterceptor } from './common/interceptors/http-response.interceptor';
 import { WsRedisIoAdapter } from './ws/adapter/ws-redis.adapter';
 import { InternalLogFilter } from './common/logger/internal-log-filter';
@@ -87,14 +92,6 @@ async function bootstrap() {
 
   const logger = new Logger('NestApplication');
 
-  process.on('unhandledRejection', (reason, promise) => {
-    logger.error(`UnhandledRejection: ${promise}, reason: ${reason}`);
-  });
-
-  process.on('uncaughtException', (error) => {
-    logger.error('UncaughtException:', error);
-  });
-
   const port = process.env.PORT || 3000;
   await app.listen(port, '0.0.0.0', () => {
     logger.log(

package.json

@@ -1,7 +1,7 @@
 {
   "name": "docmost",
   "homepage": "https://docmost.com",
-  "version": "0.20.3",
+  "version": "0.10.2",
   "private": true,
   "scripts": {
     "build": "nx run-many -t build",