From 78305e7ca29d836ea56698cf6b6efc77632cc629 Mon Sep 17 00:00:00 2001 From: Vargha Csongor Date: Tue, 14 May 2024 21:52:37 +0200 Subject: [PATCH] fix configs --- frontend/src/lib/auth.ts | 7 +-- .../lib/family_tree/AddFamilyMember.svelte | 9 +-- .../lib/family_tree/AddRelationship.svelte | 7 ++- .../src/lib/family_tree/CreateProfile.svelte | 9 +-- .../src/lib/family_tree/PersonMenu.svelte | 2 + .../src/lib/family_tree/PersonNode.svelte | 19 +++--- .../src/lib/family_tree/PersonPanel.svelte | 6 +- frontend/src/routes/+page.svelte | 59 ++++++++++++++++--- frontend/svelte.config.js | 10 +++- frontend/tsconfig.json | 1 + 10 files changed, 91 insertions(+), 38 deletions(-) diff --git a/frontend/src/lib/auth.ts b/frontend/src/lib/auth.ts index 25b119d..d671ccf 100644 --- a/frontend/src/lib/auth.ts +++ b/frontend/src/lib/auth.ts @@ -1,9 +1,6 @@ -import { UserManager, WebStorageStateStore, User } from 'oidc-client-ts'; +import { UserManager, WebStorageStateStore, type User } from 'oidc-client-ts'; import { isAuthenticated, user } from './stores'; -import { - PUBLIC_ZITADEL_CLIENT_ID, - PUBLIC_ISSUER, -} from '$env/static/public'; +import { PUBLIC_ZITADEL_CLIENT_ID, PUBLIC_ISSUER } from '$env/static/public'; import { goto } from '$app/navigation'; import { browser } from '$app/environment'; diff --git a/frontend/src/lib/family_tree/AddFamilyMember.svelte b/frontend/src/lib/family_tree/AddFamilyMember.svelte index fb0aa34..967e9d6 100644 --- a/frontend/src/lib/family_tree/AddFamilyMember.svelte +++ b/frontend/src/lib/family_tree/AddFamilyMember.svelte @@ -2,7 +2,7 @@ import { PUBLIC_API_URL } from '$env/static/public'; import { setFamilyTreeNodes } from './setFamilyTreeNodes'; import { user } from '../stores'; - export let showPanel = false; + import { onMount } from 'svelte'; export let id = ''; let auth_token = ''; @@ -43,7 +43,7 @@ } }; - function handleSubmit(event) { + function handleSubmit(event: Event) { event.preventDefault(); if ( @@ -64,7 +64,6 @@ body: JSON.stringify(payload) }).then((response) => { if (response.ok) { - showPanel = false; setFamilyTreeNodes(); dialog.close(); } else { @@ -76,7 +75,9 @@ } } - $: if (dialog && showPanel) dialog.showModal(); + onMount(() => { + if (dialog) dialog.showModal(); + }); diff --git a/frontend/src/lib/family_tree/AddRelationship.svelte b/frontend/src/lib/family_tree/AddRelationship.svelte index 85f1190..a46aee8 100644 --- a/frontend/src/lib/family_tree/AddRelationship.svelte +++ b/frontend/src/lib/family_tree/AddRelationship.svelte @@ -2,7 +2,7 @@ import { PUBLIC_API_URL } from '$env/static/public'; import { setFamilyTreeNodes } from './setFamilyTreeNodes'; import { user } from '$lib/stores'; - export let showPanel = false; + import { onMount } from 'svelte'; export let id = ''; let relationship = ''; let second_person_id = ''; @@ -35,7 +35,6 @@ body: JSON.stringify(payload) }).then((response) => { if (response.ok) { - showPanel = false; setFamilyTreeNodes(); dialog.close(); } else { @@ -47,7 +46,9 @@ } } - $: if (dialog && showPanel) dialog.showModal(); + onMount(() => { + if (dialog) dialog.showModal(); + }); diff --git a/frontend/src/lib/family_tree/CreateProfile.svelte b/frontend/src/lib/family_tree/CreateProfile.svelte index 69fcc9c..5c11751 100644 --- a/frontend/src/lib/family_tree/CreateProfile.svelte +++ b/frontend/src/lib/family_tree/CreateProfile.svelte @@ -1,7 +1,7 @@ diff --git a/frontend/src/lib/family_tree/PersonMenu.svelte b/frontend/src/lib/family_tree/PersonMenu.svelte index 9d99dbd..22e5ef8 100644 --- a/frontend/src/lib/family_tree/PersonMenu.svelte +++ b/frontend/src/lib/family_tree/PersonMenu.svelte @@ -10,6 +10,8 @@ export let bottom: number | undefined; + +
import { Handle, Position, type NodeProps } from '@xyflow/svelte'; - type $$Props = NodeProps; - export let id: $$Props['id']; + export let id: NodeProps['id']; id; - export let dragHandle: $$Props['dragHandle'] = undefined; + export let dragHandle: NodeProps['dragHandle'] = undefined; dragHandle; - export let type: $$Props['type'] = undefined; + export let type: NodeProps['type'] = undefined; type; - export let selected: $$Props['selected'] = undefined; + export let selected: NodeProps['selected'] = undefined; selected; - export let width: $$Props['width'] = undefined; + export let width: NodeProps['width'] = undefined; width; - export let height: $$Props['height'] = undefined; + export let height: NodeProps['height'] = undefined; height; - export let dragging: $$Props['dragging']; + export let dragging: NodeProps['dragging']; dragging; - export let targetPosition: $$Props['targetPosition'] = undefined; + export let targetPosition: NodeProps['targetPosition'] = undefined; targetPosition; - export let sourcePosition: $$Props['sourcePosition'] = undefined; + export let sourcePosition: NodeProps['sourcePosition'] = undefined; sourcePosition; export let data = { id: '', diff --git a/frontend/src/lib/family_tree/PersonPanel.svelte b/frontend/src/lib/family_tree/PersonPanel.svelte index 99a0294..8987c5c 100644 --- a/frontend/src/lib/family_tree/PersonPanel.svelte +++ b/frontend/src/lib/family_tree/PersonPanel.svelte @@ -1,5 +1,5 @@ diff --git a/frontend/src/routes/+page.svelte b/frontend/src/routes/+page.svelte index 0720846..5b49065 100644 --- a/frontend/src/routes/+page.svelte +++ b/frontend/src/routes/+page.svelte @@ -1,7 +1,7 @@ @@ -67,9 +88,18 @@ > - {#if menu} + {#if menu != null} { + console.log('delete node'); + }} + addRelationship={() => { + if (menu) relationshipPanel = menu.id; + }} + addFamilymember={() => { + if (menu) AddFamilyMemberPanel = menu.id; + }} id={menu.id} top={menu.top} left={menu.left} @@ -77,7 +107,18 @@ bottom={menu.bottom} /> {/if} - + {#if personPanel != null} + + {/if} + {#if relationshipPanel != ''} + + {/if} + {#if AddFamilyMemberPanel != ''} + + {/if} + {#if CreateProfilePanel} + + {/if}
diff --git a/frontend/svelte.config.js b/frontend/svelte.config.js index 7aa61af..a3a56ff 100644 --- a/frontend/svelte.config.js +++ b/frontend/svelte.config.js @@ -11,7 +11,15 @@ const config = { fallback: undefined, precompress: false, strict: true - }) + }), + prerender: { + handleHttpError: ({ path, referrer, message }) => { + return { + status: 404, + html: `

${message}

Path: ${path}

Referrer: ${referrer}

` + }; + } + } } }; diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json index 2200a64..db0d346 100644 --- a/frontend/tsconfig.json +++ b/frontend/tsconfig.json @@ -12,3 +12,4 @@ }, "include": ["src/**/*", "src/node_modules", ".svelte-kit/ambient.d.ts"] // see last element } + \ No newline at end of file