Skip to content

Commit 4052d1b

Browse files
andrasbacsaiandrasbacsai
committed
Refactor color classes from yellow to warning across the application
- Updated color classes in NotifyDemo.php to use warning colors. - Added new warning color variables in app.css. - Changed warning icon colors in callout.blade.php. - Updated loading spinner and hover states in global-search.blade.php. - Refactored warning messages and styles in project application views. - Adjusted log display colors in get-logs.blade.php. - Updated private key status indicators in index.blade.php. - Changed hover and text colors for documentation links in cloudflare-tunnel.blade.php. - Refactored server creation messages in by-hetzner.blade.php. - Updated proxy warning button colors in proxy.blade.php. - Changed loading spinner colors in show.blade.php. - Updated deployment status colors in deployments.blade.php and show.blade.php.
1 parent 0d7f777 commit 4052d1b

File tree

14 files changed

+100
-59
lines changed

14 files changed

+100
-59
lines changed

‎app/Console/Commands/NotifyDemo.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ private function showHelp()
5656
php artisan app:demo-notify {channel}
5757
</p>
5858
<div class="my-1">
59-
<div class="text-yellow-500"> Channels: </div>
59+
<div class="text-warning-500"> Channels: </div>
6060
<ul class="text-coolify">
6161
<li>email</li>
6262
<li>discord</li>

‎resources/css/app.css‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,16 @@
1818

1919
--color-base: #101010;
2020
--color-warning: #fcd452;
21+
--color-warning-50: #fefce8;
22+
--color-warning-100: #fef9c3;
23+
--color-warning-200: #fef08a;
24+
--color-warning-300: #fde047;
25+
--color-warning-400: #fcd452;
26+
--color-warning-500: #facc15;
27+
--color-warning-600: #ca8a04;
28+
--color-warning-700: #a16207;
29+
--color-warning-800: #854d0e;
30+
--color-warning-900: #713f12;
2131
--color-success: #22C55E;
2232
--color-error: #dc2626;
2333
--color-coollabs-50: #f5f0ff;

