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

Merge pull request #570 from ArticaDev/main

Browse Source 
UI Improvements and minor responsiveness fixes 👍
This commit is contained in:
Andras Bacsai 2022-08-29 15:33:20 +02:00 committed by GitHub
commit 3d7cd78d0e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apps/ui/src/lib/components/Usage.svelte
View File

@ -85,17 +85,19 @@
</script>
<div class="w-full">
<div class="flex items-center">
<div class="items-center grid grid-flow-row md:grid-flow-col md:w-96 gap-4">
<h1 class="title lg:text-3xl">Hardware Details</h1>
<div class="flex space-x-4">
<div class="grid lg:grid-flow-col gap-4">
{#if $appSession.teamId === '0'}
<button on:click={manuallyCleanupStorage} class:loading={loading.cleanup} class="btn btn-sm"
>Cleanup Storage</button
<button
on:click={manuallyCleanupStorage}
class:loading={loading.cleanup}
class="btn btn-sm w-36 h-14">Cleanup Storage</button
>
<button
on:click={restartCoolify}
class:loading={loading.restart}
class="btn btn-sm bg-red-600 hover:bg-red-500">Restart Coolify</button
class="btn btn-sm w-36 h-14 bg-red-600 hover:bg-red-500">Restart Coolify</button
>
{/if}
</div>
@ -126,7 +128,6 @@
</div>
<div class="stats stats-vertical min-w-[20rem] mb-5 bg-transparent rounded">
<div class="stat">
<div class="stat-title">Total CPU</div>
<div class="stat-value text-2xl">

4
apps/ui/src/routes/__layout.svelte
View File

@ -394,5 +394,7 @@
{/if}
{/if}
<main>
<slot />
<div class="px-20">
<slot />
</div>
</main>

9
apps/ui/src/routes/login.svelte
View File

@ -69,6 +69,7 @@
required
bind:this={emailEl}
bind:value={email}
class="w-56 md:w-96"
/>
<input
type="password"
@ -76,6 +77,7 @@
placeholder={$t('forms.password')}
bind:value={password}
required
class="w-56 md:w-96"
/>
<div class="flex space-x-2 h-8 items-center justify-center pt-8">
@ -83,14 +85,13 @@
type="submit"
disabled={loading}
class="btn btn-sm"
class:loading={loading}
class:loading
class:bg-coollabs={!loading}
>{loading ? $t('login.authenticating') : $t('login.login')}</button
>
<button
on:click|preventDefault={gotoRegister}
class="btn btn-sm">{$t('register.register')}</button
<button on:click|preventDefault={gotoRegister} class="btn btn-sm"
>{$t('register.register')}</button
>
</div>
</form>

6
apps/ui/src/routes/register.svelte
View File

@ -101,6 +101,7 @@
required
bind:this={emailEl}
bind:value={email}
class="w-56 md:w-96"
/>
<input
type="password"
@ -109,6 +110,7 @@
bind:this={passwordEl}
bind:value={password}
required
class="w-56 md:w-96"
/>
<input
type="password"
@ -116,6 +118,7 @@
placeholder={$t('forms.password_again')}
bind:value={passwordCheck}
required
class="w-56 md:w-96"
/>
<div class="flex space-x-2 h-8 items-center justify-center pt-8">
@ -125,8 +128,7 @@
disabled={loading}
class:bg-transparent={loading}
class:bg-coollabs={!loading}
class:loading={loading}
>{loading ? $t('register.registering') : $t('register.register')}</button
class:loading>{loading ? $t('register.registering') : $t('register.register')}</button
>
</div>
</form>

8
apps/ui/src/tailwind.css
View File

@ -24,12 +24,6 @@ body {
@apply min-h-screen overflow-x-hidden bg-coolblack text-sm text-white scrollbar-w-1 scrollbar-thumb-coollabs scrollbar-track-coolgray-200;
}
main,
.main {
width: calc(100% - 4rem);
margin-left: 4rem;
}
input {
@apply h-12 w-96 rounded border border-transparent bg-transparent bg-coolgray-200 p-2 text-xs tracking-tight text-white placeholder-stone-600 outline-none transition duration-150 hover:bg-coolgray-500 focus:bg-coolgray-500 disabled:border disabled:border-dashed disabled:border-coolgray-300 disabled:bg-transparent md:text-sm;
}
@ -106,7 +100,7 @@ .title {
@apply mr-4 text-base tracking-tight md:text-2xl font-bold;
}
.nav-main {
@apply fixed top-0 left-0 min-h-screen w-16 min-w-[4rem] overflow-auto border-r border-stone-800 bg-coolgray-200 scrollbar-w-1 scrollbar-thumb-coollabs scrollbar-track-coolgray-200 xl:overflow-visible;
@apply fixed top-0 left-0 min-h-screen w-16 min-w-[4rem] overflow-hidden border-r border-stone-800 bg-coolgray-200 scrollbar-w-1 scrollbar-thumb-coollabs scrollbar-track-coolgray-200 xl:overflow-visible;
}
.nav-side {