From 76bd4ae8ef13ba1ef94dcadf23439c99c4df159a Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Tue, 13 Jun 2023 10:30:07 +0200
Subject: [PATCH] fix

---
 app/Jobs/ApplicationContainerStatusJob.php    |  1 -
 resources/css/app.css                         | 29 +--------
 .../views/components/naked-modal.blade.php    | 63 ++++++++++++++++---
 resources/views/components/navbar.blade.php   |  2 +-
 .../project/application/deploy.blade.php      |  2 +-
 .../project/application/previews.blade.php    |  2 +-
 .../project/application/status.blade.php      |  2 +-
 7 files changed, 58 insertions(+), 43 deletions(-)

diff --git a/app/Jobs/ApplicationContainerStatusJob.php b/app/Jobs/ApplicationContainerStatusJob.php
index f31f067b4..5790d4cbf 100644
--- a/app/Jobs/ApplicationContainerStatusJob.php
+++ b/app/Jobs/ApplicationContainerStatusJob.php
@@ -4,7 +4,6 @@
 
 use App\Models\Application;
 use App\Models\ApplicationPreview;
-use App\Models\Server;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldBeUnique;
 use Illuminate\Contracts\Queue\ShouldQueue;
diff --git a/resources/css/app.css b/resources/css/app.css
index 8ed47bb78..cd8a20f89 100644
--- a/resources/css/app.css
+++ b/resources/css/app.css
@@ -45,7 +45,7 @@ .loading {
 }
 
 button[isWarning] {
-    @apply bg-error hover:bg-error;
+    @apply bg-red-600 hover:bg-red-500;
 }
 button[isHighlighted] {
     @apply btn-primary text-white;
@@ -65,10 +65,6 @@ h4 {
 a {
     @apply text-neutral-400 hover:text-white text-sm link link-hover hover:bg-transparent;
 }
-
-.main-navbar {
-    @apply fixed h-full overflow-hidden pt-16;
-}
 .kbd-custom {
     @apply px-2  text-xs border border-dashed rounded border-neutral-700 text-warning;
 }
@@ -82,29 +78,6 @@ .box {
     @apply flex items-center justify-center text-sm rounded min-h-12 bg-coolgray-200 hover:bg-coollabs-100 hover:text-white p-2 hover:no-underline transition-colors;
 }
 
-/* .main-menu {
-    @apply relative float-left;
-}
-.main-menu:after {
-    content: "/";
-    @apply absolute border border-dotted rounded border-neutral-600 right-1 top-0 text-warning mx-1 px-2 mt-[0.3rem] text-sm;
-} */
-.magic-badge {
-    @apply min-w-fit px-2 rounded text-center border border-dotted border-primary text-white text-xs;
-}
-.magic-input {
-    @apply input input-sm w-80 xl:w-96 placeholder:text-neutral-700 text-sm rounded;
-}
-.magic-items {
-    @apply absolute top-12 mt-2 w-[24rem] bg-coolgray-200 rounded  z-50;
-}
-.magic-item {
-    @apply text-sm flex items-center gap-4 m-2 py-2 pl-4 cursor-pointer hover:bg-coolgray-500 text-neutral-400 hover:text-white transition-colors hover:shadow;
-}
-.magic-item-focused {
-    @apply bg-coolgray-400 text-white;
-}
-
 .lds-heart {
     animation: lds-heart 1.2s infinite cubic-bezier(0.215, 0.61, 0.355, 1);
 }
diff --git a/resources/views/components/naked-modal.blade.php b/resources/views/components/naked-modal.blade.php
index 6b08fe955..44de473e1 100644
--- a/resources/views/components/naked-modal.blade.php
+++ b/resources/views/components/naked-modal.blade.php
@@ -3,16 +3,59 @@
     'message' => 'Are you sure you want to delete this?',
     'action' => 'delete',
 ])
