feat(snippets): add snippet link (#230)

antonreshetov · web-flow · commit 5a744f5d482c · 2022-08-14T09:13:00.000+03:00
diff --git a/config/electron-builder.ts b/config/electron-builder.ts
@@ -52,6 +52,12 @@ export default {
   extraMetadata: {
     main: 'src/main/index.js'
   },
+  protocols: [
+    {
+      name: 'massCode',
+      schemes: ['masscode']
+    }
+  ],
   files: [
     '!**/node_modules/*/{CHANGELOG.md,README.md,README,readme.md,readme}',
     '!**/node_modules/*/{test,__tests__,tests,powered-test,example,examples}',
diff --git a/src/main/index.ts b/src/main/index.ts
@@ -12,16 +12,24 @@ import { checkForUpdateWithInterval } from './services/update-check'
 
 const isDev = process.env.NODE_ENV === 'development'
 const isMac = process.platform === 'darwin'
+const gotTheLock = app.requestSingleInstanceLock()
+
+let mainWindow: BrowserWindow
 
 createDb()
 const apiServer = new ApiServer()
 
 subscribeToChannels()
 subscribeToDialog()
 
+if (!gotTheLock) {
+  // @ts-ignore
+  return app.quit()
+}
+
 function createWindow () {
   const bounds = store.app.get('bounds')
-  const mainWindow = new BrowserWindow({
+  mainWindow = new BrowserWindow({
     width: 1000,
     height: 600,
     ...bounds,
@@ -54,6 +62,16 @@ const storeBounds = debounce((mainWindow: BrowserWindow) => {
   store.app.set('bounds', mainWindow.getBounds())
 }, 300)
 
+if (process.defaultApp) {
+  if (process.argv.length >= 2) {
+    app.setAsDefaultProtocolClient('masscode', process.execPath, [
+      path.resolve(process.argv[1])
+    ])
+  }
+} else {
+  app.setAsDefaultProtocolClient('masscode')
+}
+
 app.whenReady().then(async () => {
   createWindow()
 
@@ -74,6 +92,22 @@ app.on('browser-window-focus', () => {
   BrowserWindow.getFocusedWindow()?.webContents.send('main:focus')
 })
 
+app.on('second-instance', (e, argv) => {
+  if (mainWindow) {
+    if (mainWindow.isMinimized()) mainWindow.restore()
+    mainWindow.focus()
+  }
+
+  if (process.platform !== 'darwin') {
+    const url = argv.find(i => i.startsWith('masscode://'))
+    BrowserWindow.getFocusedWindow()?.webContents.send('main:app-protocol', url)
+  }
+})
+
+app.on('open-url', (event, url) => {
+  BrowserWindow.getFocusedWindow()?.webContents.send('main:app-protocol', url)
+})
+
 ipcMain.handle('main:restart-api', () => {
   apiServer.restart()
 })
diff --git a/src/main/services/analytics/index.ts b/src/main/services/analytics/index.ts
@@ -19,8 +19,10 @@ export const track = (event: TrackEvents, payload?: string) => {
     ? `${version}/${os}/${event}/${payload}`
     : `${version}/${os}/${event}`
 
-  if (isDev && process.env.DEBUG?.includes('analytics')) {
-    console.log('[analytics]:', path)
+  if (isDev) {
+    if (process.env.DEBUG?.includes('analytics')) {
+      console.log('[analytics]:', path)
+    }
   } else {
     analytics.pageview(path).send()
   }
diff --git a/src/main/services/api/server.ts b/src/main/services/api/server.ts
@@ -151,6 +151,10 @@ export class ApiServer {
       }
     }
 
+    // Почему то на windows API сервер падает, не смотря на то,
+    // что порт API свободен, поэтому просто обрабатываем ошибку
+    server.on('error', err => console.error(err))
+
     return server
   }
 
diff --git a/src/main/services/i18n/locales/en/common.json b/src/main/services/i18n/locales/en/common.json
@@ -59,5 +59,6 @@
   "show": "Show",
   "collapse-all": "Collapse All",
   "expand-all": "Expand All",
-  "restore": "Restore"
+  "restore": "Restore",
+  "copy-snippet-link": "Copy Snippet Link"
 }
diff --git a/src/main/services/i18n/locales/ru/common.json b/src/main/services/i18n/locales/ru/common.json
@@ -58,5 +58,6 @@
   "show": "Show",
   "collapse-all": "Закрыть все",
   "expand-all": "Открыть все",
-  "restore": "Восстановить"
+  "restore": "Восстановить",
+  "copy-snippet-link": "Скопировать ссылку"
 }
diff --git a/src/main/services/ipc/context-menu.ts b/src/main/services/ipc/context-menu.ts
@@ -75,6 +75,17 @@ export const subscribeToContextMenu = () => {
             }
           },
           { type: 'separator' },
+          {
+            label: i18n.t('copy-snippet-link'),
+            click: () => {
+              resolve({
+                action: 'copy-snippet-link',
+                type,
+                data: true
+              })
+            }
+          },
+          { type: 'separator' },
           {
             label: i18n.t('duplicate'),
             click: () => {
diff --git a/src/renderer/App.vue b/src/renderer/App.vue
@@ -37,7 +37,8 @@ import {
   onCopySnippet,
   emitter,
   onCreateSnippet,
-  onAddDescription
+  onAddDescription,
+  goToSnippet
 } from '@/composable'
 import { useRoute } from 'vue-router'
 import type { Snippet } from '@shared/types/main/db'
@@ -164,6 +165,13 @@ ipc.on('main:focus', () => {
   showSupportToast()
 })
 
+ipc.on('main:app-protocol', (event, payload: string) => {
+  if (/^masscode:\/\/snippets/.test(payload)) {
+    const snippetId = payload.split('/').pop()
+    if (snippetId) goToSnippet(snippetId)
+  }
+})
+
 ipc.on('main-menu:preferences', () => {
   router.push('/preferences')
 })
diff --git a/src/renderer/assets/scss/themes.scss b/src/renderer/assets/scss/themes.scss
@@ -300,7 +300,7 @@
 }
 
 [data-theme^="dark"] {
-  a {
+  > a {
     color: var(--color-contrast-medium);
     &:hover {
       color: var(--color-text);
diff --git a/src/renderer/components/markdown/TheMarkdown.vue b/src/renderer/components/markdown/TheMarkdown.vue
@@ -15,9 +15,8 @@ import { computed, onBeforeUnmount, onMounted, ref, watch, nextTick } from 'vue'
 import { ipc, store } from '@/electron'
 import { marked } from 'marked'
 import mermaid from 'mermaid'
-import { useHljsTheme } from '@/composable'
+import { useHljsTheme, goToSnippet } from '@/composable'
 import { useCodemirror } from '@/composable/codemirror'
-
 import { nanoid } from 'nanoid'
 
 const isDev = import.meta.env.DEV
@@ -75,7 +74,12 @@ const init = () => {
       }
     },
     link (href: string, title: string, text: string) {
-      return `<a href="${href}" class="external">${text}</a>`
+      if (/^masscode:\/\/snippets/.test(href)) {
+        const id = href.split('/').pop()
+        return `<a href="${href}" class="snippet-link" data-snippet-id="${id}">${text}</a>`
+      } else {
+        return `<a href="${href}" class="external">${text}</a>`
+      }
     }
   }
 
@@ -181,9 +185,11 @@ const render = () => {
         'type',
         'checked',
         'disabled',
-        'id'
+        'id',
+        'data-*'
       ]
-    }
+    },
+    allowedSchemes: ['http', 'https', 'masscode']
   })
 
   const re = /src="\.\//g
@@ -196,12 +202,18 @@ const render = () => {
   renderedHtml.value = html
 }
 
-const openExternal = (e: Event) => {
+const onLink = async (e: Event) => {
   const el = e.target as HTMLAnchorElement
   e.preventDefault()
+
   if (el.classList.contains('external')) {
     ipc.invoke('main:open-url', el.href)
   }
+
+  if (el.classList.contains('snippet-link')) {
+    const { snippetId } = el.dataset
+    if (snippetId) goToSnippet(snippetId)
+  }
 }
 
 const height = computed(() => {
@@ -257,11 +269,11 @@ watch(
 init()
 
 onMounted(() => {
-  document.addEventListener('click', openExternal)
+  document.addEventListener('click', onLink)
 })
 
 onBeforeUnmount(() => {
-  document.removeEventListener('click', openExternal)
+  document.removeEventListener('click', onLink)
 })
 
 window.addEventListener('resize', () => {
diff --git a/src/renderer/components/sidebar/SidebarList.vue b/src/renderer/components/sidebar/SidebarList.vue
@@ -86,7 +86,7 @@ emitter.on('scroll-to:folder', id => {
   nextTick(() => {
     const el = document.querySelector<HTMLElement>(`[data-id='${id}']`)
     if (el) {
-      setScrollPosition(bodyRef.value!, el.getBoundingClientRect().top + 210)
+      setScrollPosition(bodyRef.value!, el.getBoundingClientRect().top - 210)
     }
   })
 })
diff --git a/src/renderer/components/sidebar/SidebarListItem.vue b/src/renderer/components/sidebar/SidebarListItem.vue
@@ -41,6 +41,7 @@ import { useTagStore } from '@/store/tags'
 import type { FolderTree } from '@shared/types/main/db'
 import { useSnippetStore } from '@/store/snippets'
 import { emitter } from '@/composable'
+import { onScrollToFolder } from './composable'
 
 interface Props {
   id?: string
@@ -162,6 +163,8 @@ onClickOutside(itemRef, () => {
   isFocused.value = false
 })
 
+onScrollToFolder(isFocused)
+
 watch(
   () => props.isSelected,
   v => {
diff --git a/src/renderer/components/sidebar/TheSidebar.vue b/src/renderer/components/sidebar/TheSidebar.vue
@@ -52,6 +52,7 @@
         v-model="folderStore.foldersTree"
         :selected-id="folderStore.selectedId"
         :context-menu-handler="contextMenuHandler"
+        :focus-handler="focusHandler"
         @update:model-value="onUpdate"
         @click:node="onClickFolder"
       >
@@ -81,6 +82,7 @@
 </template>
 
 <script setup lang="ts">
+import type { Ref } from 'vue'
 import { onMounted, ref, watch } from 'vue'
 import type {
   SidebarSystemFolder,
@@ -101,6 +103,7 @@ import { emitter, onAddNewFolder } from '@/composable'
 import interact from 'interactjs'
 import { useAppStore } from '@/store/app'
 import type { Snippet } from '@shared/types/main/db'
+import { onScrollToFolder } from './composable'
 
 const folderStore = useFolderStore()
 const snippetStore = useSnippetStore()
@@ -184,6 +187,10 @@ const onDragEnter = (id: string) => {
   folderStore.hoveredId = id
 }
 
+const focusHandler = (isFocused: Ref) => {
+  onScrollToFolder(isFocused)
+}
+
 onMounted(() => {
   interact(sidebarRef.value).resizable({
     allowFrom: gutterRef.value,
diff --git a/src/renderer/components/sidebar/composable.ts b/src/renderer/components/sidebar/composable.ts
@@ -0,0 +1,17 @@
+import { emitter } from '@/composable'
+import { onUnmounted } from 'vue'
+import type { Ref } from 'vue'
+
+export const onScrollToFolder = (isFocused: Ref) => {
+  if (!isFocused) return
+
+  const handler = () => {
+    isFocused.value = false
+  }
+
+  emitter.on('scroll-to:folder', handler)
+
+  onUnmounted(() => {
+    emitter.off('scroll-to:folder', handler)
+  })
+}
diff --git a/src/renderer/components/snippets/SnippetListItem.vue b/src/renderer/components/snippets/SnippetListItem.vue
@@ -39,11 +39,12 @@ import type {
   ContextMenuRequest,
   ContextMenuResponse
 } from '@shared/types/main'
-import { onClickOutside } from '@vueuse/core'
-import { computed, ref } from 'vue'
+import { onClickOutside, useClipboard } from '@vueuse/core'
+import { computed, onUnmounted, ref } from 'vue'
 import type { SystemFolderAlias } from '@shared/types/renderer/sidebar'
 import { useTagStore } from '@/store/tags'
 import { isToday, format } from 'date-fns'
+import { emitter } from '@/composable'
 
 interface Props {
   id: string
@@ -225,6 +226,12 @@ const onClickContextMenu = async () => {
     track('snippets/restore-from-trash')
   }
 
+  if (action === 'copy-snippet-link') {
+    const { copy } = useClipboard({ source: `masscode://snippets/${props.id}` })
+    copy()
+    track('snippets/copy-link')
+  }
+
   isHighlighted.value = false
   isFocused.value = false
   snippetStore.isContextState = false
@@ -274,6 +281,18 @@ const onDragStart = (e: DragEvent) => {
 const onDragEnd = () => {
   folderStore.hoveredId = ''
 }
+
+const onScrollToSnippet = () => {
+  if (snippetStore.selectedId !== props.id) {
+    isFocused.value = false
+  }
+}
+
+emitter.on('scroll-to:snippet', onScrollToSnippet)
+
+onUnmounted(() => {
+  emitter.off('scroll-to:snippet', onScrollToSnippet)
+})
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/renderer/components/ui/AppTree/AppTree.vue b/src/renderer/components/ui/AppTree/AppTree.vue
@@ -26,6 +26,7 @@
 </template>
 
 <script setup lang="ts">
+import type { Ref } from 'vue'
 import { provide, ref, watch } from 'vue'
 import { store } from './composable'
 import type { Node } from './types'
@@ -37,6 +38,7 @@ interface Props {
   createGhostEl?: Function
   // Колбек должен вернуть состояние для props.isHighlighted AppTreeNode
   contextMenuHandler: () => Promise<boolean>
+  focusHandler?: (isFocused: Ref) => void
 }
 
 interface Emits {
@@ -68,6 +70,7 @@ provide('updateValue', updateValue)
 provide('clickNode', clickNode)
 provide('contextMenuHandler', props.contextMenuHandler)
 provide('isHoveredByIdDisabled', isHoveredByIdDisabled)
+provide('focusHandler', props.focusHandler)
 
 defineExpose({
   setHoveredNodeId
diff --git a/src/renderer/components/ui/AppTree/AppTreeNode.vue b/src/renderer/components/ui/AppTree/AppTreeNode.vue
diff --git a/src/renderer/composable/index.ts b/src/renderer/composable/index.ts
diff --git a/src/renderer/store/snippets.ts b/src/renderer/store/snippets.ts
diff --git a/src/shared/types/main/analytics.d.ts b/src/shared/types/main/analytics.d.ts
diff --git a/src/shared/types/main/index.d.ts b/src/shared/types/main/index.d.ts

Original file line number	Diff line number	Diff line change
`@@ -151,6 +151,10 @@ export class ApiServer {`
`151`	`151`	`}`
`152`	`152`	`}`
`153`	`153`
	`154`	`+ // Почему то на windows API сервер падает, не смотря на то,`
	`155`	`+ // что порт API свободен, поэтому просто обрабатываем ошибку`
	`156`	`+ server.on('error', err => console.error(err))`
	`157`	`+`
`154`	`158`	`return server`
`155`	`159`	`}`
`156`	`160`
Original file line number	Diff line number	Diff line change
`@@ -59,5 +59,6 @@`
`59`	`59`	`"show": "Show",`
`60`	`60`	`"collapse-all": "Collapse All",`
`61`	`61`	`"expand-all": "Expand All",`
`62`		`- "restore": "Restore"`
	`62`	`+ "restore": "Restore",`
	`63`	`+ "copy-snippet-link": "Copy Snippet Link"`
`63`	`64`	`}`
Original file line number	Diff line number	Diff line change
`@@ -58,5 +58,6 @@`
`58`	`58`	`"show": "Show",`
`59`	`59`	`"collapse-all": "Закрыть все",`
`60`	`60`	`"expand-all": "Открыть все",`
`61`		`- "restore": "Восстановить"`
	`61`	`+ "restore": "Восстановить",`
	`62`	`+ "copy-snippet-link": "Скопировать ссылку"`
`62`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -300,7 +300,7 @@`
`300`	`300`	`}`
`301`	`301`
`302`	`302`	`[data-theme^="dark"] {`
`303`		`- a {`
	`303`	`+ > a {`
`304`	`304`	`color: var(--color-contrast-medium);`
`305`	`305`	`&:hover {`
`306`	`306`	`color: var(--color-text);`