From b8f63cc14eb195cb748963a62e653f552dfb8869 Mon Sep 17 00:00:00 2001
From: Anthony Fu <anthonyfu117@hotmail.com>
Date: Sat, 24 Feb 2024 18:13:34 +0100
Subject: [PATCH] refactor: move route components to `pages/`

---
 .../EntrySelect.vue => pages/entry.vue}       |  0
 .../NotesView.vue => pages/notes.vue}         |  4 ++--
 .../{internals/Play.vue => pages/play.vue}    | 14 ++++++------
 .../Presenter.vue => pages/presenter.vue}     | 22 +++++++++----------
 .../presenter/print.vue}                      | 10 +++++----
 .../{internals/Print.vue => pages/print.vue}  |  4 ++--
 packages/client/routes.ts                     | 22 ++++++++++++++-----
 7 files changed, 44 insertions(+), 32 deletions(-)
 rename packages/client/{internals/EntrySelect.vue => pages/entry.vue} (100%)
 rename packages/client/{internals/NotesView.vue => pages/notes.vue} (95%)
 rename packages/client/{internals/Play.vue => pages/play.vue} (84%)
 rename packages/client/{internals/Presenter.vue => pages/presenter.vue} (92%)
 rename packages/client/{internals/PresenterPrint.vue => pages/presenter/print.vue} (87%)
 rename packages/client/{internals/Print.vue => pages/print.vue} (90%)

diff --git a/packages/client/internals/EntrySelect.vue b/packages/client/pages/entry.vue
similarity index 100%
rename from packages/client/internals/EntrySelect.vue
rename to packages/client/pages/entry.vue
diff --git a/packages/client/internals/NotesView.vue b/packages/client/pages/notes.vue
similarity index 95%
rename from packages/client/internals/NotesView.vue
rename to packages/client/pages/notes.vue
index 1ab57c5dcc..5e809b610d 100644
--- a/packages/client/internals/NotesView.vue
+++ b/packages/client/pages/notes.vue
@@ -7,8 +7,8 @@ import { sharedState } from '../state/shared'
 import { fullscreen } from '../state'
 import { total } from '../logic/nav'
 import { rawRoutes } from '../routes'
