From 07a3bdacd95634af445376da15e544b9ba82da62 Mon Sep 17 00:00:00 2001
From: Anthony Fu <anthonyfu117@hotmail.com>
Date: Fri, 3 Feb 2023 22:52:08 +0100
Subject: [PATCH] feat: experimental notes page

---
 demo/composable-vue/slides.md                |  2 +-
 packages/client/internals/Draggable.vue      |  4 +-
 packages/client/internals/NoteEditor.vue     |  2 +-
 packages/client/internals/NoteStatic.vue     |  2 +-
 packages/client/internals/NotesView.vue      | 67 ++++++++++++++++++++
 packages/client/internals/Presenter.vue      |  2 +-
 packages/client/internals/PresenterPrint.vue |  4 +-
 packages/client/internals/WebCamera.vue      |  6 +-
 packages/client/logic/dark.ts                |  4 +-
 packages/client/logic/drawings.ts            |  8 +--
 packages/client/logic/recording.ts           |  4 +-
 packages/client/routes.ts                    | 39 +++++++-----
 packages/client/setup/root.ts                | 17 ++++-
 packages/client/state/index.ts               | 16 ++---
 packages/client/state/shared.ts              | 19 +++++-
 packages/slidev/node/plugins/loaders.ts      |  2 +-
 packages/types/src/types.ts                  |  2 +-
 17 files changed, 152 insertions(+), 48 deletions(-)
 create mode 100644 packages/client/internals/NotesView.vue

