From 60e9ab60a6e0ea9f421b4e6010d11f9d143df6c4 Mon Sep 17 00:00:00 2001
From: Sergey Bedritsky <sergey.bedritsky@gmail.com>
Date: Mon, 31 May 2021 16:51:59 +0300
Subject: [PATCH 1/7] fix: edit this page

---
 .../components/organisms/PageBottom.vue       | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/defaultTheme/components/organisms/PageBottom.vue b/src/defaultTheme/components/organisms/PageBottom.vue
index bc9d0af15..0d827ea10 100644
--- a/src/defaultTheme/components/organisms/PageBottom.vue
+++ b/src/defaultTheme/components/organisms/PageBottom.vue
@@ -1,18 +1,13 @@
 <template>
-  <div v-if="link" class="flex flex-col justify-between mt-8 mb-4 sm:flex-row">
-    <a
-      :href="link"
-      target="_blank"
-      rel="noopener"
-      class="flex items-center mb-2 text-sm sm:mb-0 font-base hover:underline dark:text-gray-400"
-    >
+  <div v-if="link" class="flex flex-col justify-between text-gray-500 dark:text-gray-500 mt-8 mb-4 sm:flex-row">
+    <a :href="link" target="_blank" rel="noopener" class="flex items-center mb-2 text-sm sm:mb-0 hover:underline">
       <IconEdit class="w-3 h-3 mr-1" />
       <span>
         {{ $t('article.github') }}
       </span>
     </a>
 
-    <span class="flex items-center text-sm text-gray-500 font-base dark:text-gray-400">
+    <span class="flex items-center text-sm">
       {{ $t('article.updatedAt') }} {{ $d(Date.parse(page.updatedAt), 'long') }}
     </span>
   </div>
