diff --git a/app/Events/Backend/Auth/User/UserConfirmed.php b/app/Events/Backend/Auth/User/UserConfirmed.php
index bc2ffc85..3e5341c6 100755
--- a/app/Events/Backend/Auth/User/UserConfirmed.php
+++ b/app/Events/Backend/Auth/User/UserConfirmed.php
@@ -18,7 +18,7 @@ class UserConfirmed
     public $user;
 
     /**
-     * @param \App\Models\Auth\User $user
+     * @param  \App\Models\Auth\User  $user
      */
     public function __construct(User $user)
     {
diff --git a/app/Events/Backend/Auth/User/UserCreated.php b/app/Events/Backend/Auth/User/UserCreated.php
index 4f83ab47..becb469d 100755
--- a/app/Events/Backend/Auth/User/UserCreated.php
+++ b/app/Events/Backend/Auth/User/UserCreated.php
@@ -18,7 +18,7 @@ class UserCreated
     public $user;
 
     /**
-     * @param \App\Models\Auth\User $user
+     * @param  \App\Models\Auth\User  $user
      */
     public function __construct(User $user)
     {
diff --git a/app/Events/Backend/Auth/User/UserDeactivated.php b/app/Events/Backend/Auth/User/UserDeactivated.php
index d08b3e3d..c784c36c 100755
--- a/app/Events/Backend/Auth/User/UserDeactivated.php
+++ b/app/Events/Backend/Auth/User/UserDeactivated.php
@@ -18,7 +18,7 @@ class UserDeactivated
     public $user;
 
     /**
-     * @param \App\Models\Auth\User $user
+     * @param  \App\Models\Auth\User  $user
      */
     public function __construct(User $user)
     {
diff --git a/app/Events/Backend/Auth/User/UserDeleted.php b/app/Events/Backend/Auth/User/UserDeleted.php
index 8f1f2b5c..d0807127 100755
--- a/app/Events/Backend/Auth/User/UserDeleted.php
+++ b/app/Events/Backend/Auth/User/UserDeleted.php
@@ -18,7 +18,7 @@ class UserDeleted
     public $user;
 
     /**
-     * @param \App\Models\Auth\User $user
+     * @param  \App\Models\Auth\User  $user
      */
     public function __construct(User $user)
     {
diff --git a/app/Events/Backend/Auth/User/UserPasswordChanged.php b/app/Events/Backend/Auth/User/UserPasswordChanged.php
index fa74d7a4..cb431034 100755
--- a/app/Events/Backend/Auth/User/UserPasswordChanged.php
+++ b/app/Events/Backend/Auth/User/UserPasswordChanged.php
@@ -18,7 +18,7 @@ class UserPasswordChanged
     public $user;
 
     /**
-     * @param \App\Models\Auth\User $user
+     * @param  \App\Models\Auth\User  $user
      */
     public function __construct(User $user)
     {
diff --git a/app/Events/Backend/Auth/User/UserPermanentlyDeleted.php b/app/Events/Backend/Auth/User/UserPermanentlyDeleted.php
index 6c1dd192..22cfdd97 100755
--- a/app/Events/Backend/Auth/User/UserPermanentlyDeleted.php
+++ b/app/Events/Backend/Auth/User/UserPermanentlyDeleted.php
@@ -18,7 +18,7 @@ class UserPermanentlyDeleted
     public $user;
 
     /**
-     * @param \App\Models\Auth\User $user
+     * @param  \App\Models\Auth\User  $user
      */
     public function __construct(User $user)
     {
diff --git a/app/Events/Backend/Auth/User/UserReactivated.php b/app/Events/Backend/Auth/User/UserReactivated.php
index e075b7bf..dac5d89e 100755
--- a/app/Events/Backend/Auth/User/UserReactivated.php
+++ b/app/Events/Backend/Auth/User/UserReactivated.php
@@ -18,7 +18,7 @@ class UserReactivated
     public $user;
 
     /**
-     * @param \App\Models\Auth\User $user
+     * @param  \App\Models\Auth\User  $user
      */
     public function __construct(User $user)
     {
diff --git a/app/Events/Backend/Auth/User/UserRestored.php b/app/Events/Backend/Auth/User/UserRestored.php
index b1e1e60c..ca6ced27 100755
--- a/app/Events/Backend/Auth/User/UserRestored.php
+++ b/app/Events/Backend/Auth/User/UserRestored.php
@@ -18,7 +18,7 @@ class UserRestored
     public $user;
 
     /**
-     * @param \App\Models\Auth\User $user
+     * @param  \App\Models\Auth\User  $user
      */
     public function __construct(User $user)
     {
diff --git a/app/Events/Backend/Auth/User/UserSocialDeleted.php b/app/Events/Backend/Auth/User/UserSocialDeleted.php
index 81e7a260..2b096b3f 100755
--- a/app/Events/Backend/Auth/User/UserSocialDeleted.php
+++ b/app/Events/Backend/Auth/User/UserSocialDeleted.php
@@ -25,7 +25,7 @@ class UserSocialDeleted
     /**
      * UserSocialDeleted constructor.
      *
-     * @param \App\Models\Auth\User $user
+     * @param  \App\Models\Auth\User  $user
      * @param $social
      */
     public function __construct(User $user, $social)
diff --git a/app/Events/Backend/Auth/User/UserUnconfirmed.php b/app/Events/Backend/Auth/User/UserUnconfirmed.php
index 56bcc41c..b0c03258 100755
--- a/app/Events/Backend/Auth/User/UserUnconfirmed.php
+++ b/app/Events/Backend/Auth/User/UserUnconfirmed.php
@@ -18,7 +18,7 @@ class UserUnconfirmed
     public $user;
 
     /**
-     * @param \App\Models\Auth\User $user
+     * @param  \App\Models\Auth\User  $user
      */
     public function __construct(User $user)
     {
diff --git a/app/Events/Backend/Auth/User/UserUpdated.php b/app/Events/Backend/Auth/User/UserUpdated.php
index b05b5ea2..6257564c 100755
--- a/app/Events/Backend/Auth/User/UserUpdated.php
+++ b/app/Events/Backend/Auth/User/UserUpdated.php
@@ -18,7 +18,7 @@ class UserUpdated
     public $user;
 
     /**
-     * @param \App\Models\Auth\User $user
+     * @param  \App\Models\Auth\User  $user
      */
     public function __construct(User $user)
     {
diff --git a/app/Exceptions/GeneralException.php b/app/Exceptions/GeneralException.php
index 0b2ee32c..fe4b0f83 100755
--- a/app/Exceptions/GeneralException.php
+++ b/app/Exceptions/GeneralException.php
@@ -18,9 +18,9 @@ class GeneralException extends Exception
     /**
      * GeneralException constructor.
      *
-     * @param string         $message
-     * @param int            $code
-     * @param Throwable|null $previous
+     * @param  string  $message
+     * @param  int  $code
+     * @param  Throwable|null  $previous
      */
     public function __construct($message = '', $code = 0, Throwable $previous = null)
     {
diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
index 97a2d4cc..9377e0ec 100755
--- a/app/Exceptions/Handler.php
+++ b/app/Exceptions/Handler.php
@@ -41,10 +41,10 @@ class Handler extends ExceptionHandler
     /**
      * Report or log an exception.
      *
-     * @param Exception $exception
+     * @param  Exception  $exception
+     * @return mixed|void
      *
      * @throws Exception
-     * @return mixed|void
      */
     public function report(Exception $exception)
     {
@@ -56,8 +56,9 @@ public function report(Exception $exception)
      *
      * @param  \Illuminate\Http\Request  $request
      * @param  \Exception  $exception
-     * @throws \Exception
      * @return \Symfony\Component\HttpFoundation\Response
+     *
+     * @throws \Exception
      */
     public function render($request, Exception $exception)
     {
@@ -123,7 +124,6 @@ public function getStatusCode()
      * set the status code.
      *
      * @param [type] $statusCode [description]
-     *
      * @return statuscode
      */
     public function setStatusCode($statusCode)
@@ -137,7 +137,6 @@ public function setStatusCode($statusCode)
      * respond with error.
      *
      * @param $message
-     *
      * @return \Illuminate\Http\JsonResponse
      */
     protected function respondWithError($message)
@@ -153,9 +152,8 @@ protected function respondWithError($message)
     /**
      * Respond.
      *
-     * @param array $data
-     * @param array $headers
-     *
+     * @param  array  $data
+     * @param  array  $headers
      * @return \Illuminate\Http\JsonResponse
      */
     public function respond($data, $headers = [])
diff --git a/app/Exceptions/ReportableException.php b/app/Exceptions/ReportableException.php
index a246031e..411942b4 100755
--- a/app/Exceptions/ReportableException.php
+++ b/app/Exceptions/ReportableException.php
@@ -18,9 +18,9 @@ class ReportableException extends Exception
     /**
      * GeneralException constructor.
      *
-     * @param string         $message
-     * @param int            $code
-     * @param Throwable|null $previous
+     * @param  string  $message
+     * @param  int  $code
+     * @param  Throwable|null  $previous
      */
     public function __construct($message = '', $code = 0, Throwable $previous = null)
     {
diff --git a/app/Helpers/General/HtmlHelper.php b/app/Helpers/General/HtmlHelper.php
index 2edf9e2f..7e670557 100755
--- a/app/Helpers/General/HtmlHelper.php
+++ b/app/Helpers/General/HtmlHelper.php
@@ -20,7 +20,7 @@ class HtmlHelper
     /**
      * HtmlHelper constructor.
      *
-     * @param UrlGenerator|null $url
+     * @param  UrlGenerator|null  $url
      */
     public function __construct(UrlGenerator $url = null)
     {
@@ -28,10 +28,9 @@ public function __construct(UrlGenerator $url = null)
     }
 
     /**
-     * @param       $url
-     * @param array $attributes
-     * @param null  $secure
-     *
+     * @param  $url
+     * @param  array  $attributes
+     * @param  null  $secure
      * @return mixed
      */
     public function style($url, $attributes = [], $secure = null)
@@ -48,10 +47,9 @@ public function style($url, $attributes = [], $secure = null)
     /**
      * Generate a link to a JavaScript file.
      *
-     * @param string $url
-     * @param array  $attributes
-     * @param bool   $secure
-     *
+     * @param  string  $url
+     * @param  array  $attributes
+     * @param  bool  $secure
      * @return \Illuminate\Support\HtmlString
      */
     public function script($url, $attributes = [], $secure = null)
@@ -62,10 +60,9 @@ public function script($url, $attributes = [], $secure = null)
     }
 
     /**
-     * @param        $cancel_to
-     * @param        $title
-     * @param string $classes
-     *
+     * @param  $cancel_to
+     * @param  $title
+     * @param  string  $classes
      * @return HtmlString
      */
     public function formCancel($cancel_to, $title, $classes = 'btn btn-danger btn-sm')
@@ -74,9 +71,8 @@ public function formCancel($cancel_to, $title, $classes = 'btn btn-danger btn-sm
     }
 
     /**
-     * @param        $title
-     * @param string $classes
-     *
+     * @param  $title
+     * @param  string  $classes
      * @return HtmlString
      */
     public function formSubmit($title, $classes = 'btn btn-success btn-sm pull-right')
@@ -87,8 +83,7 @@ public function formSubmit($title, $classes = 'btn btn-success btn-sm pull-right
     /**
      * Build an HTML attribute string from an array.
      *
-     * @param array $attributes
-     *
+     * @param  array  $attributes
      * @return string
      */
     public function attributes($attributes)
@@ -109,9 +104,8 @@ public function attributes($attributes)
     /**
      * Build a single attribute element.
      *
-     * @param string $key
-     * @param string $value
-     *
+     * @param  string  $key
+     * @param  string  $value
      * @return string
      */
     protected function attributeElement($key, $value)
@@ -139,7 +133,6 @@ protected function attributeElement($key, $value)
      * Transform the string to an Html serializable object.
      *
      * @param $html
-     *
      * @return \Illuminate\Support\HtmlString
      */
     protected function toHtmlString($html)
diff --git a/app/Helpers/General/TimezoneHelper.php b/app/Helpers/General/TimezoneHelper.php
index d9126999..057c7f7d 100755
--- a/app/Helpers/General/TimezoneHelper.php
+++ b/app/Helpers/General/TimezoneHelper.php
@@ -10,9 +10,8 @@
 class TimezoneHelper
 {
     /**
-     * @param Carbon $date
-     * @param string $format
-     *
+     * @param  Carbon  $date
+     * @param  string  $format
      * @return Carbon
      */
     public function convertToLocal(Carbon $date, $format = 'D M j G:i:s T Y'): string
@@ -22,7 +21,6 @@ public function convertToLocal(Carbon $date, $format = 'D M j G:i:s T Y'): strin
 
     /**
      * @param $date
-     *
      * @return Carbon
      */
     public function convertFromLocal($date): Carbon
diff --git a/app/Helpers/Global/HtmlHelper.php b/app/Helpers/Global/HtmlHelper.php
index 7bedfbf9..69e60202 100755
--- a/app/Helpers/Global/HtmlHelper.php
+++ b/app/Helpers/Global/HtmlHelper.php
@@ -4,10 +4,9 @@
 
 if (! function_exists('style')) {
     /**
-     * @param       $url
-     * @param array $attributes
-     * @param null  $secure
-     *
+     * @param  $url
+     * @param  array  $attributes
+     * @param  null  $secure
      * @return mixed
      */
     function style($url, $attributes = [], $secure = null)
@@ -18,10 +17,9 @@ function style($url, $attributes = [], $secure = null)
 
 if (! function_exists('script')) {
     /**
-     * @param       $url
-     * @param array $attributes
-     * @param null  $secure
-     *
+     * @param  $url
+     * @param  array  $attributes
+     * @param  null  $secure
      * @return mixed
      */
     function script($url, $attributes = [], $secure = null)
@@ -32,10 +30,9 @@ function script($url, $attributes = [], $secure = null)
 
 if (! function_exists('form_cancel')) {
     /**
-     * @param        $cancel_to
-     * @param        $title
-     * @param string $classes
-     *
+     * @param  $cancel_to
+     * @param  $title
+     * @param  string  $classes
      * @return mixed
      */
     function form_cancel($cancel_to, $title, $classes = 'btn btn-danger btn-sm')
@@ -46,9 +43,8 @@ function form_cancel($cancel_to, $title, $classes = 'btn btn-danger btn-sm')
 
 if (! function_exists('form_submit')) {
     /**
-     * @param        $title
-     * @param string $classes
-     *
+     * @param  $title
+     * @param  string  $classes
      * @return mixed
      */
     function form_submit($title, $classes = 'btn btn-success btn-sm pull-right')
@@ -61,10 +57,9 @@ function form_submit($title, $classes = 'btn btn-success btn-sm pull-right')
     /**
      * Get the active class if the condition is not falsy.
      *
-     * @param        $condition
-     * @param string $activeClass
-     * @param string $inactiveClass
-     *
+     * @param  $condition
+     * @param  string  $activeClass
+     * @param  string  $inactiveClass
      * @return string
      */
     function active_class($condition, $activeClass = 'active', $inactiveClass = '')
diff --git a/app/Helpers/helper.php b/app/Helpers/helper.php
index efbae8a0..feefc33d 100755
--- a/app/Helpers/helper.php
+++ b/app/Helpers/helper.php
@@ -107,7 +107,6 @@ function includeRouteFiles($folder)
      * So we take the original and place that in and send back the path.
      *
      * @param $path
-     *
      * @return string
      */
     function getRtlCss($path)
diff --git a/app/Http/Composers/Backend/SidebarComposer.php b/app/Http/Composers/Backend/SidebarComposer.php
index e7318de8..3307da3f 100755
--- a/app/Http/Composers/Backend/SidebarComposer.php
+++ b/app/Http/Composers/Backend/SidebarComposer.php
@@ -18,7 +18,7 @@ class SidebarComposer
     /**
      * SidebarComposer constructor.
      *
-     * @param UserRepository $userRepository
+     * @param  UserRepository  $userRepository
      */
     public function __construct(UserRepository $userRepository)
     {
@@ -26,8 +26,7 @@ public function __construct(UserRepository $userRepository)
     }
 
     /**
-     * @param View $view
-     *
+     * @param  View  $view
      * @return bool|mixed
      */
     public function compose(View $view)
diff --git a/app/Http/Composers/GlobalComposer.php b/app/Http/Composers/GlobalComposer.php
index 5aec0cd3..1ed9c405 100755
--- a/app/Http/Composers/GlobalComposer.php
+++ b/app/Http/Composers/GlobalComposer.php
@@ -12,7 +12,7 @@ class GlobalComposer
     /**
      * Bind data to the view.
      *
-     * @param View $view
+     * @param  View  $view
      */
     public function compose(View $view)
     {
diff --git a/app/Http/Controllers/Api/V1/APIController.php b/app/Http/Controllers/Api/V1/APIController.php
index d59daf01..18f8811f 100755
--- a/app/Http/Controllers/Api/V1/APIController.php
+++ b/app/Http/Controllers/Api/V1/APIController.php
@@ -31,7 +31,6 @@ public function getStatusCode()
      * set the status code.
      *
      * @param [type] $statusCode [description]
-     *
      * @return statuscode
      */
     public function setStatusCode($statusCode)
@@ -44,9 +43,8 @@ public function setStatusCode($statusCode)
     /**
      * Respond.
      *
-     * @param array $data
-     * @param array $headers
-     *
+     * @param  array  $data
+     * @param  array  $headers
      * @return \Illuminate\Http\JsonResponse
      */
     public function respond($data, $headers = [])
@@ -57,9 +55,8 @@ public function respond($data, $headers = [])
     /**
      * respond with pagincation.
      *
-     * @param Paginator $items
-     * @param array     $data
-     *
+     * @param  Paginator  $items
+     * @param  array  $data
      * @return \Illuminate\Http\JsonResponse
      */
     public function respondWithPagination($items, $data)
@@ -79,8 +76,7 @@ public function respondWithPagination($items, $data)
     /**
      * Respond Created.
      *
-     * @param string $message
-     *
+     * @param  string  $message
      * @return \Illuminate\Http\JsonResponse
      */
     public function respondCreated($data)
@@ -93,8 +89,7 @@ public function respondCreated($data)
     /**
      * Respond Created with data.
      *
-     * @param string $message
-     *
+     * @param  string  $message
      * @return \Illuminate\Http\JsonResponse
      */
     public function respondCreatedWithData($data)
@@ -106,7 +101,6 @@ public function respondCreatedWithData($data)
      * respond with error.
      *
      * @param $message
-     *
      * @return \Illuminate\Http\JsonResponse
      */
     public function respondWithError($message)
@@ -122,8 +116,7 @@ public function respondWithError($message)
     /**
      * responsd not found.
      *
-     * @param string $message
-     *
+     * @param  string  $message
      * @return \Illuminate\Http\JsonResponse
      */
     public function respondNotFound($message = 'Not Found')
@@ -134,8 +127,7 @@ public function respondNotFound($message = 'Not Found')
     /**
      * Respond with error.
      *
-     * @param string $message
-     *
+     * @param  string  $message
      * @return \Illuminate\Http\JsonResponse
      */
     public function respondInternalError($message = 'Internal Error')
@@ -146,8 +138,7 @@ public function respondInternalError($message = 'Internal Error')
     /**
      * Respond with unauthorized.
      *
-     * @param string $message
-     *
+     * @param  string  $message
      * @return \Illuminate\Http\JsonResponse
      */
     protected function respondUnauthorized($message = 'Unauthorized')
@@ -158,8 +149,7 @@ protected function respondUnauthorized($message = 'Unauthorized')
     /**
      * Respond with forbidden.
      *
-     * @param string $message
-     *
+     * @param  string  $message
      * @return \Illuminate\Http\JsonResponse
      */
     protected function respondForbidden($message = 'Forbidden')
diff --git a/app/Http/Controllers/Api/V1/BlogCategoriesController.php b/app/Http/Controllers/Api/V1/BlogCategoriesController.php
index 5669853d..c68fab3f 100755
--- a/app/Http/Controllers/Api/V1/BlogCategoriesController.php
+++ b/app/Http/Controllers/Api/V1/BlogCategoriesController.php
@@ -53,8 +53,7 @@ public function __construct(BlogCategoriesRepository $repository)
      * @responseFile status=401 scenario="API token not provided" responses/unauthenticated.json
      * @responseFile responses/blog-category/blog-category-list.json
      *
-     * @param ManageBlogCategoriesRequest $request
-     *
+     * @param  ManageBlogCategoriesRequest  $request
      * @return \Illuminate\Http\JsonResponse
      */
     public function index(ManageBlogCategoriesRequest $request)
@@ -75,9 +74,8 @@ public function index(ManageBlogCategoriesRequest $request)
      * @responseFile status=401 scenario="API token not provided" responses/unauthenticated.json
      * @responseFile responses/blog-category/blog-category-show.json
      *
-     * @param ManageBlogCategoriesRequest $request
-     * @param BlogCategory $blogCategory
-     *
+     * @param  ManageBlogCategoriesRequest  $request
+     * @param  BlogCategory  $blogCategory
      * @return \Illuminate\Http\JsonResponse
      */
     public function show(ManageBlogCategoriesRequest $request, BlogCategory $blogCategory)
@@ -93,8 +91,7 @@ public function show(ManageBlogCategoriesRequest $request, BlogCategory $blogCat
      * @responseFile status=401 scenario="API token not provided" responses/unauthenticated.json
      * @responseFile status=201 responses/blog-category/blog-category-store.json
      *
-     * @param StoreBlogCategoriesRequest $request
-     *
+     * @param  StoreBlogCategoriesRequest  $request
      * @return \Illuminate\Http\JsonResponse
      */
     public function store(StoreBlogCategoriesRequest $request)
@@ -117,9 +114,8 @@ public function store(StoreBlogCategoriesRequest $request)
      * @responseFile status=401 scenario="API token not provided" responses/unauthenticated.json
      * @responseFile status=200 responses/blog-category/blog-category-update.json
      *
-     * @param UpdateBlogCategoriesRequest $request
-     * @param BlogCategory $blogCategory
-     *
+     * @param  UpdateBlogCategoriesRequest  $request
+     * @param  BlogCategory  $blogCategory
      * @return \Illuminate\Http\JsonResponse
      */
     public function update(UpdateBlogCategoriesRequest $request, BlogCategory $blogCategory)
@@ -140,9 +136,8 @@ public function update(UpdateBlogCategoriesRequest $request, BlogCategory $blogC
      * @responseFile status=401 scenario="API token not provided" responses/unauthenticated.json
      * @responseFile status=204 scenario="When the record is deleted" responses/blog-category/blog-category-destroy.json
      *
-     * @param DeleteBlogCategoriesRequest $request
-     * @param BlogCategory $blogCategory
-     *
+     * @param  DeleteBlogCategoriesRequest  $request
+     * @param  BlogCategory  $blogCategory
      * @return \Illuminate\Http\JsonResponse
      */
     public function destroy(DeleteBlogCategoriesRequest $request, BlogCategory $blogCategory)
diff --git a/app/Http/Controllers/Api/V1/BlogTagsController.php b/app/Http/Controllers/Api/V1/BlogTagsController.php
index 649779b5..4f8ba776 100755
--- a/app/Http/Controllers/Api/V1/BlogTagsController.php
+++ b/app/Http/Controllers/Api/V1/BlogTagsController.php
@@ -53,8 +53,7 @@ public function __construct(BlogTagsRepository $repository)
      * @responseFile status=401 scenario="api_key not provided" responses/unauthenticated.json
      * @responseFile responses/blog-tag/blog-tag-list.json
      *
-     * @param ManageBlogTagsRequest $request
-     *
+     * @param  ManageBlogTagsRequest  $request
      * @return \Illuminate\Http\JsonResponse
      */
     public function index(ManageBlogTagsRequest $request)
@@ -75,9 +74,8 @@ public function index(ManageBlogTagsRequest $request)
      * @responseFile status=401 scenario="API token not provided" responses/unauthenticated.json
      * @responseFile responses/blog-tag/blog-tag-show.json
      *
-     * @param ManageBlogTagsRequest $request
-     * @param BlogTag $blogTag
-     *
+     * @param  ManageBlogTagsRequest  $request
+     * @param  BlogTag  $blogTag
      * @return \Illuminate\Http\JsonResponse
      */
     public function show(ManageBlogTagsRequest $request, BlogTag $blogTag)
@@ -93,8 +91,7 @@ public function show(ManageBlogTagsRequest $request, BlogTag $blogTag)
      * @responseFile status=401 scenario="api_key not provided" responses/unauthenticated.json
      * @responseFile responses/blog-tag/blog-tag-store.json
      *
-     * @param \App\Http\Requests\Backend\BlogTags\StoreBlogTagsRequest $request
-     *
+     * @param  \App\Http\Requests\Backend\BlogTags\StoreBlogTagsRequest  $request
      * @return \Illuminate\Http\JsonResponse
      */
     public function store(StoreBlogTagsRequest $request)
@@ -115,9 +112,8 @@ public function store(StoreBlogTagsRequest $request)
      * @responseFile status=401 scenario="api_key not provided" responses/unauthenticated.json
      * @responseFile responses/blog-tag/blog-tag-update.json
      *
-     * @param UpdateBlogTagsRequest $request
-     * @param BlogTag $blogTag
-     *
+     * @param  UpdateBlogTagsRequest  $request
+     * @param  BlogTag  $blogTag
      * @return \Illuminate\Http\JsonResponse
      */
     public function update(UpdateBlogTagsRequest $request, BlogTag $blogTag)
@@ -138,9 +134,8 @@ public function update(UpdateBlogTagsRequest $request, BlogTag $blogTag)
      * @responseFile status=401 scenario="api_key not provided" responses/unauthenticated.json
      * @responseFile status=204 scenario="When the record is deleted" responses/blog-tag/blog-tag-destroy.json
      *
-     * @param DeleteBlogTagsRequest $request
-     * @param BlogTag $blogTag
-     *
+     * @param  DeleteBlogTagsRequest  $request
+     * @param  BlogTag  $blogTag
      * @return \Illuminate\Http\JsonResponse
      */
     public function destroy(DeleteBlogTagsRequest $request, BlogTag $blogTag)
diff --git a/app/Http/Controllers/Api/V1/BlogsController.php b/app/Http/Controllers/Api/V1/BlogsController.php
index 0a68c799..b84f62fe 100755
--- a/app/Http/Controllers/Api/V1/BlogsController.php
+++ b/app/Http/Controllers/Api/V1/BlogsController.php
@@ -53,8 +53,7 @@ public function __construct(BlogsRepository $repository)
      * @responseFile status=401 scenario="api_key not provided" responses/unauthenticated.json
      * @responseFile responses/blog/blog-list.json
      *
-     * @param ManageBlogsRequest $request
-     *
+     * @param  ManageBlogsRequest  $request
      * @return \Illuminate\Http\JsonResponse
      */
     public function index(ManageBlogsRequest $request)
@@ -76,7 +75,6 @@ public function index(ManageBlogsRequest $request)
      * @responseFile responses/blog/blog-show.json
      *
      * @param \App\Models\Blog blog
-     *
      * @return \Illuminate\Http\JsonResponse
      */
     public function show(ManageBlogsRequest $request, Blog $blog)
@@ -92,8 +90,7 @@ public function show(ManageBlogsRequest $request, Blog $blog)
      * @responseFile status=401 scenario="api_key not provided" responses/unauthenticated.json
      * @responseFile status=201 responses/blog/blog-store.json
      *
-     * @param StoreBlogsRequest $request
-     *
+     * @param  StoreBlogsRequest  $request
      * @return \Illuminate\Http\JsonResponse
      */
     public function store(StoreBlogsRequest $request)
@@ -114,9 +111,8 @@ public function store(StoreBlogsRequest $request)
      * @responseFile status=401 scenario="api_key not provided" responses/unauthenticated.json
      * @responseFile responses/blog/blog-update.json
      *
-     * @param \App\Models\Blog $blog
-     * @param \App\Http\Requests\Backend\Blogs\UpdateBlogsRequest $request
-     *
+     * @param  \App\Models\Blog  $blog
+     * @param  \App\Http\Requests\Backend\Blogs\UpdateBlogsRequest  $request
      * @return \Illuminate\Http\JsonResponse
      */
     public function update(UpdateBlogsRequest $request, Blog $blog)
@@ -135,9 +131,8 @@ public function update(UpdateBlogsRequest $request, Blog $blog)
      * @responseFile status=401 scenario="api_key not provided" responses/unauthenticated.json
      * @responseFile status=204 scenario="When the record is deleted" responses/blog/blog-destroy.json
      *
-     * @param DeleteBlogsRequest $request
-     * @param \App\Models\Blog $blog
-     *
+     * @param  DeleteBlogsRequest  $request
+     * @param  \App\Models\Blog  $blog
      * @return \Illuminate\Http\JsonResponse
      */
     public function destroy(DeleteBlogsRequest $request, Blog $blog)
diff --git a/app/Http/Controllers/Api/V1/FaqsController.php b/app/Http/Controllers/Api/V1/FaqsController.php
index 2ba51fae..057c4bb2 100755
--- a/app/Http/Controllers/Api/V1/FaqsController.php
+++ b/app/Http/Controllers/Api/V1/FaqsController.php
@@ -53,8 +53,7 @@ public function __construct(FaqsRepository $repository)
      * @responseFile status=401 scenario="api_key not provided" responses/unauthenticated.json
      * @responseFile responses/faq/faq-list.json
      *
-     * @param ManageFaqsRequest $request
-     *
+     * @param  ManageFaqsRequest  $request
      * @return \Illuminate\Http\JsonResponse
      */
     public function index(ManageFaqsRequest $request)
@@ -75,9 +74,8 @@ public function index(ManageFaqsRequest $request)
      * @responseFile status=401 scenario="api_key not provided" responses/unauthenticated.json
      * @responseFile responses/faq/faq-show.json
      *
-     * @param ManageFaqsRequest $request
-     * @param \App\Models\Faq $faq
-     *
+     * @param  ManageFaqsRequest  $request
+     * @param  \App\Models\Faq  $faq
      * @return \Illuminate\Http\JsonResponse
      */
     public function show(ManageFaqsRequest $request, Faq $faq)
@@ -93,8 +91,7 @@ public function show(ManageFaqsRequest $request, Faq $faq)
      * @responseFile status=401 scenario="api_key not provided" responses/unauthenticated.json
      * @responseFile status=201 responses/faq/faq-store.json
      *
-     * @param \App\Http\Requests\Backend\Faqs\StoreFaqsRequest $request
-     *
+     * @param  \App\Http\Requests\Backend\Faqs\StoreFaqsRequest  $request
      * @return \Illuminate\Http\JsonResponse
      */
     public function store(StoreFaqsRequest $request)
@@ -115,9 +112,8 @@ public function store(StoreFaqsRequest $request)
      * @responseFile status=401 scenario="api_key not provided" responses/unauthenticated.json
      * @responseFile responses/faq/faq-update.json
      *
-     * @param \App\Models\Faq $faq
-     * @param \App\Http\Requests\Backend\Faqs\UpdateFaqsRequest $request
-     *
+     * @param  \App\Models\Faq  $faq
+     * @param  \App\Http\Requests\Backend\Faqs\UpdateFaqsRequest  $request
      * @return \Illuminate\Http\JsonResponse
      */
     public function update(UpdateFaqsRequest $request, Faq $faq)
@@ -138,8 +134,7 @@ public function update(UpdateFaqsRequest $request, Faq $faq)
      * @responseFile status=401 scenario="api_key not provided" responses/unauthenticated.json
      * @responseFile status=204 scenario="When the record is deleted" responses/faq/faq-destroy.json
      *
-     * @param \App\Models\Faq $faq
-     *
+     * @param  \App\Models\Faq  $faq
      * @return \Illuminate\Http\JsonResponse
      */
     public function destroy(DeleteFaqsRequest $request, Faq $faq)
diff --git a/app/Http/Controllers/Api/V1/PagesController.php b/app/Http/Controllers/Api/V1/PagesController.php
index bff6a9a3..502c40cd 100755
--- a/app/Http/Controllers/Api/V1/PagesController.php
+++ b/app/Http/Controllers/Api/V1/PagesController.php
@@ -53,8 +53,7 @@ public function __construct(PagesRepository $repository)
      * @responseFile status=401 scenario="api_key not provided" responses/unauthenticated.json
      * @responseFile responses/page/page-list.json
      *
-     * @param \Illuminate\Http\ManagePageRequest $request
-     *
+     * @param  \Illuminate\Http\ManagePageRequest  $request
      * @return \Illuminate\Http\JsonResponse
      */
     public function index(ManagePageRequest $request)
@@ -75,9 +74,8 @@ public function index(ManagePageRequest $request)
      * @responseFile status=401 scenario="api_key not provided" responses/unauthenticated.json
      * @responseFile responses/page/page-show.json
      *
-     * @param ManagePageRequest $request
-     * @param \App\Models\Page $page
-     *
+     * @param  ManagePageRequest  $request
+     * @param  \App\Models\Page  $page
      * @return \Illuminate\Http\JsonResponse
      */
     public function show(ManagePageRequest $request, Page $page)
@@ -93,8 +91,7 @@ public function show(ManagePageRequest $request, Page $page)
      * @responseFile status=401 scenario="api_key not provided" responses/unauthenticated.json
      * @responseFile status=201 responses/page/page-store.json
      *
-     * @param \App\Http\Requests\Backend\Pages\StorePageRequest $request
-     *
+     * @param  \App\Http\Requests\Backend\Pages\StorePageRequest  $request
      * @return \Illuminate\Http\JsonResponse
      */
     public function store(StorePageRequest $request)
@@ -117,9 +114,8 @@ public function store(StorePageRequest $request)
      * @responseFile status=401 scenario="api_key not provided" responses/unauthenticated.json
      * @responseFile responses/page/page-update.json
      *
-     * @param \App\Models\Page $page
-     * @param \App\Http\Requests\Backend\Pages\UpdatePageRequest $request
-     *
+     * @param  \App\Models\Page  $page
+     * @param  \App\Http\Requests\Backend\Pages\UpdatePageRequest  $request
      * @return \Illuminate\Http\JsonResponse
      */
     public function update(UpdatePageRequest $request, Page $page)
@@ -140,8 +136,7 @@ public function update(UpdatePageRequest $request, Page $page)
      * @responseFile status=401 scenario="api_key not provided" responses/unauthenticated.json
      * @responseFile status=204 scenario="When the record is deleted" responses/page/page-destroy.json
      *
-     * @param \App\Models\Page $page
-     *
+     * @param  \App\Models\Page  $page
      * @return \Illuminate\Http\JsonResponse
      */
     public function destroy(DeletePageRequest $request, Page $page)
diff --git a/app/Http/Controllers/Backend/Auth/Permission/PermissionTableController.php b/app/Http/Controllers/Backend/Auth/Permission/PermissionTableController.php
index 99fa0de9..00a3cd7c 100755
--- a/app/Http/Controllers/Backend/Auth/Permission/PermissionTableController.php
+++ b/app/Http/Controllers/Backend/Auth/Permission/PermissionTableController.php
@@ -18,7 +18,7 @@ class PermissionTableController extends Controller
     protected $repository;
 
     /**
-     * @param \App\Repositories\Backend\Auth\PermissionRepository $repository
+     * @param  \App\Repositories\Backend\Auth\PermissionRepository  $repository
      */
     public function __construct(PermissionRepository $repository)
     {
@@ -26,8 +26,7 @@ public function __construct(PermissionRepository $repository)
     }
 
     /**
-     * @param App\Http\Requests\Backend\Auth\Permission\ManagePermissionRequest $request
-     *
+     * @param  App\Http\Requests\Backend\Auth\Permission\ManagePermissionRequest  $request
      * @return mixed
      */
     public function __invoke(ManagePermissionRequest $request)
diff --git a/app/Http/Controllers/Backend/Auth/Permission/PermissionsController.php b/app/Http/Controllers/Backend/Auth/Permission/PermissionsController.php
index 81349819..5eb0ba5e 100755
--- a/app/Http/Controllers/Backend/Auth/Permission/PermissionsController.php
+++ b/app/Http/Controllers/Backend/Auth/Permission/PermissionsController.php
@@ -25,7 +25,7 @@ class PermissionsController extends Controller
     protected $repository;
 
     /**
-     * @param \App\Repositories\Backend\Auth\PermissionRepository $repository
+     * @param  \App\Repositories\Backend\Auth\PermissionRepository  $repository
      */
     public function __construct(PermissionRepository $repository)
     {
@@ -34,8 +34,7 @@ public function __construct(PermissionRepository $repository)
     }
 
     /**
-     * @param ManagePermissionRequest $request
-     *
+     * @param  ManagePermissionRequest  $request
      * @return \App\Http\Responses\ViewResponse
      */
     public function index(ManagePermissionRequest $request)
@@ -44,8 +43,7 @@ public function index(ManagePermissionRequest $request)
     }
 
     /**
-     * @param \App\Http\Requests\Backend\Auth\Permission\CreatePermissionRequest $request
-     *
+     * @param  \App\Http\Requests\Backend\Auth\Permission\CreatePermissionRequest  $request
      * @return \App\Http\Responses\Backend\Auth\Permission\CreateResponse
      */
     public function create(CreatePermissionRequest $request)
@@ -54,8 +52,7 @@ public function create(CreatePermissionRequest $request)
     }
 
     /**
-     * @param \App\Http\Requests\Backend\Auth\Permission\StorePermissionRequest $request
-     *
+     * @param  \App\Http\Requests\Backend\Auth\Permission\StorePermissionRequest  $request
      * @return \App\Http\Responses\RedirectResponse
      */
     public function store(StorePermissionRequest $request)
@@ -66,9 +63,8 @@ public function store(StorePermissionRequest $request)
     }
 
     /**
-     * @param \App\Models\Auth\Permission $permission
-     * @param \App\Http\Requests\Backend\Auth\Permission\EditPermissionRequest $request
-     *
+     * @param  \App\Models\Auth\Permission  $permission
+     * @param  \App\Http\Requests\Backend\Auth\Permission\EditPermissionRequest  $request
      * @return \App\Http\Responses\Backend\Auth\Permission\EditResponse
      */
     public function edit(Permission $permission, EditPermissionRequest $request)
@@ -77,9 +73,8 @@ public function edit(Permission $permission, EditPermissionRequest $request)
     }
 
     /**
-     * @param App\Models\Auth\Permission $permission
-     * @param \App\Http\Requests\Backend\Auth\Permission\UpdatePermissionRequest $request
-     *
+     * @param  App\Models\Auth\Permission  $permission
+     * @param  \App\Http\Requests\Backend\Auth\Permission\UpdatePermissionRequest  $request
      * @return \App\Http\Responses\RedirectResponse
      */
     public function update(Permission $permission, UpdatePermissionRequest $request)
@@ -90,9 +85,8 @@ public function update(Permission $permission, UpdatePermissionRequest $request)
     }
 
     /**
-     * @param App\Models\Auth\Permission $permission
-     * @param \App\Http\Requests\Backend\Auth\Permission\DeletePermissionRequest $request
-     *
+     * @param  App\Models\Auth\Permission  $permission
+     * @param  \App\Http\Requests\Backend\Auth\Permission\DeletePermissionRequest  $request
      * @return \App\Http\Responses\RedirectResponse
      */
     public function destroy(Permission $permission, DeletePermissionRequest $request)
diff --git a/app/Http/Controllers/Backend/Auth/Role/RoleController.php b/app/Http/Controllers/Backend/Auth/Role/RoleController.php
index ba90ecf5..0db037e1 100755
--- a/app/Http/Controllers/Backend/Auth/Role/RoleController.php
+++ b/app/Http/Controllers/Backend/Auth/Role/RoleController.php
@@ -29,8 +29,8 @@ class RoleController extends Controller
     protected $permissionRepository;
 
     /**
-     * @param \App\Repositories\Backend\Auth\RoleRepository $roleRepository
-     * @param \App\Repositories\Backend\Auth\PermissionRepository $permissionRepository
+     * @param  \App\Repositories\Backend\Auth\RoleRepository  $roleRepository
+     * @param  \App\Repositories\Backend\Auth\PermissionRepository  $permissionRepository
      */
     public function __construct(RoleRepository $roleRepository, PermissionRepository $permissionRepository)
     {
@@ -40,8 +40,7 @@ public function __construct(RoleRepository $roleRepository, PermissionRepository
     }
 
     /**
-     * @param \App\Http\Requests\Backend\Auth\Role\ManageRoleRequest $request
-     *
+     * @param  \App\Http\Requests\Backend\Auth\Role\ManageRoleRequest  $request
      * @return mixed
      */
     public function index(ManageRoleRequest $request)
@@ -50,8 +49,7 @@ public function index(ManageRoleRequest $request)
     }
 
     /**
-     * @param \App\Http\Requests\Backend\Auth\Role\ManageRoleRequest $request
-     *
+     * @param  \App\Http\Requests\Backend\Auth\Role\ManageRoleRequest  $request
      * @return \App\Http\Responses\Backend\Auth\Role\CreateResponse
      */
     public function create(ManageRoleRequest $request)
@@ -60,8 +58,7 @@ public function create(ManageRoleRequest $request)
     }
 
     /**
-     * @param  \App\Http\Requests\Backend\Auth\Role\StoreRoleRequest $request
-     *
+     * @param  \App\Http\Requests\Backend\Auth\Role\StoreRoleRequest  $request
      * @return \App\Http\Responses\RedirectResponse
      */
     public function store(StoreRoleRequest $request)
@@ -72,9 +69,8 @@ public function store(StoreRoleRequest $request)
     }
 
     /**
-     * @param \App\Http\Requests\Backend\Auth\Role\ManageRoleRequest $request
-     * @param \App\Models\Auth\Role $role
-     *
+     * @param  \App\Http\Requests\Backend\Auth\Role\ManageRoleRequest  $request
+     * @param  \App\Models\Auth\Role  $role
      * @return \App\Http\Responses\Backend\Auth\Role\EditResponse
      */
     public function edit(Role $role, EditRoleRequest $request)
@@ -85,7 +81,6 @@ public function edit(Role $role, EditRoleRequest $request)
     /**
      * @param  \App\Http\Requests\Backend\Auth\RoleUpdateRoleRequest  $request
      * @param  \App\Models\Auth\Role  $role
-     *
      * @return \App\Http\Responses\RedirectResponse
      */
     public function update(Role $role, UpdateRoleRequest $request)
@@ -96,11 +91,11 @@ public function update(Role $role, UpdateRoleRequest $request)
     }
 
     /**
-     * @param \App\Http\Requests\Backend\Auth\Role\ManageRoleRequest $request
-     * @param \App\Models\Auth\Role $role
+     * @param  \App\Http\Requests\Backend\Auth\Role\ManageRoleRequest  $request
+     * @param  \App\Models\Auth\Role  $role
+     * @return mixed
      *
      * @throws \Exception
-     * @return mixed
      */
     public function destroy(ManageRoleRequest $request, Role $role)
     {
diff --git a/app/Http/Controllers/Backend/Auth/Role/RoleTableController.php b/app/Http/Controllers/Backend/Auth/Role/RoleTableController.php
index 3268a411..651979c6 100755
--- a/app/Http/Controllers/Backend/Auth/Role/RoleTableController.php
+++ b/app/Http/Controllers/Backend/Auth/Role/RoleTableController.php
@@ -18,7 +18,7 @@ class RoleTableController extends Controller
     protected $repository;
 
     /**
-     * @param \App\Repositories\Backend\Auth\RoleRepository $roles
+     * @param  \App\Repositories\Backend\Auth\RoleRepository  $roles
      */
     public function __construct(RoleRepository $repository)
     {
@@ -26,8 +26,7 @@ public function __construct(RoleRepository $repository)
     }
 
     /**
-     * @param \App\Http\Requests\Backend\Auth\Role\ManageRoleRequest $request
-     *
+     * @param  \App\Http\Requests\Backend\Auth\Role\ManageRoleRequest  $request
      * @return mixed
      */
     public function __invoke(ManageRoleRequest $request)
diff --git a/app/Http/Controllers/Backend/Auth/User/UserAccessController.php b/app/Http/Controllers/Backend/Auth/User/UserAccessController.php
index 06ec8e09..f53d5170 100755
--- a/app/Http/Controllers/Backend/Auth/User/UserAccessController.php
+++ b/app/Http/Controllers/Backend/Auth/User/UserAccessController.php
@@ -14,12 +14,11 @@
 class UserAccessController extends Controller
 {
     /**
-     * @param User              $user
-     * @param ManageUserRequest $request
+     * @param  User  $user
+     * @param  ManageUserRequest  $request
+     * @return \Illuminate\Http\RedirectResponse
      *
      * @throws GeneralException
-     *
-     * @return \Illuminate\Http\RedirectResponse
      */
     public function loginAs(User $user, ManageUserRequest $request)
     {
diff --git a/app/Http/Controllers/Backend/Auth/User/UserConfirmationController.php b/app/Http/Controllers/Backend/Auth/User/UserConfirmationController.php
index 020356ab..b1a5110e 100755
--- a/app/Http/Controllers/Backend/Auth/User/UserConfirmationController.php
+++ b/app/Http/Controllers/Backend/Auth/User/UserConfirmationController.php
@@ -16,7 +16,7 @@ class UserConfirmationController extends Controller
     protected $repository;
 
     /**
-     * @param \App\Repositories\Backend\Auth\UserRepository $repository
+     * @param  \App\Repositories\Backend\Auth\UserRepository  $repository
      */
     public function __construct(UserRepository $repository)
     {
@@ -24,9 +24,8 @@ public function __construct(UserRepository $repository)
     }
 
     /**
-     * @param \App\Http\Requests\Backend\Auth\User\ManageUserRequest $request
-     * @param \App\Models\Auth\User $user
-     *
+     * @param  \App\Http\Requests\Backend\Auth\User\ManageUserRequest  $request
+     * @param  \App\Models\Auth\User  $user
      * @return mixed
      */
     public function sendConfirmationEmail(ManageUserRequest $request, User $user)
@@ -46,11 +45,11 @@ public function sendConfirmationEmail(ManageUserRequest $request, User $user)
     }
 
     /**
-     * @param \App\Http\Requests\Backend\Auth\User\ManageUserRequest $request
-     * @param \App\Models\Auth\User $user
+     * @param  \App\Http\Requests\Backend\Auth\User\ManageUserRequest  $request
+     * @param  \App\Models\Auth\User  $user
+     * @return mixed
      *
      * @throws \App\Exceptions\GeneralException
-     * @return mixed
      */
     public function confirm(ManageUserRequest $request, User $user)
     {
@@ -60,11 +59,11 @@ public function confirm(ManageUserRequest $request, User $user)
     }
 
     /**
-     * @param \App\Http\Requests\Backend\Auth\User\ManageUserRequest $request
-     * @param \App\Models\Auth\User $user
+     * @param  \App\Http\Requests\Backend\Auth\User\ManageUserRequest  $request
+     * @param  \App\Models\Auth\User  $user
+     * @return mixed
      *
      * @throws \App\Exceptions\GeneralException
-     * @return mixed
      */
     public function unconfirm(ManageUserRequest $request, User $user)
     {
diff --git a/app/Http/Controllers/Backend/Auth/User/UserController.php b/app/Http/Controllers/Backend/Auth/User/UserController.php
index 2126f5cc..e7ca4257 100755
--- a/app/Http/Controllers/Backend/Auth/User/UserController.php
+++ b/app/Http/Controllers/Backend/Auth/User/UserController.php
@@ -26,7 +26,7 @@ class UserController extends Controller
     protected $roleRepository;
 
     /**
-     * @param \App\Repositories\Backend\Auth\UserRepository $userRepository
+     * @param  \App\Repositories\Backend\Auth\UserRepository  $userRepository
      */
     public function __construct(UserRepository $userRepository, RoleRepository $roleRepository)
     {
@@ -36,8 +36,7 @@ public function __construct(UserRepository $userRepository, RoleRepository $role
     }
 
     /**
-     * @param \App\Http\Requests\Backend\Auth\User\ManageUserRequest $request
-     *
+     * @param  \App\Http\Requests\Backend\Auth\User\ManageUserRequest  $request
      * @return \App\Http\Responses\ViewResponse
      */
     public function index(ManageUserRequest $request)
@@ -46,8 +45,7 @@ public function index(ManageUserRequest $request)
     }
 
     /**
-     * @param \App\Http\Requests\Backend\Auth\User\ManageUserRequest $request
-     *
+     * @param  \App\Http\Requests\Backend\Auth\User\ManageUserRequest  $request
      * @return mixed
      */
     public function create(ManageUserRequest $request)
@@ -57,10 +55,10 @@ public function create(ManageUserRequest $request)
     }
 
     /**
-     * @param \App\Http\Requests\Backend\Auth\User\StoreUserRequest $request
+     * @param  \App\Http\Requests\Backend\Auth\User\StoreUserRequest  $request
+     * @return mixed
      *
      * @throws \Throwable
-     * @return mixed
      */
     public function store(StoreUserRequest $request)
     {
@@ -70,9 +68,8 @@ public function store(StoreUserRequest $request)
     }
 
     /**
-     * @param \App\Http\Requests\Backend\Auth\User\ManageUserRequest $request
-     * @param \App\Models\Auth\User $user
-     *
+     * @param  \App\Http\Requests\Backend\Auth\User\ManageUserRequest  $request
+     * @param  \App\Models\Auth\User  $user
      * @return mixed
      */
     public function show(ManageUserRequest $request, User $user)
@@ -82,9 +79,8 @@ public function show(ManageUserRequest $request, User $user)
     }
 
     /**
-     * @param \App\Http\Requests\Backend\Auth\User\ManageUserRequest $request
-     * @param \App\Models\Auth\User $user
-     *
+     * @param  \App\Http\Requests\Backend\Auth\User\ManageUserRequest  $request
+     * @param  \App\Models\Auth\User  $user
      * @return mixed
      */
     public function edit(ManageUserRequest $request, User $user, PermissionRepository $permissionRepository)
@@ -98,12 +94,12 @@ public function edit(ManageUserRequest $request, User $user, PermissionRepositor
     }
 
     /**
-     * @param \App\Http\Requests\Backend\Auth\User\UpdateUserRequest $request
-     * @param \App\Models\Auth\User $user
+     * @param  \App\Http\Requests\Backend\Auth\User\UpdateUserRequest  $request
+     * @param  \App\Models\Auth\User  $user
+     * @return mixed
      *
      * @throws \App\Exceptions\GeneralException
      * @throws \Throwable
-     * @return mixed
      */
     public function update(UpdateUserRequest $request, User $user)
     {
@@ -113,11 +109,11 @@ public function update(UpdateUserRequest $request, User $user)
     }
 
     /**
-     * @param \App\Http\Requests\Backend\Auth\User\ManageUserRequest $request
-     * @param \App\Models\Auth\User $user
+     * @param  \App\Http\Requests\Backend\Auth\User\ManageUserRequest  $request
+     * @param  \App\Models\Auth\User  $user
+     * @return mixed
      *
      * @throws \Exception
-     * @return mixed
      */
     public function destroy(ManageUserRequest $request, User $user)
     {
diff --git a/app/Http/Controllers/Backend/Auth/User/UserPasswordController.php b/app/Http/Controllers/Backend/Auth/User/UserPasswordController.php
index 5e9fe9d1..59f304ea 100755
--- a/app/Http/Controllers/Backend/Auth/User/UserPasswordController.php
+++ b/app/Http/Controllers/Backend/Auth/User/UserPasswordController.php
@@ -16,7 +16,7 @@ class UserPasswordController extends Controller
     protected $repository;
 
     /**
-     * @param \App\Repositories\Backend\Auth\UserRepository $userRepository
+     * @param  \App\Repositories\Backend\Auth\UserRepository  $userRepository
      */
     public function __construct(UserRepository $repository)
     {
@@ -24,9 +24,8 @@ public function __construct(UserRepository $repository)
     }
 
     /**
-     * @param \App\Http\Requests\Backend\Auth\User\ManageUserRequest $request
-     * @param \App\Models\Auth\User $user
-     *
+     * @param  \App\Http\Requests\Backend\Auth\User\ManageUserRequest  $request
+     * @param  \App\Models\Auth\User  $user
      * @return mixed
      */
     public function edit(ManageUserRequest $request, User $user)
@@ -35,11 +34,11 @@ public function edit(ManageUserRequest $request, User $user)
     }
 
     /**
-     * @param \App\Http\Requests\Backend\Auth\User\UpdateUserPasswordRequest $request
-     * @param \App\Models\Auth\User $user
+     * @param  \App\Http\Requests\Backend\Auth\User\UpdateUserPasswordRequest  $request
+     * @param  \App\Models\Auth\User  $user
+     * @return mixed
      *
      * @throws \App\Exceptions\GeneralException
-     * @return mixed
      */
     public function update(UpdateUserPasswordRequest $request, User $user)
     {
diff --git a/app/Http/Controllers/Backend/Auth/User/UserSessionController.php b/app/Http/Controllers/Backend/Auth/User/UserSessionController.php
index e6e34560..1d90a597 100755
--- a/app/Http/Controllers/Backend/Auth/User/UserSessionController.php
+++ b/app/Http/Controllers/Backend/Auth/User/UserSessionController.php
@@ -12,9 +12,8 @@
 class UserSessionController extends Controller
 {
     /**
-     * @param \App\Http\Requests\Backend\Auth\User\ManageUserRequest $request
-     * @param \App\Models\Auth\User $user
-     *
+     * @param  \App\Http\Requests\Backend\Auth\User\ManageUserRequest  $request
+     * @param  \App\Models\Auth\User  $user
      * @return mixed
      */
     public function clearSession(ManageUserRequest $request, User $user)
diff --git a/app/Http/Controllers/Backend/Auth/User/UserSocialController.php b/app/Http/Controllers/Backend/Auth/User/UserSocialController.php
index 68276819..72a99af7 100755
--- a/app/Http/Controllers/Backend/Auth/User/UserSocialController.php
+++ b/app/Http/Controllers/Backend/Auth/User/UserSocialController.php
@@ -14,13 +14,13 @@
 class UserSocialController extends Controller
 {
     /**
-     * @param \App\Http\Requests\Backend\Auth\User\ManageUserRequest $request
-     * @param \App\Repositories\Backend\Auth\User\SocialRepository  $socialRepository
-     * @param \App\Models\Auth\User $user
-     * @param \App\Models\Auth\SocialAccount $social
+     * @param  \App\Http\Requests\Backend\Auth\User\ManageUserRequest  $request
+     * @param  \App\Repositories\Backend\Auth\User\SocialRepository  $socialRepository
+     * @param  \App\Models\Auth\User  $user
+     * @param  \App\Models\Auth\SocialAccount  $social
+     * @return mixed
      *
      * @throws \App\Exceptions\GeneralException
-     * @return mixed
      */
     public function unlink(ManageUserRequest $request, SocialRepository $socialRepository, User $user, SocialAccount $social)
     {
diff --git a/app/Http/Controllers/Backend/Auth/User/UserStatusController.php b/app/Http/Controllers/Backend/Auth/User/UserStatusController.php
index 21d3bd91..93f82ed2 100755
--- a/app/Http/Controllers/Backend/Auth/User/UserStatusController.php
+++ b/app/Http/Controllers/Backend/Auth/User/UserStatusController.php
@@ -19,7 +19,7 @@ class UserStatusController extends Controller
     protected $repository;
 
     /**
-     * @param \App\Repositories\Backend\Auth\UserRepository $repository
+     * @param  \App\Repositories\Backend\Auth\UserRepository  $repository
      */
     public function __construct(UserRepository $repository)
     {
@@ -28,8 +28,7 @@ public function __construct(UserRepository $repository)
     }
 
     /**
-     * @param \App\Http\Requests\Backend\Auth\User\ManageUserRequest $request
-     *
+     * @param  \App\Http\Requests\Backend\Auth\User\ManageUserRequest  $request
      * @return mixed
      */
     public function getDeactivated(ManageUserRequest $request)
@@ -39,8 +38,7 @@ public function getDeactivated(ManageUserRequest $request)
     }
 
     /**
-     * @param \App\Http\Requests\Backend\Auth\User\ManageUserRequest $request
-     *
+     * @param  \App\Http\Requests\Backend\Auth\User\ManageUserRequest  $request
      * @return mixed
      */
     public function getDeleted(ManageUserRequest $request)
@@ -49,12 +47,12 @@ public function getDeleted(ManageUserRequest $request)
     }
 
     /**
-     * @param \App\Http\Requests\Backend\Auth\User\ManageUserRequest $request
-     * @param \App\Models\Auth\User $user
-     * @param int $status
+     * @param  \App\Http\Requests\Backend\Auth\User\ManageUserRequest  $request
+     * @param  \App\Models\Auth\User  $user
+     * @param  int  $status
+     * @return mixed
      *
      * @throws \App\Exceptions\GeneralException
-     * @return mixed
      */
     public function mark(ManageUserRequest $request, User $user, $status)
     {
@@ -68,12 +66,12 @@ public function mark(ManageUserRequest $request, User $user, $status)
     }
 
     /**
-     * @param \App\Http\Requests\Backend\Auth\User\ManageUserRequest $request
-     * @param \App\Models\Auth\User $deletedUser
+     * @param  \App\Http\Requests\Backend\Auth\User\ManageUserRequest  $request
+     * @param  \App\Models\Auth\User  $deletedUser
+     * @return mixed
      *
      * @throws \App\Exceptions\GeneralException
      * @throws \Throwable
-     * @return mixed
      */
     public function delete(ManageUserRequest $request, User $deletedUser)
     {
@@ -83,11 +81,11 @@ public function delete(ManageUserRequest $request, User $deletedUser)
     }
 
     /**
-     * @param \App\Http\Requests\Backend\Auth\User\ManageUserRequest $request
-     * @param \App\Models\Auth\User $deletedUser
+     * @param  \App\Http\Requests\Backend\Auth\User\ManageUserRequest  $request
+     * @param  \App\Models\Auth\User  $deletedUser
+     * @return mixed
      *
      * @throws \App\Exceptions\GeneralException
-     * @return mixed
      */
     public function restore(ManageUserRequest $request, User $deletedUser)
     {
diff --git a/app/Http/Controllers/Backend/Auth/User/UserTableController.php b/app/Http/Controllers/Backend/Auth/User/UserTableController.php
index 20aa7e1d..2ceb0d35 100755
--- a/app/Http/Controllers/Backend/Auth/User/UserTableController.php
+++ b/app/Http/Controllers/Backend/Auth/User/UserTableController.php
@@ -19,7 +19,7 @@ class UserTableController extends Controller
     protected $repository;
 
     /**
-     * @param \App\Repositories\Backend\Auth\UserRepository $repository
+     * @param  \App\Repositories\Backend\Auth\UserRepository  $repository
      */
     public function __construct(UserRepository $repository)
     {
@@ -27,8 +27,7 @@ public function __construct(UserRepository $repository)
     }
 
     /**
-     * @param \App\Http\Requests\Backend\Auth\User\ManageUserRequest $request
-     *
+     * @param  \App\Http\Requests\Backend\Auth\User\ManageUserRequest  $request
      * @return mixed
      */
     public function __invoke(ManageUserRequest $request)
diff --git a/app/Http/Controllers/Backend/BlogCategories/BlogCategoriesController.php b/app/Http/Controllers/Backend/BlogCategories/BlogCategoriesController.php
index 32872461..4eac0f44 100755
--- a/app/Http/Controllers/Backend/BlogCategories/BlogCategoriesController.php
+++ b/app/Http/Controllers/Backend/BlogCategories/BlogCategoriesController.php
@@ -23,7 +23,7 @@ class BlogCategoriesController extends Controller
     protected $repository;
 
     /**
-     * @param \App\Repositories\Backend\BlogCategoriesRepository $repository
+     * @param  \App\Repositories\Backend\BlogCategoriesRepository  $repository
      */
     public function __construct(BlogCategoriesRepository $repository)
     {
@@ -32,8 +32,7 @@ public function __construct(BlogCategoriesRepository $repository)
     }
 
     /**
-     * @param \App\Http\Requests\Backend\BlogCategories\ManageBlogCategoriesRequest $request
-     *
+     * @param  \App\Http\Requests\Backend\BlogCategories\ManageBlogCategoriesRequest  $request
      * @return ViewResponse
      */
     public function index(ManageBlogCategoriesRequest $request)
@@ -42,8 +41,7 @@ public function index(ManageBlogCategoriesRequest $request)
     }
 
     /**
-     * @param \App\Http\Requests\Backend\BlogCategories\CreateBlogCategoriesRequest $request
-     *
+     * @param  \App\Http\Requests\Backend\BlogCategories\CreateBlogCategoriesRequest  $request
      * @return \App\Http\Responses\ViewResponse
      */
     public function create(CreateBlogCategoriesRequest $request)
@@ -65,9 +63,8 @@ public function store(StoreBlogCategoriesRequest $request)
     }
 
     /**
-     * @param \App\Models\BlogCategory $blogCategory
-     * @param \App\Http\Requests\Backend\BlogCategories\ManageBlogCategoriesRequest $request
-     *
+     * @param  \App\Models\BlogCategory  $blogCategory
+     * @param  \App\Http\Requests\Backend\BlogCategories\ManageBlogCategoriesRequest  $request
      * @return \App\Http\Responses\Backend\BlogCategory\EditResponse
      */
     public function edit(BlogCategory $blogCategory, ManageBlogCategoriesRequest $request)
@@ -76,9 +73,8 @@ public function edit(BlogCategory $blogCategory, ManageBlogCategoriesRequest $re
     }
 
     /**
-     * @param \App\Models\BlogCategory $blogCategory
-     * @param \App\Http\Requests\Backend\BlogCategories\UpdateBlogCategoriesRequest $request
-     *
+     * @param  \App\Models\BlogCategory  $blogCategory
+     * @param  \App\Http\Requests\Backend\BlogCategories\UpdateBlogCategoriesRequest  $request
      * @return \App\Http\Responses\RedirectResponse
      */
     public function update(BlogCategory $blogCategory, UpdateBlogCategoriesRequest $request)
@@ -89,9 +85,8 @@ public function update(BlogCategory $blogCategory, UpdateBlogCategoriesRequest $
     }
 
     /**
-     * @param \App\Models\BlogCategory $blogCategory
-     * @param \App\Http\Requests\Backend\BlogCategories\DeleteBlogCategoriesRequest $request
-     *
+     * @param  \App\Models\BlogCategory  $blogCategory
+     * @param  \App\Http\Requests\Backend\BlogCategories\DeleteBlogCategoriesRequest  $request
      * @return mixed
      */
     public function destroy(BlogCategory $blogCategory, DeleteBlogCategoriesRequest $request)
diff --git a/app/Http/Controllers/Backend/BlogCategories/BlogCategoriesTableController.php b/app/Http/Controllers/Backend/BlogCategories/BlogCategoriesTableController.php
index 989a581f..bd5782ae 100755
--- a/app/Http/Controllers/Backend/BlogCategories/BlogCategoriesTableController.php
+++ b/app/Http/Controllers/Backend/BlogCategories/BlogCategoriesTableController.php
@@ -18,7 +18,7 @@ class BlogCategoriesTableController extends Controller
     protected $repository;
 
     /**
-     * @param \App\Repositories\Backend\BlogCategories\BlogCategoriesRepository $repository
+     * @param  \App\Repositories\Backend\BlogCategories\BlogCategoriesRepository  $repository
      */
     public function __construct(BlogCategoriesRepository $repository)
     {
@@ -26,8 +26,7 @@ public function __construct(BlogCategoriesRepository $repository)
     }
 
     /**
-     * @param \App\Http\Requests\Backend\BlogCategories\ManageBlogCategoriesRequest $request
-     *
+     * @param  \App\Http\Requests\Backend\BlogCategories\ManageBlogCategoriesRequest  $request
      * @return mixed
      */
     public function __invoke(ManageBlogCategoriesRequest $request)
diff --git a/app/Http/Controllers/Backend/BlogTags/BlogTagsController.php b/app/Http/Controllers/Backend/BlogTags/BlogTagsController.php
index 00bb96c2..5b6f4c5c 100755
--- a/app/Http/Controllers/Backend/BlogTags/BlogTagsController.php
+++ b/app/Http/Controllers/Backend/BlogTags/BlogTagsController.php
@@ -23,7 +23,7 @@ class BlogTagsController extends Controller
     protected $repository;
 
     /**
-     * @param \App\Repositories\Backend\BlogTagsRepository $repository
+     * @param  \App\Repositories\Backend\BlogTagsRepository  $repository
      */
     public function __construct(BlogTagsRepository $repository)
     {
@@ -32,8 +32,7 @@ public function __construct(BlogTagsRepository $repository)
     }
 
     /**
-     * @param \App\Http\Requests\Backend\BlogTags\ManageBlogTagsRequest $request
-     *
+     * @param  \App\Http\Requests\Backend\BlogTags\ManageBlogTagsRequest  $request
      * @return ViewResponse
      */
     public function index(ManageBlogTagsRequest $request)
@@ -43,8 +42,8 @@ public function index(ManageBlogTagsRequest $request)
 
     /**
      * Show the form for creating a new resource.
-     * @param \App\Http\Requests\Backend\BlogTags\CreateBlogTagsRequest
      *
+     * @param \App\Http\Requests\Backend\BlogTags\CreateBlogTagsRequest
      * @return ViewResponse
      */
     public function create(CreateBlogTagsRequest $request)
@@ -53,8 +52,7 @@ public function create(CreateBlogTagsRequest $request)
     }
 
     /**
-     * @param \App\Http\Requests\Backend\BlogTags\StoreBlogTagsRequest $request
-     *
+     * @param  \App\Http\Requests\Backend\BlogTags\StoreBlogTagsRequest  $request
      * @return \App\Http\Responses\RedirectResponse
      */
     public function store(StoreBlogTagsRequest $request)
@@ -65,9 +63,8 @@ public function store(StoreBlogTagsRequest $request)
     }
 
     /**
-     * @param \App\Models\BlogTag $blogTag
-     * @param \App\Http\Requests\Backend\BlogTags\ManageBlogTagsRequest $request
-     *
+     * @param  \App\Models\BlogTag  $blogTag
+     * @param  \App\Http\Requests\Backend\BlogTags\ManageBlogTagsRequest  $request
      * @return \App\Http\Responses\Backend\BlogTag\EditResponse
      */
     public function edit(BlogTag $blogTag, ManageBlogTagsRequest $request)
@@ -76,9 +73,8 @@ public function edit(BlogTag $blogTag, ManageBlogTagsRequest $request)
     }
 
     /**
-     * @param \App\Models\BlogTag $blogTag
-     * @param \App\Http\Requests\Backend\BlogTags\UpdateBlogTagsRequest $request
-     *
+     * @param  \App\Models\BlogTag  $blogTag
+     * @param  \App\Http\Requests\Backend\BlogTags\UpdateBlogTagsRequest  $request
      * @return \App\Http\Responses\RedirectResponse
      */
     public function update(BlogTag $blogTag, UpdateBlogTagsRequest $request)
@@ -89,9 +85,8 @@ public function update(BlogTag $blogTag, UpdateBlogTagsRequest $request)
     }
 
     /**
-     * @param \App\Models\BlogTag $blogTag
-     * @param \App\Http\Requests\Backend\BlogTags\DeleteBlogTagsRequest $request
-     *
+     * @param  \App\Models\BlogTag  $blogTag
+     * @param  \App\Http\Requests\Backend\BlogTags\DeleteBlogTagsRequest  $request
      * @return \App\Http\Responses\RedirectResponse
      */
     public function destroy(BlogTag $blogTag, DeleteBlogTagsRequest $request)
diff --git a/app/Http/Controllers/Backend/BlogTags/BlogTagsTableController.php b/app/Http/Controllers/Backend/BlogTags/BlogTagsTableController.php
index fd063cca..f2b0db61 100755
--- a/app/Http/Controllers/Backend/BlogTags/BlogTagsTableController.php
+++ b/app/Http/Controllers/Backend/BlogTags/BlogTagsTableController.php
@@ -16,7 +16,7 @@ class BlogTagsTableController extends Controller
     protected $repository;
 
     /**
-     * @param \App\Repositories\Backend\BlogTagsRepository $repository
+     * @param  \App\Repositories\Backend\BlogTagsRepository  $repository
      */
     public function __construct(BlogTagsRepository $repository)
     {
@@ -24,8 +24,7 @@ public function __construct(BlogTagsRepository $repository)
     }
 
     /**
-     * @param \App\Http\Requests\Backend\BlogTags\ManageBlogTagsRequest $request
-     *
+     * @param  \App\Http\Requests\Backend\BlogTags\ManageBlogTagsRequest  $request
      * @return mixed
      */
     public function __invoke(ManageBlogTagsRequest $request)
diff --git a/app/Http/Controllers/Backend/Blogs/BlogsController.php b/app/Http/Controllers/Backend/Blogs/BlogsController.php
index 463b33cb..b3630968 100755
--- a/app/Http/Controllers/Backend/Blogs/BlogsController.php
+++ b/app/Http/Controllers/Backend/Blogs/BlogsController.php
@@ -23,7 +23,7 @@ class BlogsController extends Controller
     protected $repository;
 
     /**
-     * @param \App\Repositories\Backend\BlogsRepository $blog
+     * @param  \App\Repositories\Backend\BlogsRepository  $blog
      */
     public function __construct(BlogsRepository $repository)
     {
@@ -32,8 +32,7 @@ public function __construct(BlogsRepository $repository)
     }
 
     /**
-     * @param \App\Http\Requests\Backend\Blogs\ManageBlogsRequest $request
-     *
+     * @param  \App\Http\Requests\Backend\Blogs\ManageBlogsRequest  $request
      * @return ViewResponse
      */
     public function index(ManageBlogsRequest $request)
@@ -42,8 +41,7 @@ public function index(ManageBlogsRequest $request)
     }
 
     /**
-     * @param \App\Http\Requests\Backend\Blogs\ManageBlogsRequest $request
-     *
+     * @param  \App\Http\Requests\Backend\Blogs\ManageBlogsRequest  $request
      * @return ViewResponse
      */
     public function create(ManageBlogsRequest $request, Blog $blog)
@@ -55,8 +53,7 @@ public function create(ManageBlogsRequest $request, Blog $blog)
     }
 
     /**
-     * @param \App\Http\Requests\Backend\Blogs\StoreBlogsRequest $request
-     *
+     * @param  \App\Http\Requests\Backend\Blogs\StoreBlogsRequest  $request
      * @return \App\Http\Responses\RedirectResponse
      */
     public function store(StoreBlogsRequest $request)
@@ -67,9 +64,8 @@ public function store(StoreBlogsRequest $request)
     }
 
     /**
-     * @param \App\Models\Blog $blog
-     * @param \App\Http\Requests\Backend\Blogs\ManageBlogsRequest $request
-     *
+     * @param  \App\Models\Blog  $blog
+     * @param  \App\Http\Requests\Backend\Blogs\ManageBlogsRequest  $request
      * @return \App\Http\Responses\Backend\Blog\EditResponse
      */
     public function edit(Blog $blog, ManageBlogsRequest $request)
@@ -81,9 +77,8 @@ public function edit(Blog $blog, ManageBlogsRequest $request)
     }
 
     /**
-     * @param \App\Models\Blogs\Blog $blog
-     * @param \App\Http\Requests\Backend\Blogs\UpdateBlogsRequest $request
-     *
+     * @param  \App\Models\Blogs\Blog  $blog
+     * @param  \App\Http\Requests\Backend\Blogs\UpdateBlogsRequest  $request
      * @return \App\Http\Responses\RedirectResponse
      */
     public function update(Blog $blog, UpdateBlogsRequest $request)
@@ -94,9 +89,8 @@ public function update(Blog $blog, UpdateBlogsRequest $request)
     }
 
     /**
-     * @param \App\Models\Blog $blog
-     * @param \App\Http\Requests\Backend\Blogs\ManageBlogsRequest $request
-     *
+     * @param  \App\Models\Blog  $blog
+     * @param  \App\Http\Requests\Backend\Blogs\ManageBlogsRequest  $request
      * @return \App\Http\Responses\RedirectResponse
      */
     public function destroy(Blog $blog, ManageBlogsRequest $request)
diff --git a/app/Http/Controllers/Backend/Blogs/BlogsTableController.php b/app/Http/Controllers/Backend/Blogs/BlogsTableController.php
index 55c00ac1..207ce62e 100755
--- a/app/Http/Controllers/Backend/Blogs/BlogsTableController.php
+++ b/app/Http/Controllers/Backend/Blogs/BlogsTableController.php
@@ -18,7 +18,7 @@ class BlogsTableController extends Controller
     protected $repository;
 
     /**
-     * @param \App\Repositories\Backend\BlogsRepository $repository
+     * @param  \App\Repositories\Backend\BlogsRepository  $repository
      */
     public function __construct(BlogsRepository $repository)
     {
@@ -26,8 +26,7 @@ public function __construct(BlogsRepository $repository)
     }
 
     /**
-     * @param \App\Http\Requests\Backend\Blogs\ManageBlogsRequest $request
-     *
+     * @param  \App\Http\Requests\Backend\Blogs\ManageBlogsRequest  $request
      * @return mixed
      */
     public function __invoke(ManageBlogsRequest $request)
diff --git a/app/Http/Controllers/Backend/DashboardController.php b/app/Http/Controllers/Backend/DashboardController.php
index 45feb9a7..ec75266b 100755
--- a/app/Http/Controllers/Backend/DashboardController.php
+++ b/app/Http/Controllers/Backend/DashboardController.php
@@ -27,7 +27,7 @@ public function index()
     /**
      * This function is used to get permissions details by role.
      *
-     * @param \Illuminate\Http\Request\Request $request
+     * @param  \Illuminate\Http\Request\Request  $request
      */
     public function getPermissionByRole(Request $request)
     {
diff --git a/app/Http/Controllers/Backend/EmailTemplates/EmailTemplatesController.php b/app/Http/Controllers/Backend/EmailTemplates/EmailTemplatesController.php
index 5df64609..5869e8d9 100755
--- a/app/Http/Controllers/Backend/EmailTemplates/EmailTemplatesController.php
+++ b/app/Http/Controllers/Backend/EmailTemplates/EmailTemplatesController.php
@@ -23,7 +23,7 @@ class EmailTemplatesController extends Controller
     protected $repository;
 
     /**
-     * @param \App\Repositories\Backend\EmailTemplatesRepository $emailTemplate
+     * @param  \App\Repositories\Backend\EmailTemplatesRepository  $emailTemplate
      */
     public function __construct(EmailTemplatesRepository $repository)
     {
@@ -32,8 +32,7 @@ public function __construct(EmailTemplatesRepository $repository)
     }
 
     /**
-     * @param \App\Http\Requests\Backend\EmailTemplates\ManageEmailTemplatesRequest $request
-     *
+     * @param  \App\Http\Requests\Backend\EmailTemplates\ManageEmailTemplatesRequest  $request
      * @return ViewResponse
      */
     public function index(ManageEmailTemplatesRequest $request)
@@ -43,7 +42,6 @@ public function index(ManageEmailTemplatesRequest $request)
 
     /**
      * @param \App\Http\Requests\Backend\EmailTemplates\CreateEmailTemplatesRequest
-     *
      * @return ViewResponse
      */
     public function create(CreateEmailTemplatesRequest $request)
@@ -52,8 +50,7 @@ public function create(CreateEmailTemplatesRequest $request)
     }
 
     /**
-     * @param \App\Http\Requests\Backend\EmailTemplates\StoreEmailTemplatesRequest $request
-     *
+     * @param  \App\Http\Requests\Backend\EmailTemplates\StoreEmailTemplatesRequest  $request
      * @return \App\Http\Responses\RedirectResponse
      */
     public function store(StoreEmailTemplatesRequest $request)
@@ -64,9 +61,8 @@ public function store(StoreEmailTemplatesRequest $request)
     }
 
     /**
-     * @param \App\Models\EmailTemplate $emailTemplate
-     * @param \App\Http\Requests\Backend\EmailTemplates\ManageEmailTemplatesRequest $request
-     *
+     * @param  \App\Models\EmailTemplate  $emailTemplate
+     * @param  \App\Http\Requests\Backend\EmailTemplates\ManageEmailTemplatesRequest  $request
      * @return \App\Http\Responses\Backend\EmailTemplates\EditResponse
      */
     public function edit(EmailTemplate $emailTemplate, ManageEmailTemplatesRequest $request)
@@ -75,9 +71,8 @@ public function edit(EmailTemplate $emailTemplate, ManageEmailTemplatesRequest $
     }
 
     /**
-     * @param \App\Models\EmailTemplate $emailTemplate
-     * @param \App\Http\Requests\Backend\EmailTemplates\UpdateEmailTemplatesRequest $request
-     *
+     * @param  \App\Models\EmailTemplate  $emailTemplate
+     * @param  \App\Http\Requests\Backend\EmailTemplates\UpdateEmailTemplatesRequest  $request
      * @return \App\Http\Responses\RedirectResponse
      */
     public function update(EmailTemplate $emailTemplate, UpdateEmailTemplatesRequest $request)
@@ -88,9 +83,8 @@ public function update(EmailTemplate $emailTemplate, UpdateEmailTemplatesRequest
     }
 
     /**
-     * @param \App\Models\EmailTemplate $emailTemplate
-     * @param \App\Http\Requests\Backend\EmailTemplates\DeleteEmailTemplatesRequest $request
-     *
+     * @param  \App\Models\EmailTemplate  $emailTemplate
+     * @param  \App\Http\Requests\Backend\EmailTemplates\DeleteEmailTemplatesRequest  $request
      * @return \App\Http\Responses\RedirectResponse
      */
     public function destroy(EmailTemplate $emailTemplate, DeleteEmailTemplatesRequest $request)
diff --git a/app/Http/Controllers/Backend/EmailTemplates/EmailTemplatesTableController.php b/app/Http/Controllers/Backend/EmailTemplates/EmailTemplatesTableController.php
index 60c2c2e1..45007893 100755
--- a/app/Http/Controllers/Backend/EmailTemplates/EmailTemplatesTableController.php
+++ b/app/Http/Controllers/Backend/EmailTemplates/EmailTemplatesTableController.php
@@ -15,7 +15,7 @@ class EmailTemplatesTableController extends Controller
     protected $repository;
 
     /**
-     * @param \App\Repositories\Backend\EmailTemplatesRepository $repository
+     * @param  \App\Repositories\Backend\EmailTemplatesRepository  $repository
      */
     public function __construct(EmailTemplatesRepository $repository)
     {
@@ -23,8 +23,7 @@ public function __construct(EmailTemplatesRepository $repository)
     }
 
     /**
-     * @param \App\Http\Requests\Backend\EmailTemplates\ManageEmailTemplatesRequest $request
-     *
+     * @param  \App\Http\Requests\Backend\EmailTemplates\ManageEmailTemplatesRequest  $request
      * @return mixed
      */
     public function __invoke(ManageEmailTemplatesRequest $request)
diff --git a/app/Http/Controllers/Backend/Faqs/FaqsController.php b/app/Http/Controllers/Backend/Faqs/FaqsController.php
index aaa60f51..e24a2244 100755
--- a/app/Http/Controllers/Backend/Faqs/FaqsController.php
+++ b/app/Http/Controllers/Backend/Faqs/FaqsController.php
@@ -22,7 +22,7 @@ class FaqsController extends Controller
     protected $repository;
 
     /**
-     * @param \App\Repositories\Backend\FaqsRepository $faq
+     * @param  \App\Repositories\Backend\FaqsRepository  $faq
      */
     public function __construct(FaqsRepository $repository)
     {
@@ -31,8 +31,7 @@ public function __construct(FaqsRepository $repository)
     }
 
     /**
-     * @param \App\Http\Requests\Backend\Faqs\ManageFaqsRequest $request
-     *
+     * @param  \App\Http\Requests\Backend\Faqs\ManageFaqsRequest  $request
      * @return ViewResponse
      */
     public function index(ManageFaqsRequest $request)
@@ -41,8 +40,7 @@ public function index(ManageFaqsRequest $request)
     }
 
     /**
-     * @param \App\Http\Requests\Backend\Faqs\CreateFaqsRequest $request
-     *
+     * @param  \App\Http\Requests\Backend\Faqs\CreateFaqsRequest  $request
      * @return ViewResponse
      */
     public function create(CreateFaqsRequest $request)
@@ -51,8 +49,7 @@ public function create(CreateFaqsRequest $request)
     }
 
     /**
-     * @param \App\Http\Requests\Backend\Faqs\StoreFaqsRequest $request
-     *
+     * @param  \App\Http\Requests\Backend\Faqs\StoreFaqsRequest  $request
      * @return \App\Http\Responses\RedirectResponse
      */
     public function store(StoreFaqsRequest $request)
@@ -63,9 +60,8 @@ public function store(StoreFaqsRequest $request)
     }
 
     /**
-     * @param \App\Models\Faq $faq
-     * @param \App\Http\Requests\Backend\Faqs\ManagePageRequest $request
-     *
+     * @param  \App\Models\Faq  $faq
+     * @param  \App\Http\Requests\Backend\Faqs\ManagePageRequest  $request
      * @return ViewResponse
      */
     public function edit(Faq $faq, ManageFaqsRequest $request)
@@ -74,9 +70,8 @@ public function edit(Faq $faq, ManageFaqsRequest $request)
     }
 
     /**
-     * @param \App\Models\Faq $faq
-     * @param \App\Http\Requests\Backend\Faqs\UpdateFaqsRequest $request
-     *
+     * @param  \App\Models\Faq  $faq
+     * @param  \App\Http\Requests\Backend\Faqs\UpdateFaqsRequest  $request
      * @return \App\Http\Responses\RedirectResponse
      */
     public function update(Faq $faq, UpdateFaqsRequest $request)
@@ -87,9 +82,8 @@ public function update(Faq $faq, UpdateFaqsRequest $request)
     }
 
     /**
-     * @param \App\Models\Faq $faq
-     * @param \App\Http\Requests\Backend\Pages\DeleteFaqRequest $request
-     *
+     * @param  \App\Models\Faq  $faq
+     * @param  \App\Http\Requests\Backend\Pages\DeleteFaqRequest  $request
      * @return \App\Http\Responses\RedirectResponse
      */
     public function destroy(Faq $faq, DeleteFaqsRequest $request)
diff --git a/app/Http/Controllers/Backend/Faqs/FaqsTableController.php b/app/Http/Controllers/Backend/Faqs/FaqsTableController.php
index f6f82519..a6566cb8 100755
--- a/app/Http/Controllers/Backend/Faqs/FaqsTableController.php
+++ b/app/Http/Controllers/Backend/Faqs/FaqsTableController.php
@@ -16,7 +16,7 @@ class FaqsTableController extends Controller
     protected $repository;
 
     /**
-     * @param \App\Repositories\Backend\FaqsRepository $faqs
+     * @param  \App\Repositories\Backend\FaqsRepository  $faqs
      */
     public function __construct(FaqsRepository $repository)
     {
@@ -24,8 +24,7 @@ public function __construct(FaqsRepository $repository)
     }
 
     /**
-     * @param \App\Http\Requests\Backend\Faqs\ManageFaqsRequest $request
-     *
+     * @param  \App\Http\Requests\Backend\Faqs\ManageFaqsRequest  $request
      * @return mixed
      */
     public function __invoke(ManageFaqsRequest $request)
diff --git a/app/Http/Controllers/Backend/Pages/PagesController.php b/app/Http/Controllers/Backend/Pages/PagesController.php
index 2add6333..e320d8d1 100755
--- a/app/Http/Controllers/Backend/Pages/PagesController.php
+++ b/app/Http/Controllers/Backend/Pages/PagesController.php
@@ -24,7 +24,7 @@ class PagesController extends Controller
     protected $repository;
 
     /**
-     * @param \App\Repositories\Backend\PagesRepository $repository
+     * @param  \App\Repositories\Backend\PagesRepository  $repository
      */
     public function __construct(PagesRepository $repository)
     {
@@ -33,8 +33,7 @@ public function __construct(PagesRepository $repository)
     }
 
     /**
-     * @param \App\Http\Requests\Backend\Pages\ManagePageRequest $request
-     *
+     * @param  \App\Http\Requests\Backend\Pages\ManagePageRequest  $request
      * @return \App\Http\Responses\ViewResponse
      */
     public function index(ManagePageRequest $request)
@@ -43,8 +42,7 @@ public function index(ManagePageRequest $request)
     }
 
     /**
-     * @param \App\Http\Requests\Backend\Pages\CreatePageRequest $request
-     *
+     * @param  \App\Http\Requests\Backend\Pages\CreatePageRequest  $request
      * @return \App\Http\Responses\ViewResponse
      */
     public function create(CreatePageRequest $request)
