from server 09.01

plugins/ahmadfatoni/apigenerator/controllers/api/postsController.php

@@ -24,7 +24,7 @@ class postsController extends Controller
     //postes list
     public function index(){
         $path = Config::get('app.cdn').Config::get('cms.storage.media.path');
-        $data = $this->Post::with(['categories:id,name'])->listFrontEnd([
+        $filter = [
             'page'             => input('page'),
             'sort'             => input('sort')??'published_at desc',
             'perPage'          => input('count'),
@@ -32,11 +32,16 @@ class postsController extends Controller
             'category'         => input('category'),
             'date'             => input('date'),
             'typePost'             => input('typePost'),
-            'postGroup'             => empty(input('group')) ? null : input('group'),
+            'postGroup'             => input('group'),
             'published'        => true,
-            'featured'        => input('featured') == true ? 1 : 0,
             'select'   => ['id','title','slug','published_at', 'more_photo', DB::raw("IF(featured_image<>'',concat('$path',featured_image),featured_image) as main_image")]
-        ]);
+        ];
+        
+        if(request()->has('featured')){
+            $filter['featured'] = true;    
+        }
+        
+        $data = $this->Post::with(['categories:id,name'])->listFrontEnd($filter);
 
         if($data){
             $data->each(function ($item, $key) {

plugins/rainlab/blog/models/post/columns.yaml

@@ -10,7 +10,7 @@ columns:
     categories:
         label: 'rainlab.blog::lang.post.categories'
         type: text
-        searchable: true
+        searchable: false
         select: name
         relation: categories
     locale:
@@ -21,35 +21,35 @@ columns:
         type: number
     created_at:
         label: 'rainlab.blog::lang.post.created'
-        type: date
+        type: datetime
         invisible: true
     updated_at:
         label: 'rainlab.blog::lang.post.updated'
-        type: date
+        type: datetime
         invisible: true
     published_at:
         label: 'rainlab.blog::lang.post.published'
-        type: date
+        type: datetime
     featured:
         label: Featured
         type: switch
     user_id:
         label: Author
         type: text
-        searchable: true
+        searchable: false
         sortable: true
         select: login
         relation: user
     type_post:
         label: 'Main Cat'
         type: text
-        searchable: true
+        searchable: false
         invisible: true
         sortable: true
     category_group:
         label: 'Cat Group'
         type: text
-        searchable: true
+        searchable: false
         sortable: true
         select: name
         relation: category_groups

themes/modern2/pages/new/afisha-post.htm

@@ -1,4 +1,4 @@
-title = "new/afisha-post"
+title = "Афиша"
 url = "/new/afisha-post/:id/:slug"
 layout = "new/master-inside"
 is_hidden = 0
@@ -12,6 +12,9 @@ slug = "{{ :slug }}"
 slug = "{{ :slug }}"
 id = "{{ :id }}"
 categoryPage = 404
+
+[SeoBlogPost]
+post = "post"
 ==
 <?php
 function onStart(){
@@ -55,7 +58,7 @@ function onStart(){
     </style>
     
 {% endput %}
-
+{% component 'SeoBlogPost' %}
 {% set post = blogPost.post %}  
 
    <main class="affiche-item">
@@ -93,11 +96,11 @@ function onStart(){
                   </div>
                   {% endif %}
                   
-                  <div class="affiche-item-data-row">
+                  <div id="view"  class="affiche-item-data-row">
                     <div class="affiche-item-data-img">
                       <img src="{{'assets/new/icons/eye.svg'|theme}}" alt="" />
                     </div>
-                    <span>1938</span>
+                   {% partial 'view' %}
                   </div>
                 </div>
               </div>
@@ -121,5 +124,32 @@ function onStart(){
   </main>
   
   {% put scripts %}
+          
+          
+<script>
+        $.request('views::onIncrement', {
+            update: { view: '@#view' },
+    
+        })
+        var re = /\[video poster=\"(.+?)\".+?mp4=\"(.+?)\"/g;
+        //  re = /(\S+)=["']?((?:.(?!["']?\s+(?:\S+)=|\s*\/?[>"']))+.)["']?/g
+        var ptags = document.querySelectorAll('p');
+    
+        ptags.forEach(s => {
+    
+            var m;
+            m = re.exec(s.innerText);
+            if (m) {
+                var video = document.createElement('video');
+                video.setAttribute('src', m[2]);
+                video.setAttribute('controls', "")
+                video.setAttribute('width', "100%")
+                video.setAttribute('type', "video/mp4")
+                video.setAttribute('poster', m[1])
+                s.parentNode.replaceChild(video, s);
+    
+            }
+        });
+    </script>
     <script src="{{'assets/new/scripts/core/affiche-item.js'|theme}}"></script>
   {% endput %}

themes/modern2/pages/new/group.htm

@@ -71,7 +71,7 @@ function onStart(){
 
     
     if($this['categorySlug']){
-        $this['mediaPostsFilter'] = Tps\Tps\Models\Media::where('type', $this['categorySlug'])->get();
+        $this['mediaPostsFilter'] = Tps\Tps\Models\Media::where('type', $this['categorySlug'])->orderBy('created_at', 'DESC')->get();
     }else{
         $this['mediaPostsFilter'] = Tps\Tps\Models\Media::all();
     }

themes/modern2/partials/newHome/main-slider.htm

@@ -3,7 +3,7 @@
 [blogPosts slider]
 pageNumber = "{{ :page }}"
 featured = "yes"
-postsPerPage = 10
+postsPerPage = 4
 noPostsMessage = "No posts found"
 sortOrder = "published_at desc"
 categoryPage = 404

themes/modern2/partials/newHome/photo.htm

@@ -1,37 +1,13 @@
 [viewBag]
-
-[blogPosts photo]
-pageNumber = "{{ :page }}"
-categoryFilter = "photo"
-postsPerPage = 10
-noPostsMessage = "No posts found"
-sortOrder = "published_at desc"
-categoryPage = 404
-postPage = 404
-
-[builderList photos]
-modelClass = "Tps\Tps\Models\Media"
-scope = "-"
-scopeValue = "{{ :scope }}"
-displayColumn = "id"
-noRecordsMessage = "No records found"
-detailsPage = "-"
-detailsUrlParameter = "id"
-recordsPerPage = 8
-pageNumber = "{{ :page }}"
-sortColumn = "id"
-sortDirection = "desc"
 ==
-{% set posts = photo.posts %}
-
-{% set records = photos.records %}
-{% set displayColumn = photos.displayColumn %}
-{% set noRecordsMessage = photos.noRecordsMessage %}
-{% set detailsPage = photos.detailsPage %}
-{% set detailsKeyColumn = photos.detailsKeyColumn %}
-{% set detailsUrlParameter = photos.detailsUrlParameter %}
+<?php
+function onStart(){
 
+ $this['mediaPostsFilter'] = Tps\Tps\Models\Media::where('type', 'photo')->orderBy('created_at', 'DESC')->get();    
     
+}
+?>
+==
 <div class="trending-head media-head">
     <h2><a href="{{'new/group'|page({categoryGroup: 'media', slug:'photo'})}}" style="color:white;">{{ 'new.page.photo.archive'|_ }}</a></h2>
     <span></span>
@@ -40,7 +16,7 @@ sortDirection = "desc"
     <div class="swiper photoSwiper">
         <div class="swiper-wrapper">
 
-            {% for post in records if post.type == 'photo' %}
+            {% for post in mediaPostsFilter %}
                 <div class="swiper-slide">
                     {% partial 'newHome/photo-item' post=post %}
                 </div>