diff --git a/demo/composable-vue/slides.md b/demo/composable-vue/slides.md
index b52bfa3cc6..139a3e7e32 100644
--- a/demo/composable-vue/slides.md
+++ b/demo/composable-vue/slides.md
@@ -281,7 +281,7 @@ Sets of reusable logic, separation of concerns.
 ```ts
 export function useDark(options: UseDarkOptions = {}) {
   const preferredDark = usePreferredDark() // <--
-  const store = useStorage('vueuse-dark', 'auto') // <--
+  const store = useLocalStorage('vueuse-dark', 'auto') // <--
 
   return computed<boolean>({
     get() {
diff --git a/packages/client/internals/Draggable.vue b/packages/client/internals/Draggable.vue
index 20997d45cf..8b7521cdd0 100644
--- a/packages/client/internals/Draggable.vue
+++ b/packages/client/internals/Draggable.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { ref } from 'vue'
-import { useDraggable, useStorage } from '@vueuse/core'
+import { useDraggable, useLocalStorage } from '@vueuse/core'
 
 const props = defineProps<{
   storageKey?: string
@@ -10,7 +10,7 @@ const props = defineProps<{
 const el = ref<HTMLElement | null>(null)
 const initial = props.initial ?? { x: 0, y: 0 }
 const point = props.storageKey
-  ? useStorage(props.storageKey, initial)
+  ? useLocalStorage(props.storageKey, initial)
   : ref(initial)
 const { style } = useDraggable(el, { initialValue: point })
 </script>
diff --git a/packages/client/internals/NoteEditor.vue b/packages/client/internals/NoteEditor.vue
index 66570ca211..de517f1e84 100644
--- a/packages/client/internals/NoteEditor.vue
+++ b/packages/client/internals/NoteEditor.vue
@@ -64,7 +64,7 @@ onClickOutside(input, () => {
     v-if="!editing && note"
     :class="props.class"
     :note="note"
-    :note-html="info?.notesHTML"
+    :note-html="info?.noteHTML"
     @click="switchNoteEdit"
   />
   <textarea
diff --git a/packages/client/internals/NoteStatic.vue b/packages/client/internals/NoteStatic.vue
index 9b0451f199..b9df770c96 100644
--- a/packages/client/internals/NoteStatic.vue
+++ b/packages/client/internals/NoteStatic.vue
@@ -8,7 +8,7 @@ const props = defineProps<{
 }>()
 
 const note = computed(() => currentRoute.value?.meta?.slide?.note)
-const noteHtml = computed(() => currentRoute.value?.meta?.slide?.notesHTML)
+const noteHtml = computed(() => currentRoute.value?.meta?.slide?.noteHTML)
 </script>
 
 <template>
diff --git a/packages/client/internals/NotesView.vue b/packages/client/internals/NotesView.vue
new file mode 100644
index 0000000000..b425f8afd2
--- /dev/null
+++ b/packages/client/internals/NotesView.vue
@@ -0,0 +1,67 @@
+<script setup lang="ts">
+import { useHead } from '@vueuse/head'
+import { computed } from 'vue'
+import { useLocalStorage } from '@vueuse/core'
+import { configs } from '../env'
+import { sharedState } from '../state/shared'
+import { total } from '../logic/nav'
+import { rawRoutes } from '../routes'
+import NoteViewer from './NoteViewer.vue'
+
+const slideTitle = configs.titleTemplate.replace('%s', configs.title || 'Slidev')
+useHead({
+  title: `Notes - ${slideTitle}`,
+})
+
+const fontSize = useLocalStorage('slidev-notes-font-size', 18)
+const pageNo = computed(() => sharedState.lastUpdate?.type === 'viewer' ? sharedState.viewerPage : sharedState.page)
+const route = computed(() => rawRoutes.find(i => i.path === `${pageNo.value}`))
+const note = computed(() => route.value?.meta?.slide?.note)
+const noteHtml = computed(() => route.value?.meta?.slide?.noteHTML)
+
+function increaseFontSize() {
+  fontSize.value = fontSize.value + 1
+}
+
+function decreaseFontSize() {
+  fontSize.value = fontSize.value - 1
+}
+</script>
+
+<template>
+  <div
+    class="fixed top-0 left-0 h-2px bg-teal-500 transition-all duration-500"
+    :style="{ width: `${(pageNo - 1) / total * 100}%` }"
+  />
+  <div class="h-full flex flex-col">
+    <div
+      class="px-5 flex-auto h-full overflow-auto"
+      :style="{ fontSize: `${fontSize}px` }"
+    >
+      <NoteViewer
+        v-if="note"
+        :note="note"
+        :note-html="noteHtml"
+      />
+      <div v-else class="prose overflow-auto outline-none opacity-50">
+        <p>
+          No notes for Slide {{ pageNo }}.
+        </p>
+      </div>
+    </div>
+    <div class="flex-none">
+      <div class="flex gap-1 justify-center items-center">
+        <button class="icon-btn" @click="increaseFontSize">
+          <carbon:add />
+        </button>
+        Font Size
+        <button class="icon-btn" @click="decreaseFontSize">
+          <carbon:subtract />
+        </button>
+      </div>
+      <div class="p2 text-center">
+        {{ pageNo }} / {{ total }}
+      </div>
+    </div>
+  </div>
+</template>
diff --git a/packages/client/internals/Presenter.vue b/packages/client/internals/Presenter.vue
index 6eacde261a..cfc2fb9459 100644
--- a/packages/client/internals/Presenter.vue
+++ b/packages/client/internals/Presenter.vue
@@ -118,7 +118,7 @@ onMounted(() => {
           class="h-full w-full"
         >
           <SlideWrapper
-            :is="nextSlide.route?.component"
+            :is="nextSlide.route?.component as any"
             v-model:clicks-elements="nextTabElements"
             :clicks="nextSlide.clicks"
             :clicks-disabled="false"
diff --git a/packages/client/internals/PresenterPrint.vue b/packages/client/internals/PresenterPrint.vue
index 64df4425d2..d8b36ad204 100644
--- a/packages/client/internals/PresenterPrint.vue
+++ b/packages/client/internals/PresenterPrint.vue
@@ -29,7 +29,7 @@ useHead({ title: `Notes - ${configs.title}` })
 const slidesWithNote = computed(() => rawRoutes
   .slice(0, -1)
   .map(route => route.meta?.slide)
-  .filter(slide => slide !== undefined && slide.notesHTML !== ''))
+  .filter(slide => slide !== undefined && slide.noteHTML !== ''))
 </script>
 
 <template>
@@ -55,7 +55,7 @@ const slidesWithNote = computed(() => rawRoutes
               <div class="flex-auto" />
             </div>
           </h2>
-          <NoteViewer :note-html="slide!.notesHTML" class="max-w-full" />
+          <NoteViewer :note-html="slide!.noteHTML" class="max-w-full" />
         </div>
         <hr v-if="index < slidesWithNote.length - 1" class="border-gray-400/50 mb-8">
       </div>
diff --git a/packages/client/internals/WebCamera.vue b/packages/client/internals/WebCamera.vue
index 6d7375db78..5efbeba95b 100644
--- a/packages/client/internals/WebCamera.vue
+++ b/packages/client/internals/WebCamera.vue
@@ -1,11 +1,11 @@
 <script setup lang="ts">
-import { useDraggable, useEventListener, useStorage } from '@vueuse/core'
+import { useDraggable, useEventListener, useLocalStorage } from '@vueuse/core'
 import { computed, onMounted, ref, watchEffect } from 'vue'
 import { currentCamera } from '../state'
 import { recorder } from '../logic/recording'
 
-const size = useStorage('slidev-webcam-size', Math.round(Math.min(window.innerHeight, (window.innerWidth) / 8)))
-const position = useStorage('slidev-webcam-pos', {
+const size = useLocalStorage('slidev-webcam-size', Math.round(Math.min(window.innerHeight, (window.innerWidth) / 8)))
+const position = useLocalStorage('slidev-webcam-pos', {
   x: window.innerWidth - size.value - 30,
   y: window.innerHeight - size.value - 30,
 }, undefined, { deep: true })
diff --git a/packages/client/logic/dark.ts b/packages/client/logic/dark.ts
index 021cd76514..293793d3fe 100644
--- a/packages/client/logic/dark.ts
+++ b/packages/client/logic/dark.ts
@@ -1,9 +1,9 @@
-import { isClient, usePreferredDark, useStorage, useToggle } from '@vueuse/core'
+import { isClient, useLocalStorage, usePreferredDark, useToggle } from '@vueuse/core'
 import { computed, watch } from 'vue'
 import { configs } from '../env'
 
 const preferredDark = usePreferredDark()
-const store = useStorage('slidev-color-schema', 'auto')
+const store = useLocalStorage('slidev-color-schema', 'auto')
 
 export const isColorSchemaConfigured = computed(() => configs.colorSchema !== 'auto')
 export const isDark = computed<boolean>({
diff --git a/packages/client/logic/drawings.ts b/packages/client/logic/drawings.ts
index a711eb2775..e70bced49f 100644
--- a/packages/client/logic/drawings.ts
+++ b/packages/client/logic/drawings.ts
@@ -1,7 +1,7 @@
 import { computed, markRaw, nextTick, reactive, ref, watch } from 'vue'
 import type { Brush, Options as DrauuOptions, DrawingMode } from 'drauu'
 import { createDrauu } from 'drauu'
-import { toReactive, useStorage } from '@vueuse/core'
+import { toReactive, useLocalStorage } from '@vueuse/core'
 import { drawingState, onPatch, patch } from '../state/drawings'
 import { configs } from '../env'
 import { currentPage, isPresenter } from './nav'
@@ -16,14 +16,14 @@ export const brushColors = [
   '#000000',
 ]
 
-export const drawingEnabled = useStorage('slidev-drawing-enabled', false)
-export const drawingPinned = useStorage('slidev-drawing-pinned', false)
+export const drawingEnabled = useLocalStorage('slidev-drawing-enabled', false)
+export const drawingPinned = useLocalStorage('slidev-drawing-pinned', false)
 export const canUndo = ref(false)
 export const canRedo = ref(false)
 export const canClear = ref(false)
 export const isDrawing = ref(false)
 
-export const brush = toReactive(useStorage<Brush>('slidev-drawing-brush', {
+export const brush = toReactive(useLocalStorage<Brush>('slidev-drawing-brush', {
   color: brushColors[0],
   size: 4,
   mode: 'stylus',
diff --git a/packages/client/logic/recording.ts b/packages/client/logic/recording.ts
index c6069f58f9..0e27fd0271 100644
--- a/packages/client/logic/recording.ts
+++ b/packages/client/logic/recording.ts
@@ -1,6 +1,6 @@
 import type { Ref } from 'vue'
 import { nextTick, ref, shallowRef, watch } from 'vue'
-import { useDevicesList, useEventListener, useStorage } from '@vueuse/core'
+import { useDevicesList, useEventListener, useLocalStorage } from '@vueuse/core'
 import { isTruthy } from '@antfu/utils'
 import type RecorderType from 'recordrtc'
 import type { Options as RecorderOptions } from 'recordrtc'
@@ -11,7 +11,7 @@ type MimeType = Defined<RecorderOptions['mimeType']>
 
 export const recordingName = ref('')
 export const recordCamera = ref(true)
-export const mimeType = useStorage<MimeType>('slidev-record-mimetype', 'video/webm')
+export const mimeType = useLocalStorage<MimeType>('slidev-record-mimetype', 'video/webm')
 
 export const mimeExtMap: Record<string, string> = {
   'video/webm': 'webm',
diff --git a/packages/client/routes.ts b/packages/client/routes.ts
index 0bace16a68..70d00f7115 100644
--- a/packages/client/routes.ts
+++ b/packages/client/routes.ts
@@ -1,5 +1,4 @@
-import type { RouteRecordRaw } from 'vue-router'
-import type { SlideTransition } from '@slidev/types'
+import type { RouteLocationNormalized, RouteRecordRaw } from 'vue-router'
 import { createRouter, createWebHashHistory, createWebHistory } from 'vue-router'
 import Play from './internals/Play.vue'
 import Print from './internals/Print.vue'
@@ -25,24 +24,31 @@ export const routes: RouteRecordRaw[] = [
 ]
 
 if (__SLIDEV_FEATURE_PRESENTER__) {
+  function passwordGuard(to: RouteLocationNormalized) {
+    if (!_configs.remote || _configs.remote === to.query.password)
+      return true
+    if (_configs.remote && to.query.password === undefined) {
+      // eslint-disable-next-line no-alert
+      const password = prompt('Enter password')
+      if (_configs.remote === password)
+        return true
+    }
+    if (to.params.no)
+      return { path: `/${to.params.no}` }
+    return { path: '' }
+  }
   routes.push({ path: '/presenter/print', component: () => import('./internals/PresenterPrint.vue') })
+  routes.push({
+    name: 'notes',
+    path: '/notes',
+    component: () => import('./internals/NotesView.vue'),
+    beforeEnter: passwordGuard,
+  })
   routes.push({
     name: 'presenter',
     path: '/presenter/:no',
     component: () => import('./internals/Presenter.vue'),
-    beforeEnter: (to) => {
-      if (!_configs.remote || _configs.remote === to.query.password)
-        return true
-      if (_configs.remote && to.query.password === undefined) {
-        // eslint-disable-next-line no-alert
-        const password = prompt('Enter password')
-        if (_configs.remote === password)
-          return true
-      }
-      if (to.params.no)
-        return { path: `/${to.params.no}` }
-      return { path: '' }
-    },
+    beforeEnter: passwordGuard,
   })
   routes.push({
     path: '/presenter',
@@ -65,14 +71,13 @@ declare module 'vue-router' {
       start: number
       end: number
       note?: string
-      notesHTML?: string
+      noteHTML?: string
       id: number
       no: number
       filepath: string
       title?: string
       level?: number
     }
-    transition?: string | SlideTransition
     // private fields
     __clicksElements: HTMLElement[]
     __preloaded?: boolean
diff --git a/packages/client/setup/root.ts b/packages/client/setup/root.ts
index f8086ff7e9..a37aa79cbf 100644
--- a/packages/client/setup/root.ts
+++ b/packages/client/setup/root.ts
@@ -1,6 +1,7 @@
 /* __imports__ */
 import { watch } from 'vue'
 import { useHead, useHtmlAttrs } from '@vueuse/head'
+import { nanoid } from 'nanoid'
 import { configs } from '../env'
 import { initSharedState, onPatch, patch } from '../state/shared'
 import { initDrawingState } from '../state/drawings'
@@ -9,7 +10,7 @@ import { router } from '../routes'
 
 export default function setupRoot() {
   // @ts-expect-error injected in runtime
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+
   const injection_arg = undefined
 
   /* __injections__ */
@@ -20,17 +21,31 @@ export default function setupRoot() {
   initSharedState(`${title} - shared`)
   initDrawingState(`${title} - drawings`)
 
+  const id = nanoid()
+
   // update shared state
   function updateSharedState() {
     if (isPresenter.value) {
       patch('page', +currentPage.value)
       patch('clicks', clicks.value)
     }
+    else {
+      patch('viewerPage', +currentPage.value)
+      patch('viewerClicks', clicks.value)
+    }
+    patch('lastUpdate', {
+      id,
+      type: isPresenter.value ? 'presenter' : 'viewer',
+      time: new Date().getTime(),
+    })
   }
   router.afterEach(updateSharedState)
   watch(clicks, updateSharedState)
 
   onPatch((state) => {
+    const routePath = router.currentRoute.value.path
+    if (!routePath.match(/^\/(\d+|presenter)\/?/))
+      return
     if (+state.page !== +currentPage.value || clicks.value !== state.clicks) {
       router.replace({
         path: getPath(state.page),
diff --git a/packages/client/state/index.ts b/packages/client/state/index.ts
index 060af7729a..51718db7cb 100644
--- a/packages/client/state/index.ts
+++ b/packages/client/state/index.ts
@@ -1,4 +1,4 @@
-import { breakpointsTailwind, isClient, useActiveElement, useBreakpoints, useFullscreen, useMagicKeys, useStorage, useToggle, useWindowSize } from '@vueuse/core'
+import { breakpointsTailwind, isClient, useActiveElement, useBreakpoints, useFullscreen, useLocalStorage, useMagicKeys, useToggle, useWindowSize } from '@vueuse/core'
 import { computed, ref } from 'vue'
 import { slideAspect } from '../env'
 
@@ -20,13 +20,13 @@ export const activeElement = useActiveElement()
 export const isInputting = computed(() => ['INPUT', 'TEXTAREA'].includes(activeElement.value?.tagName || '') || activeElement.value?.classList.contains('CodeMirror-code'))
 export const isOnFocus = computed(() => ['BUTTON', 'A'].includes(activeElement.value?.tagName || ''))
 
-export const currentCamera = useStorage<string>('slidev-camera', 'default')
-export const currentMic = useStorage<string>('slidev-mic', 'default')
-export const slideScale = useStorage<number>('slidev-scale', 0)
+export const currentCamera = useLocalStorage<string>('slidev-camera', 'default')
+export const currentMic = useLocalStorage<string>('slidev-mic', 'default')
+export const slideScale = useLocalStorage<number>('slidev-scale', 0)
 
-export const showOverview = useStorage('slidev-show-overview', false)
-export const showPresenterCursor = useStorage('slidev-presenter-cursor', true)
-export const showEditor = useStorage('slidev-show-editor', false)
-export const editorWidth = useStorage('slidev-editor-width', isClient ? window.innerWidth * 0.4 : 100)
+export const showOverview = useLocalStorage('slidev-show-overview', false)
+export const showPresenterCursor = useLocalStorage('slidev-presenter-cursor', true)
+export const showEditor = useLocalStorage('slidev-show-editor', false)
+export const editorWidth = useLocalStorage('slidev-editor-width', isClient ? window.innerWidth * 0.4 : 100)
 
 export const toggleOverview = useToggle(showOverview)
diff --git a/packages/client/state/shared.ts b/packages/client/state/shared.ts
index 5c9cdc36d4..b3750c1f51 100644
--- a/packages/client/state/shared.ts
+++ b/packages/client/state/shared.ts
@@ -8,10 +8,27 @@ export interface SharedState {
     x: number
     y: number
   }
+
+  viewerPage: number
+  viewerClicks: number
+
+  lastUpdate?: {
+    id: string
+    type: 'presenter' | 'viewer'
+    time: number
+  }
 }
 
 const { init, onPatch, patch, state } = createSyncState<SharedState>(serverState, {
   page: 1,
   clicks: 0,
+  viewerPage: 1,
+  viewerClicks: 0,
 })
-export { init as initSharedState, onPatch, patch, state as sharedState }
+
+export {
+  init as initSharedState,
+  onPatch,
+  patch,
+  state as sharedState,
+}
diff --git a/packages/slidev/node/plugins/loaders.ts b/packages/slidev/node/plugins/loaders.ts
index 65daf7c9e2..5e024b011c 100644
--- a/packages/slidev/node/plugins/loaders.ts
+++ b/packages/slidev/node/plugins/loaders.ts
@@ -61,7 +61,7 @@ md.use(mila, {
 function prepareSlideInfo(data: SlideInfo): SlideInfoExtended {
   return {
     ...data,
-    notesHTML: md.render(data?.note || ''),
+    noteHTML: md.render(data?.note || ''),
   }
 }
 
diff --git a/packages/types/src/types.ts b/packages/types/src/types.ts
index 7fa0d3976d..96502df5f5 100644
--- a/packages/types/src/types.ts
+++ b/packages/types/src/types.ts
@@ -22,7 +22,7 @@ export interface SlideInfoWithPath extends SlideInfoBase {
 }
 
 export interface SlideInfoExtended extends SlideInfo {
-  notesHTML: string
+  noteHTML: string
 }
 
 /**