Merge branch 'next' into feat-db-ssl

resources/views/layouts/base.blade.php

@@ -5,6 +5,20 @@
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
     <meta name="robots" content="noindex">
+    <meta name="theme-color" content="#ffffff" />
+    <meta name="Description" content="Coolify: An open-source & self-hostable Heroku / Netlify / Vercel alternative" />
+    <meta name="viewport" content="width=device-width,initial-scale=1" />
+    <meta name="twitter:card" content="summary_large_image" />
+    <meta name="twitter:site" content="@coolifyio" />
+    <meta name="twitter:title" content="Coolify" />
+    <meta name="twitter:description" content="An open-source & self-hostable Heroku / Netlify / Vercel alternative." />
+    <meta name="twitter:image" content="https://cdn.coollabs.io/assets/coolify/og-image.png" />
+    <meta property="og:type" content="website" />
+    <meta property="og:url" content="https://coolify.io" />
+    <meta property="og:title" content="Coolify" />
+    <meta property="og:description" content="An open-source & self-hostable Heroku / Netlify / Vercel alternative." />
+    <meta property="og:site_name" content="Coolify" />
+    <meta property="og:image" content="https://cdn.coollabs.io/assets/coolify/og-image.png" />
     @use('App\Models\InstanceSettings')
     @php
 
@@ -21,7 +35,7 @@
     @endphp
     <title>{{ $name }}{{ $title ?? 'Coolify' }}</title>
     @env('local')
-    <link rel="icon" href="{{ asset('favicon-dev.png') }}" type="image/x-icon" />
+    <link rel="icon" href="{{ asset('coolify-logo-dev-transparent.png') }}" type="image/x-icon" />
 @else
     <link rel="icon" href="{{ asset('coolify-transparent.png') }}" type="image/x-icon" />
     @endenv

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

@@ -291,16 +291,18 @@
                 @if ($application->settings->is_raw_compose_deployment_enabled)
                     <x-forms.textarea rows="10" readonly id="application.docker_compose_raw"
                         label="Docker Compose Content (applicationId: {{ $application->id }})"
-                        helper="You need to modify the docker compose file." monacoEditorLanguage="yaml"
-                        useMonacoEditor />
+                        helper="You need to modify the docker compose file in the git repository."
+                        monacoEditorLanguage="yaml" useMonacoEditor />
                 @else
                     @if ((int) $application->compose_parsing_version >= 3)
                         <x-forms.textarea rows="10" readonly id="application.docker_compose_raw"
-                            label="Docker Compose Content (raw)" helper="You need to modify the docker compose file."
+                            label="Docker Compose Content (raw)"
+                            helper="You need to modify the docker compose file in the git repository."
                             monacoEditorLanguage="yaml" useMonacoEditor />
                     @endif
                     <x-forms.textarea rows="10" readonly id="application.docker_compose"
-                        label="Docker Compose Content" helper="You need to modify the docker compose file."
+                        label="Docker Compose Content"
+                        helper="You need to modify the docker compose file in the git repository."
                         monacoEditorLanguage="yaml" useMonacoEditor />
                 @endif
                 <div class="w-96">

resources/views/livewire/project/new/select.blade.php

@@ -103,7 +103,7 @@
                                                 :src='service.logo'
                                                 x-on:error.window="$event.target.src = service.logo_github_url"
                                                 onerror="this.onerror=null; this.src=this.getAttribute('data-fallback');"
-                                                x-on:error="$event.target.src = '/svgs/coolify.png'"
+                                                x-on:error="$event.target.src = '/svgs/coolify-transparent.png'"
                                                 :data-fallback='service.logo_github_url' />
                                         </template>
                                     </x-slot:logo>

resources/views/livewire/project/shared/environment-variable/all.blade.php

@@ -8,7 +8,7 @@
                 </x-modal-input>
             </div>
             <x-forms.button
-                wire:click='switch'>{{ $view === 'normal' ? 'Developer view' : 'Normal view (required to set variables at build time)' }}</x-forms.button>
+                wire:click='switch'>{{ $view === 'normal' ? 'Developer view' : 'Normal view' }}</x-forms.button>
         </div>
         <div>Environment variables (secrets) for this resource. </div>
         @if ($this->resourceClass === 'App\Models\Application' && data_get($this->resource, 'build_pack') !== 'dockercompose')
@@ -41,9 +41,9 @@
             $requiredEmptyVars = $resource->environment_variables->filter(function ($env) {
                 return $env->is_required && empty($env->value);
             });
+
             $otherVars = $resource->environment_variables->diff($requiredEmptyVars);
         @endphp
-
         @forelse ($requiredEmptyVars->merge($otherVars) as $env)
             <livewire:project.shared.environment-variable.show wire:key="environment-{{ $env->id }}"
                 :env="$env" :type="$resource->type()" />