remove some components to lib

greymass · Oct 28, 2024 · 0d6d938 · 0d6d938
1 parent d250651
commit 0d6d938
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 40 deletions.
diff --git a/src/lib/assets/title-icon-back.svg b/src/lib/assets/title-icon-back.svg
diff --git a/...count)/resources/components/cpunet.svelte → ...components/elements/cpunetresource.svelte b/...count)/resources/components/cpunet.svelte → ...components/elements/cpunetresource.svelte
@@ -19,7 +19,7 @@
 		<div class="absolute right-3 top-3 text-xl font-bold">CPU</div>
 		<div class="absolute bottom-2 right-3">
 			<h5 class="h5 text-right">{cpuAvailable.toFixed(precision)} ms</h5>
-			<p>Usage Available</p>
+			<p>Available</p>
 		</div>
 	</div>
 	<div class="relative h-[103px] flex-1 rounded-r-lg bg-[#303338]">
@@ -29,7 +29,7 @@
 		<div class="absolute right-4 top-3 text-xl font-bold">NET</div>
 		<div class="absolute bottom-2 right-4">
 			<h5 class="h5 text-right">{netAvailable.toFixed(precision)} kb</h5>
-			<p>Usage Available</p>
+			<p>Available</p>
 		</div>
 	</div>
 </div>
diff --git a/...(account)/resources/components/ram.svelte → ...ib/components/elements/ramresource.svelte b/...(account)/resources/components/ram.svelte → ...ib/components/elements/ramresource.svelte
@@ -14,6 +14,6 @@
 	<div class="absolute right-3 top-3 text-xl font-bold">RAM</div>
 	<div class="absolute bottom-2 right-3">
 		<h5 class="h5 text-right">{ramAvailable.toFixed(precision)} kb</h5>
-		<p>Usage Available</p>
+		<p>Available</p>
 	</div>
 </div>
diff --git a/src/routes/[network]/(account)/resources/+layout.svelte b/src/routes/[network]/(account)/resources/+layout.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { page } from '$app/stores';
-	import BackIcon from '$lib/assets/title-icon-back.svg';
+	import { ChevronLeft } from 'lucide-svelte';
 
 	import Stack from '$lib/components/layout/stack.svelte';
 	import Pageheader from '$lib/components/pageheader.svelte';
@@ -28,7 +28,7 @@
 				href="/{data.network}/resources"
 				class="flex size-11 items-center justify-center rounded-full bg-[#303338] text-center"
 			>
-				<img src={BackIcon} alt="BackIcon" />
+				<ChevronLeft class="size-7 text-skyBlue-500" />
 			</a>
 		{/if}
 		<Pageheader title="Resources" {subtitle} />

diff --git a/src/routes/[network]/(account)/resources/+page.svelte b/src/routes/[network]/(account)/resources/+page.svelte
@@ -4,8 +4,8 @@
 	import CpuIcon from '$lib/assets/resources/cpu.svg';
 	import NetIcon from '$lib/assets/resources/net.svg';
 	import RamIcon from '$lib/assets/resources/ram.svg';
-	import CpuAndNetOverview from './components/cpunet.svelte';
-	import RamOverview from './components/ram.svelte';
+	import CpuAndNetResource from '$lib/components/elements/cpunetresource.svelte';
+	import RamResource from '$lib/components/elements/ramresource.svelte';
 	import { calAvailableSize } from './utils';
 
 	import type { UnicoveContext } from '$lib/state/client.svelte';
@@ -74,7 +74,7 @@
 >
 	<Stack class="max-w-lg flex-1 gap-9">
 		<Stack>
-			<CpuAndNetOverview
+			<CpuAndNetResource
 				cpuAvailable={cpuAvailableSize}
 				netAvailable={netAvailableSize}
 				{precision}
@@ -94,7 +94,7 @@
 			{/if}
 		</Stack>
 		<Stack>
-			<RamOverview ramAvailable={ramAvailableSize} {precision} />
+			<RamResource ramAvailable={ramAvailableSize} {precision} />
 			<Button variant="secondary" href="/{network}/ram">RAM Market</Button>
 		</Stack>
 	</Stack>

diff --git a/src/routes/[network]/(account)/resources/powerup/+page.svelte b/src/routes/[network]/(account)/resources/powerup/+page.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import Renting from '../components/renting.svelte';
+	import Renting from '../renting.svelte';
 
 	import type { UnicoveContext } from '$lib/state/client.svelte';
 	import { getContext } from 'svelte';

diff --git a/...ount)/resources/components/renting.svelte → ...twork]/(account)/resources/renting.svelte b/...ount)/resources/components/renting.svelte → ...twork]/(account)/resources/renting.svelte
@@ -7,7 +7,7 @@
 	import Checkbox from '$lib/components/input/checkbox.svelte';
 	import Button from '$lib/components/button/button.svelte';
 	import Transaction from '$lib/components/transaction.svelte';
-	import CpuAndNetOverview from './cpunet.svelte';
+	import CpuAndNetResource from '$lib/components/elements/cpunetresource.svelte';
 
 	import { Checksum256, type TransactResult } from '@wharfkit/session';
 
