Caching changed

Author: jetmirhaxhisefa

.idea/DefaultTheme.iml

@@ -5,6 +5,7 @@
 
 use App\Models\Category;
 use App\Models\Post;
+use App\Models\PostType;
 use App\Models\Theme;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Frontend\MainController;
@@ -40,13 +41,19 @@ public function posts(Request $request){
             return error404();
         }
 
-        $posts = Post::cache("category_posts_".$category->categoryID, function($query) use($category){
-            return $query->generateCacheByCategory($category->categoryID);
-        })
-          ->published()
-          ->orderBy('published_at','DESC')
-          ->getItems()
-          ->paginate();
+        $postType = PostType::findByID($category->postTypeID);
+        $postObj = (new Post())->setTable($postType->slug);
+
+        $categoryTable = categoriesRelationTable($postType->slug);
+        $posts = $postObj
+            ->join($categoryTable, $categoryTable.'.postID', $postType->slug . '.postID')
+            ->where($categoryTable.'.categoryID', $category->categoryID)
+            ->with($postObj->getDefaultRelations($postType))
+            ->where('status->'.\App::getLocale(),'published')
+            ->orderBy('published_at', 'DESC')
+            ->paginate(25);
+
+            $posts = Post::filterPublished($posts);
 
         return view(Theme::view('category/posts'),compact('category', 'posts'));
     }

.idea/misc.xml

@@ -3,6 +3,7 @@
 namespace Themes\DefaultTheme\Controllers;
 
 use App\Http\Controllers\Frontend\MainController;
+use App\Models\Article;
 use App\Models\Post;
 use App\Models\Theme;
 use HTMLMin\HTMLMin\Http\Middleware\MinifyMiddleware;
@@ -33,7 +34,6 @@ public function homepage(){
         return view(Theme::view('pages/home'));
     }
 
-
     /**
      * This function is usually used to load a page
      * */
@@ -42,7 +42,6 @@ public function single(){
         if(!$post){
             return error404();
         }
-
         return view(Theme::view('pages/single'),compact('post'));
     }
 }

.idea/modules.xml

@@ -2,18 +2,14 @@
 
 namespace Themes\DefaultTheme\Controllers;
 
-use App\Models\Media;
-use App\Models\MediaRelation;
-use App\Models\MenuLink;
+use App\Models\Category;
 use App\Models\Post;
 use App\Models\PostType;
 use App\Models\Theme;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\Route;
-use Accio\App\Models\PostModel;
-use Accio\Support\Facades\Pagination;
 use App\Http\Controllers\Frontend\MainController;
+use App\Models\User;
+use Illuminate\Support\Facades\Route;
+use Symfony\Component\Console\Input\Input;
 
 class PostController extends MainController{
 
@@ -50,23 +46,21 @@ public function index(){
         if(PostType::validatePostType()){
             return error404();
         }
-
-        $posts = Post::cache('post_articles')
-          ->published()
-          ->orderBy('published_at','DESC')
-          ->take(2)
-          ->getItems()
-          ->paginate(10);
+        $postType = (\Request::route('postTypeSlug') ? \Request::route('postTypeSlug') : "post_articles");
+        $posts = (new Post())->setTable($postType)
+            ->with(["categories", "featuredimage"])
+            ->orderBy('published_at','DESC')
+            ->paginate(10);
 
         return view(Theme::view('posts/index'),compact('posts'));
     }
 
     public function single(){
-        $post = Post::findBySlug(\Request::route('postSlug'));
+        $post = Post::findBySlug(\Request::route('postSlug'), "post_articles");
         if(!$post){
             return error404();
         }
 
-        return view(Theme::view('posts/single'),compact('post'));
+        return view(Theme::view('posts/single'),compact('post', 'users'));
     }
 }

.idea/vcs.xml

@@ -23,14 +23,14 @@ public function single(){
          //get posts by tag
         $postsObj = new Post();
         $postsObj->setTable(PostType::getSlug());
-        $posts = $postsObj->join('tags_relations','tags_relations.belongsToID',PostType::getSlug().'.postID')
-          ->where('belongsTo',PostType::getSlug())
+        $posts = $postsObj->join(PostType::getSlug().'_tags', PostType::getSlug().'_tags.postID',PostType::getSlug().'.postID')
           ->with('featuredImage')
-          ->published()
           ->where('tagID',$tag['tagID'])
           ->orderBy('published_at','DESC')
           ->paginate(16);
 
+        $posts = Post::filterPublished($posts);
+
         return view(Theme::view('tags/single'),compact(['posts','tag']));
     }
 }

.idea/workspace.xml

@@ -19,6 +19,7 @@
 <?php event('theme:before_body'); ?>
 <body>
     <?php event('theme:body_start'); ?>
+
     @section('header')
         <nav class="navbar navbar-expand-md fixed-top navbar-dark bg-dark">
             <a class="navbar-brand" href="#">Logo</a>
@@ -74,5 +75,6 @@
         {!! js(false, ['async' => true]) !!}
     @show
 
+    <?php event('theme:body_end'); ?>
 </body>
 </html>

controllers/CategoryController.php

@@ -2,7 +2,7 @@
 
 @section('meta')
     @parent
-    {{metaTags(homepage())}}
+    {{ metaTags(homepage()) }}
 @endsection
 
 @section('header')
@@ -18,4 +18,4 @@
             ?>
         </p>
     </div>
-@endsection
+@endsection

controllers/PagesController.php

@@ -4,6 +4,7 @@
 
 @section('header')
     @parent
+    {{metaTags()}}
 @endsection
 
 @section('content')

controllers/PostController.php

@@ -1,14 +1,13 @@
 @extends('DefaultTheme.views.index')
 
 @section('meta')
-    {{metaTags($post)}}
+    {{--{{metaTags($post)}}--}}
 @endsection
 
 @section('content')
+
     <div class="container">
         <div class="row">
-
-
             <div class="col-sm-8 blog-main">
 
                 <div class="blog-post">
@@ -32,7 +31,7 @@
 
                         <div class="post-content">
                             <?php
-                                print $post->content();
+                            print $post->content();
                             ?>
                         </div>
                     </div>
@@ -76,4 +75,5 @@
         </div><!-- /.row -->
 
     </div>
+
 @endsection