Merge remote-tracking branch 'origin/Page_Issue' into development

ladybirdweb · Oct 26, 2023 · 3237bf8 · 3237bf8
2 parents 180df47 + 4952d57
commit 3237bf8
Show file tree

Hide file tree

Showing 16 changed files with 735 additions and 39 deletions.
diff --git a/app/Http/Controllers/Agent/kb/ArticleController.php b/app/Http/Controllers/Agent/kb/ArticleController.php
@@ -46,7 +46,7 @@ public function __construct()
         // checking authentication
         $this->middleware('auth');
         // checking roles
-        $this->middleware('roles');
+        $this->middleware('role.agent');
         SettingsController::language();
     }
 

diff --git a/app/Http/Controllers/Agent/kb/CategoryController.php b/app/Http/Controllers/Agent/kb/CategoryController.php
@@ -40,7 +40,7 @@ public function __construct()
         // checking authentication
         $this->middleware('auth');
         // checking roles
-        $this->middleware('roles');
+        $this->middleware('role.agent');
         SettingsController::language();
     }
 
@@ -150,9 +150,9 @@ public function store(Category $category, CategoryRequest $request)
         try {
             $category->fill($request->input())->save();
 
-            return Redirect::back()->with('success', Lang::get('lang.category_inserted_successfully'));
+            return redirect('category')->with('success', Lang::get('lang.category_inserted_successfully'));
         } catch (Exception $e) {
-            return Redirect::back()->with('fails', Lang::get('lang.category_not_inserted').'<li>'.$e->getMessage().'</li>');
+            return redirect('category')->with('fails', Lang::get('lang.category_not_inserted').'<li>'.$e->getMessage().'</li>');
         }
     }
 

diff --git a/app/Http/Controllers/Agent/kb/PageController.php b/app/Http/Controllers/Agent/kb/PageController.php
@@ -38,7 +38,7 @@ public function __construct(Page $page)
         // checking authentication
         $this->middleware('auth');
         // checking roles
-        $this->middleware('roles');
+        $this->middleware('role.agent');
         $this->page = $page;
         SettingsController::language();
     }
