Add ability to use a link instead of a page #750 (#757)

Add ability to use a link instead of a page #750

resources/views/admin/flash/message.blade.php

@@ -1,4 +1,4 @@
-@foreach (session('flash_notification', []) as $message)
+@foreach (session('flash_notification', collect())->toArray() as $message)
   @if ($message['overlay'])
     @include('flash::modal', [
         'modalClass' => 'flash-modal',
@@ -9,21 +9,17 @@
     <div class="alert
                     alert-{{ $message['level'] }}
     {{ $message['important'] ? 'alert-important' : '' }}"
-         role="alert"
-    >
-      <div class="alert-icon">
-        <i class="now-ui-icons ui-2_like"></i>
-      </div>
+         role="alert">
       @if ($message['important'])
+        <button type="button"
+                class="close"
+                data-dismiss="alert"
+                aria-hidden="true"
+        >&times;
+        </button>
       @endif
-      <button type="button"
-              class="close"
-              data-dismiss="alert"
-              aria-hidden="true">&times;
-      </button>
-
-      {{ $message['message'] }}
 
+      {!! $message['message'] !!}
     </div>
   @endif
 @endforeach

resources/views/admin/menu.blade.php

@@ -71,7 +71,7 @@
       @endability
 
       @ability('admin', 'pages')
-      <li><a href="{!! url('/admin/pages') !!}"><i class="pe-7s-note"></i>pages</a></li>
+      <li><a href="{!! url('/admin/pages') !!}"><i class="pe-7s-note"></i>pages/links</a></li>
       @endability
 
       @ability('admin', 'maintenance')

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

@@ -45,15 +45,55 @@
   <div class="col-12">
     <div class="form-container">
       <h6><i class="fas fa-sticky-note"></i>
-        &nbsp;Content
+        &nbsp;Type
       </h6>
       <div class="form-container-body">
         <div class="row">
+          <div class="form-group col-12">
+            {{ Form::label('type', 'Page Type') }}
+            {{ Form::select('type', \App\Models\Enums\PageType::select(false), null, [
+                    'id'    => 'content-type-select',
+                    'class' => 'form-control select2',
+                ])
+            }}
+            <p class="text-danger">{{ $errors->first('type') }}</p>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+
+<div class="row">
+  <div class="col-12">
+    <div class="form-container">
+      <h6><i class="fas fa-sticky-note"></i>
+        &nbsp;Content
+      </h6>
+      <div class="form-container-body">
+        <div id="type_content_page" class="row">
           <div class="form-group col-12">
             {{ Form::textarea('body', null, ['id' => 'editor', 'class' => 'editor']) }}
             <p class="text-danger">{{ $errors->first('body') }}</p>
           </div>
         </div>
+
+        <div id="type_content_link" class="row">
+          <div class="form-group col-12">
+            {{ Form::text('link', null, ['class' => 'form-control', 'placeholder' => 'Link']) }}
+            <p class="text-danger">{{ $errors->first('link') }}</p>
+          </div>
+
+          <div class="form-group col-12">
+            <div class="checkbox">
+              <label class="checkbox-inline">
+                {{ Form::label('new_window', 'Open in new window:') }}
+                <input name="new_window" type="hidden" value="0"/>
+                {{ Form::checkbox('new_window') }}
+              </label>
+            </div>
+          </div>
+        </div>
       </div>
     </div>
   </div>
@@ -66,7 +106,6 @@
         {{ Form::hidden('id') }}
       @endif
 
-      {{ Form::hidden('type',  \App\Models\Enums\PageType::HTML) }}
       {{ Form::button('Save', ['type' => 'submit', 'class' => 'btn btn-success']) }}
       <a href="{{ route('admin.roles.index') }}" class="btn btn-default">Cancel</a>
     </div>
@@ -76,5 +115,26 @@
 <script>
   $(document).ready(function () {
     CKEDITOR.replace('editor');
+    const select_id = "select#content-type-select";
+
+    function swap_content() {
+      const type = parseInt($(select_id + " option:selected").val());
+      console.log('content type change: ', type);
+
+      if (type === 0) {
+        $("#type_content_page").show();
+        $("#type_content_link").hide();
+      }
+      else if (type === 1) {
+        $("#type_content_page").hide();
+        $("#type_content_link").show();
+      }
+    }
+
+    $(select_id).change(async (e) => {
+      swap_content();
+    });
+
+    swap_content();
   });
 </script>

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

@@ -36,7 +36,7 @@
 
       @foreach($page_links as $page)
         <li class="nav-item">
-          <a class="nav-link" href="{{ url(route('frontend.pages.show', ['slug' => $page->slug])) }}">
+          <a class="nav-link" href="{{ $page->url }}" target="{{ $page->new_window ? '_blank':'_self' }}">
             <i class="{{ $page['icon'] }}"></i>
             <p>{{ $page['name'] }}</p>
           </a>