diff --git a/app.vue b/app.vue index 210c286..d386b6b 100644 --- a/app.vue +++ b/app.vue @@ -1,13 +1,11 @@ diff --git a/db.sqlite b/db.sqlite index 7c42625..4071325 100644 Binary files a/db.sqlite and b/db.sqlite differ diff --git a/layouts/default.vue b/layouts/default.vue index bf79388..efc7931 100644 --- a/layouts/default.vue +++ b/layouts/default.vue @@ -1,68 +1,56 @@ \ No newline at end of file diff --git a/pages/user/(automatic)/mailvalidated.vue b/pages/user/(automatic)/mailvalidated.vue index c7ff272..07a108d 100644 --- a/pages/user/(automatic)/mailvalidated.vue +++ b/pages/user/(automatic)/mailvalidated.vue @@ -3,7 +3,7 @@ d[any] - Validation de votre adresse mail
- Votre compte a été validé ! 🎉 +

Votre compte a été validé ! 🎉

diff --git a/pages/user/(automatic)/reset-password.vue b/pages/user/(automatic)/reset-password.vue index 25da817..9fb874f 100644 --- a/pages/user/(automatic)/reset-password.vue +++ b/pages/user/(automatic)/reset-password.vue @@ -5,7 +5,7 @@
- Reinitialisation de mon mot de passe +

Reinitialisation de mon mot de passe

diff --git a/pages/user/(automatic)/resetting-password.vue b/pages/user/(automatic)/resetting-password.vue index 8779c75..ef07a1d 100644 --- a/pages/user/(automatic)/resetting-password.vue +++ b/pages/user/(automatic)/resetting-password.vue @@ -5,7 +5,7 @@
- Reinitialisation de mon mot de passe +

Reinitialisation de mon mot de passe

diff --git a/pages/user/changing-password.vue b/pages/user/changing-password.vue index d6cc944..527a7ec 100644 --- a/pages/user/changing-password.vue +++ b/pages/user/changing-password.vue @@ -5,7 +5,7 @@
- Modification de mon mot de passe +

Modification de mon mot de passe

diff --git a/pages/user/login.vue b/pages/user/login.vue index a42e1d0..e3f234c 100644 --- a/pages/user/login.vue +++ b/pages/user/login.vue @@ -5,7 +5,7 @@
- Connexion +

Connexion

diff --git a/pages/user/profile.vue b/pages/user/profile.vue index 75d4cf5..f0b2da4 100644 --- a/pages/user/profile.vue +++ b/pages/user/profile.vue @@ -38,8 +38,8 @@ async function deleteUser()
- {{ user.username }} - {{ user.email }} +

{{ user.username }}

+

{{ user.email }}

- Inscription +

Inscription