@@ -53,8 +51,7 @@ public function create(CreatePageRequest $request)
     }
 
     /**
-     * @param \App\Http\Requests\Backend\Pages\StorePageRequest $request
-     *
+     * @param  \App\Http\Requests\Backend\Pages\StorePageRequest  $request
      * @return \App\Http\Responses\RedirectResponse
      */
     public function store(StorePageRequest $request)
@@ -65,9 +62,8 @@ public function store(StorePageRequest $request)
     }
 
     /**
-     * @param \App\Models\Page $page
-     * @param \App\Http\Requests\Backend\Pages\EditPageRequest $request
-     *
+     * @param  \App\Models\Page  $page
+     * @param  \App\Http\Requests\Backend\Pages\EditPageRequest  $request
      * @return \App\Http\Responses\Backend\Blog\EditResponse
      */
     public function edit(Page $page, EditPageRequest $request)
@@ -76,9 +72,8 @@ public function edit(Page $page, EditPageRequest $request)
     }
 
     /**
-     * @param \App\Models\Page $page
-     * @param \App\Http\Requests\Backend\Pages\UpdatePageRequest $request
-     *
+     * @param  \App\Models\Page  $page
+     * @param  \App\Http\Requests\Backend\Pages\UpdatePageRequest  $request
      * @return \App\Http\Responses\RedirectResponse
      */
     public function update(Page $page, UpdatePageRequest $request)
