From 6913f7bdf58f4b1a3d3ac71281e4fd9230e7afb3 Mon Sep 17 00:00:00 2001 From: Azalea <22280294+hykilpikonna@users.noreply.github.com> Date: Tue, 5 Mar 2024 18:21:32 -0500 Subject: [PATCH] [F] Fix types #21 --- AquaNet/src/libs/config.ts | 5 ++++- AquaNet/src/libs/generalTypes.ts | 1 + AquaNet/src/libs/ui.ts | 9 +++------ 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/AquaNet/src/libs/config.ts b/AquaNet/src/libs/config.ts index 74a8477e..c7f9eb0a 100644 --- a/AquaNet/src/libs/config.ts +++ b/AquaNet/src/libs/config.ts @@ -1,6 +1,7 @@ export const AQUA_HOST = 'https://aquanet.example.com/aqua' export const DATA_HOST = 'https://aquanet.example.com' +export const IMG_HOST = 'https://aquadx.net/user-uploads' // This will be displayed for users to connect from the client export const AQUA_CONNECTION = 'aqua.example.com' @@ -10,4 +11,6 @@ export const DISCORD_INVITE = 'https://discord.gg/FNgveqFF7s' // UI export const FADE_OUT = { duration: 200 } -export const FADE_IN = { delay: 400 } \ No newline at end of file +export const FADE_IN = { delay: 400 } +export const DEFAULT_PFP = "/assets/imgs/no_profile.png" + diff --git a/AquaNet/src/libs/generalTypes.ts b/AquaNet/src/libs/generalTypes.ts index 3565e2de..8f531a35 100644 --- a/AquaNet/src/libs/generalTypes.ts +++ b/AquaNet/src/libs/generalTypes.ts @@ -21,6 +21,7 @@ export interface UserMe { regTime: number profileLocation: string profileBio: string + profilePicture: string emailConfirmed: boolean ghostCard: Card cards: Card[] diff --git a/AquaNet/src/libs/ui.ts b/AquaNet/src/libs/ui.ts index 01abddf4..4882068c 100644 --- a/AquaNet/src/libs/ui.ts +++ b/AquaNet/src/libs/ui.ts @@ -13,6 +13,7 @@ import moment from 'moment/moment' import CalHeatmap from 'cal-heatmap' // @ts-expect-error Cal-heatmap does not have proper types import CalTooltip from 'cal-heatmap/plugins/Tooltip' +import { DEFAULT_PFP } from "./config"; export function title(t: string) { document.title = `AquaNet - ${t}` @@ -98,9 +99,5 @@ export const CHARTJS_OPT: ChartOptions<'line'> = { }, } -export const pfpNotFound = (e: Event) => { - (e.target as HTMLImageElement).src = "/assets/imgs/no_profile.png" -} -export const coverNotFound = (e: Event) => { - (e.target as HTMLImageElement).src = "/assets/imgs/no_cover.jpg" -} +export const pfpNotFound = (e: Event) => (e.target as HTMLImageElement).src = DEFAULT_PFP +export const coverNotFound = (e: Event) => (e.target as HTMLImageElement).src = "/assets/imgs/no_cover.jpg"