From 766eebbe2fcd814efe9975ebe73db2b099e552c6 Mon Sep 17 00:00:00 2001
From: Nick <github@ngpixel.com>
Date: Sat, 21 Sep 2019 22:25:54 -0400
Subject: [PATCH] fix: editor selection UI + config trim DB_PASS_FILE

---
 .../editor/editor-modal-editorselect.vue      | 97 ++++++++++---------
 server/core/config.js                         |  3 +-
 2 files changed, 55 insertions(+), 45 deletions(-)

diff --git a/client/components/editor/editor-modal-editorselect.vue b/client/components/editor/editor-modal-editorselect.vue
index 038231f7..f9e48a11 100644
--- a/client/components/editor/editor-modal-editorselect.vue
+++ b/client/components/editor/editor-modal-editorselect.vue
@@ -1,5 +1,6 @@
 <template lang='pug'>
-  v-dialog(v-model='isShown', persistent, max-width='700')
+  v-dialog(v-model='isShown', persistent, max-width='700', no-click-animation)
+    v-btn(fab, fixed, bottom, right, color='grey darken-3', dark, @click='goBack'): v-icon mdi-undo-variant
     v-card.radius-7(color='blue darken-3', dark)
       v-card-text.text-center.py-4
         .subtitle-1.white--text {{$t('editor:select.title')}}
@@ -8,15 +9,15 @@
             v-flex(xs4)
               v-hover
                 template(v-slot:default='{ hover }')
