lee/OliveTin
1
0
Fork 0
mirror of https://github.com/OliveTin/OliveTin synced 2025-12-11 16:45:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: #685 - show navigation (and picocrank upgrade)

Browse Source
This commit is contained in:
jamesread
2025-11-06 00:38:56 +00:00
parent d94f2aca1c
commit 28c813762f
4 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -17,3 +17,5 @@ webui/
server.log
OliveTin
integration-tests/configs/authRequireGuestsToLogin/sessions.yaml
webui
webui.dev

8
frontend/package-lock.json generated
View File

@@ -17,7 +17,7 @@
"@xterm/addon-fit": "^0.10.0",
"@xterm/xterm": "^5.5.0",
"iconify-icon": "^3.0.2",
"picocrank": "^1.6.4",
"picocrank": "^1.8.0",
"unplugin-vue-components": "^30.0.0",
"vite": "^7.1.12",
"vue-router": "^4.6.3"
@@ -2362,9 +2362,9 @@
"license": "ISC"
},
"node_modules/picocrank": {
"version": "1.6.4",
"resolved": "https://registry.npmjs.org/picocrank/-/picocrank-1.6.4.tgz",
"integrity": "sha512-zD1wnkoUDAXZOUs9zKqS4rqz9mljeqFwM7QWx4ykXJsmH6iOLAIKh2AVlxa384oeXJXIWM9VLiySEnhQZmQmjA==",
"version": "1.8.0",
"resolved": "https://registry.npmjs.org/picocrank/-/picocrank-1.8.0.tgz",
"integrity": "sha512-YPGmXvw7vvjIcgrAe3io87kZDM+NUa+aiEYxk8CVqBzgI4koXeF+2VEGPHBwknZBBEbJfXsSdnxVwXrLKpWKfw==",
"license": "ISC",
"dependencies": {
"@hugeicons/core-free-icons": "^1.0.16",

2
frontend/package.json
View File

@@ -30,7 +30,7 @@
"@xterm/addon-fit": "^0.10.0",
"@xterm/xterm": "^5.5.0",
"iconify-icon": "^3.0.2",
"picocrank": "^1.6.4",
"picocrank": "^1.8.0",
"unplugin-vue-components": "^30.0.0",
"vite": "^7.1.12",
"vue-router": "^4.6.3"

40
frontend/resources/vue/App.vue
View File

@@ -1,5 +1,5 @@
<template>
<Header title="OliveTin" :logoUrl="logoUrl" @toggleSidebar="toggleSidebar">
<Header title="OliveTin" :logoUrl="logoUrl" @toggleSidebar="toggleSidebar" :sidebarEnabled="showNavigation">
<template #toolbar>
<div id="banner" v-if="bannerMessage" :style="bannerCss">
<p>{{ bannerMessage }}</p>
@@ -86,7 +86,9 @@ const initError = ref(false)
const initErrorMessage = ref('')
function toggleSidebar() {
sidebar.value.toggle()
if (sidebar.value && showNavigation.value) {
sidebar.value.toggle()
}
}
function updateHeaderFromInit() {
@@ -132,25 +134,27 @@ async function requestInit() {
showLogs.value = initResponse.showLogList
showDiagnostics.value = initResponse.showDiagnostics
for (const rootDashboard of initResponse.rootDashboards) {
sidebar.value.addNavigationLink({
id: rootDashboard,
name: rootDashboard,
title: rootDashboard,
path: rootDashboard === 'Actions' ? '/' : `/dashboards/${rootDashboard}`,
icon: DashboardSquare01Icon,
})
}
if (showNavigation.value && sidebar.value) {
for (const rootDashboard of initResponse.rootDashboards) {
sidebar.value.addNavigationLink({
id: rootDashboard,
name: rootDashboard,
title: rootDashboard,
path: rootDashboard === 'Actions' ? '/' : `/dashboards/${rootDashboard}`,
icon: DashboardSquare01Icon,
})
}
sidebar.value.addSeparator()
sidebar.value.addRouterLink('Entities')
sidebar.value.addSeparator()
sidebar.value.addRouterLink('Entities')
if (showLogs.value) {
sidebar.value.addRouterLink('Logs')
}
if (showLogs.value) {
sidebar.value.addRouterLink('Logs')
}
if (showDiagnostics.value) {
sidebar.value.addRouterLink('Diagnostics')
if (showDiagnostics.value) {
sidebar.value.addRouterLink('Diagnostics')
}
}
hasLoaded.value = true;