From 62f1f4aaa0bfbbbeb2b6752cbdc3331c5ad9ab44 Mon Sep 17 00:00:00 2001
From: Diatrex <diahshalabi@hotmail.com>
Date: Mon, 5 Oct 2020 16:59:16 +0300
Subject: [PATCH 1/4] #2256 base theme cat links are not seo friendly

---
 .../base-theme/resources/lang/en/button.php      |  1 +
 .../resources/views/partials/categories-web.twig | 16 ++++++----------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/addons/default/visiosoft/base-theme/resources/lang/en/button.php b/addons/default/visiosoft/base-theme/resources/lang/en/button.php
index cffe38ff9..31f2b7e44 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/en/button.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/en/button.php
@@ -10,4 +10,5 @@ return [
     'reset_password' => 'Reset Password',
     'email' => 'Email',
     'phone' => 'Phone',
+    'show_all' => 'Show All',
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/categories-web.twig b/addons/default/visiosoft/base-theme/resources/views/partials/categories-web.twig
index 9e47154ed..3e526f3f7 100644
--- a/addons/default/visiosoft/base-theme/resources/views/partials/categories-web.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/partials/categories-web.twig
@@ -5,26 +5,22 @@
             <img src="{{ url('files/' ~ main_category.icon.path) }}" alt="{{ main_category.name }}"
                  class="img-responsive">
         {% else %}
-            <img src="{{ img('visiosoft.theme.base::images/default-categories-icon.png').url }}"
-                 alt="{{ main_category.name }}"
-                 class="img-responsive">
+            <img src="{{ img('visiosoft.theme.base::images/default-categories-icon.png').url }}" class="img-responsive"
+                 alt="{{ main_category.name }}">
         {% endif %}
-        <a href="{{ url_route('visiosoft.module.advs::list') }}?cat={{ main_category.id }}"
-           class="main-category">
+        <a href="{{ url_route('adv_list_seo', [main_category.slug]) }}" class="main-category">
             <b>{{ main_category.name }}</b>
         </a>
-        <ul class="p-0" style="">
+        <ul class="p-0">
             {% set sub_categories = entries('cats','category').where('parent_category_id', main_category.id).where('deleted_at', null).orderBy('sort_order').get() %}
             {% for sub_category in sub_categories|slice(0,sub_categories_limit) %}
                 <li>
-                    <a href="{{ url_route('visiosoft.module.advs::list') }}?cat={{ sub_category.id }}"
-                       class="">{{ sub_category.name }}</a>
+                    <a href="{{ url_route('adv_list_seo', [sub_category.slug]) }}">{{ sub_category.name }}</a>
                 </li>
             {% endfor %}
             {% for sub_category in sub_categories|slice(sub_categories_limit,count(sub_categories)) %}
                 <li class="hidden hidden-category">
-                    <a href="{{ url_route('visiosoft.module.advs::list') }}?cat={{ sub_category.id }}"
-                       class="">{{ sub_category.name }}</a>
+                    <a href="{{ url_route('adv_list_seo', [sub_category.slug]) }}">{{ sub_category.name }}</a>
                 </li>
             {% endfor %}
             {% if count(sub_categories) > sub_categories_limit %}

From 05a04669394574b3da179d48d26fec0089f6f76b Mon Sep 17 00:00:00 2001
From: Diatrex <diahshalabi@hotmail.com>
Date: Mon, 5 Oct 2020 17:14:11 +0300
Subject: [PATCH 2/4] #1552 [demand] Changes

---
 .../resources/views/partials/categories-mobile.twig        | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

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 b2ce5c599..da95115c5 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
@@ -2,14 +2,13 @@
 
 <ul class="categories-list px-0 mr-2 d-block d-sm-none">
     <li class="categories-list-li category-icon text-truncate category-{{ main_category.slug }}">
-        <a href="{{ url_route('visiosoft.module.advs::list') }}?cat={{ main_category.id }}"
-           class="main-category">
+        <a href="{{ url_route('adv_list_seo', [main_category.slug]) }}" class="main-category">
             {% if main_category.icon.path != "" %}
                 <img src="{{ url('files/' ~ main_category.icon.path) }}" alt="{{ main_category.name }}"
                      class="img-responsive">
             {% else %}
-                <img src="{{ img('visiosoft.theme.base::images/default-categories-icon.png').url }}" alt="{{ main_category.name }}"
-                     class="img-responsive">
+                <img src="{{ img('visiosoft.theme.base::images/default-categories-icon.png').url }}"
+                     alt="{{ main_category.name }}" class="img-responsive">
             {% endif %}
             <span>{{ main_category.name }}</span>
             <p class="p-0 sub-categories">

From 68aa2e3754c0642634245f9ed5db307c772db808 Mon Sep 17 00:00:00 2001
From: Diatrex <diahshalabi@hotmail.com>
Date: Tue, 6 Oct 2020 10:46:07 +0300
Subject: [PATCH 3/4] #2256 base theme cat links are not seo friendly #698

---
 .../resources/config/settings/sections.php    |  4 +-
 .../resources/config/settings/settings.php    |  6 +++
 .../base-theme/resources/js/script.js         |  3 ++
 .../base-theme/resources/lang/en/setting.php  |  3 ++
 .../resources/views/partials/assets.twig      |  1 +
 .../views/partials/categories-web.twig        | 39 +++++++++++--------
 6 files changed, 37 insertions(+), 19 deletions(-)
 create mode 100644 addons/default/visiosoft/base-theme/resources/js/script.js

diff --git a/addons/default/visiosoft/base-theme/resources/config/settings/sections.php b/addons/default/visiosoft/base-theme/resources/config/settings/sections.php
index 15226e51e..950b34146 100644
--- a/addons/default/visiosoft/base-theme/resources/config/settings/sections.php
+++ b/addons/default/visiosoft/base-theme/resources/config/settings/sections.php
@@ -7,8 +7,8 @@ return [
             'catalog_mode' => [
                 'title' => 'visiosoft.theme.base::section.catalog_mode.name',
                 'fields' => [
-                    'navigation_title', 'navigation_action', 'date_fields', 'price_fields',
-                    'breadcrumbs', 'ad_details', 'ad_details_tab', 'latest_and_view_all_btn',
+                    'home_page_sub_categories_limit', 'navigation_title', 'navigation_action', 'date_fields',
+                    'price_fields', 'breadcrumbs', 'ad_details', 'ad_details_tab', 'latest_and_view_all_btn',
                     'register_page_instruction_logo', 'register_page_alert_link'
                 ],
             ],
diff --git a/addons/default/visiosoft/base-theme/resources/config/settings/settings.php b/addons/default/visiosoft/base-theme/resources/config/settings/settings.php
index 7a8060004..791e3a74b 100644
--- a/addons/default/visiosoft/base-theme/resources/config/settings/settings.php
+++ b/addons/default/visiosoft/base-theme/resources/config/settings/settings.php
@@ -62,6 +62,12 @@ return [
             "default_value" => "/",
         ]
     ],
+    "home_page_sub_categories_limit" => [
+        "type"   => "anomaly.field_type.integer",
+        "config" => [
+            "default_value" => 5,
+        ]
+    ],
     'style' => [
         'type' => 'anomaly.field_type.editor',
     ],
diff --git a/addons/default/visiosoft/base-theme/resources/js/script.js b/addons/default/visiosoft/base-theme/resources/js/script.js
new file mode 100644
index 000000000..9ea7da4e6
--- /dev/null
+++ b/addons/default/visiosoft/base-theme/resources/js/script.js
@@ -0,0 +1,3 @@
+$('.show-all').on('click', function () {
+    $(this).siblings('.hidden-category').toggleClass('hidden')
+})
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/lang/en/setting.php b/addons/default/visiosoft/base-theme/resources/lang/en/setting.php
index 286403eb3..f927a8a08 100644
--- a/addons/default/visiosoft/base-theme/resources/lang/en/setting.php
+++ b/addons/default/visiosoft/base-theme/resources/lang/en/setting.php
@@ -37,4 +37,7 @@ return [
     'style' => [
         'name' => 'Style(CSS)',
     ],
+    'home_page_sub_categories_limit' => [
+        'name' => 'Homepage Sub Categories Limit',
+    ],
 ];
\ No newline at end of file
diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/assets.twig b/addons/default/visiosoft/base-theme/resources/views/partials/assets.twig
index dbd77489b..48582c6d5 100644
--- a/addons/default/visiosoft/base-theme/resources/views/partials/assets.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/partials/assets.twig
@@ -14,6 +14,7 @@
 {{ asset_add("theme.js", "visiosoft.theme.base::js/phonefield.js") }}
 {{ asset_add("theme.js", "visiosoft.theme.base::js/jquery.inputmask.bundle.min.js") }}
 {{ asset_add("theme.js", "visiosoft.theme.base::js/lazy-loading.js") }}
+{{ asset_add("theme.js", "visiosoft.theme.base::js/script.js") }}
 
 {# Theme Scripts #}
 {#{{ asset_add("theme.js", "visiosoft.theme.base::js/plugins/*") }}#}
diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/categories-web.twig b/addons/default/visiosoft/base-theme/resources/views/partials/categories-web.twig
index 3e526f3f7..7335b7d0a 100644
--- a/addons/default/visiosoft/base-theme/resources/views/partials/categories-web.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/partials/categories-web.twig
@@ -1,30 +1,35 @@
 {% set sub_categories_limit = setting_value('visiosoft.theme.base::home_page_sub_categories_limit') %}
 <ul class="categories-list p-0 d-none d-sm-block">
     <li class="categories-list-li category-icon category-{{ main_category.slug }}">
-        {% if main_category.icon.path != "" %}
-            <img src="{{ url('files/' ~ main_category.icon.path) }}" alt="{{ main_category.name }}"
-                 class="img-responsive">
-        {% else %}
-            <img src="{{ img('visiosoft.theme.base::images/default-categories-icon.png').url }}" class="img-responsive"
-                 alt="{{ main_category.name }}">
-        {% endif %}
+        {% set catIcon = main_category.icon.path != "" ? url('files/' ~ main_category.icon.path) : img('visiosoft.theme.base::images/default-categories-icon.png').url %}
+        <img src="{{ catIcon }}" alt="{{ main_category.name }}" class="img-responsive">
         <a href="{{ url_route('adv_list_seo', [main_category.slug]) }}" class="main-category">
             <b>{{ main_category.name }}</b>
         </a>
         <ul class="p-0">
             {% set sub_categories = entries('cats','category').where('parent_category_id', main_category.id).where('deleted_at', null).orderBy('sort_order').get() %}
-            {% for sub_category in sub_categories|slice(0,sub_categories_limit) %}
-                <li>
-                    <a href="{{ url_route('adv_list_seo', [sub_category.slug]) }}">{{ sub_category.name }}</a>
-                </li>
-            {% endfor %}
-            {% for sub_category in sub_categories|slice(sub_categories_limit,count(sub_categories)) %}
-                <li class="hidden hidden-category">
-                    <a href="{{ url_route('adv_list_seo', [sub_category.slug]) }}">{{ sub_category.name }}</a>
-                </li>
+            {% set subCatLoop = [
+                {
+                    'start': 0,
+                    'end': sub_categories_limit,
+                    'class': '',
+                },
+                {
+                    'start': sub_categories_limit,
+                    'end': count(sub_categories),
+                    'class': 'hidden hidden-category',
+                }
+            ] %}
+            {% for subLoop in subCatLoop %}
+                {% for sub_category in sub_categories|slice(subLoop.start, subLoop.end) %}
+                    <li class="{{ subLoop.class }}">
+                        <a href="{{ url_route('adv_list_seo', [sub_category.slug]) }}">{{ sub_category.name }}</a>
+                    </li>
+                {% endfor %}
             {% endfor %}
+
             {% if count(sub_categories) > sub_categories_limit %}
-                <li class="show-all">
+                <li class="show-all" data-limit="{{ sub_categories_limit }}">
                     <a>
                         {{ trans('visiosoft.theme.base::button.show_all') }}
                         <i class="fas fa-arrow-circle-down"></i>

From e3ff78e8101fe8528ceb252da10911e5f64133ab Mon Sep 17 00:00:00 2001
From: Diatrex <diahshalabi@hotmail.com>
Date: Tue, 6 Oct 2020 12:13:48 +0300
Subject: [PATCH 4/4] #2256 base theme cat links are not seo friendly #698

---
 .../resources/views/partials/categories-mobile.twig      | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

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 da95115c5..857d5ef22 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
@@ -3,13 +3,8 @@
 <ul class="categories-list px-0 mr-2 d-block d-sm-none">
     <li class="categories-list-li category-icon text-truncate category-{{ main_category.slug }}">
         <a href="{{ url_route('adv_list_seo', [main_category.slug]) }}" class="main-category">
-            {% if main_category.icon.path != "" %}
-                <img src="{{ url('files/' ~ main_category.icon.path) }}" alt="{{ main_category.name }}"
-                     class="img-responsive">
-            {% else %}
-                <img src="{{ img('visiosoft.theme.base::images/default-categories-icon.png').url }}"
-                     alt="{{ main_category.name }}" class="img-responsive">
-            {% endif %}
+            {% set catIcon = main_category.icon.path != "" ? url('files/' ~ main_category.icon.path) : img('visiosoft.theme.base::images/default-categories-icon.png').url %}
+            <img src="{{ catIcon) }}" alt="{{ main_category.name }}" class="img-responsive">
             <span>{{ main_category.name }}</span>
             <p class="p-0 sub-categories">
                 {% set sub_categories = entries('cats','category').where('parent_category_id', main_category.id).where('deleted_at', null).orderBy('sort_order').get() %}