diff --git a/client/themes/default/components/nav-sidebar.vue b/client/themes/default/components/nav-sidebar.vue index fd749636..ff0738c8 100644 --- a/client/themes/default/components/nav-sidebar.vue +++ b/client/themes/default/components/nav-sidebar.vue @@ -26,7 +26,7 @@ @click='switchMode(`tree`)' ) v-icon(left) mdi-file-tree - .body-2.text-none {{$t('common:sidebar.tree')}} + .body-2.text-none {{'Обзор'}} v-btn.ml-3( v-else-if='currentMode === `tree`' depressed @@ -57,6 +57,7 @@ v-treeview( v-else-if='currentMode === `tree`' activatable + dense open-on-click :color='"white"' :active='treeDefaultActive' @@ -70,8 +71,8 @@ v-icon(v-else-if="open") mdi-folder-open v-icon(v-else) mdi-folder template(v-slot:label="{ item }") - div(class='tree-item' :class="{ 'tree-item-link': !item.children }") - a(v-if="!item.children" :href="'/'+item.locale+'/'+item.path" class='tree-item-link') + div(class='tree-item') + a(v-if="!item.children" :href="'/'+item.locale+'/'+item.path") span {{item.name}} span(v-else) {{item.name}} @@ -276,7 +277,7 @@ export default { return { id: item.id, level: level, path: item.path, locale: item.locale, name: item.title } } }, - activeTreeItem(id) { + activeTreeItem([id]) { const find = (items) => { for (const item of items) { if (item.id === id) { @@ -320,7 +321,7 @@ export default { this.treeItems = children.map(item => this.pageItem2TreeItem(item, 0)) this.checkTreeDefaultOpen(this.treeItems, 0) }, - async checkTreeDefaultOpen(items) { + checkTreeDefaultOpen(items) { const item = items.find(item => item.children && this.path.startsWith(item.path)) if (item) { setTimeout(() => { @@ -361,14 +362,16 @@ export default { mounted () { this.currentParent.title = `/ ${this.$t('common:sidebar.root')}` if (this.navMode === 'TREE') { - this.currentMode = 'browse' - } else if (this.navMode === 'STATIC') { + this.currentMode = 'tree' + } + if (this.navMode === 'STATIC') { this.currentMode = 'custom' } else if (this.navMode === 'NEWTREE') { this.currentMode = 'tree' } else { this.currentMode = window.localStorage.getItem('navPref') || 'custom' } + if (this.currentMode === 'browse') { this.loadFromCurrentPath() } @@ -380,32 +383,12 @@ export default { diff --git a/server/core/kernel.js b/server/core/kernel.js index 32a1e86c..259845bb 100644 --- a/server/core/kernel.js +++ b/server/core/kernel.js @@ -87,6 +87,10 @@ module.exports = { WIKI.scheduler.start() await WIKI.models.subscribeToNotifications() + + WIKI.logger.info('=======================================') + WIKI.logger.info(`✅ ✅ ✅\tApplication is ready ✅ ✅ ✅\t`) + WIKI.logger.info('=======================================') }, /** * Init Telemetry