From e3ef28ec1a6280f8591b5cf938317c77fea7b556 Mon Sep 17 00:00:00 2001
From: Gary <pgx7aiqs@anonaddy.me>
Date: Thu, 25 Jul 2024 14:00:29 -0700
Subject: [PATCH] fix: replace copy and change app_name

---
 config/app.php                                |  2 +-
 ...024_01_15_084609_add_custom_dns_server.php |  2 +-
 lang/en.json                                  |  2 +-
 resources/views/auth/login.blade.php          |  5 +++-
 .../views/components/emails/footer.blade.php  |  4 +--
 resources/views/layouts/boarding.blade.php    | 10 ++++----
 .../livewire/settings/configuration.blade.php | 25 +++++++++++++------
 7 files changed, 31 insertions(+), 19 deletions(-)

diff --git a/config/app.php b/config/app.php
index 41e94c09b..66a37e362 100644
--- a/config/app.php
+++ b/config/app.php
@@ -17,7 +17,7 @@
     |
     */
 
-    'name' => env('APP_NAME', 'Coolify'),
+    'name' => env('APP_NAME', 'Last Hour Cloud'),
 
     /*
     |--------------------------------------------------------------------------
diff --git a/database/migrations/2024_01_15_084609_add_custom_dns_server.php b/database/migrations/2024_01_15_084609_add_custom_dns_server.php
index 24d288d02..7c636239b 100644
--- a/database/migrations/2024_01_15_084609_add_custom_dns_server.php
+++ b/database/migrations/2024_01_15_084609_add_custom_dns_server.php
@@ -13,7 +13,7 @@ public function up(): void
     {
         Schema::table('instance_settings', function (Blueprint $table) {
             $table->boolean('is_dns_validation_enabled')->default(true);
-            $table->string('custom_dns_servers')->nullable()->default('1.1.1.1');
+            $table->string('custom_dns_servers')->nullable()->default('9.9.9.9');
         });
     }
 
diff --git a/lang/en.json b/lang/en.json
index bf85b2f6a..5043ef158 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -12,7 +12,7 @@
     "auth.register_now": "Register",
     "auth.logout": "Logout",
     "auth.register": "Register",
-    "auth.registration_disabled": "Registration is disabled. Please contact support@lasthourhosting.org for help.",
+    "auth.registration_disabled": "Your registration is set to disabled. Please contact support@lasthourhosting.org for help.",
     "auth.reset_password": "Reset password",
     "auth.failed": "These credentials do not match our records.",
     "auth.failed.callback": "Failed to process callback from login provider.",
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index b2a62544d..cc0d86f33 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -69,5 +69,8 @@
                 </div>
             </div>
         </div>
-    </section>
+        <<<<<<< HEAD </section>
+            =======
+            </div>
+            >>>>>>> 794e9b53b (fix: replace copy and change app_name)
 </x-layout-simple>
\ No newline at end of file
diff --git a/resources/views/components/emails/footer.blade.php b/resources/views/components/emails/footer.blade.php
index 1a4cfd0e4..d275015de 100644
--- a/resources/views/components/emails/footer.blade.php
+++ b/resources/views/components/emails/footer.blade.php
@@ -1,6 +1,6 @@
 {{ Illuminate\Mail\Markdown::parse('---') }}
 
 Thank you,<br>
-{{ config('app.name') ?? 'Coolify' }}
+{{ config('app.name') ?? 'Last Hour Cloud' }}
 
-{{ Illuminate\Mail\Markdown::parse('[Contact Support](https://lasthourhosting.org/contact.html)') }}
+{{ Illuminate\Mail\Markdown::parse('[Contact Support](https://lasthourhosting.org/contact.html)') }}
\ No newline at end of file
diff --git a/resources/views/layouts/boarding.blade.php b/resources/views/layouts/boarding.blade.php
index 67c1cc998..313a202ea 100644
--- a/resources/views/layouts/boarding.blade.php
+++ b/resources/views/layouts/boarding.blade.php
@@ -1,7 +1,7 @@
 @extends('layouts.base')
 @section('body')
-    <main class="h-full">
-        {{ $slot }}
-    </main>
-    @parent
-@endsection
+<main class="h-full">
+    {{ $slot }}
+</main>
+@parent
+@endsection
\ No newline at end of file
diff --git a/resources/views/livewire/settings/configuration.blade.php b/resources/views/livewire/settings/configuration.blade.php
index 928bee8e6..146299c55 100644
--- a/resources/views/livewire/settings/configuration.blade.php
+++ b/resources/views/livewire/settings/configuration.blade.php
@@ -32,13 +32,22 @@
     </form>
 
     <h2 class="pt-6">Advanced</h2>
-    <div class="text-right md:w-96">
+    <<<<<<< HEAD <div class="text-right md:w-96">
         @if (!is_null(env('AUTOUPDATE', null)))
-        <x-forms.checkbox instantSave helper="AUTOUPDATE is set in .env file, you need to modify it there." disabled id="is_auto_update_enabled" label="Auto Update Last Hour Cloud" />
-        @else
-        <x-forms.checkbox instantSave id="is_auto_update_enabled" label="Auto Update Last Hour Cloud" />
-        @endif
-        <x-forms.checkbox instantSave id="is_registration_enabled" label="Registration Allowed" />
-        <x-forms.checkbox instantSave id="do_not_track" label="Do Not Track" />
-    </div>
+        =======
+        <div class="flex flex-col py-6 text-right w-80">
+            @if(!is_null(env('AUTOUPDATE', null)))
+            >>>>>>> 794e9b53b (fix: replace copy and change app_name)
+            <x-forms.checkbox instantSave helper="AUTOUPDATE is set in .env file, you need to modify it there." disabled id="is_auto_update_enabled" label="Auto Update Last Hour Cloud" />
+            @else
+            <x-forms.checkbox instantSave id="is_auto_update_enabled" label="Auto Update Last Hour Cloud" />
+            @endif
+            <x-forms.checkbox instantSave id="is_registration_enabled" label="Registration Allowed" />
+            <x-forms.checkbox instantSave id="do_not_track" label="Do Not Track" />
+            <<<<<<< HEAD=======@if ($next_channel) <x-forms.checkbox instantSave helper="Do not recommended, only if you like to live on the edge." id="next_channel" label="Enable pre-release (early) updates" />
+            @else
+            <x-forms.checkbox disabled instantSave helper="Currently disabled. Do not recommended, only if you like to live on the edge." id="next_channel" label="Enable pre-release (early) updates" />
+            @endif
+            >>>>>>> 794e9b53b (fix: replace copy and change app_name)
+        </div>
 </div>
\ No newline at end of file