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.

General improvments

Smaug6739dc2d7567f0ba
diff --git a/@alexandrie/styles/src/_variables.scss b/@alexandrie/styles/src/_variables.scss
index 11a26106..87cdfb5d 100644
--- a/@alexandrie/styles/src/_variables.scss
+++ b/@alexandrie/styles/src/_variables.scss
@@ -54,7 +54,6 @@ $transition-duration: 0.3s;
--turquoise-border: rgba(23, 162, 184, 0.25);
--pink: #FF2E63;
- --info-bg: #f2f5fd;
--info-border: #2573cf;
}
diff --git a/@alexandrie/styles/src/katex.scss b/@alexandrie/styles/src/katex.scss
index 37c8a4d1..0505e844 100644
--- a/@alexandrie/styles/src/katex.scss
+++ b/@alexandrie/styles/src/katex.scss
@@ -10,12 +10,4 @@
.katex-display {
margin: 0 !important;
//text-align: left;
-}
-.katex {
- //white-space: normal !important;
- //text-align: left !important;
-}
-/* Add space between broken lines: */
-/*.katex > .katex-html > .base {
- margin: 0.35em 0 !important
-}*/
+}
\ No newline at end of file
diff --git a/@alexandrie/styles/src/main.scss b/@alexandrie/styles/src/main.scss
index 3ac17563..fe8d1115 100644
--- a/@alexandrie/styles/src/main.scss
+++ b/@alexandrie/styles/src/main.scss
@@ -13,15 +13,7 @@
}
-html {
- overflow: hidden;
-}
-mark {
- background-color: var(--yellow);
- padding: 0 2px;
- border-radius: 5px;
-}
::-webkit-scrollbar {
width: 2px;
@@ -45,6 +37,10 @@ mark {
background-color: $selection-color;
}
+html {
+ overflow: hidden;
+}
+
body {
background: var(--bg-color);
@@ -101,6 +97,6 @@ body {
}
.no-print {
- display: none;
+ display: none !important;
}
}
\ No newline at end of file
diff --git a/@alexandrie/styles/src/markdown.scss b/@alexandrie/styles/src/markdown.scss
index f8bf06ed..84f66748 100644
--- a/@alexandrie/styles/src/markdown.scss
+++ b/@alexandrie/styles/src/markdown.scss
@@ -97,6 +97,7 @@
.custom-block {
border: 1px solid transparent;
border-radius: 8px;
+ margin-top: 10px;
padding: 10px 10px 8px;
line-height: 24px;
font-size: 14px;
diff --git a/dashboard/App.vue b/dashboard/App.vue
index 373a612a..1a9eb751 100644
--- a/dashboard/App.vue
+++ b/dashboard/App.vue
@@ -25,4 +25,10 @@ useCategoriesStore().fetch();
display: flex;
flex-direction: column;
}
+
+@media print {
+ #app {
+ height: auto;
+ }
+}
</style>
\ No newline at end of file
diff --git a/dashboard/components/DocumentCardHeader.vue b/dashboard/components/DocumentCardHeader.vue
index 6a4375bb..0faae4eb 100644
--- a/dashboard/components/DocumentCardHeader.vue
+++ b/dashboard/components/DocumentCardHeader.vue
@@ -4,7 +4,7 @@
<div class="header">
<div class="text">
<p class="category">{{ category?.name }}
- <DocumentCardHeaderActionRow :doc_id="doc.id" />
+ <DocumentCardHeaderActionRow :doc_id="doc.id" class="no-print" />
</p>
<h1 class="title">{{ doc?.name }}</h1>
<p class="description">{{ doc?.description }}</p>
@@ -147,4 +147,10 @@ p {
}
}
+
+@media print {
+ .header {
+ padding: 0;
+ }
+}
</style>
\ No newline at end of file
diff --git a/dashboard/components/Navbar.vue b/dashboard/components/Navbar.vue
index 927574f9..2373d338 100644
--- a/dashboard/components/Navbar.vue
+++ b/dashboard/components/Navbar.vue
@@ -6,19 +6,7 @@
<path d="M120-240v-80h720v80H120Zm0-200v-80h720v80H120Zm0-200v-80h720v80H120Z" />
</svg>
</span>
- <ul>
- <li class="no-mobile">
- <NuxtLink to="https://alexandrie-hub.fr" target="_blank">
- View version
- </NuxtLink>
- </li>
- <li class="no-mobile">
- <NuxtLink to="https://dashboard.alexandrie-hub.fr" target="_blank">Dashboard</NuxtLink>
- </li>
- <li>
- <ThemeToggle />
- </li>
- </ul>
+ <ThemeToggle />
</header>
</template>
@@ -28,6 +16,7 @@ header {
height: 100%;
display: flex;
justify-content: space-between;
+ padding: 0 15px;
}
.open-sidebar {
diff --git a/dashboard/components/sidebar/Sidebar.vue b/dashboard/components/sidebar/Sidebar.vue
index deddd622..bc63b226 100644
--- a/dashboard/components/sidebar/Sidebar.vue
+++ b/dashboard/components/sidebar/Sidebar.vue
@@ -46,7 +46,7 @@ const items = computed((): Item[] => {
data: document
}))
- const itemsManager = new ItemsManager([...navigation, ...categories, ...documents]);
+ const itemsManager = new ItemsManager([...navigation, ...documents, ...categories]);
const tree = itemsManager.generateTree()
return tree;
});
diff --git a/dashboard/components/sidebar/SidebarDropdown.vue b/dashboard/components/sidebar/SidebarDropdown.vue
index 345e6dde..232195ab 100644
--- a/dashboard/components/sidebar/SidebarDropdown.vue
+++ b/dashboard/components/sidebar/SidebarDropdown.vue
@@ -1,6 +1,6 @@
<template>
<div class="container">
- <select name="category-filter" @change="(v: any) => selected = v.target?.value">
+ <select name="category-filter" @change="v => selected = (v.target as HTMLSelectElement)?.value">
<option value="">All</option>
<option v-for="category in categories" :key="category.id" :value="category.id">
{{ category.name }}
diff --git a/dashboard/components/sidebar/SidebarItem.vue b/dashboard/components/sidebar/SidebarItem.vue
index c194b117..22c6cc45 100644
--- a/dashboard/components/sidebar/SidebarItem.vue
+++ b/dashboard/components/sidebar/SidebarItem.vue
@@ -1,5 +1,7 @@
<template>
- <NuxtLink class="item" :to="item.route" @click="() => item.route && toggle()">
+ <NuxtLink class="item" :to="item.route" @click="() => item.route && toggle()" :draggable="draggable"
+ @dragstart="dragStart" @dragover.prevent="dragOver" @drop="drop" @dragleave="dragLeave"
+ :class="{ 'drag-over': isDragOver }">
<i v-html="getIcon(item)" class="icon"></i>
<span>{{ item.title }}</span>
<slot></slot>
@@ -7,20 +9,88 @@
</template>
<script setup lang="ts">
+
+import { useDocumentsStore, useCategoriesStore } from '~/store';
+
+const documentStore = useDocumentsStore();
+const categoriesStore = useCategoriesStore();
+
import type { Item } from './tree_builder';
-import { icons } from './helpers';
+import { icons, navigationItems } from './helpers';
const { isOpened } = useSidebar();
-defineProps<{ item: Item }>();
+const props = defineProps<{ item: Item }>();
const isMobile = () => process.client ? window.innerWidth <= 768 : false;
function getIcon(item: Item) {
if ('icon' in item.data && item.data.icon) return item.data.icon;
if (item.data.type === 'category') return icons.folder;
if (item.data.type === 'document' && item.childrens?.length) return icons.file_parent;
- if (item.data.type === 'document' && item.data.accessibility != 1) return icons.draft;
+ if (item.data.type === 'document' && item.data.accessibility == 2) return icons.draft;
+ if (item.data.type === 'document' && item.data.accessibility == 3) return icons.archive;
return icons.file;
}
const toggle = () => isMobile() && (isOpened.value = false);
+
+const draggable = ref<boolean>(true);
+const isDragOver = ref<boolean>(false);
+
+const dragStart = (event: DragEvent) => {
+ // Stocke l'ID de l'élément en cours de glissement
+ event.dataTransfer!.setData('text/plain', props.item.id.toString());
+};
+
+const dragOver = () => {
+ // Indique que l'élément est survolé lors du glisser-déposer
+ isDragOver.value = true;
+};
+
+const dragLeave = () => {
+ // Réinitialise l'état de survol lorsque l'élément quitte la zone de dépôt
+ isDragOver.value = false;
+};
+
+const drop = async (event: DragEvent) => {
+ isDragOver.value = false;
+ const draggedItemId = event.dataTransfer!.getData('text/plain');
+
+ let draggedItem = documentStore.getById(draggedItemId) || categoriesStore.getById(draggedItemId) || navigationItems.find((item) => item.id === draggedItemId);
+ if (!draggedItem) return;
+
+ if (draggedItem.type === "document" && draggedItem.partial) {
+ draggedItem = await documentStore.fetch({ id: draggedItem.id });
+ }
+
+ if (draggedItem.type === "document" && props.item.data.type === "category") { // Move document to category
+ documentStore.update(
+ { ...draggedItem, category: props.item.id, parent_id: null }
+ );
+ }
+ if (draggedItem.type === "category" && props.item.data.type === "category") { // Move category to category
+ if (draggedItem.id === props.item.id) return; // Prevent moving to the same category
+ categoriesStore.update(
+ { ...draggedItem, parent_id: props.item.id }
+ );
+ }
+ if (draggedItem.type === "document" && props.item.data.type === "document") { // Move document to document
+ if (draggedItem.id === props.item.parent_id) return; // Prevent moving parent to child
+ if (draggedItem.id === props.item.id) return; // Prevent moving to the same document
+ documentStore.update(
+ { ...draggedItem, parent_id: props.item.id }
+ );
+ }
+ if (draggedItem.type === "category" && props.item.data.type === "category") { // Move category to category
+ if (draggedItem.id === props.item.id) return; // Prevent moving to the same category
+ categoriesStore.update(
+ { ...draggedItem, parent_id: props.item.id }
+ );
+ }
+ if (draggedItem.type === "category" && props.item.data.type === "default") { // Move category to root
+ categoriesStore.update(
+ { ...draggedItem, parent_id: undefined }
+ );
+ }
+
+};
</script>
<style lang="scss" scoped>
@@ -57,4 +127,9 @@ const toggle = () => isMobile() && (isOpened.value = false);
}
}
}
+
+.drag-over {
+ border-bottom: 2px solid var(--blue);
+ box-shadow: 0 2px 10px rgba(0, 0, 0, 0.2);
+}
</style>
\ No newline at end of file
diff --git a/dashboard/components/sidebar/helpers.ts b/dashboard/components/sidebar/helpers.ts
index 182b41a0..ac616308 100644
--- a/dashboard/components/sidebar/helpers.ts
+++ b/dashboard/components/sidebar/helpers.ts
@@ -49,4 +49,6 @@ export const icons = {
file: '<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path style="fill:var(--pink);" d="M320-240h320v-80H320v80Zm0-160h320v-80H320v80ZM240-80q-33 0-56.5-23.5T160-160v-640q0-33 23.5-56.5T240-880h320l240 240v480q0 33-23.5 56.5T720-80H240Zm280-520v-200H240v640h480v-440H520ZM240-800v200-200 640-640Z"/></svg>',
file_parent:
'<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path style="fill:var(--green);" d="M200-120q-33 0-56.5-23.5T120-200v-560q0-33 23.5-56.5T200-840h560q33 0 56.5 23.5T840-760v560q0 33-23.5 56.5T760-120H200Zm0-80h240v-560H200v560Zm320 0h240v-280H520v280Zm0-360h240v-200H520v200Z"/></svg>',
+ archive:
+ '<svg xmlns="http://www.w3.org/2000/svg" height="24" viewBox="0 -960 960 960" width="24"><path style="fill:var(--grey)" d="M200-120v-640q0-33 23.5-56.5T280-840h400q33 0 56.5 23.5T760-760v640L480-240 200-120Zm80-122 200-86 200 86v-518H280v518Zm0-518h400-400Z"/></svg>',
};
diff --git a/dashboard/nuxt.config.ts b/dashboard/nuxt.config.ts
index b88f1c44..dd89e8e8 100644
--- a/dashboard/nuxt.config.ts
+++ b/dashboard/nuxt.config.ts
@@ -1,4 +1,5 @@
import { resolve } from 'path';
+// favicon: 'https://alexandrie.fr/logo.svg',
export default defineNuxtConfig({
devtools: { enabled: true },
vite: {
@@ -45,6 +46,11 @@ export default defineNuxtConfig({
crossorigin: 'use-credentials',
href: '/manifest.json',
},
+ {
+ rel: 'icon',
+ type: 'image/svg+xml',
+ href: '/favicon.svg',
+ },
],
},
},
diff --git a/dashboard/pages/dashboard/cdn.vue b/dashboard/pages/dashboard/cdn.vue
index bd58cb4e..4e1aa6c2 100644
--- a/dashboard/pages/dashboard/cdn.vue
+++ b/dashboard/pages/dashboard/cdn.vue
@@ -31,7 +31,7 @@ const fileInput: Ref<HTMLInputElement | null> = ref(null);
const isLoading = ref(false);
const triggerFileSelect = () => fileInput.value!.click();
-const handleFileSelect = (event: any) => selectedFile.value = event.target?.files[0];
+const handleFileSelect = (event: Event) => selectedFile.value = (event.target as HTMLInputElement | null)?.files?.[0] || null;
const handleFileDrop = (event: DragEvent) => {
if (event.dataTransfer?.files && event.dataTransfer.files.length > 0) {
diff --git a/dashboard/pages/dashboard/doc/[id].vue b/dashboard/pages/dashboard/doc/[id].vue
index e000196d..17bc3ae8 100644
--- a/dashboard/pages/dashboard/doc/[id].vue
+++ b/dashboard/pages/dashboard/doc/[id].vue
@@ -18,7 +18,7 @@ import TableOfContent from "@/components/table-of-content/TableOfContents.vue";
const route = useRoute();
const documentsStore = useDocumentsStore();
-const element = ref<HTMLElement>() as any;
+const element = ref<HTMLElement>();
const document_id = route.params.id as string;
const article = ref<Document>();
diff --git a/dashboard/public/android-chrome-192x192.png b/dashboard/public/android-chrome-192x192.png
index e8bbce57..ea62c18f 100644
Binary files a/dashboard/public/android-chrome-192x192.png and b/dashboard/public/android-chrome-192x192.png differ
diff --git a/dashboard/public/android-chrome-512x512.png b/dashboard/public/android-chrome-512x512.png
index 959fee18..63e8d8a9 100644
Binary files a/dashboard/public/android-chrome-512x512.png and b/dashboard/public/android-chrome-512x512.png differ
diff --git a/dashboard/public/apple-touch-icon.png b/dashboard/public/apple-touch-icon.png
index 70a1f14a..e17e3773 100644
Binary files a/dashboard/public/apple-touch-icon.png and b/dashboard/public/apple-touch-icon.png differ
diff --git a/dashboard/public/favicon-16x16.png b/dashboard/public/favicon-16x16.png
index 75bd0762..07c5fb70 100644
Binary files a/dashboard/public/favicon-16x16.png and b/dashboard/public/favicon-16x16.png differ
diff --git a/dashboard/public/favicon-32x32.png b/dashboard/public/favicon-32x32.png
index 84f92c26..3d24d79b 100644
Binary files a/dashboard/public/favicon-32x32.png and b/dashboard/public/favicon-32x32.png differ
diff --git a/dashboard/public/favicon.ico b/dashboard/public/favicon.ico
deleted file mode 100644
index d4d7dd77..00000000
Binary files a/dashboard/public/favicon.ico and /dev/null differ
diff --git a/dashboard/public/favicon.svg b/dashboard/public/favicon.svg
new file mode 100644
index 00000000..c994a4f3
--- /dev/null
+++ b/dashboard/public/favicon.svg
@@ -0,0 +1,12 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="263" height="292" viewBox="0 0 263 292" fill="none">
+<g style="mix-blend-mode:color-dodge" clip-path="url(#clip0_7_198)">
+<path d="M245.617 198.964C245.351 199.913 244.858 200.862 244.212 201.85C243.529 203.217 242.807 204.622 242.048 205.989L245.617 198.964ZM245.617 198.964C258.686 171.425 261.287 140.448 252.857 110.895L245.617 198.964ZM251.469 108.52L252.142 110.862C260.602 140.323 258.034 171.215 245.004 198.673L244.979 198.725L244.963 198.781C244.724 199.637 244.27 200.52 243.644 201.478L243.622 201.511L243.605 201.546C242.923 202.909 242.207 204.304 241.454 205.659L241.453 205.661C225.364 234.818 198.853 255.929 166.862 265.145C155.416 268.431 143.784 270.055 132.189 270.055C111.382 270.055 90.8001 264.807 72.066 254.458C70.5933 253.628 69.1194 252.758 67.6815 251.888L67.6425 251.864L67.6007 251.846C66.7997 251.498 66.1309 251.042 65.5556 250.575L65.5245 250.55L65.4908 250.528C39.7329 234.212 21.0767 209.401 12.5785 179.865L12.5785 179.865C4.11821 150.48 6.68631 119.664 19.6411 92.2434L19.6781 92.1649L19.6943 92.0796C19.9336 90.8146 20.6293 89.3928 21.8442 87.8098L21.8732 87.772L21.8967 87.7306C22.1506 87.2813 22.3839 86.8244 22.6097 86.3823L22.6128 86.3762C22.8417 85.9279 23.0631 85.4945 23.3017 85.0724L23.3048 85.0669C38.6392 57.3441 63.3757 36.913 93.2887 27.0553L93.3017 27.051L93.3146 27.0462C94.8115 26.4849 96.3503 25.9966 97.8974 25.5438C99.4728 25.0937 101.051 24.7177 102.636 24.3782L102.646 24.376L102.657 24.3735C135.059 16.3671 167.955 21.9934 194.999 37.7062L195.054 37.7385L195.115 37.7597C197.231 38.5021 198.726 39.3982 199.598 40.4712L199.666 40.5554L199.757 40.6141C223.66 55.9852 242.475 79.4448 251.469 108.52Z" stroke="#000" stroke-width="1.35766"/>
+<path d="M166.3 265.21C189.355 258.569 192.59 199.534 173.525 133.352C154.46 67.1701 120.315 18.9029 97.2603 25.5443C74.2054 32.1856 70.9709 91.2206 90.0358 157.403C109.101 223.585 143.246 271.852 166.3 265.21Z" stroke="#000" stroke-width="1.35766" stroke-miterlimit="10"/>
+<path d="M166.297 265.209C215.268 251.102 239.512 186.015 220.448 119.833C201.383 53.6512 146.228 11.4362 97.2568 25.5433C48.2854 39.6504 24.0413 104.738 43.1063 170.92C62.1712 237.101 117.326 279.317 166.297 265.209Z" stroke="#000" stroke-width="1.35766" stroke-miterlimit="10"/>
+<path d="M114.98 86.9534C164.898 72.5734 202.927 52.4536 199.92 42.0144C196.913 31.5752 154.008 34.7698 104.09 49.1498C54.171 63.5297 16.1417 83.6496 19.1489 94.0888C22.1561 104.528 65.061 101.333 114.98 86.9534Z" stroke="#000" stroke-width="1.35766" stroke-miterlimit="10"/>
+<path d="M128.491 134.006C190.34 116.19 236.784 88.9216 232.227 73.1016C227.67 57.2816 173.837 58.9003 111.988 76.7171C50.1386 94.5338 3.69437 121.802 8.25161 137.622C12.8088 153.442 66.6418 151.823 128.491 134.006Z" stroke="#000" stroke-width="1.35766" stroke-miterlimit="10"/>
+<path d="M138.926 170.188C204.523 151.292 254.505 124.88 250.563 111.196C246.621 97.5125 190.249 101.738 124.651 120.635C59.0535 139.531 9.07167 165.943 13.0135 179.627C16.9554 193.311 73.3282 189.085 138.926 170.188Z" stroke="#000" stroke-width="1.35766" stroke-miterlimit="10"/>
+<path d="M159.37 241.119C209.429 226.698 247.573 206.545 244.566 196.106C241.559 185.667 198.539 188.895 148.48 203.315C98.42 217.736 60.2764 237.889 63.2836 248.328C66.2908 258.767 109.31 255.539 159.37 241.119Z" stroke="#000" stroke-width="1.35766" stroke-miterlimit="10"/>
+<path d="M151.401 213.562C213.251 195.745 259.695 168.478 255.138 152.658C250.58 136.838 196.747 138.456 134.898 156.273C73.0492 174.09 26.6049 201.358 31.1622 217.178C35.7194 232.998 89.5524 231.379 151.401 213.562Z" stroke="#000" stroke-width="1.35766" stroke-miterlimit="10"/>
+</g>
+</svg>
diff --git a/dashboard/store/categories.store.ts b/dashboard/store/categories.store.ts
index 0357d938..f5e641e9 100644
--- a/dashboard/store/categories.store.ts
+++ b/dashboard/store/categories.store.ts
@@ -21,9 +21,9 @@ export const useCategoriesStore = defineStore('categories', {
if (opts?.id) {
// replace the document with the new one
const index = this.categories.findIndex(d => d.id == opts?.id);
- if (index == -1) this.categories.push(request.result);
- else this.categories[index] = { ...request.result, type: 'category' };
- } else this.categories = request.result.map((d: Category) => ({ ...d, type: 'category' }));
+ if (index == -1) this.categories.push(request.result as Category);
+ else this.categories[index] = { ...(request.result as Category), type: 'category' };
+ } else this.categories = (request.result as Category[]).map((d: Category) => ({ ...d, type: 'category' }));
resolve(this.categories);
} else reject(request.message);
});
@@ -31,7 +31,7 @@ export const useCategoriesStore = defineStore('categories', {
post(category: Category) {
return new Promise(async (resolve, reject) => {
const request = await makeRequest(`categories`, 'POST', category);
- if (request.status == 'success') resolve(this.categories.push(request.result));
+ if (request.status == 'success') resolve(this.categories.push(request.result as Category));
else reject(request.message);
});
},
diff --git a/dashboard/store/documents.store.ts b/dashboard/store/documents.store.ts
index 8b53c792..ff6144a7 100644
--- a/dashboard/store/documents.store.ts
+++ b/dashboard/store/documents.store.ts
@@ -34,12 +34,12 @@ export const useDocumentsStore = defineStore('documents', {
if (request.status == 'success') {
if (opts?.id) {
const index = this.documents.findIndex(d => d.id == opts?.id);
- const updatedDocument: Document = { ...request.result, partial: false, type: 'document' };
+ const updatedDocument: Document = { ...(request.result as Document), partial: false, type: 'document' };
if (index == -1) this.documents.push(updatedDocument);
else this.documents[index] = updatedDocument;
resolve(updatedDocument as 'id' extends keyof T ? Document : Document[]);
} else {
- this.documents = request.result.map((d: Document) => ({ ...d, partial: true, type: 'document' }));
+ this.documents = (request.result as Document[]).map((d: Document) => ({ ...d, partial: true, type: 'document' }));
resolve(this.documents as 'id' extends keyof T ? Document : Document[]);
}
} else reject(request.message);
@@ -48,7 +48,7 @@ export const useDocumentsStore = defineStore('documents', {
post(doc: Document) {
return new Promise(async (resolve, reject) => {
const request = await makeRequest('documents', 'POST', doc);
- if (request.status == 'success') resolve(this.documents.push(request.result));
+ if (request.status == 'success') resolve(this.documents.push(request.result as Document));
else reject(request.message);
});
},
diff --git a/dashboard/store/utils.ts b/dashboard/store/utils.ts
index c996fcf8..6538a102 100644
--- a/dashboard/store/utils.ts
+++ b/dashboard/store/utils.ts
@@ -1,3 +1,5 @@
+import type { Document, Category } from './db_strustures';
+
export interface APIResult<Data> {
status: 'success' | 'error';
message?: string;
@@ -9,7 +11,7 @@ export interface FetchOptions<K> {
}
export const baseUrl = import.meta.env.VITE_BASE_API?.toString() || '';
-export async function makeRequest(route: string, method: string, body: Object): Promise<APIResult<any>> {
+export async function makeRequest(route: string, method: string, body: Object): Promise<APIResult<Document | Category | Document[] | Category[]>> {
try {
const responce = await fetch(`${baseUrl}/api/v1/${route}`, {
method: method,