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

fix

Browse Source
This commit is contained in:
Andras Bacsai 2023-05-25 21:23:03 +02:00
parent 45ea53b9ba
commit 3ba9f399b8
6 changed files with 20 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Livewire/ForceUpgrade.php
View File

@ -10,6 +10,6 @@ class ForceUpgrade extends Component
public function upgrade()
{
$this->emit('updateInitiated');
dispatch_sync(new InstanceAutoUpdateJob(force: true));
dispatch(new InstanceAutoUpdateJob(force: true));
}
}

17
resources/css/app.css
View File

@ -2,16 +2,16 @@
@tailwind components;
@tailwind utilities;
* {
//outline: solid 0.25rem hsla(210, 100%, 100%, 0.5);
@apply scrollbar-thumb-coollabs-100 scrollbar-track-coolgray-200 scrollbar-w-1;
}
html {
@apply h-full min-h-full bg-coolgray-100;
@apply min-h-screen h-full bg-coolgray-100;
}
body {
@apply bg-coolgray-100 text-neutral-400 min-h-full antialiased;
@apply min-h-screen bg-coolgray-100 text-neutral-400 antialiased scrollbar-thumb-coollabs-100 scrollbar-track-coolgray-200 scrollbar-w-1;
}
main {
@apply px-32 xl:px-14 mx-auto max-w-screen-xl;
}
input[type="checkbox"] {
@apply toggle toggle-warning toggle-xs rounded;
}
@ -59,9 +59,6 @@ a {
@apply text-neutral-400 hover:text-white text-sm link link-hover hover:bg-transparent;
}
main {
@apply h-full w-full pb-10 px-32 xl:px-14 pt-8 mx-auto max-w-screen-xl;
}
.main-navbar {
@apply fixed top-0 left-0 min-h-screen overflow-hidden;
}
@ -123,5 +120,5 @@ main {
}
}
.bg-coollabs-gradient {
@apply text-transparent bg-clip-text bg-gradient-to-r from-coollabs via-pink-500 to-red-500;
@apply text-transparent bg-clip-text bg-gradient-to-r from-purple-500 via-pink-500 to-red-500;
}

12
resources/views/auth/login.blade.php
View File

@ -5,8 +5,8 @@
<div class="flex items-center gap-2">
<h1 class="pb-0">{{ __('auth.login') }}</h1>
@if ($is_registration_enabled)
<a href="/register" class="flex justify-center pt-2">
<x.inputs-button>{{ __('auth.register-now') }}</x.inputs-button>
<a href="/register" class="flex justify-center pt-2 hover:no-underline">
<x-forms.button type="submit">{{ __('auth.register-now') }}</x-forms.button>
</a>
@else
<div class="text-sm text-center">{{ __('auth.registration_disabled') }}</div>
@ -21,23 +21,17 @@
<x-forms.input required value="password" type="password" name="password"
label="{{ __('input.password') }}" />
@else
<x-forms.input required type="password" name="password" label="{{ __('input.password') }}" />
<x-forms.input required type="email" name="email" label="{{ __('input.email') }}" autofocus />
<x-forms.input required type="password" name="password" label="{{ __('input.password') }}" />
@endenv
@if ($errors->any())
<div class="text-center text-error">
<span>{{ __('auth.failed') }}</span>
</div>
@endif
<x-forms.button type="submit">{{ __('auth.login') }}</x-forms.button>
</form>
</div>
</div>
</div>
</x-layout-simple>

6
resources/views/auth/register.blade.php
View File

@ -1,11 +1,11 @@
<x-layout-simple>
<div class="flex items-center justify-center h-screen">
<div class="flex items-center justify-center min-h-screen">
<div>
<div class="pb-8 text-5xl font-bold tracking-tight text-center text-white">Coolify</div>
<div class="flex items-center gap-2">
<h1 class="pb-0">{{ __('auth.register') }}</h1>
<a href="/login" class="flex justify-center pt-2">
<x.inputs-button>{{ __('auth.already-registered') }}</x.inputs-button>
<a href="/login" class="flex justify-center pt-2 hover:no-underline">
<x-forms.button type="submit">{{ __('auth.already-registered') }}</x-forms.button>
</a>
</div>
<form action="/register" method="POST" class="flex flex-col gap-2">

3
resources/views/livewire/force-upgrade.blade.php
View File

@ -8,4 +8,5 @@
<path d="M3.124 10.5c.16 -.95 .468 -1.85 .9 -2.675l.169 -.305" />
<path d="M6.907 4.579a8.954 8.954 0 0 1 3.093 -1.356" />
<path d="M12 9l-2 3h4l-2 3" />
</svg>Force Upgrade</button>
</svg>Force Upgrade
</button>

8
resources/views/livewire/upgrading.blade.php
View File

@ -1,11 +1,11 @@
<div x-data="{ visible: @entangle('visible') }" class="fixed text-xs text-white top-2 right-28">
<div x-data="{ visible: @entangle('visible') }" class="fixed text-xs text-white top-3 right-28">
<template x-if="visible">
<div>
<svg xmlns="http://www.w3.org/2000/svg" class="w-10 h-10 mx-auto lds-heart text-warning" viewBox="0 0 24 24"
<div class="bg-coollabs-gradient">
<svg xmlns="http://www.w3.org/2000/svg" class="w-10 h-10 mx-auto text-pink-500 lds-heart" viewBox="0 0 24 24"
stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
<path stroke="none" d="M0 0h24v24H0z" fill="none" />
<path d="M19.5 13.572l-7.5 7.428l-7.5 -7.428m0 0a5 5 0 1 1 7.5 -6.566a5 5 0 1 1 7.5 6.572" />
</svg> Upgrading...
</svg> Upgrading, please wait...
<script>
function checkHealth() {
console.log('Checking server\'s health...')