From 00c0b6cc1aaa26903bec4ea0bb09c837114a8af9 Mon Sep 17 00:00:00 2001 From: Ruslan Semak Date: Mon, 21 Apr 2025 17:22:09 +0300 Subject: [PATCH 1/5] =?UTF-8?q?=D0=92=D1=81=D1=91=20=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BD=D0=BE=20=D0=BF=D1=80=D0=BE=D0=B1=D0=BB=D0=B5=D0=BC=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../themes/default/components/nav-sidebar.vue | 55 ++++++++++++++----- 1 file changed, 40 insertions(+), 15 deletions(-) diff --git a/client/themes/default/components/nav-sidebar.vue b/client/themes/default/components/nav-sidebar.vue index fd749636..f3a778c4 100644 --- a/client/themes/default/components/nav-sidebar.vue +++ b/client/themes/default/components/nav-sidebar.vue @@ -14,7 +14,7 @@ depressed :color='$vuetify.theme.dark ? `grey darken-4` : `blue darken-2`' style='flex: 1 1 100%;' - @click='switchMode(`browse`)' + @click='switchMode(`tree`)' ) v-icon(left) mdi-file-tree .body-2.text-none {{$t('common:sidebar.browse')}} @@ -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 @@ -361,11 +361,12 @@ 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 = 'custom' - } else if (this.navMode === 'NEWTREE') { 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' } @@ -387,7 +388,7 @@ export default { padding: 8px 0; font-weight: 500; line-height: 1rem; - font-size: 0.8rem; + font-size: 1rem; } .tree-item-link { @@ -406,13 +407,37 @@ export default { color: inherit; } - a { - text-decoration: none; - } - &.theme--dark{ - a { - color: white; - } - } + //.tree-item { + // width: 100%; + // padding: 8px 0; + // font-weight: 500; + // line-height: 1rem; + // font-size: 0.8rem; + //} + // + //.tree-item-link { + // display: block; + // width: 100%; + // text-decoration: none; + // color: inherit; + //} + // + //.tree-item-link a { + // display: block; + // width: 100%; + // padding: 8px 16px; + // margin: -8px 0; + // text-decoration: none; + // color: inherit; + //} + // + //a { + // text-decoration: none; + //} + //&.theme--dark{ + // a { + // color: white; + // } + //} } From 89102b38eb86ec720b311e627de9827e024cb214 Mon Sep 17 00:00:00 2001 From: Ruslan Semak Date: Tue, 22 Apr 2025 15:33:59 +0300 Subject: [PATCH 2/5] =?UTF-8?q?feat:=20=D0=92=D1=81=D1=91=20=D0=B5=D1=89?= =?UTF-8?q?=D1=91=20=D0=BF=D1=80=D0=BE=D0=B1=D0=BB=D0=B5=D0=BC=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../themes/default/components/nav-sidebar.vue | 82 ++++++------------- 1 file changed, 24 insertions(+), 58 deletions(-) diff --git a/client/themes/default/components/nav-sidebar.vue b/client/themes/default/components/nav-sidebar.vue index f3a778c4..fd69594d 100644 --- a/client/themes/default/components/nav-sidebar.vue +++ b/client/themes/default/components/nav-sidebar.vue @@ -14,7 +14,7 @@ depressed :color='$vuetify.theme.dark ? `grey darken-4` : `blue darken-2`' style='flex: 1 1 100%;' - @click='switchMode(`tree`)' + @click='switchMode(`browse`)' ) v-icon(left) mdi-file-tree .body-2.text-none {{$t('common:sidebar.browse')}} @@ -70,10 +70,13 @@ 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') - span {{item.name}} - span(v-else) {{item.name}} + a.d-flex.align-center( + v-if="!item.children" + :href="'/'+item.locale+'/'+item.path" + style="width: 100%; text-decoration: none; color: inherit;" + ) + span {{item.name}} + span(v-else) {{item.name}} //-> Browse v-list.py-2(v-else-if='currentMode === `browse`', dense, :class='color', :dark='dark') @@ -320,7 +323,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(() => { @@ -365,11 +368,12 @@ export default { } if (this.navMode === 'STATIC') { this.currentMode = 'custom' - // } else if (this.navMode === 'NEWTREE') { - // this.currentMode = 'tree' + } else if (this.navMode === 'NEWTREE') { + this.currentMode = 'tree' } else { this.currentMode = window.localStorage.getItem('navPref') || 'custom' } + if (this.currentMode === 'browse') { this.loadFromCurrentPath() } @@ -381,63 +385,25 @@ export default { From 722842da6f3160bf604af599af145cffcaf54f59 Mon Sep 17 00:00:00 2001 From: Ruslan Semak Date: Wed, 23 Apr 2025 10:44:52 +0300 Subject: [PATCH 3/5] feat: Original v-treeview --- .../themes/default/components/nav-sidebar.vue | 37 +++++++------------ server/core/kernel.js | 4 ++ 2 files changed, 18 insertions(+), 23 deletions(-) diff --git a/client/themes/default/components/nav-sidebar.vue b/client/themes/default/components/nav-sidebar.vue index fd69594d..67d0e851 100644 --- a/client/themes/default/components/nav-sidebar.vue +++ b/client/themes/default/components/nav-sidebar.vue @@ -70,13 +70,10 @@ v-icon(v-else-if="open") mdi-folder-open v-icon(v-else) mdi-folder template(v-slot:label="{ item }") - a.d-flex.align-center( - v-if="!item.children" - :href="'/'+item.locale+'/'+item.path" - style="width: 100%; text-decoration: none; color: inherit;" - ) - span {{item.name}} - span(v-else) {{item.name}} + div(class='tree-item') + a(v-if="!item.children" :href="'/'+item.locale+'/'+item.path") + span {{item.name}} + span(v-else) {{item.name}} //-> Browse v-list.py-2(v-else-if='currentMode === `browse`', dense, :class='color', :dark='dark') @@ -385,25 +382,19 @@ 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 From 1823a4e8ddc8d3910d9797868e4d9972a099ffc7 Mon Sep 17 00:00:00 2001 From: Ruslan Semak Date: Wed, 23 Apr 2025 10:47:30 +0300 Subject: [PATCH 4/5] =?UTF-8?q?feat:=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B0=20=D0=BF=D0=BB=D0=BE=D1=82=D0=BD=D0=BE?= =?UTF-8?q?=D1=81=D1=82=D1=8C=20=D0=BF=D0=BB=D0=B8=D1=82=D0=BE=D0=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../themes/default/components/nav-sidebar.vue | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/client/themes/default/components/nav-sidebar.vue b/client/themes/default/components/nav-sidebar.vue index 67d0e851..bb9854c7 100644 --- a/client/themes/default/components/nav-sidebar.vue +++ b/client/themes/default/components/nav-sidebar.vue @@ -57,6 +57,7 @@ v-treeview( v-else-if='currentMode === `tree`' activatable + dense open-on-click :color='"white"' :active='treeDefaultActive' @@ -397,4 +398,21 @@ export default { } } } + +.v-treeview-node { + min-height: 32px; /* Уменьшаем минимальную высоту узла */ + + .v-treeview-node__root { + min-height: 32px; /* Уменьшаем минимальную высоту корневого элемента */ + padding: 2px 0; /* Уменьшаем вертикальные отступы */ + } + + .v-treeview-node__content { + margin: 2px 0; /* Уменьшаем отступы содержимого */ + } + + .v-treeview-node__children { + margin-left: 16px; /* Уменьшаем отступ для дочерних элементов */ + } +} From 41f8b8565aaa6e9dc7d8cb3ba8fc23edca1284da Mon Sep 17 00:00:00 2001 From: Ruslan Semak Date: Wed, 23 Apr 2025 11:23:49 +0300 Subject: [PATCH 5/5] feat: tree-navigation release --- client/themes/default/components/nav-sidebar.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/themes/default/components/nav-sidebar.vue b/client/themes/default/components/nav-sidebar.vue index bb9854c7..ff0738c8 100644 --- a/client/themes/default/components/nav-sidebar.vue +++ b/client/themes/default/components/nav-sidebar.vue @@ -277,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) {