@@ -89,9 +84,8 @@ public function update(Page $page, UpdatePageRequest $request)
     }
 
     /**
-     * @param \App\Models\Page $page
-     * @param \App\Http\Requests\Backend\Pages\DeletePageRequest $request
-     *
+     * @param  \App\Models\Page  $page
+     * @param  \App\Http\Requests\Backend\Pages\DeletePageRequest  $request
      * @return \App\Http\Responses\RedirectResponse
      */
     public function destroy(Page $page, DeletePageRequest $request)
diff --git a/app/Http/Controllers/Backend/Pages/PagesTableController.php b/app/Http/Controllers/Backend/Pages/PagesTableController.php
index 16c3043a..e2b301e4 100755
--- a/app/Http/Controllers/Backend/Pages/PagesTableController.php
+++ b/app/Http/Controllers/Backend/Pages/PagesTableController.php
@@ -15,7 +15,7 @@ class PagesTableController extends Controller
     protected $repository;
 
     /**
-     * @param \App\Repositories\Backend\PagesRepository $repository
+     * @param  \App\Repositories\Backend\PagesRepository  $repository
      */
     public function __construct(PagesRepository $repository)
     {
@@ -23,8 +23,7 @@ public function __construct(PagesRepository $repository)
     }
 
     /**
-     * @param \App\Http\Requests\Backend\Pages\ManagePageRequest $request
-     *
+     * @param  \App\Http\Requests\Backend\Pages\ManagePageRequest  $request
      * @return mixed
      */
     public function __invoke(ManagePageRequest $request)
