Skip to content

πŸ“š The open-source, offline-first Notion, Obsidian & Confluence alternative. Advanced Markdown, multi-tenant teams, OIDC/SSO, and local S3 backups. Deploy in one command.

fix: public documents children list with ssr

Smaug67392dff46351849
diff --git a/frontend/app/components/AppBtnIcon.vue b/frontend/app/components/AppBtnIcon.vue
index d3d2cbf8..7b7b03f9 100644
--- a/frontend/app/components/AppBtnIcon.vue
+++ b/frontend/app/components/AppBtnIcon.vue
@@ -1,40 +1,35 @@
<template>
- <template v-if="nav && !isMobile">
- <NuxtLink v-if="to || href" :to="to" :href="href" :target="blank ? '_blank' : undefined" v-bind="download ? { download: '' } : {}" @click="emit('click')">
- <Icon :name="icon" display="lg" />
- <p v-if="tooltip" class="hint-tooltip">{{ tooltip }}</p>
- <slot />
- </NuxtLink>
- <button v-else v-bind="attrs" :class="{ fill }" @click="emit('click')">
- <Icon :name="icon" display="lg" />
- <p v-if="tooltip" class="hint-tooltip">{{ tooltip }}</p>
- <slot />
- </button>
- </template>
- <template v-else>
- <NuxtLink v-if="to || href" :to="to" :href="href" :target="blank ? '_blank' : undefined" v-bind="download ? { download: '' } : {}" @click="emit('click')">
- <Icon :name="icon" display="lg" />
- <slot />
- <span v-if="tooltip">{{ tooltip }}</span>
- </NuxtLink>
- <button v-else v-bind="attrs" :class="{ fill }" @click="emit('click')">
- <Icon :name="icon" display="lg" />
- <slot />
- <span v-if="tooltip">{{ tooltip }}</span>
- </button>
- </template>
+ <NuxtLink
+ v-if="to || href"
+ :to="to"
+ :href="href"
+ :target="blank ? '_blank' : undefined"
+ v-bind="download ? { download: '' } : {}"
+ :class="{ 'btn-nav': nav }"
+ @click="emit('click')"
+ >
+ <Icon :name="icon" display="lg" />
+ <slot />
+ <span v-if="tooltip" class="hint-tooltip btn-tooltip">{{ tooltip }}</span>
+ </NuxtLink>
+
+ <button v-else v-bind="attrs" :class="{ fill, 'btn-nav': nav }" @click="emit('click')">
+ <Icon :name="icon" display="lg" />
+ <slot />
+ <span v-if="tooltip" class="hint-tooltip btn-tooltip">{{ tooltip }}</span>
+ </button>
</template>
<script setup lang="ts">
defineProps<{ icon: string; tooltip?: string; to?: string; blank?: boolean; href?: string; download?: boolean; nav?: boolean; fill?: boolean }>();
const emit = defineEmits<{ (e: 'click'): void }>();
-const { isMobile } = useDevice();
const attrs = useAttrs();
</script>
<style scoped lang="scss">
button,
+button,
a {
position: relative;
display: inline-flex;
@@ -51,29 +46,37 @@ a {
&:hover {
background-color: var(--surface-raised);
}
+}
- &:hover {
- background: var(--surface-transparent);
+// Gestion du survol pour Desktop uniquement (au-dessus de 768px)
+@media screen and (width > 768px) {
+ a:hover > .btn-tooltip,
+ button:hover > .btn-tooltip {
+ opacity: 1;
+ visibility: visible;
}
}
-a:hover > .hint-tooltip {
- opacity: 1;
- visibility: visible;
+.fill {
+ background-color: var(--surface-raised);
}
-button:hover > .hint-tooltip {
- opacity: 1;
- visibility: visible;
-}
+// Le fix magique pour Mobile
+@media screen and (width <= 768px) {
+ .btn-tooltip {
+ position: static !important;
+ transform: none !important;
+ background-color: transparent !important;
+ box-shadow: none !important;
+ color: inherit !important;
+ padding: 0 !important;
+ margin: 0 !important;
-span {
- font-size: 14px;
- font-weight: 500;
- white-space: nowrap;
-}
+ opacity: 1 !important;
+ visibility: visible !important;
+ pointer-events: auto !important;
-.fill {
- background-color: var(--surface-raised);
+ order: 1;
+ }
}
</style>
diff --git a/frontend/app/components/Node/Document/Header.vue b/frontend/app/components/Node/Document/Header.vue
index 7fb1db68..f0769f37 100644
--- a/frontend/app/components/Node/Document/Header.vue
+++ b/frontend/app/components/Node/Document/Header.vue
@@ -6,7 +6,9 @@
<!-- Real content -->
<template v-else>
<Teleport to="#navbar-actions" :disabled="public">
- <NodeDocumentHeaderActionRow :doc="doc" :is-public="public" />
+ <div class="no-print">
+ <NodeDocumentHeaderActionRow :doc="doc" :is-public="public" />
+ </div>
</Teleport>
<div class="content">
diff --git a/frontend/app/pages/(public)/doc/[id]/index.vue b/frontend/app/pages/(public)/doc/[id]/index.vue
index 449948cc..a049438b 100644
--- a/frontend/app/pages/(public)/doc/[id]/index.vue
+++ b/frontend/app/pages/(public)/doc/[id]/index.vue
@@ -1,23 +1,22 @@
<template>
<div style="width: 100%; padding: 1rem 0">
<div
- v-if="!error && article"
+ v-if="!error && data?.node"
class="reader"
:style="{
- marginRight: !isTablet && isOpened && hasContent ? '200px' : '0px',
+ marginRight: isOpened && hasContent ? '200px' : '0px',
transition: 'margin $transition-medium',
}"
>
<div class="doc-container">
- <NodeDocumentHeader :doc="article" public style="margin: 20px 0" />
+ <NodeDocumentHeader :doc="data.node" public style="margin: 20px 0" />
- <NodeDocumentContentCompiled v-if="hasContent" ref="elementComponent" :node="article" />
-
- <NodeTree v-if="children.length > 0" :nodes="children" :parent-id="article.id" />
+ <NodeDocumentContentCompiled v-if="hasContent" ref="elementComponent" :node="data.node" />
+ <NodeTree v-if="data.children.length > 0" :nodes="data.children" :parent-id="data.node.id" />
</div>
- <div v-if="!isTablet && hasContent" class="toc">
- <NodeTOC :doc="article" :element="element" />
+ <div v-if="hasContent" class="toc">
+ <NodeTOC :doc="data.node" :element="element" />
</div>
</div>
@@ -38,56 +37,48 @@ import type { Node, PublicNodeResponse } from '~/stores';
const route = useRoute();
const requestUrl = useRequestURL();
const { isOpened } = useSidebar();
-const { isTablet } = useDevice();
-const children = ref<Node[]>([]);
const elementComponent = ref<InstanceType<typeof NodeDocumentContentCompiled>>();
const element = computed(() => elementComponent.value?.rootElement as HTMLElement | undefined);
-const { data: article, error } = await useAsyncData(`public-doc-${route.params.id}`, async (): Promise<Node | undefined> => {
+const { data, error } = await useAsyncData(`public-doc-${route.params.id}`, async (): Promise<{ node: Node | undefined; children: Node[] }> => {
const documentId = route.params.id;
- if (!documentId || typeof documentId !== 'string') return undefined;
+ if (!documentId || typeof documentId !== 'string') return { node: undefined, children: [] };
const request = await makeRequest(`nodes/public/${documentId}`, 'GET', {});
if (request.status === 'success') {
const response = request.result as PublicNodeResponse;
-
- children.value = (response.children || []).map(c => ({ ...c, partial: true, shared: false, permissions: [] }));
-
return {
- ...response.node,
- partial: false,
- shared: false,
- permissions: [],
+ node: { ...response.node, shared: false, public: true, permissions: [] } as Node,
+ children: response.children?.map(child => ({ ...child, shared: false, public: true }) as Node) || [],
};
}
- return undefined;
+ return { node: undefined, children: [] };
});
/** Check if node has displayable content */
-const hasContent = computed(() => !!article.value?.content_compiled?.trim());
+const hasContent = computed(() => !!data.value?.node?.content_compiled?.trim());
const baseUrl = requestUrl.origin || __BASE_URL__;
-// Configuration SEO robuste pour le SSR
useSeoMeta({
- title: () => article.value?.name || 'Unknown document',
- description: () => article.value?.description || 'Public document published on Alexandrie, a modern Markdown-based note-taking platform.',
- keywords: () => article.value?.tags,
+ title: () => data.value?.node?.name || 'Unknown document',
+ description: () => data.value?.node?.description || 'Public document published on Alexandrie, a modern Markdown-based note-taking platform.',
+ keywords: () => data.value?.node?.tags,
- ogTitle: () => article.value?.name || 'Unknown document',
- ogDescription: () => article.value?.description || 'Public document published on Alexandrie, a modern Markdown-based note-taking platform.',
+ ogTitle: () => data.value?.node?.name || 'Unknown document',
+ ogDescription: () => data.value?.node?.description || 'Public document published on Alexandrie, a modern Markdown-based note-taking platform.',
ogType: 'article',
ogUrl: () => `${baseUrl}/doc/${route.params.id}`,
- ogImage: () => (article.value?.thumbnail ? `${baseUrl}${article.value.thumbnail}` : `${baseUrl}/og/default-article.png`),
+ ogImage: () => (data.value?.node?.thumbnail ? `${baseUrl}${data.value?.node.thumbnail}` : `${baseUrl}/og/default-data.png`),
- articlePublishedTime: () => (article.value?.created_timestamp ? new Date(article.value.created_timestamp).toISOString() : undefined),
- articleModifiedTime: () => (article.value?.updated_timestamp ? new Date(article.value.updated_timestamp).toISOString() : undefined),
+ articlePublishedTime: () => (data.value?.node?.created_timestamp ? new Date(data.value?.node.created_timestamp).toISOString() : undefined),
+ articleModifiedTime: () => (data.value?.node?.updated_timestamp ? new Date(data.value?.node.updated_timestamp).toISOString() : undefined),
twitterCard: 'summary_large_image',
- twitterTitle: () => article.value?.name || 'Unknown document',
- twitterDescription: () => article.value?.description || 'Public document published on Alexandrie, a modern Markdown-based note-taking platform.',
- twitterImage: () => (article.value?.thumbnail ? `${baseUrl}${article.value.thumbnail}` : `${baseUrl}/og/default-article.png`),
+ twitterTitle: () => data.value?.node?.name || 'Unknown document',
+ twitterDescription: () => data.value?.node?.description || 'Public document published on Alexandrie, a modern Markdown-based note-taking platform.',
+ twitterImage: () => (data.value?.node?.thumbnail ? `${baseUrl}${data.value?.node.thumbnail}` : `${baseUrl}/og/default-data.png`),
});
</script>