From 794e9b53b813a8a38b6ea08d5f42651fbad63651 Mon Sep 17 00:00:00 2001
From: Gary <pgx7aiqs@anonaddy.me>
Date: Thu, 7 Mar 2024 13:00:33 -0800
Subject: [PATCH] fix: replace copy and change app_name

---
 bootstrap/helpers/shared.php                  |  2 +-
 config/app.php                                |  2 +-
 ...024_01_15_084609_add_custom_dns_server.php |  2 +-
 lang/en.json                                  |  2 +-
 resources/views/auth/login.blade.php          | 70 +++++++++----------
 resources/views/auth/register.blade.php       | 34 ++++-----
 .../views/components/emails/footer.blade.php  |  4 +-
 resources/views/layouts/boarding.blade.php    | 24 ++++---
 .../livewire/settings/configuration.blade.php | 16 ++---
 9 files changed, 72 insertions(+), 84 deletions(-)

diff --git a/bootstrap/helpers/shared.php b/bootstrap/helpers/shared.php
index 794a1f78c..7a264fa7e 100644
--- a/bootstrap/helpers/shared.php
+++ b/bootstrap/helpers/shared.php
@@ -145,7 +145,7 @@ function get_latest_version_of_coolify(): string
     try {
         $response = Http::get('https://cdn.lasthourhosting.org/lasthourcloud/versions.json');
         $versions = $response->json();
-        return data_get($versions, 'coolify.v4.version');
+        return data_get($versions, 'lasthourcloud.v4.version');
     } catch (\Throwable $e) {
         //throw $e;
         ray($e->getMessage());
diff --git a/config/app.php b/config/app.php
index 5851640be..a6a7566f0 100644
--- a/config/app.php
+++ b/config/app.php
@@ -17,7 +17,7 @@ return [
     |
     */
 
-    '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 @@ return new class extends Migration
     {
         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 49888d605..bf0afd929 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -7,7 +7,7 @@
     "auth.register_now": "Register a new account",
     "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.password": "The provided password is incorrect.",
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index 91d735428..0223ba8f0 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -2,66 +2,62 @@
     <div class="min-h-screen hero">
         <div class="w-96 min-w-fit">
             <div class="flex flex-col items-center pb-8">
-                <div class="text-5xl font-extrabold tracking-tight text-center text-white">Last Hour Cloud</div>
+                <img class="transition rounded w-22 h-22" src="{{ asset('lasthour-transparent.png') }}">
             </div>
             <div class="flex items-center gap-2">
                 <h1>{{ __('auth.login') }}</h1>
                 @if ($is_registration_enabled)
-                    @if (config('coolify.waitlist'))
-                        <a href="/waitlist"
-                            class="text-xs text-center text-white normal-case bg-transparent border-none rounded no-animation hover:no-underline btn btn-sm bg-coollabs-gradient">
-                            Join the waitlist
-                        </a>
-                    @else
-                        <a href="/register"
-                            class="text-xs text-center text-white normal-case bg-transparent border-none rounded no-animation hover:no-underline btn btn-sm bg-coollabs-gradient">
-                            {{ __('auth.register_now') }}
-                        </a>
-                    @endif
+                @if (config('coolify.waitlist'))
+                <a href="/waitlist" class="text-xs text-center text-white normal-case bg-transparent border-none rounded no-animation hover:no-underline btn btn-sm bg-coollabs-gradient">
+                    Join the waitlist
+                </a>
+                @else
+                <a href="/register" class="text-xs text-center text-white normal-case bg-transparent border-none rounded no-animation hover:no-underline btn btn-sm bg-coollabs-gradient">
+                    {{ __('auth.register_now') }}
+                </a>
+                @endif
                 @endif
             </div>
             <div>
                 <form action="/login" method="POST" class="flex flex-col gap-2">
                     @csrf
                     @env('local')
-                        <x-forms.input value="test@example.com" type="email" name="email" required
-                            label="{{ __('input.email') }}" autofocus />
+                    <x-forms.input value="test@example.com" type="email" name="email" required label="{{ __('input.email') }}" autofocus />
 
-                        <x-forms.input value="password" type="password" name="password" required
-                            label="{{ __('input.password') }}" />
-                        <a href="/forgot-password" class="text-xs">
-                            {{ __('auth.forgot_password') }}?
-                        </a>
+                    <x-forms.input value="password" type="password" name="password" required label="{{ __('input.password') }}" />
+                    <a href="/forgot-password" class="text-xs">
+                        {{ __('auth.forgot_password') }}?
+                    </a>
                     @else
-                        <x-forms.input type="email" name="email" required label="{{ __('input.email') }}" autofocus />
-                        <x-forms.input type="password" name="password" required label="{{ __('input.password') }}" />
-                        <a href="/forgot-password" class="text-xs">
-                            {{ __('auth.forgot_password') }}?
-                        </a>
+                    <x-forms.input type="email" name="email" required label="{{ __('input.email') }}" autofocus />
+                    <x-forms.input type="password" name="password" required label="{{ __('input.password') }}" />
+                    <a href="/forgot-password" class="text-xs">
+                        {{ __('auth.forgot_password') }}?
+                    </a>
                     @endenv
                     <x-forms.button type="submit">{{ __('auth.login') }}</x-forms.button>
                     @if (!$is_registration_enabled)
-                        <div class="text-center ">{{ __('auth.registration_disabled') }}</div>
+                    <div class="text-center ">{{ __('auth.registration_disabled') }}</div>
                     @endif
                     @if ($errors->any())
-                        <div class="text-xs text-center text-error">
-                            @foreach ($errors->all() as $error)
-                                <p>{{ $error }}</p>
-                            @endforeach
-                        </div>
+                    <div class="text-xs text-center text-error">
+                        @foreach ($errors->all() as $error)
+                        <p>{{ $error }}</p>
+                        @endforeach
+                    </div>
                     @endif
                     @if (session('status'))
-                        <div class="mb-4 font-medium text-green-600">
-                            {{ session('status') }}
-                        </div>
+                    <div class="mb-4 font-medium text-green-600">
+                        {{ session('status') }}
+                    </div>
                     @endif
                     @if (session('error'))
-                        <div class="mb-4 font-medium text-red-600">
-                            {{ session('error') }}
-                        </div>
+                    <div class="mb-4 font-medium text-red-600">
+                        {{ session('error') }}
+                    </div>
                     @endif
                 </form>
             </div>
         </div>
     </div>
-</x-layout-simple>
+</x-layout-simple>
\ No newline at end of file
diff --git a/resources/views/auth/register.blade.php b/resources/views/auth/register.blade.php
index e1daeaef2..e88200e1b 100644
--- a/resources/views/auth/register.blade.php
+++ b/resources/views/auth/register.blade.php
@@ -2,47 +2,41 @@
     <div class="flex items-center justify-center min-h-screen ">
         <div class="w-1/2">
             <div class="flex flex-col items-center pb-8">
-                <div class="text-5xl font-bold tracking-tight text-center text-white">Last Hour Cloud</div>
+                <img class="transition rounded w-22 h-22" src="{{ asset('lasthour-transparent.png') }}">
                 <x-version />
             </div>
             <div class="flex items-center gap-2">
                 <h1>{{ __('auth.register') }}</h1>
-                <a href="/login"
-                    class="text-xs text-center text-white normal-case bg-transparent border-none rounded no-animation hover:no-underline btn btn-sm bg-coollabs-gradient">
+                <a href="/login" class="text-xs text-center text-white normal-case bg-transparent border-none rounded no-animation hover:no-underline btn btn-sm bg-coollabs-gradient">
                     {{ __('auth.already_registered') }}
                 </a>
             </div>
             <form action="/register" method="POST" class="flex flex-col gap-2">
                 @csrf
                 @env('local')
-                <x-forms.input required value="test3 normal user" type="text" name="name"
-                    label="{{ __('input.name') }}" />
-                <x-forms.input required value="test3@example.com" type="email" name="email"
-                    label="{{ __('input.email') }}" />
+                <x-forms.input required value="test3 normal user" type="text" name="name" label="{{ __('input.name') }}" />
+                <x-forms.input required value="test3@example.com" type="email" name="email" label="{{ __('input.email') }}" />
                 <div class="flex gap-2">
-                    <x-forms.input required value="password" type="password" name="password"
-                        label="{{ __('input.password') }}" />
-                    <x-forms.input required value="password" type="password" name="password_confirmation"
-                        label="{{ __('input.password.again') }}" />
+                    <x-forms.input required value="password" type="password" name="password" label="{{ __('input.password') }}" />
+                    <x-forms.input required value="password" type="password" name="password_confirmation" label="{{ __('input.password.again') }}" />
                 </div>
-            @else
+                @else
                 <x-forms.input required type="text" name="name" label="{{ __('input.name') }}" />
                 <x-forms.input required type="email" name="email" label="{{ __('input.email') }}" />
                 <div class="flex gap-2">
                     <x-forms.input required type="password" name="password" label="{{ __('input.password') }}" />
-                    <x-forms.input required type="password" name="password_confirmation"
-                        label="{{ __('input.password.again') }}" />
+                    <x-forms.input required type="password" name="password_confirmation" label="{{ __('input.password.again') }}" />
                 </div>
                 @endenv
                 <x-forms.button type="submit">{{ __('auth.register') }}</x-forms.button>
             </form>
             @if ($errors->any())
-                <div class="text-xs text-center text-error">
-                    @foreach ($errors->all() as $error)
-                        <p>{{ $error }}</p>
-                    @endforeach
-                </div>
+            <div class="text-xs text-center text-error">
+                @foreach ($errors->all() as $error)
+                <p>{{ $error }}</p>
+                @endforeach
+            </div>
             @endif
         </div>
     </div>
-</x-layout-simple>
+</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 10a0a9f54..e42791218 100644
--- a/resources/views/layouts/boarding.blade.php
+++ b/resources/views/layouts/boarding.blade.php
@@ -1,16 +1,18 @@
 @extends('layouts.base')
 @section('body')
-    <div title="Send us feedback or get help!" class="fixed top-0 right-0 p-2 px-4 pt-4 mt-auto text-xs">
-        <button class="flex items-center justify-center gap-2" wire:click="help" onclick="help.showModal()">
+<div title="Send us feedback or get help!" class="fixed top-0 right-0 p-2 px-4 pt-4 mt-auto text-xs">
+    <a href="https://lasthourhosting.org/contact.html" target="_blank">
+        <div class="justify-center hover:text-white hover:bg-transparent">
             <svg class="icon" viewBox="0 0 256 256" xmlns="http://www.w3.org/2000/svg">
-                <path fill="currentColor" d="M140 180a12 12 0 1 1-12-12a12 12 0 0 1 12 12M128 72c-22.06 0-40 16.15-40 36v4a8 8 0 0 0 16 0v-4c0-11 10.77-20 24-20s24 9 24 20s-10.77 20-24 20a8 8 0 0 0-8 8v8a8 8 0 0 0 16 0v-.72c18.24-3.35 32-17.9 32-35.28c0-19.85-17.94-36-40-36m104 56A104 104 0 1 1 128 24a104.11 104.11 0 0 1 104 104m-16 0a88 88 0 1 0-88 88a88.1 88.1 0 0 0 88-88"/>
+                <path fill="currentColor" d="M140 180a12 12 0 1 1-12-12a12 12 0 0 1 12 12M128 72c-22.06 0-40 16.15-40 36v4a8 8 0 0 0 16 0v-4c0-11 10.77-20 24-20s24 9 24 20s-10.77 20-24 20a8 8 0 0 0-8 8v8a8 8 0 0 0 16 0v-.72c18.24-3.35 32-17.9 32-35.28c0-19.85-17.94-36-40-36m104 56A104 104 0 1 1 128 24a104.11 104.11 0 0 1 104 104m-16 0a88 88 0 1 0-88 88a88.1 88.1 0 0 0 88-88" />
             </svg>
-        </button>
-    </div>
-    <main class="min-h-screen hero">
-        <div class="hero-content">
-            {{ $slot }}
         </div>
-    </main>
-    @parent
-@endsection
+    </a>
+</div>
+<main class="min-h-screen hero">
+    <div class="hero-content">
+        {{ $slot }}
+    </div>
+</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 03bcea810..f70814b67 100644
--- a/resources/views/livewire/settings/configuration.blade.php
+++ b/resources/views/livewire/settings/configuration.blade.php
@@ -11,7 +11,7 @@
         <div class="flex flex-col gap-2 pt-4">
             <div class="flex items-end gap-2">
                 <x-forms.input id="settings.fqdn" label="Instance's Domain" placeholder="https://lasthourhosting.org" />
-                <x-forms.input id="settings.custom_dns_servers" label="DNS Servers" helper="DNS servers for validation FQDNS againts. A comma separated list of DNS servers." placeholder="1.1.1.1,8.8.8.8" />
+                <x-forms.input id="settings.custom_dns_servers" label="DNS Servers" helper="DNS servers for validation FQDNS againts. A comma separated list of DNS servers." placeholder="9.9.9.9" />
                 <x-forms.checkbox instantSave id="is_dns_validation_enabled" label="Validate DNS settings?" />
             </div>
 
@@ -24,20 +24,16 @@
     <h2 class="pt-6">Advanced</h2>
     <div class="flex flex-col py-6 text-right w-80">
         @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" />
+        <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" />
+        <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" />
         @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" />
+        <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" />
+        <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
     </div>
-</div>
+</div>
\ No newline at end of file