π The open-source, offline-first Notion, Obsidian & Confluence alternative. Advanced Markdown, multi-tenant teams, OIDC/SSO, and local S3 backups. Deploy in one command.
Vue dockergolangkanbanknowledge-baseknowledge-managementmarkdownnote-takingnotesnotes-appnotionnuxtnuxtjsoffline-firstoidcpwaselfhostedssovuevuejswiki
refactor: simplify preferences access across components
Smaug673948ff37f25fb0
diff --git a/frontend/app/App.vue b/frontend/app/App.vueindex 59b80ee0..b4a49cf8 100644--- a/frontend/app/App.vue+++ b/frontend/app/App.vue@@ -15,8 +15,8 @@ useFavicon();const preferences = usePreferences();const { setAppColor } = useAppColors();-const primaryColor = computed(() => preferences.get('primaryColor').value);-const interfaceStyle = computed(() => preferences.get('style').value);+const primaryColor = preferences.get('primaryColor');+const interfaceStyle = preferences.get('style');watch(primaryColor,diff --git a/frontend/app/components/BreadCrumb.vue b/frontend/app/components/BreadCrumb.vueindex 6138d301..0566bec0 100644--- a/frontend/app/components/BreadCrumb.vue+++ b/frontend/app/components/BreadCrumb.vue@@ -1,7 +1,7 @@<template><nav class="no-mobile" aria-label="Breadcrumb"><svg- v-if="preferences.get('navbarItems').value.navigation"+ v-if="hasNavigation.navigation":class="{ disabled: !canGoBack, 'no-tablet': true }"xmlns="http://www.w3.org/2000/svg"viewBox="0 -960 960 960"@@ -11,7 +11,7 @@</svg><svg- v-if="preferences.get('navbarItems').value.navigation"+ v-if="hasNavigation.navigation":class="{ disabled: !canGoForward, 'no-tablet': true }"xmlns="http://www.w3.org/2000/svg"viewBox="0 -960 960 960"@@ -39,6 +39,7 @@ const breadcrumbs = ref<Array<{ name: string; path: string }>>([]);const canGoBack = ref(false);const canGoForward = ref(false);+const hasNavigation = preferences.get('navbarItems');// Renamed for clarityconst goBack = () => router.go(-1);@@ -65,7 +66,7 @@ watchEffect(() => {if (typeof meta === 'function') {name = meta(route);} else {- name = meta;+ name = meta as string;}if (!name) return;diff --git a/frontend/app/components/DataTable.vue b/frontend/app/components/DataTable.vueindex 392c30f6..d38b5b1f 100644--- a/frontend/app/components/DataTable.vue+++ b/frontend/app/components/DataTable.vue@@ -83,13 +83,13 @@import { Paginator } from '../helpers/paginator';const props = defineProps<{ headers: Header[]; rows: Field[] }>();-const itemsPerPage = ref(usePreferences().get('datatableItemsCount').value || 10);+const itemsPerPage = usePreferences().get('datatableItemsCount');const searchInput = ref('');// Pagination + filterconst paginator = new Paginator<Field>(computed(() => props.rows),- itemsPerPage.value,+ itemsPerPage.value || 10,);paginator.filter(row => {return Object.values(row).some(value => value.content?.toLowerCase().includes(searchInput.value.toLowerCase()));diff --git a/frontend/app/components/MarkdownEditor/MarkdownEditor.vue b/frontend/app/components/MarkdownEditor/MarkdownEditor.vueindex 763b7c61..0409e545 100644--- a/frontend/app/components/MarkdownEditor/MarkdownEditor.vue+++ b/frontend/app/components/MarkdownEditor/MarkdownEditor.vue@@ -24,7 +24,7 @@<div class="panel-header"><span class="panel-label">Preview</span></div>- <div ref="markdownPreview" :class="['markdown-preview', `${preferences.get('theme').value}-theme`]" v-html="document.content_compiled" />+ <div ref="markdownPreview" :class="['markdown-preview', `${theme}-theme`]" v-html="document.content_compiled" /></div></div></div>@@ -55,6 +55,9 @@ const markdownPreview = ref<HTMLDivElement>();const editorView = ref<EditorView | null>(null);const showPreview = ref(false);+const theme = preferences.get('theme');+const autoSaveEnabled = preferences.get('documentAutoSave');+const document = ref<Partial<Node>>({...props.doc,content_compiled: compile(props.doc?.content || ''),@@ -94,7 +97,7 @@ onMounted(() => {});onBeforeUnmount(() => {- if (preferences.get('documentAutoSave').value) {+ if (autoSaveEnabled.value) {updateDocumentContent();emit('autoSave', document.value);}@@ -124,7 +127,7 @@ function syncScroll() {}function autoSaveConditional() {- if (preferences.get('documentAutoSave').value) {+ if (autoSaveEnabled.value) {autoSave();}}diff --git a/frontend/app/components/MarkdownEditor/Toolbar.vue b/frontend/app/components/MarkdownEditor/Toolbar.vueindex 418d12fb..f9f6d33c 100644--- a/frontend/app/components/MarkdownEditor/Toolbar.vue+++ b/frontend/app/components/MarkdownEditor/Toolbar.vue@@ -67,7 +67,7 @@<!-- Right Section --><div class="toolbar-right"><!-- Stats Badge -->- <div v-if="preferences.get('editorDisplayStats').value" class="stats-badge no-tablet">+ <div v-if="displayStats" class="stats-badge no-tablet"><div class="stat-item"><span class="stat-value">{{ stats.words }}</span><span class="stat-label">words</span>@@ -130,6 +130,7 @@ const props = defineProps<{const preferences = usePreferences();const mobileSimplifiedView = preferences.get('editorSimplifiedViewOnMobile');+const displayStats = preferences.get('editorDisplayStats');const stats = computed(() => {const content = props.modelValue.content || '';diff --git a/frontend/app/components/Navbar.vue b/frontend/app/components/Navbar.vueindex b625597e..a1e2b476 100644--- a/frontend/app/components/Navbar.vue+++ b/frontend/app/components/Navbar.vue@@ -6,20 +6,14 @@<path d="M120-240v-80h720v80H120Zm0-200v-80h720v80H120Zm0-200v-80h720v80H120Z" /></svg></button>- <BreadCrumb v-if="preferences.get('navbarItems').value.breadcrumb" />+ <BreadCrumb v-if="navbarItems.breadcrumb" /></div><div>- <button- v-if="preferences.get('navbarItems').value.search"- class="search-btn"- title="Command center (Ctrl+K)"- aria-label="Command center"- @click="openCommandCenter"- >+ <button v-if="navbarItems.search" class="search-btn" title="Command center (Ctrl+K)" aria-label="Command center" @click="openCommandCenter"><Icon name="search" /><span class="search-text">Type <kbd>/</kbd> to navigate</span></button>- <ThemeToggle v-if="preferences.get('navbarItems').value.theme" aria-label="toggle theme" />+ <ThemeToggle v-if="navbarItems.theme" aria-label="toggle theme" /></div></header></template>@@ -28,6 +22,7 @@const { toggleSidebar, isOpened } = useSidebar();const preferences = usePreferences();+const navbarItems = preferences.get('navbarItems');const openCommandCenter = () => useCommandCenter().open();</script>diff --git a/frontend/app/components/Node/Action/ContextMenu.vue b/frontend/app/components/Node/Action/ContextMenu.vueindex ea67df95..d1298860 100644--- a/frontend/app/components/Node/Action/ContextMenu.vue+++ b/frontend/app/components/Node/Action/ContextMenu.vue@@ -29,7 +29,7 @@<button class="menu-item delete" @click="action('delete')"><Icon name="delete" />Move to trash<kbd>Del</kbd></button></div>- <div v-if="preferences.get('developerMode').value" class="menu-group">+ <div v-if="developerMode" class="menu-group"><button class="menu-item" @click="action('copyId')"><Icon name="snippets" />Copy ID</button></div></div>@@ -54,6 +54,7 @@ const { avatarURL } = useApi();userStore.fetchPublicUser(props.node.user_id);const user = computed(() => userStore.getById(props.node.user_id || ''));+const developerMode = preferences.get('developerMode');async function action(name: string) {switch (name) {diff --git a/frontend/app/components/Node/Action/ResourceContextMenu.vue b/frontend/app/components/Node/Action/ResourceContextMenu.vueindex 4a596b8e..9c956c57 100644--- a/frontend/app/components/Node/Action/ResourceContextMenu.vue+++ b/frontend/app/components/Node/Action/ResourceContextMenu.vue@@ -26,7 +26,7 @@<button class="menu-item delete" @click="action('delete')"><Icon name="delete" />Move to trash</button></div>- <div v-if="preferences.get('developerMode').value" class="menu-group">+ <div v-if="developerMode" class="menu-group"><button class="menu-item" @click="action('copyId')"><Icon name="snippets" />Copy ID</button></div></div>@@ -49,6 +49,7 @@ const { avatarURL, resourceURL } = useApi();userStore.fetchPublicUser(props.node.user_id);const user = computed(() => userStore.getById(props.node.user_id || ''));+const developerMode = preferences.get('developerMode');async function action(name: string) {switch (name) {diff --git a/frontend/app/components/Node/Document/Header.vue b/frontend/app/components/Node/Document/Header.vueindex 265ed835..67d481a2 100644--- a/frontend/app/components/Node/Document/Header.vue+++ b/frontend/app/components/Node/Document/Header.vue@@ -1,5 +1,5 @@<template>- <div class="header" :class="{ 'print-style': preferences.get('printMode').value }">+ <div class="header" :class="{ 'print-style': printMode }"><div class="container"><!-- Skeleton when doc is undefined --><HeaderSkeleton v-if="!doc" />@@ -36,14 +36,18 @@ import Thumbnail from './Thumbnail.vue';import HeaderSkeleton from './HeaderSkeleton.vue';import HeaderActionRow from './HeaderActionRow.vue';+const props = defineProps<{ doc?: Node; public?: boolean }>();++const store = useUserStore();+const preferences = usePreferences();const api = useApi();const nodesTree = useNodesTree();-const props = defineProps<{ doc?: Node; public?: boolean }>();const category = computed(() => nodesTree.getAncestorCategory(props.doc?.parent_id)?.data);-const store = useUserStore();const user = ref<PublicUser | null>(null);+const printMode = preferences.get('printMode');+watchEffect(() => {if (props.doc) store.fetchPublicUser(props.doc.user_id).then(u => (user.value = u));});diff --git a/frontend/app/components/Sidebar/Sidebar.vue b/frontend/app/components/Sidebar/Sidebar.vueindex 065db26c..9d105a18 100644--- a/frontend/app/components/Sidebar/Sidebar.vue+++ b/frontend/app/components/Sidebar/Sidebar.vue@@ -1,8 +1,8 @@<template><div :class="{ 'sidebar-mask': isMobile && isOpened }" /><Resizable>- <Dock v-if="!isMobile && preferences.get('view_dock').value" />- <div class="sidebar" :class="{ compact: preferences.get('compactMode').value }">+ <Dock v-if="!isMobile && viewDock" />+ <div class="sidebar" :class="{ compact: compactMode }"><section class="header"><span class="name"><IconApp />@@ -77,6 +77,9 @@ const { isOpened, hasSidebar, filtered } = useSidebar();const { isMobile } = useDevice();const { avatarURL } = useApi();+const viewDock = preferences.get('view_dock');+const compactMode = preferences.get('compactMode');+const filter = ref<string>('');const workspaces = computed(() => [...nodesStore.getAll.filter(c => c.role === 1).map(c => ({ text: c.name, value: c.id, meta: c }))]);const isLoading = computed(() => nodesStore.isFetching);diff --git a/frontend/app/pages/(public)/doc/[id]/index.vue b/frontend/app/pages/(public)/doc/[id]/index.vueindex 07568957..b2f259a6 100644--- a/frontend/app/pages/(public)/doc/[id]/index.vue+++ b/frontend/app/pages/(public)/doc/[id]/index.vue@@ -5,7 +5,7 @@v-if="!error && article"class="reader":style="{- marginRight: !isTablet && preferencesStore.get('hideTOC').value && isOpened && hasContent ? '200px' : '0px',+ marginRight: !isTablet && hideTOC && isOpened && hasContent ? '200px' : '0px',transition: 'margin $transition-medium',}">@@ -14,20 +14,14 @@<NodeDocumentHeader :doc="article" :public="true" style="margin: 20px 0" /><!-- Document content if available -->- <article- v-if="hasContent"- ref="element"- :class="`${article.theme || preferencesStore.get('theme').value}-theme`"- style="max-width: 100%"- v-html="article.content_compiled"- />+ <article v-if="hasContent" ref="element" :class="`${article.theme || theme}-theme`" style="max-width: 100%" v-html="article.content_compiled" /><!-- Hierarchical children tree --><NodeTree v-if="children.length > 0" :nodes="children" :parent-id="article.id" /></div><!-- Table of contents only for documents with content -->- <div v-if="!isTablet && !preferencesStore.get('hideTOC').value && hasContent" class="toc">+ <div v-if="!isTablet && !hideTOC && hasContent" class="toc"><NodeTOC :doc="article" :element="element" /></div></div>@@ -53,6 +47,9 @@ const runtimeConfig = useRuntimeConfig();const { isOpened } = useSidebar();const { isTablet } = useDevice();+const hideTOC = preferencesStore.get('hideTOC');+const theme = preferencesStore.get('theme');+const element = ref<HTMLElement>();const children = ref<Node[]>([]);diff --git a/frontend/app/pages/dashboard/docs/[id].vue b/frontend/app/pages/dashboard/docs/[id].vueindex dd160585..995787b3 100644--- a/frontend/app/pages/dashboard/docs/[id].vue+++ b/frontend/app/pages/dashboard/docs/[id].vue@@ -5,25 +5,19 @@<div :style="{ maxWidth: width }" class="doc-container"><NodeDocumentHeader :doc="node" style="margin-bottom: 20px" />- <article- v-if="node"- ref="element"- :class="`${node.theme || preferencesStore.get('theme').value}-theme`"- style="max-width: 100%"- v-html="node.content_compiled"- />+ <article v-if="node" ref="element" :class="`${node.theme || theme}-theme`" style="max-width: 100%" v-html="node.content_compiled" /><NodeDocumentSkeleton v-else /><NodeDocumentFooter :document="node" :next="next" :previous="previous" /></div>- <div v-if="!devise.isTablet.value && !preferencesStore.get('hideTOC').value" class="toc">+ <div v-if="!devise.isTablet.value && !hideTOC" class="toc"><NodeTOC :doc="node" :element="element" style="width: 320px; margin-left: 20px" /></div><divclass="no-print":style="{- marginRight: !devise.isTablet.value && preferencesStore.get('hideTOC').value && sidebar.isOpened.value ? '200px' : '0px',+ marginRight: !devise.isTablet.value && hideTOC && sidebar.isOpened.value ? '200px' : '0px',transition: 'margin var(--transition-medium)',}"/>@@ -46,6 +40,10 @@ const nodesTree = useNodesTree();const route = useRoute();const router = useRouter();+const hideTOC = preferencesStore.get('hideTOC');+const theme = preferencesStore.get('theme');+const docSize = preferencesStore.get('docSize');+const element = ref<HTMLElement>();const node = ref<Node | undefined>();const error = ref<false | string>(false);@@ -79,8 +77,8 @@ definePageMeta({const next = computed(() => nodesTree.nextDocument(node.value?.id));const previous = computed(() => nodesTree.prevDocument(node.value?.id));const width = computed(() => {- if (preferencesStore.get('docSize').value == 2) return '980px';- if (preferencesStore.get('docSize').value == 1) return '800px';+ if (docSize.value == 2) return '980px';+ if (docSize.value == 1) return '800px';return '700px';});