From ec139b79a2fdaa138ec861ef50792f8898492196 Mon Sep 17 00:00:00 2001
From: Deon George <deon@dege.au>
Date: Fri, 6 Dec 2024 21:30:44 +1100
Subject: [PATCH] Change all notes inputs to use notes component

---
 public/css/fixes.css                          | 12 +++++
 .../views/components/form/notes.blade.php     | 44 +++++++++++++++++++
 resources/views/domain/addedit.blade.php      | 21 +++------
 resources/views/echoarea/addedit.blade.php    | 19 ++++----
 resources/views/filearea/addedit.blade.php    | 19 ++++----
 resources/views/system/areafix.blade.php      | 14 ++----
 .../views/system/widget/system.blade.php      |  3 +-
 resources/views/user/addedit.blade.php        | 10 ++---
 resources/views/zone/addedit.blade.php        |  3 +-
 9 files changed, 87 insertions(+), 58 deletions(-)
 create mode 100644 resources/views/components/form/notes.blade.php

diff --git a/public/css/fixes.css b/public/css/fixes.css
index 31931f0..d701eef 100644
--- a/public/css/fixes.css
+++ b/public/css/fixes.css
@@ -23,6 +23,18 @@ select2-container--bootstrap-5 .select2-selection--multiple .select2-selection__
 	font-size: 90%;
 }
 
