WIP: PostController actions and public assets

chrisjk123 · chrisjk123 · commit f8f8d333230c · 2020-01-18T18:37:39.000Z
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,4 +8,5 @@ All notable changes to `blogger` will be documented in this file
 
 ## 1.0.1 - XX-XX-2020
 
-Updates to comments and tags
+- Updates to comments and tags
+- Add facades
diff --git a/routes/web.php b/routes/web.php
@@ -2,6 +2,8 @@
 
 Route::group(['middleware' => config('blog.middleware')], function () {
     Route::resource('posts', 'PostController');
+    Route::resource('tags', 'TagController');
+    Route::resource('categories', 'CategoryController');
 });
 
 Route::get('posts/{post}', 'PostController@show')->name('posts.show');
diff --git a/src/BlogServiceProvider.php b/src/BlogServiceProvider.php
@@ -105,6 +105,10 @@ private function handleMigrations()
     private function handlePublishing()
     {
         if ($this->app->runningInConsole()) {
+            $this->publishes([
+                __DIR__.'/../public' => public_path('vendor/blog'),
+            ], 'blog-assets');
+
             $this->publishes([
                 __DIR__.'/../database/factories/' => database_path('factories'),
             ], 'blog-factories');
diff --git a/src/Controllers/CategoryController.php b/src/Controllers/CategoryController.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace Chriscreates\Blog\Controllers;
+
+use Chriscreates\Blog\Category;
+use Illuminate\Http\Request;
+
+class CategoryController extends Controller
+{
+    /**
+     * Instantiate a new controller instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->middleware('auth');
+    }
+
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index() : JsonResponse
+    {
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \Chriscreates\Blog\Requests\ValidateCategoryRequest  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(ValidateCategoryRequest $request) : JsonResponse
+    {
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  \Chriscreates\Blog\Category  $category
+     * @return \Illuminate\Http\Response
+     */
+    public function edit(Category $category) : JsonResponse
+    {
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Chriscreates\Blog\Requests\ValidateCategoryRequest  $request
+     * @param  \Chriscreates\Blog\Category  $category
+     * @return \Illuminate\Http\Response
+     */
+    public function update(ValidateCategoryRequest $request, Category $category) : JsonResponse
+    {
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  \Chriscreates\Blog\Category  $category
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy(Category $category) : JsonResponse
+    {
+    }
+}
diff --git a/src/Controllers/PostController.php b/src/Controllers/PostController.php
@@ -4,8 +4,11 @@
 
 use Artesaos\SEOTools\Facades\OpenGraph;
 use Artesaos\SEOTools\Facades\SEOMeta;
+use Chriscreates\Blog\Category;
 use Chriscreates\Blog\Post;
 use Chriscreates\Blog\Requests\ValidatePostRequest;
+use Chriscreates\Blog\Tag;
+use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Storage;
 
@@ -42,16 +45,22 @@ public function index()
      */
     public function create()
     {
-        return view('admin.posts.create-post');
+        $post = new Post;
+
+        return view('admin.posts.edit-post', [
+            'post' => $post,
+            'categories' => Category::all(),
+            'tags' => Tag::all(),
+        ]);
     }
 
     /**
      * Store a newly created resource in storage.
      *
-     * @param  \App\Http\Requests\ValidatePostRequest  $request
-     * @return \Illuminate\Http\Response
+     * @param  \Chriscreates\Blog\Requests\ValidatePostRequest  $request
+     * @return \Illuminate\Http\JsonResponse
      */
-    public function store(ValidatePostRequest $request)
+    public function store(ValidatePostRequest $request) : JsonResponse
     {
         $post = Post::create($request->only([
             'title',
@@ -64,9 +73,7 @@ public function store(ValidatePostRequest $request)
             'allow_guest_comments',
         ]));
 
-        return redirect()
-        ->route('posts.edit', ['post' => $post->id])
-        ->with('success', 'Post created.');
+        return response()->json($post);
     }
 
     /**
@@ -98,17 +105,23 @@ public function show(Post $post)
      */
     public function edit(Post $post)
     {
-        return view('admin.posts.edit-post', compact('post'));
+        $post->load('category', 'tags');
+
+        return view('admin.posts.edit-post', [
+            'post' => $post,
+            'categories' => Category::all(),
+            'tags' => Tag::all(),
+        ]);
     }
 
     /**
      * Update the specified resource in storage.
      *
-     * @param  \App\Http\Requests\ValidatePostRequest  $request
+     * @param  \Chriscreates\Blog\Requests\ValidatePostRequest  $request
      * @param  \Chriscreates\Blog\Post  $post
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
-    public function update(ValidatePostRequest $request, Post $post)
+    public function update(ValidatePostRequest $request, Post $post) : JsonResponse
     {
         $post->update($request->only([
             'title',
@@ -121,23 +134,23 @@ public function update(ValidatePostRequest $request, Post $post)
             'allow_guest_comments',
         ]));
 
-        return redirect()
-        ->route('posts.edit', ['post' => $post->id])
-        ->with('success', 'Post updated.');
+        $post->refresh();
+
+        return response()->json($post);
     }
 
     /**
      * Remove the specified resource from storage.
      *
      * @param  \Chriscreates\Blog\Post  $post
-     * @return \Illuminate\Http\Response
+     * @return \Illuminate\Http\JsonResponse
      */
-    public function destroy(Post $post)
+    public function destroy(Post $post) : JsonResponse
     {
         $post->delete();
 
-        return redirect()
-        ->route('posts.index')
-        ->with('success', 'Post deleted.');
+        $post = new Post;
+
+        return response()->json($post);
     }
 }
diff --git a/src/Controllers/TagController.php b/src/Controllers/TagController.php
@@ -0,0 +1,69 @@
+<?php
+
+namespace Chriscreates\Blog\Controllers;
+
+use Chriscreates\Blog\Tag;
+use Illuminate\Http\Request;
+
+class TagController extends Controller
+{
+    /**
+     * Instantiate a new controller instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        $this->middleware('auth');
+    }
+
+    /**
+     * Display a listing of the resource.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function index() : JsonResponse
+    {
+    }
+
+    /**
+     * Store a newly created resource in storage.
+     *
+     * @param  \Chriscreates\Blog\Requests\ValidateTagRequest  $request
+     * @return \Illuminate\Http\Response
+     */
+    public function store(ValidateTagRequest $request) : JsonResponse
+    {
+    }
+
+    /**
+     * Show the form for editing the specified resource.
+     *
+     * @param  \Chriscreates\Blog\Tag  $tag
+     * @return \Illuminate\Http\Response
+     */
+    public function edit(Tag $tag) : JsonResponse
+    {
+    }
+
+    /**
+     * Update the specified resource in storage.
+     *
+     * @param  \Chriscreates\Blog\Requests\ValidateTagRequest  $request
+     * @param  \Chriscreates\Blog\Tag  $tag
+     * @return \Illuminate\Http\Response
+     */
+    public function update(ValidateTagRequest $request, Tag $tag) : JsonResponse
+    {
+    }
+
+    /**
+     * Remove the specified resource from storage.
+     *
+     * @param  \Chriscreates\Blog\Tag  $tag
+     * @return \Illuminate\Http\Response
+     */
+    public function destroy(Tag $tag) : JsonResponse
+    {
+    }
+}
diff --git a/src/Observers/PostObserver.php b/src/Observers/PostObserver.php
@@ -3,6 +3,7 @@
 namespace Chriscreates\Blog\Observers;
 
 use Chriscreates\Blog\Post;
+use Illuminate\Support\Facades\Auth;
 
 class PostObserver
 {
@@ -23,7 +24,7 @@ public function saving(Post $post)
         }
 
         if ( ! request()->filled('user_id')) {
-            $post->user_id = auth()->id();
+            $post->user_id = Auth::id();
         }
 
         if ( ! request()->filled('slug')) {
@@ -45,6 +46,8 @@ public function deleting(Post $post)
     {
         $post->tags()->detach();
 
-        $post->comments()->delete();
+        if ($post->comments()) {
+            $post->comments()->delete();
+        }
     }
 }
diff --git a/src/Post.php b/src/Post.php
@@ -18,9 +18,9 @@ class Post extends Model
     PostsHaveComments,
     PostsHaveACategory;
 
-    const PUBLISHED = 'published';
-    const DRAFT = 'draft';
-    const SCHEDULED = 'scheduled';
+    public const PUBLISHED = 'published';
+    public const DRAFT = 'draft';
+    public const SCHEDULED = 'scheduled';
 
     protected $table = 'posts';
 
@@ -30,7 +30,13 @@ class Post extends Model
 
     public $timestamps = true;
 
-    protected $appends = ['tagsCount'];
+    protected $appends = [
+        'tags_count',
+        'statuses',
+        'friendly_status',
+        'view_path',
+        'delete_path',
+    ];
 
     protected $dates = ['published_at'];
 
@@ -154,4 +160,40 @@ public function statuses()
             self::SCHEDULED,
         ]);
     }
