👍 Frontend js support

modules/CMS/Exceptions/Handler.php

@@ -65,25 +65,27 @@ function (Throwable $e) {
     public function render($request, Throwable $e)
     {
         if ($this->is404Exception($e)) {
+            $message = $e->getMessage() ?: 'Page not found';
+
             if ($request->expectsJson()) {
-                return response()->json(['message' => 'Page not found'], 404);
+                return response()->json(['message' => $message], 404);
             }
 
             if ($request->is(config('juzaweb.admin_prefix').'/*')) {
-                return response()->view('cms::404', ['message' => 'Page not found'], 404);
+                return response()->view('cms::404', ['message' => $message], 404);
             }
 
             if (view()->exists(theme_viewname('theme::404'))) {
                 return response()->view(
                     theme_viewname('theme::404'),
-                    ['message' => 'Page not found'],
+                    ['message' => $message],
                     404
                 );
             }
 
             return response()->view(
                 'cms::404',
-                ['message' => 'Page not found'],
+                ['message' => $message],
                 404
             );
         }

resources/assets/js/form-ajax.js

@@ -9,14 +9,14 @@
  */
 
 $(function () {
-    function sendMessageByResponse(response, notify = false) {
+    function sendMessageByResponse(response, notify = false, form = null) {
         if (notify) {
             if (typeof show_notify !== 'undefined' && typeof show_notify === 'function') {
                 show_notify(response);
             }
         } else {
             if (typeof show_message !== 'undefined' && typeof show_message === 'function') {
-                show_message(response);
+                show_message(response, false, form);
             }
         }
     }
@@ -38,7 +38,7 @@ $(function () {
             contentType: false,
             processData: false
         }).done(function(response) {
-            sendMessageByResponse(response, notify);
+            sendMessageByResponse(response, notify, form);
 
             if (submitSuccess) {
                 let handler = eval(submitSuccess)(form, response);
@@ -75,7 +75,7 @@ $(function () {
                 btnsubmit.html(currentText);
             }
 
-            sendMessageByResponse(response, notify);
+            sendMessageByResponse(response, notify, form);
             return false;
         });
     }

resources/assets/js/helpers/helpers.js

@@ -75,7 +75,7 @@ function get_message_response(response)
     }
 }
 
-function show_message(response, append = false)
+function show_message(response, append = false, form = null)
 {
     let msg = get_message_response(response);
     if (!msg) {
@@ -91,10 +91,15 @@ function show_message(response, append = false)
         ${msg.status ? '<i class="fa fa-check"></i>' : '<i class="fa fa-times"></i>' } ${msg.message}
     </div>`;
 
+    let el = $('#jquery-message');
+    if (form && form.find('.form-mesage').length > 0) {
+        el = form.find('.form-mesage');
+    }
+
     if (append) {
-        $('#jquery-message').append(msgHTML);
+        el.append(msgHTML);
     } else {
-        $('#jquery-message').html(msgHTML);
+        el.html(msgHTML);
     }
 }