From eb793458e619b94cd4445fb92206df639bee5d90 Mon Sep 17 00:00:00 2001
From: saeid <saeidkhakbazan@gmail.com>
Date: Mon, 4 Apr 2022 13:47:48 +0430
Subject: [PATCH 1/2] fix

---
 composer-prod.json    |  2 +-
 composer-staging.json | 34 +++++++++++++++++-----------------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/composer-prod.json b/composer-prod.json
index 3a4232c..a28ab19 100644
--- a/composer-prod.json
+++ b/composer-prod.json
@@ -155,7 +155,7 @@
             "type": "vcs",
             "url": "git@git.willaspace.com:WillaEngine-Project/lms.git"
         },
-	{
+	    {
             "type": "vcs",
             "url": "git@git.willaspace.com:WillaEngine-Project/contact-us.git"
         }
diff --git a/composer-staging.json b/composer-staging.json
index 4a6aa71..a9e34c5 100644
--- a/composer-staging.json
+++ b/composer-staging.json
@@ -20,23 +20,23 @@
         "spatie/laravel-medialibrary": "^8.0.0",
         "io-developer/php-whois": "^4.0",
         "silber/bouncer": "v1.0.0-rc.10",
-        "wm/blog": "dev-master",
-        "wm/common": "dev-master",
-        "wm/core": "dev-master",
-        "wm/crm": "dev-master",
-        "wm/portfolio": "dev-master",
-        "wm/product": "dev-master",
-        "wm/service": "dev-master",
-        "wm/store": "dev-master",
-        "wm/finance": "dev-master",
-        "wm/admin": "dev-master",
-        "wm/web-builder": "dev-master",
-        "wm/app-management": "dev-master",
-        "wm/notification": "dev-master",
-        "wm/roll-call": "dev-master",
-        "wm/lms": "dev-master",
-        "wm/service-store": "dev-master",
-        "wm/contact-us": "dev-master",
+        "wm/blog": "dev-dev",
+        "wm/common": "dev-dev",
+        "wm/core": "dev-dev",
+        "wm/crm": "dev-dev",
+        "wm/portfolio": "dev-dev",
+        "wm/product": "dev-dev",
+        "wm/service": "dev-dev",
+        "wm/store": "dev-dev",
+        "wm/finance": "dev-dev",
+        "wm/admin": "dev-dev",
+        "wm/web-builder": "dev-dev",
+        "wm/app-management": "dev-dev",
+        "wm/notification": "dev-dev",
+        "wm/roll-call": "dev-dev",
+        "wm/lms": "dev-dev",
+        "wm/service-store": "dev-dev",
+        "wm/contact-us": "dev-dev",
         "zircote/swagger-php": "^3.0"
     },
     "provide": {

From e663bf91262f7d627b4835b5c6a709bc5cd0b1b1 Mon Sep 17 00:00:00 2001
From: saeid <saeidkhakbazan@gmail.com>
Date: Sat, 9 Apr 2022 18:08:17 +0430
Subject: [PATCH 2/2] feat: add custom page for  error 404

---
 app/Exceptions/Handler.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index 7323ea7..ee4413b 100644
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -60,6 +60,10 @@ class Handler extends ExceptionHandler
             return response()->view('webBuilder::errors.template_disabled', ['error' => 'business banned']);
         } elseif ($exception instanceof HasRelationException) {
             return response()->json(Responser::error([$exception->getMessage()]), 422);
+        } elseif ($this->isHttpException($exception)) {
+            if ($exception->getStatusCode() == 404) {
+                return response()->view('webBuilder::errors.404', [], 404);
+            }
         }
 
         return parent::render($request, $exception);