Merge branch 'dev' of https://git.peaceultime.com/Peaceultime/obsidian-visualiser into dev

components/MarkdownRenderer.vue

@@ -20,6 +20,7 @@ import ProseImg from '~/components/prose/ProseImg.vue';
 import ProseUl from '~/components/prose/ProseUl.vue';
 import ProseOl from '~/components/prose/ProseOl.vue';
 import ProseLi from '~/components/prose/ProseLi.vue';
+import ProseSmall from './prose/ProseSmall.vue';
 import ProseStrong from '~/components/prose/ProseStrong.vue';
 import ProseTable from '~/components/prose/ProseTable.vue';
 import ProseTag from '~/components/prose/ProseTag.vue';
@@ -49,6 +50,7 @@ const proseList = {
     "ul": ProseUl,
     "ol": ProseOl,
     "li": ProseLi,
+    "small": ProseSmall,
     "strong": ProseStrong,
     "table": ProseTable,
     "tag": ProseTag,

components/prose/ProseP.vue

@@ -1,12 +1,3 @@
 <template>
   <p><slot /></p>
 </template>
-
-<style>
-.text-comment
-{
-  @apply text-light-50;
-  @apply dark:text-dark-50;
-  @apply text-sm;
-}
-</style>

components/prose/ProseSmall.vue

@@ -0,0 +1,5 @@
+<template>
+    <small class="text-light-60 dark:text-dark-60 text-sm italic">
+        <slot />
+    </small>
+</template>

nuxt.config.ts

@@ -160,7 +160,7 @@ export default defineNuxtConfig({
     defaults: {
       nuxtLink: {
         prefetchOn: {
-          interaction: true,
+          interaction: false,
           visibility: false,
         }
       }

server/api/file/content/[path].get.ts

@@ -29,11 +29,18 @@ export default defineEventHandler(async (e) => {
             setResponseStatus(e, 404);
             return;
         }
-        if(session && session.user && content.private && session.user.id !== content.owner)
+        if(session && session.user && session.user.id !== content.owner)
+        {
+            if(content.private)
             {
                 setResponseStatus(e, 404);
                 return;
             }
+            else
+            {
+                content.content = content.content.replace(/%%(.+)%%/g, "");
+            }
+        }
         if(query.type === 'view')
         {
             db.update(explorerContentTable).set({ visit: content.visit + 1 }).where(eq(explorerContentTable.path, path)).run();
@@ -43,6 +50,11 @@ export default defineEventHandler(async (e) => {
             content.content = convertFromStorableLinks(content.content);
         }
 
+        if(session && session.user && session.user.id !== content.owner)
+        {
+            content.content = content.content.replace(/%%(.+)%%/g, "");
+        }
+
         return { content: content.content };
     }
     

server/api/file/overview/[path].get.ts

@@ -20,8 +20,6 @@ export default defineEventHandler(async (e) => {
         'type': explorerContentTable.type,
         'navigable': explorerContentTable.navigable,
         'private': explorerContentTable.private,
-        'order': explorerContentTable.order,
-        'visit': explorerContentTable.visit,
     }).from(explorerContentTable).where(eq(explorerContentTable.path, sql.placeholder('path'))).prepare().get({ path });
 
     if(content !== undefined)
@@ -39,7 +37,11 @@ export default defineEventHandler(async (e) => {
             return;
         }
         
-        return content;
+        return { path: content.path,
+            owner: content.owner,
+            title: content.title,
+            type: content.type,
+        };
     }
     
     setResponseStatus(e, 404);

server/components/mail/base.vue

@@ -1,8 +1,8 @@
 <template>
     <div style='margin-left: auto; margin-right: auto; width: 75%; font-family: ui-sans-serif, system-ui, sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji"; font-size: 1rem; line-height: 1.5rem; color: #171717;'>
         <div style="margin-left: auto; margin-right: auto; text-align: center;">
-            <a href="https://obsidian.peaceultime.com">
-                <img src="https://obsidian.peaceultime.com/logo.light.png" alt="Logo" title="d[any] logo" width="64" height="64" style="display: block; height: 4rem; width: 4rem; margin-left: auto; margin-right: auto;" />
+            <a href="https://d-any.com">
+                <img src="https://d-any.com/logo.light.png" alt="Logo" title="d[any] logo" width="64" height="64" style="display: block; height: 4rem; width: 4rem; margin-left: auto; margin-right: auto;" />
                 <span style="margin-inline-end: 1rem; font-size: 1.5rem; line-height: 2rem; font-weight: 700; font-family: 'Lucida Sans', 'Lucida Sans Regular', 'Lucida Grande', 'Lucida Sans Unicode', Geneva, Verdana, sans-serif;">d[any]</span>
             </a>
         </div>

server/components/mail/registration.vue

@@ -3,12 +3,12 @@
         <p style="font-variant: small-caps; margin-bottom: 1rem; font-size: 1.25rem; line-height: 1.75rem;">Bienvenue sur d[any], <span>{{ username }}</span>.</p>
         <p>Nous vous invitons à valider votre compte afin de profiter de toutes les fonctionnalités de d[any].</p>
         <div style="padding-top: 1rem; padding-bottom: 1rem; text-align: center;">
-            <a :href="`https://obsidian.peaceultime.com/user/mailvalidation?u=${id}&t=${timestamp}&h=${hash}`" target="_blank"><span style="display: inline-block; border-width: 1px; border-color: #525252; background-color: #e5e5e5; padding-left: 0.75rem; padding-right: 0.75rem; padding-top: 0.25rem; padding-bottom: 0.25rem; font-weight: 200; color: #171717; text-decoration: none;">Je valide mon compte</span></a>
+            <a :href="`https://d-any.com/user/mailvalidation?u=${id}&t=${timestamp}&h=${hash}`" target="_blank"><span style="display: inline-block; border-width: 1px; border-color: #525252; background-color: #e5e5e5; padding-left: 0.75rem; padding-right: 0.75rem; padding-top: 0.25rem; padding-bottom: 0.25rem; font-weight: 200; color: #171717; text-decoration: none;">Je valide mon compte</span></a>
             <span style="display: block; padding-top: 0.5rem; font-size: 0.75rem; line-height: 1rem;">Ce lien est valable 1 heure.</span>
         </div>
         <div>
             <span>Vous pouvez egalement copier le lien suivant pour valider votre compte: </span>
-            <pre style="display: inline-block; border-bottom-width: 1px; font-size: 0.75rem; line-height: 1rem; color: #171717; font-weight: 400; text-decoration: none;">{{ `https://obsidian.peaceultime.com/user/mailvalidation?u=${id}&t=${timestamp}&h=${hash}` }}</pre>
+            <pre style="display: inline-block; border-bottom-width: 1px; font-size: 0.75rem; line-height: 1rem; color: #171717; font-weight: 400; text-decoration: none;">{{ `https://d-any.com/user/mailvalidation?u=${id}&t=${timestamp}&h=${hash}` }}</pre>
         </div>
     </div>
 </template>