@@ -31,23 +26,24 @@ export default defineComponent({
   setup(props) {
     const { $docus, $config } = useContext()
 
-    const settings = computed(() => $docus.settings)
+    const { value: settings } = computed(() => $docus.settings)
 
     const link = computed(() => {
       if (!settings.value.github) return
 
       return [
-        $docus.repoUrl,
+        $docus.repoUrl.value,
         'edit',
         settings.value.github.branch,
-        settings.value.github.dir,
-        $config.contentDir,
+        settings.value.github.dir || $config.contentDir,
         `${props.page.path}${props.page.extension}`.replace(/^\//g, '')
       ]
         .filter(Boolean)
         .join('/')
     })
 
+    console.log(link)
+
     return {
       link
     }

From 8919cf367d769e423c09fc7ebcb4030036933c3c Mon Sep 17 00:00:00 2001
From: Sergey Bedritsky <sergey.bedritsky@gmail.com>
Date: Mon, 31 May 2021 16:52:25 +0300
Subject: [PATCH 2/7] fix: cleanup

---
 src/defaultTheme/components/organisms/PageBottom.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/defaultTheme/components/organisms/PageBottom.vue b/src/defaultTheme/components/organisms/PageBottom.vue
index 0d827ea10..1a1f3f01b 100644
--- a/src/defaultTheme/components/organisms/PageBottom.vue
+++ b/src/defaultTheme/components/organisms/PageBottom.vue
@@ -42,8 +42,6 @@ export default defineComponent({
         .join('/')
     })
 
-    console.log(link)
-
     return {
       link
     }

From 3a792a89af7a16f07be789eb0f0d45092d879555 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yae=CC=88l=20GUILLOUX?= <yael.guilloux@gmail.com>
Date: Tue, 1 Jun 2021 00:00:14 +0200
Subject: [PATCH 3/7] :fire: (core) remove contentDir injection

---
 src/core/module.ts | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/core/module.ts b/src/core/module.ts
index c14785e87..d1e21d2d9 100644
--- a/src/core/module.ts
+++ b/src/core/module.ts
@@ -48,10 +48,6 @@ export default <Module>async function docusModule() {
   // Inject Docus theme as ~docus
   options.alias['~docus'] = resolve(__dirname, 'runtime')
 
-  // Inject content dir in private runtime config
-  const contentDir = options.dir.pages || 'pages'
-  options.publicRuntimeConfig.contentDir = contentDir
-
   // extend parser options
   const parserOptions: Partial<ParserOptions> = { markdown: {} }
   await nuxt.callHook('docus:parserOptions', parserOptions)
@@ -188,8 +184,12 @@ export default <Module>async function docusModule() {
       options.watch.push(pagesDirPath)
     }
   })
+
   nuxt.callHook('docus:storage:ready')
 
+  // Watch Docus while DOCUS_DEV is set
+  if (process.env.DOCUS_DEV) options.watch.push(resolve(__dirname, '../'))
+
   nuxt.hook('close', () => {
     destroyHooks()
     destroyDB()

From c00e6150283bf7303f39aba12d190a29cd1fae53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yae=CC=88l=20GUILLOUX?= <yael.guilloux@gmail.com>
Date: Tue, 1 Jun 2021 00:01:10 +0200
Subject: [PATCH 4/7] :recycle: (i18n) update contentDir reference

---
 src/i18n/index.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/i18n/index.ts b/src/i18n/index.ts
index b3de37006..afe08a716 100644
--- a/src/i18n/index.ts
+++ b/src/i18n/index.ts
@@ -38,15 +38,14 @@ const config = {
 }
 
 export default <Module>function docusI18n() {
-  const { requireModule, addPlugin, nuxt } = this
+  const { requireModule, addPlugin, nuxt, $docus } = this
   const { options } = nuxt
 
   // Update i18n langDir to relative from `~` (https://github.com/nuxt-community/i18n-module/blob/4bfa890ff15b43bc8c2d06ef9225451da711dde6/src/templates/utils.js#L31)
   config.langDir = join(relative(options.srcDir, r('languages')), '/')
 
   if (!options.i18n?.locales?.length) {
-    const contentDir = resolve(options.srcDir, options.dir.pages)
-
+    const contentDir = resolve(options.srcDir, $docus.settings.contentDir)
     const languageCodes = languages.map(({ code }) => code)
     const activeLanguages = fs.readdirSync(contentDir).filter(name => languageCodes.includes(name))
     activeLanguages.unshift(config.defaultLocale)

From 903c742c3b560199f9844135875ca81a7e2c6f01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yae=CC=88l=20GUILLOUX?= <yael.guilloux@gmail.com>
Date: Tue, 1 Jun 2021 00:04:09 +0200
Subject: [PATCH 5/7] :sparkles: (theme) update page bottom

---
 src/defaultTheme/components/organisms/PageBottom.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/defaultTheme/components/organisms/PageBottom.vue b/src/defaultTheme/components/organisms/PageBottom.vue
index 1a1f3f01b..b778f9607 100644
--- a/src/defaultTheme/components/organisms/PageBottom.vue
+++ b/src/defaultTheme/components/organisms/PageBottom.vue
@@ -24,7 +24,7 @@ export default defineComponent({
     }
   },
   setup(props) {
-    const { $docus, $config } = useContext()
+    const { $docus } = useContext()
 
     const { value: settings } = computed(() => $docus.settings)
 
@@ -35,7 +35,7 @@ export default defineComponent({
         $docus.repoUrl.value,
         'edit',
         settings.value.github.branch,
-        settings.value.github.dir || $config.contentDir,
+        settings.value.github.dir || '',
         `${props.page.path}${props.page.extension}`.replace(/^\//g, '')
       ]
         .filter(Boolean)

From 9048013f57d3e42a1c46b709d33ead7671a792f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yae=CC=88l=20GUILLOUX?= <yael.guilloux@gmail.com>
Date: Tue, 1 Jun 2021 00:05:04 +0200
Subject: [PATCH 6/7] :recycle: (docus) general cleanup

---
 src/defaultTheme/module.ts | 2 +-
 src/settings/defaults.ts   | 5 ++---
 src/settings/index.ts      | 1 +
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/defaultTheme/module.ts b/src/defaultTheme/module.ts
index 1cffdba60..198912355 100644
--- a/src/defaultTheme/module.ts
+++ b/src/defaultTheme/module.ts
@@ -116,7 +116,7 @@ export default <Module>function themeSetupModule() {
       subDirs.forEach((path: string) => dirs.push({ path, global: true }))
     } else {
       // Watch existence of root `components` directory
-      nuxt.options.watch.push(componentsDirPath)
+      options.watch.push(componentsDirPath)
     }
   })
 }
diff --git a/src/settings/defaults.ts b/src/settings/defaults.ts
index da6628888..04be3b245 100644
--- a/src/settings/defaults.ts
+++ b/src/settings/defaults.ts
@@ -2,10 +2,9 @@ import { DocusSettings } from '../types'
 
 export const docusDefaults: DocusSettings = {
   title: 'Docus',
+  contentDir: 'pages',
+  url: '',
   description: '',
   template: 'docs',
-  logo: '',
-  url: '',
-  layout: '',
   credits: true
 }
diff --git a/src/settings/index.ts b/src/settings/index.ts
index b73a9d052..5b7774f58 100644
--- a/src/settings/index.ts
+++ b/src/settings/index.ts
@@ -29,6 +29,7 @@ export default <Module>function settingsModule() {
     console.warn('`themeDir` is not specified in current theme, fallback to default theme')
     options.themeDir = resolve(__dirname, '..', 'defaultTheme')
   }
+
   let themeDefaultsPath = resolve(options.themeDir, 'settings')
   if (existsSync(themeDefaultsPath + '.js')) themeDefaultsPath += '.js'
   else if (existsSync(themeDefaultsPath + '.ts')) themeDefaultsPath += '.ts'

From 03c198268e97b6b0c2ab32f9441c0c254199abef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Yae=CC=88l=20GUILLOUX?= <yael.guilloux@gmail.com>
Date: Tue, 1 Jun 2021 00:05:21 +0200
Subject: [PATCH 7/7] :label: (types) update DocusSettings

---
 src/types/core.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/types/core.ts b/src/types/core.ts
index 1fd774634..ab5f23f15 100644
--- a/src/types/core.ts
+++ b/src/types/core.ts
@@ -96,11 +96,10 @@ export interface DocusDocument {
 
 export interface DocusSettings<T = DefaultThemeSettings> {
   title: string
+  contentDir: string
   description: string
   credits: boolean
-  logo: string
   url: string
-  layout: string
   template: string
   theme?: T
   [key: string]: any