diff --git a/app/Http/Controllers/Frontend/Auth/ConfirmAccountController.php b/app/Http/Controllers/Frontend/Auth/ConfirmAccountController.php
index 63ee4fa9..36e661f4 100755
--- a/app/Http/Controllers/Frontend/Auth/ConfirmAccountController.php
+++ b/app/Http/Controllers/Frontend/Auth/ConfirmAccountController.php
@@ -19,7 +19,7 @@ class ConfirmAccountController extends Controller
     /**
      * ConfirmAccountController constructor.
      *
-     * @param UserRepository $user
+     * @param  UserRepository  $user
      */
     public function __construct(UserRepository $user)
     {
@@ -28,9 +28,9 @@ public function __construct(UserRepository $user)
 
     /**
      * @param $token
+     * @return mixed
      *
      * @throws \App\Exceptions\GeneralException
-     * @return mixed
      */
     public function confirm($token)
     {
@@ -41,9 +41,9 @@ public function confirm($token)
 
     /**
      * @param $uuid
+     * @return mixed
      *
      * @throws \App\Exceptions\GeneralException
-     * @return mixed
      */
     public function sendConfirmationEmail($uuid)
     {
diff --git a/app/Http/Controllers/Frontend/Auth/LoginController.php b/app/Http/Controllers/Frontend/Auth/LoginController.php
index 0d07fcfa..73613ac3 100755
--- a/app/Http/Controllers/Frontend/Auth/LoginController.php
+++ b/app/Http/Controllers/Frontend/Auth/LoginController.php
@@ -66,11 +66,11 @@ protected function validateLogin(Request $request)
     /**
      * The user has been authenticated.
      *
-     * @param Request $request
-     * @param         $user
+     * @param  Request  $request
+     * @param  $user
+     * @return \Illuminate\Http\RedirectResponse
      *
      * @throws GeneralException
-     * @return \Illuminate\Http\RedirectResponse
      */
     protected function authenticated(Request $request, $user)
     {
@@ -106,8 +106,7 @@ protected function authenticated(Request $request, $user)
     /**
      * Log the user out of the application.
      *
-     * @param Request $request
-     *
+     * @param  Request  $request
      * @return \Illuminate\Http\Response
      */
     public function logout(Request $request)
diff --git a/app/Http/Controllers/Frontend/Auth/PasswordExpiredController.php b/app/Http/Controllers/Frontend/Auth/PasswordExpiredController.php
index 6c2dc92a..df8d852e 100755
--- a/app/Http/Controllers/Frontend/Auth/PasswordExpiredController.php
+++ b/app/Http/Controllers/Frontend/Auth/PasswordExpiredController.php
@@ -22,11 +22,11 @@ public function expired()
     }
 
     /**
-     * @param UpdatePasswordRequest $request
-     * @param UserRepository        $userRepository
+     * @param  UpdatePasswordRequest  $request
+     * @param  UserRepository  $userRepository
+     * @return mixed
      *
      * @throws \App\Exceptions\GeneralException
-     * @return mixed
      */
     public function update(UpdatePasswordRequest $request, UserRepository $userRepository)
     {
diff --git a/app/Http/Controllers/Frontend/Auth/RegisterController.php b/app/Http/Controllers/Frontend/Auth/RegisterController.php
index e9dae2b0..acc52942 100755
--- a/app/Http/Controllers/Frontend/Auth/RegisterController.php
+++ b/app/Http/Controllers/Frontend/Auth/RegisterController.php
@@ -23,7 +23,7 @@ class RegisterController extends Controller
     /**
      * RegisterController constructor.
      *
-     * @param UserRepository $userRepository
+     * @param  UserRepository  $userRepository
      */
     public function __construct(UserRepository $userRepository)
     {
@@ -53,10 +53,10 @@ public function showRegistrationForm()
     }
 
     /**
-     * @param RegisterRequest $request
+     * @param  RegisterRequest  $request
+     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      *
      * @throws \Throwable
-     * @return \Illuminate\Http\RedirectResponse|\Illuminate\Routing\Redirector
      */
     public function register(RegisterRequest $request)
     {
diff --git a/app/Http/Controllers/Frontend/Auth/ResetPasswordController.php b/app/Http/Controllers/Frontend/Auth/ResetPasswordController.php
index 1fb1a361..d2b7c0b1 100755
--- a/app/Http/Controllers/Frontend/Auth/ResetPasswordController.php
+++ b/app/Http/Controllers/Frontend/Auth/ResetPasswordController.php
@@ -25,7 +25,7 @@ class ResetPasswordController extends Controller
     /**
      * ChangePasswordController constructor.
      *
-     * @param UserRepository $userRepository
+     * @param  UserRepository  $userRepository
      */
     public function __construct(UserRepository $userRepository)
     {
@@ -37,8 +37,7 @@ public function __construct(UserRepository $userRepository)
      *
      * If no token is present, display the link request form.
      *
-     * @param string|null $token
-     *
+     * @param  string|null  $token
      * @return \Illuminate\Http\Response
      */
     public function showResetForm($token = null)
diff --git a/app/Http/Controllers/Frontend/Auth/SocialLoginController.php b/app/Http/Controllers/Frontend/Auth/SocialLoginController.php
index 26777c10..e959d1f6 100755
--- a/app/Http/Controllers/Frontend/Auth/SocialLoginController.php
+++ b/app/Http/Controllers/Frontend/Auth/SocialLoginController.php
@@ -28,8 +28,8 @@ class SocialLoginController extends Controller
     /**
      * SocialLoginController constructor.
      *
-     * @param UserRepository  $userRepository
-     * @param SocialiteHelper $socialiteHelper
+     * @param  UserRepository  $userRepository
+     * @param  SocialiteHelper  $socialiteHelper
      */
     public function __construct(UserRepository $userRepository, SocialiteHelper $socialiteHelper)
     {
@@ -38,12 +38,11 @@ public function __construct(UserRepository $userRepository, SocialiteHelper $soc
     }
 
     /**
-     * @param Request $request
+     * @param  Request  $request
      * @param $provider
+     * @return \Illuminate\Http\RedirectResponse|mixed
      *
      * @throws GeneralException
-     *
-     * @return \Illuminate\Http\RedirectResponse|mixed
      */
     public function login(Request $request, $provider)
     {
@@ -99,7 +98,6 @@ public function login(Request $request, $provider)
 
     /**
      * @param  $provider
-     *
      * @return mixed
      */
     protected function getAuthorizationFirst($provider)
@@ -126,7 +124,6 @@ protected function getAuthorizationFirst($provider)
 
     /**
      * @param $provider
-     *
      * @return mixed
      */
     protected function getProviderUser($provider)
diff --git a/app/Http/Controllers/Frontend/Auth/UpdatePasswordController.php b/app/Http/Controllers/Frontend/Auth/UpdatePasswordController.php
index 3483ee41..59530059 100755
--- a/app/Http/Controllers/Frontend/Auth/UpdatePasswordController.php
+++ b/app/Http/Controllers/Frontend/Auth/UpdatePasswordController.php
@@ -19,7 +19,7 @@ class UpdatePasswordController extends Controller
     /**
      * ChangePasswordController constructor.
      *
-     * @param UserRepository $userRepository
+     * @param  UserRepository  $userRepository
      */
     public function __construct(UserRepository $userRepository)
     {
@@ -27,10 +27,10 @@ public function __construct(UserRepository $userRepository)
     }
 
     /**
-     * @param UpdatePasswordRequest $request
+     * @param  UpdatePasswordRequest  $request
+     * @return mixed
      *
      * @throws \App\Exceptions\GeneralException
-     * @return mixed
      */
     public function update(UpdatePasswordRequest $request)
     {
diff --git a/app/Http/Controllers/Frontend/ContactController.php b/app/Http/Controllers/Frontend/ContactController.php
index 689ba0b9..51e82bb5 100755
--- a/app/Http/Controllers/Frontend/ContactController.php
+++ b/app/Http/Controllers/Frontend/ContactController.php
@@ -21,8 +21,7 @@ public function index()
     }
 
     /**
-     * @param SendContactRequest $request
-     *
+     * @param  SendContactRequest  $request
      * @return mixed
      */
     public function send(SendContactRequest $request)
diff --git a/app/Http/Controllers/Frontend/User/ProfileController.php b/app/Http/Controllers/Frontend/User/ProfileController.php
index 658c167f..a0aa8f8a 100755
--- a/app/Http/Controllers/Frontend/User/ProfileController.php
+++ b/app/Http/Controllers/Frontend/User/ProfileController.php
@@ -19,7 +19,7 @@ class ProfileController extends Controller
     /**
      * ProfileController constructor.
      *
-     * @param UserRepository $userRepository
+     * @param  UserRepository  $userRepository
      */
     public function __construct(UserRepository $userRepository)
     {
@@ -27,10 +27,10 @@ public function __construct(UserRepository $userRepository)
     }
 
     /**
-     * @param UpdateProfileRequest $request
+     * @param  UpdateProfileRequest  $request
+     * @return mixed
      *
      * @throws \App\Exceptions\GeneralException
-     * @return mixed
      */
     public function update(UpdateProfileRequest $request)
     {
diff --git a/app/Http/Controllers/LanguageController.php b/app/Http/Controllers/LanguageController.php
index 4e178b55..a8a4d031 100755
--- a/app/Http/Controllers/LanguageController.php
+++ b/app/Http/Controllers/LanguageController.php
@@ -9,7 +9,6 @@ class LanguageController extends Controller
 {
     /**
      * @param $locale
-     *
      * @return \Illuminate\Http\RedirectResponse
      */
     public function swap($locale)
diff --git a/app/Http/Middleware/CheckForReadOnlyMode.php b/app/Http/Middleware/CheckForReadOnlyMode.php
index e4766610..7e50caae 100755
--- a/app/Http/Middleware/CheckForReadOnlyMode.php
+++ b/app/Http/Middleware/CheckForReadOnlyMode.php
@@ -24,9 +24,8 @@ class CheckForReadOnlyMode
     /**
      * Handle an incoming request.
      *
-     * @param \Illuminate\Http\Request $request
-     * @param \Closure                 $next
-     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
      * @return mixed
      */
     public function handle($request, Closure $next)
diff --git a/app/Http/Middleware/LocaleMiddleware.php b/app/Http/Middleware/LocaleMiddleware.php
index 4e3b02b8..925fb30f 100755
--- a/app/Http/Middleware/LocaleMiddleware.php
+++ b/app/Http/Middleware/LocaleMiddleware.php
@@ -13,9 +13,8 @@ class LocaleMiddleware
     /**
      * Handle an incoming request.
      *
-     * @param \Illuminate\Http\Request $request
-     * @param \Closure                 $next
-     *
+     * @param  \Illuminate\Http\Request  $request
+     * @param  \Closure  $next
      * @return mixed
      */
     public function handle($request, Closure $next)
diff --git a/app/Http/Middleware/PasswordExpires.php b/app/Http/Middleware/PasswordExpires.php
index 63cb48f8..dad93040 100755
--- a/app/Http/Middleware/PasswordExpires.php
+++ b/app/Http/Middleware/PasswordExpires.php
@@ -11,11 +11,11 @@
 class PasswordExpires
 {
     /**
-     * @param         $request
-     * @param Closure $next
+     * @param  $request
+     * @param  Closure  $next
+     * @return \Illuminate\Http\RedirectResponse|mixed
      *
      * @throws \Exception
-     * @return \Illuminate\Http\RedirectResponse|mixed
      */
     public function handle($request, Closure $next)
     {
diff --git a/app/Http/Middleware/SecureHeaders.php b/app/Http/Middleware/SecureHeaders.php
index dbd320a2..7db7d0fc 100755
--- a/app/Http/Middleware/SecureHeaders.php
+++ b/app/Http/Middleware/SecureHeaders.php
@@ -28,7 +28,6 @@ class SecureHeaders
     /**
      * @param $request
      * @param  Closure  $next
-     *
      * @return mixed
      */
     public function handle($request, Closure $next)
diff --git a/app/Http/Middleware/ToBeLoggedOut.php b/app/Http/Middleware/ToBeLoggedOut.php
index faeaed68..ea708203 100755
--- a/app/Http/Middleware/ToBeLoggedOut.php
+++ b/app/Http/Middleware/ToBeLoggedOut.php
@@ -10,9 +10,8 @@
 class ToBeLoggedOut
 {
     /**
-     * @param         $request
-     * @param Closure $next
-     *
+     * @param  $request
+     * @param  Closure  $next
      * @return \Illuminate\Http\RedirectResponse|mixed
      */
     public function handle($request, Closure $next)
diff --git a/app/Http/Resources/BlogCategoriesResource.php b/app/Http/Resources/BlogCategoriesResource.php
index d536c4c3..050e9c62 100755
--- a/app/Http/Resources/BlogCategoriesResource.php
+++ b/app/Http/Resources/BlogCategoriesResource.php
@@ -10,7 +10,6 @@ class BlogCategoriesResource extends Resource
      * Transform the resource into an array.
      *
      * @param  \Illuminate\Http\Request
-     *
      * @return array
      */
     public function toArray($request)
diff --git a/app/Http/Resources/BlogTagsResource.php b/app/Http/Resources/BlogTagsResource.php
index 6b6243aa..401575c5 100755
--- a/app/Http/Resources/BlogTagsResource.php
+++ b/app/Http/Resources/BlogTagsResource.php
@@ -10,7 +10,6 @@ class BlogTagsResource extends Resource
      * Transform the resource into an array.
      *
      * @param  \Illuminate\Http\Request
-     *
      * @return array
      */
     public function toArray($request)
diff --git a/app/Http/Resources/BlogsResource.php b/app/Http/Resources/BlogsResource.php
index ae5bbbc2..7dd5fe02 100755
--- a/app/Http/Resources/BlogsResource.php
+++ b/app/Http/Resources/BlogsResource.php
@@ -10,7 +10,6 @@ class BlogsResource extends Resource
      * Transform the resource into an array.
      *
      * @param  \Illuminate\Http\Request
-     *
      * @return array
      */
     public function toArray($request)
diff --git a/app/Http/Resources/FaqsResource.php b/app/Http/Resources/FaqsResource.php
index aff89466..cf184436 100755
--- a/app/Http/Resources/FaqsResource.php
+++ b/app/Http/Resources/FaqsResource.php
@@ -10,7 +10,6 @@ class FaqsResource extends Resource
      * Transform the resource into an array.
      *
      * @param  \Illuminate\Http\Request
-     *
      * @return array
      */
     public function toArray($request)
diff --git a/app/Http/Resources/PagesResource.php b/app/Http/Resources/PagesResource.php
index 129ea883..12dafea9 100755
--- a/app/Http/Resources/PagesResource.php
+++ b/app/Http/Resources/PagesResource.php
@@ -10,7 +10,6 @@ class PagesResource extends Resource
      * Transform the resource into an array.
      *
      * @param  \Illuminate\Http\Request
-     *
      * @return array
      */
     public function toArray($request)
diff --git a/app/Http/Resources/UserResource.php b/app/Http/Resources/UserResource.php
index 1fc6d005..827b549d 100755
--- a/app/Http/Resources/UserResource.php
+++ b/app/Http/Resources/UserResource.php
@@ -10,7 +10,6 @@ class UserResource extends Resource
      * Transform the resource into an array.
      *
      * @param  \Illuminate\Http\Request
-     *
      * @return array
      */
     public function toArray($request)
diff --git a/app/Http/Responses/Backend/Auth/Permission/CreateResponse.php b/app/Http/Responses/Backend/Auth/Permission/CreateResponse.php
index c0e9a015..7f375b49 100755
--- a/app/Http/Responses/Backend/Auth/Permission/CreateResponse.php
+++ b/app/Http/Responses/Backend/Auth/Permission/CreateResponse.php
@@ -12,7 +12,7 @@ class CreateResponse implements Responsable
     protected $permissions;
 
     /**
-     * @param \App\Repositories\Backend\Auth\Permission\PermissionRepository $permissions
+     * @param  \App\Repositories\Backend\Auth\Permission\PermissionRepository  $permissions
      */
     public function __construct($permissions)
     {
@@ -22,8 +22,7 @@ public function __construct($permissions)
     /**
      * In Response.
      *
-     * @param \App\Http\Requests\Request $request
-     *
+     * @param  \App\Http\Requests\Request  $request
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
     public function toResponse($request)
diff --git a/app/Http/Responses/Backend/Auth/Permission/EditResponse.php b/app/Http/Responses/Backend/Auth/Permission/EditResponse.php
index 32048465..83905cf6 100755
--- a/app/Http/Responses/Backend/Auth/Permission/EditResponse.php
+++ b/app/Http/Responses/Backend/Auth/Permission/EditResponse.php
@@ -12,7 +12,7 @@ class EditResponse implements Responsable
     protected $permission;
 
     /**
-     * @param \App\Models\Auth\Permission\Permission $permission
+     * @param  \App\Models\Auth\Permission\Permission  $permission
      */
     public function __construct($permission)
     {
@@ -22,8 +22,7 @@ public function __construct($permission)
     /**
      * toReponse.
      *
-     * @param \Illuminate\Http\Request $request
-     *
+     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
     public function toResponse($request)
diff --git a/app/Http/Responses/Backend/Auth/Role/CreateResponse.php b/app/Http/Responses/Backend/Auth/Role/CreateResponse.php
index 0f73f276..d6e634e1 100755
--- a/app/Http/Responses/Backend/Auth/Role/CreateResponse.php
+++ b/app/Http/Responses/Backend/Auth/Role/CreateResponse.php
@@ -17,8 +17,8 @@ class CreateResponse implements Responsable
     protected $permissionRepository;
 
     /**
-     * @param \App\Repositories\Backend\Auth\Permission\PermissionRepository $permissions
-     * @param \App\Repositories\Backend\Auth\Role\RoleRepository $roles
+     * @param  \App\Repositories\Backend\Auth\Permission\PermissionRepository  $permissions
+     * @param  \App\Repositories\Backend\Auth\Role\RoleRepository  $roles
      */
     public function __construct($permissions, $roles)
     {
@@ -29,8 +29,7 @@ public function __construct($permissions, $roles)
     /**
      * In Response.
      *
-     * @param \App\Http\Requests\Request $request
-     *
+     * @param  \App\Http\Requests\Request  $request
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
     public function toResponse($request)
diff --git a/app/Http/Responses/Backend/Auth/Role/EditResponse.php b/app/Http/Responses/Backend/Auth/Role/EditResponse.php
index c67a7d28..cd3605cf 100755
--- a/app/Http/Responses/Backend/Auth/Role/EditResponse.php
+++ b/app/Http/Responses/Backend/Auth/Role/EditResponse.php
@@ -17,8 +17,8 @@ class EditResponse implements Responsable
     protected $permissionRepository;
 
     /**
-     * @param \App\Models\Auth\Role $role
-     * @param \App\Repositories\Backend\Auth\Permission\PermissionRepository $permissionRepository
+     * @param  \App\Models\Auth\Role  $role
+     * @param  \App\Repositories\Backend\Auth\Permission\PermissionRepository  $permissionRepository
      */
     public function __construct($role, $permissionRepository)
     {
@@ -29,8 +29,7 @@ public function __construct($role, $permissionRepository)
     /**
      * toReponse.
      *
-     * @param \Illuminate\Http\Request $request
-     *
+     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
     public function toResponse($request)
diff --git a/app/Http/Responses/Backend/BlogCategory/EditResponse.php b/app/Http/Responses/Backend/BlogCategory/EditResponse.php
index b717a73a..6b1300e4 100755
--- a/app/Http/Responses/Backend/BlogCategory/EditResponse.php
+++ b/app/Http/Responses/Backend/BlogCategory/EditResponse.php
@@ -12,7 +12,7 @@ class EditResponse implements Responsable
     protected $blogCategory;
 
     /**
-     * @param \App\Models\BlogCategories\BlogCategory $blogCategory
+     * @param  \App\Models\BlogCategories\BlogCategory  $blogCategory
      */
     public function __construct($blogCategory)
     {
@@ -22,8 +22,7 @@ public function __construct($blogCategory)
     /**
      * toReponse.
      *
-     * @param \Illuminate\Http\Request $request
-     *
+     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
     public function toResponse($request)
diff --git a/app/Http/Responses/Backend/BlogTag/EditResponse.php b/app/Http/Responses/Backend/BlogTag/EditResponse.php
index e0ecae40..d28d0b96 100755
--- a/app/Http/Responses/Backend/BlogTag/EditResponse.php
+++ b/app/Http/Responses/Backend/BlogTag/EditResponse.php
@@ -12,7 +12,7 @@ class EditResponse implements Responsable
     protected $blogTag;
 
     /**
-     * @param \App\Models\BlogTags\BlogTag $blogTag
+     * @param  \App\Models\BlogTags\BlogTag  $blogTag
      */
     public function __construct($blogTag)
     {
@@ -22,8 +22,7 @@ public function __construct($blogTag)
     /**
      * toReponse.
      *
-     * @param \Illuminate\Http\Request $request
-     *
+     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
     public function toResponse($request)
diff --git a/app/Http/Responses/Backend/Page/EditResponse.php b/app/Http/Responses/Backend/Page/EditResponse.php
index e893fadb..bf70dfeb 100755
--- a/app/Http/Responses/Backend/Page/EditResponse.php
+++ b/app/Http/Responses/Backend/Page/EditResponse.php
@@ -12,7 +12,7 @@ class EditResponse implements Responsable
     protected $page;
 
     /**
-     * @param \App\Models\Page\Page $page
+     * @param  \App\Models\Page\Page  $page
      */
     public function __construct($page)
     {
@@ -22,8 +22,7 @@ public function __construct($page)
     /**
      * toReponse.
      *
-     * @param \Illuminate\Http\Request $request
-     *
+     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
     public function toResponse($request)
diff --git a/app/Http/Responses/ViewResponse.php b/app/Http/Responses/ViewResponse.php
index 53f52fb1..79940565 100755
--- a/app/Http/Responses/ViewResponse.php
+++ b/app/Http/Responses/ViewResponse.php
@@ -17,8 +17,8 @@ class ViewResponse implements Responsable
     protected $with;
 
     /**
-     * @param string $view
-     * @param array  $with
+     * @param  string  $view
+     * @param  array  $with
      */
     public function __construct($view, $with = [])
     {
@@ -29,8 +29,7 @@ public function __construct($view, $with = [])
     /**
      * In Response.
      *
-     * @param \Illuminate\Http\Request $request
-     *
+     * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Contracts\View\Factory|\Illuminate\View\View
      */
     public function toResponse($request)
diff --git a/app/Listeners/Backend/Auth/Permission/PermissionEventListener.php b/app/Listeners/Backend/Auth/Permission/PermissionEventListener.php
index 9714c832..97646b08 100755
--- a/app/Listeners/Backend/Auth/Permission/PermissionEventListener.php
+++ b/app/Listeners/Backend/Auth/Permission/PermissionEventListener.php
@@ -54,7 +54,7 @@ public function onDeleted($event)
     /**
      * Register the listeners for the subscriber.
      *
-     * @param \Illuminate\Events\Dispatcher $events
+     * @param  \Illuminate\Events\Dispatcher  $events
      */
     public function subscribe($events)
     {
diff --git a/app/Listeners/Backend/Auth/Role/RoleEventListener.php b/app/Listeners/Backend/Auth/Role/RoleEventListener.php
index e0b838dd..a55a8e4b 100755
--- a/app/Listeners/Backend/Auth/Role/RoleEventListener.php
+++ b/app/Listeners/Backend/Auth/Role/RoleEventListener.php
@@ -38,7 +38,7 @@ public function onDeleted($event)
     /**
      * Register the listeners for the subscriber.
      *
-     * @param \Illuminate\Events\Dispatcher $events
+     * @param  \Illuminate\Events\Dispatcher  $events
      */
     public function subscribe($events)
     {
diff --git a/app/Listeners/Backend/Auth/User/UserEventListener.php b/app/Listeners/Backend/Auth/User/UserEventListener.php
index 8a053626..56109bfe 100755
--- a/app/Listeners/Backend/Auth/User/UserEventListener.php
+++ b/app/Listeners/Backend/Auth/User/UserEventListener.php
@@ -110,7 +110,7 @@ public function onRestored($event)
     /**
      * Register the listeners for the subscriber.
      *
-     * @param \Illuminate\Events\Dispatcher $events
+     * @param  \Illuminate\Events\Dispatcher  $events
      */
     public function subscribe($events)
     {
diff --git a/app/Listeners/Backend/BlogCategories/BlogCategoryEventListener.php b/app/Listeners/Backend/BlogCategories/BlogCategoryEventListener.php
index 3e35487b..d56cce7e 100755
--- a/app/Listeners/Backend/BlogCategories/BlogCategoryEventListener.php
+++ b/app/Listeners/Backend/BlogCategories/BlogCategoryEventListener.php
@@ -54,7 +54,7 @@ public function onDeleted($event)
     /**
      * Register the listeners for the subscriber.
      *
-     * @param \Illuminate\Events\Dispatcher $events
+     * @param  \Illuminate\Events\Dispatcher  $events
      */
     public function subscribe($events)
     {
diff --git a/app/Listeners/Backend/BlogTags/BlogTagEventListener.php b/app/Listeners/Backend/BlogTags/BlogTagEventListener.php
index 7061bbb3..261647a4 100755
--- a/app/Listeners/Backend/BlogTags/BlogTagEventListener.php
+++ b/app/Listeners/Backend/BlogTags/BlogTagEventListener.php
@@ -54,7 +54,7 @@ public function onDeleted($event)
     /**
      * Register the listeners for the subscriber.
      *
-     * @param \Illuminate\Events\Dispatcher $events
+     * @param  \Illuminate\Events\Dispatcher  $events
      */
     public function subscribe($events)
     {
diff --git a/app/Listeners/Backend/Blogs/BlogEventListener.php b/app/Listeners/Backend/Blogs/BlogEventListener.php
index 2cff5b39..2a6cf829 100755
--- a/app/Listeners/Backend/Blogs/BlogEventListener.php
+++ b/app/Listeners/Backend/Blogs/BlogEventListener.php
@@ -54,7 +54,7 @@ public function onDeleted($event)
     /**
      * Register the listeners for the subscriber.
      *
-     * @param \Illuminate\Events\Dispatcher $events
+     * @param  \Illuminate\Events\Dispatcher  $events
      */
     public function subscribe($events)
     {
diff --git a/app/Listeners/Backend/EmailTemplates/EmailTemplateEventListener.php b/app/Listeners/Backend/EmailTemplates/EmailTemplateEventListener.php
index 94e1033f..327e335b 100755
--- a/app/Listeners/Backend/EmailTemplates/EmailTemplateEventListener.php
+++ b/app/Listeners/Backend/EmailTemplates/EmailTemplateEventListener.php
@@ -54,7 +54,7 @@ public function onDeleted($event)
     /**
      * Register the listeners for the subscriber.
      *
-     * @param \Illuminate\Events\Dispatcher $events
+     * @param  \Illuminate\Events\Dispatcher  $events
      */
     public function subscribe($events)
     {
diff --git a/app/Listeners/Backend/Faqs/FaqEventListener.php b/app/Listeners/Backend/Faqs/FaqEventListener.php
index fd4185ee..0be0d0ac 100755
--- a/app/Listeners/Backend/Faqs/FaqEventListener.php
+++ b/app/Listeners/Backend/Faqs/FaqEventListener.php
@@ -54,7 +54,7 @@ public function onDeleted($event)
     /**
      * Register the listeners for the subscriber.
      *
-     * @param \Illuminate\Events\Dispatcher $events
+     * @param  \Illuminate\Events\Dispatcher  $events
      */
     public function subscribe($events)
     {
diff --git a/app/Listeners/Backend/Pages/PageEventListener.php b/app/Listeners/Backend/Pages/PageEventListener.php
index 344b2bbc..036a3660 100755
--- a/app/Listeners/Backend/Pages/PageEventListener.php
+++ b/app/Listeners/Backend/Pages/PageEventListener.php
@@ -54,7 +54,7 @@ public function onDeleted($event)
     /**
      * Register the listeners for the subscriber.
      *
-     * @param \Illuminate\Events\Dispatcher $events
+     * @param  \Illuminate\Events\Dispatcher  $events
      */
     public function subscribe($events)
     {
diff --git a/app/Listeners/Frontend/Auth/UserEventListener.php b/app/Listeners/Frontend/Auth/UserEventListener.php
index 31e9239b..a9779e85 100755
--- a/app/Listeners/Frontend/Auth/UserEventListener.php
+++ b/app/Listeners/Frontend/Auth/UserEventListener.php
@@ -76,7 +76,7 @@ public function onConfirmed($event)
     /**
      * Register the listeners for the subscriber.
      *
-     * @param \Illuminate\Events\Dispatcher $events
+     * @param  \Illuminate\Events\Dispatcher  $events
      */
     public function subscribe($events)
     {
diff --git a/app/Mail/Frontend/Contact/SendContact.php b/app/Mail/Frontend/Contact/SendContact.php
index d56e5c08..6acb153a 100755
--- a/app/Mail/Frontend/Contact/SendContact.php
+++ b/app/Mail/Frontend/Contact/SendContact.php
@@ -22,7 +22,7 @@ class SendContact extends Mailable
     /**
      * SendContact constructor.
      *
-     * @param Request $request
+     * @param  Request  $request
      */
     public function __construct(Request $request)
     {
diff --git a/app/Models/Auth/BaseUser.php b/app/Models/Auth/BaseUser.php
index ab29dc3f..3273f823 100755
--- a/app/Models/Auth/BaseUser.php
+++ b/app/Models/Auth/BaseUser.php
@@ -47,6 +47,7 @@ abstract class BaseUser extends Authenticatable implements Recordable
 
     /**
      * The dynamic attributes from mutators that should be returned with the user object.
+     *
      * @var array
      */
     protected $appends = [
@@ -87,7 +88,7 @@ abstract class BaseUser extends Authenticatable implements Recordable
      * Return true or false if the user can impersonate an other user.
      *
      * @param void
-     * @return  bool
+     * @return bool
      */
     public function canImpersonate()
     {
@@ -98,7 +99,7 @@ public function canImpersonate()
      * Return true or false if the user can be impersonate.
      *
      * @param void
-     * @return  bool
+     * @return bool
      */
     public function canBeImpersonated()
     {
diff --git a/app/Models/Auth/Traits/Access/RoleAccess.php b/app/Models/Auth/Traits/Access/RoleAccess.php
index 18b5d02c..fea839e0 100755
--- a/app/Models/Auth/Traits/Access/RoleAccess.php
+++ b/app/Models/Auth/Traits/Access/RoleAccess.php
@@ -7,7 +7,7 @@ trait RoleAccess
     /**
      * Save the inputted permissions.
      *
-     * @param mixed $inputPermissions
+     * @param  mixed  $inputPermissions
      */
     public function savePermissions($inputPermissions)
     {
@@ -21,7 +21,7 @@ public function savePermissions($inputPermissions)
     /**
      * Attach permission to current role.
      *
-     * @param object|array $permission
+     * @param  object|array  $permission
      */
     public function attachPermission($permission)
     {
@@ -39,7 +39,7 @@ public function attachPermission($permission)
     /**
      * Detach permission form current role.
      *
-     * @param object|array $permission
+     * @param  object|array  $permission
      */
     public function detachPermission($permission)
     {
@@ -57,7 +57,7 @@ public function detachPermission($permission)
     /**
      * Attach multiple permissions to current role.
      *
-     * @param mixed $permissions
+     * @param  mixed  $permissions
      */
     public function attachPermissions($permissions)
     {
@@ -69,7 +69,7 @@ public function attachPermissions($permissions)
     /**
      * Detach multiple permissions from current role.
      *
-     * @param mixed $permissions
+     * @param  mixed  $permissions
      */
     public function detachPermissions($permissions)
     {
diff --git a/app/Models/Auth/Traits/Access/UserAccess.php b/app/Models/Auth/Traits/Access/UserAccess.php
index 8d4f215e..a9245fef 100755
--- a/app/Models/Auth/Traits/Access/UserAccess.php
+++ b/app/Models/Auth/Traits/Access/UserAccess.php
@@ -7,8 +7,7 @@ trait UserAccess
     /**
      * Checks if the user has a Role by its name or id.
      *
-     * @param string $nameOrId Role name or id.
-     *
+     * @param  string  $nameOrId  Role name or id.
      * @return bool
      */
     public function hasRole($nameOrId)
@@ -42,7 +41,6 @@ public function hasRole($nameOrId)
      *
      * @param  $roles
      * @param  $needsAll
-     *
      * @return bool
      */
     public function hasRoles($roles, $needsAll = false)
@@ -79,8 +77,7 @@ public function hasRoles($roles, $needsAll = false)
     /**
      * Check if user has a permission by its name or id.
      *
-     * @param string $nameOrId Permission name or id.
-     *
+     * @param  string  $nameOrId  Permission name or id.
      * @return bool
      */
     public function allow($nameOrId)
@@ -140,7 +137,6 @@ public function allow($nameOrId)
      *
      * @param  $permissions
      * @param  $needsAll
-     *
      * @return bool
      */
     public function allowMultiple($permissions, $needsAll = false)
@@ -176,7 +172,6 @@ public function allowMultiple($permissions, $needsAll = false)
 
     /**
      * @param  $nameOrId
-     *
      * @return bool
      */
     public function hasPermission($nameOrId)
@@ -186,8 +181,7 @@ public function hasPermission($nameOrId)
 
     /**
      * @param  $permissions
-     * @param bool $needsAll
-     *
+     * @param  bool  $needsAll
      * @return bool
      */
     public function hasPermissions($permissions, $needsAll = false)
@@ -198,7 +192,7 @@ public function hasPermissions($permissions, $needsAll = false)
     /**
      * Alias to eloquent many-to-many relation's attach() method.
      *
-     * @param mixed $role
+     * @param  mixed  $role
      */
     public function attachRole($role)
     {
@@ -216,7 +210,7 @@ public function attachRole($role)
     /**
      * Alias to eloquent many-to-many relation's detach() method.
      *
-     * @param mixed $role
+     * @param  mixed  $role
      */
     public function detachRole($role)
     {
@@ -234,7 +228,7 @@ public function detachRole($role)
     /**
      * Attach multiple roles to a user.
      *
-     * @param mixed $roles
+     * @param  mixed  $roles
      */
     public function attachRoles($roles)
     {
@@ -246,7 +240,7 @@ public function attachRoles($roles)
     /**
      * Detach multiple roles from a user.
      *
-     * @param mixed $roles
+     * @param  mixed  $roles
      */
     public function detachRoles($roles)
     {
@@ -258,7 +252,7 @@ public function detachRoles($roles)
     /**
      * Attach multiple Permissions to a user.
      *
-     * @param mixed $permissions
+     * @param  mixed  $permissions
      */
     public function attachPermissions($permissions)
     {
@@ -270,7 +264,7 @@ public function attachPermissions($permissions)
     /**
      * Alias to eloquent many-to-many relation's attach() method.
      *
-     * @param mixed $permission
+     * @param  mixed  $permission
      */
     public function attachPermission($permission)
     {
@@ -288,7 +282,7 @@ public function attachPermission($permission)
     /**
      * Detach multiple permissions from current role.
      *
-     * @param mixed $permissions
+     * @param  mixed  $permissions
      */
     public function detachPermissions($permissions)
     {
@@ -300,7 +294,7 @@ public function detachPermissions($permissions)
     /**
      * Detach permission form current User.
      *
-     * @param object|array $permission
+     * @param  object|array  $permission
      */
     public function detachPermission($permission)
     {
diff --git a/app/Models/Auth/Traits/Methods/UserMethods.php b/app/Models/Auth/Traits/Methods/UserMethods.php
index 5889e697..64b3738d 100755
--- a/app/Models/Auth/Traits/Methods/UserMethods.php
+++ b/app/Models/Auth/Traits/Methods/UserMethods.php
@@ -21,10 +21,10 @@ public function canChangePassword()
     }
 
     /**
-     * @param bool $size
+     * @param  bool  $size
+     * @return bool|\Illuminate\Contracts\Routing\UrlGenerator|mixed|string
      *
      * @throws \Illuminate\Container\EntryNotFoundException
-     * @return bool|\Illuminate\Contracts\Routing\UrlGenerator|mixed|string
      */
     public function getPicture($size = false)
     {
@@ -51,7 +51,6 @@ public function getPicture($size = false)
 
     /**
      * @param $provider
-     *
      * @return bool
      */
     public function hasProvider($provider)
diff --git a/app/Models/Auth/Traits/Scopes/RoleScopes.php b/app/Models/Auth/Traits/Scopes/RoleScopes.php
index 2ea91c50..fad5d246 100755
--- a/app/Models/Auth/Traits/Scopes/RoleScopes.php
+++ b/app/Models/Auth/Traits/Scopes/RoleScopes.php
@@ -6,8 +6,7 @@ trait RoleScopes
 {
     /**
      * @param $query
-     * @param string $direction
-     *
+     * @param  string  $direction
      * @return mixed
      */
     public function scopeSort($query, $direction = 'asc')
diff --git a/app/Models/Auth/Traits/Scopes/UserScopes.php b/app/Models/Auth/Traits/Scopes/UserScopes.php
index 19c79519..3c17c672 100755
--- a/app/Models/Auth/Traits/Scopes/UserScopes.php
+++ b/app/Models/Auth/Traits/Scopes/UserScopes.php
@@ -6,8 +6,7 @@ trait UserScopes
 {
     /**
      * @param $query
-     * @param bool $confirmed
-     *
+     * @param  bool  $confirmed
      * @return mixed
      */
     public function scopeConfirmed($query, $confirmed = true)
@@ -17,8 +16,7 @@ public function scopeConfirmed($query, $confirmed = true)
 
     /**
      * @param $query
-     * @param bool $status
-     *
+     * @param  bool  $status
      * @return mixed
      */
     public function scopeActive($query, $status = true)
diff --git a/app/Models/Auth/Traits/SendUserPasswordReset.php b/app/Models/Auth/Traits/SendUserPasswordReset.php
index 8ce21e15..1390f0ae 100755
--- a/app/Models/Auth/Traits/SendUserPasswordReset.php
+++ b/app/Models/Auth/Traits/SendUserPasswordReset.php
@@ -12,7 +12,7 @@ trait SendUserPasswordReset
     /**
      * Send the password reset notification.
      *
-     * @param string $token
+     * @param  string  $token
      */
     public function sendPasswordResetNotification($token)
     {
diff --git a/app/Models/BaseModel.php b/app/Models/BaseModel.php
index 5818437e..c4aef5f4 100755
--- a/app/Models/BaseModel.php
+++ b/app/Models/BaseModel.php
@@ -9,8 +9,7 @@ class BaseModel extends Model
     /**
      * Generate drop-down select data with basic IDs.
      *
-     * @param string $field_name
-     *
+     * @param  string  $field_name
      * @return array
      */
     public static function getSelectData($field_name = 'name')
@@ -24,8 +23,7 @@ public static function getSelectData($field_name = 'name')
      * Generate items for drop-down select data with basic IDs.
      *
      * @param $collection
-     * @param string $field_name
-     *
+     * @param  string  $field_name
      * @return array
      */
     public static function getItems($collection, $field_name)
diff --git a/app/Models/Traits/Uuid.php b/app/Models/Traits/Uuid.php
index 62b44ba9..8c3b5788 100755
--- a/app/Models/Traits/Uuid.php
+++ b/app/Models/Traits/Uuid.php
@@ -12,7 +12,6 @@ trait Uuid
     /**
      * @param $query
      * @param $uuid
-     *
      * @return mixed
      */
     public function scopeUuid($query, $uuid)
diff --git a/app/Notifications/Backend/Auth/UserAccountActive.php b/app/Notifications/Backend/Auth/UserAccountActive.php
index 6d457bbe..14b54a25 100755
--- a/app/Notifications/Backend/Auth/UserAccountActive.php
+++ b/app/Notifications/Backend/Auth/UserAccountActive.php
@@ -16,8 +16,7 @@ class UserAccountActive extends Notification
     /**
      * Get the notification's delivery channels.
      *
-     * @param mixed $notifiable
-     *
+     * @param  mixed  $notifiable
      * @return array
      */
     public function via($notifiable)
@@ -28,8 +27,7 @@ public function via($notifiable)
     /**
      * Get the mail representation of the notification.
      *
-     * @param mixed $notifiable
-     *
+     * @param  mixed  $notifiable
      * @return \Illuminate\Notifications\Messages\MailMessage
      */
     public function toMail($notifiable)
diff --git a/app/Notifications/Frontend/Auth/UserNeedsConfirmation.php b/app/Notifications/Frontend/Auth/UserNeedsConfirmation.php
index 4d27d676..bd57e533 100755
--- a/app/Notifications/Frontend/Auth/UserNeedsConfirmation.php
+++ b/app/Notifications/Frontend/Auth/UserNeedsConfirmation.php
@@ -31,8 +31,7 @@ public function __construct($confirmation_code)
     /**
      * Get the notification's delivery channels.
      *
-     * @param mixed $notifiable
-     *
+     * @param  mixed  $notifiable
      * @return array
      */
     public function via($notifiable)
@@ -43,8 +42,7 @@ public function via($notifiable)
     /**
      * Get the mail representation of the notification.
      *
-     * @param mixed $notifiable
-     *
+     * @param  mixed  $notifiable
      * @return \Illuminate\Notifications\Messages\MailMessage
      */
     public function toMail($notifiable)
diff --git a/app/Notifications/Frontend/Auth/UserNeedsPasswordReset.php b/app/Notifications/Frontend/Auth/UserNeedsPasswordReset.php
index 0eecee4d..9e2786e2 100755
--- a/app/Notifications/Frontend/Auth/UserNeedsPasswordReset.php
+++ b/app/Notifications/Frontend/Auth/UserNeedsPasswordReset.php
@@ -33,8 +33,7 @@ public function __construct($token)
     /**
      * Get the notification's channels.
      *
-     * @param mixed $notifiable
-     *
+     * @param  mixed  $notifiable
      * @return array|string
      */
     public function via($notifiable)
@@ -45,8 +44,7 @@ public function via($notifiable)
     /**
      * Build the mail representation of the notification.
      *
-     * @param mixed $notifiable
-     *
+     * @param  mixed  $notifiable
      * @return \Illuminate\Notifications\Messages\MailMessage
      */
     public function toMail($notifiable)
diff --git a/app/Observers/User/UserObserver.php b/app/Observers/User/UserObserver.php
index c9334087..bfd9ab05 100755
--- a/app/Observers/User/UserObserver.php
+++ b/app/Observers/User/UserObserver.php
@@ -33,7 +33,7 @@ public function updated(User $user): void
     }
 
     /**
-     * @param User $user
+     * @param  User  $user
      */
     private function logPasswordHistory(User $user): void
     {
diff --git a/app/Repositories/Backend/Auth/Permission/PermissionRepository.php b/app/Repositories/Backend/Auth/Permission/PermissionRepository.php
index eb112fbd..1b1dbf68 100755
--- a/app/Repositories/Backend/Auth/Permission/PermissionRepository.php
+++ b/app/Repositories/Backend/Auth/Permission/PermissionRepository.php
@@ -42,11 +42,10 @@ public function getForDataTable()
     }
 
     /**
-     * @param array $input
+     * @param  array  $input
+     * @return bool
      *
      * @throws GeneralException
-     *
-     * @return bool
      */
     public function create(array $input)
     {
@@ -73,12 +72,11 @@ public function create(array $input)
     }
 
     /**
-     * @param Model $permission
+     * @param  Model  $permission
      * @param  $input
+     * @return bool
      *
      * @throws GeneralException
-     *
-     * @return bool
      */
     public function update($permission, array $input)
     {
@@ -104,11 +102,10 @@ public function update($permission, array $input)
     }
 
     /**
-     * @param Model $permission
+     * @param  Model  $permission
+     * @return bool
      *
      * @throws GeneralException
-     *
-     * @return bool
      */
     public function delete($permission)
     {
diff --git a/app/Repositories/Backend/Auth/PermissionRepository.php b/app/Repositories/Backend/Auth/PermissionRepository.php
index f8ba9d60..393dc680 100755
--- a/app/Repositories/Backend/Auth/PermissionRepository.php
+++ b/app/Repositories/Backend/Auth/PermissionRepository.php
@@ -34,11 +34,10 @@ public function getForDataTable()
     }
 
     /**
-     * @param array $input
+     * @param  array  $input
+     * @return bool
      *
      * @throws GeneralException
-     *
-     * @return bool
      */
     public function create(array $input)
     {
@@ -66,12 +65,11 @@ public function create(array $input)
     }
 
     /**
-     * @param Model $permission
+     * @param  Model  $permission
      * @param  $input
+     * @return bool
      *
      * @throws GeneralException
-     *
-     * @return bool
      */
     public function update($permission, array $input)
     {
@@ -97,11 +95,10 @@ public function update($permission, array $input)
     }
 
     /**
-     * @param \App\Models\Auth\Permission $permission
+     * @param  \App\Models\Auth\Permission  $permission
+     * @return bool
      *
      * @throws GeneralException
-     *
-     * @return bool
      */
     public function delete($permission)
     {
diff --git a/app/Repositories/Backend/Auth/RoleRepository.php b/app/Repositories/Backend/Auth/RoleRepository.php
index 82818e50..2049cd14 100755
--- a/app/Repositories/Backend/Auth/RoleRepository.php
+++ b/app/Repositories/Backend/Auth/RoleRepository.php
@@ -40,11 +40,11 @@ public function getForDataTable()
     }
 
     /**
-     * @param array $data
+     * @param  array  $data
+     * @return \App\Models\Auth\Role
      *
      * @throws GeneralException
      * @throws \Throwable
-     * @return \App\Models\Auth\Role
      */
     public function create(array $input)
     {
@@ -99,12 +99,12 @@ public function create(array $input)
     }
 
     /**
-     * @param \App\Models\Auth\Role  $role
-     * @param array $data
+     * @param  \App\Models\Auth\Role  $role
+     * @param  array  $data
+     * @return mixed
      *
      * @throws GeneralException
      * @throws \Throwable
-     * @return mixed
      */
     public function update(Role $role, array $input)
     {
@@ -170,7 +170,6 @@ public function update(Role $role, array $input)
 
     /**
      * @param $name
-     *
      * @return bool
      */
     protected function roleExists($name): bool
@@ -181,11 +180,10 @@ protected function roleExists($name): bool
     }
 
     /**
-     * @param \App\Models\Auth\Role $role
+     * @param  \App\Models\Auth\Role  $role
+     * @return bool
      *
      * @throws GeneralException
-     *
-     * @return bool
      */
     public function delete(Role $role)
     {
diff --git a/app/Repositories/Backend/Auth/SocialRepository.php b/app/Repositories/Backend/Auth/SocialRepository.php
index a0b5d91b..e1cbf945 100755
--- a/app/Repositories/Backend/Auth/SocialRepository.php
+++ b/app/Repositories/Backend/Auth/SocialRepository.php
@@ -15,11 +15,11 @@ class SocialRepository
     const MODEL = SocialAccount::class;
 
     /**
-     * @param \App\Models\Auth\User $user
-     * @param App\Models\Auth\SocialAccount $social
+     * @param  \App\Models\Auth\User  $user
+     * @param  App\Models\Auth\SocialAccount  $social
+     * @return bool
      *
      * @throws GeneralException
-     * @return bool
      */
     public function delete(User $user, SocialAccount $social)
     {
diff --git a/app/Repositories/Backend/Auth/UserRepository.php b/app/Repositories/Backend/Auth/UserRepository.php
index c233b8cf..f79679e7 100755
--- a/app/Repositories/Backend/Auth/UserRepository.php
+++ b/app/Repositories/Backend/Auth/UserRepository.php
@@ -31,9 +31,8 @@ class UserRepository extends BaseRepository
     const MODEL = User::class;
 
     /**
-     * @param int  $status
-     * @param bool $trashed
-     *
+     * @param  int  $status
+     * @param  bool  $trashed
      * @return mixed
      */
     public function getForDataTable($status = 1, $trashed = false)
@@ -64,11 +63,11 @@ public function getForDataTable($status = 1, $trashed = false)
     }
 
     /**
-     * @param array $data
+     * @param  array  $data
+     * @return User
      *
      * @throws \Exception
      * @throws \Throwable
-     * @return User
      */
     public function create(array $data)
     {
@@ -103,13 +102,13 @@ public function create(array $data)
     }
 
     /**
-     * @param \App\Models\Auth\User  $user
-     * @param array $data
+     * @param  \App\Models\Auth\User  $user
+     * @param  array  $data
+     * @return \App\Models\Auth\User
      *
      * @throws GeneralException
      * @throws \Exception
      * @throws \Throwable
-     * @return \App\Models\Auth\User
      */
     public function update(User $user, array $data)
     {
@@ -139,11 +138,10 @@ public function update(User $user, array $data)
     /**
      * Delete User.
      *
-     * @param App\Models\Auth\User $user
+     * @param  App\Models\Auth\User  $user
+     * @return bool
      *
      * @throws GeneralException
-     *
-     * @return bool
      */
     public function delete(User $user)
     {
@@ -161,11 +159,11 @@ public function delete(User $user)
     }
 
     /**
-     * @param \App\Models\Auth\User $user
-     * @param      $input
+     * @param  \App\Models\Auth\User  $user
+     * @param  $input
+     * @return \App\Models\Auth\User
      *
      * @throws GeneralException
-     * @return \App\Models\Auth\User
      */
     public function updatePassword(User $user, $input): User
     {
@@ -179,11 +177,11 @@ public function updatePassword(User $user, $input): User
     }
 
     /**
-     * @param \App\Models\Auth\User $user
-     * @param int $status
+     * @param  \App\Models\Auth\User  $user
+     * @param  int  $status
+     * @return \App\Models\Auth\User
      *
      * @throws GeneralException
-     * @return \App\Models\Auth\User
      */
     public function mark(User $user, $status): User
     {
@@ -210,10 +208,10 @@ public function mark(User $user, $status): User
     }
 
     /**
-     * @param \App\Models\Auth\User $user
+     * @param  \App\Models\Auth\User  $user
+     * @return \App\Models\Auth\User
      *
      * @throws GeneralException
-     * @return \App\Models\Auth\User
      */
     public function confirm(User $user): User
     {
@@ -239,10 +237,10 @@ public function confirm(User $user): User
     }
 
     /**
-     * @param \App\Models\Auth\User $user
+     * @param  \App\Models\Auth\User  $user
+     * @return \App\Models\Auth\User
      *
      * @throws GeneralException
-     * @return \App\Models\Auth\User
      */
     public function unconfirm(User $user): User
     {
@@ -273,12 +271,12 @@ public function unconfirm(User $user): User
     }
 
     /**
-     * @param \App\Models\Auth\User $user
+     * @param  \App\Models\Auth\User  $user
+     * @return \App\Models\Auth\User
      *
      * @throws GeneralException
      * @throws \Exception
      * @throws \Throwable
-     * @return \App\Models\Auth\User
      */
     public function forceDelete(User $user)
     {
@@ -302,10 +300,10 @@ public function forceDelete(User $user)
     }
 
     /**
-     * @param \App\Models\Auth\User $user
+     * @param  \App\Models\Auth\User  $user
+     * @return \App\Models\Auth\User
      *
      * @throws GeneralException
-     * @return \App\Models\Auth\User
      */
     public function restore(User $user): User
     {
@@ -324,7 +322,6 @@ public function restore(User $user): User
 
     /**
      * @param  $input
-     *
      * @return mixed
      */
     protected function createUserStub($input)
@@ -368,10 +365,9 @@ public function getUnconfirmedCount(): int
     }
 
     /**
-     * @param int    $paged
-     * @param string $orderBy
-     * @param string $sort
-     *
+     * @param  int  $paged
+     * @param  string  $orderBy
+     * @param  string  $sort
      * @return mixed
      */
     public function getActivePaginated($paged = 25, $orderBy = 'created_at', $sort = 'desc'): LengthAwarePaginator
@@ -384,10 +380,9 @@ public function getActivePaginated($paged = 25, $orderBy = 'created_at', $sort =
     }
 
     /**
-     * @param int    $paged
-     * @param string $orderBy
-     * @param string $sort
-     *
+     * @param  int  $paged
+     * @param  string  $orderBy
+     * @param  string  $sort
      * @return LengthAwarePaginator
      */
     public function getInactivePaginated($paged = 25, $orderBy = 'created_at', $sort = 'desc'): LengthAwarePaginator
@@ -400,10 +395,9 @@ public function getInactivePaginated($paged = 25, $orderBy = 'created_at', $sort
     }
 
     /**
-     * @param int    $paged
-     * @param string $orderBy
-     * @param string $sort
-     *
+     * @param  int  $paged
+     * @param  string  $orderBy
+     * @param  string  $sort
      * @return LengthAwarePaginator
      */
     public function getDeletedPaginated($paged = 25, $orderBy = 'created_at', $sort = 'desc'): LengthAwarePaginator
diff --git a/app/Repositories/Backend/BlogCategoriesRepository.php b/app/Repositories/Backend/BlogCategoriesRepository.php
index c30cdb97..191305c6 100755
--- a/app/Repositories/Backend/BlogCategoriesRepository.php
+++ b/app/Repositories/Backend/BlogCategoriesRepository.php
@@ -33,6 +33,7 @@ class BlogCategoriesRepository extends BaseRepository
      * Retrieve List.
      *
      * @var array
+     *
      * @return Collection
      */
     public function retrieveList(array $options = [])
@@ -71,11 +72,10 @@ public function getForDataTable()
     }
 
     /**
-     * @param array $input
+     * @param  array  $input
+     * @return bool
      *
      * @throws \App\Exceptions\GeneralException
-     *
-     * @return bool
      */
     public function create(array $input)
     {
@@ -96,7 +96,7 @@ public function create(array $input)
     }
 
     /**
-     * @param \App\Models\BlogCategory $blogcategory
+     * @param  \App\Models\BlogCategory  $blogcategory
      * @param  $input
      *
      * @throws \App\Exceptions\GeneralException
@@ -122,11 +122,10 @@ public function update(BlogCategory $blogcategory, array $input)
     }
 
     /**
-     * @param \App\Models\BlogCategory $blogcategory
+     * @param  \App\Models\BlogCategory  $blogcategory
+     * @return bool
      *
      * @throws \App\Exceptions\GeneralException
-     *
-     * @return bool
      */
     public function delete(BlogCategory $blogcategory)
     {
diff --git a/app/Repositories/Backend/BlogTagsRepository.php b/app/Repositories/Backend/BlogTagsRepository.php
index 4f9966b2..39b377b9 100755
--- a/app/Repositories/Backend/BlogTagsRepository.php
+++ b/app/Repositories/Backend/BlogTagsRepository.php
@@ -33,6 +33,7 @@ class BlogTagsRepository extends BaseRepository
      * Retrieve List.
      *
      * @var array
+     *
      * @return Collection
      */
     public function retrieveList(array $options = [])
@@ -71,11 +72,10 @@ public function getForDataTable()
     }
 
     /**
-     * @param array $input
+     * @param  array  $input
+     * @return bool
      *
      * @throws \App\Exceptions\GeneralException
-     *
-     * @return bool
      */
     public function create(array $input)
     {
@@ -96,7 +96,7 @@ public function create(array $input)
     }
 
     /**
-     * @param \App\Models\BlogTag $blogtag
+     * @param  \App\Models\BlogTag  $blogtag
      * @param  $input
      *
      * @throws \App\Exceptions\GeneralException
@@ -122,11 +122,10 @@ public function update(BlogTag $blogtag, array $input)
     }
 
     /**
-     * @param \App\Models\BlogTag $blogtag
+     * @param  \App\Models\BlogTag  $blogtag
+     * @return bool
      *
      * @throws \App\Exceptions\GeneralException
-     *
-     * @return bool
      */
     public function delete(BlogTag $blogtag)
     {
diff --git a/app/Repositories/Backend/BlogsRepository.php b/app/Repositories/Backend/BlogsRepository.php
index 9d29b002..32d8c1c9 100755
--- a/app/Repositories/Backend/BlogsRepository.php
+++ b/app/Repositories/Backend/BlogsRepository.php
@@ -60,6 +60,7 @@ public function __construct()
      * Retrieve List.
      *
      * @var array
+     *
      * @return Collection
      */
     public function retrieveList(array $options = [])
@@ -100,11 +101,10 @@ public function getForDataTable()
     }
 
     /**
-     * @param array $input
+     * @param  array  $input
+     * @return bool
      *
      * @throws \App\Exceptions\GeneralException
-     *
-     * @return bool
      */
     public function create(array $input)
     {
@@ -141,8 +141,8 @@ public function create(array $input)
     }
 
     /**
-     * @param \App\Models\Blog $blog
-     * @param array $input
+     * @param  \App\Models\Blog  $blog
+     * @param  array  $input
      */
     public function update(Blog $blog, array $input)
     {
@@ -185,8 +185,7 @@ public function update(Blog $blog, array $input)
     /**
      * Creating Tags.
      *
-     * @param array $tags
-     *
+     * @param  array  $tags
      * @return array
      */
     public function createTags($tags)
@@ -218,8 +217,7 @@ public function createTags($tags)
     /**
      * Creating Categories.
      *
-     * @param array $categories
-     *
+     * @param  array  $categories
      * @return array
      */
     public function createCategories($categories)
@@ -250,11 +248,10 @@ public function createCategories($categories)
     }
 
     /**
-     * @param \App\Models\Blogs\Blog $blog
+     * @param  \App\Models\Blogs\Blog  $blog
+     * @return bool
      *
      * @throws GeneralException
-     *
-     * @return bool
      */
     public function delete(Blog $blog)
     {
@@ -275,8 +272,7 @@ public function delete(Blog $blog)
     /**
      * Upload Image.
      *
-     * @param array $input
-     *
+     * @param  array  $input
      * @return array $input
      */
     public function uploadImage($input)
@@ -296,7 +292,7 @@ public function uploadImage($input)
     /**
      * Destroy Old Image.
      *
-     * @param int $id
+     * @param  int  $id
      */
     public function deleteOldFile($model)
     {
diff --git a/app/Repositories/Backend/EmailTemplatesRepository.php b/app/Repositories/Backend/EmailTemplatesRepository.php
index e75a36ee..99e2a79c 100755
--- a/app/Repositories/Backend/EmailTemplatesRepository.php
+++ b/app/Repositories/Backend/EmailTemplatesRepository.php
@@ -18,10 +18,9 @@ class EmailTemplatesRepository extends BaseRepository
     const MODEL = EmailTemplate::class;
 
     /**
-     * @param int    $paged
-     * @param string $orderBy
-     * @param string $sort
-     *
+     * @param  int  $paged
+     * @param  string  $orderBy
+     * @param  string  $sort
      * @return mixed
      */
     public function getActivePaginated($paged = 25, $orderBy = 'created_at', $sort = 'desc')
@@ -57,11 +56,10 @@ public function getForDataTable()
     }
 
     /**
-     * @param array $input
+     * @param  array  $input
+     * @return bool
      *
      * @throws \App\Exceptions\GeneralException
-     *
-     * @return bool
      */
     public function create(array $input)
     {
@@ -79,8 +77,8 @@ public function create(array $input)
     }
 
     /**
-     * @param \App\Models\EmailTemplate $emailTemplate
-     * @param array $input
+     * @param  \App\Models\EmailTemplate  $emailTemplate
+     * @param  array  $input
      */
     public function update(EmailTemplate $emailTemplate, array $input)
     {
@@ -97,11 +95,10 @@ public function update(EmailTemplate $emailTemplate, array $input)
     }
 
     /**
-     * @param \App\Models\EmailTemplate $emailTemplate
+     * @param  \App\Models\EmailTemplate  $emailTemplate
+     * @return bool
      *
      * @throws GeneralException
-     *
-     * @return bool
      */
     public function delete(EmailTemplate $emailTemplate)
     {
diff --git a/app/Repositories/Backend/FaqsRepository.php b/app/Repositories/Backend/FaqsRepository.php
index cb6a263f..bd63f14f 100755
--- a/app/Repositories/Backend/FaqsRepository.php
+++ b/app/Repositories/Backend/FaqsRepository.php
@@ -34,6 +34,7 @@ class FaqsRepository extends BaseRepository
      * Retrieve List.
      *
      * @var array
+     *
      * @return Collection
      */
     public function retrieveList(array $options = [])
@@ -67,11 +68,10 @@ public function getForDataTable()
     }
 
     /**
-     * @param array $input
+     * @param  array  $input
+     * @return bool
      *
      * @throws \App\Exceptions\GeneralException
-     *
-     * @return bool
      */
     public function create(array $input)
     {
@@ -88,8 +88,8 @@ public function create(array $input)
     }
 
     /**
-     * @param \App\Models\Faq $faq
-     * @param array $input
+     * @param  \App\Models\Faq  $faq
+     * @param  array  $input
      */
     public function update(Faq $faq, array $input)
     {
@@ -106,11 +106,10 @@ public function update(Faq $faq, array $input)
     }
 
     /**
-     * @param \App\Models\Faq $faq
+     * @param  \App\Models\Faq  $faq
+     * @return bool
      *
      * @throws GeneralException
-     *
-     * @return bool
      */
     public function delete(Faq $faq)
     {
diff --git a/app/Repositories/Backend/PagesRepository.php b/app/Repositories/Backend/PagesRepository.php
index 2c40a81a..868e4b26 100755
--- a/app/Repositories/Backend/PagesRepository.php
+++ b/app/Repositories/Backend/PagesRepository.php
@@ -37,6 +37,7 @@ class PagesRepository extends BaseRepository
      * Retrieve List.
      *
      * @var array
+     *
      * @return Collection
      */
     public function retrieveList(array $options = [])
@@ -75,11 +76,10 @@ public function getForDataTable()
     }
 
     /**
-     * @param array $input
+     * @param  array  $input
+     * @return bool
      *
      * @throws \App\Exceptions\GeneralException
-     *
-     * @return bool
      */
     public function create(array $input)
     {
@@ -103,8 +103,8 @@ public function create(array $input)
     /**
      * Update Page.
      *
-     * @param \App\Models\Page $page
-     * @param array $input
+     * @param  \App\Models\Page  $page
+     * @param  array  $input
      */
     public function update(Page $page, array $input)
     {
@@ -128,11 +128,10 @@ public function update(Page $page, array $input)
     }
 
     /**
-     * @param \App\Models\Page $page
+     * @param  \App\Models\Page  $page
+     * @return bool
      *
      * @throws GeneralException
-     *
-     * @return bool
      */
     public function delete(Page $page)
     {
diff --git a/app/Repositories/BaseRepository.php b/app/Repositories/BaseRepository.php
index cff99827..452cd4fc 100755
--- a/app/Repositories/BaseRepository.php
+++ b/app/Repositories/BaseRepository.php
@@ -16,10 +16,9 @@ public function getAll()
      * Get Paginated.
      *
      * @param $per_page
-     * @param string $active
-     * @param string $order_by
-     * @param string $sort
-     *
+     * @param  string  $active
+     * @param  string  $order_by
+     * @param  string  $sort
      * @return mixed
      */
     public function getPaginated($per_page, $active = '', $order_by = 'id', $sort = 'asc')
@@ -44,7 +43,6 @@ public function getCount()
 
     /**
      * @param $id
-     *
      * @return mixed
      */
     public function find($id)
@@ -55,9 +53,8 @@ public function find($id)
     /**
      * Find Record based on specific column.
      *
-     * @param string $value
-     * @param string $column_name
-     *
+     * @param  string  $value
+     * @param  string  $column_name
      * @return mixed
      */
     public function getByColumn($value, $column_name = 'id')
@@ -76,8 +73,7 @@ public function query()
     /**
      * Generate drop-down select data with basic IDs.
      *
-     * @param string $field_name
-     *
+     * @param  string  $field_name
      * @return array
      */
     public function getSelectData($field_name = 'name')
diff --git a/app/Repositories/Frontend/Auth/UserRepository.php b/app/Repositories/Frontend/Auth/UserRepository.php
index 79b29bcf..1a6a607e 100755
--- a/app/Repositories/Frontend/Auth/UserRepository.php
+++ b/app/Repositories/Frontend/Auth/UserRepository.php
@@ -26,11 +26,11 @@ class UserRepository extends BaseRepository
     const MODEL = User::class;
 
     /**
-     * @param      $input
-     * @param bool $expired
+     * @param  $input
+     * @param  bool  $expired
+     * @return bool
      *
      * @throws GeneralException
-     * @return bool
      */
     public function updatePassword($input, $expired = false)
     {
@@ -49,11 +49,11 @@ public function updatePassword($input, $expired = false)
 
     /**
      * @param \App\Models\Auth\User;
-     * @param array $input
-     * @param bool|UploadedFile  $image
+     * @param  array  $input
+     * @param  bool|UploadedFile  $image
+     * @return array|bool
      *
      * @throws GeneralException
-     * @return array|bool
      */
     public function update(User $user, array $input, $image = false)
     {
@@ -111,11 +111,11 @@ public function update(User $user, array $input, $image = false)
     }
 
     /**
-     * @param array $data
+     * @param  array  $data
+     * @return \Illuminate\Database\Eloquent\Model|mixed
      *
      * @throws \Exception
      * @throws \Throwable
-     * @return \Illuminate\Database\Eloquent\Model|mixed
      */
     public function create(array $data)
     {
@@ -148,7 +148,6 @@ public function create(array $data)
 
     /**
      * @param  $input
-     *
      * @return mixed
      */
     protected function createUserStub($input)
@@ -167,9 +166,9 @@ protected function createUserStub($input)
 
     /**
      * @param $code
+     * @return bool
      *
      * @throws GeneralException
-     * @return bool
      */
     public function confirm($code)
     {
@@ -192,9 +191,9 @@ public function confirm($code)
 
     /**
      * @param $code
+     * @return mixed
      *
      * @throws GeneralException
-     * @return mixed
      */
     public function findByConfirmationCode($code)
     {
@@ -211,7 +210,6 @@ public function findByConfirmationCode($code)
 
     /**
      * @param $token
-     *
      * @return bool|\Illuminate\Database\Eloquent\Model
      */
     public function findByPasswordResetToken($token)
@@ -227,9 +225,9 @@ public function findByPasswordResetToken($token)
 
     /**
      * @param $uuid
+     * @return mixed
      *
      * @throws GeneralException
-     * @return mixed
      */
     public function findByUuid($uuid)
     {
@@ -247,9 +245,9 @@ public function findByUuid($uuid)
     /**
      * @param $data
      * @param $provider
+     * @return mixed
      *
      * @throws GeneralException
-     * @return mixed
      */
     public function findOrCreateProvider($data, $provider)
     {
@@ -317,7 +315,6 @@ public function findOrCreateProvider($data, $provider)
 
     /**
      * @param $fullName
-     *
      * @return array
      */
     protected function getNameParts($fullName)
diff --git a/app/Services/Access.php b/app/Services/Access.php
index 00e8fb8c..275aefd9 100755
--- a/app/Services/Access.php
+++ b/app/Services/Access.php
@@ -44,8 +44,8 @@ public function id()
     }
 
     /**
-     * @param Authenticatable $user
-     * @param bool            $remember
+     * @param  Authenticatable  $user
+     * @param  bool  $remember
      */
     public function login(Authenticatable $user, $remember = false)
     {
@@ -54,7 +54,6 @@ public function login(Authenticatable $user, $remember = false)
 
     /**
      * @param $id
-     *
      * @return mixed
      */
     public function loginUsingId($id)
@@ -65,8 +64,7 @@ public function loginUsingId($id)
     /**
      * Checks if the current user has a Role by its name or id.
      *
-     * @param string $role Role name.
-     *
+     * @param  string  $role  Role name.
      * @return bool
      */
     public function hasRole($role)
@@ -82,8 +80,7 @@ public function hasRole($role)
      * Checks if the user has either one or more, or all of an array of roles.
      *
      * @param  $roles
-     * @param bool $needsAll
-     *
+     * @param  bool  $needsAll
      * @return bool
      */
     public function hasRoles($roles, $needsAll = false)
@@ -98,8 +95,7 @@ public function hasRoles($roles, $needsAll = false)
     /**
      * Check if the current user has a permission by its name or id.
      *
-     * @param string $permission Permission name or id.
-     *
+     * @param  string  $permission  Permission name or id.
      * @return bool
      */
     public function allow($permission)
@@ -116,7 +112,6 @@ public function allow($permission)
      *
      * @param  $permissions
      * @param  $needsAll
-     *
      * @return bool
      */
     public function allowMultiple($permissions, $needsAll = false)
@@ -130,7 +125,6 @@ public function allowMultiple($permissions, $needsAll = false)
 
     /**
      * @param  $permission
-     *
      * @return bool
      */
     public function hasPermission($permission)
@@ -141,7 +135,6 @@ public function hasPermission($permission)
     /**
      * @param  $permissions
      * @param  $needsAll
-     *
      * @return bool
      */
     public function hasPermissions($permissions, $needsAll = false)
diff --git a/database/seeds/Auth/RoleTableSeeder.php b/database/seeds/Auth/RoleTableSeeder.php
index b02b3c04..99812ce4 100755
--- a/database/seeds/Auth/RoleTableSeeder.php
+++ b/database/seeds/Auth/RoleTableSeeder.php
@@ -1,6 +1,6 @@
 <?php
 
-use Carbon\Carbon as Carbon;
+use Carbon\Carbon;
 use Database\DisableForeignKeys;
 use Database\TruncateTable;
 use Illuminate\Database\Seeder;
diff --git a/database/seeds/Auth/UserTableSeeder.php b/database/seeds/Auth/UserTableSeeder.php
index f780116c..8d3c1201 100755
--- a/database/seeds/Auth/UserTableSeeder.php
+++ b/database/seeds/Auth/UserTableSeeder.php
@@ -1,7 +1,7 @@
 <?php
 
 use App\Models\Auth\User;
-use Carbon\Carbon as Carbon;
+use Carbon\Carbon;
 use Database\DisableForeignKeys;
 use Database\TruncateTable;
 use Illuminate\Database\Seeder;
diff --git a/database/seeds/Traits/TruncateTable.php b/database/seeds/Traits/TruncateTable.php
index 668dc36b..a823d123 100755
--- a/database/seeds/Traits/TruncateTable.php
+++ b/database/seeds/Traits/TruncateTable.php
@@ -11,7 +11,6 @@ trait TruncateTable
 {
     /**
      * @param $table
-     *
      * @return bool
      */
     protected function truncate($table)
@@ -31,7 +30,7 @@ protected function truncate($table)
     }
 
     /**
-     * @param array $tables
+     * @param  array  $tables
      */
     protected function truncateMultiple(array $tables)
     {
diff --git a/package-lock.json b/package-lock.json
old mode 100755
new mode 100644
index e146361c..9855abd8
--- a/package-lock.json
+++ b/package-lock.json
@@ -3267,47 +3267,6 @@
             "integrity": "sha512-40rZaf3bUNKTVYu9sIeeEGOg7g14Yvnj9kH7b50EiwX0Q7A6umbvfI5tvHaOERH0XigqKkfLkFQxzb4e6CIXnA==",
             "dev": true
         },
-        "body-parser": {
-            "version": "1.19.0",
-            "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz",
-            "integrity": "sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==",
-            "dev": true,
-            "requires": {
-                "bytes": "3.1.0",
-                "content-type": "~1.0.4",
-                "debug": "2.6.9",
-                "depd": "~1.1.2",
-                "http-errors": "1.7.2",
-                "iconv-lite": "0.4.24",
-                "on-finished": "~2.3.0",
-                "qs": "6.7.0",
-                "raw-body": "2.4.0",
-                "type-is": "~1.6.17"
-            },
-            "dependencies": {
-                "bytes": {
-                    "version": "3.1.0",
-                    "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
-                    "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
-                    "dev": true
-                },
-                "debug": {
-                    "version": "2.6.9",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-                    "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-                    "dev": true,
-                    "requires": {
-                        "ms": "2.0.0"
-                    }
-                },
-                "qs": {
-                    "version": "6.7.0",
-                    "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
-                    "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
-                    "dev": true
-                }
-            }
-        },
         "bonjour": {
             "version": "3.5.0",
             "resolved": "https://registry.npmjs.org/bonjour/-/bonjour-3.5.0.tgz",
@@ -3622,6 +3581,16 @@
                 "unset-value": "^1.0.0"
             }
         },
+        "call-bind": {
+            "version": "1.0.2",
+            "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
+            "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+            "dev": true,
+            "requires": {
+                "function-bind": "^1.1.1",
+                "get-intrinsic": "^1.0.2"
+            }
+        },
         "call-me-maybe": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/call-me-maybe/-/call-me-maybe-1.0.1.tgz",
@@ -4096,15 +4065,6 @@
             "integrity": "sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=",
             "dev": true
         },
-        "content-disposition": {
-            "version": "0.5.3",
-            "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz",
-            "integrity": "sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==",
-            "dev": true,
-            "requires": {
-                "safe-buffer": "5.1.2"
-            }
-        },
         "content-type": {
             "version": "1.0.4",
             "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
@@ -4120,12 +4080,6 @@
                 "safe-buffer": "~5.1.1"
             }
         },
-        "cookie": {
-            "version": "0.4.0",
-            "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
-            "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==",
-            "dev": true
-        },
         "cookie-signature": {
             "version": "1.0.6",
             "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
@@ -4897,12 +4851,6 @@
                 "minimalistic-assert": "^1.0.0"
             }
         },
-        "destroy": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
-            "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=",
-            "dev": true
-        },
         "detect-file": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz",
@@ -5519,47 +5467,99 @@
             }
         },
         "express": {
-            "version": "4.17.1",
-            "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz",
-            "integrity": "sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==",
+            "version": "4.18.2",
+            "resolved": "https://registry.npmjs.org/express/-/express-4.18.2.tgz",
+            "integrity": "sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==",
             "dev": true,
             "requires": {
-                "accepts": "~1.3.7",
+                "accepts": "~1.3.8",
                 "array-flatten": "1.1.1",
-                "body-parser": "1.19.0",
-                "content-disposition": "0.5.3",
+                "body-parser": "1.20.1",
+                "content-disposition": "0.5.4",
                 "content-type": "~1.0.4",
-                "cookie": "0.4.0",
+                "cookie": "0.5.0",
                 "cookie-signature": "1.0.6",
                 "debug": "2.6.9",
-                "depd": "~1.1.2",
+                "depd": "2.0.0",
                 "encodeurl": "~1.0.2",
                 "escape-html": "~1.0.3",
                 "etag": "~1.8.1",
-                "finalhandler": "~1.1.2",
+                "finalhandler": "1.2.0",
                 "fresh": "0.5.2",
+                "http-errors": "2.0.0",
                 "merge-descriptors": "1.0.1",
                 "methods": "~1.1.2",
-                "on-finished": "~2.3.0",
+                "on-finished": "2.4.1",
                 "parseurl": "~1.3.3",
                 "path-to-regexp": "0.1.7",
-                "proxy-addr": "~2.0.5",
-                "qs": "6.7.0",
+                "proxy-addr": "~2.0.7",
+                "qs": "6.11.0",
                 "range-parser": "~1.2.1",
-                "safe-buffer": "5.1.2",
-                "send": "0.17.1",
-                "serve-static": "1.14.1",
-                "setprototypeof": "1.1.1",
-                "statuses": "~1.5.0",
+                "safe-buffer": "5.2.1",
+                "send": "0.18.0",
+                "serve-static": "1.15.0",
+                "setprototypeof": "1.2.0",
+                "statuses": "2.0.1",
                 "type-is": "~1.6.18",
                 "utils-merge": "1.0.1",
                 "vary": "~1.1.2"
             },
             "dependencies": {
+                "accepts": {
+                    "version": "1.3.8",
+                    "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
+                    "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==",
+                    "dev": true,
+                    "requires": {
+                        "mime-types": "~2.1.34",
+                        "negotiator": "0.6.3"
+                    }
+                },
                 "array-flatten": {
                     "version": "1.1.1",
                     "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-                    "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=",
+                    "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==",
+                    "dev": true
+                },
+                "body-parser": {
+                    "version": "1.20.1",
+                    "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.1.tgz",
+                    "integrity": "sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==",
+                    "dev": true,
+                    "requires": {
+                        "bytes": "3.1.2",
+                        "content-type": "~1.0.4",
+                        "debug": "2.6.9",
+                        "depd": "2.0.0",
+                        "destroy": "1.2.0",
+                        "http-errors": "2.0.0",
+                        "iconv-lite": "0.4.24",
+                        "on-finished": "2.4.1",
+                        "qs": "6.11.0",
+                        "raw-body": "2.5.1",
+                        "type-is": "~1.6.18",
+                        "unpipe": "1.0.0"
+                    }
+                },
+                "bytes": {
+                    "version": "3.1.2",
+                    "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
+                    "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==",
+                    "dev": true
+                },
+                "content-disposition": {
+                    "version": "0.5.4",
+                    "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
+                    "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
+                    "dev": true,
+                    "requires": {
+                        "safe-buffer": "5.2.1"
+                    }
+                },
+                "cookie": {
+                    "version": "0.5.0",
+                    "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz",
+                    "integrity": "sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==",
                     "dev": true
                 },
                 "debug": {
@@ -5571,10 +5571,176 @@
                         "ms": "2.0.0"
                     }
                 },
+                "depd": {
+                    "version": "2.0.0",
+                    "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+                    "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
+                    "dev": true
+                },
+                "destroy": {
+                    "version": "1.2.0",
+                    "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+                    "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
+                    "dev": true
+                },
+                "finalhandler": {
+                    "version": "1.2.0",
+                    "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz",
+                    "integrity": "sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==",
+                    "dev": true,
+                    "requires": {
+                        "debug": "2.6.9",
+                        "encodeurl": "~1.0.2",
+                        "escape-html": "~1.0.3",
+                        "on-finished": "2.4.1",
+                        "parseurl": "~1.3.3",
+                        "statuses": "2.0.1",
+                        "unpipe": "~1.0.0"
+                    }
+                },
+                "forwarded": {
+                    "version": "0.2.0",
+                    "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
+                    "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
+                    "dev": true
+                },
+                "http-errors": {
+                    "version": "2.0.0",
+                    "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+                    "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+                    "dev": true,
+                    "requires": {
+                        "depd": "2.0.0",
+                        "inherits": "2.0.4",
+                        "setprototypeof": "1.2.0",
+                        "statuses": "2.0.1",
+                        "toidentifier": "1.0.1"
+                    }
+                },
+                "mime-db": {
+                    "version": "1.52.0",
+                    "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+                    "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+                    "dev": true
+                },
+                "mime-types": {
+                    "version": "2.1.35",
+                    "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+                    "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+                    "dev": true,
+                    "requires": {
+                        "mime-db": "1.52.0"
+                    }
+                },
+                "negotiator": {
+                    "version": "0.6.3",
+                    "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+                    "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+                    "dev": true
+                },
+                "on-finished": {
+                    "version": "2.4.1",
+                    "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+                    "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+                    "dev": true,
+                    "requires": {
+                        "ee-first": "1.1.1"
+                    }
+                },
+                "proxy-addr": {
+                    "version": "2.0.7",
+                    "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
+                    "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
+                    "dev": true,
+                    "requires": {
+                        "forwarded": "0.2.0",
+                        "ipaddr.js": "1.9.1"
+                    }
+                },
                 "qs": {
-                    "version": "6.7.0",
-                    "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
-                    "integrity": "sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==",
+                    "version": "6.11.0",
+                    "resolved": "https://registry.npmjs.org/qs/-/qs-6.11.0.tgz",
+                    "integrity": "sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==",
+                    "dev": true,
+                    "requires": {
+                        "side-channel": "^1.0.4"
+                    }
+                },
+                "raw-body": {
+                    "version": "2.5.1",
+                    "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.1.tgz",
+                    "integrity": "sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==",
+                    "dev": true,
+                    "requires": {
+                        "bytes": "3.1.2",
+                        "http-errors": "2.0.0",
+                        "iconv-lite": "0.4.24",
+                        "unpipe": "1.0.0"
+                    }
+                },
+                "safe-buffer": {
+                    "version": "5.2.1",
+                    "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz",
+                    "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==",
+                    "dev": true
+                },
+                "send": {
+                    "version": "0.18.0",
+                    "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+                    "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
+                    "dev": true,
+                    "requires": {
+                        "debug": "2.6.9",
+                        "depd": "2.0.0",
+                        "destroy": "1.2.0",
+                        "encodeurl": "~1.0.2",
+                        "escape-html": "~1.0.3",
+                        "etag": "~1.8.1",
+                        "fresh": "0.5.2",
+                        "http-errors": "2.0.0",
+                        "mime": "1.6.0",
+                        "ms": "2.1.3",
+                        "on-finished": "2.4.1",
+                        "range-parser": "~1.2.1",
+                        "statuses": "2.0.1"
+                    },
+                    "dependencies": {
+                        "ms": {
+                            "version": "2.1.3",
+                            "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+                            "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+                            "dev": true
+                        }
+                    }
+                },
+                "serve-static": {
+                    "version": "1.15.0",
+                    "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz",
+                    "integrity": "sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==",
+                    "dev": true,
+                    "requires": {
+                        "encodeurl": "~1.0.2",
+                        "escape-html": "~1.0.3",
+                        "parseurl": "~1.3.3",
+                        "send": "0.18.0"
+                    }
+                },
+                "setprototypeof": {
+                    "version": "1.2.0",
+                    "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
+                    "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
+                    "dev": true
+                },
+                "statuses": {
+                    "version": "2.0.1",
+                    "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+                    "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+                    "dev": true
+                },
+                "toidentifier": {
+                    "version": "1.0.1",
+                    "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
+                    "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
                     "dev": true
                 }
             }
@@ -5822,32 +5988,6 @@
                 "to-regex-range": "^2.1.0"
             }
         },
-        "finalhandler": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
-            "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
-            "dev": true,
-            "requires": {
-                "debug": "2.6.9",
-                "encodeurl": "~1.0.2",
-                "escape-html": "~1.0.3",
-                "on-finished": "~2.3.0",
-                "parseurl": "~1.3.3",
-                "statuses": "~1.5.0",
-                "unpipe": "~1.0.0"
-            },
-            "dependencies": {
-                "debug": {
-                    "version": "2.6.9",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-                    "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-                    "dev": true,
-                    "requires": {
-                        "ms": "2.0.0"
-                    }
-                }
-            }
-        },
         "find-babel-config": {
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/find-babel-config/-/find-babel-config-1.2.0.tgz",
@@ -5940,12 +6080,6 @@
                 "mime-types": "^2.1.12"
             }
         },
-        "forwarded": {
-            "version": "0.1.2",
-            "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz",
-            "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=",
-            "dev": true
-        },
         "fragment-cache": {
             "version": "0.2.1",
             "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
@@ -6103,6 +6237,25 @@
             "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
             "dev": true
         },
+        "get-intrinsic": {
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.3.tgz",
+            "integrity": "sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==",
+            "dev": true,
+            "requires": {
+                "function-bind": "^1.1.1",
+                "has": "^1.0.3",
+                "has-symbols": "^1.0.3"
+            },
+            "dependencies": {
+                "has-symbols": {
+                    "version": "1.0.3",
+                    "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz",
+                    "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==",
+                    "dev": true
+                }
+            }
+        },
         "get-stream": {
             "version": "4.1.0",
             "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
@@ -6530,27 +6683,6 @@
             "integrity": "sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=",
             "dev": true
         },
-        "http-errors": {
-            "version": "1.7.2",
-            "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
-            "integrity": "sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==",
-            "dev": true,
-            "requires": {
-                "depd": "~1.1.2",
-                "inherits": "2.0.3",
-                "setprototypeof": "1.1.1",
-                "statuses": ">= 1.5.0 < 2",
-                "toidentifier": "1.0.0"
-            },
-            "dependencies": {
-                "inherits": {
-                    "version": "2.0.3",
-                    "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-                    "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
-                    "dev": true
-                }
-            }
-        },
         "http-proxy": {
             "version": "1.18.1",
             "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
@@ -8962,15 +9094,6 @@
             "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==",
             "dev": true
         },
-        "on-finished": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-            "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
-            "dev": true,
-            "requires": {
-                "ee-first": "1.1.1"
-            }
-        },
         "on-headers": {
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
@@ -10176,16 +10299,6 @@
             "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=",
             "dev": true
         },
-        "proxy-addr": {
-            "version": "2.0.6",
-            "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz",
-            "integrity": "sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==",
-            "dev": true,
-            "requires": {
-                "forwarded": "~0.1.2",
-                "ipaddr.js": "1.9.1"
-            }
-        },
         "prr": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
@@ -10320,26 +10433,6 @@
             "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==",
             "dev": true
         },
-        "raw-body": {
-            "version": "2.4.0",
-            "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz",
-            "integrity": "sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==",
-            "dev": true,
-            "requires": {
-                "bytes": "3.1.0",
-                "http-errors": "1.7.2",
-                "iconv-lite": "0.4.24",
-                "unpipe": "1.0.0"
-            },
-            "dependencies": {
-                "bytes": {
-                    "version": "3.1.0",
-                    "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz",
-                    "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==",
-                    "dev": true
-                }
-            }
-        },
         "react-is": {
             "version": "16.13.1",
             "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
@@ -10958,52 +11051,6 @@
             "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
             "dev": true
         },
-        "send": {
-            "version": "0.17.1",
-            "resolved": "https://registry.npmjs.org/send/-/send-0.17.1.tgz",
-            "integrity": "sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==",
-            "dev": true,
-            "requires": {
-                "debug": "2.6.9",
-                "depd": "~1.1.2",
-                "destroy": "~1.0.4",
-                "encodeurl": "~1.0.2",
-                "escape-html": "~1.0.3",
-                "etag": "~1.8.1",
-                "fresh": "0.5.2",
-                "http-errors": "~1.7.2",
-                "mime": "1.6.0",
-                "ms": "2.1.1",
-                "on-finished": "~2.3.0",
-                "range-parser": "~1.2.1",
-                "statuses": "~1.5.0"
-            },
-            "dependencies": {
-                "debug": {
-                    "version": "2.6.9",
-                    "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-                    "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-                    "dev": true,
-                    "requires": {
-                        "ms": "2.0.0"
-                    },
-                    "dependencies": {
-                        "ms": {
-                            "version": "2.0.0",
-                            "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-                            "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
-                            "dev": true
-                        }
-                    }
-                },
-                "ms": {
-                    "version": "2.1.1",
-                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
-                    "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
-                    "dev": true
-                }
-            }
-        },
         "serialize-javascript": {
             "version": "3.1.0",
             "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-3.1.0.tgz",
@@ -11063,18 +11110,6 @@
                 }
             }
         },
-        "serve-static": {
-            "version": "1.14.1",
-            "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz",
-            "integrity": "sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==",
-            "dev": true,
-            "requires": {
-                "encodeurl": "~1.0.2",
-                "escape-html": "~1.0.3",
-                "parseurl": "~1.3.3",
-                "send": "0.17.1"
-            }
-        },
         "set-blocking": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
@@ -11099,12 +11134,6 @@
             "integrity": "sha1-KQy7Iy4waULX1+qbg3Mqt4VvgoU=",
             "dev": true
         },
-        "setprototypeof": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz",
-            "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==",
-            "dev": true
-        },
         "sha.js": {
             "version": "2.4.11",
             "resolved": "https://registry.npmjs.org/sha.js/-/sha.js-2.4.11.tgz",
@@ -11153,6 +11182,25 @@
             "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==",
             "dev": true
         },
+        "side-channel": {
+            "version": "1.0.4",
+            "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz",
+            "integrity": "sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==",
+            "dev": true,
+            "requires": {
+                "call-bind": "^1.0.0",
+                "get-intrinsic": "^1.0.2",
+                "object-inspect": "^1.9.0"
+            },
+            "dependencies": {
+                "object-inspect": {
+                    "version": "1.12.2",
+                    "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
+                    "integrity": "sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==",
+                    "dev": true
+                }
+            }
+        },
         "sigmund": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
@@ -12162,12 +12210,6 @@
                 "repeat-string": "^1.6.1"
             }
         },
-        "toidentifier": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz",
-            "integrity": "sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==",
-            "dev": true
-        },
         "tough-cookie": {
             "version": "2.5.0",
             "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz",
diff --git a/tests/Feature/Frontend/UpdateUserAccountTest.php b/tests/Feature/Frontend/UpdateUserAccountTest.php
index 7eb61e0d..b1298bf5 100755
--- a/tests/Feature/Frontend/UpdateUserAccountTest.php
+++ b/tests/Feature/Frontend/UpdateUserAccountTest.php
@@ -16,7 +16,8 @@ class UpdateUserAccountTest extends TestCase
 
     /**
      * helper method for valid user data with option to override.
-     * @param array $userData
+     *
+     * @param  array  $userData
      * @return array
      */
     protected function getValidUserData($userData = [])
diff --git a/tests/Feature/Frontend/UserRegistrationTest.php b/tests/Feature/Frontend/UserRegistrationTest.php
index c822e3f3..592e3da3 100755
--- a/tests/Feature/Frontend/UserRegistrationTest.php
+++ b/tests/Feature/Frontend/UserRegistrationTest.php
@@ -21,7 +21,8 @@ class UserRegistrationTest extends TestCase
 
     /**
      * Helper function for registering a user.
-     * @param array $userData
+     *
+     * @param  array  $userData
      * @return \Illuminate\Foundation\Testing\TestResponse
      */
     protected function registerUser($userData = [], $roleData = [])
diff --git a/tests/TestCase.php b/tests/TestCase.php
index 14f82a60..fb748f63 100755
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -46,8 +46,7 @@ protected function getAdminRole()
     /**
      * Create an administrator.
      *
-     * @param array $attributes
-     *
+     * @param  array  $attributes
      * @return mixed
      */
     protected function createAdmin(array $attributes = [])
@@ -62,8 +61,7 @@ protected function createAdmin(array $attributes = [])
     /**
      * Login the given administrator or create the first if none supplied.
      *
-     * @param bool $admin
-     *
+     * @param  bool  $admin
      * @return bool|mixed
      */
     protected function loginAsAdmin($admin = false)
diff --git a/tests/Unit/UserRepositoryTest.php b/tests/Unit/UserRepositoryTest.php
index 3ebb177c..498609dc 100755
--- a/tests/Unit/UserRepositoryTest.php
+++ b/tests/Unit/UserRepositoryTest.php
@@ -447,8 +447,8 @@ public function getForDataTable_will_provide_active_users_for_datatable()
     {
         $aciveUsers = factory(User::class, 6)->state('active')->create();
         $inactiveUsers = factory(User::class, 5)->state('inactive')->create();
-        $activeDeletesUsers = factory(User::class, 4)->states('active', 'softDeleted', )->create();
-        $inactiveDeletedUsers = factory(User::class, 3)->states('inactive', 'softDeleted', )->create();
+        $activeDeletesUsers = factory(User::class, 4)->states('active', 'softDeleted')->create();
+        $inactiveDeletedUsers = factory(User::class, 3)->states('inactive', 'softDeleted')->create();
 
         $this->assertCount($aciveUsers->count(), $this->userRepository->getForDataTable(1, false)->get()->toArray());
     }
@@ -460,8 +460,8 @@ public function getForDataTable_will_provide_inactive_users_for_datatable()
     {
         $aciveUsers = factory(User::class, 6)->state('active')->create();
         $inactiveUsers = factory(User::class, 5)->state('inactive')->create();
-        $activeDeletesUsers = factory(User::class, 4)->states('active', 'softDeleted', )->create();
-        $inactiveDeletedUsers = factory(User::class, 3)->states('inactive', 'softDeleted', )->create();
+        $activeDeletesUsers = factory(User::class, 4)->states('active', 'softDeleted')->create();
+        $inactiveDeletedUsers = factory(User::class, 3)->states('inactive', 'softDeleted')->create();
 
         $this->assertCount($inactiveUsers->count(), $this->userRepository->getForDataTable(0, false)->get()->toArray());
     }
@@ -473,8 +473,8 @@ public function getForDataTable_will_provide_deleted_users_for_datatable()
     {
         $aciveUsers = factory(User::class, 6)->state('active')->create();
         $inactiveUsers = factory(User::class, 5)->state('inactive')->create();
-        $activeDeletesUsers = factory(User::class, 4)->states('active', 'softDeleted', )->create();
-        $inactiveDeletedUsers = factory(User::class, 3)->states('inactive', 'softDeleted', )->create();
+        $activeDeletesUsers = factory(User::class, 4)->states('active', 'softDeleted')->create();
+        $inactiveDeletedUsers = factory(User::class, 3)->states('inactive', 'softDeleted')->create();
 
         $deletedUserCount = $activeDeletesUsers->count() + $inactiveDeletedUsers->count();
 
diff --git a/yarn.lock b/yarn.lock
old mode 100755
new mode 100644
index 8a80ef0b..169073c5
--- a/yarn.lock
+++ b/yarn.lock
@@ -1241,13 +1241,13 @@ abbrev@1:
   resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8"
   integrity sha512-nne9/IiQ/hzIhY6pdDnbBtz7DjPTKrY00P/zvPSm5pOFkl6xuGrGnXn/VtTNNfNtAfZ9/1RtehkszU9qcTii0Q==
 
-accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.7:
-  version "1.3.7"
-  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.7.tgz#531bc726517a3b2b41f850021c6cc15eaab507cd"
-  integrity sha512-Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA==
+accepts@~1.3.4, accepts@~1.3.5, accepts@~1.3.8:
+  version "1.3.8"
+  resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.8.tgz#0bf0be125b67014adcb0b0921e62db7bffe16b2e"
+  integrity sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==
   dependencies:
-    mime-types "~2.1.24"
-    negotiator "0.6.2"
+    mime-types "~2.1.34"
+    negotiator "0.6.3"
 
 acorn-globals@^4.1.0:
   version "4.3.4"
@@ -1374,19 +1374,11 @@ anymatch@~3.1.1:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
 
-aproba@^1.0.3, aproba@^1.1.1:
+aproba@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
   integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
 
-are-we-there-yet@~1.1.2:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
-  integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==
-  dependencies:
-    delegates "^1.0.0"
-    readable-stream "^2.0.6"
-
 argparse@^1.0.7:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
@@ -1422,7 +1414,7 @@ array-equal@^1.0.0:
 array-flatten@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-1.1.1.tgz#9a5f699051b1e7073328f2a008968b64ea2955d2"
-  integrity sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=
+  integrity sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==
 
 array-flatten@^2.1.0:
   version "2.1.2"
@@ -2375,21 +2367,23 @@ bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
   integrity sha512-ItfYfPLkWHUjckQCk8xC+LwxgK8NYcXywGigJgSwOP8Y2iyWT4f2vsZnoOXTTbo+o5yXmIUJ4gn5538SO5S3gA==
 
-body-parser@1.19.0:
-  version "1.19.0"
-  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.19.0.tgz#96b2709e57c9c4e09a6fd66a8fd979844f69f08a"
-  integrity sha512-dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw==
+body-parser@1.20.1:
+  version "1.20.1"
+  resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.20.1.tgz#b1812a8912c195cd371a3ee5e66faa2338a5c668"
+  integrity sha512-jWi7abTbYwajOytWCQc37VulmWiRae5RyTpaCyDcS5/lMdtwSz5lOpDE67srw/HYe35f1z3fDQw+3txg7gNtWw==
   dependencies:
-    bytes "3.1.0"
+    bytes "3.1.2"
     content-type "~1.0.4"
     debug "2.6.9"
-    depd "~1.1.2"
-    http-errors "1.7.2"
+    depd "2.0.0"
+    destroy "1.2.0"
+    http-errors "2.0.0"
     iconv-lite "0.4.24"
-    on-finished "~2.3.0"
-    qs "6.7.0"
-    raw-body "2.4.0"
-    type-is "~1.6.17"
+    on-finished "2.4.1"
+    qs "6.11.0"
+    raw-body "2.5.1"
+    type-is "~1.6.18"
+    unpipe "1.0.0"
 
 bonjour@^3.5.0:
   version "3.5.0"
@@ -2408,6 +2402,16 @@ boolbase@^1.0.0, boolbase@~1.0.0:
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
   integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
 
+bootstrap@4.3.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.3.1.tgz#280ca8f610504d99d7b6b4bfc4b68cec601704ac"
+  integrity sha512-rXqOmH1VilAt2DyPzluTi2blhk17bO7ef+zLLPlWvG494pDxcM234pJ8wTc/6R40UWizAIIMgxjvxZg5kmsbag==
+
+bootstrap@^3.3:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-3.4.1.tgz#c3a347d419e289ad11f4033e3c4132b87c081d72"
+  integrity sha512-yN5oZVmRCwe5aKwzRj6736nSmKDX7pLYwsXiCj/EYmo16hODaBiT4En5btW/jhBF/seV+XMx3aYwukYC3A49DA==
+
 bootstrap@^4.3.1:
   version "4.4.1"
   resolved "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.4.1.tgz#8582960eea0c5cd2bede84d8b0baf3789c3e8b01"
@@ -2571,10 +2575,10 @@ bytes@3.0.0:
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
   integrity sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=
 
-bytes@3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
-  integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
+bytes@3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.2.tgz#8b0beeb98605adf1b128fa4386403c009e0221a5"
+  integrity sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==
 
 cacache@^12.0.2:
   version "12.0.4"
@@ -2636,6 +2640,14 @@ cache-base@^1.0.1:
     union-value "^1.0.0"
     unset-value "^1.0.0"
 
+call-bind@^1.0.0:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/call-bind/-/call-bind-1.0.2.tgz#b1d4e89e688119c3c9a903ad30abb2f6a919be3c"
+  integrity sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==
+  dependencies:
+    function-bind "^1.1.1"
+    get-intrinsic "^1.0.2"
+
 call-me-maybe@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/call-me-maybe/-/call-me-maybe-1.0.1.tgz#26d208ea89e37b5cbde60250a15f031c16a4d66b"
@@ -3021,11 +3033,6 @@ console-browserify@^1.1.0:
   resolved "https://registry.yarnpkg.com/console-browserify/-/console-browserify-1.2.0.tgz#67063cef57ceb6cf4993a2ab3a55840ae8c49336"
   integrity sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==
 
-console-control-strings@^1.0.0, console-control-strings@~1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
-  integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
-
 consolidate@^0.15.1:
   version "0.15.1"
   resolved "https://registry.yarnpkg.com/consolidate/-/consolidate-0.15.1.tgz#21ab043235c71a07d45d9aad98593b0dba56bab7"
@@ -3038,12 +3045,12 @@ constants-browserify@^1.0.0:
   resolved "https://registry.yarnpkg.com/constants-browserify/-/constants-browserify-1.0.0.tgz#c20b96d8c617748aaf1c16021760cd27fcb8cb75"
   integrity sha1-wguW2MYXdIqvHBYCF2DNJ/y4y3U=
 
-content-disposition@0.5.3:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.3.tgz#e130caf7e7279087c5616c2007d0485698984fbd"
-  integrity sha512-ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g==
+content-disposition@0.5.4:
+  version "0.5.4"
+  resolved "https://registry.yarnpkg.com/content-disposition/-/content-disposition-0.5.4.tgz#8b82b4efac82512a02bb0b1dcec9d2c5e8eb5bfe"
+  integrity sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==
   dependencies:
-    safe-buffer "5.1.2"
+    safe-buffer "5.2.1"
 
 content-type@~1.0.4:
   version "1.0.4"
@@ -3065,12 +3072,12 @@ convert-source-map@^0.3.3:
 cookie-signature@1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/cookie-signature/-/cookie-signature-1.0.6.tgz#e303a882b342cc3ee8ca513a79999734dab3ae2c"
-  integrity sha1-4wOogrNCzD7oylE6eZmXNNqzriw=
+  integrity sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==
 
-cookie@0.4.0:
-  version "0.4.0"
-  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.4.0.tgz#beb437e7022b3b6d49019d088665303ebe9c14ba"
-  integrity sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg==
+cookie@0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/cookie/-/cookie-0.5.0.tgz#d1f5d71adec6558c58f389987c366aa47e994f8b"
+  integrity sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==
 
 copy-concurrently@^1.0.0:
   version "1.0.5"
@@ -3429,6 +3436,21 @@ data-urls@^1.0.0:
     whatwg-mimetype "^2.2.0"
     whatwg-url "^7.0.0"
 
+datatables.net-bs4@^1.10.21:
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/datatables.net-bs4/-/datatables.net-bs4-1.13.1.tgz#b704d9639bbe650c996e614dc37f529e8c09ff47"
+  integrity sha512-GBTOzUT8ooEUMPtjVHktvDk0MyakFGh89F8aHj8VwF1OFLbqTGEAPacO8XAgSfej/Ng3dbFJA6sjrk4gFra8kg==
+  dependencies:
+    datatables.net ">=1.12.1"
+    jquery ">=1.7"
+
+datatables.net@>=1.12.1, datatables.net@^1.10.21:
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/datatables.net/-/datatables.net-1.13.1.tgz#199f7cb63f4536c135e161f95254212835a1c130"
+  integrity sha512-cX5dDHsbVdLLYKsWOSE0MvuGUcV88zU5dZ/taK2puJV6F9Fw0CFsP3+U/kr+qpDSFOBLWISRyM4Q9wWWovPTNg==
+  dependencies:
+    jquery ">=1.7"
+
 de-indent@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/de-indent/-/de-indent-1.0.2.tgz#b2038e846dc33baa5796128d0804b455b8c1e21d"
@@ -3448,7 +3470,7 @@ debug@=3.1.0:
   dependencies:
     ms "2.0.0"
 
-debug@^3.0.0, debug@^3.1.1, debug@^3.2.5, debug@^3.2.6:
+debug@^3.0.0, debug@^3.1.1, debug@^3.2.5:
   version "3.2.6"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
   integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
@@ -3484,11 +3506,6 @@ deep-equal@^1.0.1:
     object-keys "^1.1.1"
     regexp.prototype.flags "^1.2.0"
 
-deep-extend@^0.6.0:
-  version "0.6.0"
-  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
-  integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
-
 deep-is@~0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
@@ -3554,10 +3571,10 @@ delayed-stream@~1.0.0:
   resolved "https://registry.yarnpkg.com/delayed-stream/-/delayed-stream-1.0.0.tgz#df3ae199acadfb7d440aaae0b29e2272b24ec619"
   integrity sha1-3zrhmayt+31ECqrgsp4icrJOxhk=
 
-delegates@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a"
-  integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o=
+depd@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
+  integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
 
 depd@~1.1.2:
   version "1.1.2"
@@ -3572,10 +3589,10 @@ des.js@^1.0.0:
     inherits "^2.0.1"
     minimalistic-assert "^1.0.0"
 
-destroy@~1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
-  integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
+destroy@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.2.0.tgz#4803735509ad8be552934c67df614f94e66fa015"
+  integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==
 
 detect-file@^1.0.0:
   version "1.0.0"
@@ -3589,11 +3606,6 @@ detect-indent@^4.0.0:
   dependencies:
     repeating "^2.0.0"
 
-detect-libc@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
-  integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
-
 detect-newline@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/detect-newline/-/detect-newline-2.1.0.tgz#f41f1c10be4b00e87b5f13da680759f2c5bfd3e2"
@@ -3737,7 +3749,7 @@ editorconfig@^0.15.3:
 ee-first@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
-  integrity sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=
+  integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
 
 electron-to-chromium@^1.3.390:
   version "1.3.401"
@@ -3775,7 +3787,7 @@ emojis-list@^3.0.0:
 encodeurl@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/encodeurl/-/encodeurl-1.0.2.tgz#ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"
-  integrity sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=
+  integrity sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==
 
 end-of-stream@^1.0.0, end-of-stream@^1.1.0:
   version "1.4.4"
@@ -3807,6 +3819,26 @@ entities@^2.0.0:
   resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.0.tgz#68d6084cab1b079767540d80e56a39b423e4abf4"
   integrity sha512-D9f7V0JSRwIxlRI2mjMqufDrRDnx8p+eEOz7aUM9SuvF8gsBzra0/6tbjl1m8eQHrZlYj6PxqE00hZ1SAIKPLw==
 
+eonasdan-bootstrap-datetimepicker-bootstrap4beta@^4.17.47-a:
+  version "4.17.47-a"
+  resolved "https://registry.yarnpkg.com/eonasdan-bootstrap-datetimepicker-bootstrap4beta/-/eonasdan-bootstrap-datetimepicker-bootstrap4beta-4.17.47-a.tgz#6b6ee7fd18c4284d25e03f0196d6e66976cfed6b"
+  integrity sha512-PBSVeji4xJkjGGCjFXgG9nnFo6k2k22SPBuvyodL0zQLdthNIWaWBaH1l6hhAUJms9amjbxFPlTYXoPqROMMOA==
+  dependencies:
+    bootstrap "^3.3"
+    jquery "^1.8.3 || ^2.0 || ^3.0"
+    moment "^2.10"
+    moment-timezone "^0.4.0"
+
+eonasdan-custom-bootstrap-datetimepicker-with-bootstrap-4@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/eonasdan-custom-bootstrap-datetimepicker-with-bootstrap-4/-/eonasdan-custom-bootstrap-datetimepicker-with-bootstrap-4-1.0.0.tgz#a88931f0c8c32849e629fd1f3730579b065f20d7"
+  integrity sha512-klB2kBL6xe1WcAgBrmLs1estznQHs/NMN0ju26qsHy/CfrL5dwzAqJQQ5E/509nIkFbGrNyixeGkDSRaVmIf7g==
+  dependencies:
+    bootstrap "4.3.1"
+    jquery "^1.8.3 || ^2.0 || ^3.0"
+    moment "^2.19.4"
+    moment-timezone "0.4.0"
+
 errno@^0.1.3, errno@~0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
@@ -3891,7 +3923,7 @@ es6-templates@^0.2.3:
 escape-html@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/escape-html/-/escape-html-1.0.3.tgz#0258eae4d3d0c0974de1c169188ef0051d1d1988"
-  integrity sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=
+  integrity sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==
 
 escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   version "1.0.5"
@@ -3948,7 +3980,7 @@ esutils@^2.0.2:
 etag@~1.8.1:
   version "1.8.1"
   resolved "https://registry.yarnpkg.com/etag/-/etag-1.8.1.tgz#41ae2eeb65efa62268aebfea83ac7d79299b0887"
-  integrity sha1-Qa4u62XvpiJorr/qg6x9eSmbCIc=
+  integrity sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==
 
 eventemitter3@^4.0.0:
   version "4.0.0"
@@ -4031,37 +4063,38 @@ expect@^24.9.0:
     jest-regex-util "^24.9.0"
 
 express@^4.17.1:
-  version "4.17.1"
-  resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
-  integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==
+  version "4.18.2"
+  resolved "https://registry.yarnpkg.com/express/-/express-4.18.2.tgz#3fabe08296e930c796c19e3c516979386ba9fd59"
+  integrity sha512-5/PsL6iGPdfQ/lKM1UuielYgv3BUoJfz1aUwU9vHZ+J7gyvwdQXFEBIEIaxeGf0GIcreATNyBExtalisDbuMqQ==
   dependencies:
-    accepts "~1.3.7"
+    accepts "~1.3.8"
     array-flatten "1.1.1"
-    body-parser "1.19.0"
-    content-disposition "0.5.3"
+    body-parser "1.20.1"
+    content-disposition "0.5.4"
     content-type "~1.0.4"
-    cookie "0.4.0"
+    cookie "0.5.0"
     cookie-signature "1.0.6"
     debug "2.6.9"
-    depd "~1.1.2"
+    depd "2.0.0"
     encodeurl "~1.0.2"
     escape-html "~1.0.3"
     etag "~1.8.1"
-    finalhandler "~1.1.2"
+    finalhandler "1.2.0"
     fresh "0.5.2"
+    http-errors "2.0.0"
     merge-descriptors "1.0.1"
     methods "~1.1.2"
-    on-finished "~2.3.0"
+    on-finished "2.4.1"
     parseurl "~1.3.3"
     path-to-regexp "0.1.7"
-    proxy-addr "~2.0.5"
-    qs "6.7.0"
+    proxy-addr "~2.0.7"
+    qs "6.11.0"
     range-parser "~1.2.1"
-    safe-buffer "5.1.2"
-    send "0.17.1"
-    serve-static "1.14.1"
-    setprototypeof "1.1.1"
-    statuses "~1.5.0"
+    safe-buffer "5.2.1"
+    send "0.18.0"
+    serve-static "1.15.0"
+    setprototypeof "1.2.0"
+    statuses "2.0.1"
     type-is "~1.6.18"
     utils-merge "1.0.1"
     vary "~1.1.2"
@@ -4227,17 +4260,17 @@ fill-range@^7.0.1:
   dependencies:
     to-regex-range "^5.0.1"
 
-finalhandler@~1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
-  integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==
+finalhandler@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.2.0.tgz#7d23fe5731b207b4640e4fcd00aec1f9207a7b32"
+  integrity sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==
   dependencies:
     debug "2.6.9"
     encodeurl "~1.0.2"
     escape-html "~1.0.3"
-    on-finished "~2.3.0"
+    on-finished "2.4.1"
     parseurl "~1.3.3"
-    statuses "~1.5.0"
+    statuses "2.0.1"
     unpipe "~1.0.0"
 
 find-babel-config@^1.1.0:
@@ -4339,10 +4372,10 @@ form-data@~2.3.2:
     combined-stream "^1.0.6"
     mime-types "^2.1.12"
 
-forwarded@~0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
-  integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=
+forwarded@0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811"
+  integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==
 
 fragment-cache@^0.2.1:
   version "0.2.1"
@@ -4354,7 +4387,7 @@ fragment-cache@^0.2.1:
 fresh@0.5.2:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
-  integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
+  integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==
 
 friendly-errors-webpack-plugin@^1.6.1:
   version "1.7.0"
@@ -4382,13 +4415,6 @@ fs-extra@^7.0.1:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
-fs-minipass@^1.2.5:
-  version "1.2.7"
-  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
-  integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==
-  dependencies:
-    minipass "^2.6.0"
-
 fs-minipass@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
@@ -4429,20 +4455,6 @@ function-bind@^1.1.1:
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
-gauge@~2.7.3:
-  version "2.7.4"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
-  integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
-  dependencies:
-    aproba "^1.0.3"
-    console-control-strings "^1.0.0"
-    has-unicode "^2.0.0"
-    object-assign "^4.1.0"
-    signal-exit "^3.0.0"
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-    wide-align "^1.1.0"
-
 gensync@^1.0.0-beta.1:
   version "1.0.0-beta.1"
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.1.tgz#58f4361ff987e5ff6e1e7a210827aa371eaac269"
@@ -4458,6 +4470,15 @@ get-caller-file@^2.0.1:
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-2.0.5.tgz#4f94412a82db32f36e3b0b9741f8a97feb031f7e"
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
+get-intrinsic@^1.0.2:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.3.tgz#063c84329ad93e83893c7f4f243ef63ffa351385"
+  integrity sha512-QJVz1Tj7MS099PevUG5jvnt9tSkXN8K14dxQlikJuPt4uD9hHAHjLyLBiLR5zELelBdD9QNRAXZzsJx0WaDL9A==
+  dependencies:
+    function-bind "^1.1.1"
+    has "^1.0.3"
+    has-symbols "^1.0.3"
+
 get-stream@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
@@ -4636,10 +4657,10 @@ has-symbols@^1.0.0, has-symbols@^1.0.1:
   resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
   integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
 
-has-unicode@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
-  integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
+has-symbols@^1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.3.tgz#bb7b2c4349251dce87b125f7bdf874aa7c8b39f8"
+  integrity sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==
 
 has-value@^0.3.1:
   version "0.3.1"
@@ -4810,16 +4831,16 @@ http-deceiver@^1.2.7:
   resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
   integrity sha1-+nFolEq5pRnTN8sL7HKE3D5yPYc=
 
-http-errors@1.7.2:
-  version "1.7.2"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.2.tgz#4f5029cf13239f31036e5b2e55292bcfbcc85c8f"
-  integrity sha512-uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg==
+http-errors@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-2.0.0.tgz#b7774a1486ef73cf7667ac9ae0858c012c57b9d3"
+  integrity sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==
   dependencies:
-    depd "~1.1.2"
-    inherits "2.0.3"
-    setprototypeof "1.1.1"
-    statuses ">= 1.5.0 < 2"
-    toidentifier "1.0.0"
+    depd "2.0.0"
+    inherits "2.0.4"
+    setprototypeof "1.2.0"
+    statuses "2.0.1"
+    toidentifier "1.0.1"
 
 http-errors@~1.6.2:
   version "1.6.3"
@@ -4831,17 +4852,6 @@ http-errors@~1.6.2:
     setprototypeof "1.1.0"
     statuses ">= 1.4.0 < 2"
 
-http-errors@~1.7.2:
-  version "1.7.3"
-  resolved "https://registry.yarnpkg.com/http-errors/-/http-errors-1.7.3.tgz#6c619e4f9c60308c38519498c14fbb10aacebb06"
-  integrity sha512-ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw==
-  dependencies:
-    depd "~1.1.2"
-    inherits "2.0.4"
-    setprototypeof "1.1.1"
-    statuses ">= 1.5.0 < 2"
-    toidentifier "1.0.0"
-
 "http-parser-js@>=0.4.0 <0.4.11":
   version "0.4.10"
   resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.10.tgz#92c9c1374c35085f75db359ec56cc257cbb93fa4"
@@ -4880,7 +4890,7 @@ https-browserify@^1.0.0:
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
   integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
 
-iconv-lite@0.4.24, iconv-lite@^0.4.4:
+iconv-lite@0.4.24:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
@@ -4909,13 +4919,6 @@ iferr@^0.1.5:
   resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
   integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
 
-ignore-walk@^3.0.1:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37"
-  integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==
-  dependencies:
-    minimatch "^3.0.4"
-
 ignore@^3.3.5:
   version "3.3.10"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
@@ -5013,7 +5016,7 @@ inherits@2.0.3:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
   integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
-ini@^1.3.4, ini@^1.3.5, ini@~1.3.0:
+ini@^1.3.4, ini@^1.3.5:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
   integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
@@ -5763,6 +5766,11 @@ jest@^24.8.0:
     import-local "^2.0.0"
     jest-cli "^24.9.0"
 
+jquery@>=1.7, jquery@>=1.9.1, "jquery@^1.8.3 || ^2.0 || ^3.0":
+  version "3.6.1"
+  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.1.tgz#fab0408f8b45fc19f956205773b62b292c147a16"
+  integrity sha512-opJeO4nCucVnsjiXOE+/PcCgYw9Gwpvs/a6B1LL/lQhwWwpbVEVYDZ1FokFr8PRc7ghYlrFPuyHuiiDNTQxmcw==
+
 jquery@^3.4.1:
   version "3.4.1"
   resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.4.1.tgz#714f1f8d9dde4bdfa55764ba37ef214630d80ef2"
@@ -5910,6 +5918,13 @@ jsprim@^1.2.2:
     json-schema "0.2.3"
     verror "1.10.0"
 
+jstree@^3.3.10:
+  version "3.3.12"
+  resolved "https://registry.yarnpkg.com/jstree/-/jstree-3.3.12.tgz#cf206bc85dcf4a4664ed6617eaae3bd5983d8601"
+  integrity sha512-vHNLWkUr02ZYH7RcIckvhtLUtneWCVEtIKpIp2G9WtRh01ITv18EoNtNQcFG3ozM+oK6wp1Z300gSLXNQWCqGA==
+  dependencies:
+    jquery ">=1.9.1"
+
 killable@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
@@ -6215,7 +6230,7 @@ mdn-data@2.0.6:
 media-typer@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
-  integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
+  integrity sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==
 
 mem@^4.0.0:
   version "4.3.0"
@@ -6245,7 +6260,7 @@ memory-fs@^0.5.0:
 merge-descriptors@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/merge-descriptors/-/merge-descriptors-1.0.1.tgz#b00aaa556dd8b44568150ec9d1b953f3f90cbb61"
-  integrity sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=
+  integrity sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==
 
 merge-source-map@^1.1.0:
   version "1.1.0"
@@ -6267,7 +6282,7 @@ merge2@^1.2.3:
 methods@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
-  integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
+  integrity sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==
 
 micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4:
   version "3.1.10"
@@ -6301,13 +6316,25 @@ mime-db@1.43.0, "mime-db@>= 1.43.0 < 2":
   resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.43.0.tgz#0a12e0502650e473d735535050e7c8f4eb4fae58"
   integrity sha512-+5dsGEEovYbT8UY9yD7eE4XTc4UwJ1jBYlgaQQF38ENsKR3wj/8q8RFZrF9WIZpB2V1ArTVFUva8sAul1NzRzQ==
 
-mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24:
+mime-db@1.52.0:
+  version "1.52.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70"
+  integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==
+
+mime-types@^2.1.12, mime-types@~2.1.17, mime-types@~2.1.19:
   version "2.1.26"
   resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.26.tgz#9c921fc09b7e149a65dfdc0da4d20997200b0a06"
   integrity sha512-01paPWYgLrkqAyrlDorC1uDwl2p3qZT7yl806vW7DvDoxwXi46jsjFbg+WdwotBIk6/MbEhO/dh5aZ5sNj/dWQ==
   dependencies:
     mime-db "1.43.0"
 
+mime-types@~2.1.24, mime-types@~2.1.34:
+  version "2.1.35"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a"
+  integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==
+  dependencies:
+    mime-db "1.52.0"
+
 mime@1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
@@ -6366,14 +6393,6 @@ minipass-pipeline@^1.2.2:
   dependencies:
     minipass "^3.0.0"
 
-minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0:
-  version "2.9.0"
-  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6"
-  integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==
-  dependencies:
-    safe-buffer "^5.1.2"
-    yallist "^3.0.0"
-
 minipass@^3.0.0, minipass@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.1.tgz#7607ce778472a185ad6d89082aa2070f79cedcd5"
@@ -6381,13 +6400,6 @@ minipass@^3.0.0, minipass@^3.1.1:
   dependencies:
     yallist "^4.0.0"
 
-minizlib@^1.2.1:
-  version "1.3.3"
-  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d"
-  integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==
-  dependencies:
-    minipass "^2.9.0"
-
 mississippi@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
@@ -6412,7 +6424,7 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-mkdirp@^0.5.0, mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@~0.5.1:
+mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@~0.5.1:
   version "0.5.5"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def"
   integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==
@@ -6424,6 +6436,25 @@ mkdirp@~1.0.3:
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
 
+moment-timezone@0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.4.0.tgz#571ec43f5d2fb70ddb601c7d23b284e2f63ddab4"
+  integrity sha512-g9kUW7A+SGhnNiTNnxO8HvKQOtBgfOvoa3mFa1nZ2RLkqhD4Z9vMXQo8rsk1Q9Kx425IJ+mIlqaqoT2mzAFTHQ==
+  dependencies:
+    moment ">= 2.6.0"
+
+moment-timezone@^0.4.0:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.4.1.tgz#81f598c3ad5e22cdad796b67ecd8d88d0f5baa06"
+  integrity sha512-5cNPVUwaVJDCe9JM8m/qz17f9SkaI8rpnRUyDJi2K5HAd6EwhuQ3n5nLclZkNC/qJnomKgQH2TIu70Gy2dxFKA==
+  dependencies:
+    moment ">= 2.6.0"
+
+"moment@>= 2.6.0", moment@^2.10, moment@^2.19.4:
+  version "2.29.4"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.4.tgz#3dbe052889fe7c1b2ed966fcb3a77328964ef108"
+  integrity sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w==
+
 move-concurrently@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/move-concurrently/-/move-concurrently-1.0.1.tgz#be2c005fda32e0b29af1f05d7c4b33214c701f92"
@@ -6439,12 +6470,12 @@ move-concurrently@^1.0.1:
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
-  integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=
+  integrity sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==
 
-ms@2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
-  integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
+ms@2.1.3:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2"
+  integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==
 
 ms@^2.1.1:
   version "2.1.2"
@@ -6491,19 +6522,10 @@ natural-compare@^1.4.0:
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
 
-needle@^2.2.1:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/needle/-/needle-2.4.1.tgz#14af48732463d7475696f937626b1b993247a56a"
-  integrity sha512-x/gi6ijr4B7fwl6WYL9FwlCvRQKGlUNvnceho8wxkwXqN8jvVmmmATTmZPRRG7b/yC1eode26C2HO9jl78Du9g==
-  dependencies:
-    debug "^3.2.6"
-    iconv-lite "^0.4.4"
-    sax "^1.2.4"
-
-negotiator@0.6.2:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
-  integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
+negotiator@0.6.3:
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.3.tgz#58e323a72fedc0d6f9cd4d31fe49f51479590ccd"
+  integrity sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==
 
 neo-async@^2.5.0, neo-async@^2.6.1:
   version "2.6.1"
@@ -6590,28 +6612,12 @@ node-notifier@^5.1.2, node-notifier@^5.4.2:
     shellwords "^0.1.1"
     which "^1.3.0"
 
-node-pre-gyp@*:
-  version "0.14.0"
-  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83"
-  integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA==
-  dependencies:
-    detect-libc "^1.0.2"
-    mkdirp "^0.5.1"
-    needle "^2.2.1"
-    nopt "^4.0.1"
-    npm-packlist "^1.1.6"
-    npmlog "^4.0.2"
-    rc "^1.2.7"
-    rimraf "^2.6.1"
-    semver "^5.3.0"
-    tar "^4.4.2"
-
 node-releases@^1.1.53:
   version "1.1.53"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.53.tgz#2d821bfa499ed7c5dffc5e2f28c88e78a08ee3f4"
   integrity sha512-wp8zyQVwef2hpZ/dJH7SfSrIPD6YoJz6BDQDpGEkcA0s3LpAQoxBIYmfIq6QAhC1DhwsyCgTaTTcONwX8qzCuQ==
 
-nopt@^4.0.1, nopt@^4.0.3:
+nopt@^4.0.3:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz#a375cad9d02fd921278d954c2254d5aa57e15e48"
   integrity sha512-CvaGwVMztSMJLOeXPrez7fyfObdZqNUK1cPAEzLHrTybIua9pMdmmPR5YwtfNftIOMv3DPUhFaxsZMNTQO20Kg==
@@ -6651,27 +6657,6 @@ normalize-url@^3.0.0:
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559"
   integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==
 
-npm-bundled@^1.0.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b"
-  integrity sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==
-  dependencies:
-    npm-normalize-package-bin "^1.0.1"
-
-npm-normalize-package-bin@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
-  integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==
-
-npm-packlist@^1.1.6:
-  version "1.4.8"
-  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e"
-  integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==
-  dependencies:
-    ignore-walk "^3.0.1"
-    npm-bundled "^1.0.1"
-    npm-normalize-package-bin "^1.0.1"
-
 npm-run-path@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
@@ -6679,16 +6664,6 @@ npm-run-path@^2.0.0:
   dependencies:
     path-key "^2.0.0"
 
-npmlog@^4.0.2:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
-  integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
-  dependencies:
-    are-we-there-yet "~1.1.2"
-    console-control-strings "~1.1.0"
-    gauge "~2.7.3"
-    set-blocking "~2.0.0"
-
 nth-check@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"
@@ -6735,6 +6710,11 @@ object-inspect@^1.7.0:
   resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz#f4f6bd181ad77f006b5ece60bd0b6f398ff74a67"
   integrity sha512-a7pEHdh1xKIAgTySUGgLMx/xwDZskN1Ud6egYYN3EdRW4ZMPNEDUTF+hwy2LUC+Bl+SyLXANnwz/jyh/qutKUw==
 
+object-inspect@^1.9.0:
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.12.2.tgz#c0641f26394532f28ab8d796ab954e43c009a8ea"
+  integrity sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==
+
 object-is@^1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.0.2.tgz#6b80eb84fe451498f65007982f035a5b445edec4"
@@ -6804,10 +6784,10 @@ obuf@^1.0.0, obuf@^1.1.2:
   resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"
   integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==
 
-on-finished@~2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
-  integrity sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=
+on-finished@2.4.1:
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.4.1.tgz#58c8c44116e54845ad57f14ab10b03533184ac3f"
+  integrity sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==
   dependencies:
     ee-first "1.1.1"
 
@@ -7098,7 +7078,7 @@ path-parse@^1.0.6:
 path-to-regexp@0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
-  integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
+  integrity sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==
 
 path-type@^3.0.0:
   version "3.0.0"
@@ -7625,12 +7605,12 @@ proto-list@~1.2.1:
   resolved "https://registry.yarnpkg.com/proto-list/-/proto-list-1.2.4.tgz#212d5bfe1318306a420f6402b8e26ff39647a849"
   integrity sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=
 
-proxy-addr@~2.0.5:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.6.tgz#fdc2336505447d3f2f2c638ed272caf614bbb2bf"
-  integrity sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==
+proxy-addr@~2.0.7:
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025"
+  integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==
   dependencies:
-    forwarded "~0.1.2"
+    forwarded "0.2.0"
     ipaddr.js "1.9.1"
 
 prr@~1.0.1:
@@ -7705,10 +7685,12 @@ q@^1.1.2:
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
   integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
 
-qs@6.7.0:
-  version "6.7.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.7.0.tgz#41dc1a015e3d581f1621776be31afb2876a9b1bc"
-  integrity sha512-VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ==
+qs@6.11.0:
+  version "6.11.0"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.11.0.tgz#fd0d963446f7a65e1367e01abd85429453f0c37a"
+  integrity sha512-MvjoMCJwEarSbUYk5O+nmoSzSutSsTwF85zcHPQ9OrlFoZOYIjaqBAJIqIXjptyD5vThxGq52Xu/MaJzRkIk4Q==
+  dependencies:
+    side-channel "^1.0.4"
 
 qs@~6.5.2:
   version "6.5.2"
@@ -7750,26 +7732,16 @@ range-parser@^1.2.1, range-parser@~1.2.1:
   resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
   integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
 
-raw-body@2.4.0:
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332"
-  integrity sha512-4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q==
+raw-body@2.5.1:
+  version "2.5.1"
+  resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.5.1.tgz#fe1b1628b181b700215e5fd42389f98b71392857"
+  integrity sha512-qqJBtEyVgS0ZmPGdCFPWJ3FreoqvG4MVQln/kCgF7Olq95IbOp0/BWyMwbdtn4VTvkM8Y7khCQ2Xgk/tcrCXig==
   dependencies:
-    bytes "3.1.0"
-    http-errors "1.7.2"
+    bytes "3.1.2"
+    http-errors "2.0.0"
     iconv-lite "0.4.24"
     unpipe "1.0.0"
 
-rc@^1.2.7:
-  version "1.2.8"
-  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
-  integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
-  dependencies:
-    deep-extend "^0.6.0"
-    ini "~1.3.0"
-    minimist "^1.2.0"
-    strip-json-comments "~2.0.1"
-
 react-is@^16.8.4:
   version "16.13.1"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
@@ -7792,7 +7764,7 @@ read-pkg@^3.0.0:
     normalize-package-data "^2.3.2"
     path-type "^3.0.0"
 
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
   version "2.3.7"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
   integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
@@ -8132,7 +8104,7 @@ rgba-regex@^1.0.0:
   resolved "https://registry.yarnpkg.com/rgba-regex/-/rgba-regex-1.0.0.tgz#43374e2e2ca0968b0ef1523460b7d730ff22eeb3"
   integrity sha1-QzdOLiyglosO8VI0YLfXMP8i7rM=
 
-rimraf@^2.5.4, rimraf@^2.6.1, rimraf@^2.6.3, rimraf@^2.7.1:
+rimraf@^2.5.4, rimraf@^2.6.3, rimraf@^2.7.1:
   version "2.7.1"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
   integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
@@ -8164,10 +8136,10 @@ safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
-safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz#b74daec49b1148f88c64b68d49b1e815c1f2f519"
-  integrity sha512-fZEwUGbVl7kouZs1jCdMLdt95hdIv0ZeHg6L7qPeciMZhZ+/gdesW4wgTARkrFWEpspjEATAzUGPG8N2jJiwbg==
+safe-buffer@5.2.1, safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.2.0:
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
+  integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
 
 safe-regex@^1.1.0:
   version "1.1.0"
@@ -8249,6 +8221,11 @@ select-hose@^2.0.0:
   resolved "https://registry.yarnpkg.com/select-hose/-/select-hose-2.0.0.tgz#625d8658f865af43ec962bfc376a37359a4994ca"
   integrity sha1-Yl2GWPhlr0Psliv8N2o3NZpJlMo=
 
+select2@^4.0.13:
+  version "4.0.13"
+  resolved "https://registry.yarnpkg.com/select2/-/select2-4.0.13.tgz#0dbe377df3f96167c4c1626033e924372d8ef44d"
+  integrity sha512-1JeB87s6oN/TDxQQYCvS5EFoQyvV6eYMZZ0AeA4tdFDYWN3BAGZ8npr17UBFddU0lgAt3H0yjX3X6/ekOj1yjw==
+
 selfsigned@^1.10.7:
   version "1.10.7"
   resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.7.tgz#da5819fd049d5574f28e88a9bcc6dbc6e6f3906b"
@@ -8256,7 +8233,7 @@ selfsigned@^1.10.7:
   dependencies:
     node-forge "0.9.0"
 
-"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
+"semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
@@ -8271,24 +8248,24 @@ semver@^6.0.0, semver@^6.2.0, semver@^6.3.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
 
-send@0.17.1:
-  version "0.17.1"
-  resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8"
-  integrity sha512-BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg==
+send@0.18.0:
+  version "0.18.0"
+  resolved "https://registry.yarnpkg.com/send/-/send-0.18.0.tgz#670167cc654b05f5aa4a767f9113bb371bc706be"
+  integrity sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==
   dependencies:
     debug "2.6.9"
-    depd "~1.1.2"
-    destroy "~1.0.4"
+    depd "2.0.0"
+    destroy "1.2.0"
     encodeurl "~1.0.2"
     escape-html "~1.0.3"
     etag "~1.8.1"
     fresh "0.5.2"
-    http-errors "~1.7.2"
+    http-errors "2.0.0"
     mime "1.6.0"
-    ms "2.1.1"
-    on-finished "~2.3.0"
+    ms "2.1.3"
+    on-finished "2.4.1"
     range-parser "~1.2.1"
-    statuses "~1.5.0"
+    statuses "2.0.1"
 
 serialize-javascript@^2.1.2:
   version "2.1.2"
@@ -8308,17 +8285,17 @@ serve-index@^1.9.1:
     mime-types "~2.1.17"
     parseurl "~1.3.2"
 
-serve-static@1.14.1:
-  version "1.14.1"
-  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9"
-  integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==
+serve-static@1.15.0:
+  version "1.15.0"
+  resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.15.0.tgz#faaef08cffe0a1a62f60cad0c4e513cff0ac9540"
+  integrity sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==
   dependencies:
     encodeurl "~1.0.2"
     escape-html "~1.0.3"
     parseurl "~1.3.3"
-    send "0.17.1"
+    send "0.18.0"
 
-set-blocking@^2.0.0, set-blocking@~2.0.0:
+set-blocking@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
@@ -8343,10 +8320,10 @@ setprototypeof@1.1.0:
   resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.0.tgz#d0bd85536887b6fe7c0d818cb962d9d91c54e656"
   integrity sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==
 
-setprototypeof@1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.1.1.tgz#7e95acb24aa92f5885e0abef5ba131330d4ae683"
-  integrity sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==
+setprototypeof@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/setprototypeof/-/setprototypeof-1.2.0.tgz#66c9a24a73f9fc28cbe66b09fed3d33dcaf1b424"
+  integrity sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==
 
 sha.js@^2.4.0, sha.js@^2.4.8:
   version "2.4.11"
@@ -8392,6 +8369,15 @@ shellwords@^0.1.1:
   resolved "https://registry.yarnpkg.com/shellwords/-/shellwords-0.1.1.tgz#d6b9181c1a48d397324c84871efbcfc73fc0654b"
   integrity sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==
 
+side-channel@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.4.tgz#efce5c8fdc104ee751b25c58d4290011fa5ea2cf"
+  integrity sha512-q5XPytqFEIKHkGdiMIrY10mvLRvnQh42/+GoBlFW3b2LXLE2xxJpZFdm94we0BaoV3RwJyGqg5wS7epxTv0Zvw==
+  dependencies:
+    call-bind "^1.0.0"
+    get-intrinsic "^1.0.2"
+    object-inspect "^1.9.0"
+
 sigmund@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/sigmund/-/sigmund-1.0.1.tgz#3ff21f198cad2175f9f3b781853fd94d0d19b590"
@@ -8634,7 +8620,12 @@ static-extend@^0.1.1:
     define-property "^0.2.5"
     object-copy "^0.1.0"
 
-"statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0:
+statuses@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/statuses/-/statuses-2.0.1.tgz#55cb000ccf1d48728bd23c685a063998cf1a1b63"
+  integrity sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==
+
+"statuses@>= 1.4.0 < 2":
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
   integrity sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=
@@ -8693,7 +8684,7 @@ string-width@^1.0.1:
     is-fullwidth-code-point "^1.0.0"
     strip-ansi "^3.0.0"
 
-"string-width@^1.0.2 || 2", string-width@^2.0.0, string-width@^2.1.1:
+string-width@^2.0.0, string-width@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
   integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
@@ -8789,7 +8780,7 @@ strip-eof@^1.0.0:
   resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
   integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
 
-strip-json-comments@^2.0.0, strip-json-comments@~2.0.1:
+strip-json-comments@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
   integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
@@ -8871,19 +8862,6 @@ tapable@^1.0.0, tapable@^1.1.3:
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
   integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
 
-tar@^4.4.2:
-  version "4.4.13"
-  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
-  integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==
-  dependencies:
-    chownr "^1.1.1"
-    fs-minipass "^1.2.5"
-    minipass "^2.8.6"
-    minizlib "^1.2.1"
-    mkdirp "^0.5.0"
-    safe-buffer "^5.1.2"
-    yallist "^3.0.3"
-
 terser-webpack-plugin@^1.4.3:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz#5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c"
@@ -8977,6 +8955,11 @@ timsort@^0.3.0:
   resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4"
   integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=
 
+tinymce@^5.4.0:
+  version "5.10.7"
+  resolved "https://registry.yarnpkg.com/tinymce/-/tinymce-5.10.7.tgz#d89d446f1962f2a1df6b2b70018ce475ec7ffb80"
+  integrity sha512-9UUjaO0R7FxcFo0oxnd1lMs7H+D0Eh+dDVo5hKbVe1a+VB0nit97vOqlinj+YwgoBDt6/DSCUoWqAYlLI8BLYA==
+
 tmpl@1.0.x:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1"
@@ -9029,10 +9012,10 @@ to-regex@^3.0.1, to-regex@^3.0.2:
     regex-not "^1.0.2"
     safe-regex "^1.1.0"
 
-toidentifier@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
-  integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
+toidentifier@1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.1.tgz#3be34321a88a820ed1bd80dfaa33e479fbb8dd35"
+  integrity sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==
 
 tough-cookie@^2.3.3, tough-cookie@^2.3.4, tough-cookie@~2.5.0:
   version "2.5.0"
@@ -9093,7 +9076,7 @@ type-check@~0.3.2:
   dependencies:
     prelude-ls "~1.1.2"
 
-type-is@~1.6.17, type-is@~1.6.18:
+type-is@~1.6.18:
   version "1.6.18"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131"
   integrity sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==
@@ -9189,7 +9172,7 @@ universalify@^0.1.0:
 unpipe@1.0.0, unpipe@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
-  integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
+  integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==
 
 unquote@~1.1.1:
   version "1.1.1"
@@ -9279,7 +9262,7 @@ util@^0.11.0:
 utils-merge@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
-  integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
+  integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==
 
 uuid@^3.0.1, uuid@^3.3.2:
   version "3.4.0"
@@ -9302,7 +9285,7 @@ validate-npm-package-license@^3.0.1:
 vary@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
-  integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
+  integrity sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==
 
 vendors@^1.0.0:
   version "1.0.4"
@@ -9607,13 +9590,6 @@ which@^2.0.1:
   dependencies:
     isexe "^2.0.0"
 
-wide-align@^1.1.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
-  integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
-  dependencies:
-    string-width "^1.0.2 || 2"
-
 word-wrap@~1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
@@ -9691,7 +9667,7 @@ yallist@^2.1.2:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
   integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
 
-yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3:
+yallist@^3.0.2:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
   integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==