+/* SimpleMDE Toolbar fixes */
+.editor-toolbar {
+	background-color: #fff;
+	color: #000;
+	opacity: 1;
+}
+
+div.CodeMirror-wrap.form-control.is-invalid {
+	border-top-left-radius: 0;
+	border-top-right-radius: 0;
+}
+
 /* Bootstrap 5 fixes */
 /* select import, round the right side */
 .input-group .form-select {
diff --git a/resources/views/components/form/notes.blade.php b/resources/views/components/form/notes.blade.php
new file mode 100644
index 0000000..0230323
--- /dev/null
+++ b/resources/views/components/form/notes.blade.php
@@ -0,0 +1,44 @@
+<div class="form-group">
+	@if(isset($label))
+		<label {{ $attributes->only(['class'])->merge(['class'=>'form-label']) }} for="{{ $id ?? $name }}">{!! html_entity_decode($label) !!}</label>
+	@endisset
+	<div class="input-group has-validation">
+		@if(isset($icon) || isset($prepend))
+			<div class="input-group-prepend">
+				<span class="input-group-text">@isset($icon)<i class="fas fa-fw {{ $icon }}"></i>@endisset @isset($prepend){!! $prepend !!}@endisset</span>
+			</div>
+		@endif
+		<div class="w-100">
+			<textarea class="form-control {{ $class ?? ''}} @error((! empty($old)) ? $old : $name) is-invalid @enderror" rows="{{ (($l=count(explode("\n",$value ?? ''))) < ($rows ?? 5) ? $rows : (($l > ($y=($max ?? 25))) ? $y : $l)) }}" id="{{ $id ?? $name }}" name="{{ $name }}" @isset($placeholder)placeholder="{{ $placeholder }}"@endisset @readonly(isset($readonly) && $readonly) @required(isset($required) && $required) @disabled(isset($disabled) && $disabled)>{{ old($old ?? $name,$value ?? '') }}</textarea>
+			<span class="invalid-feedback">
+				@error($old ?? $name)
+					{{ $message }}
+				@elseif(isset($feedback))
+					{{ $feedback }}
+				@enderror
+			</span>
+		</div>
+	</div>
+	@isset($helper)
+		<span class="input-helper">{{ $helper }}</span>
+	@endif
+</div>
+
+@if(isset($simplemde) && $simplemde)
+	@pa(simplemde)
+
+	@section('page-scripts')
+		<script type="text/javascript">
+			$(document).ready(function() {
+				new SimpleMDE({
+					element: $('#{{ $id ?? $name }}')[0],
+					forceSync: true
+				});
+
+				@error($old ?? $name)
+					$('div.CodeMirror-wrap').addClass('form-control is-invalid');
+				@enderror
+			});
+		</script>
+	@append
+@endif
\ No newline at end of file
diff --git a/resources/views/domain/addedit.blade.php b/resources/views/domain/addedit.blade.php
index 5aa2e26..f17af36 100644
--- a/resources/views/domain/addedit.blade.php
+++ b/resources/views/domain/addedit.blade.php
@@ -1,4 +1,5 @@
 <!-- $o=Domain::class -->
+@use(Illuminate\Support\Facades\Gate)
 @use(App\Models\Echoarea)
 
 @extends('layouts.app')
@@ -149,8 +150,7 @@
 
 					<div class="row">
 						<div class="col-12">
-							<label for="notes" class="form-label">Notes</label>
-							<textarea class="form-control" rows=3 id="notes" name="notes" placeholder="Notes..." @cannot('admin',$o)disabled @endcannot>{{ old('notes',$o->notes) }}</textarea>
+							<x-form.notes name="notes" label="Notes" rows=3 placeholder="Notes..." :value="$o->notes" :disabled="Gate::denies('admin',$o)"/>
 						</div>
 					</div>
 				</div>
@@ -163,11 +163,8 @@
 					<h2 class="cap">Home Page</h2>
 
 					<div class="row">
-						<div class="col-12">
-							<label for="homepage" class="form-label">Home Page Text</label>
-							<div style="background-color: #fff;color: #000;">
-								<textarea class="form-control" rows=5 id="homepage" name="homepage" placeholder="Home Page..." @cannot('admin',$o)disabled @endcannot>{{ old('homepage',$o->homepage) }}</textarea>
-							</div>
+						<div class="col-12" >
+							<x-form.notes name="homepage" label="Home Page Text" rows=5 placeholder="Home Page..." :value="$o->homepage" :disabled="Gate::denies('admin',$o)" :simplemde="true"/>
 						</div>
 					</div>
 				</div>
@@ -183,12 +180,4 @@
 			</div>
 		</div>
 	</form>
-@endsection
-
-@pa(simplemde)
-
-@section('page-scripts')
-	<script type="text/javascript">
-		var simplemde = new SimpleMDE({ element: $("#homepage")[0] });
-	</script>
-@append
\ No newline at end of file
+@endsection
\ No newline at end of file
diff --git a/resources/views/echoarea/addedit.blade.php b/resources/views/echoarea/addedit.blade.php
index 95e8368..26b6f0c 100644
--- a/resources/views/echoarea/addedit.blade.php
+++ b/resources/views/echoarea/addedit.blade.php
@@ -127,19 +127,18 @@
 					</div>
 
 					@can('admin',$o)
-					<div class="row">
-						<div class="col-12">
-							<label for="notes" class="form-label">Notes</label>
-							<textarea class="form-control" rows=3 name="notes" placeholder="Notes..." @cannot('admin',$o)disabled @endcannot>{{ old('notes',$o->notes) }}</textarea>
+						<div class="row">
+							<div class="col-12">
+								<x-form.notes name="notes" label="Notes" rows=3 placeholder="Notes..." :value="$o->notes"/>
+							</div>
 						</div>
-					</div>
 
-					<div class="row">
-						<div class="col-12">
-							<a href="{{ url('echoarea') }}" class="btn btn-danger">Cancel</a>
-							<button type="submit" name="submit" class="btn btn-success float-end">@if ($o->exists)Save @else Add @endif</button>
+						<div class="row">
+							<div class="col-12">
+								<a href="{{ url('echoarea') }}" class="btn btn-danger">Cancel</a>
+								<button type="submit" name="submit" class="btn btn-success float-end">@if ($o->exists)Save @else Add @endif</button>
+							</div>
 						</div>
-					</div>
 					@endcan
 				</div>
 			</div>
diff --git a/resources/views/filearea/addedit.blade.php b/resources/views/filearea/addedit.blade.php
index c5896c4..fae822d 100644
--- a/resources/views/filearea/addedit.blade.php
+++ b/resources/views/filearea/addedit.blade.php
@@ -128,19 +128,18 @@
 					</div>
 
 					@can('admin',$o)
-					<div class="row">
-						<div class="col-12">
-							<label for="notes" class="form-label">Notes</label>
-							<textarea class="form-control" rows=3 name="notes" placeholder="Notes..." @cannot('admin',$o)disabled @endcannot>{{ old('notes',$o->notes) }}</textarea>
+						<div class="row">
+							<div class="col-12">
+								<x-form.notes name="notes" label="Notes" rows=3 placeholder="Notes..." :value="$o->notes"/>
+							</div>
 						</div>
-					</div>
 
-					<div class="row">
-						<div class="col-12">
-							<a href="{{ url('filearea') }}" class="btn btn-danger">Cancel</a>
-							<button type="submit" name="submit" class="btn btn-success float-end">@if ($o->exists)Save @else Add @endif</button>
+						<div class="row">
+							<div class="col-12">
+								<a href="{{ url('filearea') }}" class="btn btn-danger">Cancel</a>
+								<button type="submit" name="submit" class="btn btn-success float-end">@if ($o->exists)Save @else Add @endif</button>
+							</div>
 						</div>
-					</div>
 					@endcan
 				</div>
 			</div>
diff --git a/resources/views/system/areafix.blade.php b/resources/views/system/areafix.blade.php
index 7347b20..3684e5e 100644
--- a/resources/views/system/areafix.blade.php
+++ b/resources/views/system/areafix.blade.php
@@ -19,11 +19,11 @@
 		@csrf
 
 		<div class="row pt-0">
-			<div class="col-2">
+			<div class="col-3">
 				<x-form.select name="to" icon="bi-robot" label="To" feedback="To name required" :value="($x=collect(config('fido.areafilefix')))->first()" :options="$x->map(fn($item)=>['id'=>$item,'value'=>$item])" required/>
 			</div>
 
-			<div class="offset-2 col-3">
+			<div class="offset-1 col-3">
 				<x-form.select name="tftn_id" icon="bi-ui-radios" label="Uplink Address" feedback="Uplink address required" :value="($x=collect(config('fido.areafilefix')))->first()" :options="$o->akas->where('zone_id',$zo->id)->map(fn($item)=>['id'=>$item->id,'value'=>$item->ftn])" required/>
 			</div>
 		</div>
@@ -53,15 +53,7 @@
 		<div class="row">
 			<!-- Message -->
 			<div class="col-12">
-				<label for="msg" class="form-label">Message</label>
-				<textarea class="form-control @error('msg') is-invalid @enderror" rows=10 name="msg" placeholder="Message..." required>{{ old('msg') }}</textarea>
-				<span class="invalid-feedback" role="alert">
-					@error('msg')
-						{{ $message }}
-					@else
-						Area/filefix commands are required
-					@enderror
-				</span>
+				<x-form.notes name="msg" label="Message" rows=10 placeholder="Message..." helper="Area/filefix commands are required"/>
 			</div>
 		</div>
 
diff --git a/resources/views/system/widget/system.blade.php b/resources/views/system/widget/system.blade.php
index fe27f87..2b25ce7 100644
--- a/resources/views/system/widget/system.blade.php
+++ b/resources/views/system/widget/system.blade.php
@@ -403,8 +403,7 @@
 	<div class="row">
 		<!-- Notes -->
 		<div class="col-12">
-			<label for="notes" class="form-label">Notes</label>
-			<textarea class="form-control" rows=3 id="notes" name="notes" placeholder="Notes...">{{ old('notes',$o->notes) }}</textarea>
+			<x-form.notes name="notes" label="Notes" rows=3 placeholder="Notes..." :value="$o->notes"/>
 		</div>
 	</div>
 @endcan
diff --git a/resources/views/user/addedit.blade.php b/resources/views/user/addedit.blade.php
index b8f95b8..5a6a338 100644
--- a/resources/views/user/addedit.blade.php
+++ b/resources/views/user/addedit.blade.php
@@ -1,4 +1,6 @@
 <!-- $o=User::class -->
+@use(Illuminate\Support\Facades\Gate)
+
 @extends('layouts.app')
 
 @section('htmlheader_title')
@@ -133,13 +135,7 @@
 
 					<div class="row">
 						<div class="col-12">
-							<label for="pgp_pubkey" class="form-label">PGP Public Key</label>
-							<textarea class="form-control @error('pgp_pubkey')is-invalid @enderror" rows=3 id="pgp_pubkey" name="pgp_pubkey" placeholder="PGP Public Key..." @cannot('update',$o)disabled @endcannot>{{ old('pgp_pubkey',$o->pgp_pubkey) }}</textarea>
-							<span class="invalid-feedback" role="alert">
-								@error('pgp_pubkey')
-									{{ $message }}
-								@enderror
-							</span>
+							<x-form.notes name="pgp_pubkey" label="PGP Public Key" rows=5 max=25 placeholder="PGP Public Key..." :value="$o->pgp_pubkey" :disabled="Gate::denies('update',$o)"/>
 						</div>
 					</div>
 
diff --git a/resources/views/zone/addedit.blade.php b/resources/views/zone/addedit.blade.php
index c937793..bf0910f 100644
--- a/resources/views/zone/addedit.blade.php
+++ b/resources/views/zone/addedit.blade.php
@@ -138,8 +138,7 @@
 
 					<div class="row">
 						<div class="col-12">
-							<label for="notes" class="form-label">Notes</label>
-							<textarea class="form-control" rows=3 name="notes" placeholder="Notes..." @cannot('admin',$o)disabled @endcannot>{{ old('notes',$o->notes) }}</textarea>
+							<x-form.notes name="notes" label="Notes" rows=3 placeholder="Notes..." :value="$o->notes" :disabled="Gate::denies('admin',$o)"/>
 						</div>
 					</div>