Use supabase

6 files changed, 39 insertions, 56 deletions

diff --git a/src/routes/__layout.svelte b/src/routes/__layout.svelte
index 0077810..16ae5dc 100644
--- a/src/routes/__layout.svelte
+++ b/src/routes/__layout.svelte
@@ -5,16 +5,13 @@
 	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';
-
-	$: store = getForums();
-	$: forums = $store.data;
 </script>
 
 {#if $isLoading}
@@ -25,17 +22,17 @@
 		<slot />
 	</main>
 	<nav
-		class="col-start-1 row-start-2 border-r-2 border-2-black border-solid"
+		class="col-start-1 row-start-2 border-r border-r-black border-solid"
 		title={$_('forum_list.title')}
 	>
-		{#if $store.loading}
+		{#if $forums.loading}
 			<Loader />
 		{/if}
-		{#if $store.error}
+		{#if $forums.error}
 			<ErrorBlock message={$_('forum_list.error.unavailable')} />
 		{/if}
-		{#if forums}
-			<ForumList {forums} />
+		{#if $forums.data}
+			<ForumList forums={$forums.data} />
 		{/if}
 	</nav>
 	<Footer />
diff --git a/src/routes/a/[id].svelte b/src/routes/a/[id].svelte
index aeca142..6f5a3db 100644
--- a/src/routes/a/[id].svelte
+++ b/src/routes/a/[id].svelte
@@ -1,8 +1,6 @@
 <script lang="ts" context="module">
 	export const load = ({
-		page: {
-			params: { id }
-		}
+    params: { id }
 	}) => ({ props: { id } });
 </script>
 
diff --git a/src/routes/f/[id].svelte b/src/routes/f/[id].svelte
index fc103d2..103e8f8 100644
--- a/src/routes/f/[id].svelte
+++ b/src/routes/f/[id].svelte
@@ -1,8 +1,6 @@
 <script lang="ts" context="module">
 	export const load = ({
-		page: {
-			params: { id }
-		}
+    params: { id }
 	}) => ({ props: { id } });
 </script>
 
@@ -14,21 +12,20 @@
 
 	export let id: string;
 
-	import { getForum } from '$lib/stores/forums';
-	$: store = getForum(id);
-	$: forum = $store.data;
+	import { forum } from '$lib/stores/forums';
+	$: response = forum(id, true);
 </script>
 
 <svelte:head>
 	<title>{$_(`forum.name.${id}`)}, {$_('forum.forum')}</title>
 </svelte:head>
 
-{#if $store.loading}
+{#if $response.loading}
 	<Loader />
 {/if}
-{#if $store.error}
+{#if $response.error}
 	<ErrorBlock message={$_('forum.error.unavailable')} />
 {/if}
-{#if forum}
-	<Forum {forum} />
+{#if $response.data}
+	<Forum forum={$response.data} />
 {/if}
diff --git a/src/routes/g/[id].svelte b/src/routes/g/[id].svelte
index 0419362..2033f14 100644
--- a/src/routes/g/[id].svelte
+++ b/src/routes/g/[id].svelte
@@ -1,33 +1,30 @@
 <script lang="ts" context="module">
 	export const load = ({
-		page: {
-			params: { id }
-		}
+    params: { id }
 	}) => ({ props: { id } });
 </script>
 
 <script lang="ts">
 	import { _ } from 'svelte-i18n';
-	import { getTag } from '$lib/stores/tags';
+	import { topicsForTag } from '$lib/stores/topics';
 	import ErrorBlock from '$lib/components/error_block/error_block.svelte';
 	import Loader from '$lib/components/loader/loader.svelte';
 	import Tag from '$lib/components/tag/tag.svelte';
 	export let id: string;
 
-	$: store = getTag(id);
-	$: tag = $store.data;
+	$: tagResponse = topicsForTag(id);
 </script>
 
 <svelte:head>
 	<title>{id}, {$_('tag.title')}</title>
 </svelte:head>
 
-{#if $store.loading}
+{#if $tagResponse.loading}
 	<Loader />
 {/if}
-{#if $store.error}
+{#if $tagResponse.error}
 	<ErrorBlock message={$_('tag.error.unavailable')} />
 {/if}
-{#if tag}
-	<Tag {tag} />
+{#if $tagResponse.data}
+	<Tag topics={$tagResponse.data} tag={id} />
 {/if}
diff --git a/src/routes/p/[id].svelte b/src/routes/p/[id].svelte
index 8efd8c1..bbf6396 100644
--- a/src/routes/p/[id].svelte
+++ b/src/routes/p/[id].svelte
@@ -1,34 +1,31 @@
 <script lang="ts" context="module">
 	export const load = ({
-		page: {
-			params: { id }
-		}
+    params: { id }
 	}) => ({ props: { id } });
 </script>
 
 <script lang="ts">
 	import { _ } from 'svelte-i18n';
-	import { getPost } from '$lib/stores/posts';
+	import { post } from '$lib/stores/posts';
 	import Post from '$lib/components/post/post.svelte';
 	import ErrorBlock from '$lib/components/error_block/error_block.svelte';
 	import Loader from '$lib/components/loader/loader.svelte';
 
 	export let id: string;
 
-	$: store = getPost(id);
-	$: post = $store.data;
+	$: postResponse = post(id, true);
 </script>
 
 <svelte:head>
 	<title>{$_('post.post')}}</title>
 </svelte:head>
 
-{#if $store.loading}
+{#if $postResponse.loading}
 	<Loader />
 {/if}
-{#if $store.error}
+{#if $postResponse.error}
 	<ErrorBlock message={$_('post.error.unavailable')} />
 {/if}
-{#if post}
-	<Post {post} />
+{#if $postResponse.data}
+	<Post post={$postResponse.data} />
 {/if}
diff --git a/src/routes/t/[id].svelte b/src/routes/t/[id].svelte
index d60946b..45cc63e 100644
--- a/src/routes/t/[id].svelte
+++ b/src/routes/t/[id].svelte
@@ -1,15 +1,13 @@
 <script lang="ts" context="module">
 	export const load = ({
-		page: {
-			params: { id }
-		}
+    params: { id }
 	}) => ({ props: { id } });
 </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';
@@ -18,31 +16,30 @@
 
 	export let id: string;
 
-	$: store = getTopic(id);
-	$: topic = $store.data;
+	$: response = topic(id, true);
 
 	enableTopicActions(id);
 	onDestroy(() => disableTopicActions());
 </script>
 
 <svelte:head>
-	{#if $store.loading}
+	{#if $response.loading}
 		<title>{$_('loader.message')}, {$_('topic.title')}</title>
 	{/if}
-	{#if $store.error}
+	{#if $response.error}
 		<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 $store.loading}
+{#if $response.loading}
 	<Loader />
 {/if}
-{#if $store.error}
+{#if $response.error}
 	<ErrorBlock message={$_('topic.error.unavailable')} />
 {/if}
-{#if topic}
-	<Topic {topic} />
+{#if $response.data}
+	<Topic topic={$response.data} />
 {/if}