Add jest for testing

[rbdr/forum] / src / routes / $layout.svelte

diff --git a/src/routes/$layout.svelte b/src/routes/$layout.svelte
index a848a59fce3f79ffc03508c3973bfc695fe1ae7b..49ceb4921851f8209a9c2dba4796631d8ff85dc3 100644 (file)
--- a/src/routes/$layout.svelte
+++ b/src/routes/$layout.svelte
@@ -1,39 +1,19 @@
 <script>
 <script>

-  import '$config/i18n';
-  import { isLoading, waitLocale } from 'svelte-i18n';
-
-  export const load = function load() {
-
-    return waitLocale;
-  };
-
-  import ForumList from '$components/forum_list/forum_list.svelte';
-  import Header from '$components/header/header.svelte';
-  import Footer from '$components/footer/footer.svelte';
+       import '$/config/i18n';
+       import { isLoading } from 'svelte-i18n';
+       import ForumList from '$/components/forum_list/forum_list.svelte';
+       import Header from '$/components/header/header.svelte';
+       import Loader from '$/components/loader/loader.svelte';
+       import Footer from '$/components/footer/footer.svelte';

 </script>
 
 {#if $isLoading}
 </script>
 
 {#if $isLoading}

-  <h1>Loading.</h1>
-  <p>Please wait.</p>
+       <Loader />

 {:else}
 {:else}

-  <Header />
-  <main>
-    <slot></slot>
-  </main>
-  <ForumList />
-  <Footer />
+       <Header />
+       <main>
+               <slot />
+       </main>
+       <ForumList />
+       <Footer />

 {/if}
 {/if}

-
-<style>
-  main {
-    grid-column: col-start 2 / span 11;
-  }
-
-  :global(#forum) {
-    display: grid;
-    font-family : 'ヒラギノ明朝 ProN' , 'Hiragino Mincho ProN' , '游明朝','游明朝体',YuMincho,'Yu Mincho' , 'ＭＳ 明朝' , 'MS Mincho' , HiraMinProN-W3 , 'TakaoEx明朝' , TakaoExMincho , 'MotoyaLCedar' , 'Droid Sans Japanese' , serif;
-    grid-template-columns: repeat(12, [col-start] 1fr);
-    grid-gap: 20px;
-    grid-auto-rows: minmax(24px, auto);
-  }
-</style>