ui ui ui (pig)

pratadaniel94 · Mar 24, 2024 · b418a78 · b418a78
1 parent 04c92ec
commit b418a78
Show file tree

Hide file tree

Showing 103 changed files with 412 additions and 444 deletions.
diff --git a/app/Livewire/Project/Application/General.php b/app/Livewire/Project/Application/General.php
@@ -251,7 +251,7 @@ public function submit($showToaster = true)
                 if ($this->application->additional_servers->count() === 0) {
                     foreach ($domains as $domain) {
                         if (!validate_dns_entry($domain, $this->application->destination->server)) {
-                            $showToaster && $this->dispatch('error', "Validating DNS ($domain) failed.", "Make sure you have added the DNS records correctly.<br><br>Check this <a target='_blank' class='text-white underline' href='https://coolify.io/docs/dns-settings'>documentation</a> for further help.");
+                            $showToaster && $this->dispatch('error', "Validating DNS ($domain) failed.", "Make sure you have added the DNS records correctly.<br><br>Check this <a target='_blank' class='dark:text-white underline' href='https://coolify.io/docs/dns-settings'>documentation</a> for further help.");
                         }
                     }
                 }

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -21,7 +21,6 @@
         "@tailwindcss/forms": "^0.5.7",
         "@tailwindcss/typography": "0.5.10",
         "alpinejs": "3.13.5",
-        "daisyui": "4.7.2",
         "ioredis": "5.3.2",
         "tailwindcss-scrollbar": "0.1.0"
     }

