From f9d94fa66093003e7b34b58994da8ee133c93244 Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 23 Sep 2022 14:20:37 +0200
Subject: [PATCH] ui: fixes

---
 .gitignore                                    |  3 +-
 .../src/routes/applications/[id]/index.svelte | 28 +-------------
 .../src/routes/settings/certificates.svelte   | 37 +++++++++----------
 3 files changed, 21 insertions(+), 47 deletions(-)

diff --git a/.gitignore b/.gitignore
index eddb26abd..ddc188f8c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,4 +13,5 @@ apps/api/db/*.db
 local-serve
 apps/api/db/migration.db-journal
 apps/api/core*
-logs
\ No newline at end of file
+logs
+others/certificates
\ No newline at end of file
diff --git a/apps/ui/src/routes/applications/[id]/index.svelte b/apps/ui/src/routes/applications/[id]/index.svelte
index a5001e732..e6a81f451 100644
--- a/apps/ui/src/routes/applications/[id]/index.svelte
+++ b/apps/ui/src/routes/applications/[id]/index.svelte
@@ -55,18 +55,8 @@
 	$: isDisabled =
 		!$appSession.isAdmin || $status.application.isRunning || $status.application.initialLoading;
 
-	let domainEl: HTMLInputElement;
-
 	let loading = false;
 
-	let usageLoading = false;
-	let usage = {
-		MemUsage: 0,
-		CPUPerc: 0,
-		NetIO: 0
-	};
-	let usageInterval: any;
-
 	let forceSave = false;
 	let debug = application.settings.debug;
 	let previews = application.settings.previews;
@@ -98,27 +88,11 @@
 		return 'text-white bg-transparent font-thin px-0 w-full border border-dashed border-coolgray-200 bg-transparent';
 	}
 
-	async function getUsage() {
-		if (usageLoading) return;
-		if (!$status.application.isRunning) return;
-		usageLoading = true;
-		const data = await get(`/applications/${id}/usage`);
-		usage = data.usage;
-		usageLoading = false;
-	}
-	onDestroy(() => {
-		clearInterval(usageInterval);
-	});
 	onMount(async () => {
 		if (window.location.hostname === 'demo.coolify.io' && !application.fqdn) {
 			application.fqdn = `http://${cuid()}.demo.coolify.io`;
 			await handleSubmit();
-		}
-		// !isBot && domainEl.focus();
-		await getUsage();
-		usageInterval = setInterval(async () => {
-			await getUsage();
-		}, 1000);
+		}	
 		await getBaseBuildImages();
 	});
 	async function getBaseBuildImages() {
diff --git a/apps/ui/src/routes/settings/certificates.svelte b/apps/ui/src/routes/settings/certificates.svelte
index 13b962dbf..eb2737914 100644
--- a/apps/ui/src/routes/settings/certificates.svelte
+++ b/apps/ui/src/routes/settings/certificates.svelte
@@ -55,20 +55,14 @@
 	}
 </script>
 
-<div class="w-full">
-	{#if certificates.length === 0}
-		<div class="text-sm">No SSL Certificate found</div>
-		<label for="my-modal" class="btn btn-primary mt-6" on:click={() => (isModalActive = true)}
-			>Add SSL Certificate</label
-		>
-	{:else}
-		<div class="mx-auto w-full">
-			<div class="flex border-b border-coolgray-500 mb-6">
-				<div class="title font-bold pb-3 pr-4">SSL Certificates</div>
-				<label for="my-modal" class="btn btn-sm btn-primary" on:click={() => (isModalActive = true)}
-					>Add SSL Certificate</label
-				>
-			</div>
+	<div class="mx-auto w-full">
+		<div class="flex border-b border-coolgray-500 mb-6">
+			<div class="title font-bold pb-3 pr-4">SSL Certificates</div>
+			<label for="my-modal" class="btn btn-sm btn-primary" on:click={() => (isModalActive = true)}
+				>Add SSL Certificate</label
+			>
+		</div>
+		{#if certificates.length > 0}
 			<table class="table w-full">
 				<thead>
 					<tr>
@@ -91,10 +85,11 @@
 					{/each}
 				</tbody>
 			</table>
-		</div>
-	{/if}
-</div>
-
+		{:else}
+			<div class="text-sm">No SSL Certificate found</div>
+		{/if}
+	</div>
+		
 {#if isModalActive}
 	<input type="checkbox" id="my-modal" class="modal-toggle" />
 	<div class="modal modal-bottom sm:modal-middle ">
@@ -131,7 +126,11 @@
 					<label for="my-modal">
 						<button type="submit" class="btn btn-sm btn-primary mt-4">Upload</button></label
 					>
-					<button on:click={() => (isModalActive = false)} type="button" class="btn btn-sm btn-error">Cancel</button>
+					<button
+						on:click={() => (isModalActive = false)}
+						type="button"
+						class="btn btn-sm btn-error">Cancel</button
+					>
 				</form>
 			</div>
 		</div>