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.

Fixes & improvments

Smaug6739b85744563d3c
diff --git a/backend/classes/DocumentsManager.ts b/backend/classes/DocumentsManager.ts
index e4cb4f63..6ec54d36 100644
--- a/backend/classes/DocumentsManager.ts
+++ b/backend/classes/DocumentsManager.ts
@@ -122,7 +122,7 @@ export class DocumentsManager extends Base<Document> {
if (data.category && data.category.length > 50) return 'document category invalid';
if (data.parent_id && data.parent_id.length > 50) return 'document parent id invalid';
if (!data.accessibility && data.accessibility > 10) return 'document accessibility invalid';
- if (!data.content_markdown || data.content_markdown.length > 4_294_967_295) return 'document content markdown invalid';
+ if (data.content_markdown && data.content_markdown.length > 4_294_967_295) return 'document content markdown invalid';
if (data.content_html && data.content_html.length > 4_294_967_295) return 'document content html invalid';
if (!data.author_id || data.author_id.length > 50) return 'document author id invalid';
if (!data.created_timestamp || data.created_timestamp.length > 50) return 'document created timestamp invalid';
diff --git a/frontend/components/DHeader.vue b/frontend/components/BreadCrumb.vue
similarity index 81%
rename from frontend/components/DHeader.vue
rename to frontend/components/BreadCrumb.vue
index e0519787..2ab3664c 100644
--- a/frontend/components/DHeader.vue
+++ b/frontend/components/BreadCrumb.vue
@@ -9,11 +9,11 @@
</template>
<script setup lang="ts">
-import type { RouteLocation } from 'vue-router';
-const route: RouteLocation = useRoute();
+const route = useRoute();
const router = useRouter();
const breadcrumbs: Ref<Array<{ name: string; path: string }>> = ref([]);
+
declare module 'vue-router' {
interface RouteMeta {
breadcrumb: () => string;
@@ -40,19 +40,17 @@ watchEffect(() => {
.breadcrumb {
display: flex;
flex-wrap: wrap;
- padding: 0;
list-style: none;
- border-radius: 0.25rem;
- font-family: Inter;
+ padding: 3px;
}
-.breadcrumb-item + .breadcrumb-item::before {
+.breadcrumb-item+.breadcrumb-item::before {
content: '/';
padding: 0 0.5rem;
}
.breadcrumb-item a {
- font-size: 20px;
- font-weight: 600;
+ font-size: 17px;
+ font-weight: 500;
}
</style>
diff --git a/frontend/components/DocumentCardHeaderActionRow.vue b/frontend/components/DocumentCardHeaderActionRow.vue
index ff38eb18..6270fc26 100644
--- a/frontend/components/DocumentCardHeaderActionRow.vue
+++ b/frontend/components/DocumentCardHeaderActionRow.vue
@@ -19,16 +19,12 @@
d="M280-120q-33 0-56.5-23.5T200-200v-520h-40v-80h200v-40h240v40h200v80h-40v520q0 33-23.5 56.5T680-120H280Zm400-600H280v520h400v-520ZM360-280h80v-360h-80v360Zm160 0h80v-360h-80v360ZM280-720v520-520Z" />
</svg>
</NuxtLink>
- <Modal :show="showDeleteModal" @close="showDeleteModal = false" @confirm="deleteDoc">
- <template #header>
- <h3>Delete document</h3>
- </template>
- <template #body>
- <p>Are you sure you want to delete this document?</p>
- </template>
- <template #footer>
- <p style="opacity: 0.7; ">This action is irreversible</p>
- </template>
+ <Modal :show="showDeleteModal">
+ <h3>Delete document</h3>
+ <p>Are you sure you want to delete this document?</p>
+ <p style="opacity: 0.7; ">This action is irreversible</p>
+ <button @click="showDeleteModal = false" style="float: left;">Cancel</button>
+ <button @click="deleteDoc" style="float: right;" class="confirm">Confirm</button>
</Modal>
</span>
</template>
@@ -61,4 +57,14 @@ a {
.header svg path {
fill: var(--font-color);
}
+
+button {
+ font-weight: 600;
+ font-size: medium;
+}
+
+.confirm {
+ background-color: var(--font-color);
+ color: var(--bg-color);
+}
</style>
\ No newline at end of file
diff --git a/frontend/components/Modal.vue b/frontend/components/Modal.vue
index a29b383f..f3e40676 100644
--- a/frontend/components/Modal.vue
+++ b/frontend/components/Modal.vue
@@ -1,28 +1,13 @@
<script setup lang="ts">
-defineProps<{ show: boolean }>()
+defineProps<{ show: boolean, size?: 'large' }>()
const emit = defineEmits(['close', 'confirm'])
</script>
<template>
<Transition name="modal">
<div v-if="show" class="modal-mask">
- <div class="modal-container">
- <div class="modal-header">
- <slot name="header"></slot>
- </div>
-
- <div class="modal-body">
- <slot name="body"></slot>
- </div>
-
- <div class="modal-footer">
- <slot name="footer">
- </slot>
- <div style="display:flex; justify-content: space-between;padding: 0 15px;">
- <button class="modal-close-button" @click="emit('close')">Cancel</button>
- <button class="modal-confirm-button" @click="emit('confirm')">OK</button>
- </div>
- </div>
+ <div class="modal-container" :class="size">
+ <slot></slot>
</div>
</div>
</Transition>
@@ -58,6 +43,13 @@ const emit = defineEmits(['close', 'confirm'])
opacity: 0;
}
+.large {
+ width: 1150px;
+ height: calc(-100px + 100vh);
+ max-width: calc(-100px + 100vw);
+ max-height: 715px;
+}
+
.modal-enter-from .modal-container,
.modal-leave-to .modal-container {
-webkit-transform: scale(1.1);
diff --git a/frontend/components/Navbar.vue b/frontend/components/Navbar.vue
index b8448618..60f9ec46 100644
--- a/frontend/components/Navbar.vue
+++ b/frontend/components/Navbar.vue
@@ -6,7 +6,7 @@
<path d="M120-240v-80h720v80H120Zm0-200v-80h720v80H120Zm0-200v-80h720v80H120Z" />
</svg>
</button>
- <DHeader v-if="!isMobile()" />
+ <BreadCrumb v-if="!isMobile()" />
</div>
<ThemeToggle />
</header>
diff --git a/frontend/components/sidebar/Collapse.vue b/frontend/components/Sidebar/Collapse.vue
similarity index 100%
rename from frontend/components/sidebar/Collapse.vue
rename to frontend/components/Sidebar/Collapse.vue
diff --git a/frontend/components/sidebar/CollapseItem.vue b/frontend/components/Sidebar/CollapseItem.vue
similarity index 100%
rename from frontend/components/sidebar/CollapseItem.vue
rename to frontend/components/Sidebar/CollapseItem.vue
diff --git a/frontend/components/sidebar/IconApp.vue b/frontend/components/Sidebar/IconApp.vue
similarity index 100%
rename from frontend/components/sidebar/IconApp.vue
rename to frontend/components/Sidebar/IconApp.vue
diff --git a/frontend/components/sidebar/IconClose.vue b/frontend/components/Sidebar/IconClose.vue
similarity index 100%
rename from frontend/components/sidebar/IconClose.vue
rename to frontend/components/Sidebar/IconClose.vue
diff --git a/frontend/components/sidebar/Resizable.vue b/frontend/components/Sidebar/Resizable.vue
similarity index 100%
rename from frontend/components/sidebar/Resizable.vue
rename to frontend/components/Sidebar/Resizable.vue
diff --git a/frontend/components/sidebar/Search.vue b/frontend/components/Sidebar/Search.vue
similarity index 100%
rename from frontend/components/sidebar/Search.vue
rename to frontend/components/Sidebar/Search.vue
diff --git a/frontend/components/sidebar/Sidebar.vue b/frontend/components/Sidebar/Sidebar.vue
similarity index 100%
rename from frontend/components/sidebar/Sidebar.vue
rename to frontend/components/Sidebar/Sidebar.vue
diff --git a/frontend/components/sidebar/SidebarItem.vue b/frontend/components/Sidebar/SidebarItem.vue
similarity index 100%
rename from frontend/components/sidebar/SidebarItem.vue
rename to frontend/components/Sidebar/SidebarItem.vue
diff --git a/frontend/components/sidebar/helpers.ts b/frontend/components/Sidebar/helpers.ts
similarity index 100%
rename from frontend/components/sidebar/helpers.ts
rename to frontend/components/Sidebar/helpers.ts
diff --git a/frontend/components/sidebar/tree_builder.ts b/frontend/components/Sidebar/tree_builder.ts
similarity index 100%
rename from frontend/components/sidebar/tree_builder.ts
rename to frontend/components/Sidebar/tree_builder.ts
diff --git a/frontend/pages/dashboard.vue b/frontend/pages/dashboard.vue
index d87883cc..7383ebeb 100644
--- a/frontend/pages/dashboard.vue
+++ b/frontend/pages/dashboard.vue
@@ -8,7 +8,7 @@
</div>
</template>
<script setup lang="ts">
-import Sidebar from '~/components/sidebar/Sidebar.vue';
+import Sidebar from '~/components/Sidebar/Sidebar.vue';
import { useDocumentsStore, useCategoriesStore } from '@/stores';
definePageMeta({ breadcrumb: 'Home' });
diff --git a/frontend/styles/theme.scss b/frontend/styles/theme.scss
index cce5b5fe..36a32c91 100644
--- a/frontend/styles/theme.scss
+++ b/frontend/styles/theme.scss
@@ -32,7 +32,7 @@ button {
width: fit-content;
&:hover {
- transform: scale(1.1);
+ background-color: var(--bg-contrast-2);
}
&:disabled {
@@ -141,6 +141,7 @@ mark {
option {
padding: 8px 12px;
+ font-family: $external-font;
&:hover {
box-shadow: 0 0 10px 100px #000 inset;