@@ -86,7 +86,7 @@ public function getData()
                         /* add column Actions */
                         /* there are action buttons and modal popup to delete a data column */
                         ->addColumn('Actions', function ($model) {
-                            return '<span  data-toggle="modal" data-target="#deletepage'.$model->id.'"><a href="#" ><button class="btn btn-danger btn-xs"></a> '.\Lang::get('lang.delete').'</button></span>&nbsp;<a href=page/'.$model->slug.'/edit class="btn btn-warning btn-xs">'.\Lang::get('lang.edit').'</a>&nbsp;<a href=pages/'.$model->slug.' class="btn btn-primary btn-xs">'.\Lang::get('lang.view').'</a>
+                            return '<span  data-toggle="modal" data-target="#deletepage'.$model->id.'"><a href="#" ><button class="btn btn-danger btn-xs"></a> '.\Lang::get('lang.delete').'</button></span>&nbsp;<a href=page/'.$model->id.'/edit class="btn btn-warning btn-xs">'.\Lang::get('lang.edit').'</a>&nbsp;<a href=pages/'.$model->slug.' class="btn btn-primary btn-xs">'.\Lang::get('lang.view').'</a>
 				<div class="modal fade" id="deletepage'.$model->id.'">
         			<div class="modal-dialog">
             			<div class="modal-content">
@@ -150,7 +150,7 @@ public function store(PageRequest $request)
     public function edit($slug)
     {
         try {
-            $page = $this->page->where('slug', $slug)->first();
+            $page = $this->page->where('id', $slug)->first();
 
             return view('themes.default1.agent.kb.pages.edit', compact('page'));
         } catch (Exception $e) {
@@ -169,7 +169,7 @@ public function edit($slug)
     public function update($slug, PageRequest $request)
     {
         // get pages with respect to slug
-        $pages = $this->page->where('slug', $slug)->first();
+        $pages = $this->page->where('id', $slug)->first();
         $sl = $request->input('name');
         $slug = Str::slug($sl, '-');
 

diff --git a/app/Http/Controllers/Agent/kb/SettingsController.php b/app/Http/Controllers/Agent/kb/SettingsController.php
@@ -42,7 +42,7 @@ public function __construct()
         // checking authentication
         $this->middleware('auth');
         // checking roles
-        $this->middleware('roles');
+        $this->middleware('role.agent');
         $this->language();
     }
 

diff --git a/app/Http/Controllers/Client/kb/UserController.php b/app/Http/Controllers/Client/kb/UserController.php
@@ -124,7 +124,7 @@ public function show($slug, Article $article, Category $category)
         if ($arti) {
             return view('themes.default1.client.kb.article-list.show', compact('arti'));
         } else {
-            return redirect('404');
+            return Redirect::back()->with('fails', Lang::get('lang.sorry_not_processed'));
         }
     }
 
@@ -150,7 +150,6 @@ public function home(Article $article, Category $category, Relationship $relatio
         if (Config::get('database.install') == '%0%') {
             return redirect('step1');
         } else {
-            //$categorys = $category->get();
             $categorys = $category->get();
             // $categorys->setPath('home');
             /* direct to view with $article_id */
@@ -235,7 +234,6 @@ public function postComment($slug, Article $article, Request $request, Comment $
     {
         $request->validate([
             'comment' => 'required',
-
         ]);
 
         $article = $article->where('slug', $slug)->first();
@@ -265,7 +263,16 @@ public function postComment($slug, Article $article, Request $request, Comment $
 
     public function getPage($name, Page $page)
     {
-        $page = $page->where('slug', $name)->first();
+        $page = $page->where('slug', $name);
+
+        if (!Auth::check() || \Auth::user()->role == 'user') {
+            $page = $page
+                    ->where(['status' => 1, 'visibility'=>1])
+                    ->first();
+        } else {
+            $page = $page->where('status', 1)->first();
+        }
+
         if ($page) {
             return view('themes.default1.client.kb.article-list.pages', compact('page'));
         } else {

diff --git a/app/Http/Requests/kb/ArticleRequest.php b/app/Http/Requests/kb/ArticleRequest.php
@@ -24,8 +24,7 @@ public function authorize()
     public function rules()
     {
         return [
-            'name' => 'required',
-            //'slug'        => 'required|unique:kb_article',
+            'name'        => 'required|unique:kb_article',
             'description' => 'required',
             'category_id' => 'required',
         ];

diff --git a/app/Http/Requests/kb/ArticleUpdate.php b/app/Http/Requests/kb/ArticleUpdate.php
@@ -23,11 +23,14 @@ public function authorize()
      */
     public function rules()
     {
-        $id = $this->segments()[1];
+        //$id = $this->segments()[1];
+        $segments = $this->segments();
+
+        $id = isset($segments[1]) ? $segments[1] : null;
 
         return [
-            'name'        => 'required',
-            'slug'        => 'required|unique:kb_article,slug,'.$id.',id',
+            'name'        => 'required|unique:kb_article,name,'.$id,
+            'slug'        => 'required|unique:kb_article,slug,'.$id,
             'description' => 'required',
             'category_id' => 'required',
         ];

diff --git a/app/Http/Requests/kb/PageRequest.php b/app/Http/Requests/kb/PageRequest.php
@@ -23,10 +23,11 @@ public function authorize()
      */
     public function rules()
     {
-        $slug = $this->segment(2);
+        $id = $this->segment(2);
 
         return [
-            'name' => 'required|unique:kb_pages,slug,'.$slug,
+            'name'        => 'required|unique:kb_pages,name,'.$id,
+            'description' => 'required',
         ];
     }
 }
diff --git a/phpunit.xml b/phpunit.xml
@@ -1,27 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" bootstrap="bootstrap/autoload.php" colors="true" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" processIsolation="false" stopOnFailure="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
-  <coverage includeUncoveredFiles="true">
-    <include>
-      <directory suffix=".php">app/</directory>
-    </include>
-  </coverage>
+<phpunit backupGlobals="false"
+         backupStaticAttributes="false"
+         bootstrap="bootstrap/autoload.php"
+         colors="true"
+         convertErrorsToExceptions="true"
+         convertNoticesToExceptions="true"
+         convertWarningsToExceptions="true"
+         processIsolation="false"
+         stopOnFailure="false">
   <testsuites>
-    <testsuite name="feature">
-      <directory>tests/Feature</directory>
+    <testsuite name="all">
+      <directory>./tests/</directory>
     </testsuite>
     <testsuite name="unit">
-      <directory>tests/Unit</directory>
+      <directory>./tests/unit</directory>
     </testsuite>
   </testsuites>
+  <filter>
+    <whitelist addUncoveredFilesFromWhitelist="true">
+      <directory suffix=".php">app/</directory>
+    </whitelist>
+  </filter>
   <php>
     <env name="APP_ENV" value="testing"/>
-   <!-- <env name="DB_CONNECTION" value="testing"/>
-    <env name="DB_DATABASE" value="testing_db"/> -->
+    <env name="DB_CONNECTION" value="testing"/>
+    <env name="DB_DATABASE" value="testing_db"/>
     <env name="CACHE_DRIVER" value="array"/>
     <env name="SESSION_DRIVER" value="array"/>
     <env name="QUEUE_CONNECTION" value="sync"/>
     <env name="MAIL_MAILER" value="mail"/>
     <env name="APP_URL" value="http://localhost:8000"/>
+    <env name="DB_DATABASE" value="testing_db"/>
     <env name="DB_INSTALL" value="1"/>
   </php>
-</phpunit>
+</phpunit>
diff --git a/resources/views/themes/default1/agent/kb/pages/create.blade.php b/resources/views/themes/default1/agent/kb/pages/create.blade.php
@@ -83,7 +83,7 @@ class="nav-item menu-open"
 
                     <div class="form-group col-sm-12 {{ $errors->has('description') ? 'has-error' : '' }}">
                         {!! Form::label('description',Lang::get('lang.description')) !!}
-
+                        <span class="text-red"> *</span>
                         <div class="form-group" style="background-color:white">
                             {!! Form::textarea('description',null,['class' => 'form-control color','size' => '110x15','id'=>'myNicEditor','placeholder'=>Lang::get('lang.enter_the_description')]) !!}
                         </div>

diff --git a/resources/views/themes/default1/agent/kb/pages/edit.blade.php b/resources/views/themes/default1/agent/kb/pages/edit.blade.php
@@ -35,7 +35,7 @@ class="nav-item menu-open"
 
 @section('content')
 
-{!! Form::model($page,['url' => 'page/'.$page->slug, 'method' => 'PATCH','files'=>true]) !!}
+{!! Form::model($page,['url' => 'page/'.$page->id, 'method' => 'PATCH','files'=>true]) !!}
 
 @if(Session::has('errors'))
 <?php //dd($errors); ?>
@@ -130,7 +130,7 @@ class="nav-item menu-open"
             </div>
 
             <div class="card-footer">
-               
+
                 {!! Form::submit(Lang::get('lang.publish'),['class'=>'btn btn-primary'])!!}
             </div>
         </div>

diff --git a/resources/views/themes/default1/client/kb/article-list/show.blade.php b/resources/views/themes/default1/client/kb/article-list/show.blade.php
@@ -254,9 +254,22 @@ function submitComment(userId, comment) {
                                 $(".form-group").removeClass("has-error");
 
                                 // Perform your custom validation here
-                                var name = $("#comment-name").val().trim();
-                                var email = $("#comment-email").val().trim();
-                                var comment = $("#comment-comment").val().trim();
+                                var nameElement = $("#comment-name");
+                                var emailElement = $("#comment-email");
+                                var commentElement = $("#comment-comment");
+
+                                if (nameElement.length > 0) {
+                                    var name = nameElement.val().trim();
+                                }
+
+                                if (emailElement.length > 0) {
+                                    var email = emailElement.val().trim();
+                                }
+
+                                if (commentElement.length > 0) {
+                                    var comment = commentElement.val().trim();
+                                }
+
 
                                 // Flag to track if there are any errors
                                 var hasErrors = false;

diff --git a/resources/views/themes/default1/client/layout/client.blade.php b/resources/views/themes/default1/client/layout/client.blade.php
@@ -160,7 +160,11 @@
                                     </ul>
                                 </li>
 
-                                 <?php $pages = App\Model\kb\Page::where('status', '1')->where('visibility', '1')->get();
+                                 <?php
+                                    if(!Auth::check() || Auth::user()->role == 'user')
+                                 $pages = App\Model\kb\Page::where('status', '1')->where('visibility', '1')->get();
+                                    else
+                                        $pages = App\Model\kb\Page::where('status', '1')->get();
                                 ?>
                                  @if(count($pages))
                                 <li @yield('pages') class="nav-item dropdown">