From a8417aca16a5d5924bfea3789293bf52ea8ba9dc Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Tue, 26 Mar 2024 11:17:48 +0100 Subject: [PATCH 01/10] cloud: run cleanup every day --- app/Console/Commands/CleanupDatabase.php | 2 +- app/Console/Kernel.php | 4 +--- config/sentry.php | 2 +- config/version.php | 2 +- versions.json | 2 +- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/app/Console/Commands/CleanupDatabase.php b/app/Console/Commands/CleanupDatabase.php index 495b365ee..9e3a58a7e 100644 --- a/app/Console/Commands/CleanupDatabase.php +++ b/app/Console/Commands/CleanupDatabase.php @@ -20,7 +20,7 @@ class CleanupDatabase extends Command $keep_days = 60; echo "Keep days: $keep_days\n"; // Cleanup failed jobs table - $failed_jobs = DB::table('failed_jobs')->where('failed_at', '<', now()->subDays(7)); + $failed_jobs = DB::table('failed_jobs')->where('failed_at', '<', now()->subDays(1)); $count = $failed_jobs->count(); echo "Delete $count entries from failed_jobs.\n"; if ($this->option('yes')) { diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index d43da9cbe..ac17f6640 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -48,9 +48,7 @@ class Kernel extends ConsoleKernel $this->pull_helper_image($schedule); $this->check_scheduled_tasks($schedule); - if (!isCloud()) { - $schedule->command('cleanup:database --yes')->daily(); - } + $schedule->command('cleanup:database --yes')->daily(); } } private function pull_helper_image($schedule) diff --git a/config/sentry.php b/config/sentry.php index b432cb213..ec6abd3c9 100644 --- a/config/sentry.php +++ b/config/sentry.php @@ -7,7 +7,7 @@ return [ // The release version of your application // Example with dynamic git hash: trim(exec('git --git-dir ' . base_path('.git') . ' log --pretty="%h" -n1 HEAD')) - 'release' => '4.0.0-beta.244', + 'release' => '4.0.0-beta.245', // When left empty or `null` the Laravel environment will be used 'environment' => config('app.env'), diff --git a/config/version.php b/config/version.php index 40004d17e..8b2443f54 100644 --- a/config/version.php +++ b/config/version.php @@ -1,3 +1,3 @@ Date: Tue, 26 Mar 2024 11:52:45 +0100 Subject: [PATCH 02/10] fix: ui for tags --- resources/css/app.css | 7 ++++- .../livewire/project/resource/index.blade.php | 28 +++++++++---------- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/resources/css/app.css b/resources/css/app.css index ffea7a63a..fa29bf90f 100644 --- a/resources/css/app.css +++ b/resources/css/app.css @@ -116,7 +116,12 @@ tr td:first-child { .alert-error { @apply flex items-center gap-2 text-error; } - +.tag { + @apply px-2 py-1 cursor-pointer box-description dark:bg-coolgray-100 dark:hover:bg-coolgray-300 bg-neutral-100 hover:bg-neutral-200 +} +.add-tag { + @apply flex items-center px-2 text-xs cursor-pointer dark:text-neutral-500/20 text-neutral-500 group-hover:text-neutral-700 group-hover:dark:text-white dark:hover:bg-coolgray-300 hover:bg-neutral-200; +} .dropdown-item { @apply relative flex cursor-pointer select-none dark:text-white hover:bg-neutral-100 dark:hover:bg-coollabs items-center pr-4 pl-2 py-1 text-xs justify-start outline-none transition-colors data-[disabled]:pointer-events-none data-[disabled]:opacity-50 gap-2 w-full; } diff --git a/resources/views/livewire/project/resource/index.blade.php b/resources/views/livewire/project/resource/index.blade.php index d46528cc1..ed7641bb1 100644 --- a/resources/views/livewire/project/resource/index.blade.php +++ b/resources/views/livewire/project/resource/index.blade.php @@ -72,10 +72,10 @@
-
Add tag
@@ -104,10 +104,10 @@
-
Add tag
@@ -136,10 +136,10 @@
-
Add tag
@@ -168,10 +168,10 @@
-
Add tag
@@ -200,10 +200,10 @@
-
Add tag
@@ -232,10 +232,10 @@
-
Add tag
@@ -264,10 +264,10 @@
-
Add tag
From d931241edc060792c14f2ace63f6911a22c618b7 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Tue, 26 Mar 2024 12:51:42 +0100 Subject: [PATCH 03/10] fix: update resources view --- public/svgs/unknown.svg | 3 - .../livewire/project/new/select.blade.php | 155 ++++++++++++++---- 2 files changed, 127 insertions(+), 31 deletions(-) delete mode 100644 public/svgs/unknown.svg diff --git a/public/svgs/unknown.svg b/public/svgs/unknown.svg deleted file mode 100644 index d7752c454..000000000 --- a/public/svgs/unknown.svg +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/resources/views/livewire/project/new/select.blade.php b/resources/views/livewire/project/new/select.blade.php index 289d3a6a9..b218c9557 100644 --- a/resources/views/livewire/project/new/select.blade.php +++ b/resources/views/livewire/project/new/select.blade.php @@ -207,9 +207,25 @@ robustness, advanced features, and strong standards compliance. - +
+ + + + + + + + +
+ @@ -219,9 +235,33 @@ broker. - +
+ + + + + + + + + + + + + +
@@ -231,9 +271,57 @@ optional schemas. - +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -243,9 +331,18 @@ flexibility. - +
+ + + + + +
@@ -255,9 +352,14 @@ replacement for MySQL. - +
+ + + +
@@ -293,7 +395,6 @@ @if (data_get($service, 'slogan')) {{ data_get($service, 'slogan') }} @endif - @if (data_get($service, 'logo')) @@ -310,14 +411,6 @@ service. - {{-- --}} @else {{ Str::headline($serviceName) }} @@ -329,12 +422,18 @@ @if (file_exists(public_path(data_get($service, 'logo')))) @else - +
+ + + +
@endif From d077e0c83c97bbdca07411d15dd71b3a6bf96793 Mon Sep 17 00:00:00 2001 From: Andras Bacsai Date: Tue, 26 Mar 2024 13:25:10 +0100 Subject: [PATCH 04/10] fix: realtime connection check --- app/Console/Kernel.php | 6 +-- app/Livewire/RealtimeConnection.php | 25 --------- ...6_122110_remove_realtime_notifications.php | 28 ++++++++++ resources/views/components/popup.blade.php | 5 +- resources/views/layouts/app.blade.php | 3 -- .../views/livewire/layout-popups.blade.php | 52 +++++++++++++++++-- .../livewire/realtime-connection.blade.php | 48 ----------------- 7 files changed, 83 insertions(+), 84 deletions(-) delete mode 100644 app/Livewire/RealtimeConnection.php create mode 100644 database/migrations/2024_03_26_122110_remove_realtime_notifications.php delete mode 100644 resources/views/livewire/realtime-connection.blade.php diff --git a/app/Console/Kernel.php b/app/Console/Kernel.php index ac17f6640..5cc398aa5 100644 --- a/app/Console/Kernel.php +++ b/app/Console/Kernel.php @@ -70,13 +70,13 @@ class Kernel extends ConsoleKernel $containerServers = $servers->where('settings.is_swarm_worker', false)->where('settings.is_build_server', false); } foreach ($containerServers as $server) { - $schedule->job(new ContainerStatusJob($server))->everyMinute()->onOneServer(); + $schedule->job(new ContainerStatusJob($server))->everyTwoMinutes()->onOneServer(); if ($server->isLogDrainEnabled()) { - $schedule->job(new CheckLogDrainContainerJob($server))->everyMinute()->onOneServer(); + $schedule->job(new CheckLogDrainContainerJob($server))->everyTwoMinutes()->onOneServer(); } } foreach ($servers as $server) { - $schedule->job(new ServerStatusJob($server))->everyMinute()->onOneServer(); + $schedule->job(new ServerStatusJob($server))->everyTwoMinutes()->onOneServer(); } // Delayed Jobs // foreach ($containerServers as $server) { diff --git a/app/Livewire/RealtimeConnection.php b/app/Livewire/RealtimeConnection.php deleted file mode 100644 index 89b680277..000000000 --- a/app/Livewire/RealtimeConnection.php +++ /dev/null @@ -1,25 +0,0 @@ -user()->update(['is_notification_realtime_enabled' => false]); - $this->showNotification = false; - } - public function mount() { - $this->isNotificationEnabled = auth()->user()->is_notification_realtime_enabled; - $this->checkConnection = auth()->user()->id === 0; - } -} diff --git a/database/migrations/2024_03_26_122110_remove_realtime_notifications.php b/database/migrations/2024_03_26_122110_remove_realtime_notifications.php new file mode 100644 index 000000000..6d5d0e041 --- /dev/null +++ b/database/migrations/2024_03_26_122110_remove_realtime_notifications.php @@ -0,0 +1,28 @@ +dropColumn('is_notification_realtime_enabled'); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('users', function (Blueprint $table) { + $table->boolean('is_notification_realtime_enabled')->default(true); + }); + } +}; diff --git a/resources/views/components/popup.blade.php b/resources/views/components/popup.blade.php index a184d80b0..8061c29bd 100644 --- a/resources/views/components/popup.blade.php +++ b/resources/views/components/popup.blade.php @@ -6,7 +6,8 @@ x-transition:enter-start="translate-y-full" x-transition:enter-end="translate-y-0" x-transition:leave="transition ease-in duration-300" x-transition:leave-start="translate-y-0" x-transition:leave-end="translate-y-full" x-init="setTimeout(() => { bannerVisible = true }, bannerVisibleAfter);" - class="fixed bottom-0 right-0 w-full h-auto duration-300 ease-out sm:px-5 sm:pb-5 sm:w-[26rem] lg:w-full z-[999]" x-cloak> + class="fixed bottom-0 right-0 w-full h-auto duration-300 ease-out sm:px-5 sm:pb-5 sm:w-[26rem] lg:w-full z-[999]" + x-cloak>
attributes->whereStartsWith('@click')->first()) @click="bannerVisible=false;{{ $buttonText->attributes->get('@click') }}" @else @click="bannerVisible=false;" @endif - class="inline-flex items-center justify-center flex-shrink-0 w-1/2 px-4 py-2 text-sm font-medium tracking-wide transition-colors duration-200 bg-white rounded-md dark:bg-coolgray-200 lg:w-auto dark:text-neutral-200 dark:hover:bg-coolgray-300 focus:shadow-outline focus:outline-none"> + class="inline-flex items-center justify-center flex-shrink-0 w-1/2 px-4 py-2 text-sm font-medium tracking-wide transition-colors duration-200 rounded-md bg-neutral-100 hover:bg-neutral-200 dark:bg-coolgray-200 lg:w-auto dark:text-neutral-200 dark:hover:bg-coolgray-300 focus:shadow-outline focus:outline-none"> {{ $buttonText }}
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index e502e9e6e..744f33739 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -4,9 +4,6 @@ @if (isSubscribed() || !isCloud()) @endif - @auth - - @endauth @auth