‎resources/views/components/callout.blade.php‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
@php
44
$icons = [
5-
'warning' => '<svg class="w-5 h-5 text-yellow-600 dark:text-yellow-400" fill="currentColor" viewBox="0 0 20 20"><path fill-rule="evenodd" d="M8.257 3.099c.765-1.36 2.722-1.36 3.486 0l5.58 9.92c.75 1.334-.213 2.98-1.742 2.98H4.42c-1.53 0-2.493-1.646-1.743-2.98l5.58-9.92zM11 13a1 1 0 11-2 0 1 1 0 012 0zm-1-8a1 1 0 00-1 1v3a1 1 0 002 0V6a1 1 0 00-1-1z" clip-rule="evenodd"></path></svg>',
5+
'warning' => '<svg class="w-5 h-5 text-warning-600 dark:text-warning-400" fill="currentColor" viewBox="0 0 20 20"><path fill-rule="evenodd" d="M8.257 3.099c.765-1.36 2.722-1.36 3.486 0l5.58 9.92c.75 1.334-.213 2.98-1.742 2.98H4.42c-1.53 0-2.493-1.646-1.743-2.98l5.58-9.92zM11 13a1 1 0 11-2 0 1 1 0 012 0zm-1-8a1 1 0 00-1 1v3a1 1 0 002 0V6a1 1 0 00-1-1z" clip-rule="evenodd"></path></svg>',
66
77
'danger' => '<svg class="w-5 h-5 text-red-600 dark:text-red-400" fill="currentColor" viewBox="0 0 20 20"><path fill-rule="evenodd" d="M10 18a8 8 0 100-16 8 8 0 000 16zM8.707 7.293a1 1 0 00-1.414 1.414L8.586 10l-1.293 1.293a1 1 0 101.414 1.414L10 11.414l1.293 1.293a1 1 0 001.414-1.414L11.414 10l1.293-1.293a1 1 0 00-1.414-1.414L10 8.586 8.707 7.293z" clip-rule="evenodd"></path></svg>',
88
@@ -13,10 +13,10 @@
1313
1414
$colors = [
1515
'warning' => [
16-
'bg' => 'bg-yellow-50 dark:bg-yellow-900/30',
17-
'border' => 'border-yellow-300 dark:border-yellow-800',
18-
'title' => 'text-yellow-800 dark:text-yellow-300',
19-
'text' => 'text-yellow-700 dark:text-yellow-200'
16+
'bg' => 'bg-warning-50 dark:bg-warning-900/30',
17+
'border' => 'border-warning-300 dark:border-warning-800',
18+
'title' => 'text-warning-800 dark:text-warning-300',
19+
'text' => 'text-warning-700 dark:text-warning-200'
2020
],
2121
'danger' => [
2222
'bg' => 'bg-red-50 dark:bg-red-900/30',

‎resources/views/livewire/global-search.blade.php‎

Lines changed: 22 additions & 22 deletions
Large diffs are not rendered by default.

‎resources/views/livewire/project/application/general.blade.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -386,7 +386,7 @@
386386
@if ($this->detectedPortInfo)
387387
@if ($this->detectedPortInfo['isEmpty'])
388388
<div
389-
class="flex items-start gap-2 p-4 mb-4 text-sm rounded-lg bg-yellow-50 dark:bg-yellow-900/20 text-yellow-800 dark:text-yellow-300 border border-yellow-200 dark:border-yellow-800">
389+
class="flex items-start gap-2 p-4 mb-4 text-sm rounded-lg bg-warning-50 dark:bg-warning-900/20 text-warning-800 dark:text-warning-300 border border-warning-200 dark:border-warning-800">
390390
<svg class="w-5 h-5 shrink-0 mt-0.5" fill="currentColor" viewBox="0 0 20 20">
391391
<path fill-rule="evenodd"
392392
d="M8.485 2.495c.673-1.167 2.357-1.167 3.03 0l6.28 10.875c.673 1.167-.17 2.625-1.516 2.625H3.72c-1.347 0-2.189-1.458-1.515-2.625L8.485 2.495zM10 5a.75.75 0 01.75.75v3.5a.75.75 0 01-1.5 0v-3.5A.75.75 0 0110 5zm0 9a1 1 0 100-2 1 1 0 000 2z"
@@ -402,7 +402,7 @@ class="flex items-start gap-2 p-4 mb-4 text-sm rounded-lg bg-yellow-50 dark:bg-y
402402
</div>
403403
@elseif (!$this->detectedPortInfo['matches'])
404404
<div
405-
class="flex items-start gap-2 p-4 mb-4 text-sm rounded-lg bg-yellow-50 dark:bg-yellow-900/20 text-yellow-800 dark:text-yellow-300 border border-yellow-200 dark:border-yellow-800">
405+
class="flex items-start gap-2 p-4 mb-4 text-sm rounded-lg bg-warning-50 dark:bg-warning-900/20 text-warning-800 dark:text-warning-300 border border-warning-200 dark:border-warning-800">
406406
<svg class="w-5 h-5 shrink-0 mt-0.5" fill="currentColor" viewBox="0 0 20 20">
407407
<path fill-rule="evenodd"
408408
d="M8.485 2.495c.673-1.167 2.357-1.167 3.03 0l6.28 10.875c.673 1.167-.17 2.625-1.516 2.625H3.72c-1.347 0-2.189-1.458-1.515-2.625L8.485 2.495zM10 5a.75.75 0 01.75.75v3.5a.75.75 0 01-1.5 0v-3.5A.75.75 0 0110 5zm0 9a1 1 0 100-2 1 1 0 000 2z"

‎resources/views/livewire/project/database/scheduled-backups.blade.php‎

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,18 @@ class="px-3 py-1 rounded-md text-xs font-medium tracking-wide shadow-xs bg-gray-
7171
<div class="text-gray-600 dark:text-gray-400 text-sm">
7272
@if ($backup->latest_log)
7373
@if (data_get($backup->latest_log, 'status') === 'running')
74-
<span title="Started: {{ formatDateInServerTimezone(data_get($backup->latest_log, 'created_at'), $backup->server()) }}">
75-
Running for {{ calculateDuration(data_get($backup->latest_log, 'created_at'), now()) }}
74+
<span
75+
title="Started: {{ formatDateInServerTimezone(data_get($backup->latest_log, 'created_at'), $backup->server()) }}">
76+
Running for
77+
{{ calculateDuration(data_get($backup->latest_log, 'created_at'), now()) }}
7678
</span>
7779
@else
78-
<span title="Started: {{ formatDateInServerTimezone(data_get($backup->latest_log, 'created_at'), $backup->server()) }}&#10;Ended: {{ formatDateInServerTimezone(data_get($backup->latest_log, 'finished_at'), $backup->server()) }}">
80+
<span
81+
title="Started: {{ formatDateInServerTimezone(data_get($backup->latest_log, 'created_at'), $backup->server()) }}&#10;Ended: {{ formatDateInServerTimezone(data_get($backup->latest_log, 'finished_at'), $backup->server()) }}">
7982
{{ \Carbon\Carbon::parse(data_get($backup->latest_log, 'finished_at'))->diffForHumans() }}
8083
({{ calculateDuration(data_get($backup->latest_log, 'created_at'), data_get($backup->latest_log, 'finished_at')) }})
81-
• {{ \Carbon\Carbon::parse(data_get($backup->latest_log, 'finished_at'))->format('M j, H:i') }}
84+
•
85+
{{ \Carbon\Carbon::parse(data_get($backup->latest_log, 'finished_at'))->format('M j, H:i') }}
8286
</span>
8387
@endif
8488
@if (data_get($backup->latest_log, 'status') === 'success')
@@ -155,14 +159,18 @@ class="px-3 py-1 rounded-md text-xs font-medium tracking-wide shadow-xs bg-gray-
155159
<div class="text-gray-600 dark:text-gray-400 text-sm">
156160
@if ($backup->latest_log)
157161
@if (data_get($backup->latest_log, 'status') === 'running')
158-
<span title="Started: {{ formatDateInServerTimezone(data_get($backup->latest_log, 'created_at'), $backup->server()) }}">
159-
Running for {{ calculateDuration(data_get($backup->latest_log, 'created_at'), now()) }}
162+
<span
163+
title="Started: {{ formatDateInServerTimezone(data_get($backup->latest_log, 'created_at'), $backup->server()) }}">
164+
Running for
165+
{{ calculateDuration(data_get($backup->latest_log, 'created_at'), now()) }}
160166
</span>
161167
@else
162-
<span title="Started: {{ formatDateInServerTimezone(data_get($backup->latest_log, 'created_at'), $backup->server()) }}&#10;Ended: {{ formatDateInServerTimezone(data_get($backup->latest_log, 'finished_at'), $backup->server()) }}">
168+
<span
169+
title="Started: {{ formatDateInServerTimezone(data_get($backup->latest_log, 'created_at'), $backup->server()) }}&#10;Ended: {{ formatDateInServerTimezone(data_get($backup->latest_log, 'finished_at'), $backup->server()) }}">
163170
{{ \Carbon\Carbon::parse(data_get($backup->latest_log, 'finished_at'))->diffForHumans() }}
164171
({{ calculateDuration(data_get($backup->latest_log, 'created_at'), data_get($backup->latest_log, 'finished_at')) }})
165-
• {{ \Carbon\Carbon::parse(data_get($backup->latest_log, 'finished_at'))->format('M j, H:i') }}
172+
•
173+
{{ \Carbon\Carbon::parse(data_get($backup->latest_log, 'finished_at'))->format('M j, H:i') }}
166174
</span>
167175
@endif
168176
@if (data_get($backup->latest_log, 'status') === 'success')
@@ -186,7 +194,7 @@ class="px-3 py-1 rounded-md text-xs font-medium tracking-wide shadow-xs bg-gray-
186194
• Success Rate: <span @class([
187195
'font-medium',
188196
'text-green-600' => $successRate >= 80,
189-
'text-yellow-600' => $successRate >= 50 && $successRate < 80,
197+
'text-warning-600' => $successRate >= 50 && $successRate < 80,
190198
'text-red-600' => $successRate < 50,
191199
])>{{ $successRate }}%</span>
192200
({{ $successCount }}/{{ $totalCount }})

‎resources/views/livewire/project/shared/get-logs.blade.php‎

Lines changed: 32 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -103,15 +103,37 @@
103103
</div>
104104
@if ($outputs)
105105
<div id="logs" class="font-mono text-sm">
106-
@foreach(explode("\n", trim($outputs)) as $line)
107-
@if(!empty(trim($line)))
106+
@foreach (explode("\n", trim($outputs)) as $line)
107+
@if (!empty(trim($line)))
108108
@php
109109
$lowerLine = strtolower($line);
110-
$isError = str_contains($lowerLine, 'error') || str_contains($lowerLine, 'err') || str_contains($lowerLine, 'failed') || str_contains($lowerLine, 'exception');
111-
$isWarning = str_contains($lowerLine, 'warn') || str_contains($lowerLine, 'warning') || str_contains($lowerLine, 'wrn');
112-
$isDebug = str_contains($lowerLine, 'debug') || str_contains($lowerLine, 'dbg') || str_contains($lowerLine, 'trace');
113-
$barColor = $isError ? 'bg-red-500 dark:bg-red-400' : ($isWarning ? 'bg-yellow-500 dark:bg-yellow-400' : ($isDebug ? 'bg-purple-500 dark:bg-purple-400' : 'bg-blue-500 dark:bg-blue-400'));
114-
$bgColor = $isError ? 'bg-red-50/50 dark:bg-red-900/20 hover:bg-red-100/50 dark:hover:bg-red-800/30' : ($isWarning ? 'bg-yellow-50/50 dark:bg-yellow-900/20 hover:bg-yellow-100/50 dark:hover:bg-yellow-800/30' : ($isDebug ? 'bg-purple-50/50 dark:bg-purple-900/20 hover:bg-purple-100/50 dark:hover:bg-purple-800/30' : 'bg-blue-50/50 dark:bg-blue-900/20 hover:bg-blue-100/50 dark:hover:bg-blue-800/30'));
110+
$isError =
111+
str_contains($lowerLine, 'error') ||
112+
str_contains($lowerLine, 'err') ||
113+
str_contains($lowerLine, 'failed') ||
114+
str_contains($lowerLine, 'exception');
115+
$isWarning =
116+
str_contains($lowerLine, 'warn') ||
117+
str_contains($lowerLine, 'warning') ||
118+
str_contains($lowerLine, 'wrn');
119+
$isDebug =
120+
str_contains($lowerLine, 'debug') ||
121+
str_contains($lowerLine, 'dbg') ||
122+
str_contains($lowerLine, 'trace');
123+
$barColor = $isError
124+
? 'bg-red-500 dark:bg-red-400'
125+
: ($isWarning
126+
? 'bg-warning-500 dark:bg-warning-400'
127+
: ($isDebug
128+
? 'bg-purple-500 dark:bg-purple-400'
129+
: 'bg-blue-500 dark:bg-blue-400'));
130+
$bgColor = $isError
131+
? 'bg-red-50/50 dark:bg-red-900/20 hover:bg-red-100/50 dark:hover:bg-red-800/30'
132+
: ($isWarning
133+
? 'bg-warning-50/50 dark:bg-warning-900/20 hover:bg-warning-100/50 dark:hover:bg-warning-800/30'
134+
: ($isDebug
135+
? 'bg-purple-50/50 dark:bg-purple-900/20 hover:bg-purple-100/50 dark:hover:bg-purple-800/30'
136+
: 'bg-blue-50/50 dark:bg-blue-900/20 hover:bg-blue-100/50 dark:hover:bg-blue-800/30'));
115137
116138
// Check for timestamp at the beginning (ISO 8601 format)
117139
$timestampPattern = '/^(\d{4}-\d{2}-\d{2}[T ]\d{2}:\d{2}:\d{2}(?:\.\d{3})?Z?)\s+/';
@@ -122,8 +144,9 @@
122144
<div class="flex items-start gap-2 py-1 px-2 rounded-sm">
123145
<div class="w-1 {{ $barColor }} rounded-full flex-shrink-0 self-stretch"></div>
124146
<div class="flex-1 {{ $bgColor }} py-1 px-2 -mx-2 rounded-sm">
125-
@if($hasTimestamp)
126-
<span class="text-xs text-gray-500 dark:text-gray-400 font-mono mr-2">{{ $timestamp }}</span>
147+
@if ($hasTimestamp)
148+
<span
149+
class="text-xs text-gray-500 dark:text-gray-400 font-mono mr-2">{{ $timestamp }}</span>
127150
<span class="whitespace-pre-wrap break-all">{{ $logContent }}</span>
128151
@else
129152
<span class="whitespace-pre-wrap break-all">{{ $line }}</span>

‎resources/views/livewire/security/private-key/index.blade.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
{{ $key->description }}
2727
@if (!$key->isInUse())
2828
<span
29-
class="inline-flex items-center px-2 py-0.5 rounded-sm text-xs font-medium bg-yellow-400 text-black">Unused</span>
29+
class="inline-flex items-center px-2 py-0.5 rounded-sm text-xs font-medium bg-warning-400 text-black">Unused</span>
3030
@endif
3131
</div>
3232
</div>
@@ -43,7 +43,7 @@ class="inline-flex items-center px-2 py-0.5 rounded-sm text-xs font-medium bg-ye
4343
{{ $key->description }}
4444
@if (!$key->isInUse())
4545
<span
46-
class="inline-flex items-center px-2 py-0.5 rounded-sm text-xs font-medium bg-yellow-400 text-black">Unused</span>
46+
class="inline-flex items-center px-2 py-0.5 rounded-sm text-xs font-medium bg-warning-400 text-black">Unused</span>
4747
@endif
4848
</div>
4949
</div>

‎resources/views/livewire/server/cloudflare-tunnel.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ class="underline">documentation</a>.
7474
<div class="flex flex-col pb-2">
7575
<h3>Automated </h3>
7676
<a href="https://coolify.io/docs/knowledge-base/cloudflare/tunnels/server-ssh" target="_blank"
77-
class="text-xs underline hover:text-yellow-600 dark:hover:text-yellow-200">Docs<x-external-link /></a>
77+
class="text-xs underline hover:text-warning-600 dark:hover:text-warning-200">Docs<x-external-link /></a>
7878
</div>
7979
<div class="flex gap-2">
8080
<x-slide-over @automated.window="slideOverOpen = true" fullScreen>

‎resources/views/livewire/server/new/by-hetzner.blade.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
<x-highlighted text="*" />
112112
</label>
113113
<div
114-
class="p-4 border border-yellow-500 dark:border-yellow-600 rounded bg-yellow-50 dark:bg-yellow-900/10">
114+
class="p-4 border border-warning-500 dark:border-warning-600 rounded bg-warning-50 dark:bg-warning-900/10">
115115
<p class="text-sm mb-3 text-neutral-700 dark:text-neutral-300">
116116
No private keys found. You need to create a private key to continue.
117117
</p>

0 commit comments

Comments
 (0)