-                  v-card.radius-7.grey.animated.fadeInUp(
+                  v-card.radius-7.primary.animated.fadeInUp(
                     hover
                     light
                     ripple
                     )
                     v-card-text.text-center(@click='')
-                      img(src='/svg/editor-icon-api.svg', alt='API', style='width: 36px;')
-                      .body-2.mt-2.grey--text.text--darken-2 API Docs
-                      .caption.grey--text.text--darken-1 REST / GraphQL
+                      img(src='/svg/editor-icon-api.svg', alt='API', style='width: 36px; opacity: .5;')
+                      .body-2.mt-2.blue--text.text--lighten-2 API Docs
+                      .caption.blue--text.text--lighten-1 REST / GraphQL
                     v-fade-transition
                       v-overlay(
                         v-if='hover'
@@ -28,15 +29,15 @@
             v-flex(xs4)
               v-hover
                 template(v-slot:default='{ hover }')
-                  v-card.radius-7.grey.animated.fadeInUp.wait-p1s(
+                  v-card.radius-7.primary.animated.fadeInUp.wait-p1s(
                     hover
                     light
                     ripple
                     )
                     v-card-text.text-center(@click='')
-                      img(src='/svg/editor-icon-wikitext.svg', alt='WikiText', style='width: 36px;')
-                      .body-2.grey--text.mt-2.text--darken-2 Blog
-                      .caption.grey--text.text--darken-1 Timeline of Posts
+                      img(src='/svg/editor-icon-wikitext.svg', alt='WikiText', style='width: 36px; opacity: .5;')
+                      .body-2.blue--text.mt-2.text--lighten-2 Blog
+                      .caption.blue--text.text--lighten-1 Timeline of Posts
                     v-fade-transition
                       v-overlay(
                         v-if='hover'
@@ -68,15 +69,15 @@
             v-flex(xs4)
               v-hover
                 template(v-slot:default='{ hover }')
-                  v-card.radius-7.grey.animated.fadeInUp.wait-p2s(
+                  v-card.radius-7.primary.animated.fadeInUp.wait-p2s(
                     hover
                     light
                     ripple
                     )
                     v-card-text.text-center(@click='')
-                      img(src='/svg/editor-icon-tabular.svg', alt='Tabular', style='width: 36px;')
-                      .body-2.grey--text.mt-2.text--darken-2 Tabular
-                      .caption.grey--text.text--darken-1 Excel-like
+                      img(src='/svg/editor-icon-tabular.svg', alt='Tabular', style='width: 36px; opacity: .5;')
+                      .body-2.blue--text.mt-2.text--lighten-2 Tabular
+                      .caption.blue--text.text--lighten-1 Excel-like
                     v-fade-transition
                       v-overlay(
                         v-if='hover'
@@ -97,18 +98,6 @@
                   .caption.grey--text Rich-text WYSIWYG
         .caption.blue--text.text--lighten-2 {{$t('editor:select.cannotChange')}}
 
-    v-card.radius-7.mt-2(color='indigo darken-3', dark)
-      v-toolbar(dense, flat, color='light-green darken-3')
-        v-spacer
-        .caption.mr-1 Or convert from
-        v-btn.mx-1(depressed, color='light-green darken-2', @click='')
-          v-icon(left) mdi-alpha-a-box
-          .body-2.text-none AsciiDoc
-        v-btn.mx-1(depressed, color='light-green darken-2', @click='')
-          v-icon(left) mdi-alpha-w-circle
-          .body-2.text-none WikiText
-        v-spacer
-
     v-card.radius-7.mt-2(color='teal darken-3', dark)
       v-card-text.text-center.py-4
         .subtitle-1.white--text {{$t('editor:select.customView')}}
@@ -117,15 +106,15 @@
             v-flex(xs4)
               v-hover
                 template(v-slot:default='{ hover }')
-                  v-card.radius-7.grey.animated.fadeInUp(
+                  v-card.radius-7.teal.animated.fadeInUp(
                     hover
                     light
                     ripple
                     )
                     v-card-text.text-center(@click='')
-                      img(src='/svg/icon-cube.svg', alt='From Template', style='width: 42px;')
-                      .body-2.mt-1.grey--text.text--darken-2 From Template
-                      .caption.grey--text.text--darken-1 Use an existing page / tree
+                      img(src='/svg/icon-cube.svg', alt='From Template', style='width: 42px; opacity: .5;')
+                      .body-2.mt-1.teal--text.text--lighten-2 From Template
+                      .caption.teal--text.text--lighten-1 Use an existing page / tree
                     v-fade-transition
                       v-overlay(
                         v-if='hover'
@@ -137,15 +126,15 @@
             v-flex(xs4)
               v-hover
                 template(v-slot:default='{ hover }')
-                  v-card.radius-7.grey.animated.fadeInUp.wait-p1s(
+                  v-card.radius-7.teal.animated.fadeInUp.wait-p1s(
                     hover
                     light
                     ripple
                     )
                     v-card-text.text-center(@click='')
-                      img(src='/svg/icon-tree-structure.svg', alt='Tree View', style='width: 42px;')
-                      .body-2.mt-1.grey--text.text--darken-2 Tree View
-                      .caption.grey--text.text--darken-1 List children pages
+                      img(src='/svg/icon-tree-structure.svg', alt='Tree View', style='width: 42px; opacity: .5;')
+                      .body-2.mt-1.teal--text.text--lighten-2 Tree View
+                      .caption.teal--text.text--lighten-1 List children pages
                     v-fade-transition
                       v-overlay(
                         v-if='hover'
@@ -157,15 +146,15 @@
             v-flex(xs4)
               v-hover
                 template(v-slot:default='{ hover }')
-                  v-card.radius-7.grey.animated.fadeInUp.wait-p2s(
+                  v-card.radius-7.teal.animated.fadeInUp.wait-p2s(
                     hover
                     light
                     ripple
                     )
                     v-card-text.text-center(@click='')
-                      img(src='/svg/icon-sewing-patch.svg', alt='Code', style='width: 42px;')
-                      .body-2.mt-1.grey--text.text--darken-2 Embed
-                      .caption.grey--text.text--darken-1 Include external pages
+                      img(src='/svg/icon-sewing-patch.svg', alt='Code', style='width: 42px; opacity: .5;')
+                      .body-2.mt-1.teal--text.text--lighten-2 Embed
+                      .caption.teal--text.text--lighten-1 Include external pages
                     v-fade-transition
                       v-overlay(
                         v-if='hover'
@@ -174,13 +163,33 @@
                         opacity='.8'
                         )
                         .body-2.mt-7 Coming Soon
-    v-card.radius-7.mt-2(color='grey darken-3', dark)
-      v-toolbar(dense, flat)
-        v-spacer
-        v-btn(text, @click='goBack')
-          v-icon(left) mdi-undo-variant
-          span Cancel
-        v-spacer
+    v-hover
+      template(v-slot:default='{ hover }')
+        v-card.radius-7.mt-2(color='indigo darken-3', dark)
+          v-toolbar(dense, flat, color='light-green darken-3')
+            v-spacer
+            .caption.mr-1 or convert from
+            v-btn.mx-1(depressed, color='light-green darken-2', @click='', disabled)
+              v-icon(left) mdi-alpha-a-circle
+              .body-2.text-none AsciiDoc
+            v-btn.mx-1(depressed, color='light-green darken-2', @click='', disabled)
+              v-icon(left) mdi-alpha-c-circle
+              .body-2.text-none CREOLE
+            v-btn.mx-1(depressed, color='light-green darken-2', @click='', disabled)
+              v-icon(left) mdi-alpha-t-circle
+              .body-2.text-none Textile
+            v-btn.mx-1(depressed, color='light-green darken-2', @click='', disabled)
+              v-icon(left) mdi-alpha-w-circle
+              .body-2.text-none WikiText
+            v-spacer
+          v-fade-transition
+            v-overlay(
+              v-if='hover'
+              absolute
+              color='light-green darken-3'
+              opacity='.8'
+              )
+              .body-2 Coming Soon
 </template>
 
 <script>
diff --git a/server/core/config.js b/server/core/config.js
index 54cfb64c..d1bcdf64 100644
--- a/server/core/config.js
+++ b/server/core/config.js
@@ -56,8 +56,9 @@ module.exports = {
 
     // Load DB Password from Docker Secret File
     if (process.env.DB_PASS_FILE) {
+      console.info(chalk.blue(`DB_PASS_FILE is defined. Will use secret from file.`))
       try {
-        appconfig.db.pass = fs.readFileSync(process.env.DB_PASS_FILE, 'utf8')
+        appconfig.db.pass = fs.readFileSync(process.env.DB_PASS_FILE, 'utf8').trim()
       } catch (err) {
         console.error(chalk.red.bold(`>>> Failed to read Docker Secret File using path defined in DB_PASS_FILE env variable!`))
         console.error(err.message)