Shiloh/lasthourcloud
Shiloh/lasthourcloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

ui: fixes

Browse Source
This commit is contained in:
Andras Bacsai 2022-09-23 14:20:37 +02:00
parent eaa13f4990
commit f9d94fa660
3 changed files with 21 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -13,4 +13,5 @@ apps/api/db/*.db
local-serve
apps/api/db/migration.db-journal
apps/api/core*
logs
logs
others/certificates

28
apps/ui/src/routes/applications/[id]/index.svelte
View File

@ -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() {

37
apps/ui/src/routes/settings/certificates.svelte
View File

@ -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>