refactor layouts module to domain/di and prepare 0.256 release

autoload/admin/Controllers/ArticlesController.php

@@ -3,16 +3,23 @@ namespace admin\Controllers;
 
 use Domain\Article\ArticleRepository;
 use Domain\Languages\LanguagesRepository;
+use Domain\Layouts\LayoutsRepository;
 
 class ArticlesController
 {
     private ArticleRepository $repository;
     private LanguagesRepository $languagesRepository;
+    private LayoutsRepository $layoutsRepository;
 
-    public function __construct(ArticleRepository $repository, LanguagesRepository $languagesRepository)
+    public function __construct(
+        ArticleRepository $repository,
+        LanguagesRepository $languagesRepository,
+        LayoutsRepository $layoutsRepository
+    )
     {
         $this->repository = $repository;
         $this->languagesRepository = $languagesRepository;
+        $this->layoutsRepository = $layoutsRepository;
     }
 
     /**
@@ -189,7 +196,7 @@ class ArticlesController
             'article'   => $this->repository->find((int)\S::get('id')),
             'menus'     => \admin\factory\Pages::menus_list(),
             'languages' => $this->languagesRepository->languagesList(),
-            'layouts'   => \admin\factory\Layouts::layouts_list(),
+            'layouts'   => $this->layoutsRepository->listAll(),
             'user'      => $user
         ]);
     }

autoload/admin/Controllers/LayoutsController.php

@@ -0,0 +1,172 @@
+<?php
+namespace admin\Controllers;
+
+use Domain\Layouts\LayoutsRepository;
+use Domain\Languages\LanguagesRepository;
+
+class LayoutsController
+{
+    private LayoutsRepository $repository;
+    private LanguagesRepository $languagesRepository;
+
+    public function __construct(LayoutsRepository $repository, LanguagesRepository $languagesRepository)
+    {
+        $this->repository = $repository;
+        $this->languagesRepository = $languagesRepository;
+    }
+
+    public function list(): string
+    {
+        $sortableColumns = ['name', 'status', 'categories_default'];
+
+        $filterDefinitions = [
+            [
+                'key' => 'name',
+                'label' => 'Nazwa',
+                'type' => 'text',
+            ],
+            [
+                'key' => 'status',
+                'label' => 'Szablon domyslny',
+                'type' => 'select',
+                'options' => [
+                    '' => '- domyslny -',
+                    '1' => 'tak',
+                    '0' => 'nie',
+                ],
+            ],
+            [
+                'key' => 'categories_default',
+                'label' => 'Domyslny (kategorie)',
+                'type' => 'select',
+                'options' => [
+                    '' => '- kategorie -',
+                    '1' => 'tak',
+                    '0' => 'nie',
+                ],
+            ],
+        ];
+
+        $listRequest = \admin\Support\TableListRequestFactory::fromRequest(
+            $filterDefinitions,
+            $sortableColumns,
+            'name'
+        );
+
+        $sortDir = $listRequest['sortDir'];
+        if (trim((string)\S::get('sort')) === '') {
+            $sortDir = 'ASC';
+        }
+
+        $result = $this->repository->listForAdmin(
+            $listRequest['filters'],
+            $listRequest['sortColumn'],
+            $sortDir,
+            $listRequest['page'],
+            $listRequest['perPage']
+        );
+
+        $rows = [];
+        $lp = ($listRequest['page'] - 1) * $listRequest['perPage'] + 1;
+        foreach ($result['items'] as $item) {
+            $id = (int)($item['id'] ?? 0);
+            $name = trim((string)($item['name'] ?? ''));
+
+            $rows[] = [
+                'lp' => $lp++ . '.',
+                'name' => '<a href="/admin/layouts/layout_edit/id=' . $id . '">' . htmlspecialchars($name, ENT_QUOTES, 'UTF-8') . '</a>',
+                'status' => ((int)($item['status'] ?? 0) === 1) ? '<span class="text-system">tak</span>' : 'nie',
+                'categories_default' => ((int)($item['categories_default'] ?? 0) === 1) ? '<span class="text-system">tak</span>' : 'nie',
+                '_actions' => [
+                    [
+                        'label' => 'Edytuj',
+                        'url' => '/admin/layouts/layout_edit/id=' . $id,
+                        'class' => 'btn btn-xs btn-primary',
+                    ],
+                    [
+                        'label' => 'Usun',
+                        'url' => '/admin/layouts/layout_delete/id=' . $id,
+                        'class' => 'btn btn-xs btn-danger',
+                        'confirm' => 'Na pewno chcesz usunac wybrany szablon?',
+                    ],
+                ],
+            ];
+        }
+
+        $total = (int)$result['total'];
+        $totalPages = max(1, (int)ceil($total / $listRequest['perPage']));
+
+        $viewModel = new \admin\ViewModels\Common\PaginatedTableViewModel(
+            [
+                ['key' => 'lp', 'label' => 'Lp.', 'class' => 'text-center', 'sortable' => false],
+                ['key' => 'name', 'sort_key' => 'name', 'label' => 'Nazwa', 'sortable' => true, 'raw' => true],
+                ['key' => 'status', 'sort_key' => 'status', 'label' => 'Szablon domyslny', 'class' => 'text-center', 'sortable' => true, 'raw' => true],
+                ['key' => 'categories_default', 'sort_key' => 'categories_default', 'label' => 'Domyslny (kategorie)', 'class' => 'text-center', 'sortable' => true, 'raw' => true],
+            ],
+            $rows,
+            $listRequest['viewFilters'],
+            [
+                'column' => $listRequest['sortColumn'],
+                'dir' => $sortDir,
+            ],
+            [
+                'page' => $listRequest['page'],
+                'per_page' => $listRequest['perPage'],
+                'total' => $total,
+                'total_pages' => $totalPages,
+            ],
+            array_merge($listRequest['queryFilters'], [
+                'sort' => $listRequest['sortColumn'],
+                'dir' => $sortDir,
+                'per_page' => $listRequest['perPage'],
+            ]),
+            $listRequest['perPageOptions'],
+            $sortableColumns,
+            '/admin/layouts/view_list/',
+            'Brak danych w tabeli.',
+            '/admin/layouts/layout_edit/',
+            'Dodaj szablon'
+        );
+
+        return \Tpl::view('layouts/layouts-list', [
+            'viewModel' => $viewModel,
+        ]);
+    }
+
+    public function edit(): string
+    {
+        return \Tpl::view('layouts/layout-edit', [
+            'layout' => $this->repository->find((int)\S::get('id')),
+            'menus' => $this->repository->menusWithPages(),
+            'categories' => $this->repository->categoriesTree(),
+            'dlang' => $this->languagesRepository->defaultLanguageId(),
+        ]);
+    }
+
+    public function save(): void
+    {
+        $response = ['status' => 'error', 'msg' => 'Podczas zapisywania szablonu wystapil blad. Prosze sprobowac ponownie.'];
+        $values = json_decode((string)\S::get('values'), true);
+
+        if (is_array($values)) {
+            $id = $this->repository->save($values);
+            if (!empty($id)) {
+                $response = ['status' => 'ok', 'msg' => 'Szablon zostal zapisany.', 'id' => $id];
+            }
+        }
+
+        echo json_encode($response);
+        exit;
+    }
+
+    public function delete(): void
+    {
+        if ($this->repository->delete((int)\S::get('id'))) {
+            \S::alert('Szablon zostal usuniety.');
+        }
+
+        header('Location: /admin/layouts/view_list/');
+        exit;
+    }
+
+}

autoload/admin/class.Site.php

@@ -207,7 +207,8 @@ class Site
 
         return new \admin\Controllers\ArticlesController(
           new \Domain\Article\ArticleRepository( $mdb ),
-          new \Domain\Languages\LanguagesRepository( $mdb )
+          new \Domain\Languages\LanguagesRepository( $mdb ),
+          new \Domain\Layouts\LayoutsRepository( $mdb )
         );
       },
       'Banners' => function() {
@@ -266,6 +267,14 @@ class Site
           new \Domain\Languages\LanguagesRepository( $mdb )
         );
       },
+      'Layouts' => function() {
+        global $mdb;
+
+        return new \admin\Controllers\LayoutsController(
+          new \Domain\Layouts\LayoutsRepository( $mdb ),
+          new \Domain\Languages\LanguagesRepository( $mdb )
+        );
+      },
     ];
 
     return self::$newControllers;
@@ -309,6 +318,9 @@ class Site
     'unit_edit' => 'edit',
     'unit_save' => 'save',
     'unit_delete' => 'delete',
+    'layout_edit' => 'edit',
+    'layout_save' => 'save',
+    'layout_delete' => 'delete',
   ];
 
   public static function route()

autoload/admin/controls/class.Layouts.php

@@ -1,43 +0,0 @@
-<?php
-namespace admin\controls;
-
-class Layouts
-{
-  public static function layout_delete()
-  {
-    if ( \admin\factory\Layouts::layout_delete( \S::get( 'id' ) ) )
-      \S::alert( 'Szablon został usunięty.' );
-    header( 'Location: /admin/layouts/view_list/' );
-    exit;
-  }
-
-  public static function layout_save()
-  {
-    $response = [ 'status' => 'error', 'msg' => 'Podczas zapisywania szablonu wystąpił błąd. Proszę spróbować ponownie.' ];
-    $values = json_decode( \S::get( 'values' ), true );
-
-    if ( $id = \admin\factory\Layouts::layout_save( $values['id'], $values['name'], $values['status'], $values['pages'], $values['html'], $values['css'], $values['js'], $values['m_html'],
-            $values['m_css'], $values['m_js'], $values['categories'], $values['categories_default'] )
-    )
-      $response = [ 'status' => 'ok', 'msg' => 'Szablon został zapisany.', 'id' => $id ];
-
-    echo json_encode( $response );
-    exit;
-  }
-
-  public static function layout_edit()
-  {
-    return \Tpl::view( 'layouts/layout-edit', [
-              'layout' => \admin\factory\Layouts::layout_details( \S::get( 'id' ) ),
-              'menus' => \admin\factory\Layouts::menus_list(),
-              'categories' => \admin\factory\ShopCategory::subcategories( null ),
-              'dlang' => \front\factory\Languages::default_language()
-            ] );
-  }
-
-  public static function view_list()
-  {
-    return \admin\view\Layouts::layouts_list();
-  }
-}
-?>

autoload/admin/factory/class.Layouts.php

@@ -1,190 +1,78 @@
 <?php
 namespace admin\factory;
 
+use Domain\Layouts\LayoutsRepository;
+
 class Layouts
 {
-  public static function layout_delete( $layout_id )
-  {
-    global $mdb;
-    
-    if ( $mdb -> count( 'pp_layouts' ) > 1 )
-      return $mdb -> delete( 'pp_layouts', [ 'id' => (int)$layout_id ] );
-    return false;
-  }
-  
-  public static function layout_details( $layout_id )
-  {
-    global $mdb;
-   
-    $layout = $mdb -> get( 'pp_layouts', '*', [ 'id' => (int)$layout_id ] );
-    
-    $layout['pages'] = $mdb -> select( 'pp_layouts_pages', 'page_id', [ 'layout_id' => (int)$layout_id ] );    
-    $layout['categories'] = $mdb -> select( 'pp_layouts_categories', 'category_id', [ 'layout_id' => (int)$layout_id ] );
-    
-    return $layout;
-  }
-  
-  public static function layout_save( $layout_id, $name, $status, $pages, $html, $css, $js, $m_html, $m_css, $m_js, $categories, $categories_default )
-  {
-    global $mdb;
-    
-    if ( !$layout_id )
+    public static function layout_delete($layout_id)
     {
-      if ( $status == 'on' )
-        $mdb -> update( 'pp_layouts', [ 'status' => 0 ] );
-      
-      if ( $categories_default == 'on' )
-        $mdb -> update( 'pp_layouts', [ 'categories_default' => 0 ] );
-      
-      $mdb -> insert( 'pp_layouts', [
-                'name' => $name,
-                'html' => $html,
-                'css' => $css,
-                'js' => $js,
-                'm_html' => $m_html,
-                'm_css' => $m_css,
-                'm_js' => $m_js,
-                'status' => $status == 'on' ? 1 : 0,
-                'categories_default' => $categories_default == 'on' ? 1 : 0
-              ] );
-      
-      $id = $mdb -> id();
-      
-      if ( $id )
-      {
-        if ( is_array( $pages ) ) foreach ( $pages as $page )
-        {
-          $mdb -> delete( 'pp_layouts_pages', [ 'page_id' => (int)$page ] );
-          
-          $mdb -> insert( 'pp_layouts_pages', [
-                  'layout_id' => (int)$id,
-                  'page_id'   => (int)$page
-          ] );
-        }
-        else if ( $pages )
-        {
-          $mdb -> delete( 'pp_layouts_pages', [ 'page_id' => (int)$pages ] );
-          
-          $mdb -> insert( 'pp_layouts_pages', [
-                  'layout_id' => (int)$id,
-                  'page_id'   => (int)$pages
-          ] );
-        }
-        
-        if ( is_array( $categories ) ) foreach ( $categories as $category )
-        {
-          $mdb -> delete( 'pp_layouts_categories', [ 'category_id' => (int)$category ] );
-          
-          $mdb -> insert( 'pp_layouts_categories', [
-                  'layout_id'   => (int)$id,
-                  'category_id' => (int)$category
-          ] );
-        }
-        else if ( $categories )
-        {
-          $mdb -> delete( 'pp_layouts_categories', [ 'category_id' => (int)$categories ] );
-          
-          $mdb -> insert( 'pp_layouts_categories', [
-                  'layout_id'   => (int)$id,
-                  'category_id' => (int)$categories
-          ] );
-        }
-      
-        \S::delete_dir( '../temp/' );
-        
-        return $id;
-      }
+        return self::repository()->delete((int)$layout_id);
     }
-    else
+
+    public static function layout_details($layout_id)
     {
-      if ( $status == 'on' )
-        $mdb -> update( 'pp_layouts', [ 'status' => 0 ] );
-      
-      if ( $categories_default == 'on' )
-        $mdb -> update( 'pp_layouts', [ 'categories_default' => 0 ] );
-      
-      $mdb -> update( 'pp_layouts', [
-                'name' => $name,
-                'html' => $html,
-                'css' => $css,
-                'js' => $js,
-                'm_html' => $m_html,
-                'm_css' => $m_css,
-                'm_js' => $m_js,
-                'status' => $status == 'on' ? 1 : 0,
-                'categories_default' => $categories_default == 'on' ? 1 : 0
-            ], [
-              'id' => $layout_id
-            ] );
-      
-      $mdb -> delete( 'pp_layouts_pages', [ 'layout_id' => (int)$layout_id ] );
-      
-      if ( is_array( $pages ) ) foreach ( $pages as $page )
-      {
-        $mdb -> delete( 'pp_layouts_pages', [ 'page_id' => (int)$page ] );
-          
-        $mdb -> insert( 'pp_layouts_pages', [
-                'layout_id' => (int)$layout_id,
-                'page_id'   => (int)$page
-        ] );
-      }
-      else if ( $pages )
-      {
-        $mdb -> delete( 'pp_layouts_pages', [ 'page_id' => (int)$pages ] );
-        
-        $mdb -> insert( 'pp_layouts_pages', [
-                'layout_id' => (int)$layout_id,
-                'page_id'   => (int)$pages
-        ] );
-      }
-       
-      $mdb -> delete( 'pp_layouts_categories', [ 'layout_id' => (int)$layout_id ] );
-      
-      if ( is_array( $categories ) ) foreach ( $categories as $category )
-      {
-        $mdb -> delete( 'pp_layouts_categories', [ 'category_id' => (int)$category ] );
-
-        $mdb -> insert( 'pp_layouts_categories', [
-                'layout_id'   => (int)$layout_id,
-                'category_id' => (int)$category
-        ] );
-      }
-      else if ( $categories )
-      {
-        $mdb -> delete( 'pp_layouts_categories', [ 'category_id' => (int)$categories ] );
-
-        $mdb -> insert( 'pp_layouts_categories', [
-                'layout_id'   => (int)$layout_id,
-                'category_id' => (int)$categories
-        ] );
-      }
-      
-      \S::delete_dir( '../temp/' );
-
-      return $layout_id;
+        return self::repository()->find((int)$layout_id);
     }
-    return false;
-  }
-  
-  public static function menus_list()
-  {
-    global $mdb;
-    
-    $results = $mdb -> select( 'pp_menus', 'id', [ 'ORDER' => [ 'id' => 'ASC' ] ] );
-    if ( is_array( $results ) ) foreach ( $results as $row )
+
+    public static function layout_save(
+        $layout_id,
+        $name,
+        $status,
+        $pages,
+        $html,
+        $css,
+        $js,
+        $m_html,
+        $m_css,
+        $m_js,
+        $categories,
+        $categories_default
+    ) {
+        return self::repository()->save([
+            'id' => $layout_id,
+            'name' => $name,
+            'status' => $status,
+            'pages' => $pages,
+            'html' => $html,
+            'css' => $css,
+            'js' => $js,
+            'm_html' => $m_html,
+            'm_css' => $m_css,
+            'm_js' => $m_js,
+            'categories' => $categories,
+            'categories_default' => $categories_default,
+        ]);
+    }
+
+    public static function menus_list()
     {
-      $menu = \admin\factory\Pages::menu_details( $row );
-      $menu['pages'] = \admin\factory\Pages::menu_pages( $row );
-      
-      $menus[] = $menu;
+        $menus = \admin\factory\Pages::menus_list();
+        if (!is_array($menus)) {
+            return [];
+        }
+
+        foreach ($menus as $key => $menu) {
+            $menuId = (int)($menu['id'] ?? 0);
+            if ($menuId <= 0) {
+                continue;
+            }
+
+            $menus[$key]['pages'] = \admin\factory\Pages::menu_pages($menuId);
+        }
+
+        return $menus;
+    }
+
+    public static function layouts_list()
+    {
+        return self::repository()->listAll();
+    }
+
+    private static function repository(): LayoutsRepository
+    {
+        global $mdb;
+        return new LayoutsRepository($mdb);
     }
-    return $menus;
-  }
-  
-  public static function layouts_list()
-  {
-    global $mdb;
-    return $mdb -> select( 'pp_layouts', '*', [ 'ORDER' => [ 'name' => 'ASC' ] ] );
-  }
 }
-?>
+

autoload/admin/view/class.Layouts.php

@@ -1,21 +0,0 @@
-<?php
-namespace admin\view;
-
-class Layouts
-{
-  public static function subpages_list( $pages, $layout_pages, $parent_id = null, $step = 1 )
-  {
-    $tpl = new \Tpl;
-    $tpl -> pages         = $pages;
-    $tpl -> step          = $step;
-    $tpl -> layout_pages  = $layout_pages;
-    return $tpl -> render( 'layouts/subpages-list' );
-  }
-  
-  public static function layouts_list()
-  {
-    $tpl = new \Tpl;
-    return $tpl -> render( 'layouts/layouts-list' );
-  }
-}
-?>