From 2d9235070856c0a5032ddf47f7b1dc7cc5cceb60 Mon Sep 17 00:00:00 2001 From: Fuwn Date: Thu, 25 Jul 2024 00:19:44 -0700 Subject: refactor(Database): separate providers --- src/routes/+layout.svelte | 4 +--- src/routes/api/badges/+server.ts | 2 +- src/routes/api/configuration/+server.ts | 2 +- src/routes/api/events/+server.ts | 2 +- src/routes/api/events/group/+server.ts | 2 +- src/routes/api/events/groups/+server.ts | 2 +- src/routes/api/notifications/subscribe/+server.ts | 2 +- src/routes/api/notifications/unsubscribe/+server.ts | 2 +- src/routes/api/preferences/+server.ts | 2 +- src/routes/api/preferences/pin/+server.ts | 2 +- src/routes/events/group/[group]/+page.svelte | 4 ++-- src/routes/events/groups/+page.svelte | 2 +- src/routes/user/[user]/+page.svelte | 2 +- src/routes/user/[user]/badges/+page.svelte | 4 ++-- 14 files changed, 16 insertions(+), 18 deletions(-) (limited to 'src/routes') diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index e1381ff0..66f290d6 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -28,9 +28,8 @@ import settingsSyncTimes from '$stores/settingsSyncTimes'; import Announcement from '$lib/Announcement.svelte'; import Message from '$lib/Loading/Message.svelte'; - import { notifications } from '$lib/Data/AniList/notifications'; import { requestNotifications } from '$lib/Utility/notifications'; - import { database as userDatabase } from '$lib/Database/user'; + import { database as userDatabase } from '$lib/Database/IndexedDB/user'; injectSpeedInsights(); @@ -39,7 +38,6 @@ let isHeaderVisible = true; let previousScrollPosition = 0; let notificationInterval: NodeJS.Timeout | undefined = undefined; - let lastNotificationId = 0; addMessages('en', english as unknown as LocaleDictionary); addMessages('ja', japanese as unknown as LocaleDictionary); diff --git a/src/routes/api/badges/+server.ts b/src/routes/api/badges/+server.ts index 483d0b9c..7d800f4b 100644 --- a/src/routes/api/badges/+server.ts +++ b/src/routes/api/badges/+server.ts @@ -10,7 +10,7 @@ import { setShadowHidden, setShadowHiddenBadge, incrementClickCount -} from '$lib/Database/userBadges'; +} from '$lib/Database/Supabase/userBadges'; import authorisedJson from '$lib/Data/Static/authorised.json'; const unauthorised = new Response('Unauthorised', { status: 401 }); diff --git a/src/routes/api/configuration/+server.ts b/src/routes/api/configuration/+server.ts index 8b37628f..d5d3f600 100644 --- a/src/routes/api/configuration/+server.ts +++ b/src/routes/api/configuration/+server.ts @@ -3,7 +3,7 @@ import { deleteUserConfiguration, getUserConfiguration, setUserConfiguration -} from '$lib/Database/userConfiguration.js'; +} from '$lib/Database/Supabase/userConfiguration.js'; const unauthorised = new Response('Unauthorised', { status: 401 }); diff --git a/src/routes/api/events/+server.ts b/src/routes/api/events/+server.ts index 65347874..b09d4e98 100644 --- a/src/routes/api/events/+server.ts +++ b/src/routes/api/events/+server.ts @@ -1,4 +1,4 @@ -import { getEvents, getGroupEvents } from '$lib/Database/events'; +import { getEvents, getGroupEvents } from '$lib/Database/Supabase/events'; export const GET = async ({ url }) => Response.json( diff --git a/src/routes/api/events/group/+server.ts b/src/routes/api/events/group/+server.ts index b79895fd..20637de0 100644 --- a/src/routes/api/events/group/+server.ts +++ b/src/routes/api/events/group/+server.ts @@ -1,4 +1,4 @@ -import { getGroup } from '$lib/Database/groups'; +import { getGroup } from '$lib/Database/Supabase/groups'; export const GET = async ({ url }) => Response.json(await getGroup(url.searchParams.get('slug') || '')); diff --git a/src/routes/api/events/groups/+server.ts b/src/routes/api/events/groups/+server.ts index 512dde37..7ed9c344 100644 --- a/src/routes/api/events/groups/+server.ts +++ b/src/routes/api/events/groups/+server.ts @@ -1,3 +1,3 @@ -import { getGroups } from '$lib/Database/groups'; +import { getGroups } from '$lib/Database/Supabase/groups'; export const GET = async () => Response.json(await getGroups()); diff --git a/src/routes/api/notifications/subscribe/+server.ts b/src/routes/api/notifications/subscribe/+server.ts index 98bd5c4d..d7b4b6a4 100644 --- a/src/routes/api/notifications/subscribe/+server.ts +++ b/src/routes/api/notifications/subscribe/+server.ts @@ -1,5 +1,5 @@ import { userIdentity } from '$lib/Data/AniList/identity'; -import { setUserSubscription } from '$lib/Database/userNotifications'; +import { setUserSubscription } from '$lib/Database/Supabase/userNotifications'; const unauthorised = new Response('Unauthorised', { status: 401 }); diff --git a/src/routes/api/notifications/unsubscribe/+server.ts b/src/routes/api/notifications/unsubscribe/+server.ts index f122625d..0961fbad 100644 --- a/src/routes/api/notifications/unsubscribe/+server.ts +++ b/src/routes/api/notifications/unsubscribe/+server.ts @@ -1,5 +1,5 @@ import { userIdentity } from '$lib/Data/AniList/identity'; -import { deleteUserSubscription } from '$lib/Database/userNotifications'; +import { deleteUserSubscription } from '$lib/Database/Supabase/userNotifications'; const unauthorised = new Response('Unauthorised', { status: 401 }); diff --git a/src/routes/api/preferences/+server.ts b/src/routes/api/preferences/+server.ts index 37e8af29..9de8ae8e 100644 --- a/src/routes/api/preferences/+server.ts +++ b/src/routes/api/preferences/+server.ts @@ -7,7 +7,7 @@ import { toggleHideAWCBadges, togglePinnedBadgeWallCategory, setPinnedBadgeWallCategories -} from '$lib/Database/userPreferences'; +} from '$lib/Database/Supabase/userPreferences'; const unauthorised = new Response('Unauthorised', { status: 401 }); diff --git a/src/routes/api/preferences/pin/+server.ts b/src/routes/api/preferences/pin/+server.ts index 90dfce62..3b17a4ed 100644 --- a/src/routes/api/preferences/pin/+server.ts +++ b/src/routes/api/preferences/pin/+server.ts @@ -1,5 +1,5 @@ import { userIdentity } from '$lib/Data/AniList/identity'; -import { toggleHololiveStreamPinning } from '$lib/Database/userPreferences'; +import { toggleHololiveStreamPinning } from '$lib/Database/Supabase/userPreferences'; const unauthorised = new Response('Unauthorised', { status: 401 }); diff --git a/src/routes/events/group/[group]/+page.svelte b/src/routes/events/group/[group]/+page.svelte index ef920254..6cd0c8ba 100644 --- a/src/routes/events/group/[group]/+page.svelte +++ b/src/routes/events/group/[group]/+page.svelte @@ -1,6 +1,6 @@