Don't remember what this WIP was about

[rbdr/forum] / src / routes / t / [id].svelte

diff --git a/src/routes/t/[id].svelte b/src/routes/t/[id].svelte
index e04f473a001375f5ea6506db5e2133fe5f5db6f2..b7a067bce35b8ace1fd0c88a04dc7c41e073ff0f 100644 (file)
--- a/src/routes/t/[id].svelte
+++ b/src/routes/t/[id].svelte
@@ -1,48 +1,43 @@
 <script lang="ts" context="module">
 <script lang="ts" context="module">

-       export const load = ({
-               page: {
-                       params: { id }
-               }
-       }) => ({ props: { id } });
+       export const load = ({ params: { id } }) => ({ props: { id } });

 </script>
 
 <script lang="ts">
        import { onDestroy } from 'svelte';
        import { _ } from 'svelte-i18n';
 </script>
 
 <script lang="ts">
        import { onDestroy } from 'svelte';
        import { _ } from 'svelte-i18n';

-       import { getTopic } from '$lib/stores/topics';
+       import { topic } from '$lib/stores/topics';

        import { disableTopicActions, enableTopicActions } from '$lib/stores/actions';
 
        import Topic from '$lib/components/topic/topic.svelte';
        import ErrorBlock from '$lib/components/error_block/error_block.svelte';
        import Loader from '$lib/components/loader/loader.svelte';
 
        import { disableTopicActions, enableTopicActions } from '$lib/stores/actions';
 
        import Topic from '$lib/components/topic/topic.svelte';
        import ErrorBlock from '$lib/components/error_block/error_block.svelte';
        import Loader from '$lib/components/loader/loader.svelte';
 

-       export let id;
+       export let id: string;

 
 

-       $: store = getTopic(id);
-       $: topic = $store.data;
+       $: response = topic(id, true);

 
        enableTopicActions(id);
        onDestroy(() => disableTopicActions());
 </script>
 
 <svelte:head>
 
        enableTopicActions(id);
        onDestroy(() => disableTopicActions());
 </script>
 
 <svelte:head>

-       {#if $store.loading}
+       {#if $response.loading}

                <title>{$_('loader.message')}, {$_('topic.title')}</title>
        {/if}
                <title>{$_('loader.message')}, {$_('topic.title')}</title>
        {/if}

-       {#if $store.error}
+       {#if $response.error}

                <title>{$_('error.generic.title')}, {$_('topic.title')}</title>
        {/if}
                <title>{$_('error.generic.title')}, {$_('topic.title')}</title>
        {/if}

-       {#if topic}
-               <title>{topic.title}, {$_('topic.title')}</title>
+       {#if $response.data}
+               <title>{$response.data.title}, {$_('topic.title')}</title>

        {/if}
 </svelte:head>
 
        {/if}
 </svelte:head>
 

-{#if $store.loading}
+{#if $response.loading}

        <Loader />
 {/if}
        <Loader />
 {/if}

-{#if $store.error}
+{#if $response.error}

        <ErrorBlock message={$_('topic.error.unavailable')} />
 {/if}
        <ErrorBlock message={$_('topic.error.unavailable')} />
 {/if}

-{#if topic}
-       <Topic {topic} />
+{#if $response.data}
+       <Topic topic={$response.data} />

 {/if}
 {/if}