Merge pull request #84 from K97i/v2-modal-clickless

Add modals with no expanded content (and fix stuff from prev prs lol)

Author: zleyyij

new/apps/web/src/lib/common/ModalWidget.svelte

@@ -20,18 +20,27 @@
 	let moreInfoExpanded = $state(false);
 </script>
 
-<button
-	onclick={() => {
-			modalExpanded = true;
-		}}
-	class="_widget">
-	<h1>{title}</h1>
-	<div class="widget-values">
-			{@render widgetContents()}
+{#if modalContents}
+	<button
+		onclick={() => {
+				modalExpanded = true;
+			}}
+		class="_widget">
+		<h1>{title}</h1>
+		<div class="widget-values">
+				{@render widgetContents()}
+		</div>
+	</button>
+{:else}
+	<div class="_widget">
+		<h1>{title}</h1>
+		<div class="widget-values">
+				{@render widgetContents()}
+		</div>
 	</div>
-</button>
+{/if}
 
-{#if modalExpanded}
+{#if modalContents && modalExpanded}
 <span class="backdrop" onclick={() => {modalExpanded = false}} role="none">
 </span>
 <div class="_modal">

new/apps/web/src/lib/components/Widgets.svelte

@@ -19,15 +19,15 @@
 </script>
 
 <div class="widgets">
-	<Cpu cpu={report.Hardware.Cpu} />
+	<Cpu cpu={report.Hardware.Cpu} cpuMoreInfo={cpuMoreInfo}/>
 	<Motherboard
 		tpm={report.Security.Tpm}
 		motherboard={report.Hardware.Motherboard}
 		bios={report.Hardware.BiosInfo}
 	/>
 	<Ram ram={report.Hardware.Ram} pagefile={report.System.PageFile}/>
 	<Gpu gpus={report.Hardware.Gpu} monitors={report.Hardware.Monitors} />
-	<Nic nic={report.Network.Adapters} />
+	<Nic nics={report.Network.Adapters} />
 	<!--
 	<OS securityData={rawJSON.Security} basicinfoData={rawJSON.BasicInfo} />
 -->

new/apps/web/src/routes/+page.server.ts

@@ -44,7 +44,7 @@ async function cpuLookup(cpu: CpuInfo): Response {
 
 	if (!response) {
 		response = await (
-			await fetch(`https://spec-ifygoon.com/api/cpus/?name=${encodeURIComponent(cpu.Name)}`, {
+			await fetch(`https://spec-ify.com/api/cpus/?name=${encodeURIComponent(cpu.Name)}`, {
 				method: 'GET',
 				mode: 'cors'
 			})