-import NoteDisplay from './NoteDisplay.vue'
-import IconButton from './IconButton.vue'
+import NoteDisplay from '../internals/NoteDisplay.vue'
+import IconButton from '../internals/IconButton.vue'
 
 const slideTitle = configs.titleTemplate.replace('%s', configs.title || 'Slidev')
 useHead({
diff --git a/packages/client/internals/Play.vue b/packages/client/pages/play.vue
similarity index 84%
rename from packages/client/internals/Play.vue
rename to packages/client/pages/play.vue
index b953438cf9..470e6263eb 100644
--- a/packages/client/internals/Play.vue
+++ b/packages/client/pages/play.vue
@@ -5,11 +5,11 @@ import { isEmbedded, isPrintMode, next, prev, useSwipeControls } from '../logic/
 import { isDrawing } from '../logic/drawings'
 import { registerShortcuts } from '../logic/shortcuts'
 import { configs, themeVars } from '../env'
-import Controls from './Controls.vue'
-import SlideContainer from './SlideContainer.vue'
-import NavControls from './NavControls.vue'
-import SlidesShow from './SlidesShow.vue'
-import PrintStyle from './PrintStyle.vue'
+import Controls from '../internals/Controls.vue'
+import SlideContainer from '../internals/SlideContainer.vue'
+import NavControls from '../internals/NavControls.vue'
+import SlidesShow from '../internals/SlidesShow.vue'
+import PrintStyle from '../internals/PrintStyle.vue'
 
 registerShortcuts()
 
@@ -33,11 +33,11 @@ const persistNav = computed(() => isScreenVertical.value || showEditor.value)
 
 const Editor = shallowRef<any>()
 if (__DEV__ && __SLIDEV_FEATURE_EDITOR__)
-  import('./Editor.vue').then(v => Editor.value = v.default)
+  import('../internals/Editor.vue').then(v => Editor.value = v.default)
 
 const DrawingControls = shallowRef<any>()
 if (__SLIDEV_FEATURE_DRAWINGS__)
-  import('./DrawingControls.vue').then(v => DrawingControls.value = v.default)
+  import('../internals/DrawingControls.vue').then(v => DrawingControls.value = v.default)
 </script>
 
 <template>
diff --git a/packages/client/internals/Presenter.vue b/packages/client/pages/presenter.vue
similarity index 92%
rename from packages/client/internals/Presenter.vue
rename to packages/client/pages/presenter.vue
index c4c23df305..d3c2d7e0f1 100644
--- a/packages/client/internals/Presenter.vue
+++ b/packages/client/pages/presenter.vue
@@ -11,16 +11,16 @@ import { getSlideClass } from '../utils'
 import { useTimer } from '../logic/utils'
 import { isDrawing } from '../logic/drawings'
 import { useFixedClicks } from '../composables/useClicks'
-import SlideContainer from './SlideContainer.vue'
-import NavControls from './NavControls.vue'
-import SlidesOverview from './SlidesOverview.vue'
-import NoteEditor from './NoteEditor.vue'
-import NoteStatic from './NoteStatic.vue'
-import Goto from './Goto.vue'
-import SlidesShow from './SlidesShow.vue'
-import SlideWrapper from './SlideWrapper'
-import DrawingControls from './DrawingControls.vue'
-import IconButton from './IconButton.vue'
+import SlideWrapper from '../internals/SlideWrapper'
+import SlideContainer from '../internals/SlideContainer.vue'
+import NavControls from '../internals/NavControls.vue'
+import SlidesOverview from '../internals/SlidesOverview.vue'
+import NoteEditor from '../internals/NoteEditor.vue'
+import NoteStatic from '../internals/NoteStatic.vue'
+import Goto from '../internals/Goto.vue'
+import SlidesShow from '../internals/SlidesShow.vue'
+import DrawingControls from '../internals/DrawingControls.vue'
+import IconButton from '../internals/IconButton.vue'
 
 const main = ref<HTMLDivElement>()
 
@@ -54,7 +54,7 @@ watch([currentRoute, queryClicks], () => {
 
 const Editor = shallowRef<any>()
 if (__DEV__ && __SLIDEV_FEATURE_EDITOR__)
-  import('./Editor.vue').then(v => Editor.value = v.default)
+  import('../internals/Editor.vue').then(v => Editor.value = v.default)
 
 // sync presenter cursor
 onMounted(() => {
diff --git a/packages/client/internals/PresenterPrint.vue b/packages/client/pages/presenter/print.vue
similarity index 87%
rename from packages/client/internals/PresenterPrint.vue
rename to packages/client/pages/presenter/print.vue
index 0fc57726a1..ec221f5d8c 100644
--- a/packages/client/internals/PresenterPrint.vue
+++ b/packages/client/pages/presenter/print.vue
@@ -2,9 +2,9 @@
 import { computed } from 'vue'
 import { useStyleTag } from '@vueuse/core'
 import { useHead } from '@unhead/vue'
-import { configs, themeVars } from '../env'
-import { rawRoutes, total } from '../logic/nav'
-import NoteDisplay from './NoteDisplay.vue'
+import { configs, themeVars } from '../../env'
+import { rawRoutes, total } from '../../logic/nav'
+import NoteDisplay from '../../internals/NoteDisplay.vue'
 
 useStyleTag(`
 @page {
@@ -24,7 +24,9 @@ html #page-root {
 }
 `)
 
-useHead({ title: `Notes - ${configs.title}` })
+useHead({
+  title: `Notes - ${configs.title}`,
+})
 
 const slidesWithNote = computed(() => rawRoutes
   .map(route => route.meta?.slide)
diff --git a/packages/client/internals/Print.vue b/packages/client/pages/print.vue
similarity index 90%
rename from packages/client/internals/Print.vue
rename to packages/client/pages/print.vue
index 2852e9764a..816beed63c 100644
--- a/packages/client/internals/Print.vue
+++ b/packages/client/pages/print.vue
@@ -3,8 +3,8 @@ import { watchEffect } from 'vue'
 import { windowSize } from '../state'
 import { isPrintMode } from '../logic/nav'
 import { themeVars } from '../env'
-import PrintContainer from './PrintContainer.vue'
-import PrintStyle from './PrintStyle.vue'
+import PrintContainer from '../internals/PrintContainer.vue'
+import PrintStyle from '../internals/PrintStyle.vue'
 
 watchEffect(() => {
   if (isPrintMode)
diff --git a/packages/client/routes.ts b/packages/client/routes.ts
index 680d7b9fca..372f17adf2 100644
--- a/packages/client/routes.ts
+++ b/packages/client/routes.ts
@@ -15,13 +15,19 @@ export const routes: RouteRecordRaw[] = [
   {
     name: 'play',
     path: '/',
-    component: () => import('./internals/Play.vue'),
+    component: () => import('./pages/play.vue'),
     children: [
       ...rawRoutes,
       ...redirects,
     ],
   },
-  { name: 'print', path: '/print', component: () => import('./internals/Print.vue') },
+  {
+    name: 'print',
+    path: '/print',
+    component: () => import('./pages/print.vue'),
+  },
+
+  // Redirects
   { path: '', redirect: { path: '/1' } },
   { path: '/:pathMatch(.*)', redirect: { path: '/1' } },
 ]
@@ -40,24 +46,28 @@ if (__SLIDEV_FEATURE_PRESENTER__) {
       return { path: `/${to.params.no}` }
     return { path: '' }
   }
-  routes.push({ path: '/presenter/print', component: () => import('./internals/PresenterPrint.vue') })
+
+  routes.push({
+    path: '/presenter/print',
+    component: () => import('./pages/presenter/print.vue'),
+  })
   if (__SLIDEV_HAS_SERVER__) {
     routes.push({
       name: 'entry',
       path: '/entry',
-      component: () => import('./internals/EntrySelect.vue'),
+      component: () => import('./pages/entry.vue'),
     })
     routes.push({
       name: 'notes',
       path: '/notes',
-      component: () => import('./internals/NotesView.vue'),
+      component: () => import('./pages/notes.vue'),
       beforeEnter: passwordGuard,
     })
   }
   routes.push({
     name: 'presenter',
     path: '/presenter/:no',
-    component: () => import('./internals/Presenter.vue'),
+    component: () => import('./pages/presenter.vue'),
     beforeEnter: passwordGuard,
   })
   routes.push({