+
+    public function getStatusesAttribute()
+    {
+        return $this->statuses()->toArray();
+    }
+
+    public function getFriendlyStatusAttribute()
+    {
+        if ($this->isDraft()) {
+            return ucfirst(self::DRAFT);
+        }
+
+        if ($this->isScheduled()) {
+            return ucfirst(self::SCHEDULED)." for: {$this->published_at->format('d-m-Y')}";
+        }
+
+        return ucfirst(self::PUBLISHED);
+    }
+
+    public function getViewPathAttribute()
+    {
+        if ( ! $this->id) {
+            return '';
+        }
+
+        return route('posts.show', ['post' => $this->id]);
+    }
+
+    public function getDeletePathAttribute()
+    {
+        if ( ! $this->id) {
+            return '';
+        }
+
+        return route('posts.destroy', ['post' => $this->id]);
+    }
 }
diff --git a/src/Requests/ValidateCategoryRequest.php b/src/Requests/ValidateCategoryRequest.php
diff --git a/src/Requests/ValidateTagRequest.php b/src/Requests/ValidateTagRequest.php

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`namespace Chriscreates\Blog\Observers;`
`4`	`4`
`5`	`5`	`use Chriscreates\Blog\Post;`
	`6`	`+use Illuminate\Support\Facades\Auth;`
`6`	`7`
`7`	`8`	`class PostObserver`
`8`	`9`	`{`
`@@ -23,7 +24,7 @@ public function saving(Post $post)`
`23`	`24`	`}`
`24`	`25`
`25`	`26`	`if ( ! request()->filled('user_id')) {`
`26`		`- $post->user_id = auth()->id();`
	`27`	`+ $post->user_id = Auth::id();`
`27`	`28`	`}`
`28`	`29`
`29`	`30`	`if ( ! request()->filled('slug')) {`
`@@ -45,6 +46,8 @@ public function deleting(Post $post)`
`45`	`46`	`{`
`46`	`47`	`$post->tags()->detach();`
`47`	`48`
`48`		`- $post->comments()->delete();`
	`49`	`+ if ($post->comments()) {`
	`50`	`+ $post->comments()->delete();`
	`51`	`+ }`
`49`	`52`	`}`
`50`	`53`	`}`