@@ -20,7 +20,7 @@
 
 	import { preventDefault } from '$lib/utils';
 	import { RentState } from './state.svelte';
-	import { calAvailableSize, getCpuAndNetPrice, getPowerupFrac, type RentType } from '../utils';
+	import { calAvailableSize, getCpuAndNetPrice, getPowerupFrac, type RentType } from './utils';
 
 	const context = getContext<UnicoveContext>('state');
 	const debugMode = getSetting('debug-mode', true);
@@ -92,7 +92,6 @@
 	});
 
 	const precision = 2;
-	//0ebca2f19920514cb7d1f31f04cbfd279788a06671dd1260b7c00a259e2e85ad
 	let transactionId: Checksum256 | undefined = $state();
 
 	function handleRent() {
@@ -102,7 +101,6 @@
 		}
 
 		try {
-			rentState.resetBeforeTransction();
 			const actions = rentState.getActions(context.network.contracts.system);
 			context.wharf
 				.transact({
@@ -113,11 +111,10 @@
 					resetStateAfterTrasaction();
 				})
 				.catch((error) => {
-					rentState.error = String(error);
+					console.error(error);
 				});
 		} catch (error) {
 			console.error(error);
-			alert('rex failed: ' + (error as { message: string }).message);
 		}
 	}
 
@@ -133,10 +130,10 @@
 {/if}
 
 <div class="mx-auto max-w-md">
-	<CpuAndNetOverview cpuAvailable={cpuAvailableSize} netAvailable={netAvailableSize} {precision} />
+	<CpuAndNetResource cpuAvailable={cpuAvailableSize} netAvailable={netAvailableSize} {precision} />
 	<form onsubmit={preventDefault(handleRent)}>
 		<Stack class="py-4 sm:p-4">
-			<fieldset class="grid gap-1">
+			<fieldset class="grid gap-2">
 				<Label for="cpuNumberInput"
 					>Amount of CPU {#if rentState.cpuPricePerMs}
 						(<AssetText variant="full" value={rentState.cpuPricePerMs} />/MS){/if}</Label
@@ -149,7 +146,7 @@
 				/>
 			</fieldset>
 
-			<fieldset class="grid gap-1">
+			<fieldset class="grid gap-2">
 				<Label for="netNumberInput"
 					>Amount of NET {#if rentState.netPricePerKb}
 						(<AssetText variant="full" value={rentState.netPricePerKb} />/KB){/if}</Label
@@ -168,7 +165,7 @@
 			</fieldset>
 
 			{#if !rentState.rentingForSelf}
-				<fieldset class="semi-bold grid gap-1">
+				<fieldset class="semi-bold grid gap-2">
 					<Label for="thirdReceiver">Receiving Account</Label>
 					<NameInput
 						id="thirdReceiver"

diff --git a/src/routes/[network]/(account)/resources/rex/+page.svelte b/src/routes/[network]/(account)/resources/rex/+page.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import Renting from '../components/renting.svelte';
+	import Renting from '../renting.svelte';
 
 	import type { UnicoveContext } from '$lib/state/client.svelte';
 	import { getContext } from 'svelte';

diff --git a/src/routes/[network]/(account)/resources/stake/+page.svelte b/src/routes/[network]/(account)/resources/stake/+page.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import Renting from '../components/renting.svelte';
+	import Renting from '../renting.svelte';
 
 	import type { UnicoveContext } from '$lib/state/client.svelte';
 	import { getContext } from 'svelte';

diff --git a/...unt)/resources/components/state.svelte.ts → ...work]/(account)/resources/state.svelte.ts b/...unt)/resources/components/state.svelte.ts → ...work]/(account)/resources/state.svelte.ts
@@ -2,7 +2,7 @@ import { type Action, Asset, Name } from '@wharfkit/antelope';
 import { ChainDefinition } from '@wharfkit/common';
 import type { Contract } from '@wharfkit/contract';
 
-import type { RentType } from '../utils';
+import type { RentType } from './utils';
 
 const defaultName = Name.from('');
 const defaultSymbol = Asset.Symbol.from('0,UNKNOWN');
@@ -60,14 +60,6 @@ export class RentState {
 	public cpuFrac: number = $state(0);
 	public netFrac: number = $state(0);
 
-	//transaction error
-	public error: string = $state('');
-
-	public min: number | undefined = $derived(
-		this.balance ? Asset.fromUnits(1, this.balance.symbol).value : undefined
-	);
-	public max: number | undefined = $derived(this.balance ? this.balance.value : undefined);
-
 	public insufficientBalance: boolean = $derived.by(() => {
 		if (this.cost && this.balance) return this.cost.value > this.balance.value;
 		return false;
@@ -96,17 +88,11 @@ export class RentState {
 		this.netPricePerKb = undefined;
 		this.cpuFrac = 0;
 		this.netFrac = 0;
-		this.error = '';
-	}
-
-	resetBeforeTransction() {
-		this.error = '';
 	}
 
 	resetAfterTransction() {
 		this.cpuAmount = 0;
 		this.netAmount = 0;
-		this.error = '';
 	}
 
 	getActions(contract: Contract): Action[] {