Merge remote-tracking branch 'upstream/main'
This commit is contained in:
		@@ -86,7 +86,7 @@
 | 
			
		||||
 | 
			
		||||
<div class="w-full">
 | 
			
		||||
	<div class="items-center grid grid-flow-row md:grid-flow-col md:w-96 gap-4">
 | 
			
		||||
		<h1 class="title text-4xl">Hardware Details</h1>
 | 
			
		||||
		<h1 class="title lg:text-3xl">Hardware Details</h1>
 | 
			
		||||
		<div class="grid lg:grid-flow-col gap-4">
 | 
			
		||||
			{#if $appSession.teamId === '0'}
 | 
			
		||||
				<button
 | 
			
		||||
@@ -103,42 +103,40 @@
 | 
			
		||||
		</div>
 | 
			
		||||
	</div>
 | 
			
		||||
	<div class="divider" />
 | 
			
		||||
	<div class="grid grid-flow-col gap-4 grid-rows-3 lg:grid-rows-1">
 | 
			
		||||
		<div class="stats stats-vertical lg:stats-horizontal w-full mb-5 bg-transparent rounded">
 | 
			
		||||
			<div class="font-bold flex lg:justify-center">Memory</div>
 | 
			
		||||
	<div class="grid grid-flow-col gap-4 grid-rows-3 justify-start lg:justify-center lg:grid-rows-1">
 | 
			
		||||
		<div class="stats stats-vertical min-w-[16rem] mb-5 rounded bg-transparent">
 | 
			
		||||
			<div class="stat">
 | 
			
		||||
				<div class="stat-title">Total</div>
 | 
			
		||||
				<div class="stat-title">Total Memory</div>
 | 
			
		||||
				<div class="stat-value text-2xl">
 | 
			
		||||
					{(usage?.memory.totalMemMb).toFixed(0)}<span class="text-sm">MB</span>
 | 
			
		||||
				</div>
 | 
			
		||||
			</div>
 | 
			
		||||
 | 
			
		||||
			<div class="stat">
 | 
			
		||||
				<div class="stat-title">Used</div>
 | 
			
		||||
				<div class="stat-title">Used Memory</div>
 | 
			
		||||
				<div class="stat-value text-2xl">
 | 
			
		||||
					{(usage?.memory.usedMemMb).toFixed(0)}<span class="text-sm">MB</span>
 | 
			
		||||
				</div>
 | 
			
		||||
			</div>
 | 
			
		||||
 | 
			
		||||
			<div class="stat">
 | 
			
		||||
				<div class="stat-title">Free</div>
 | 
			
		||||
				<div class="stat-title">Free Memory</div>
 | 
			
		||||
				<div class="stat-value text-2xl">
 | 
			
		||||
					{usage?.memory.freeMemPercentage}<span class="text-sm">%</span>
 | 
			
		||||
				</div>
 | 
			
		||||
			</div>
 | 
			
		||||
		</div>
 | 
			
		||||
 | 
			
		||||
		<div class="stats stats-vertical lg:stats-horizontal w-full mb-5 bg-transparent rounded">
 | 
			
		||||
			<div class="font-bold flex lg:justify-center">CPU</div>
 | 
			
		||||
		<div class="stats stats-vertical min-w-[20rem] mb-5 bg-transparent rounded">
 | 
			
		||||
			<div class="stat">
 | 
			
		||||
				<div class="stat-title">Total</div>
 | 
			
		||||
				<div class="stat-title">Total CPU</div>
 | 
			
		||||
				<div class="stat-value text-2xl">
 | 
			
		||||
					{usage?.cpu.count}
 | 
			
		||||
				</div>
 | 
			
		||||
			</div>
 | 
			
		||||
 | 
			
		||||
			<div class="stat">
 | 
			
		||||
				<div class="stat-title">Usage</div>
 | 
			
		||||
				<div class="stat-title">CPU Usage</div>
 | 
			
		||||
				<div class="stat-value text-2xl">
 | 
			
		||||
					{usage?.cpu.usage}<span class="text-sm">%</span>
 | 
			
		||||
				</div>
 | 
			
		||||
@@ -149,24 +147,23 @@
 | 
			
		||||
				<div class="stat-value text-2xl">{usage?.cpu.load}</div>
 | 
			
		||||
			</div>
 | 
			
		||||
		</div>
 | 
			
		||||
		<div class="stats stats-vertical lg:stats-horizontal w-full mb-5 bg-transparent rounded">
 | 
			
		||||
			<div class="font-bold flex lg:justify-center">Disk</div>
 | 
			
		||||
		<div class="stats stats-vertical min-w-[16rem] mb-5 bg-transparent rounded">
 | 
			
		||||
			<div class="stat">
 | 
			
		||||
				<div class="stat-title">Total</div>
 | 
			
		||||
				<div class="stat-title">Total Disk</div>
 | 
			
		||||
				<div class="stat-value text-2xl">
 | 
			
		||||
					{usage?.disk.totalGb}<span class="text-sm">GB</span>
 | 
			
		||||
				</div>
 | 
			
		||||
			</div>
 | 
			
		||||
 | 
			
		||||
			<div class="stat">
 | 
			
		||||
				<div class="stat-title">Used</div>
 | 
			
		||||
				<div class="stat-title">Used Disk</div>
 | 
			
		||||
				<div class="stat-value text-2xl">
 | 
			
		||||
					{usage?.disk.usedGb}<span class="text-sm">GB</span>
 | 
			
		||||
				</div>
 | 
			
		||||
			</div>
 | 
			
		||||
 | 
			
		||||
			<div class="stat">
 | 
			
		||||
				<div class="stat-title">Free</div>
 | 
			
		||||
				<div class="stat-title">Free Disk</div>
 | 
			
		||||
				<div class="stat-value text-2xl">
 | 
			
		||||
					{usage?.disk.freePercentage}<span class="text-sm">%</span>
 | 
			
		||||
				</div>
 | 
			
		||||
 
 | 
			
		||||
@@ -3,7 +3,7 @@
 | 
			
		||||
</script>
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
<svg viewBox="0 0 128 128" class={isAbsolute ? 'absolute top-0 left-0 -m-8 h-16 w-16' : 'mx-auto w-10 h-10'}>
 | 
			
		||||
<svg viewBox="0 0 128 128" class={isAbsolute ? 'absolute top-0 left-0 -m-5 h-12 w-12' : 'mx-auto w-10 h-10'}>
 | 
			
		||||
	<path d="M124.8 52.1c-4.3-2.5-10-2.8-14.8-1.4-.6-5.2-4-9.7-8-12.9l-1.6-1.3-1.4 1.6c-2.7 3.1-3.5 8.3-3.1 12.3.3 2.9 1.2 5.9 3 8.3-1.4.8-2.9 1.9-4.3 2.4-2.8 1-5.9 2-8.9 2H79V49H66V24H51v12H26v13H13v14H1.8l-.2 1.5c-.5 6.4.3 12.6 3 18.5l1.1 2.2.1.2c7.9 13.4 21.7 19 36.8 19 29.2 0 53.3-13.1 64.3-40.6 7.4.4 15-1.8 18.6-8.9l.9-1.8-1.6-1zM28 39h10v11H28V39zm13.1 44.2c0 1.7-1.4 3.1-3.1 3.1-1.7 0-3.1-1.4-3.1-3.1 0-1.7 1.4-3.1 3.1-3.1 1.7.1 3.1 1.4 3.1 3.1zM28 52h10v11H28V52zm-13 0h11v11H15V52zm27.7 50.2c-15.8-.1-24.3-5.4-31.3-12.4 2.1.1 4.1.2 5.9.2 1.6 0 3.2 0 4.7-.1 3.9-.2 7.3-.7 10.1-1.5 2.3 5.3 6.5 10.2 14 13.8h-3.4zM51 63H40V52h11v11zm0-13H40V39h11v11zm13 13H53V52h11v11zm0-13H53V39h11v11zm0-13H53V26h11v11zm13 26H66V52h11v11zM38.8 81.2c-.2-.1-.5-.2-.8-.2-1.2 0-2.2 1-2.2 2.2 0 1.2 1 2.2 2.2 2.2s2.2-1 2.2-2.2c0-.3-.1-.6-.2-.8-.2.3-.4.5-.8.5-.5 0-.9-.4-.9-.9.1-.4.3-.7.5-.8z" fill="#019BC6"></path>
 | 
			
		||||
	</svg>
 | 
			
		||||
  
 | 
			
		||||
 
 | 
			
		||||
@@ -4,6 +4,6 @@
 | 
			
		||||
 | 
			
		||||
<img
 | 
			
		||||
	alt="ghost logo"
 | 
			
		||||
	class={isAbsolute ? 'w-12 absolute top-0 left-0 -m-3 -mt-5' : 'w-8 mx-auto'}
 | 
			
		||||
	class={isAbsolute ? 'w-12 h-12 absolute top-0 left-0 -m-3 -mt-5' : 'w-8 h-8 mx-auto'}
 | 
			
		||||
	src="/ghost.png"
 | 
			
		||||
/>
 | 
			
		||||
 
 | 
			
		||||
@@ -3,7 +3,7 @@
 | 
			
		||||
</script>
 | 
			
		||||
 | 
			
		||||
<svg
 | 
			
		||||
	class={isAbsolute ? 'w-10 h-10 absolute top-0 left-0 -m-5' : 'w-8 mx-auto'}
 | 
			
		||||
	class={isAbsolute ? 'w-10 h-10 absolute top-0 left-0 -m-5' : 'w-8 h-8 mx-auto'}
 | 
			
		||||
	viewBox="0 0 81 84"
 | 
			
		||||
	fill="none"
 | 
			
		||||
	xmlns="http://www.w3.org/2000/svg"
 | 
			
		||||
 
 | 
			
		||||
@@ -4,7 +4,7 @@
 | 
			
		||||
 | 
			
		||||
<svg
 | 
			
		||||
	xmlns="http://www.w3.org/2000/svg"
 | 
			
		||||
	class={isAbsolute ? 'w-10 h-10 absolute top-0 left-0 -m-5' : 'w-8 mx-auto'}
 | 
			
		||||
	class={isAbsolute ? 'w-10 h-10 absolute top-0 left-0 -m-5' : 'w-8 h-8 mx-auto'}
 | 
			
		||||
	fill="none"
 | 
			
		||||
	viewBox="0 0 140 140"
 | 
			
		||||
	data-lt-extension-installed="true"
 | 
			
		||||
 
 | 
			
		||||
@@ -4,7 +4,7 @@
 | 
			
		||||
 | 
			
		||||
<svg
 | 
			
		||||
	viewBox="0 0 127 74"
 | 
			
		||||
	class={isAbsolute ? 'w-10 h-10 absolute top-0 left-0 -m-5' : 'w-8 mx-auto'}
 | 
			
		||||
	class={isAbsolute ? 'w-10 h-10 absolute top-0 left-0 -m-5' : 'w-8 h-8mx-auto'}
 | 
			
		||||
	xmlns="http://www.w3.org/2000/svg"
 | 
			
		||||
	><path
 | 
			
		||||
		d="M.825 73.993l23.244-59.47A21.85 21.85 0 0144.42.625h14.014L35.19 60.096a21.85 21.85 0 01-20.352 13.897H.825z"
 | 
			
		||||
 
 | 
			
		||||
@@ -4,6 +4,6 @@
 | 
			
		||||
 | 
			
		||||
<img
 | 
			
		||||
	alt="minio logo"
 | 
			
		||||
	class={isAbsolute ? 'w-7 absolute top-0 left-0 -m-3 -mt-5' : 'w-4  mx-auto'}
 | 
			
		||||
	class={isAbsolute ? 'w-7 h-12 absolute top-0 left-0 -m-3 -mt-5' : 'w-4 h-8 mx-auto'}
 | 
			
		||||
	src="/minio.png"
 | 
			
		||||
/>
 | 
			
		||||
 
 | 
			
		||||
@@ -3,6 +3,6 @@
 | 
			
		||||
</script>
 | 
			
		||||
<img
 | 
			
		||||
	alt="moodle logo"
 | 
			
		||||
	class={isAbsolute ? 'w-9 absolute top-0 left-0 -m-3 -mt-5' : 'w-8 mx-auto'}
 | 
			
		||||
	class={isAbsolute ? 'w-9 h-9 absolute top-0 left-0 -m-3 -mt-5' : 'w-8 h-8 mx-auto'}
 | 
			
		||||
	src="/moodle.png"
 | 
			
		||||
/>
 | 
			
		||||
 
 | 
			
		||||
@@ -3,7 +3,7 @@
 | 
			
		||||
</script>
 | 
			
		||||
 | 
			
		||||
<svg
 | 
			
		||||
	class={isAbsolute ? 'w-12 h-12 absolute top-0 left-0 -m-5' : 'w-8 mx-auto'}
 | 
			
		||||
	class={isAbsolute ? 'w-12 h-12 absolute top-0 left-0 -m-5' : 'w-8 h-8 mx-auto'}
 | 
			
		||||
	viewBox="0 0 220 105"
 | 
			
		||||
>
 | 
			
		||||
	<g>
 | 
			
		||||
 
 | 
			
		||||
@@ -4,6 +4,6 @@
 | 
			
		||||
 | 
			
		||||
<img
 | 
			
		||||
	alt="nocodb logo"
 | 
			
		||||
	class={isAbsolute ? 'w-10 absolute top-0 left-0 -m-5' : 'w-8 mx-auto'}
 | 
			
		||||
	class={isAbsolute ? 'w-10 h-10 absolute top-0 left-0 -m-5' : 'w-8 h-8 mx-auto'}
 | 
			
		||||
	src="/nocodb.png"
 | 
			
		||||
/>
 | 
			
		||||
 
 | 
			
		||||
@@ -7,7 +7,7 @@
 | 
			
		||||
	xmlns="http://www.w3.org/2000/svg"
 | 
			
		||||
	viewBox="0 0 856.000000 856.000000"
 | 
			
		||||
	preserveAspectRatio="xMidYMid meet"
 | 
			
		||||
	class={isAbsolute ? 'w-10 h-10 absolute top-0 left-0 -m-5' : 'w-8 mx-auto'}
 | 
			
		||||
	class={isAbsolute ? 'w-10 h-10 absolute top-0 left-0 -m-5' : 'w-8 h-8 mx-auto'}
 | 
			
		||||
>
 | 
			
		||||
	<metadata> Created by potrace 1.11, written by Peter Selinger 2001-2013 </metadata>
 | 
			
		||||
	<g
 | 
			
		||||
 
 | 
			
		||||
@@ -3,7 +3,7 @@
 | 
			
		||||
</script>
 | 
			
		||||
 | 
			
		||||
<svg
 | 
			
		||||
	class={isAbsolute ? 'w-10 h-10 absolute top-0 left-0 -m-5' : 'w-8 mx-auto'}
 | 
			
		||||
	class={isAbsolute ? 'w-10 h-10 absolute top-0 left-0 -m-5' : 'w-8 h-8mx-auto'}
 | 
			
		||||
	viewBox="0 0 128 128"
 | 
			
		||||
>
 | 
			
		||||
	<path
 | 
			
		||||
 
 | 
			
		||||
@@ -3,7 +3,7 @@
 | 
			
		||||
</script>
 | 
			
		||||
 | 
			
		||||
<svg
 | 
			
		||||
	class={isAbsolute ? 'w-10 absolute top-0 left-0 -m-5' : 'w-8 mx-auto'}
 | 
			
		||||
	class={isAbsolute ? 'w-10 h-10 absolute top-0 left-0 -m-5' : 'w-8 h-8mx-auto'}
 | 
			
		||||
	xmlns="http://www.w3.org/2000/svg"
 | 
			
		||||
	xmlns:xlink="http://www.w3.org/1999/xlink"
 | 
			
		||||
	version="1.1"
 | 
			
		||||
 
 | 
			
		||||
@@ -2,7 +2,7 @@
 | 
			
		||||
	export let isAbsolute = false;
 | 
			
		||||
</script>
 | 
			
		||||
 | 
			
		||||
<svg class={isAbsolute ? 'w-10  absolute top-0 left-0 -m-5' : 'w-8 mx-auto'} viewBox="0 0 128 128">
 | 
			
		||||
<svg class={isAbsolute ? 'w-10 h-10 absolute top-0 left-0 -m-5' : 'w-8 h-8mx-auto'} viewBox="0 0 128 128">
 | 
			
		||||
	<path
 | 
			
		||||
		fill-rule="evenodd"
 | 
			
		||||
		clip-rule="evenodd"
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user