-<div x-cloak x-show="{{ $show }}" x-transition class="modal modal-open">
-    <div class="relative text-center rounded modal-box bg-coolgray-100">
-        <div class="pb-8 text-base text-white">{{ $message }}</div>
-        <div class="flex justify-center gap-4 text-xs">
-            <x-forms.button class="w-32 hover:bg-coolgray-400 bg-coolgray-200 h-7" isWarning
-                wire:click='{{ $action }}' x-on:click="{{ $show }} = false">
-                Yes
-            </x-forms.button>
-            <x-forms.button class="w-32 hover:bg-coolgray-400 bg-coolgray-200 h-7"
-                x-on:click="{{ $show }} = false">No</x-forms.button>
+<div x-cloak x-show="{{ $show }}" x-transition class="relative z-10" aria-labelledby="modal-title" role="dialog"
+    aria-modal="true">
+    <!--
+    Background backdrop, show/hide based on modal state.
+
+    Entering: "ease-out duration-300"
+      From: "opacity-0"
+      To: "opacity-100"
+    Leaving: "ease-in duration-200"
+      From: "opacity-100"
+      To: "opacity-0"
+  -->
+    <div class="fixed inset-0 transition-opacity bg-coolgray-100/75"></div>
+
+    <div class="fixed inset-0 z-10 overflow-y-auto">
+        <div class="flex items-end justify-center min-h-full p-4 text-center sm:items-center sm:p-0">
+            <!--
+        Modal panel, show/hide based on modal state.
+
+        Entering: "ease-out duration-300"
+          From: "opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
+          To: "opacity-100 translate-y-0 sm:scale-100"
+        Leaving: "ease-in duration-200"
+          From: "opacity-100 translate-y-0 sm:scale-100"
+          To: "opacity-0 translate-y-4 sm:translate-y-0 sm:scale-95"
+      -->
+            <div
+                class="relative px-4 pt-5 pb-4 overflow-hidden text-left text-white transition-all transform rounded-lg shadow-xl bg-coolgray-200 sm:my-8 sm:w-full sm:max-w-lg sm:p-6">
+                <div class="sm:flex sm:items-start">
+                    <div
+                        class="flex items-center justify-center flex-shrink-0 w-12 h-12 mx-auto rounded-full sm:mx-0 sm:h-10 sm:w-10">
+                        <svg class="w-8 h-8 text-error" fill="none" viewBox="0 0 24 24" stroke-width="1.5"
+                            stroke="currentColor" aria-hidden="true">
+                            <path stroke-linecap="round" stroke-linejoin="round"
+                                d="M12 9v3.75m-9.303 3.376c-.866 1.5.217 3.374 1.948 3.374h14.71c1.73 0 2.813-1.874 1.948-3.374L13.949 3.378c-.866-1.5-3.032-1.5-3.898 0L2.697 16.126zM12 15.75h.007v.008H12v-.008z" />
+                        </svg>
+                    </div>
+                    <div class="mt-4 text-center sm:ml-4 sm:mt-1 sm:text-left">
+                        <h3 class="text-base font-semibold leading-6 text-white" id="modal-title">Delete Resource
+                        </h3>
+                        <div class="mt-2">
+                            <p class="text-sm text-neutral-200">{{ $message }}</p>
+                        </div>
+                    </div>
+                </div>
+                <div class="gap-4 mt-5 sm:mt-4 sm:flex sm:flex-row-reverse">
+                    <x-forms.button class="w-24" wire:click='{{ $action }}'
+                        x-on:click="{{ $show }} = false" isWarning type="button">Delete</x-forms.button>
+                    <x-forms.button class="w-24 bg-coolgray-200 hover:bg-coolgray-300"
+                        x-on:click="{{ $show }} = false" type="button">Cancel
+                    </x-forms.button>
+                </div>
+            </div>
         </div>
     </div>
 </div>
diff --git a/resources/views/components/navbar.blade.php b/resources/views/components/navbar.blade.php
index f392d5256..3a636c77e 100644
--- a/resources/views/components/navbar.blade.php
+++ b/resources/views/components/navbar.blade.php
@@ -1,5 +1,5 @@
 @auth
-    <nav class="main-navbar">
+    <nav class="fixed h-full pt-16 overflow-hidden">
         <ul class="gap-4 menu">
             <li>
                 <a class="hover:bg-transparent" @if (!request()->is('/')) href="/" @endif>
diff --git a/resources/views/livewire/project/application/deploy.blade.php b/resources/views/livewire/project/application/deploy.blade.php
index bf431cc7f..b778e1b1f 100644
--- a/resources/views/livewire/project/application/deploy.blade.php
+++ b/resources/views/livewire/project/application/deploy.blade.php
@@ -1,4 +1,4 @@
-<div class="flex items-center gap-2" wire:poll="pollStatus">
+<div class="flex items-center gap-2" wire:poll.10000ms="pollStatus">
     <div class="group">
         <label tabindex="0" class="flex items-center gap-2 cursor-pointer hover:text-white"> Actions
             <x-chevron-down />
diff --git a/resources/views/livewire/project/application/previews.blade.php b/resources/views/livewire/project/application/previews.blade.php
index ee74d1950..5359aa804 100644
--- a/resources/views/livewire/project/application/previews.blade.php
+++ b/resources/views/livewire/project/application/previews.blade.php
@@ -3,7 +3,7 @@
     <div>
         <div class="flex items-center gap-2">
             <h3>Pull Requests on Git</h3>
-            <x-forms.button wire:click="load_prs">Load (Open) Pull Requests
+            <x-forms.button wire:click="load_prs">Load Pull Requests (Open)
             </x-forms.button>
         </div>
         @isset($rate_limit_remaining)
diff --git a/resources/views/livewire/project/application/status.blade.php b/resources/views/livewire/project/application/status.blade.php
index 8636ed8ab..701447df5 100644
--- a/resources/views/livewire/project/application/status.blade.php
+++ b/resources/views/livewire/project/application/status.blade.php
@@ -1,4 +1,4 @@
-<div wire:poll.5000ms='applicationStatusChanged'>
+<div wire:poll.10000ms='applicationStatusChanged'>
     @if ($application->status === 'running')
         <x-status.running />
     @elseif($application->status === 'restarting')