diff --git a/resources/css/app.css b/resources/css/app.css
@@ -4,7 +4,7 @@
 
 html,
 body {
-    @apply bg-white text-neutral-600 dark:bg-base dark:text-neutral-400;
+    @apply bg-neutral-100 text-neutral-800 dark:bg-base dark:text-neutral-400;
 }
 
 body {
@@ -28,14 +28,14 @@ body {
 }
 
 option {
-    @apply text-white dark:bg-coolgray-100;
+    @apply dark:text-white dark:bg-coolgray-100;
 }
 
 .button {
-    @apply flex items-center justify-center px-3 py-1 text-sm font-normal normal-case rounded bg-neutral-200 hover:bg-neutral-300 dark:bg-coolgray-200 dark:text-white dark:hover:bg-coolgray-100 hover:text-black dark:hover:text-white dark:disabled:bg-coolgray-100/40 dark:disabled:text-neutral-800 min-w-fit;
+    @apply flex items-center justify-center gap-2 px-3 py-1 text-sm font-normal normal-case rounded cursor-pointer bg-neutral-200 hover:bg-neutral-300 dark:bg-coolgray-200 dark:text-white dark:hover:bg-coolgray-100 dark:hover:dark:text-white dark:disabled:bg-coolgray-100/40 dark:disabled:text-neutral-800 min-w-fit hover:dark:text-white ;
 }
 button[isError]:not(:disabled) {
-    @apply bg-red-600 hover:bg-red-700;
+    @apply text-white bg-red-600 hover:bg-red-700;
 }
 
 button[isHighlighted]:not(:disabled) {
@@ -44,39 +44,39 @@ button[isHighlighted]:not(:disabled) {
 
 
 h1 {
-    @apply text-2xl font-bold dark:text-white text-neutral-800;
+    @apply text-2xl font-bold dark:text-white;
 }
 
 h2 {
-    @apply text-xl font-bold dark:text-white text-neutral-800;
+    @apply text-xl font-bold dark:text-white;
 }
 
 h3 {
-    @apply text-lg font-bold dark:text-white text-neutral-800;
+    @apply text-lg font-bold dark:text-white;
 }
 
 h4 {
-    @apply text-base font-bold dark:text-white text-neutral-800;
+    @apply text-base font-bold dark:text-white;
 }
 
 a {
     @apply  hover:text-black dark:hover:text-white;
 }
 
 label {
-    @apply dark:text-neutral-400 text-neutral-600;
+    @apply dark:text-neutral-400;
 }
 
 table {
-    @apply min-w-full divide-y divide-coolgray-200;
+    @apply min-w-full divide-y dark:divide-coolgray-200 divide-neutral-300;
 }
 
 thead {
     @apply uppercase;
 }
 
 tbody {
-    @apply divide-y divide-coolgray-200;
+    @apply divide-y dark:divide-coolgray-200 divide-neutral-300;
 }
 
 tr {
@@ -112,7 +112,7 @@ tr td:first-child {
 }
 
 .badge {
-    @apply inline-block w-3 h-3 text-xs font-bold leading-none border border-black rounded-full;
+    @apply inline-block w-3 h-3 text-xs font-bold leading-none border rounded-full border-neutral-200 dark:border-black;
 }
 
 .badge-success {
@@ -142,13 +142,15 @@ tr td:first-child {
 .menu-item-active {
     @apply text-black rounded-none dark:bg-coolgray-200 dark:text-warning bg-neutral-200;
 }
+.heading-item-active {
+    @apply text-black rounded-none dark:bg-coolgray-200 dark:text-warning;
+}
 
 .icon {
-    @apply w-6 h-6 hover:text-white;
+    @apply w-6 h-6 dark:hover:text-white;
 }
 
 
-
 .scrollbar {
     @apply scrollbar-thumb-coollabs-100 scrollbar-track-coolgray-200 scrollbar-w-2;
 }
@@ -162,7 +164,7 @@ tr td:first-child {
 }
 
 .navbar-main {
-    @apply flex items-center h-10 gap-6 pb-2 border-b-2 border-solid border-coolgray-200;
+    @apply flex items-center h-10 gap-6 pb-2 border-b-2 border-solid dark:border-coolgray-200;
 }
 
 .loading {
@@ -174,7 +176,7 @@ tr td:first-child {
 }
 
 .box {
-    @apply flex p-2 transition-colors cursor-pointer min-h-[4rem] dark:bg-coolgray-100 bg-neutral-100 hover:bg-neutral-200 dark:hover:bg-coollabs-100 dark:hover:text-white hover:no-underline;
+    @apply flex p-2 transition-colors cursor-pointer min-h-[4rem] dark:bg-coolgray-100 bg-white border border-neutral-200 dark:border-black hover:bg-neutral-200 dark:hover:bg-coollabs-100 dark:hover:text-white hover:no-underline;
 }
 
 .on-box {
@@ -230,13 +232,13 @@ tr td:first-child {
 }
 
 .text-helper {
-    @apply inline-block font-bold text-coollabs dark:text-warning;
+    @apply inline-block font-bold text-red-500 dark:text-warning;
 }
 .info-helper {
     @apply cursor-pointer text-coollabs dark:text-warning;
 }
 .info-helper-popup {
-    @apply absolute z-40 hidden text-xs rounded text-neutral-700 group-hover:block dark:border-coolgray-500 border-neutral-900 dark:bg-coolgray-400 bg-neutral-100 dark:text-neutral-300;
+    @apply absolute z-40 hidden text-xs rounded text-neutral-700 group-hover:block dark:border-coolgray-500 border-neutral-900 dark:bg-coolgray-400 bg-neutral-200 dark:text-neutral-300;
 }
 
 .buyme {

diff --git a/resources/js/components/MagicBar.vue b/resources/js/components/MagicBar.vue
@@ -27,7 +27,7 @@
                             </svg>
                             <input type="text" v-model="search" ref="searchInput" @keydown.down="focusNext(magic.length)"
                                 @keydown.up="focusPrev(magic.length)" @keyup.enter="callAction"
-                                class="w-full h-10 pr-4 text-white rounded outline-none bg-coolgray-400 pl-11 placeholder:text-neutral-700 sm:text-sm focus:outline-none"
+                                class="w-full h-10 pr-4 dark:text-white rounded outline-none bg-coolgray-400 pl-11 placeholder:text-neutral-700 sm:text-sm focus:outline-none"
                                 placeholder="Search, jump or create... magically... 🪄" role="combobox"
                                 aria-expanded="false" aria-controls="options">
                         </div>
@@ -39,7 +39,7 @@
                                     class="mt-4 mb-2 text-xs font-semibold text-neutral-500">{{
                                         possibleSequences[sequenceState.sequence[sequenceState.currentActionIndex]].newTitle }}
                                 </h2>
-                                <ul class="mt-2 -mx-4 text-white">
+                                <ul class="mt-2 -mx-4 dark:text-white">
                                     <li class="flex items-center px-4 py-2 cursor-pointer select-none group hover:bg-coolgray-400"
                                         id="option-1" role="option" tabindex="-1"
                                         @click="addNew(sequenceState.sequence[sequenceState.currentActionIndex])">
@@ -67,7 +67,7 @@
                                 </ul>
                             </li>
                             <li>
-                                <ul v-if="magic.length == 0" class="mt-2 -mx-4 text-white">
+                                <ul v-if="magic.length == 0" class="mt-2 -mx-4 dark:text-white">
                                     <li class="flex items-center px-4 py-2 select-none group">
                                         <svg xmlns="http://www.w3.org/2000/svg" class="w-6 h-6 icon" viewBox="0 0 24 24"
                                             stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"
@@ -85,7 +85,7 @@
                                     class="mt-4 mb-2 text-xs font-semibold text-neutral-500">{{
                                         possibleSequences[sequenceState.sequence[sequenceState.currentActionIndex]].title }}
                                 </h2>
-                                <ul v-if="magic.length != 0" class="mt-2 -mx-4 text-white">
+                                <ul v-if="magic.length != 0" class="mt-2 -mx-4 dark:text-white">
                                     <li class="flex items-center px-4 py-2 transition-all cursor-pointer select-none group hover:bg-coolgray-400"
                                         :class="{ 'bg-coollabs': currentFocus === index }" id="option-1" role="option"
                                         tabindex="-1" v-for="action, index in magic" @click="goThroughSequence(index)"

diff --git a/resources/views/auth/confirm-password.blade.php b/resources/views/auth/confirm-password.blade.php
@@ -2,7 +2,7 @@
     <div class="flex items-center justify-center h-screen">
         <div>
             <div class="flex flex-col items-center pb-8">
-                <div class="text-5xl font-bold tracking-tight text-center text-white">Coolify</div>
+                <div class="text-5xl font-bold tracking-tight text-center dark:text-white">Coolify</div>
                 <x-version />
             </div>
             <div class="w-96">

diff --git a/resources/views/auth/forgot-password.blade.php b/resources/views/auth/forgot-password.blade.php
@@ -3,7 +3,7 @@
         <div>
             <div class="flex flex-col items-center pb-8">
                 <a href="{{ route('dashboard') }}">
-                    <div class="text-5xl font-bold tracking-tight text-center text-white">Coolify</div>
+                    <div class="text-5xl font-bold tracking-tight text-center dark:text-white">Coolify</div>
                 </a>
                 <x-version />
             </div>
@@ -20,7 +20,7 @@
                     </form>
                 @else
                     <div>Transactional emails are not active on this instance.</div>
-                    <div>See how to set it in our <a class="text-white" target="_blank"
+                    <div>See how to set it in our <a class="dark:text-white" target="_blank"
                             href="{{ config('constants.docs.base_url') }}">docs</a>, or how to
                         manually reset password.
                     </div>

diff --git a/resources/views/auth/reset-password.blade.php b/resources/views/auth/reset-password.blade.php
@@ -3,7 +3,7 @@
         <div>
             <div class="flex flex-col items-center ">
                 <a href="{{ route('dashboard') }}">
-                    <div class="text-5xl font-bold tracking-tight text-center text-white">Coolify</div>
+                    <div class="text-5xl font-bold tracking-tight text-center dark:text-white">Coolify</div>
                 </a>
             </div>
             <div class="flex items-center justify-center pb-4 text-center">

diff --git a/resources/views/auth/two-factor-challenge.blade.php b/resources/views/auth/two-factor-challenge.blade.php
@@ -2,7 +2,7 @@
     <div class="flex items-center justify-center h-screen">
         <div>
             <div class="flex flex-col items-center pb-8">
-                <div class="text-5xl font-bold tracking-tight text-center text-white">Coolify</div>
+                <div class="text-5xl font-bold tracking-tight text-center dark:text-white">Coolify</div>
                 <x-version />
             </div>
             <div class="w-96" x-data="{ showRecovery: false }">
@@ -12,7 +12,7 @@
                         <div>
                             <x-forms.input required type="number" name="code" label="{{ __('input.code') }}"
                                 autofocus />
-                            <div class="pt-2 text-xs cursor-pointer hover:underline hover:text-white"
+                            <div class="pt-2 text-xs cursor-pointer hover:underline hover:dark:text-white"
                                 x-on:click="showRecovery = !showRecovery">Use
                                 Recovery Code
                             </div>
@@ -22,7 +22,7 @@
                         <div>
                             <x-forms.input required type="text" name="recovery_code"
                                 label="{{ __('input.recovery_code') }}" />
-                            <div class="pt-2 text-xs cursor-pointer hover:underline hover:text-white"
+                            <div class="pt-2 text-xs cursor-pointer hover:underline hover:dark:text-white"
                                 x-on:click="showRecovery = !showRecovery">Use
                                 One-Time Code
                             </div>

diff --git a/resources/views/components/applications/advanced.blade.php b/resources/views/components/applications/advanced.blade.php
@@ -1,14 +1,14 @@
 <div class="flex items-center gap-2">
     <div class="group">
-        <label tabindex="0" class="flex items-center gap-2 cursor-pointer hover:text-white"> Advanced
+        <label tabindex="0" class="flex items-center gap-2 cursor-pointer hover:dark:text-white"> Advanced
             <x-chevron-down />
         </label>
         <div class="absolute hidden group-hover:block ">
             <ul tabindex="0"
-                class="relative text-xs text-white normal-case rounded -ml-44 min-w-max menu bg-coolgray-200">
+                class="relative text-xs dark:text-white normal-case rounded -ml-44 min-w-max menu bg-coolgray-200">
                 @if ($application->status === 'running')
                     <li>
-                        <div class="rounded-none hover:bg-coollabs hover:text-white"
+                        <div class="rounded-none hover:bg-coollabs hover:dark:text-white"
                             wire:click='force_deploy_without_cache'>
                             <svg xmlns="http://www.w3.org/2000/svg" class="w-6 h-6" viewBox="0 0 24 24"
                                 stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"
@@ -27,7 +27,7 @@ class="relative text-xs text-white normal-case rounded -ml-44 min-w-max menu bg-
                     </li>
                 @else
                     <li>
-                        <div class="rounded-none hover:bg-coollabs hover:text-white" wire:click='deploy(true)'>
+                        <div class="rounded-none hover:bg-coollabs hover:dark:text-white" wire:click='deploy(true)'>
                             <svg xmlns="http://www.w3.org/2000/svg" class="w-6 h-6" viewBox="0 0 24 24"
                                 stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round"
                                 stroke-linejoin="round">

diff --git a/resources/views/components/confirm-modal.blade.php b/resources/views/components/confirm-modal.blade.php
@@ -20,7 +20,7 @@
 <div x-cloak x-show="open" x-transition class="fixed inset-0 z-50 flex pt-10">
     <div @click.away="open = false" class="w-screen h-20 max-w-xl mx-auto bg-black rounded-lg">
         <div class="flex flex-col items-center justify-center h-full">
-            <div class="pb-5 text-white" x-text="message"></div>
+            <div class="pb-5 dark:text-white" x-text="message"></div>
             <div>
                 <x-forms.button x-on:click='confirmed()'>Confirm</x-forms.button>
                 <x-forms.button x-on:click="open = false">Cancel</x-forms.button>

diff --git a/resources/views/components/forms/input.blade.php b/resources/views/components/forms/input.blade.php
@@ -16,7 +16,7 @@
         <div class="relative" x-data="{ type: 'password' }">
             @if ($allowToPeak)
                 <div x-on:click="changePasswordFieldType"
-                    class="absolute inset-y-0 right-0 flex items-center pr-2 cursor-pointer hover:text-white">
+                    class="absolute inset-y-0 right-0 flex items-center pr-2 cursor-pointer hover:dark:text-white">
                     <svg xmlns="http://www.w3.org/2000/svg" class="w-6 h-6" 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" />

diff --git a/resources/views/components/forms/select.blade.php b/resources/views/components/forms/select.blade.php
@@ -9,7 +9,7 @@
             @endif
         </label>
     @endif
-    <select {{ $attributes->merge(['class' => $defaultClass]) }} @required($required) wire:dirty.class.remove='text-white'
+    <select {{ $attributes->merge(['class' => $defaultClass]) }} @required($required) wire:dirty.class.remove='dark:text-white'
         wire:dirty.class="text-black bg-warning" wire:loading.attr="disabled" name={{ $id }}
         @if ($attributes->whereStartsWith('wire:model')->first()) {{ $attributes->whereStartsWith('wire:model')->first() }} @else wire:model={{ $id }} @endif>
         {{ $slot }}

diff --git a/resources/views/components/forms/textarea.blade.php b/resources/views/components/forms/textarea.blade.php
@@ -13,7 +13,7 @@
         <div class="relative" x-data="{ type: 'password' }">
             @if ($allowToPeak)
                 <div x-on:click="changePasswordFieldType"
-                    class="absolute inset-y-0 right-0 flex items-center h-6 pt-2 pr-2 cursor-pointer hover:text-white">
+                    class="absolute inset-y-0 right-0 flex items-center h-6 pt-2 pr-2 cursor-pointer hover:dark:text-white">
                     <svg xmlns="http://www.w3.org/2000/svg" class="w-6 h-6" 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" />

diff --git a/resources/views/components/limit-reached.blade.php b/resources/views/components/limit-reached.blade.php
@@ -1,6 +1,6 @@
 <div class="flex flex-col items-center justify-center h-32">
-    <span class="text-xl font-bold text-white">You have reached the limit of {{ $name }} you can create.</span>
-    <span>Please <a class="text-white underline "href="{{ route('subscription.show') }}">upgrade your
+    <span class="text-xl font-bold dark:text-white">You have reached the limit of {{ $name }} you can create.</span>
+    <span>Please <a class="dark:text-white underline "href="{{ route('subscription.show') }}">upgrade your
             subscription</a> to create more
         {{ $name }}.</span>
 </div>