-import { store } from './apollo';
-import { GET_FORUM, GET_FORUMS } from '$lib/data/queries';
+import { createClient } from '@supabase/supabase-js';
+import { single, collection } from './supabase';
+import { supabase } from '$lib/config/config';
-export const getForum = (id: string) => store({ key: 'forum', query: GET_FORUM, variables: { id } });
-export const getForums = () => store({ key: 'forums', query: GET_FORUMS, initialValue: [] });
+import type { Forum } from '$lib/data/types';
+
+const client = createClient(supabase.url, supabase.key);
+
+export const forum = (id: string, withTopics = false) =>
+ single<Forum>(
+ client
+ .from('forums')
+ .select(
+ withTopics
+ ? `*,
+ topics (
+ *
+ )
+ `
+ : '*'
+ )
+ .eq('id', id),
+ null
+ );
+export const forums = collection<Forum>(client.from('forums').select('*'), []);