From f19a6a65da9ace67122f7c85594ca074133a9e7e Mon Sep 17 00:00:00 2001 From: Peaceultime Date: Tue, 9 Jan 2024 18:06:43 +0100 Subject: [PATCH] Add gitea content searching and fix lots of things --- app.vue | 1 + assets/global.css | 20 +- .../{CanvasEdge.vue => CanvasEdge.client.vue} | 0 .../{CanvasNode.vue => CanvasNode.client.vue} | 18 +- ...Renderer.vue => CanvasRenderer.client.vue} | 10 +- components/content/prose/ProseA.vue | 102 +- content/.gitignore | 2 - content/.obsidian/app.json | 5 - content/.obsidian/appearance.json | 12 - content/.obsidian/canvas.json | 8 - content/.obsidian/community-plugins.json | 3 - content/.obsidian/core-plugins-migration.json | 30 - content/.obsidian/core-plugins.json | 20 - content/.obsidian/graph.json | 22 - content/.obsidian/hotkeys.json | 1 - content/.obsidian/snippets/canvas.css | 10 - content/.obsidian/snippets/style.css | 23 - content/.obsidian/templates.json | 3 - .../.obsidian/themes/AnuPpuccin/manifest.json | 7 - content/.obsidian/themes/AnuPpuccin/theme.css | 8161 ----------------- .../themes/Golden Topaz/manifest.json | 6 - .../.obsidian/themes/Golden Topaz/theme.css | 5500 ----------- .../.obsidian/themes/Typewriter/manifest.json | 7 - content/.obsidian/themes/Typewriter/theme.css | 575 -- .../1. Les règles/1. L'entrainement.md | 77 - .../1. Règles/1. Les règles/2. Les combats.md | 59 - .../1. Règles/1. Les règles/3. La magie.md | 93 - .../1. Règles/1. Les règles/4. Les Aspects.md | 35 - .../1. Les règles/5. Les spécialisations.md | 9 - .../1. Les règles/99. Annexes/La fatigue.md | 30 - .../99. Annexes/Les évolutions de valeur.canvas | 90 - .../99. Annexes/Tableau des Aspects.md | 15 - .../99. Annexes/[OLD] Les effets subis.md | 28 - .../99. Annexes/[OLD] Les types de dégâts.md | 17 - .../2. L'entrainement/Progression.canvas | 805 -- .../1. Règles/3. Les spécialisations/Arts.md | 40 - .../3. Les spécialisations/Métiers.md | 46 - .../3. Les spécialisations/Sciences.md | 55 - .../3. Les spécialisations/Sports.md | 30 - .../Template de spécialisation.md | 8 - .../2. Compendium/Armes/Armement standard.md | 107 - .../2. Compendium/Armes/Matériel moderne.md | 0 .../Armures/Protection communes.md | 22 - content/2. Compendium/Objets communs.md | 37 - .../Objets magiques/1. Communs.md | 5 - .../Objets magiques/2. Atypiques.md | 17 - .../2. Compendium/Objets magiques/3. Rares.md | 10 - .../Objets magiques/4. Légendaires.md | 8 - .../Les trouvailles des aventuriers-sages.md | 16 - content/2. Compendium/Tags.md | 66 - content/3. Bestiaire/Aspects.md | 14 - .../L'univers brisé et la grande Brèche.md | 0 content/4. Lore/La cosmogonie.md | 2 - content/4. Lore/Les Dolmes.md | 11 - .../La première guerre dolmienne.md | 0 .../La première guerre draconique.md | 0 .../La seconde guerre draconique.md | 0 content/4. Lore/Les terres d'Erina.md | 0 .../La mort de Longrisse.md | 0 .../Le dieu usurpateur.md | 0 content/99. Playground/Idées en vrac.md | 61 - content/99. Playground/Pense-bêtes.md | 23 - content/99. Playground/Substats.md | 42 - nuxt.config.ts | 9 +- pages/[...slug].vue | 1 - transformer/canvas/transformer.ts | 16 +- types/canvas.ts | 16 +- 67 files changed, 139 insertions(+), 16327 deletions(-) rename components/{CanvasEdge.vue => CanvasEdge.client.vue} (100%) rename components/{CanvasNode.vue => CanvasNode.client.vue} (76%) rename components/{CanvasRenderer.vue => CanvasRenderer.client.vue} (97%) delete mode 100644 content/.gitignore delete mode 100644 content/.obsidian/app.json delete mode 100644 content/.obsidian/appearance.json delete mode 100644 content/.obsidian/canvas.json delete mode 100644 content/.obsidian/community-plugins.json delete mode 100644 content/.obsidian/core-plugins-migration.json delete mode 100644 content/.obsidian/core-plugins.json delete mode 100644 content/.obsidian/graph.json delete mode 100644 content/.obsidian/hotkeys.json delete mode 100644 content/.obsidian/snippets/canvas.css delete mode 100644 content/.obsidian/snippets/style.css delete mode 100644 content/.obsidian/templates.json delete mode 100644 content/.obsidian/themes/AnuPpuccin/manifest.json delete mode 100644 content/.obsidian/themes/AnuPpuccin/theme.css delete mode 100644 content/.obsidian/themes/Golden Topaz/manifest.json delete mode 100644 content/.obsidian/themes/Golden Topaz/theme.css delete mode 100644 content/.obsidian/themes/Typewriter/manifest.json delete mode 100644 content/.obsidian/themes/Typewriter/theme.css delete mode 100644 content/1. Règles/1. Les règles/1. L'entrainement.md delete mode 100644 content/1. Règles/1. Les règles/2. Les combats.md delete mode 100644 content/1. Règles/1. Les règles/3. La magie.md delete mode 100644 content/1. Règles/1. Les règles/4. Les Aspects.md delete mode 100644 content/1. Règles/1. Les règles/5. Les spécialisations.md delete mode 100644 content/1. Règles/1. Les règles/99. Annexes/La fatigue.md delete mode 100644 content/1. Règles/1. Les règles/99. Annexes/Les évolutions de valeur.canvas delete mode 100644 content/1. Règles/1. Les règles/99. Annexes/Tableau des Aspects.md delete mode 100644 content/1. Règles/1. Les règles/99. Annexes/[OLD] Les effets subis.md delete mode 100644 content/1. Règles/1. Les règles/99. Annexes/[OLD] Les types de dégâts.md delete mode 100644 content/1. Règles/2. L'entrainement/Progression.canvas delete mode 100644 content/1. Règles/3. Les spécialisations/Arts.md delete mode 100644 content/1. Règles/3. Les spécialisations/Métiers.md delete mode 100644 content/1. Règles/3. Les spécialisations/Sciences.md delete mode 100644 content/1. Règles/3. Les spécialisations/Sports.md delete mode 100644 content/1. Règles/3. Les spécialisations/Template de spécialisation.md delete mode 100644 content/2. Compendium/Armes/Armement standard.md delete mode 100644 content/2. Compendium/Armes/Matériel moderne.md delete mode 100644 content/2. Compendium/Armures/Protection communes.md delete mode 100644 content/2. Compendium/Objets communs.md delete mode 100644 content/2. Compendium/Objets magiques/1. Communs.md delete mode 100644 content/2. Compendium/Objets magiques/2. Atypiques.md delete mode 100644 content/2. Compendium/Objets magiques/3. Rares.md delete mode 100644 content/2. Compendium/Objets magiques/4. Légendaires.md delete mode 100644 content/2. Compendium/Objets magiques/Spéciaux/Les trouvailles des aventuriers-sages.md delete mode 100644 content/2. Compendium/Tags.md delete mode 100644 content/3. Bestiaire/Aspects.md delete mode 100644 content/4. Lore/L'univers brisé et la grande Brèche.md delete mode 100644 content/4. Lore/La cosmogonie.md delete mode 100644 content/4. Lore/Les Dolmes.md delete mode 100644 content/4. Lore/Les guerres/La première guerre dolmienne.md delete mode 100644 content/4. Lore/Les guerres/La première guerre draconique.md delete mode 100644 content/4. Lore/Les guerres/La seconde guerre draconique.md delete mode 100644 content/4. Lore/Les terres d'Erina.md delete mode 100644 content/4. Lore/Spoilers/Spoilers/Entre la grande Brèche et l'Usurpateur/La mort de Longrisse.md delete mode 100644 content/4. Lore/Spoilers/Spoilers/Entre la grande Brèche et l'Usurpateur/Le dieu usurpateur.md delete mode 100644 content/99. Playground/Idées en vrac.md delete mode 100644 content/99. Playground/Pense-bêtes.md delete mode 100644 content/99. Playground/Substats.md diff --git a/app.vue b/app.vue index f001bdc..cba0025 100644 --- a/app.vue +++ b/app.vue @@ -2,6 +2,7 @@
+
diff --git a/assets/global.css b/assets/global.css index 3569ff9..c8a4021 100644 --- a/assets/global.css +++ b/assets/global.css @@ -71,7 +71,7 @@ --footer-display: block; } -html { +:root { /* Tooltips */ --tooltip-display: none; /* Popovers */ @@ -81,7 +81,7 @@ html { /* Obsidian Publish mobile variables */ /* --------------------------------- */ @media screen and (max-width: 750px) { - html { + :root { --popover-display: none; --input-height: 36px; } @@ -99,7 +99,7 @@ html { /* Obsidian theme variables */ /* ------------------------ */ -html { +:root { /* Animations */ --anim-duration-none: 0; --anim-duration-superfast: 70ms; @@ -487,7 +487,7 @@ html { /* Popovers - file previews */ --popover-width: 450px; --popover-height: 400px; - --popover-max-height: 70vh; + --popover-max-height: 50vh; --popover-pdf-width: 600px; --popover-pdf-height: 800px; --popover-font-size: var(--font-text-size); @@ -2825,12 +2825,18 @@ body:not(.native-scrollbars) * { max-height: var(--popover-max-height); } -.popover.hover-popover>.markdown-embed { - height: var(--popover-height); - max-height: var(--popover-max-height); +.popover.hover-popover>.markdown-embed, .popover.hover-popover>.canvas-embed { + min-height: 150px; + height: 100%; + max-height: min(var(--popover-height), var(--popover-max-height)); border: 0; padding: 0; margin: 0; + overflow: auto; +} + +.popover.hover-popover>.canvas-embed { + min-height: 350px; } .popover.hover-popover>.markdown-embed>.markdown-embed-content { diff --git a/components/CanvasEdge.vue b/components/CanvasEdge.client.vue similarity index 100% rename from components/CanvasEdge.vue rename to components/CanvasEdge.client.vue diff --git a/components/CanvasNode.vue b/components/CanvasNode.client.vue similarity index 76% rename from components/CanvasNode.vue rename to components/CanvasNode.client.vue index e77b24a..0271cf6 100644 --- a/components/CanvasNode.vue +++ b/components/CanvasNode.client.vue @@ -6,9 +6,21 @@ interface Props { zoom: number; } +function getColor(color: string): string +{ + if(props.node?.color?.startsWith('#')) + return hexToRgb(color); + else + return getComputedStyle(document.body, null).getPropertyValue('--canvas-color-' + props.node.color); +} function hexToRgb(hex: string): string { - return `${parseInt(hex.substring(1, 3), 16)}, ${parseInt(hex.substring(3, 5), 16)}, ${parseInt(hex.substring(5, 7), 16)}`; + return `${parseInt(hex.substring(1, 3), 16)},${parseInt(hex.substring(3, 5), 16)},${parseInt(hex.substring(5, 7), 16)}`; +} +function darken(rgb: string): boolean +{ + const [r, g, b] = rgb.split(','); + return (299 * parseInt(r) + 587 * parseInt(g) + 114 * parseInt(b)) / 1e3 >= 150; } const props = defineProps(); @@ -25,7 +37,7 @@ if(props.node.color !== undefined)