liz/wikijs-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: editor selection UI + config trim DB_PASS_FILE

Browse Source
This commit is contained in:
Nick
2019-09-21 22:25:54 -04:00
parent 53cdb11239
commit 766eebbe2f
2 changed files with 55 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

97
client/components/editor/editor-modal-editorselect.vue
View File

@@ -1,5 +1,6 @@
<template lang='pug'> <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.radius-7(color='blue darken-3', dark)
v-card-text.text-center.py-4 v-card-text.text-center.py-4
.subtitle-1.white--text {{$t('editor:select.title')}} .subtitle-1.white--text {{$t('editor:select.title')}}
@@ -8,15 +9,15 @@
v-flex(xs4) v-flex(xs4)
v-hover v-hover
template(v-slot:default='{ hover }') template(v-slot:default='{ hover }')
v-card.radius-7.grey.animated.fadeInUp( v-card.radius-7.primary.animated.fadeInUp(
hover hover
light light
ripple ripple
) )
v-card-text.text-center(@click='') v-card-text.text-center(@click='')
img(src='/svg/editor-icon-api.svg', alt='API', style='width: 36px;') img(src='/svg/editor-icon-api.svg', alt='API', style='width: 36px; opacity: .5;')
.body-2.mt-2.grey--text.text--darken-2 API Docs .body-2.mt-2.blue--text.text--lighten-2 API Docs
.caption.grey--text.text--darken-1 REST / GraphQL .caption.blue--text.text--lighten-1 REST / GraphQL
v-fade-transition v-fade-transition
v-overlay( v-overlay(
v-if='hover' v-if='hover'
@@ -28,15 +29,15 @@
v-flex(xs4) v-flex(xs4)
v-hover v-hover
template(v-slot:default='{ 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 hover
light light
ripple ripple
) )
v-card-text.text-center(@click='') v-card-text.text-center(@click='')
img(src='/svg/editor-icon-wikitext.svg', alt='WikiText', style='width: 36px;') img(src='/svg/editor-icon-wikitext.svg', alt='WikiText', style='width: 36px; opacity: .5;')
.body-2.grey--text.mt-2.text--darken-2 Blog .body-2.blue--text.mt-2.text--lighten-2 Blog
.caption.grey--text.text--darken-1 Timeline of Posts .caption.blue--text.text--lighten-1 Timeline of Posts
v-fade-transition v-fade-transition
v-overlay( v-overlay(
v-if='hover' v-if='hover'
@@ -68,15 +69,15 @@
v-flex(xs4) v-flex(xs4)
v-hover v-hover
template(v-slot:default='{ 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 hover
light light
ripple ripple
) )
v-card-text.text-center(@click='') v-card-text.text-center(@click='')
img(src='/svg/editor-icon-tabular.svg', alt='Tabular', style='width: 36px;') img(src='/svg/editor-icon-tabular.svg', alt='Tabular', style='width: 36px; opacity: .5;')
.body-2.grey--text.mt-2.text--darken-2 Tabular .body-2.blue--text.mt-2.text--lighten-2 Tabular
.caption.grey--text.text--darken-1 Excel-like .caption.blue--text.text--lighten-1 Excel-like
v-fade-transition v-fade-transition
v-overlay( v-overlay(
v-if='hover' v-if='hover'
@@ -97,18 +98,6 @@
.caption.grey--text Rich-text WYSIWYG .caption.grey--text Rich-text WYSIWYG
.caption.blue--text.text--lighten-2 {{$t('editor:select.cannotChange')}} .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.radius-7.mt-2(color='teal darken-3', dark)
v-card-text.text-center.py-4 v-card-text.text-center.py-4
.subtitle-1.white--text {{$t('editor:select.customView')}} .subtitle-1.white--text {{$t('editor:select.customView')}}
@@ -117,15 +106,15 @@
v-flex(xs4) v-flex(xs4)
v-hover v-hover
template(v-slot:default='{ hover }') template(v-slot:default='{ hover }')
v-card.radius-7.grey.animated.fadeInUp( v-card.radius-7.teal.animated.fadeInUp(
hover hover
light light
ripple ripple
) )
v-card-text.text-center(@click='') v-card-text.text-center(@click='')
img(src='/svg/icon-cube.svg', alt='From Template', style='width: 42px;') img(src='/svg/icon-cube.svg', alt='From Template', style='width: 42px; opacity: .5;')
.body-2.mt-1.grey--text.text--darken-2 From Template .body-2.mt-1.teal--text.text--lighten-2 From Template
.caption.grey--text.text--darken-1 Use an existing page / tree .caption.teal--text.text--lighten-1 Use an existing page / tree
v-fade-transition v-fade-transition
v-overlay( v-overlay(
v-if='hover' v-if='hover'
@@ -137,15 +126,15 @@
v-flex(xs4) v-flex(xs4)
v-hover v-hover
template(v-slot:default='{ 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 hover
light light
ripple ripple
) )
v-card-text.text-center(@click='') v-card-text.text-center(@click='')
img(src='/svg/icon-tree-structure.svg', alt='Tree View', style='width: 42px;') img(src='/svg/icon-tree-structure.svg', alt='Tree View', style='width: 42px; opacity: .5;')
.body-2.mt-1.grey--text.text--darken-2 Tree View .body-2.mt-1.teal--text.text--lighten-2 Tree View
.caption.grey--text.text--darken-1 List children pages .caption.teal--text.text--lighten-1 List children pages
v-fade-transition v-fade-transition
v-overlay( v-overlay(
v-if='hover' v-if='hover'
@@ -157,15 +146,15 @@
v-flex(xs4) v-flex(xs4)
v-hover v-hover
template(v-slot:default='{ 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 hover
light light
ripple ripple
) )
v-card-text.text-center(@click='') v-card-text.text-center(@click='')
img(src='/svg/icon-sewing-patch.svg', alt='Code', style='width: 42px;') img(src='/svg/icon-sewing-patch.svg', alt='Code', style='width: 42px; opacity: .5;')
.body-2.mt-1.grey--text.text--darken-2 Embed .body-2.mt-1.teal--text.text--lighten-2 Embed
.caption.grey--text.text--darken-1 Include external pages .caption.teal--text.text--lighten-1 Include external pages
v-fade-transition v-fade-transition
v-overlay( v-overlay(
v-if='hover' v-if='hover'
@@ -174,13 +163,33 @@
opacity='.8' opacity='.8'
) )
.body-2.mt-7 Coming Soon .body-2.mt-7 Coming Soon
v-card.radius-7.mt-2(color='grey darken-3', dark) v-hover
v-toolbar(dense, flat) template(v-slot:default='{ hover }')
v-spacer v-card.radius-7.mt-2(color='indigo darken-3', dark)
v-btn(text, @click='goBack') v-toolbar(dense, flat, color='light-green darken-3')
v-icon(left) mdi-undo-variant v-spacer
span Cancel .caption.mr-1 or convert from
v-spacer 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> </template>
<script> <script>

3
server/core/config.js
View File

@@ -56,8 +56,9 @@ module.exports = {
// Load DB Password from Docker Secret File // Load DB Password from Docker Secret File
if (process.env.DB_PASS_FILE) { if (process.env.DB_PASS_FILE) {
console.info(chalk.blue(`DB_PASS_FILE is defined. Will use secret from file.`))
try { 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) { } catch (err) {
console.error(chalk.red.bold(`>>> Failed to read Docker Secret File using path defined in DB_PASS_FILE env variable!`)) console.error(chalk.red.bold(`>>> Failed to read Docker Secret File using path defined in DB_PASS_FILE env variable!`))
console.error(err.message) console.error(err.message)