fixed post categorization

chetans9 · Oct 16, 2022 · 0ba6aeb · 0ba6aeb
1 parent d8e9a36
commit 0ba6aeb
Show file tree

Hide file tree

Showing 15 changed files with 28 additions and 96 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -14,10  14,11 @@ RUN apk add busybox-extras
 RUN apk add nano
 RUN apk add curl
 RUN apk add libxml2 libxslt-dev
 RUN apk add jpeg-dev libpng-dev
 
 # COPY ./docker/php/config/php.ini /usr/local/etc/php
 
-#RUN docker-php-ext-configure gd --with-freetype --with-jpeg
 RUN docker-php-ext-configure gd --with-jpeg
 RUN docker-php-ext-install pdo pdo_mysql gd zip soap
 
 

diff --git a/app/Http/Controllers/Admin/Posts/AdminPostsCategoriesController.php b/app/Http/Controllers/Admin/Posts/AdminPostsCategoriesController.php
@@ -5,7  5,7 @@
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
 use App\Models\User;
-use App\Models\PostCategoriesModel;
 use App\Models\CategoriesModel;
 
 class AdminPostsCategoriesController extends Controller
 {
@@ -23,7  23,7 @@ public function __construct()
     public function index()
     {
 
-        $list = PostCategoriesModel::paginate(50);
         $list = CategoriesModel::paginate(50);
 
 
         return view('admin.post_categories.list', compact('list'));
@@ -54,7  54,7 @@ public function store(Request $request)
         ]);
         $inputs = $request->all();
 
-        $status = PostCategoriesModel::create($inputs);
         $status = CategoriesModel::create($inputs);
         $request->session()->flash('success', 'New Category created Successfully!');
         return redirect("admin/posts-categories");
 
@@ -70,7  70,7 @@ public function store(Request $request)
     public function edit($id)
     {
 
-        $post_category = PostCategoriesModel::findOrFail($id);
         $post_category = CategoriesModel::findOrFail($id);
         $data['post_category'] = $post_category;
         return view('admin.post_categories.edit', $data);
 
@@ -89,7  89,7 @@ public function update(Request $request, $id)
             'name' => 'required',
         ]);
         $inputs = $request->all();
-        $postCategory = PostCategoriesModel::findOrFail($id);
         $postCategory = CategoriesModel::findOrFail($id);
         $postCategory->fill($inputs);
         $postCategory->save();
         $request->session()->flash('success', 'Category Updated Successfully!');
@@ -104,7  104,7 @@ public function update(Request $request, $id)
      */
     public function destroy($id)
     {
-        $postCategory = PostCategoriesModel::findOrFail($id);
         $postCategory = CategoriesModel::findOrFail($id);
         $postCategory->delete($id);
         $request->session()->flash('info','Category deleted Successfully');
         return redirect(route('posts-categories.index'));

diff --git a/app/Http/Controllers/Admin/Posts/AdminPostsController.php b/app/Http/Controllers/Admin/Posts/AdminPostsController.php
@@ -8,7  8,7 @@
 use Illuminate\Support\Str;
 use App\Models\PostsModel;
 use App\Repositories\UserRepository;
-use App\Models\PostCategoriesModel;
 use App\Models\CategoriesModel;
 use App\Repositories\TagsRepository;
 use Auth;
 use Yajra\Datatables\Datatables;
@@ -64,7  64,8 @@ public function index(Request $request)
     public function create()
     {
         $data = array();
-        $categories = PostCategoriesModel::pluck("name","id");
         //Get key value pair data from categories table for populating in dropdown:
         $categories = CategoriesModel::pluck("name","id");
         $data['post_tags'] = array();
         $data['categories'] = $categories;
         return view("admin.posts.create",$data);
@@ -83,7  84,7 @@ public function store(Request $request)
             'title' => 'required',
             'content' => 'required',
             'active' => 'required',
-            'categories'=>'required|array|min:1',
             'category_id'=>'required|numeric',
             'featured_image'=>'required'
         ]); 
         $inputs = $request->all();

diff --git a/app/Http/Controllers/Blog/PostCategoriesController.php b/app/Http/Controllers/Blog/PostCategoriesController.php
@@ -4,7  4,7 @@
 
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
-use App\Models\PostCategoriesModel;
 use App\Models\CategoriesModel;
 
 
 class PostCategoriesController extends Controller
