From a03f3733741f5aa6efd75b4cfa38ba1089d42ded Mon Sep 17 00:00:00 2001 From: Fatih Alp Date: Sun, 10 Jan 2021 22:33:12 +0300 Subject: [PATCH] Optimize homepage cats queries --- .../advs-module/src/AdvsModulePlugin.php | 3 - .../src/Http/Controller/advsController.php | 7 -- .../views/partials/categories-mobile.twig | 12 ++-- .../views/partials/categories-web.twig | 45 +++++-------- .../resources/views/partials/categories.twig | 10 +-- ...ts__create_placeholderforsearch_stream.php | 35 ---------- ....module.cats__alter_index_to_all_table.php | 4 -- ..._170033_visiosoft.module.cats__adcount.php | 21 ++++++ .../resources/config/permissions.php | 9 +-- .../src/Category/CategoryRepository.php | 35 ++++++++++ .../src/Category/Command/getLevel2Cats.php | 12 ++++ .../Contract/CategoryRepositoryInterface.php | 2 + .../visiosoft/cats-module/src/CatsModule.php | 7 +- .../cats-module/src/CatsModulePlugin.php | 23 ++++++- .../cats-module/src/CatsModuleSeeder.php | 3 +- .../src/CatsModuleServiceProvider.php | 20 +----- .../Admin/PlaceholderforsearchController.php | 43 ------------ .../PlaceholderforsearchInterface.php | 8 --- ...laceholderforsearchRepositoryInterface.php | 8 --- .../Form/PlaceholderforsearchFormBuilder.php | 66 ------------------- .../PlaceholderforsearchCollection.php | 8 --- .../PlaceholderforsearchCriteria.php | 8 --- .../PlaceholderforsearchModel.php | 9 --- .../PlaceholderforsearchObserver.php | 8 --- .../PlaceholderforsearchPresenter.php | 8 --- .../PlaceholderforsearchRepository.php | 25 ------- .../PlaceholderforsearchRouter.php | 8 --- .../PlaceholderforsearchSeeder.php | 49 -------------- .../PlaceholderforsearchTableBuilder.php | 61 ----------------- 29 files changed, 126 insertions(+), 431 deletions(-) delete mode 100644 addons/default/visiosoft/cats-module/migrations/2019_04_03_071244_visiosoft.module.cats__create_placeholderforsearch_stream.php create mode 100644 addons/default/visiosoft/cats-module/migrations/2021_01_03_170033_visiosoft.module.cats__adcount.php create mode 100644 addons/default/visiosoft/cats-module/src/Category/Command/getLevel2Cats.php delete mode 100644 addons/default/visiosoft/cats-module/src/Http/Controller/Admin/PlaceholderforsearchController.php delete mode 100644 addons/default/visiosoft/cats-module/src/Placeholderforsearch/Contract/PlaceholderforsearchInterface.php delete mode 100644 addons/default/visiosoft/cats-module/src/Placeholderforsearch/Contract/PlaceholderforsearchRepositoryInterface.php delete mode 100644 addons/default/visiosoft/cats-module/src/Placeholderforsearch/Form/PlaceholderforsearchFormBuilder.php delete mode 100644 addons/default/visiosoft/cats-module/src/Placeholderforsearch/PlaceholderforsearchCollection.php delete mode 100644 addons/default/visiosoft/cats-module/src/Placeholderforsearch/PlaceholderforsearchCriteria.php delete mode 100644 addons/default/visiosoft/cats-module/src/Placeholderforsearch/PlaceholderforsearchModel.php delete mode 100644 addons/default/visiosoft/cats-module/src/Placeholderforsearch/PlaceholderforsearchObserver.php delete mode 100644 addons/default/visiosoft/cats-module/src/Placeholderforsearch/PlaceholderforsearchPresenter.php delete mode 100644 addons/default/visiosoft/cats-module/src/Placeholderforsearch/PlaceholderforsearchRepository.php delete mode 100644 addons/default/visiosoft/cats-module/src/Placeholderforsearch/PlaceholderforsearchRouter.php delete mode 100644 addons/default/visiosoft/cats-module/src/Placeholderforsearch/PlaceholderforsearchSeeder.php delete mode 100644 addons/default/visiosoft/cats-module/src/Placeholderforsearch/Table/PlaceholderforsearchTableBuilder.php diff --git a/addons/default/visiosoft/advs-module/src/AdvsModulePlugin.php b/addons/default/visiosoft/advs-module/src/AdvsModulePlugin.php index 2005dd80e..8b417d0f3 100644 --- a/addons/default/visiosoft/advs-module/src/AdvsModulePlugin.php +++ b/addons/default/visiosoft/advs-module/src/AdvsModulePlugin.php @@ -43,18 +43,15 @@ class AdvsModulePlugin extends Plugin ), new \Twig_SimpleFunction( 'latestAds', function () { - if (!$latestAds = $this->dispatch(new LatestAds())) { return 0; } - return $latestAds; } ), new \Twig_SimpleFunction( 'appendRequestURL', function ($request, $url, $new_parameters, $removeParams = []) { - return $this->dispatch(new appendRequestURL($request, $url, $new_parameters, $removeParams)); } ), diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php index f1bc64a04..a762adbf2 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -1065,13 +1065,6 @@ class AdvsController extends PublicController return $this->view->make('theme::passwords/reset', compact('code')); } - public function homePage(CategoryRepositoryInterface $repository) - { - $cats = $repository->mainCats(); - - return $this->view->make('theme::addons/anomaly/pages-module/page', compact('cats')); - } - public function mapJson(Request $request, AdvRepositoryInterface $repository) { $param = $request->toArray(); diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/categories-mobile.twig b/addons/default/visiosoft/base-theme/resources/views/partials/categories-mobile.twig index 96f211d5e..4d8746305 100644 --- a/addons/default/visiosoft/base-theme/resources/views/partials/categories-mobile.twig +++ b/addons/default/visiosoft/base-theme/resources/views/partials/categories-mobile.twig @@ -1,15 +1,13 @@ -{% set sub_categories_limit = setting_value('visiosoft.theme.base::home_page_sub_categories_limit') %} -