Merge pull request #235 from ThatGravyBoat/fix/misc-fixes

Fix: Miscellaneous changes/fixes

Author: LynithDev

apps/frontend/src/assets/logos/curseforge.svg

@@ -8,7 +8,7 @@ type PlayerHeadProps = JSX.IntrinsicElements['img'] & {
 };
 
 function crafatar(uuid: string) {
-	return `https://crafatar.com/avatars/${uuid}?size=48`;
+	return `https://crafatar.com/avatars/${uuid}?size=48&overlay`;
 }
 
 function PlayerHead(props: PlayerHeadProps) {

apps/frontend/src/ui/components/game/PlayerHead.tsx

@@ -127,7 +127,7 @@ export type ModalProps = {
 
 function Modal(props: ModalProps) {
 	return (
-		<div class="min-w-xs flex flex-col gap-y-2 border border-white/5 rounded-lg bg-page p-4 text-center" ref={mergeRefs(props.ref)}>
+		<div class="min-w-md flex flex-col gap-y-2 border border-white/5 rounded-lg bg-page p-4 text-center" ref={mergeRefs(props.ref)}>
 			{props.children}
 		</div>
 	);

apps/frontend/src/ui/components/overlay/Modal.tsx

@@ -19,7 +19,7 @@ export type PopupProps = Omit<Parameters<typeof Portal>[0], 'children'> & Parent
 function Popup(props: PopupProps) {
 	let popupRef!: HTMLDivElement;
 
-	function onMouseDown(e: MouseEvent) {
+	function onClick(e: MouseEvent) {
 		e.stopPropagation();
 		if (!popupRef || !props.visible())
 			return;
@@ -31,9 +31,9 @@ function Popup(props: PopupProps) {
 
 	createEffect(() => {
 		if (props.visible())
-			document.addEventListener('mousedown', onMouseDown);
+			document.addEventListener('click', onClick);
 		else
-			document.removeEventListener('mousedown', onMouseDown);
+			document.removeEventListener('click', onClick);
 	});
 
 	return (

apps/frontend/src/ui/components/overlay/Popup.tsx

@@ -18,17 +18,6 @@ export function NotificationProvider(props: ParentProps) {
 	let unlisten: UnlistenFn | undefined;
 
 	onMount(() => {
-		document.addEventListener('keypress', (e) => {
-			if (e.key === 'n')
-				setNotifications(notifications => ({
-					...notifications,
-					[Math.random().toString()]: {
-						title: 'Test',
-						message: 'This is a test notification',
-					},
-				}));
-		});
-
 		events.ingressPayload.listen((e) => {
 			setNotifications(notifications => ({
 				...notifications,

apps/frontend/src/ui/hooks/useNotifications.tsx

@@ -9,11 +9,13 @@ import useCommand, { tryResult } from '~ui/hooks/useCommand';
 import useSettings from '~ui/hooks/useSettings';
 import { join } from 'pathe';
 import { createEffect, createSignal, For, Show, untrack } from 'solid-js';
+import useNotifications from "~ui/hooks/useNotifications.tsx";
 
 function ClusterLogs() {
 	const [cluster] = useClusterContext();
 	const [logs] = useCommand(() => bridge.commands.getClusterLogs(cluster()!.uuid));
 	const { settings } = useSettings();
+	const notifications = useNotifications();
 
 	const [activeLogFile, setActiveLogFile] = createSignal<string | null>(null);
 	const [logContent, setLogContent] = createSignal<string | null>(null);
@@ -46,7 +48,11 @@ function ClusterLogs() {
 			return;
 
 		const id = await tryResult(() => bridge.commands.uploadLog(cluster()!.uuid, log));
-		open(`https://mclo.gs/${id}`);
+
+		open(`https://mclo.gs/${id}`).then(() => notifications.set("logs", {
+			title: "Log Uploaded",
+			message: "Opening in your browser."
+		}));
 	}
 
 	const missingLogs = () => logs() === undefined || logs()?.length === 0 || false;

apps/frontend/src/ui/pages/cluster/ClusterLogs.tsx

@@ -15,14 +15,16 @@ export const configuredXss: FilterXSS = new FilterXSS({
 		kbd: ['id'],
 		input: ['checked', 'disabled', 'type'],
 		iframe: ['width', 'height', 'allowfullscreen', 'frameborder', 'start', 'end'],
-		img: [...(whiteList.img || []), 'usemap', 'style'],
+		img: [...(whiteList.img || []), 'usemap', 'style', 'align'],
 		map: ['name'],
 		area: [...(whiteList.a || []), 'coords'],
 		a: [...(whiteList.a || []), 'rel'],
 		td: [...(whiteList.td || []), 'style'],
 		th: [...(whiteList.th || []), 'style'],
 		picture: [],
 		source: ['media', 'sizes', 'src', 'srcset', 'type'],
+		p: [...(whiteList.p || []), 'align'],
+		div: [...(whiteList.p || []), 'align'],
 
 		// Other
 		center: [],