Laravel 9 Update (#1413)

Update to Laravel 9 and PHP 8+

Co-authored-by: B.Fatih KOZ <fatih.koz@gmail.com>

resources/views/admin/dashboard/index.blade.php

@@ -30,27 +30,28 @@
         @endcomponent
       </div>
     </div>
+
     <div class="row">
       <div class="col-md-6">
-        {{--@include('admin.dashboard.pirep_chart')--}}
+        {{-- @include('admin.dashboard.pirep_chart') --}}
       </div>
       <div class="col-md-6">
-
+        {{-- Intentionally Left Blank --}}
       </div>
     </div>
 
-
     <div class="row">
       <div class="col-md-6">
-
+        {{-- Intentionally Left Blank --}}
       </div>
       <div class="col-md-6">
-
+        {{-- Intentionally Left Blank --}}
       </div>
     </div>
   </div>
 @endsection
 @section('scripts')
+  @parent
   <script>
     $(document).ready(function () {
       $(document).on('submit', 'form.pjax_news_form', function (event) {

resources/views/admin/dashboard/news.blade.php

@@ -2,33 +2,33 @@
   <div class="card border-blue-bottom">
     @if($news->count() === 0)
       <div class="text-center text-muted" style="padding: 30px;">
-        no news items
+        No news items
       </div>
     @endif
     @foreach($news as $item)
       <div class="content">
         <div class="header">
-          <h4 class="title">{{ $item->subject }}</h4>
-          <p class="category">{{ $item->user->name }} - {{ show_datetime($item->created_at) }}</p>
+          <h5 class="title">
+            <b>{{ $item->subject }}</b>
+          </h5>
+          <div class="text-right">
+            {{ Form::open(['route' => 'admin.dashboard.news', 'method' => 'delete', 'class' => 'pjax_news_form']) }}
+            {{ Form::hidden('news_id', $item->id) }}
+            {{ 
+              Form::button('<i class="far fa-trash-alt"></i>&nbsp;delete', [
+                'type'    => 'submit', 
+                'class'   => ' btn btn-danger btn-xs text-small', 
+                'onclick' => "return confirm('Are you sure?')"
+              ]) 
+            }}
+            {{ Form::close() }}
+          </div>
         </div>
-
-        {{ $item->body }}
-
-        <div class="text-right">
-          {{ Form::open(['route' => 'admin.dashboard.news',
-          'method' => 'delete',
-          'class' => 'pjax_news_form',
-      ]) }}
-          {{ Form::hidden('news_id', $item->id) }}
-          {{
-               Form::button('<i class="far fa-trash-alt"></i>&nbsp;delete',
-                               ['type' => 'submit',
-                                'class' => ' btn btn-danger btn-xs text-small',
-                                'onclick' => "return confirm('Are you sure?')"
-                                ])
-
-               }}
-          {{ Form::close() }}
+        <div class="body">
+          {!! $item->body !!}
+        </div>
+        <div class="footer text-right">
+          {{ $item->user->name }} - {{ show_datetime($item->created_at) }}
         </div>
       </div>
       <hr/>
@@ -37,30 +37,28 @@
       <div class="header">
         <h4 class="title">Add News</h4>
       </div>
-      {{ Form::open(['route' => 'admin.dashboard.news',
-          'method' => 'post',
-          'class' => 'pjax_news_form',
-      ]) }}
+      {{ Form::open(['route' => 'admin.dashboard.news', 'method' => 'post', 'class' => 'pjax_news_form']) }}
       <table class="table">
         <tr>
           <td>{{ Form::label('subject', 'Subject:') }}</td>
           <td>{{ Form::text('subject', '', ['class' => 'form-control'])  }}</td>
         </tr>
-
         <tr>
           <td>{{ Form::label('body', 'Body:') }}</td>
-          <td>{{ Form::textarea('body', '', ['class' => 'form-control']) }}</td>
+          <td>{!! Form::textarea('body', '', ['id' => 'news_editor', 'class' => 'editor']) !!}</td>
         </tr>
       </table>
       <div class="text-right">
-        {{
-         Form::button('<i class="fas fa-plus-circle"></i>&nbsp;add',
-                         ['type' => 'submit',
-                          'class' => 'btn btn-success btn-s'])
-
-         }}
+        {{ Form::button('<i class="fas fa-plus-circle"></i>&nbsp;add', ['type' => 'submit', 'class' => 'btn btn-success btn-s']) }}
         {{ Form::close() }}
       </div>
     </div>
   </div>
 </div>
+@section('scripts')
+  @parent
+  <script src="{{ public_asset('assets/vendor/ckeditor4/ckeditor.js') }}"></script>
+  <script>
+    $(document).ready(function () { CKEDITOR.replace('news_editor'); });
+  </script>
+@endsection

resources/views/admin/pireps/fields.blade.php

@@ -205,6 +205,36 @@
           </div>
         </div>
 
+        <div class="row">
+          <div class="form-group col-sm-2">
+            {{ Form::label('distance', 'Distance:') }}
+            <div class="row">
+              <div class="col-sm-12">
+                {{ Form::number('distance', null, [
+                    'class' => 'form-control',
+                    'min' => 0,
+                    'step' => '0.01'
+                    ]) }}
+                <p class="text-danger">{{ $errors->first('distance') }}</p>
+              </div>
+            </div>
+          </div>
+
+          <div class="form-group col-sm-2">
+            {{ Form::label('distance', 'Planned Distance:') }}
+            <div class="row">
+              <div class="col-sm-12">
+                {{ Form::number('planned_distance', null, [
+                    'class' => 'form-control',
+                    'min' => 0,
+                    'step' => '0.01'
+                    ]) }}
+                <p class="text-danger">{{ $errors->first('planned_distance') }}</p>
+              </div>
+            </div>
+          </div>
+
+        </div>
 
         <div class="row">
           <!-- Route Field -->

resources/views/admin/pireps/show_fields.blade.php

@@ -62,6 +62,10 @@
         <td>Flight Level</td>
         <td>{{ $pirep->level }}</td>
       </tr>
+      <tr>
+        <td>Distance</td>
+        <td>{{ $pirep->distance }}</td>
+      </tr>
       <tr>
         <td>Route</td>
         <td>{{ $pirep->route }}</td>

resources/views/layouts/default/app.blade.php

@@ -22,13 +22,8 @@
 
   {{-- Start of the required files in the head block --}}
   <link href="{{ public_mix('/assets/global/css/vendor.css') }}" rel="stylesheet"/>
-  <style type="text/css">
-    @yield('css')
-  </style>
-
-  <script>
-    @yield('scripts_head')
-  </script>
+  @yield('css')
+  @yield('scripts_head')
   {{-- End of the required stuff in the head block --}}
 
 </head>

resources/views/layouts/default/auth/register.blade.php

@@ -97,14 +97,11 @@
             @endforeach
           @endif
 
-          @if(config('captcha.enabled'))
-            <label for="g-recaptcha-response" class="control-label">@lang('auth.fillcaptcha')</label>
-            <div
-              class="input-group form-group-no-border {{ $errors->has('g-recaptcha-response') ? 'has-danger' : '' }}">
-              {!! NoCaptcha::display(config('captcha.attributes')) !!}
-            </div>
-            @if ($errors->has('g-recaptcha-response'))
-              <p class="text-danger">{{ $errors->first('g-recaptcha-response') }}</p>
+          @if($captcha['enabled'] === true)
+            <label for="h-captcha" class="control-label">@lang('auth.fillcaptcha')</label>
+            <div class="h-captcha" data-sitekey="{{ $captcha['site_key'] }}"></div>
+            @if ($errors->has('h-captcha-response'))
+              <p class="text-danger">{{ $errors->first('h-captcha-response') }}</p>
             @endif
           @endif
 
@@ -158,7 +155,9 @@
 @endsection
 
 @section('scripts')
-  {!! NoCaptcha::renderJs(config('app.locale')) !!}
+  @if ($captcha['enabled'])
+    <script src="https://hcaptcha.com/1/api.js" async defer></script>
+  @endif
 
   <script>
     $('#toc_accepted').click(function () {

resources/views/layouts/default/downloads/table.blade.php

@@ -9,8 +9,10 @@
       @if($file->description)
         - {{$file->description}}
       @endif
-      <span
-        style="margin-left: 20px">{{ $file->download_count.' '.trans_choice('common.download', $file->download_count) }}</span>
+      @if ($file->download_count > 0)
+        <span
+          style="margin-left: 20px">{{ $file->download_count.' '.trans_choice('common.download', $file->download_count) }}</span>
+      @endif
     </li>
   @endforeach
 </ul>

resources/views/layouts/default/widgets/latest_news.blade.php

@@ -14,7 +14,7 @@
       <p class="category">{{ $item->user->name_private }}
         - {{ show_datetime($item->created_at) }}</p>
 
-      {{ $item->body }}
+      {!! $item->body !!}
     @endforeach
   </div>
 </div>

resources/views/notifications/mail/news/news.blade.php

@@ -1,7 +1,7 @@
 @component('mail::message')
   # {{ $news->subject }}
 
-  {{ $news->body }}
+  {!! $news->body !!}
 
   Thanks,<br>
   {{ config('app.name') }}