From b997a81ef709379418cb554843db90ee09f9c0f6 Mon Sep 17 00:00:00 2001 From: marvin23 <70077396+marvin2309@users.noreply.github.com> Date: Thu, 9 May 2024 13:03:59 +0200 Subject: [PATCH 1/3] Forces HTTPS if possible --- app/Providers/AppServiceProvider.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index 5ecdb0f..70fdc52 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -5,6 +5,7 @@ use App\Search\Ingredient; use CloudCreativity\LaravelJsonApi\LaravelJsonApi; use Illuminate\Support\ServiceProvider; +use Illuminate\Support\Facades\URL; class AppServiceProvider extends ServiceProvider { @@ -25,6 +26,9 @@ public function register() */ public function boot() { + if (strpos(env('APP_URL', ''), 'https') !== false) { + URL::forceScheme('https'); + } LaravelJsonApi::defaultApi('v1'); if (config('scout.driver') === 'algolia') { From f00631a2d9fa96a45abfab9f652cd338013a5760 Mon Sep 17 00:00:00 2001 From: marvin23 <70077396+marvin2309@users.noreply.github.com> Date: Thu, 9 May 2024 13:05:59 +0200 Subject: [PATCH 2/3] Asset Url added. See https://stackoverflow.com/questions/34378122/load-blade-assets-with-https-in-laravel/68287406#68287406 --- .env.example | 1 + 1 file changed, 1 insertion(+) diff --git a/.env.example b/.env.example index 88e74d8..e4da182 100644 --- a/.env.example +++ b/.env.example @@ -7,6 +7,7 @@ APP_ENV=local APP_KEY= APP_DEBUG=false APP_URL=http://127.0.0.1 +ASSET_URL=https://your-domain.org/ APP_PORT=8080 APP_SERVICE=app APP_TIMEZONE=UTC From 05a4f635bba063f61c5270b2fe97289f9c6a5ce3 Mon Sep 17 00:00:00 2001 From: marvin23 <70077396+marvin2309@users.noreply.github.com> Date: Thu, 9 May 2024 16:09:20 +0200 Subject: [PATCH 3/3] Changed Button To Gray Thus Its Not Invisible Anymore --- resources/views/foods/index.blade.php | 4 ++-- resources/views/goals/index.blade.php | 4 ++-- .../views/journal-entries/create-from-nutrients.blade.php | 4 ++-- resources/views/journal-entries/create.blade.php | 4 ++-- resources/views/journal-entries/index.blade.php | 4 ++-- resources/views/profiles/show.blade.php | 4 ++-- resources/views/recipes/index.blade.php | 4 ++-- resources/views/users/index.blade.php | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/resources/views/foods/index.blade.php b/resources/views/foods/index.blade.php index 04c378b..0cddfb7 100644 --- a/resources/views/foods/index.blade.php +++ b/resources/views/foods/index.blade.php @@ -3,9 +3,9 @@

Foods

- + Add Food - +
diff --git a/resources/views/goals/index.blade.php b/resources/views/goals/index.blade.php index 14217c8..f589b60 100644 --- a/resources/views/goals/index.blade.php +++ b/resources/views/goals/index.blade.php @@ -3,9 +3,9 @@

My Goals

- + Add Goal - +
diff --git a/resources/views/journal-entries/create-from-nutrients.blade.php b/resources/views/journal-entries/create-from-nutrients.blade.php index e1ffad3..1ebb771 100644 --- a/resources/views/journal-entries/create-from-nutrients.blade.php +++ b/resources/views/journal-entries/create-from-nutrients.blade.php @@ -3,9 +3,9 @@

Add Entry

- + Add by Recipes/Foods - +
diff --git a/resources/views/journal-entries/create.blade.php b/resources/views/journal-entries/create.blade.php index d32fc7b..8249020 100644 --- a/resources/views/journal-entries/create.blade.php +++ b/resources/views/journal-entries/create.blade.php @@ -3,9 +3,9 @@

Add Entries

- + Add by Nutrients - +
diff --git a/resources/views/journal-entries/index.blade.php b/resources/views/journal-entries/index.blade.php index 02f465f..2b0a26b 100644 --- a/resources/views/journal-entries/index.blade.php +++ b/resources/views/journal-entries/index.blade.php @@ -33,9 +33,9 @@ class="border-0 shadow-none p-0 text-center" - + Add Entry - +
diff --git a/resources/views/profiles/show.blade.php b/resources/views/profiles/show.blade.php index 5605a1d..334198d 100644 --- a/resources/views/profiles/show.blade.php +++ b/resources/views/profiles/show.blade.php @@ -5,9 +5,9 @@

{{ $title }}

@can('editProfile', $user) - + Edit Profile - + @endcan
diff --git a/resources/views/recipes/index.blade.php b/resources/views/recipes/index.blade.php index ac1b573..4bd3d50 100644 --- a/resources/views/recipes/index.blade.php +++ b/resources/views/recipes/index.blade.php @@ -3,9 +3,9 @@

Recipes

- + Add Recipe - +
diff --git a/resources/views/users/index.blade.php b/resources/views/users/index.blade.php index 85abb5b..ee8d877 100644 --- a/resources/views/users/index.blade.php +++ b/resources/views/users/index.blade.php @@ -3,9 +3,9 @@

Users

- + Add User - +