From 04e37091708b2cbd6b9d3e66a2bd1da80e05732e Mon Sep 17 00:00:00 2001 From: Gary Date: Tue, 5 Mar 2024 16:39:13 -0800 Subject: [PATCH] main: fix for various bugs --- database/seeders/ProductionSeeder.php | 4 +- lang/en.json | 2 +- .../components/navbar-subscription.blade.php | 69 ++- resources/views/components/navbar.blade.php | 404 ++++++++---------- resources/views/components/version.blade.php | 3 +- .../livewire/project/add-empty.blade.php | 6 +- .../livewire/subscription/index.blade.php | 4 +- versions.json | 3 +- 8 files changed, 218 insertions(+), 277 deletions(-) diff --git a/database/seeders/ProductionSeeder.php b/database/seeders/ProductionSeeder.php index 4c66bdabf..752998dd5 100644 --- a/database/seeders/ProductionSeeder.php +++ b/database/seeders/ProductionSeeder.php @@ -94,7 +94,7 @@ class ProductionSeeder extends Seeder $server_details = [ 'id' => 0, 'name' => "localhost", - 'description' => "This is the server where Coolify is running on. Don't delete this!", + 'description' => "This is the server where Last Hour Cloud is running on. Don't delete this!", 'user' => 'root', 'ip' => "host.docker.internal", 'team_id' => 0, @@ -147,7 +147,7 @@ uZx9iFkCELtxrh31QJ68AAAAEXNhaWxANzZmZjY2ZDJlMmRkAQIDBA== 'id' => 0, 'uuid' => 'coolify-testing-host', 'name' => "localhost", - 'description' => "This is the server where Coolify is running on. Don't delete this!", + 'description' => "This is the server where Last Hour Cloud is running on. Don't delete this!", 'user' => 'root', 'ip' => "coolify-testing-host", 'team_id' => 0, diff --git a/lang/en.json b/lang/en.json index 1f4fbdb74..49888d605 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 the administrator.", + "auth.registration_disabled": "Registration is 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/components/navbar-subscription.blade.php b/resources/views/components/navbar-subscription.blade.php index 8c29c3378..864bf89b1 100644 --- a/resources/views/components/navbar-subscription.blade.php +++ b/resources/views/components/navbar-subscription.blade.php @@ -1,41 +1,38 @@ @auth - +@endauth \ No newline at end of file diff --git a/resources/views/components/version.blade.php b/resources/views/components/version.blade.php index ada5206a1..2a3c8f6b2 100644 --- a/resources/views/components/version.blade.php +++ b/resources/views/components/version.blade.php @@ -1,2 +1 @@ -merge(['class' => 'text-xs cursor-pointer opacity-60 hover:opacity-100 hover:text-white z-50']) }} - href="https://githaven.org/Shiloh/lasthourcloud/releases/tag/v{{ config('version') }}">v{{ config('version') }} +merge(['class' => 'text-xs cursor-pointer opacity-60 hover:opacity-100 hover:text-white z-50']) }} href="https://githaven.org/Shiloh/lasthourcloud/releases/tag/v{{ config('version') }}">v{{ config('version') }} \ No newline at end of file diff --git a/resources/views/livewire/project/add-empty.blade.php b/resources/views/livewire/project/add-empty.blade.php index 7f1db453e..79fb02cec 100644 --- a/resources/views/livewire/project/add-empty.blade.php +++ b/resources/views/livewire/project/add-empty.blade.php @@ -1,7 +1,7 @@
- - + + Save @@ -9,4 +9,4 @@ -
 + \ No newline at end of file diff --git a/resources/views/livewire/subscription/index.blade.php b/resources/views/livewire/subscription/index.blade.php index a0a096a91..79a6955b2 100644 --- a/resources/views/livewire/subscription/index.blade.php +++ b/resources/views/livewire/subscription/index.blade.php @@ -40,8 +40,8 @@ Currently active team: {{ session('currentTeam.name') }}
You are not an admin or have been removed from this team. If this does not make sense, please contact - us.
+ class="text-white underline">contact + us at support@lasthourhosting.org. @endif @else diff --git a/versions.json b/versions.json index 8f30ba88c..6904ddb81 100644 --- a/versions.json +++ b/versions.json @@ -4,8 +4,7 @@ "version": "3.12.36" }, "v4": { - "version": "4.0.0-beta.239" + "version": "4.0.3" } } } -