diff --git a/shared/canvas.util.ts b/shared/canvas.util.ts index d64051b..8344631 100644 --- a/shared/canvas.util.ts +++ b/shared/canvas.util.ts @@ -8,6 +8,71 @@ import { preview } from "#shared/proses"; import { SpatialGrid } from "#shared/physics.util"; import type { CanvasPreferences } from "~/types/general"; +/* + +stroke-light-red +stroke-light-orange +stroke-light-yellow +stroke-light-green +stroke-light-cyan +stroke-light-purple +dark:stroke-dark-red +dark:stroke-dark-orange +dark:stroke-dark-yellow +dark:stroke-dark-green +dark:stroke-dark-cyan +dark:stroke-dark-purple +fill-light-red +fill-light-orange +fill-light-yellow +fill-light-green +fill-light-cyan +fill-light-purple +dark:fill-dark-red +dark:fill-dark-orange +dark:fill-dark-yellow +dark:fill-dark-green +dark:fill-dark-cyan +dark:fill-dark-purple +bg-light-red +bg-light-orange +bg-light-yellow +bg-light-green +bg-light-cyan +bg-light-purple +dark:bg-dark-red +dark:bg-dark-orange +dark:bg-dark-yellow +dark:bg-dark-green +dark:bg-dark-cyan +dark:bg-dark-purple +border-light-red +border-light-orange +border-light-yellow +border-light-green +border-light-cyan +border-light-purple +dark:border-dark-red +dark:border-dark-orange +dark:border-dark-yellow +dark:border-dark-green +dark:border-dark-cyan +dark:border-dark-purple +outline-light-red +outline-light-orange +outline-light-yellow +outline-light-green +outline-light-cyan +outline-light-purple +dark:outline-dark-red +dark:outline-dark-orange +dark:outline-dark-yellow +dark:outline-dark-green +dark:outline-dark-cyan +dark:outline-dark-purple + +*/ + export type Direction = 'bottom' | 'top' | 'left' | 'right'; export type Position = { x: number, y: number }; export type Box = Position & { width: number, height: number }; @@ -417,6 +482,8 @@ export class Canvas ]), ]), this.transform, ]); + + console.log(this.nodes.length, this.edges.length); } protected computeLimits() @@ -467,11 +534,11 @@ export class Canvas this.firstX = pos.x; this.firstY = pos.y; - window.addEventListener('mouseup', dragEnd, { passive: true }); - window.addEventListener('mousemove', dragMove, { passive: true }); + window.addEventListener('mouseup', dragEnd); + window.addEventListener('mousemove', dragMove); this.dragStart(e); - }, { passive: true }); + }); this.container.addEventListener('wheel', (e) => { if((this._zoom >= Canvas.maxZoom && e.deltaY < 0) || (this._zoom <= this.containZoom && e.deltaY > 0)) return; @@ -490,10 +557,10 @@ export class Canvas this.lastDistance = distance(e.touches); } - this.container.addEventListener('touchend', touchend, { passive: true }); - this.container.addEventListener('touchcancel', touchcancel, { passive: true }); - this.container.addEventListener('touchmove', touchmove, { passive: true }); - }, { passive: true }); + this.container.addEventListener('touchend', touchend); + this.container.addEventListener('touchcancel', touchcancel); + this.container.addEventListener('touchmove', touchmove); + }); const touchend = (e: TouchEvent) => { if(e.touches.length > 1) { diff --git a/shared/character.util.ts b/shared/character.util.ts index 1763587..e5a3c40 100644 --- a/shared/character.util.ts +++ b/shared/character.util.ts @@ -406,7 +406,7 @@ export class CharacterCompiler if(feature.action === 'add' && !this._result.lists[feature.list]!.includes(feature.item)) this._result.lists[feature.list]!.push(feature.item); else if(feature.action === 'remove') - this._result.lists[feature.list] = this._result.lists[feature.list]!.splice(this._result.lists[feature.list]!.findIndex((e: string) => e !== feature.item), 1); + this._result.lists[feature.list]!.splice(this._result.lists[feature.list]!.findIndex((e: string) => e === feature.item), 1); return; case "value": @@ -443,7 +443,7 @@ export class CharacterCompiler if(feature.action === 'remove' && !this._result.lists[feature.list]!.includes(feature.item)) this._result.lists[feature.list]!.push(feature.item); else if(feature.action === 'add') - this._result.lists[feature.list] = this._result.lists[feature.list]!.splice(this._result.lists[feature.list]!.findIndex((e: string) => e !== feature.item), 1) + this._result.lists[feature.list]!.splice(this._result.lists[feature.list]!.findIndex((e: string) => e === feature.item), 1) return; case "value": @@ -1233,7 +1233,7 @@ export class CharacterSheet { user: ComputedRef; character?: CharacterCompiler; - container: HTMLElement = div(); + container: HTMLElement = div('flex flex-1 h-full w-full items-start justify-center'); tabs?: HTMLDivElement & { refresh: () => void }; constructor(id: string, user: ComputedRef) { @@ -1296,8 +1296,8 @@ export class CharacterSheet div('flex flex-col gap-2', [ span('text-lg font-bold', 'Notes privés'), div('border border-light-35 dark:border-dark-35 p-1', [ privateNotes.dom ]) ]), ]) ] }, - ], { focused: 'abilities', class: { container: 'flex-1 gap-4 px-4 w-[960px]' } }); - this.container.replaceChildren(div('flex flex-col justify-center gap-1', [ + ], { focused: 'abilities', class: { container: 'flex-1 gap-4 px-4 w-[960px] h-full', content: 'overflow-auto' } }); + this.container.replaceChildren(div('flex flex-col justify-start gap-1 h-full', [ div("flex flex-row gap-4 justify-between", [ div(), @@ -1420,7 +1420,7 @@ export class CharacterSheet ]), ]), - div("flex flex-1 flex-row items-stretch justify-center py-2 gap-4", [ + div("flex flex-1 flex-row items-stretch justify-center py-2 gap-4 h-0", [ div("flex flex-col gap-4 py-1 w-60", [ div("flex flex-col py-1 gap-4", [ div("flex flex-row items-center justify-center gap-4", [