@tenjuu99/blog 0.2.6 → 0.2.7

package/bin/dev-server

@@ -9,6 +9,7 @@ import { fileURLToPath } from 'url';
 
 const __filename = fileURLToPath(import.meta.url);
 const libDir = path.dirname(__filename) + '/../lib/'
+const binDir = path.dirname(__filename) + '/../bin/'
 
 watchers.push({
   paths: srcDir,
@@ -38,7 +39,7 @@ watch()
 let childProcess = null
 
 const proceed = () => {
-  const child = spawn('node', ['bin/server'])
+  const child = spawn('node', [`${binDir}server`])
   console.log(`start process. PID(parent): ${process.pid}, PID(child): ${child.pid}`)
 
   child.stdout.on('data', (data) => {

package/lib/pageData.js

@@ -24,6 +24,7 @@ const parse = (content, name, ext) => {
     site_name: config.site_name,
     url_base: config.url_base,
     markdown: markdownReplaced,
+    markdown_not_parsed: markdownReplaced,
     relative_path: config.relative_path || '',
     template: 'default.html',
     ext: 'html',

package/lib/server.js

@@ -61,7 +61,7 @@ const server = () => {
     } catch (e) {
       console.log(e)
       console.log(styleText('red', `[${request.method}] 500`), request.url)
-      const errorContent = fs.readFileSync(`${distDir}/404.html`)
+      const errorContent = fs.readFileSync(`${distDir}/500.html`)
       response.writeHead(500)
       response.end(errorContent)
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tenjuu99/blog",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "description": "blog template",
   "main": "index.js",
   "scripts": {

package/src-sample/js/editor.js

@@ -3,8 +3,15 @@ const sleep = waitTime => new Promise( resolve => setTimeout(resolve, waitTime)
 const fetchData = (target) => {
   return fetch(`/get_editor_target?md=${target}`)
     .then(async res => {
-      const json = await res.json()
-      return json
+      if (!res.ok) {
+        document.querySelector('#inputFileName').value = target
+        document.querySelector('#editorTextArea').value = `${target.split('.')[0]}についての記事を作成しましょう`
+        // submit('/preview', form)
+        throw new Error(`${target} does not exist.`)
+      } else {
+        const json = await res.json()
+        return json
+      }
     })
 }
 const onloadFunction = async (e) => {
@@ -22,6 +29,9 @@ const onloadFunction = async (e) => {
       inputFileName.value = json.filename
       inputFileName.setAttribute('disabled', true)
       submit('/preview', form)
+    }).catch(e => {
+      console.log('error!!!')
+      console.log(e)
     })
   }
   select.addEventListener('change', async (event) => {
@@ -51,7 +61,7 @@ const onloadFunction = async (e) => {
     formData.forEach((v, k) => {
       obj[k] = v
     })
-    fetch(fetchUrl, {
+    return fetch(fetchUrl, {
       method: 'post',
       body: JSON.stringify(obj)
     }).then(async response => {
@@ -94,13 +104,11 @@ const sidebarToggle = (e) => {
     main.classList.toggle('sidebar-close')
   })
   const hamburger = document.querySelector('.hamburger-menu input[type="checkbox"]')
-  console.log(hamburger)
   hamburger.addEventListener('change', (e) => {
     main.classList.toggle('sidebar-close')
   })
 }
 document.addEventListener('DOMContentLoaded', (event) => {
-  console.log(event)
   onloadFunction(event)
   sidebarToggle(event)
 })

package/src-sample/js/error.js

@@ -0,0 +1,7 @@
+document.addEventListener('DOMContentLoaded', (e) => {
+})
+const url = new URL(location)
+if (url.pathname !== '/editor') {
+  const link = document.querySelector('.editor_link')
+  link.href = `/editor?md=${url.pathname.replace('/', '')}.md`
+}

package/src-sample/pages/500.md

@@ -0,0 +1,5 @@
+---
+index: false
+noindex: true
+---
+問題が発生しました。

package/src-sample/pages/editor.md

@@ -3,3 +3,5 @@ template: editor.html
 index: false
 distribute: config.editor_enable
 ---
+
+新規に記事を作成しましょう。

package/src-sample/pages/notfound.md

@@ -3,6 +3,7 @@ title: 404 not found
 url: /404
 index: false
 noindex: true
+add_script: /js/error.js
 ---
 
 記事が見つかりませんでした。

package/src-sample/server/get_editor_target.js

@@ -17,7 +17,11 @@ export const get = async (req, res) => {
   }
   const file = `${pageDir}/${target}`
   if (!fs.existsSync(`${file}`)) {
-    return false
+    return {
+      status: 404,
+      contentType: 'application/json',
+      body: JSON.stringify({ content: '', filename: target })
+    }
   }
   const f = fs.readFileSync(`${file}`, 'utf8')
   return {

package/src-sample/server/preview.js

@@ -16,6 +16,12 @@ export const post = async (req, res) => {
     .on('end', async () => {
       const json = JSON.parse(chunks.join())
       const filename = json.inputFileName ? json.inputFileName : json.selectDataFile
+      if (!filename) {
+        res.writeHead(400, { 'content-type': 'application/json' })
+        return res.end(JSON.stringify({
+          message: 'filename is requried.'
+        }))
+      }
       const pageData = makePageData(filename, json.content)
       const rendered = await render(pageData.template, pageData)
       res.writeHead(200, { 'content-type': 'application/json' })

package/src-sample/template/default.html

@@ -48,10 +48,13 @@
   </main>
     {if isEditorEnabled() }
     <div class="container">
-      <a href="/editor?md={{name}}.{{__filetype}}">編集する</a>
+      <a href="/editor?md={{name}}.{{__filetype}}" class="editor_link">編集する</a>
     </div>
     {/if}
 
   {include('template/footer.html')}
+  {if add_script}
+  <script src="{{ADD_SCRIPT}}" async></script>
+  {/if}
 </body>
 </html>

package/src-sample/template/editor.html

@@ -42,9 +42,7 @@
       </select>
       <div class="textareaAndPreview">
         <textarea id="editorTextArea" name="content" cols="30" rows="10">
-# H1
-
-ここにマークダウンを入力してください。
+{{ MARKDOWN_NOT_PARSED }}
         </textarea>
         <div class="preview">
           <div id="previewContent"></div>