From e33a793c5d0fe5ccdc94f87dba52ad84c059457d Mon Sep 17 00:00:00 2001 From: Gary Date: Thu, 25 Jul 2024 13:55:33 -0700 Subject: [PATCH] main: fix for various bugs --- database/seeders/ProductionSeeder.php | 6 +- lang/en.json | 2 +- .../components/navbar-subscription.blade.php | 69 +++---- resources/views/components/navbar.blade.php | 194 +++++++++++++++++- .../livewire/project/add-empty.blade.php | 4 +- .../livewire/subscription/index.blade.php | 65 +++--- 6 files changed, 256 insertions(+), 84 deletions(-) diff --git a/database/seeders/ProductionSeeder.php b/database/seeders/ProductionSeeder.php index e030c0ae6..ab4c222fc 100644 --- a/database/seeders/ProductionSeeder.php +++ b/database/seeders/ProductionSeeder.php @@ -65,7 +65,7 @@ public function run(): void ]); } - if (! isCloud() && config('coolify.is_windows_docker_desktop') == false) { + if (!isCloud() && config('coolify.is_windows_docker_desktop') == false) { echo "Checking localhost key.\n"; // Save SSH Keys for the Coolify Host $coolify_key_name = 'id.root@host.docker.internal'; @@ -93,7 +93,7 @@ public function run(): void $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, @@ -146,7 +146,7 @@ public function run(): void '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 461a96e9a..bf85b2f6a 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 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.callback": "Failed to process callback from login provider.", 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 +>>>>>>> 04e370917 (main: fix for various bugs) diff --git a/resources/views/livewire/project/add-empty.blade.php b/resources/views/livewire/project/add-empty.blade.php index c9cf5ac4e..1f162c796 100644 --- a/resources/views/livewire/project/add-empty.blade.php +++ b/resources/views/livewire/project/add-empty.blade.php @@ -1,8 +1,8 @@
- +
New project will have a default production environment.
Continue - + \ 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 5131ebd56..3c732e304 100644 --- a/resources/views/livewire/subscription/index.blade.php +++ b/resources/views/livewire/subscription/index.blade.php @@ -1,43 +1,40 @@
- Subscribe | Coolify - - @if ($settings->is_resale_license_active) + Subscribe | Last Hour Cloud + + @if ($settings->is_resale_license_active) @if (auth()->user()->isAdminFromSession()) -
-
-

Subscriptions

- @if (subscriptionProvider() === 'stripe' && $alreadySubscribed) - Manage My Subscription - @endif -
- @if (request()->query->get('cancelled')) -
- - - - Something went wrong with your subscription. Please try again or contact - support. -
+
+
+

Subscriptions

+ @if (subscriptionProvider() === 'stripe' && $alreadySubscribed) + Manage My Subscription @endif +
+ @if (request()->query->get('cancelled')) +
+ + + + Something went wrong with your subscription. Please try again or contact + support. +
+ @endif - @if (config('subscription.provider') === 'stripe') - - @endif -
+ @if (config('subscription.provider') === 'stripe') + + @endif +
@else -
-
-

Subscription

-
-
You are not an admin or have been removed from this team. If this does not make sense, please contact - us.
+
+
+

Subscription

+
You are not an admin or have been removed from this team. If this does not make sense, please contact + us.
+
@endif - @else + @else
Resale license is not active. Please contact your instance admin.
- @endif -
+ @endif +
\ No newline at end of file