From 72ba3a33d8a989ded2bc96b0dbd0e4fd8553d07f Mon Sep 17 00:00:00 2001 From: Fuwn Date: Sun, 11 Feb 2024 13:01:09 -0800 Subject: refactor(database): rename badges --- src/lib/Database/badges.ts | 69 ------------------------------ src/lib/Database/userBadges.ts | 69 ++++++++++++++++++++++++++++++ src/lib/websocket.ts | 2 +- src/routes/api/badges/+server.ts | 6 +-- src/routes/user/[user]/badges/+page.svelte | 2 +- 5 files changed, 74 insertions(+), 74 deletions(-) delete mode 100644 src/lib/Database/badges.ts create mode 100644 src/lib/Database/userBadges.ts (limited to 'src') diff --git a/src/lib/Database/badges.ts b/src/lib/Database/badges.ts deleted file mode 100644 index 8816ac40..00000000 --- a/src/lib/Database/badges.ts +++ /dev/null @@ -1,69 +0,0 @@ -import { databaseTimeToDate } from '$lib/Utility/time'; -import supabase from './supabase'; - -export interface Badge { - post?: string; - image?: string; - description?: string; - id?: number; - time?: string; - category?: string; -} - -export const getUserBadges = async (userId: number): Promise => { - const { data, error } = await supabase.from('user_badges').select('*').eq('user_id', userId); - - if (error) return []; - - return data.sort((a, b) => - databaseTimeToDate((a as Badge).time ?? '').getTime() > - databaseTimeToDate((b as Badge).time ?? '').getTime() - ? -1 - : 1 - ) as Badge[]; -}; - -export const addUserBadge = async (userId: number, badge: Badge) => { - const { post, image, description, time, category } = badge; - - if (post === undefined || image === undefined) return; - - if (time) { - await supabase - .from('user_badges') - .insert({ user_id: userId, post, image, description, time, category }); - } else { - await supabase - .from('user_badges') - .insert({ user_id: userId, post, image, description, category }); - } -}; - -export const removeUserBadge = async (userId: number, id: number) => { - if (!isNaN(id)) await supabase.from('user_badges').delete().eq('id', id).eq('user_id', userId); -}; - -export const updateUserBadge = async (userId: number, id: number, badge: Badge) => { - if (badge.post === undefined || badge.image === undefined) return; - - await supabase - .from('user_badges') - .update({ - post: badge.post, - image: badge.image, - description: badge.description, - category: badge.category - }) - .eq('id', id) - .eq('user_id', userId); -}; - -export const renameCategory = async (userId: number, oldName: string, newName: string) => - await supabase - .from('user_badges') - .update({ category: newName }) - .eq('category', oldName) - .eq('user_id', userId); - -export const removeAllUserBadges = async (userId: number) => - await supabase.from('user_badges').delete().eq('user_id', userId); diff --git a/src/lib/Database/userBadges.ts b/src/lib/Database/userBadges.ts new file mode 100644 index 00000000..8816ac40 --- /dev/null +++ b/src/lib/Database/userBadges.ts @@ -0,0 +1,69 @@ +import { databaseTimeToDate } from '$lib/Utility/time'; +import supabase from './supabase'; + +export interface Badge { + post?: string; + image?: string; + description?: string; + id?: number; + time?: string; + category?: string; +} + +export const getUserBadges = async (userId: number): Promise => { + const { data, error } = await supabase.from('user_badges').select('*').eq('user_id', userId); + + if (error) return []; + + return data.sort((a, b) => + databaseTimeToDate((a as Badge).time ?? '').getTime() > + databaseTimeToDate((b as Badge).time ?? '').getTime() + ? -1 + : 1 + ) as Badge[]; +}; + +export const addUserBadge = async (userId: number, badge: Badge) => { + const { post, image, description, time, category } = badge; + + if (post === undefined || image === undefined) return; + + if (time) { + await supabase + .from('user_badges') + .insert({ user_id: userId, post, image, description, time, category }); + } else { + await supabase + .from('user_badges') + .insert({ user_id: userId, post, image, description, category }); + } +}; + +export const removeUserBadge = async (userId: number, id: number) => { + if (!isNaN(id)) await supabase.from('user_badges').delete().eq('id', id).eq('user_id', userId); +}; + +export const updateUserBadge = async (userId: number, id: number, badge: Badge) => { + if (badge.post === undefined || badge.image === undefined) return; + + await supabase + .from('user_badges') + .update({ + post: badge.post, + image: badge.image, + description: badge.description, + category: badge.category + }) + .eq('id', id) + .eq('user_id', userId); +}; + +export const renameCategory = async (userId: number, oldName: string, newName: string) => + await supabase + .from('user_badges') + .update({ category: newName }) + .eq('category', oldName) + .eq('user_id', userId); + +export const removeAllUserBadges = async (userId: number) => + await supabase.from('user_badges').delete().eq('user_id', userId); diff --git a/src/lib/websocket.ts b/src/lib/websocket.ts index feaf546f..28557415 100644 --- a/src/lib/websocket.ts +++ b/src/lib/websocket.ts @@ -1,6 +1,6 @@ import type { ViteDevServer } from 'vite'; import { Server } from 'socket.io'; -import { getUserBadges } from '$lib/Database/badges'; +import { getUserBadges } from '$lib/Database/userBadges'; import { userIdentity } from '$lib/Data/AniList/identity'; export const webSocketServer = { diff --git a/src/routes/api/badges/+server.ts b/src/routes/api/badges/+server.ts index 353a158b..9cfc49fc 100644 --- a/src/routes/api/badges/+server.ts +++ b/src/routes/api/badges/+server.ts @@ -3,10 +3,10 @@ import { removeAllUserBadges, removeUserBadge, updateUserBadge, + getUserBadges, + addUserBadge, type Badge -} from '$lib/Database/badges'; -import { getUserBadges } from '$lib/Database/badges'; -import { addUserBadge } from '$lib/Database/badges'; +} from '$lib/Database/userBadges'; const unauthorised = new Response('Unauthorised', { status: 401 }); diff --git a/src/routes/user/[user]/badges/+page.svelte b/src/routes/user/[user]/badges/+page.svelte index 97623fb7..1e22a489 100644 --- a/src/routes/user/[user]/badges/+page.svelte +++ b/src/routes/user/[user]/badges/+page.svelte @@ -1,7 +1,7 @@