@@ -18,7  18,7 @@ class PostCategoriesController extends Controller
      */
     public function show($id)
     {
-        $category  = PostCategoriesModel::findOrFail($id);
         $category  = CategoriesModel::findOrFail($id);
     	$posts = $category->posts()->where('posts.active','1')->paginate(10);
     	$data['category'] = $category;
     	$data['posts'] = $posts;

diff --git a/app/Http/Controllers/Blog/PostsController.php b/app/Http/Controllers/Blog/PostsController.php
@@ -4,7  4,7 @@
 
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
-use App\Models\PostCategoriesModel;
 use App\Models\CategoriesModel;
 use App\Models\PostsModel;
 use App\Models\User;
 use App\Models\CommentsModel;

diff --git a/app/Http/Controllers/Home/HomeController.php b/app/Http/Controllers/Home/HomeController.php
@@ -6,7  6,7 @@
 use App\Http\Controllers\Controller;
 use App\Models\PostsModel;
 use App\Models\User;
-use App\Models\PostCategoriesModel;
 use App\Models\CategoriesModel;
 use App\Models\TagsModel;
 use Auth;
 
@@ -25,7  25,7 @@ public function index()
 
     	$data = array();
         $data['recent_posts'] = PostsModel::OrderBy('created_at', 'Desc')->where('active', '1')->limit(6)->get();
-        $data['post_categories'] = PostCategoriesModel::all();
         $data['post_categories'] = CategoriesModel::latest()->limit(25)->get();
         $data['tags'] =  TagsModel::has('posts')->get();
         $data['featured_posts'] = PostsModel::where('featured_post', '1')->get();
     	return view('home',$data);

diff --git a/app/Models/PostCategoriesModel.php → app/Models/CategoriesModel.php b/app/Models/PostCategoriesModel.php → app/Models/CategoriesModel.php
@@ -4,7  4,7 @@
 
 use Illuminate\Database\Eloquent\Model;
 
-class PostCategoriesModel extends Model
 class CategoriesModel extends Model
 {
     protected $table = "categories";
 
@@ -17,7  17,7 @@ class PostCategoriesModel extends Model
      */
     public function posts()
     {
-        return $this->belongsToMany('App\Models\PostsModel','post_category','category_id','post_id');
         return $this->hasMany('App\Models\PostsModel','category_id');
     }
 
 }
diff --git a/app/Models/PostsModel.php b/app/Models/PostsModel.php
@@ -26,9  26,9 @@ class PostsModel extends Model
      *
      * @return \Illuminate\Database\Eloquent\Relations\BelongsToMany
      */
-    public function categories()
     public function category()
     {
-        return $this->belongsToMany('App\Models\PostCategoriesModel','post_category','post_id','category_id');
         return $this->belongsTo('App\Models\CategoriesModel','category_id');
     }
 
     /**

diff --git a/database/migrations/2017_09_02_163048_create_posts_table.php b/database/migrations/2017_09_02_163048_create_posts_table.php
@@ -20,6  20,7 @@ public function up()
             $table->text('content');
             $table->string('featured_image');
             $table->boolean('active')->default(false);
             $table->integer('category_id')->unsigned();
             $table->integer('user_id')->unsigned();
             $table->timestamps();
         });

diff --git a/database/migrations/2018_01_09_064324_post_category_table.php b/database/migrations/2018_01_09_064324_post_category_table.php
diff --git a/database/migrations/2018_01_10_075753_Drop_unique_slug_posts.php b/database/migrations/2018_01_10_075753_Drop_unique_slug_posts.php
diff --git a/public/uploads/images/blog/colour-math-function-1170167.jpg b/public/uploads/images/blog/colour-math-function-1170167.jpg
diff --git a/public/uploads/images/blog/medium_colour-math-function-1170167.jpg b/public/uploads/images/blog/medium_colour-math-function-1170167.jpg
diff --git a/public/uploads/images/blog/thumb_colour-math-function-1170167.jpg b/public/uploads/images/blog/thumb_colour-math-function-1170167.jpg
diff --git a/resources/views/admin/posts/form.blade.php b/resources/views/admin/posts/form.blade.php
@@ -11,12  11,12 @@
         </span>
     @endif
 </div>
-<div class="form-group{{ $errors->has('categories') ? ' has-error' : '' }}">
-    {{Form::label('categories', 'Category *')}}
-    {{Form::select("categories[]",$categories,null, array("class"=>"form-control","id"=>"categories","multiple"=>"multiple"))}}
-    @if ($errors->has('categories'))
 <div class="form-group{{ $errors->has('category') ? ' has-error' : '' }}">
     {{Form::label('category_id', 'Category *')}}
     {{Form::select("category_id",$categories,null, array("class"=>"form-control","id"=>"category_id"))}}
     @if ($errors->has('category'))
         <span class="help-block">
-                <strong>{{ $errors->first('categories') }}</strong>
                 <strong>{{ $errors->first('category') }}</strong>
         </span>
     @endif
 </div>
@@ -111,7  111,7 @@ function readURL(input) {
 
         $(document).ready(function() {
 
-            $("#categories").select2();
             $("#category_id").select2();
 
             $("#tags").select2({
                 minimumInputLength: 2,