From 4a1b008bb04ba48b0f5f489c357c764ca8ddcda9 Mon Sep 17 00:00:00 2001
From: Diatrex <diahshalabi@hotmail.com>
Date: Wed, 15 Jul 2020 11:37:48 +0300
Subject: [PATCH 1/2] #1716 Creating Google Sitemap for cats

---
 .../resources/views/sitemap/categories.twig   | 10 +++++
 .../resources/views/sitemap/index.twig        |  9 +++++
 .../src/CatsModuleServiceProvider.php         |  4 ++
 .../src/Http/Controller/SitemapController.php | 38 +++++++++++++++++++
 4 files changed, 61 insertions(+)
 create mode 100644 addons/default/visiosoft/cats-module/resources/views/sitemap/categories.twig
 create mode 100644 addons/default/visiosoft/cats-module/resources/views/sitemap/index.twig
 create mode 100644 addons/default/visiosoft/cats-module/src/Http/Controller/SitemapController.php

diff --git a/addons/default/visiosoft/cats-module/resources/views/sitemap/categories.twig b/addons/default/visiosoft/cats-module/resources/views/sitemap/categories.twig
new file mode 100644
index 000000000..3cf9a85c2
--- /dev/null
+++ b/addons/default/visiosoft/cats-module/resources/views/sitemap/categories.twig
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+    {% for category in categories %}
+        <url>
+            <loc>{{ url_route('adv_list_seo', [category.slug]) }}</loc>
+            <lastmod>{{ category.created_at.tz('UTC').toAtomString() }}</lastmod>
+            <changefreq>weekly</changefreq>
+        </url>
+    {% endfor %}
+</urlset>
\ No newline at end of file
diff --git a/addons/default/visiosoft/cats-module/resources/views/sitemap/index.twig b/addons/default/visiosoft/cats-module/resources/views/sitemap/index.twig
new file mode 100644
index 000000000..ff98d2ea1
--- /dev/null
+++ b/addons/default/visiosoft/cats-module/resources/views/sitemap/index.twig
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<sitemapindex xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
+    {% for i in 1..pagesCount %}
+        <sitemap>
+            <loc>{{ url('sitemap.xml/categories') }}?page={{ i }}</loc>
+        </sitemap>
+    {% endfor %}
+</sitemapindex>
\ No newline at end of file
diff --git a/addons/default/visiosoft/cats-module/src/CatsModuleServiceProvider.php b/addons/default/visiosoft/cats-module/src/CatsModuleServiceProvider.php
index 659543e1e..9a7ecebf9 100644
--- a/addons/default/visiosoft/cats-module/src/CatsModuleServiceProvider.php
+++ b/addons/default/visiosoft/cats-module/src/CatsModuleServiceProvider.php
@@ -58,6 +58,10 @@ class CatsModuleServiceProvider extends AddonServiceProvider
         'admin/cats/create' => 'Visiosoft\CatsModule\Http\Controller\Admin\CategoryController@create',
         'admin/cats/edit/{id}' => 'Visiosoft\CatsModule\Http\Controller\Admin\CategoryController@edit',
         'admin/cats/category/delete/{id}' => 'Visiosoft\CatsModule\Http\Controller\Admin\CategoryController@delete',
+
+        // Sitemap
+        'sitemap.xml' => 'Visiosoft\CatsModule\Http\Controller\SitemapController@index',
+        'sitemap.xml/categories' => 'Visiosoft\CatsModule\Http\Controller\SitemapController@categories',
     ];
 
     /**
diff --git a/addons/default/visiosoft/cats-module/src/Http/Controller/SitemapController.php b/addons/default/visiosoft/cats-module/src/Http/Controller/SitemapController.php
new file mode 100644
index 000000000..b7aa34d9a
--- /dev/null
+++ b/addons/default/visiosoft/cats-module/src/Http/Controller/SitemapController.php
@@ -0,0 +1,38 @@
+<?php namespace Visiosoft\CatsModule\Http\Controller;
+
+use Anomaly\Streams\Platform\Http\Controller\PublicController;
+use Visiosoft\CatsModule\Category\Contract\CategoryRepositoryInterface;
+
+class SitemapController extends PublicController
+{
+
+    private $categoryRepository;
+
+    public function __construct(CategoryRepositoryInterface $categoryRepository)
+    {
+        parent::__construct();
+        $this->categoryRepository = $categoryRepository;
+    }
+
+    public function index()
+    {
+        $categoriesCount = $this->categoryRepository->count();
+        $pagesCount = ceil($categoriesCount / 5000);
+
+        return response()->view('visiosoft.module.cats::sitemap.index', [
+            'pagesCount' => $pagesCount,
+        ])->header('Content-Type', 'text/xml');
+    }
+
+    public function categories()
+    {
+        $page = request()->page ?: 1;
+        $skip = $page - 1;
+
+        $categories = $this->categoryRepository->newQuery()->skip(5000 * $skip)->take(5000)->get();
+
+        return response()->view('visiosoft.module.cats::sitemap.categories', [
+            'categories' => $categories,
+        ])->header('Content-Type', 'text/xml');
+    }
+}

From 42f096f19efdbe4d5a47ffa31d7bf441bd074f97 Mon Sep 17 00:00:00 2001
From: Diatrex <diahshalabi@hotmail.com>
Date: Wed, 15 Jul 2020 13:14:07 +0300
Subject: [PATCH 2/2] #1795 Register Info Block change with type

---
 .../views/addons/anomaly/users-module/register.twig        | 7 ++++++-
 .../base-theme/src/Seed/RegisterInstructionSeeder.php      | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/register.twig b/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/register.twig
index ae48c529b..5f9934aa6 100644
--- a/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/register.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/register.twig
@@ -37,7 +37,12 @@
             </div>
 
             <div class="col-12 col-md-6 py-3 pr-0 instructions d-none d-md-block">
-                {{ blocks('register-instructions') }}
+                {% set type = app.request.get('type') %}
+                {% if type %}
+                    {{ blocks(type) }}
+                {% else %}
+                    {{ blocks('register-instructions') }}
+                {% endif %}
 
                 {{ addBlock('register/instructions')|raw }}
 
diff --git a/addons/default/visiosoft/base-theme/src/Seed/RegisterInstructionSeeder.php b/addons/default/visiosoft/base-theme/src/Seed/RegisterInstructionSeeder.php
index b112da205..ae53639dd 100644
--- a/addons/default/visiosoft/base-theme/src/Seed/RegisterInstructionSeeder.php
+++ b/addons/default/visiosoft/base-theme/src/Seed/RegisterInstructionSeeder.php
@@ -56,7 +56,7 @@ class RegisterInstructionSeeder extends Seeder
             'name' => trans('visiosoft.theme.base::field.list'),
             'slug' => 'list',
             'category' => 'other',
-            'content_layout' => '<div class="border {{ block.area.slug == \'register-instructions\' ? \'personal-advantages\' : \'corporate-advantages\' }} py-5 px-5">
+            'content_layout' => '<div class="border {{ block.area.slug == \'store-register-instructions\' ? \'corporate-advantages\' : \'personal-advantages\' }} py-5 px-5">
                                     <div class="d-flex align-items-center mb-4">
                                         {% if setting_value(\'visiosoft.theme.base::register_page_instruction_logo\') %}
                                             <img class="mr-3" src="{{ file(setting_value(\'visiosoft.theme.base::register_page_instruction_logo\')).url }}">