Some improvements

Freddiefady · Jan 27, 2025 · 7c0bbda · 7c0bbda
1 parent b3a03c3
commit 7c0bbda
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 23 deletions.
diff --git a/app/Http/Controllers/Api/Auth/Account/PostsController.php b/app/Http/Controllers/Api/Auth/Account/PostsController.php
@@ -26,10 +26,10 @@ public function index()
         }
 
         $posts = $user->posts()->active()->activeCategory()->get();
-        if (!$posts) {
-            return responseApi(null, 'No posts found.', 404);
+        if ($posts->count() > 0) {
+            return responseApi(new PostsCollection($posts), 'Response posts data successfully', 200);
         }
-        return responseApi(new PostsCollection($posts), 'Response posts data successfully', 200);
+        return responseApi(null, 'No posts found.', 404);
     }
     public function store(PostRequest $request)
     {

diff --git a/app/Http/Controllers/Api/SettingsController.php b/app/Http/Controllers/Api/SettingsController.php
@@ -14,7 +14,7 @@ public function getSettings()
     {
         $settings = Setting::first();
         if(!$settings){
-            return responseApi(new SettingsResoucres($settings), 'Not found Settings', 404);
+            return responseApi(null, 'Not found Settings', 404);
         }
         $data = [
             'settings' => new SettingsResoucres($settings),
@@ -26,8 +26,8 @@ public function relatedNews()
     {
         $related = RelatedNewsSite::select('name', 'url')->get();
         if(!$related){
-            return responseApi($related, 'Not found related', 404);
+            return responseApi(null, 'Not found related', 404);
         }
-        return responseApi(['related-news'=>$related], 'Response data successfully', 200);
+        return $related;
     }
 }
diff --git a/app/Http/Controllers/Dashboard/Admins/AdminController.php b/app/Http/Controllers/Dashboard/Admins/AdminController.php
@@ -100,11 +100,11 @@ public function update(AdminsRequest $request, string $id)
     public function destroy(string $id)
     {
         $admin = Admin::findOrFail($id);
-        $admin->delete();
         if(!$admin)
         {
             return redirect()->back()->with('error', 'Invalid Try again');
         }
+        $admin->delete();
         Session::flash('success', 'Deleted Successfully');
         return redirect()->back();
     }

diff --git a/app/Http/Controllers/Dashboard/Posts/PostController.php b/app/Http/Controllers/Dashboard/Posts/PostController.php
@@ -151,7 +151,7 @@ public function imageDestroy(Request $request, $image_id)
         if (!$image)
         {
             return response()->json([
-                'status'=>201,
+                'status'=>404,
                 'msg'=>'Image Not Found',
             ]);
         }

diff --git a/app/Http/Controllers/Frontend/Dashboard/NotificationController.php b/app/Http/Controllers/Frontend/Dashboard/NotificationController.php
@@ -15,9 +15,9 @@ public function index()
     }
     public function show()
     {
-    auth()->user()->unreadNotifications->markAsRead();
-    Session::flash('success', 'Notification has been marked as read');
-    return redirect()->back();
+        auth()->user()->unreadNotifications->markAsRead();
+        Session::flash('success', 'Notification has been marked as read');
+        return redirect()->back();
     }
     public function destroyAll()
     {

diff --git a/app/Http/Controllers/Frontend/Dashboard/ProfileController.php b/app/Http/Controllers/Frontend/Dashboard/ProfileController.php
@@ -115,7 +115,7 @@ public function imageDestroy(Request $request, $image_id)
         if (!$image)
         {
             return response()->json([
-                'status'=>201,
+                'status'=>404,
                 'msg'=>'Image Not Found',
             ]);
         }

diff --git a/app/Http/Controllers/Frontend/Dashboard/SettingController.php b/app/Http/Controllers/Frontend/Dashboard/SettingController.php
@@ -22,7 +22,7 @@ public function update(UserSettingsRequest $request)
         $request->validated();
         // code to update user settings goes here
         $user = User::findOrFail(auth()->user()->id);
-        $user->update($request->except(['_token, image']));
+        $user->update($request->except(['_token','image']));
         ImageManager::UploadImages($request, $user, null);
 
         return redirect()->back()->with('success', 'User settings updated successfully');

diff --git a/app/Http/Resources/PostsResoucre.php b/app/Http/Resources/PostsResoucre.php
@@ -14,7 +14,7 @@ class PostsResoucre extends JsonResource
      */
     public function toArray(Request $request): array
     {
-        $data =  [
+        $data =  [  
             'id' => $this->id,
             'title'=>$this->title,
             'slug'=>$this->slug,

diff --git a/routes/api.php b/routes/api.php
@@ -1,20 +1,20 @@
 <?php
 
-use App\Http\Controllers\Api\Auth\Account\NotificationsContoller;
-use App\Http\Controllers\Api\Auth\Account\PostsController;
-use App\Http\Controllers\Api\Auth\Account\ProfileController;
-use App\Http\Controllers\Api\Auth\EmailVerifyController;
-use App\Http\Controllers\Api\Auth\LoginController;
-use App\Http\Controllers\Api\Auth\password\ForgetPasswordController;
-use App\Http\Controllers\Api\Auth\password\ResetPasswordController;
-use App\Http\Controllers\Api\Auth\RegistrationController;
 use Illuminate\Http\Request;
+use App\Http\Resources\UserResource;
 use Illuminate\Support\Facades\Route;
 use App\Http\Controllers\Api\ContactController;
 use App\Http\Controllers\Api\GeneralController;
 use App\Http\Controllers\Api\CategoryController;
 use App\Http\Controllers\Api\SettingsController;
-use App\Http\Resources\UserResource;
+use App\Http\Controllers\Api\Auth\LoginController;
+use App\Http\Controllers\Api\Auth\EmailVerifyController;
+use App\Http\Controllers\Api\Auth\RegistrationController;
+use App\Http\Controllers\Api\Auth\Account\PostsController;
+use App\Http\Controllers\Api\Auth\Account\ProfileController;
+use App\Http\Controllers\Api\Auth\Account\NotificationsContoller;
+use App\Http\Controllers\Api\Auth\password\ResetPasswordController;
+use App\Http\Controllers\Api\Auth\password\ForgetPasswordController;
 
 /*
 |--------------------------------------------------------------------------