From b23d9351b5f372844ae2e6f57be673cf352705e5 Mon Sep 17 00:00:00 2001
From: Deon George <deon@dege.au>
Date: Fri, 7 Jun 2024 15:08:50 +1000
Subject: [PATCH] Make $setup available to all blades

---
 app/Http/Middleware/AddUserToView.php          | 3 +++
 resources/views/dashboard.blade.php            | 2 --
 resources/views/system/widget/system.blade.php | 4 ++--
 resources/views/user/system/register.blade.php | 4 ++--
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/app/Http/Middleware/AddUserToView.php b/app/Http/Middleware/AddUserToView.php
index 2e3e725..b06f0b9 100644
--- a/app/Http/Middleware/AddUserToView.php
+++ b/app/Http/Middleware/AddUserToView.php
@@ -6,6 +6,8 @@ use Closure;
 use Illuminate\Contracts\View\Factory;
 use Illuminate\Contracts\Auth\Authenticatable;
 
+use App\Models\Setup;
+
 class AddUserToView
 {
 	/**
@@ -44,6 +46,7 @@ class AddUserToView
 	public function handle($request, Closure $next)
 	{
 		$this->factory->share('user',$this->user);
+		$this->factory->share('setup',Setup::find(config('app.id')));
 
 		return $next($request);
 	}
diff --git a/resources/views/dashboard.blade.php b/resources/views/dashboard.blade.php
index 0f41107..302b7a4 100644
--- a/resources/views/dashboard.blade.php
+++ b/resources/views/dashboard.blade.php
@@ -5,9 +5,7 @@
 
 @php
 use App\Classes\Protocol\Binkp;
-use App\Models\Setup;
 $user->load(['systems.akas.zone.domain.echoareas','systems.akas.echoareas']);
-$setup = Setup::findOrFail(config('app.id'));
 @endphp
 
 @section('content')
diff --git a/resources/views/system/widget/system.blade.php b/resources/views/system/widget/system.blade.php
index e5056a5..7a35a7a 100644
--- a/resources/views/system/widget/system.blade.php
+++ b/resources/views/system/widget/system.blade.php
@@ -1,6 +1,6 @@
 @php
 use App\Classes\FTN\Packet;
-use App\Models\{Mailer,Setup,User};
+use App\Models\{Mailer,User};
 @endphp
 
 <!-- $o=System::class -->
@@ -195,7 +195,7 @@ use App\Models\{Mailer,Setup,User};
 						<label for="pkt_msgs" class="form-label w-100">Packet Msgs</label>
 						<div class="input-group has-validation">
 							<span class="input-group-text"><i class="bi bi-hash"></i></span>
-							<input type="text" class="form-control text-end @error('pkt_msgs') is-invalid @enderror" id="pkt_msgs" placeholder="{{ Setup::MAX_MSGS_PKT }}" name="pkt_msgs" value="{{ old('pkt_msgs',$o->getRawOriginal('pkt_msgs')) }}" @cannot($action,$o)readonly @endcannot>
+							<input type="text" class="form-control text-end @error('pkt_msgs') is-invalid @enderror" id="pkt_msgs" placeholder="{{ $setup->msgs_pkt }}" name="pkt_msgs" value="{{ old('pkt_msgs',$o->getRawOriginal('pkt_msgs')) }}" @cannot($action,$o)readonly @endcannot>
 							<span class="invalid-feedback" role="alert">
 								@error('pkt_msgs')
 									{{ $message }}
diff --git a/resources/views/user/system/register.blade.php b/resources/views/user/system/register.blade.php
index f35a567..ed9a547 100644
--- a/resources/views/user/system/register.blade.php
+++ b/resources/views/user/system/register.blade.php
@@ -5,7 +5,7 @@
 @endsection
 
 @php
-use App\Models\{Setup,System};
+use App\Models\System;
 @endphp
 
 @section('content')
@@ -28,7 +28,7 @@ use App\Models\{Setup,System};
 										<option value="">&nbsp;</option>
 										@foreach (System::select(['systems.id','systems.name'])
 											->active()
-											->where('id','<>',Setup::findOrFail(config('app.id'))->system_id)
+											->where('id','<>',$setup->system_id)
 											->whereRaw('id NOT IN (SELECT system_id FROM system_user)')
 											->cursor() as $oo)
 											<option value="{{ $oo->id }}" @if(old('id')===$oo->id)selected @endif>{{ $oo->name }}</option>