Major Enhancement

Author: YasserElgammal

app/Http/Controllers/Admin/AccountController.php

@@ -3,8 +3,7 @@
 namespace App\Http\Controllers\Admin;
 
 use App\Http\Controllers\Controller;
-use App\Http\Requests\UpdateAccountRequest;
-use App\Models\User;
+use App\Http\Requests\Admin\UpdateAccountRequest;
 use Illuminate\Support\Facades\Storage;
 
 class AccountController extends Controller

app/Http/Controllers/Admin/CategoryController.php

@@ -3,11 +3,9 @@
 namespace App\Http\Controllers\Admin;
 
 use App\Http\Controllers\Controller;
-use App\Http\Requests\StoreCategoryRequest;
-use App\Http\Requests\UpdateCategoryRequest;
+use App\Http\Requests\Admin\CategoryRequest;
 use App\Models\Category;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Str;
 
 class CategoryController extends Controller
@@ -39,7 +37,7 @@ public function create()
      * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Http\Response
      */
-    public function store(StoreCategoryRequest $request)
+    public function store(CategoryRequest $request)
     {
         $validate = $request->validated();
         Category::create($validate);
@@ -76,7 +74,7 @@ public function edit(Category $category)
      * @param  int  $id
      * @return \Illuminate\Http\Response
      */
-    public function update(UpdateCategoryRequest $request, Category $category)
+    public function update(CategoryRequest $request, Category $category)
     {
         $vaildated = $request->validated();
         $category->update($vaildated);

app/Http/Controllers/Admin/PageController.php

@@ -3,7 +3,7 @@
 namespace App\Http\Controllers\Admin;
 
 use App\Http\Controllers\Controller;
-use App\Http\Requests\StorePageRequest;
+use App\Http\Requests\Admin\PageRequest;
 use Illuminate\Http\Request;
 use App\Models\Page;
 use Illuminate\Support\Str;
@@ -21,7 +21,7 @@ public function create(){
         return view('admin.page.create');
     }
 
-    public function store(StorePageRequest $request){
+    public function store(PageRequest $request){
 
         $page_data = $request->validated();
         $page_data['user_id'] = auth()->user()->id;
@@ -32,6 +32,16 @@ public function store(StorePageRequest $request){
         return to_route('admin.page.index')->with('message', 'Page Created');
     }
 
+    public function update(PageRequest $request, Page $page){
+
+        $page_data = $request->validated();
+        $page_data['user_id'] = auth()->user()->id;
+
+        $page->update($page_data);
+
+        return to_route('admin.page.index')->with('message', 'Page Updated');
+    }
+
     public function edit(Page $page){
 
         return view('admin.page.edit', compact('page'));

app/Http/Controllers/Admin/PostController.php

@@ -3,8 +3,7 @@
 namespace App\Http\Controllers\Admin;
 
 use App\Http\Controllers\Controller;
-use App\Http\Requests\StorePostRequest;
-use App\Http\Requests\UpdatePostRequest;
+use App\Http\Requests\Admin\PostRequest;
 use App\Models\Category;
 use App\Models\Post;
 use App\Models\Tag;
@@ -47,7 +46,7 @@ public function create()
      * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Http\Response
      */
-    public function store(StorePostRequest $request)
+    public function store(PostRequest $request)
     {
         $post_data = $request->safe()->except('image');
 
@@ -90,7 +89,7 @@ public function edit(Post $post)
      * @param  int  $id
      * @return \Illuminate\Http\Response
      */
-    public function update(UpdatePostRequest $request, Post $post)
+    public function update(PostRequest $request, Post $post)
     {
         $post_data = $request->safe()->except('image');
 

app/Http/Controllers/Admin/SettingController.php

@@ -3,9 +3,8 @@
 namespace App\Http\Controllers\Admin;
 
 use App\Http\Controllers\Controller;
-use App\Http\Requests\UpdateSettingRequest;
+use App\Http\Requests\Admin\UpdateSettingRequest;
 use App\Models\Setting;
-use Illuminate\Http\Request;
 
 class SettingController extends Controller
 {

app/Http/Controllers/Admin/TagController.php

@@ -3,8 +3,7 @@
 namespace App\Http\Controllers\Admin;
 
 use App\Http\Controllers\Controller;
-use App\Http\Requests\StoreTagRequest;
-use App\Http\Requests\UpdateTagRequest;
+use App\Http\Requests\Admin\TagRequest;
 use App\Models\Tag;
 use Illuminate\Http\Request;
 
@@ -37,7 +36,7 @@ public function create()
      * @param  \Illuminate\Http\Request  $request
      * @return \Illuminate\Http\Response
      */
-    public function store(StoreTagRequest $request)
+    public function store(TagRequest $request)
     {
         $validate = $request->validated();
         Tag::create($validate);
@@ -63,7 +62,7 @@ public function edit(Tag $tag)
      * @param  int  $id
      * @return \Illuminate\Http\Response
      */
-    public function update(UpdateTagRequest $request, Tag $tag)
+    public function update(TagRequest $request, Tag $tag)
     {
         $vaildated = $request->validated();
         $tag->update($vaildated);

app/Http/Controllers/CategoryController.php renamed to app/Http/Controllers/Front/CategoryController.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\Front;
 
+use App\Http\Controllers\Controller;
 use App\Models\Category;
-use Illuminate\Http\Request;
 
 class CategoryController extends Controller
 {

app/Http/Controllers/CommentController.php renamed to app/Http/Controllers/Front/CommentController.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\Front;
 
-use App\Http\Requests\CommentRequest;
+use App\Http\Controllers\Controller;
+use App\Http\Requests\Front\CommentRequest;
 use App\Models\Comment;
 use App\Models\Post;
-use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 
 class CommentController extends Controller

app/Http/Controllers/HomeController.php renamed to app/Http/Controllers/Front/HomeController.php

@@ -1,7 +1,8 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\Front;
 
+use App\Http\Controllers\Controller;
 use App\Models\Post;
 
 class HomeController extends Controller
@@ -10,7 +11,7 @@ class HomeController extends Controller
     public function index()
     {
         // Get the active posts with (Category and User) details
-        $posts = Post::whereStatus(true)->with(['category', 'user'])->orderBy('id','desc')->paginate(10);
+        $posts = Post::published()->with(['category', 'user'])->latest('created_at')->paginate(10);
 
         return view('index', compact('posts'));
     }

app/Http/Controllers/PageController.php renamed to app/Http/Controllers/Front/PageController.php

@@ -1,9 +1,9 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\Front;
 
+use App\Http\Controllers\Controller;
 use App\Models\Page;
-use Illuminate\Http\Request;
 
 class PageController extends Controller
 {

app/Http/Controllers/PostController.php renamed to app/Http/Controllers/Front/PostController.php

@@ -1,11 +1,9 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\Front;
 
-use App\Http\Requests\CommentRequest;
+use App\Http\Controllers\Controller;
 use App\Models\Post;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Cookie;
 
 class PostController extends Controller

app/Http/Controllers/ProfileController.php renamed to app/Http/Controllers/Front/ProfileController.php

@@ -1,8 +1,9 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\Front;
 
-use App\Http\Requests\ProfileUpdateRequest;
+use App\Http\Controllers\Controller;
+use App\Http\Requests\Front\ProfileUpdateRequest;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Redirect;

app/Http/Controllers/TagController.php renamed to app/Http/Controllers/Front/TagController.php

@@ -1,10 +1,9 @@
 <?php
 
-namespace App\Http\Controllers;
+namespace App\Http\Controllers\Front;
 
-use App\Models\Post;
+use App\Http\Controllers\Controller;
 use App\Models\Tag;
-use Illuminate\Http\Request;
 
 class TagController extends Controller
 {

app/Http/Requests/UpdateCategoryRequest.php renamed to app/Http/Requests/Admin/CategoryRequest.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Http\Requests\Admin;
 
 use App\Rules\Authcheck;
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
 
-class UpdateCategoryRequest extends FormRequest
+class CategoryRequest extends FormRequest
 {
     /**
      * Determine if the user is authorized to make this request.
@@ -26,8 +26,8 @@ public function authorize()
     public function rules()
     {
         return [
-            'name' => ['required', 'min:3', 'max:25'],
-            'slug' => ['required', Rule::unique('categories')->ignore($this->category->id)],
+            'name' => ['required', 'min:3', 'max:25', Rule::unique('categories')->ignore($this?->category?->id)],
+            'slug' => ['required', Rule::unique('categories')->ignore($this?->category?->id)],
             'user_id' => ['required', 'exists:users,id', new Authcheck]
         ];
     }

app/Http/Requests/StorePageRequest.php renamed to app/Http/Requests/Admin/PageRequest.php

@@ -1,10 +1,11 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Http\Requests\Admin;
 
 use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Rule;
 
-class StorePageRequest extends FormRequest
+class PageRequest extends FormRequest
 {
     /**
      * Determine if the user is authorized to make this request.
@@ -27,7 +28,7 @@ public function rules()
 
         return [
             'name' => ['required', 'min:3'],
-            'slug' => ['required', 'unique:pages'],
+            'slug' => ['required', Rule::unique('pages')->ignore($this?->page?->id)],
             'content' => ['required', 'min:10'],
             'navbar' => ['required', 'boolean'],
             'footer' => ['required', 'boolean'],

app/Http/Requests/UpdatePostRequest.php renamed to app/Http/Requests/Admin/PostRequest.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Http\Requests\Admin;
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
 
-class UpdatePostRequest extends FormRequest
+class PostRequest extends FormRequest
 {
     /**
      * Determine if the user is authorized to make this request.
@@ -28,9 +28,9 @@ public function rules()
             'title' => ['required', 'min:3'],
             'content' => ['required', 'min:20'],
             'category_id' => ['required', 'exists:categories,id'],
-            'slug' => ['required', Rule::unique('posts')->ignore($this->post->id)],
+            'slug' => ['required', Rule::unique('posts')->ignore($this?->post?->id)],
             'status' => ['required', 'boolean'],
-            'image' => ['image', 'mimes:jpeg,png,jpg', 'max:2048'],
+            'image' => ['image', 'mimes:jpeg,png,jpg', 'max:2048', Rule::requiredIf(!$this?->post?->id)],
             'tags' => ['exists:tags,id']
         ];
     }

app/Http/Requests/UpdateTagRequest.php renamed to app/Http/Requests/Admin/TagRequest.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Http\Requests\Admin;
 
-use Illuminate\Validation\Rule;
 use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Rule;
 
-class UpdateTagRequest extends FormRequest
+class TagRequest extends FormRequest
 {
     /**
      * Determine if the user is authorized to make this request.
@@ -25,7 +25,7 @@ public function authorize()
     public function rules()
     {
         return [
-            'name' => ['required', 'min:3', 'max:25', Rule::unique('tags')->ignore($this->tag->id)],
+            'name' => ['required', 'min:3', 'max:25', Rule::unique('tags')->ignore($this?->tag?->id)],
         ];
     }
 }

app/Http/Requests/UpdateAccountRequest.php renamed to app/Http/Requests/Admin/UpdateAccountRequest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Http\Requests\Admin;
 
 use Illuminate\Foundation\Http\FormRequest;
 

app/Http/Requests/UpdateSettingRequest.php renamed to app/Http/Requests/Admin/UpdateSettingRequest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Http\Requests\Admin;
 
 use Illuminate\Foundation\Http\FormRequest;
 
@@ -25,7 +25,7 @@ public function rules()
     {
         return [
             'site_name' => ['required', 'min:3', 'max:20'],
-            'contact_mail' => ['required', 'email', 'max:255'],
+            'contact_email' => ['required', 'email', 'max:255'],
             'description' => ['required', 'min:3', 'max:255'],
             'about' => ['required', 'min:3', 'max:255'],
             'copy_rights' => ['required', 'min:3'],

app/Http/Requests/CommentRequest.php renamed to app/Http/Requests/Front/CommentRequest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Http\Requests\Front;
 
 use Illuminate\Foundation\Http\FormRequest;
 

app/Http/Requests/ProfileUpdateRequest.php renamed to app/Http/Requests/Front/ProfileUpdateRequest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Requests;
+namespace App\Http\Requests\Front;
 
 use App\Models\User;
 use Illuminate\Foundation\Http\FormRequest;