Fix editors insert + Error pages styling

client/index.js

@@ -3,6 +3,9 @@
 let logic = document.documentElement.dataset.logic
 
 switch (logic) {
+  case 'error':
+    require('./scss/error.scss')
+    break
   case 'login':
     require('./scss/login.scss')
     require('./js/login.js')

client/js/app.js

@@ -54,7 +54,7 @@ $(() => {
   // ====================================
 
   require('./pages/view.js')(alerts)
-  // require('./pages/create.js')
+  require('./pages/create.js')(alerts, socket)
   require('./pages/edit.js')(alerts, socket)
   require('./pages/source.js')(alerts)
   require('./pages/admin.js')(alerts)

client/js/components/editor-image.js

@@ -51,6 +51,7 @@ module.exports = (alerts, mde, mdeModalOpenState, socket) => {
         vueImage.currentImage = imageId
       },
       insertImage: (ev) => {
+        console.log(mde)
         if (mde.codemirror.doc.somethingSelected()) {
           mde.codemirror.execCommand('singleSelection')
         }

client/js/components/editor.js

@@ -16,14 +16,13 @@ module.exports = (alerts, pageEntryPath, socket) => {
       return _.toUpper(filesize(v))
     })
 
-    let mde
     let mdeModalOpenState = false
-    let vueImage = require('./editor-image.js')(alerts, mde, mdeModalOpenState, socket)
-    let vueFile = require('./editor-file.js')(alerts, mde, mdeModalOpenState, socket)
-    let vueVideo = require('./editor-video.js')(mde, mdeModalOpenState)
-    let vueCodeBlock = require('./editor-codeblock.js')(mde, mdeModalOpenState)
+    let vueImage
+    let vueFile
+    let vueVideo
+    let vueCodeBlock
 
-    mde = new SimpleMDE({
+    let mde = new SimpleMDE({
       autofocus: true,
       autoDownloadFontAwesome: false,
       element: $('#mk-editor').get(0),
@@ -185,6 +184,11 @@ module.exports = (alerts, pageEntryPath, socket) => {
       }
     })
 
+    vueImage = require('./editor-image.js')(alerts, mde, mdeModalOpenState, socket)
+    vueFile = require('./editor-file.js')(alerts, mde, mdeModalOpenState, socket)
+    vueVideo = require('./editor-video.js')(mde, mdeModalOpenState)
+    vueCodeBlock = require('./editor-codeblock.js')(mde, mdeModalOpenState)
+
     // -> Save
 
     let saveCurrentDocument = (ev) => {

client/js/pages/create.js

@@ -1,7 +1,10 @@
-/* global $ */
+'use strict'
 
+import $ from 'jquery'
+
+module.exports = (alerts, socket) => {
   if ($('#page-type-create').length) {
-  let pageEntryPath = $('#page-type-create').data('entrypath') // eslint-disable-line no-unused-vars
+    let pageEntryPath = $('#page-type-create').data('entrypath')
 
     // -> Discard
 
@@ -9,7 +12,6 @@ if ($('#page-type-create').length) {
       $('#modal-create-discard').toggleClass('is-active')
     })
 
-  /* eslint-disable spaced-comment */
-  //=include ../components/editor.js
-  /* eslint-enable spaced-comment */
+    require('../components/editor.js')(alerts, pageEntryPath, socket)
+  }
 }

views/error-forbidden.pug

@@ -1,5 +1,5 @@
 doctype html
-html
+html(data-logic='error')
   head
     meta(http-equiv='X-UA-Compatible', content='IE=edge')
     meta(charset='UTF-8')
@@ -17,9 +17,8 @@ html
       link(rel='icon', type='image/png', sizes=favsize + 'x' + favsize, href='/favicons/favicon-' + favsize + 'x' + favsize + '.png')
     link(rel='manifest', href='/manifest.json')
 
-    // CSS
-    link(type='text/css', rel='stylesheet', href='/css/libs.css')
-    link(type='text/css', rel='stylesheet', href='/css/error.css')
+    // JS / CSS
+    script(type='text/javascript', src='/js/bundle.min.js')
 
   body(class='is-forbidden')
     .container

views/error-notexist.pug

@@ -1,5 +1,5 @@
 doctype html
-html
+html(data-logic='error')
   head
     meta(http-equiv='X-UA-Compatible', content='IE=edge')
     meta(charset='UTF-8')
@@ -17,9 +17,8 @@ html
       link(rel='icon', type='image/png', sizes=favsize + 'x' + favsize, href='/favicons/favicon-' + favsize + 'x' + favsize + '.png')
     link(rel='manifest', href='/manifest.json')
 
-    // CSS
-    link(type='text/css', rel='stylesheet', href='/css/libs.css')
-    link(type='text/css', rel='stylesheet', href='/css/error.css')
+    // JS / CSS
+    script(type='text/javascript', src='/js/bundle.min.js')
 
   body(class='is-notexist')
     .container

views/error.pug

@@ -1,5 +1,5 @@
 doctype html
-html
+html(data-logic='error')
   head
     meta(http-equiv='X-UA-Compatible', content='IE=edge')
     meta(charset='UTF-8')
@@ -17,9 +17,8 @@ html
       link(rel='icon', type='image/png', sizes=favsize + 'x' + favsize, href='/favicons/favicon-' + favsize + 'x' + favsize + '.png')
     link(rel='manifest', href='/manifest.json')
 
-    // CSS
-    link(type='text/css', rel='stylesheet', href='/css/libs.css')
-    link(type='text/css', rel='stylesheet', href='/css/error.css')
+    // JS / CSS
+    script(type='text/javascript', src='/js/bundle.min.js')
 
   body(class='is-error')
     .container