From 6041b1697a6bf164f6d9392f03a77ea75c69d7d9 Mon Sep 17 00:00:00 2001
From: Nick <github@ngpixel.com>
Date: Sat, 11 May 2019 01:23:32 -0400
Subject: [PATCH] fix: session knex connector + editor UI improvements

---
 client/components/editor.vue                 |  12 +-
 client/components/editor/editor-markdown.vue | 191 ++++++++++---------
 client/scss/base/animation.scss              |   2 +-
 client/themes/default/scss/app.scss          |   4 +
 package.json                                 |   1 +
 server/master.js                             |   6 +-
 server/models/editors.js                     |   3 +
 7 files changed, 122 insertions(+), 97 deletions(-)

diff --git a/client/components/editor.vue b/client/components/editor.vue
index c4b5b871..1167d1e5 100644
--- a/client/components/editor.vue
+++ b/client/components/editor.vue
@@ -6,25 +6,25 @@
         .subheading.grey--text {{currentPageTitle}}
         v-spacer
       template(slot='actions')
-        v-btn(
-          outline
+        v-btn.animated.fadeInDown(
+          flat
           color='green'
           @click.native.stop='save'
           :class='{ "is-icon": $vuetify.breakpoint.mdAndDown }'
           )
           v-icon(color='green', :left='$vuetify.breakpoint.lgAndUp') check
           span.white--text(v-if='$vuetify.breakpoint.lgAndUp') {{ mode === 'create' ? $t('common:actions.create') : $t('common:actions.save') }}
-        v-btn(
-          outline
+        v-btn.animated.fadeInDown.wait-p1s(
+          flat
           color='blue'
           @click.native.stop='openPropsModal'
           :class='{ "is-icon": $vuetify.breakpoint.mdAndDown, "mx-0": !welcomeMode, "ml-0": welcomeMode }'
           )
           v-icon(color='blue', :left='$vuetify.breakpoint.lgAndUp') sort_by_alpha
           span.white--text(v-if='$vuetify.breakpoint.lgAndUp') {{ $t('editor:page') }}
-        v-btn(
+        v-btn.animated.fadeInDown.wait-p2s(
           v-if='!welcomeMode'
-          outline
+          flat
           color='red'
           :class='{ "is-icon": $vuetify.breakpoint.mdAndDown }'
           @click.native.stop='exit'
diff --git a/client/components/editor/editor-markdown.vue b/client/components/editor/editor-markdown.vue
index 7670eed8..9253241d 100644
--- a/client/components/editor/editor-markdown.vue
+++ b/client/components/editor/editor-markdown.vue
@@ -1,130 +1,134 @@
 <template lang='pug'>
   .editor-markdown
     v-toolbar.editor-markdown-toolbar(dense, color='primary', dark, flat)
-      v-tooltip(bottom, color='primary')
-        v-btn(icon, slot='activator', @click='toggleMarkup({ start: `**` })').mx-0
-          v-icon format_bold
-        span Bold
-      v-tooltip(bottom, color='primary')
-        v-btn(icon, slot='activator', @click='toggleMarkup({ start: `*` })').mx-0
-          v-icon format_italic
-        span Italic
-      v-tooltip(bottom, color='primary')
-        v-btn(icon, slot='activator', @click='toggleMarkup({ start: `~~` })').mx-0
-          v-icon format_strikethrough
-        span Strikethrough
-      v-menu(offset-y, open-on-hover)
-        v-btn(icon, slot='activator').mx-0
-          v-icon text_fields
-        v-list.py-0
-          template(v-for='(n, idx) in 6')
-            v-list-tile(@click='setHeaderLine(n)', :key='idx')
+      v-btn.animated.fadeInLeft(v-if='isModalShown', flat, @click='closeAllModal')
+        v-icon(left) chevron_left
+        span Back
+      template(v-else)
+        v-tooltip(bottom, color='primary')
+          v-btn.animated.fadeIn(icon, slot='activator', @click='toggleMarkup({ start: `**` })').mx-0
+            v-icon format_bold
+          span Bold
+        v-tooltip(bottom, color='primary')
+          v-btn.animated.fadeIn.wait-p1s(icon, slot='activator', @click='toggleMarkup({ start: `*` })').mx-0
+            v-icon format_italic
+          span Italic
+        v-tooltip(bottom, color='primary')
+          v-btn.animated.fadeIn.wait-p2s(icon, slot='activator', @click='toggleMarkup({ start: `~~` })').mx-0
+            v-icon format_strikethrough
+          span Strikethrough
+        v-menu(offset-y, open-on-hover)
+          v-btn.animated.fadeIn.wait-p3s(icon, slot='activator').mx-0
+            v-icon text_fields
+          v-list.py-0
+            template(v-for='(n, idx) in 6')
+              v-list-tile(@click='setHeaderLine(n)', :key='idx')
+                v-list-tile-action
+                  v-icon(:size='24 - (idx - 1) * 2') title
+                v-list-tile-title Heading {{n}}
+              v-divider(v-if='idx < 5')
+        v-tooltip(bottom, color='primary')
+          v-btn.animated.fadeIn.wait-p4s(icon, slot='activator', @click='toggleMarkup({ start: `~` })').mx-0
+            v-icon vertical_align_bottom
+          span Subscript
+        v-tooltip(bottom, color='primary')
+          v-btn.animated.fadeIn.wait-p5s(icon, slot='activator', @click='toggleMarkup({ start: `^` })').mx-0
+            v-icon vertical_align_top
+          span Superscript
+        v-menu(offset-y, open-on-hover)
+          v-btn.animated.fadeIn.wait-p6s(icon, slot='activator').mx-0
+            v-icon format_quote
+          v-list.py-0
+            v-list-tile(@click='insertBeforeEachLine({ content: `> `})')
               v-list-tile-action
-                v-icon(:size='24 - (idx - 1) * 2') title
-              v-list-tile-title Heading {{n}}
-            v-divider(v-if='idx < 5')
-      v-tooltip(bottom, color='primary')
-        v-btn(icon, slot='activator', @click='toggleMarkup({ start: `~` })').mx-0
-          v-icon vertical_align_bottom
-        span Subscript
-      v-tooltip(bottom, color='primary')
-        v-btn(icon, slot='activator', @click='toggleMarkup({ start: `^` })').mx-0
-          v-icon vertical_align_top
-        span Superscript
-      v-menu(offset-y, open-on-hover)
-        v-btn(icon, slot='activator').mx-0
-          v-icon format_quote
-        v-list.py-0
-          v-list-tile(@click='insertBeforeEachLine({ content: `> `})')
-            v-list-tile-action
-              v-icon format_quote
-            v-list-tile-title Blockquote
-          v-divider
-          v-list-tile(@click='insertBeforeEachLine({ content: `> `, after: `{.is-info}`})')
-            v-list-tile-action
-              v-icon(color='blue') format_quote
-            v-list-tile-title Info Blockquote
-          v-divider
-          v-list-tile(@click='insertBeforeEachLine({ content: `> `, after: `{.is-success}`})')
-            v-list-tile-action
-              v-icon(color='success') format_quote
-            v-list-tile-title Success Blockquote
-          v-divider
-          v-list-tile(@click='insertBeforeEachLine({ content: `> `, after: `{.is-warning}`})')
-            v-list-tile-action
-              v-icon(color='warning') format_quote
-            v-list-tile-title Warning Blockquote
-          v-divider
-          v-list-tile(@click='insertBeforeEachLine({ content: `> `, after: `{.is-error}`})')
-            v-list-tile-action
-              v-icon(color='error') format_quote
-            v-list-tile-title Error Blockquote
-          v-divider
-      v-tooltip(bottom, color='primary')
-        v-btn(icon, slot='activator', @click='insertBeforeEachLine({ content: `- `})').mx-0
-          v-icon format_list_bulleted
-        span Unordered List
-      v-tooltip(bottom, color='primary')
-        v-btn(icon, slot='activator', @click='insertBeforeEachLine({ content: `1. `})').mx-0
-          v-icon format_list_numbered
-        span Ordered List
-      v-tooltip(bottom, color='primary')
-        v-btn(icon, slot='activator', @click='toggleMarkup({ start: "`" })').mx-0
-          v-icon space_bar
-        span Inline Code
-      v-tooltip(bottom, color='primary')
-        v-btn(icon, slot='activator', @click='toggleMarkup({ start: `<kbd>`, end: `</kbd>` })').mx-0
-          v-icon font_download
-        span Keyboard Key
-      v-tooltip(bottom, color='primary')
-        v-btn(icon, slot='activator', @click='insertAfter({ content: `---`, newLine: true })').mx-0
-          v-icon remove
-        span Horizontal Bar
+                v-icon format_quote
+              v-list-tile-title Blockquote
+            v-divider
+            v-list-tile(@click='insertBeforeEachLine({ content: `> `, after: `{.is-info}`})')
+              v-list-tile-action
+                v-icon(color='blue') format_quote
+              v-list-tile-title Info Blockquote
+            v-divider
+            v-list-tile(@click='insertBeforeEachLine({ content: `> `, after: `{.is-success}`})')
+              v-list-tile-action
+                v-icon(color='success') format_quote
+              v-list-tile-title Success Blockquote
+            v-divider
+            v-list-tile(@click='insertBeforeEachLine({ content: `> `, after: `{.is-warning}`})')
+              v-list-tile-action
+                v-icon(color='warning') format_quote
+              v-list-tile-title Warning Blockquote
+            v-divider
+            v-list-tile(@click='insertBeforeEachLine({ content: `> `, after: `{.is-error}`})')
+              v-list-tile-action
+                v-icon(color='error') format_quote
+              v-list-tile-title Error Blockquote
+            v-divider
+        v-tooltip(bottom, color='primary')
+          v-btn.animated.fadeIn.wait-p7s(icon, slot='activator', @click='insertBeforeEachLine({ content: `- `})').mx-0
+            v-icon format_list_bulleted
+          span Unordered List
+        v-tooltip(bottom, color='primary')
+          v-btn.animated.fadeIn.wait-p8s(icon, slot='activator', @click='insertBeforeEachLine({ content: `1. `})').mx-0
+            v-icon format_list_numbered
+          span Ordered List
+        v-tooltip(bottom, color='primary')
+          v-btn.animated.fadeIn.wait-p9s(icon, slot='activator', @click='toggleMarkup({ start: "`" })').mx-0
+            v-icon space_bar
+          span Inline Code
+        v-tooltip(bottom, color='primary')
+          v-btn.animated.fadeIn.wait-p10s(icon, slot='activator', @click='toggleMarkup({ start: `<kbd>`, end: `</kbd>` })').mx-0
+            v-icon font_download
+          span Keyboard Key
+        v-tooltip(bottom, color='primary')
+          v-btn.animated.fadeIn.wait-p11s(icon, slot='activator', @click='insertAfter({ content: `---`, newLine: true })').mx-0
+            v-icon remove
+          span Horizontal Bar
     .editor-markdown-main
       .editor-markdown-sidebar
         v-tooltip(right, color='teal')
-          v-btn(icon, slot='activator', dark, disabled).mx-0
+          v-btn.animated.fadeInLeft(icon, slot='activator', dark, disabled).mx-0
             v-icon link
           span Insert Link
         v-tooltip(right, color='teal')
-          v-btn(icon, slot='activator', dark, @click='toggleModal(`editorModalMedia`)').mx-0
+          v-btn.animated.fadeInLeft.wait-p1s(icon, slot='activator', dark, @click='toggleModal(`editorModalMedia`)').mx-0
             v-icon(:color='activeModal === `editorModalMedia` ? `teal` : ``') image
           span Insert Image
         v-tooltip(right, color='teal')
-          v-btn(icon, slot='activator', dark, @click='toggleModal(`editorModalBlocks`)').mx-0
+          v-btn.animated.fadeInLeft.wait-p2s(icon, slot='activator', dark, @click='toggleModal(`editorModalBlocks`)').mx-0
             v-icon(:color='activeModal === `editorModalBlocks` ? `teal` : ``') dashboard
           span Insert Block
         v-tooltip(right, color='teal')
-          v-btn(icon, slot='activator', dark, disabled).mx-0
+          v-btn.animated.fadeInLeft.wait-p3s(icon, slot='activator', dark, disabled).mx-0
             v-icon insert_drive_file
           span Insert File
         v-tooltip(right, color='teal')
-          v-btn(icon, slot='activator', dark, disabled).mx-0
+          v-btn.animated.fadeInLeft.wait-p4s(icon, slot='activator', dark, disabled).mx-0
             v-icon code
           span Insert Code Block
         v-tooltip(right, color='teal')
-          v-btn(icon, slot='activator', dark, disabled).mx-0
+          v-btn.animated.fadeInLeft.wait-p5s(icon, slot='activator', dark, disabled).mx-0
             v-icon play_circle_outline
           span Insert Video / Audio
         v-tooltip(right, color='teal')
-          v-btn(icon, slot='activator', dark, disabled).mx-0
+          v-btn.animated.fadeInLeft.wait-p6s(icon, slot='activator', dark, disabled).mx-0
             v-icon multiline_chart
           span Insert Diagram
         v-tooltip(right, color='teal')
-          v-btn(icon, slot='activator', dark, disabled).mx-0
+          v-btn.animated.fadeInLeft.wait-p7s(icon, slot='activator', dark, disabled).mx-0
             v-icon functions
           span Insert Math Expression
         v-tooltip(right, color='teal')
-          v-btn(icon, slot='activator', dark, disabled).mx-0
+          v-btn.animated.fadeInLeft.wait-p8s(icon, slot='activator', dark, disabled).mx-0
             v-icon border_outer
           span Table Helper
         v-spacer
         v-tooltip(right, color='teal')
-          v-btn(icon, slot='activator', dark, @click='toggleFullscreen').mx-0
+          v-btn.animated.fadeInLeft.wait-p9s(icon, slot='activator', dark, @click='toggleFullscreen').mx-0
             v-icon crop_free
           span Distraction Free Mode
         v-tooltip(right, color='teal')
-          v-btn(icon, slot='activator', dark, @click='toggleHelp').mx-0
+          v-btn.animated.fadeInLeft.wait-p10s(icon, slot='activator', dark, @click='toggleHelp').mx-0
             v-icon(:color='helpShown ? `teal` : ``') help
           span Markdown Formatting Help
       .editor-markdown-editor
@@ -275,6 +279,9 @@ export default {
     isMobile() {
       return this.$vuetify.breakpoint.smAndDown
     },
+    isModalShown() {
+      return this.helpShown || this.activeModal !== ''
+    },
     locale: get('page/locale'),
     path: get('page/path'),
     activeModal: sync('editor/activeModal')
@@ -282,6 +289,11 @@ export default {
   methods: {
     toggleModal(key) {
       this.activeModal = (this.activeModal === key) ? '' : key
+      this.helpShown = false
+    },
+    closeAllModal() {
+      this.activeModal = ''
+      this.helpShown = false
     },
     onCmReady(cm) {
       const keyBindings = {
@@ -438,6 +450,7 @@ export default {
     }, 500),
     toggleHelp () {
       this.helpShown = !this.helpShown
+      this.activeModal = ''
     },
     toggleFullscreen () {
       this.cm.setOption('fullScreen', true)
diff --git a/client/scss/base/animation.scss b/client/scss/base/animation.scss
index b7e21812..5021aeb7 100644
--- a/client/scss/base/animation.scss
+++ b/client/scss/base/animation.scss
@@ -5,7 +5,7 @@ $use-bounce: true;
 @import "~animate-sass/animate";
 
 
-@for $i from 1 to 9 {
+@for $i from 1 to 12 {
   .wait-p#{$i}s {
     animation-delay: $i * .1s !important;
   }
diff --git a/client/themes/default/scss/app.scss b/client/themes/default/scss/app.scss
index 7ceef6a1..2212ad48 100644
--- a/client/themes/default/scss/app.scss
+++ b/client/themes/default/scss/app.scss
@@ -274,6 +274,10 @@
     padding: 1rem 1rem 1rem 3rem;
     margin: 1rem 24px;
 
+    @at-root .theme--dark & {
+      background-color: darken(mc('grey', '900'), 5%);
+    }
+
     > code {
       background-color: transparent;
       padding: 0;
diff --git a/package.json b/package.json
index 31a09d3f..bec7181a 100644
--- a/package.json
+++ b/package.json
@@ -57,6 +57,7 @@
     "chokidar": "2.1.5",
     "clean-css": "4.2.1",
     "compression": "1.7.4",
+    "connect-session-knex": "1.4.0",
     "cookie-parser": "1.4.4",
     "cors": "2.8.5",
     "custom-error-instance": "2.1.1",
diff --git a/server/master.js b/server/master.js
index d657ef37..eb4eeac7 100644
--- a/server/master.js
+++ b/server/master.js
@@ -5,6 +5,7 @@ const cookieParser = require('cookie-parser')
 const cors = require('cors')
 const express = require('express')
 const session = require('express-session')
+const KnexSessionStore = require('connect-session-knex')(session)
 const favicon = require('serve-favicon')
 const fs = require('fs-extra')
 const http = require('http')
@@ -69,7 +70,10 @@ module.exports = async () => {
   app.use(session({
     secret: WIKI.config.sessionSecret,
     resave: false,
-    saveUninitialized: false
+    saveUninitialized: false,
+    store: new KnexSessionStore({
+      knex: WIKI.models.knex
+    })
   }))
   app.use(WIKI.auth.passport.initialize())
   app.use(WIKI.auth.authenticate)
diff --git a/server/models/editors.js b/server/models/editors.js
index f7ee494d..34a688a9 100644
--- a/server/models/editors.js
+++ b/server/models/editors.js
@@ -88,6 +88,9 @@ module.exports = class Editor extends Model {
     } catch (err) {
       WIKI.logger.error(`Failed to scan or load new editors: [ FAILED ]`)
       WIKI.logger.error(err)
+      if (trx) {
+        trx.rollback()
+      }
     }
   }