Merge branch 'dev' into main

Author: gustavotoyota

README.md

@@ -2,11 +2,11 @@
 
 Website: [https://deepnotes.app](https://deepnotes.app)
 
-DeepNotes is an open source, end-to-end encrypted visual note-taking app with deep page navigation and live collaboration.
+DeepNotes is an open source, end-to-end encrypted infinite canvas note-taking app with deep page navigation and live collaboration.
 
 ## Why DeepNotes?
 
-- **Visual note-taking:** Free yourself from the big wall of text.
+- **Infinite canvas note-taking:** Free yourself from the big wall of text.
 - **Deep page navigation:** Explore concepts in all their complexity.
 - **End-to-end encryption:** Keep your notes well protected.
 - **Live collaboration:** Create groups to collaborate with your team.

apps/client/components.d.ts

@@ -19,6 +19,7 @@ declare module '@vue/runtime-core' {
     DisplayBtn: typeof import('./src/components/DisplayBtn.vue')['default']
     EvaluatedPasswordField: typeof import('./src/components/EvaluatedPasswordField.vue')['default']
     Gap: typeof import('./src/components/Gap.vue')['default']
+    InlineGap: typeof import('./src/components/InlineGap.vue')['default']
     LinkURL: typeof import('./src/components/LinkURL.vue')['default']
     LoadingOverlay: typeof import('./src/components/LoadingOverlay.vue')['default']
     MiniSidebarBtn: typeof import('./src/components/MiniSidebarBtn.vue')['default']

apps/client/index.html

@@ -18,7 +18,7 @@
     <!-- Primary Meta Tags -->
     <meta
       name="description"
-      content="DeepNotes is an open source, end-to-end encrypted visual note-taking app with bidirectional page navigation and live collaboration."
+      content="DeepNotes is an open source, end-to-end encrypted infinite canvas note-taking app with bidirectional page navigation and live collaboration."
     />
     <meta
       name="keywords"
@@ -54,7 +54,7 @@
     />
     <meta
       property="og:description"
-      content="DeepNotes is an open source, end-to-end encrypted visual note-taking app with bidirectional page navigation and live collaboration."
+      content="DeepNotes is an open source, end-to-end encrypted infinite canvas note-taking app with bidirectional page navigation and live collaboration."
     />
     <meta
       property="og:image"
@@ -76,7 +76,7 @@
     />
     <meta
       property="twitter:description"
-      content="DeepNotes is an open source, end-to-end encrypted visual note-taking app with bidirectional page navigation and live collaboration."
+      content="DeepNotes is an open source, end-to-end encrypted infinite canvas note-taking app with bidirectional page navigation and live collaboration."
     />
     <meta
       property="twitter:image"

apps/client/public/help/how-to-create-a-group/create-new-page.png

@@ -348,14 +348,14 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = NK86B84G2A;
 				INFOPLIST_FILE = App/Info.plist;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 1.0.2;
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
 				PRODUCT_BUNDLE_IDENTIFIER = app.deepnotes;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -375,14 +375,14 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 3;
+				CURRENT_PROJECT_VERSION = 4;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = NK86B84G2A;
 				INFOPLIST_FILE = App/Info.plist;
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.productivity";
 				IPHONEOS_DEPLOYMENT_TARGET = 13.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				MARKETING_VERSION = 1.0;
+				MARKETING_VERSION = 1.0.2;
 				PRODUCT_BUNDLE_IDENTIFIER = app.deepnotes;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

apps/client/public/help/how-to-create-a-group/create-with-options.png

@@ -1,4 +1,3 @@
-import { splitStr } from '@stdlib/misc';
 import { useEventListener } from '@vueuse/core';
 import { imageResizing } from 'src/code/tiptap/image-resize/NodeView.vue';
 import { youtubeResizing } from 'src/code/tiptap/youtube-video/NodeView.vue';
@@ -42,8 +41,8 @@ export function usePageNavigationInterception() {
         !(
           href.startsWith('/pages/') ||
           href.startsWith('/groups/') ||
-          href.startsWith(`${window.location.origin}/pages/`) ||
-          href.startsWith(`${window.location.origin}/groups/`)
+          href.startsWith('https://deepnotes.app/pages/') ||
+          href.startsWith('https://deepnotes.app/groups/')
         )
       ) {
         mainLogger
@@ -58,9 +57,14 @@ export function usePageNavigationInterception() {
         'Link points to a DeepNotes page: prevent default action.',
       );
 
-      event.preventDefault(); // Prevent default action
+      event.preventDefault(); // Prevent default
 
-      const id = splitStr(href, '/').at(-1) ?? '';
+      const matches =
+        href.match(/\/(?:pages|groups)\/([\w-]{21})(?:\?note=([\w-]{21}))?/) ??
+        [];
+
+      const id = matches[1];
+      const noteId = matches[2];
 
       if (href.includes('/groups/')) {
         await internals.pages.goToGroup(id, {
@@ -71,6 +75,7 @@ export function usePageNavigationInterception() {
         await internals.pages.goToPage(id, {
           fromParent: true,
           openInNewTab: isCtrlDown(event),
+          noteId,
         });
       }
     } catch (error) {