Don't remember what this WIP was about

[rbdr/forum] / src / routes / __layout.svelte

diff --git a/src/routes/__layout.svelte b/src/routes/__layout.svelte
index 62881f25defb19d3752c9152263788844e2e854d..16ae5dc3f5aa535e307f8b70e65f9be974670e55 100644 (file)
--- a/src/routes/__layout.svelte
+++ b/src/routes/__layout.svelte
@@ -5,43 +5,35 @@
        import { isLoading } from 'svelte-i18n';
        import { _ } from 'svelte-i18n';
 
        import { isLoading } from 'svelte-i18n';
        import { _ } from 'svelte-i18n';
 

-       import { getForums } from '$lib/stores/forums';
+       import { forums } from '$lib/stores/forums';

 
        import ErrorBlock from '$lib/components/error_block/error_block.svelte';
        import ForumList from '$lib/components/forum_list/forum_list.svelte';
        import Header from '$lib/components/header/header.svelte';
        import Loader from '$lib/components/loader/loader.svelte';
        import Footer from '$lib/components/footer/footer.svelte';
 
        import ErrorBlock from '$lib/components/error_block/error_block.svelte';
        import ForumList from '$lib/components/forum_list/forum_list.svelte';
        import Header from '$lib/components/header/header.svelte';
        import Loader from '$lib/components/loader/loader.svelte';
        import Footer from '$lib/components/footer/footer.svelte';

-
-       $: store = getForums();
-       $: forums = $store.data;

 </script>
 
 {#if $isLoading}
        <Loader />
 {:else}
        <Header />
 </script>
 
 {#if $isLoading}
        <Loader />
 {:else}
        <Header />

-       <main>
+       <main class="col-start-2 col-span-11">

                <slot />
        </main>
                <slot />
        </main>

-       <nav title={$_('forum_list.title')}>
-               {#if $store.loading}
+       <nav
+               class="col-start-1 row-start-2 border-r border-r-black border-solid"
+               title={$_('forum_list.title')}
+       >
+               {#if $forums.loading}

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

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

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

-               {#if forums}
-                       <ForumList {forums} />
+               {#if $forums.data}
+                       <ForumList forums={$forums.data} />

                {/if}
        </nav>
        <Footer />
 {/if}
                {/if}
        </nav>
        <Footer />
 {/if}

-
-<style>
-       nav {
-               grid-column: col-start 1;
-               grid-row: 2;
-               border-right: 1px solid black;
-       }
-</style>