From e2bedf3c01a629fdc985d4a4466758beb0ff0fb3 Mon Sep 17 00:00:00 2001
From: Muammer Top <muammer@visiosoft.com.tr>
Date: Wed, 8 Sep 2021 13:00:45 +0300
Subject: [PATCH 01/23] #4515 mobile edit

---
 composer.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index e7cb719fc..80d03e20f 100644
--- a/composer.json
+++ b/composer.json
@@ -93,8 +93,7 @@
         "filp/whoops": "~2.0",
         "fzaninotto/faker": "~1.4",
         "symfony/css-selector": "3.1.*",
-        "symfony/dom-crawler": "3.1.*",
-        "anomaly/installer-module": "~2.4.0"
+        "symfony/dom-crawler": "3.1.*"
     },
     "repositories": [
         {

From b1b348a7f9827455e1006f8b58482440103f35c6 Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Tue, 21 Sep 2021 18:06:45 +0300
Subject: [PATCH 02/23] detail page

---
 .../base-theme/resources/css/bootstrap-notify-visio.css     | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/addons/default/visiosoft/base-theme/resources/css/bootstrap-notify-visio.css b/addons/default/visiosoft/base-theme/resources/css/bootstrap-notify-visio.css
index 68a2dbc48..c3530673a 100644
--- a/addons/default/visiosoft/base-theme/resources/css/bootstrap-notify-visio.css
+++ b/addons/default/visiosoft/base-theme/resources/css/bootstrap-notify-visio.css
@@ -1,7 +1,7 @@
 .swal2-container {
     display: grid;
     position: fixed;
-    z-index: 1060;
+    z-index: 99999999999999;
     top: 0;
     right: 0;
     bottom: 0;
@@ -53,4 +53,8 @@ body.swal2-toast-shown .swal2-container.swal2-top-end, body.swal2-toast-shown .s
     grid-column: 3;
     align-self: start;
     justify-self: end;
+}
+
+.swal2-title {
+     max-width: 14rem;
 }
\ No newline at end of file

From e8533fc30900a91fe0df727af03f2aa1b8df7c0d Mon Sep 17 00:00:00 2001
From: Muammer Top <muammer@visiosoft.com.tr>
Date: Mon, 27 Sep 2021 14:12:17 +0300
Subject: [PATCH 03/23] #4527 SEO optimise for openclassify.com (ahrefs.com)

---
 .../visiosoft/advs-module/src/Adv/AdvModel.php       |  7 -------
 .../advs-module/src/Adv/Contract/AdvInterface.php    |  2 --
 .../src/Http/Controller/AdvsController.php           | 12 +++---------
 .../visiosoft/base-theme/resources/js/script.js      |  2 +-
 .../src/Http/Controller/MyProfileController.php      |  5 +----
 5 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php
index 6f7377f07..484aba9e9 100644
--- a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php
+++ b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php
@@ -436,13 +436,6 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface
         return null;
     }
 
-    public function authControl()
-    {
-        if (!Auth::user()) {
-            redirect('/login?redirect=' . url()->current())->send();
-        }
-    }
-
     public function currentAds() {
     	return $this->whereDate('finish_at', '>=', date("Y-m-d H:i:s"))
 		    ->where('status', '=', 'approved')
diff --git a/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvInterface.php b/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvInterface.php
index 87702de18..e38e2a87a 100644
--- a/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvInterface.php
+++ b/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvInterface.php
@@ -70,8 +70,6 @@ interface AdvInterface extends EntryInterface
 
     public function getRecommended($id);
 
-    public function authControl();
-
     public function inStock();
 
     public function getCity();
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 526f83d9c..4885d2938 100644
--- a/addons/default/visiosoft/advs-module/src/Http/Controller/AdvsController.php
+++ b/addons/default/visiosoft/advs-module/src/Http/Controller/AdvsController.php
@@ -711,9 +711,7 @@ class AdvsController extends PublicController
     public function deleteAd(AdvRepositoryInterface $advs, $id)
     {
         $ad = $this->adv_model->find($id);
-        if (!Auth::user()) {
-            redirect('/login?redirect=' . url()->current())->send();
-        }
+        $this->middleware('auth');
 
         if ($ad->created_by_id != Auth::id()) {
             $this->messages->error(trans('visiosoft.module.advs::message.delete_author_error'));
@@ -745,9 +743,7 @@ class AdvsController extends PublicController
 
     public function create(AdvFormBuilder $formBuilder, CategoryRepositoryInterface $repository)
     {
-        if (!Auth::user()) {
-            redirect('/login?redirect=' . url()->current())->send();
-        }
+        $this->middleware('auth');
 
         $isActive = new AdvModel();
         $cats = $this->request->toArray();
@@ -1059,9 +1055,7 @@ class AdvsController extends PublicController
 
     public function cats()
     {
-        if (!Auth::user()) {
-            redirect('/login?redirect=' . url()->current())->send();
-        }
+        $this->middleware('auth');
         $main_cats = $this->category_repository->getMainCategories();
 
         return $this->view->make('visiosoft.module.advs::new-ad/post-cat', compact('main_cats'));
diff --git a/addons/default/visiosoft/base-theme/resources/js/script.js b/addons/default/visiosoft/base-theme/resources/js/script.js
index 70565b5ed..23442b5e7 100644
--- a/addons/default/visiosoft/base-theme/resources/js/script.js
+++ b/addons/default/visiosoft/base-theme/resources/js/script.js
@@ -1,4 +1,4 @@
 $('.categories-list .show-all').on('click', function () {
     $(this).siblings('.hidden-category').toggleClass('hidden')
     $(this).find('a span').toggleClass('hidden')
-})
+});
diff --git a/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php b/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php
index 5eaf1f233..8042a6013 100644
--- a/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php
+++ b/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php
@@ -34,10 +34,7 @@ class MyProfileController extends PublicController
     )
     {
         parent::__construct();
-        if (!Auth::user()) {
-            redirect('/login?redirect=' . url()->current())->send();
-        }
-
+        $this->middleware('auth');
         $this->adressRepository = $adressRepository;
         $this->userRepository = $userRepository;
     }

From 2e82d6cf7614de5c2fc7e4e4fb3c57bb5d5123cc Mon Sep 17 00:00:00 2001
From: Muammer Top <muammer@visiosoft.com.tr>
Date: Mon, 27 Sep 2021 14:14:10 +0300
Subject: [PATCH 04/23] #4527 SEO optimise for openclassify.com (ahrefs.com)

---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 80d03e20f..e7cb719fc 100644
--- a/composer.json
+++ b/composer.json
@@ -93,7 +93,8 @@
         "filp/whoops": "~2.0",
         "fzaninotto/faker": "~1.4",
         "symfony/css-selector": "3.1.*",
-        "symfony/dom-crawler": "3.1.*"
+        "symfony/dom-crawler": "3.1.*",
+        "anomaly/installer-module": "~2.4.0"
     },
     "repositories": [
         {

From e2d973625a72e25dc8efa9eca3a7a1930d7c3f9b Mon Sep 17 00:00:00 2001
From: Muammer Top <muammer@visiosoft.com.tr>
Date: Mon, 27 Sep 2021 15:26:51 +0300
Subject: [PATCH 05/23] #4527 SEO optimise for openclassify.com (ahrefs.com)

---
 .../visiosoft/base-theme/resources/views/partials/metadata.twig | 2 +-
 .../visiosoft/base-theme/resources/views/partials/metatags.twig | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig b/addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig
index 2ad8eb479..9be755125 100644
--- a/addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig
@@ -19,7 +19,7 @@
 {{ asset_add("theme.css", "visiosoft.theme.base::css/select2.css") }}
 {{ asset_add("theme.css", "visiosoft.theme.base::css/font-awesome.min.css") }}
 {{ asset_add("theme.css", "visiosoft.theme.base::css/intlTelInput.css") }}
-{{ asset_style("visiosoft.theme.base::css/offline.scss") }}
+{{ asset_add("theme.css", "visiosoft.theme.base::css/offline.scss") }}
 
 <script src="{{ asset_path('visiosoft.theme.base::js/vendor/jquery.min.js') }}"></script>
 {{ asset_script('visiosoft.theme.base::js/visiosoft.js') }}
diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/metatags.twig b/addons/default/visiosoft/base-theme/resources/views/partials/metatags.twig
index 017843463..dc63e9255 100644
--- a/addons/default/visiosoft/base-theme/resources/views/partials/metatags.twig
+++ b/addons/default/visiosoft/base-theme/resources/views/partials/metatags.twig
@@ -1,6 +1,5 @@
 <!-- Meta Tags -->
 <meta charset="utf-8">
-<meta name="viewport" content="width=device-width"/>
 <meta name="generator" content="{{ config_get('streams::distribution.name') }}"/>
 <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, viewport-fit=cover">
 <meta name="description"

From 6a5c0db694da74f3f31737ca5a5e0c869e958e33 Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Tue, 28 Sep 2021 12:28:19 +0300
Subject: [PATCH 06/23] fix senfony/translation

---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index e7cb719fc..c0dac6852 100644
--- a/composer.json
+++ b/composer.json
@@ -84,7 +84,8 @@
         "pusher/pusher-php-server": "^5.0",
         "simplepie/simplepie": "^1.5.0",
         "guzzlehttp/guzzle": "^7.3",
-        "visiosoft/connect-module": "^1.0"
+        "visiosoft/connect-module": "^1.0",
+        "symfony/translation": "v5.3.7"
     },
     "replace": {
         "anomaly/streams-platform": "*"

From 69ec5e96a8dbac4c53de509a762b0ab45df3ef12 Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Tue, 28 Sep 2021 12:29:55 +0300
Subject: [PATCH 07/23] remove

---
 .../base-theme/resources/css/bootstrap-notify-visio.css          | 1 -
 1 file changed, 1 deletion(-)

diff --git a/addons/default/visiosoft/base-theme/resources/css/bootstrap-notify-visio.css b/addons/default/visiosoft/base-theme/resources/css/bootstrap-notify-visio.css
index c3530673a..ecb8f02a3 100644
--- a/addons/default/visiosoft/base-theme/resources/css/bootstrap-notify-visio.css
+++ b/addons/default/visiosoft/base-theme/resources/css/bootstrap-notify-visio.css
@@ -1,7 +1,6 @@
 .swal2-container {
     display: grid;
     position: fixed;
-    z-index: 99999999999999;
     top: 0;
     right: 0;
     bottom: 0;

From 41800f4dc6900f1d9e80656862a393bfea72ecea Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Tue, 28 Sep 2021 13:00:45 +0300
Subject: [PATCH 08/23] fix

---
 addons/default/visiosoft/advs-module/composer.json | 3 ++-
 composer.json                                      | 3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/default/visiosoft/advs-module/composer.json b/addons/default/visiosoft/advs-module/composer.json
index a028944ee..5cb075ab7 100644
--- a/addons/default/visiosoft/advs-module/composer.json
+++ b/addons/default/visiosoft/advs-module/composer.json
@@ -10,6 +10,7 @@
     ]
   },
   "require": {
-    "fruitcake/laravel-cors": "^2.0"
+    "fruitcake/laravel-cors": "^2.0",
+    "symfony/translation": "v5.3.7"
   }
 }
diff --git a/composer.json b/composer.json
index c0dac6852..e7cb719fc 100644
--- a/composer.json
+++ b/composer.json
@@ -84,8 +84,7 @@
         "pusher/pusher-php-server": "^5.0",
         "simplepie/simplepie": "^1.5.0",
         "guzzlehttp/guzzle": "^7.3",
-        "visiosoft/connect-module": "^1.0",
-        "symfony/translation": "v5.3.7"
+        "visiosoft/connect-module": "^1.0"
     },
     "replace": {
         "anomaly/streams-platform": "*"

From e574e8d2bc4a649a8f39ca149e0b64701aa3d523 Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Tue, 28 Sep 2021 16:01:56 +0300
Subject: [PATCH 09/23] fixed symfony/translation

---
 addons/default/visiosoft/advs-module/composer.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/default/visiosoft/advs-module/composer.json b/addons/default/visiosoft/advs-module/composer.json
index 5cb075ab7..a028944ee 100644
--- a/addons/default/visiosoft/advs-module/composer.json
+++ b/addons/default/visiosoft/advs-module/composer.json
@@ -10,7 +10,6 @@
     ]
   },
   "require": {
-    "fruitcake/laravel-cors": "^2.0",
-    "symfony/translation": "v5.3.7"
+    "fruitcake/laravel-cors": "^2.0"
   }
 }

From 3d63d10386938585b78a57f22cbe5ebde71d0f7a Mon Sep 17 00:00:00 2001
From: Muammer Top <muammer@visiosoft.com.tr>
Date: Tue, 28 Sep 2021 16:50:06 +0300
Subject: [PATCH 10/23] #4513 Hepsiemlak ads pages

---
 .../location-module/resources/views/new-ad/map.twig        | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/addons/default/visiosoft/location-module/resources/views/new-ad/map.twig b/addons/default/visiosoft/location-module/resources/views/new-ad/map.twig
index c1d32a90f..ae07b99c4 100644
--- a/addons/default/visiosoft/location-module/resources/views/new-ad/map.twig
+++ b/addons/default/visiosoft/location-module/resources/views/new-ad/map.twig
@@ -90,6 +90,11 @@
         var selectedAddressText = "{{ trans('visiosoft.module.location::field.selected') }}";
         var chooseAddressText = '{{ trans("visiosoft.module.profile::field.choose.name") }}';
         var chooseOptionTrans = '{{ trans("visiosoft.module.location::field.choose_an_option") }}';
+        var default_country = "{{ setting_value('visiosoft.module.location::default_country') }}";
+        var default_city = "{{ setting_value('visiosoft.module.location::default_city') }}";
+        var default_district = "{{ setting_value('visiosoft.module.location::default_district') }}";
+        var default_neighborhood = "{{ setting_value('visiosoft.module.location::default_neighborhood') }}";
+        var default_village = "{{ setting_value('visiosoft.module.location::default_village') }}";
     </script>
     <script src="https://maps.googleapis.com/maps/api/js?key={{ setting_value('visiosoft.module.location::google_map_key') }}&callback="
             type="text/javascript"></script>
@@ -100,4 +105,4 @@
     .location-map .nav-tabs .active {
         background-color: #e5e5e5;
     }
-</style>
\ No newline at end of file
+</style>

From 61248a4b3afd21c79ab6de1919b365372cc296b1 Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Wed, 29 Sep 2021 17:42:20 +0300
Subject: [PATCH 11/23] fixed logo

---
 .../defaultadmin-theme/resources/css/theme.css       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/css/theme.css b/addons/default/visiosoft/defaultadmin-theme/resources/css/theme.css
index 650f916ba..70d52d052 100644
--- a/addons/default/visiosoft/defaultadmin-theme/resources/css/theme.css
+++ b/addons/default/visiosoft/defaultadmin-theme/resources/css/theme.css
@@ -2628,8 +2628,8 @@ body {
   display: none;
 }
 #login .login-container .logo svg, #login .login-container .logo img {
-  width: 45px;
-  max-height: 82px;
+  /*width: 45px;*/
+  /*max-height: 82px;*/
   fill: #ffffff;
   margin-top: -30px;
   vertical-align: middle;
@@ -2668,8 +2668,8 @@ body {
   font-family: "Montserrat", sans-serif;
 }
 #login .logo svg, #login .logo img {
-  width: 45px;
-  max-height: 82px;
+  width: 8rem;
+  height: 8rem;
   margin-top: -30px;
   vertical-align: middle;
   object-fit: contain;
@@ -2724,8 +2724,8 @@ body {
     margin-bottom: 2rem;
   }
   #login .login-container .logo svg, #login .login-container .logo img {
-    width: 55px;
-    max-height: 100px;
+    width: 8rem;
+    height: auto;
   }
 }
 @media (max-width: 767px) {

From 30c1d170d754f3385b30c9d16e5cfad97760ace5 Mon Sep 17 00:00:00 2001
From: Muammer Top <muammer@visiosoft.com.tr>
Date: Thu, 30 Sep 2021 11:06:27 +0300
Subject: [PATCH 12/23] #4609 default country not working fast create

---
 .../src/Adv/Form/SimpleAdvFormHandler.php            | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/addons/default/visiosoft/advs-module/src/Adv/Form/SimpleAdvFormHandler.php b/addons/default/visiosoft/advs-module/src/Adv/Form/SimpleAdvFormHandler.php
index 176bc5632..aae52965a 100644
--- a/addons/default/visiosoft/advs-module/src/Adv/Form/SimpleAdvFormHandler.php
+++ b/addons/default/visiosoft/advs-module/src/Adv/Form/SimpleAdvFormHandler.php
@@ -2,6 +2,8 @@
 
 use Anomaly\Streams\Platform\Ui\Form\FormBuilder;
 use Visiosoft\AdvsModule\Adv\Contract\AdvRepositoryInterface;
+use Visiosoft\LocationModule\Country\Contract\CountryRepositoryInterface;
+use Visiosoft\LocationModule\Country\CountryModel;
 
 class SimpleAdvFormHandler
 {
@@ -11,12 +13,14 @@ class SimpleAdvFormHandler
             return;
         }
 
-        if (!$builder->getFormValue('created_by_id')) {
-            $builder->setFormValue('created_by_id', auth()->id());
-        }
-
         $builder->saveForm();
 
+        if (!$builder->getFormValue('country_id')) {
+            $entry = $builder->getFormEntry();
+            $entry->setAttribute('country_id', setting_value('visiosoft.module.location::default_country'));
+            $entry->save();
+        }
+
         $ad = $advRepository->find($builder->getFormEntryId());
         if (!$builder->getFormValue('status') && $ad->status !== 'approved') {
             $ad->approve();

From 7466f07f7087f2e6e15ba89b3a5f37abbad3fda3 Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Thu, 30 Sep 2021 17:30:20 +0300
Subject: [PATCH 13/23] fix certificate error file_get_content

---
 .../visiosoft/advs-module/src/Adv/AdvRepository.php    | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php
index cea08a2ce..7e9277833 100644
--- a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php
+++ b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php
@@ -312,7 +312,15 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface
             if (!$thumbnail AND $ext[1] != 'svg') {
 
 				// Create thumbnail image
-				$image = Image::make(file_get_contents($adv->files[0]->make()->url()));
+
+                $arrContextOptions=array(
+                    "ssl"=>array(
+                        "verify_peer"=>false,
+                        "verify_peer_name"=>false,
+                    ),
+                );
+
+                $image = Image::make(file_get_contents($adv->files[0]->make()->url(), false, stream_context_create($arrContextOptions)));
 				$image->resize(
 					null,
 					setting_value('visiosoft.module.advs::thumbnail_height'),

From 01a5968e80062d24b513ec22db98a461ad234b0d Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Thu, 30 Sep 2021 17:45:32 +0300
Subject: [PATCH 14/23] create my ads api

---
 .../advs-module/src/Adv/AdvApiCollection.php          | 11 +++++++++++
 1 file changed, 11 insertions(+)
 create mode 100644 addons/default/visiosoft/advs-module/src/Adv/AdvApiCollection.php

diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvApiCollection.php b/addons/default/visiosoft/advs-module/src/Adv/AdvApiCollection.php
new file mode 100644
index 000000000..2503b7af6
--- /dev/null
+++ b/addons/default/visiosoft/advs-module/src/Adv/AdvApiCollection.php
@@ -0,0 +1,11 @@
+<?php namespace Visiosoft\AdvsModule\Adv;
+
+class AdvApiCollection extends AdvRepository
+{
+    public function getMyAds()
+    {
+        return $this->model->userAdv()
+            ->where('advs_advs.finish_at', '>', date('Y-m-d H:i:s'));
+
+    }
+}

From ec9dc00ac03bb03589353c22693c1f1400ff9d14 Mon Sep 17 00:00:00 2001
From: Muammer Top <muammer@visiosoft.com.tr>
Date: Fri, 1 Oct 2021 12:42:16 +0300
Subject: [PATCH 15/23] #1945 Post ad - location section

---
 .../resources/views/new-ad/new-create.twig    |  2 +-
 .../resources/views/new-ad/map.twig           | 31 ++++++++++---------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig b/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig
index a6bd38144..49c3b36ec 100644
--- a/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig
+++ b/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig
@@ -287,7 +287,7 @@
                                 <h5 class="mt-5 pb-1 border-bottom">
                                     {{ trans('visiosoft.module.advs::field.ad_location') }}
                                 </h5>
-                                <div class="bg-light p-4 mb-4">
+                                <div class="bg-light px-4 pb-4 pt-0 mb-4">
                                     {% include "visiosoft.module.location::new-ad/map" %}
 
                                     <input value="{{ adv.map_Val }}" name="map_Val" data-max="255" data-mask=""
diff --git a/addons/default/visiosoft/location-module/resources/views/new-ad/map.twig b/addons/default/visiosoft/location-module/resources/views/new-ad/map.twig
index ae07b99c4..e60ba4cf6 100644
--- a/addons/default/visiosoft/location-module/resources/views/new-ad/map.twig
+++ b/addons/default/visiosoft/location-module/resources/views/new-ad/map.twig
@@ -1,48 +1,48 @@
 {% if setting_value('visiosoft.module.location::create_ad_page_location') %}
-    <div class="form-group location-map">
+    <div class="form-group location-map position-relative">
         <div>
-            <ul class="nav nav-tabs p-1 bg-dark border-bottom py-2" role="tablist">
+            <ul class="nav nav-tabs d-flex justify-content-end border-0 bg-light position-absolute" role="tablist">
                 <li role="presentation" class="p-0 m-0">
-                    <a href="#location" class="text-dark py-1 px-4 border bg-white locationSection"
+                    <a href="#location" class="text-dark pr-2"
                        aria-controls="location"
                        role="tab" data-toggle="tab">{{ trans('visiosoft.module.location::addon.title') }}</a>
                 </li>
                 <li role="presentation" class="p-0 m-0 ml-1">
-                    <a href="#my_address" class="text-dark py-1 px-4 border bg-white" aria-controls="my_address"
+                    <a href="#my_address" class="text-dark pl-2" aria-controls="my_address"
                        role="tab" data-toggle="tab">{{ trans('visiosoft.module.profile::field.my_address') }}</a>
                 </li>
             </ul>
             <div class="tab-content bg-light">
                 <div role="tabpanel" class="tab-pane m-0 pt-2 active" id="location">
                     <div class="row">
-                        <div class="col-sm-4">
-                            <ul style="padding: 0" class="list-unstyled">
-                                <li class="country-data" data-content="{{ adv['country_id'] }}"
+                        <div class="col-12">
+                            <ul style="padding: 0" class="list-unstyled d-flex flex-column flex-sm-row">
+                                <li class="country-data flex-fill mx-1" data-content="{{ adv['country_id'] }}"
                                     data-default="{{ setting_value('visiosoft.module.location::default_country') }}"
                                     class="location-field country-data">
                                     {{ form.fields.country.setOptions({})|raw }}
                                 </li>
-                                <li class="city-data" data-content="{{ adv['city'] }}"
+                                <li class="city-data flex-fill mx-1" data-content="{{ adv['city'] }}"
                                     data-default="{{ setting_value('visiosoft.module.location::default_city') }}"
                                     class="location-field city-data">
                                     {{ form.fields.city|raw }}
                                 </li>
-                                <li class="district-data" data-content="{{ adv['district'] }}"
+                                <li class="district-data flex-fill mx-1" data-content="{{ adv['district'] }}"
                                     class="location-field district-data">
                                     {{ form.fields.district|raw }}
                                 </li>
-                                <li class="neighborhood-data" data-content="{{ adv['neighborhood'] }}"
+                                <li class="neighborhood-data flex-fill mx-1" data-content="{{ adv['neighborhood'] }}"
                                     class="location-field neighborhood-data">
                                     {{ form.fields.neighborhood|raw }}
                                 </li>
                                 {% if not setting_value('visiosoft.module.advs::hide_village_field') %}
-                                    <li class="village-data" data-content="{{ adv['village'] }}" class="location-field">
+                                    <li class="village-data flex-fill" data-content="{{ adv['village'] }}">
                                         {{ form.fields.village|raw }}
                                     </li>
                                 {% endif %}
                             </ul>
                         </div>
-                        <div class="col-sm-8">
+                        <div class="col-12">
                             <div id="map-canvas" style="
                                 position: relative; overflow: hidden;
                                 transform: translateZ(0px) translateZ(0px) translateZ(0px) translateZ(0px) translateZ(0px) translateZ(0px);
@@ -102,7 +102,8 @@
     {{ asset_add("scripts.js", "visiosoft.module.location::js/addressSelect.js") }}
 {% endif %}
 <style>
-    .location-map .nav-tabs .active {
-        background-color: #e5e5e5;
-    }
+    .location-map .nav-tabs .active { text-decoration: underline; color: lightskyblue !important; }
+    .location-map .nav-tabs { top: -30px; right: 0; font-size: 12px; }
+    .location-map .tab-content label { font-size: 13px; font-weight: bold; }
+    .location-map .tab-content select { border-color: #e8e8e8; border-radius: 3px; }
 </style>

From 462e051d729fc0ead3de624ba69a8f4087d67773 Mon Sep 17 00:00:00 2001
From: Muammer Top <muammer@visiosoft.com.tr>
Date: Fri, 1 Oct 2021 12:47:48 +0300
Subject: [PATCH 16/23] #1945 Post ad - location section

---
 .../location-module/resources/css/map.css     | 20 +++++++++++++++++++
 .../resources/views/new-ad/map.twig           |  9 +++------
 2 files changed, 23 insertions(+), 6 deletions(-)
 create mode 100644 addons/default/visiosoft/location-module/resources/css/map.css

diff --git a/addons/default/visiosoft/location-module/resources/css/map.css b/addons/default/visiosoft/location-module/resources/css/map.css
new file mode 100644
index 000000000..1e0890d49
--- /dev/null
+++ b/addons/default/visiosoft/location-module/resources/css/map.css
@@ -0,0 +1,20 @@
+.location-map .nav-tabs .active {
+    text-decoration: underline;
+    color: lightskyblue !important;
+}
+
+.location-map .nav-tabs {
+    top: -30px;
+    right: 0;
+    font-size: 12px;
+}
+
+.location-map .tab-content label {
+    font-size: 13px;
+    font-weight: bold;
+}
+
+.location-map .tab-content select {
+    border-color: #e8e8e8;
+    border-radius: 3px;
+}
diff --git a/addons/default/visiosoft/location-module/resources/views/new-ad/map.twig b/addons/default/visiosoft/location-module/resources/views/new-ad/map.twig
index e60ba4cf6..d56f21222 100644
--- a/addons/default/visiosoft/location-module/resources/views/new-ad/map.twig
+++ b/addons/default/visiosoft/location-module/resources/views/new-ad/map.twig
@@ -100,10 +100,7 @@
             type="text/javascript"></script>
     {{ asset_add("scripts.js", "visiosoft.module.advs::js/location.js") }}
     {{ asset_add("scripts.js", "visiosoft.module.location::js/addressSelect.js") }}
+
+    {{ asset_add("styles.css", "visiosoft.module.location::css/map.css") }}
 {% endif %}
-<style>
-    .location-map .nav-tabs .active { text-decoration: underline; color: lightskyblue !important; }
-    .location-map .nav-tabs { top: -30px; right: 0; font-size: 12px; }
-    .location-map .tab-content label { font-size: 13px; font-weight: bold; }
-    .location-map .tab-content select { border-color: #e8e8e8; border-radius: 3px; }
-</style>
+

From e84f9418a57338d23e9f6021f629d58417fd973a Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Sat, 2 Oct 2021 15:51:46 +0300
Subject: [PATCH 17/23] added api

---
 .../advs-module/resources/lang/en/message.php |  1 +
 .../advs-module/resources/lang/tr/message.php |  1 +
 .../advs-module/src/Adv/AdvApiCollection.php  | 25 +++++++++++++++++++
 3 files changed, 27 insertions(+)

diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/message.php b/addons/default/visiosoft/advs-module/resources/lang/en/message.php
index c60c9eeab..8c176b997 100644
--- a/addons/default/visiosoft/advs-module/resources/lang/en/message.php
+++ b/addons/default/visiosoft/advs-module/resources/lang/en/message.php
@@ -32,4 +32,5 @@ return [
 	'sold_status_change' => "Your Ad's Status Has Been Set to Sold!",
 	'status_change' => "Your Ad's Status Has Been Set to :status!",
 	'disabled_detailed_options_for_admin_role' => "Detailed product options are disabled.",
+    'permission_error' => 'You do not have permission for this action',
 ];
diff --git a/addons/default/visiosoft/advs-module/resources/lang/tr/message.php b/addons/default/visiosoft/advs-module/resources/lang/tr/message.php
index 5f6db9514..74c91afb1 100644
--- a/addons/default/visiosoft/advs-module/resources/lang/tr/message.php
+++ b/addons/default/visiosoft/advs-module/resources/lang/tr/message.php
@@ -32,4 +32,5 @@ return [
 	'sold_status_change' => "İlanın Durumu Satıldı Olarak Ayarlanmıştır!",
 	'status_change' => "İlanın durumu Ayarland :status !",
 	'disabled_detailed_options_for_admin_role' => "Ayrıntılı ürün seçenekleri devre dışı bırakıldı.",
+    'permission_error' => 'Bu işlem için yetkiniz bulunmamaktadır',
 ];
diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvApiCollection.php b/addons/default/visiosoft/advs-module/src/Adv/AdvApiCollection.php
index 2503b7af6..8423798c0 100644
--- a/addons/default/visiosoft/advs-module/src/Adv/AdvApiCollection.php
+++ b/addons/default/visiosoft/advs-module/src/Adv/AdvApiCollection.php
@@ -1,11 +1,36 @@
 <?php namespace Visiosoft\AdvsModule\Adv;
 
+use Illuminate\Foundation\Bus\DispatchesJobs;
+use Illuminate\Support\Facades\Auth;
+use Visiosoft\ConnectModule\Command\CheckRequiredParams;
+
 class AdvApiCollection extends AdvRepository
 {
+    use DispatchesJobs;
+
     public function getMyAds()
     {
         return $this->model->userAdv()
             ->where('advs_advs.finish_at', '>', date('Y-m-d H:i:s'));
+    }
 
+    public function createNewAd(array $params)
+    {
+        return $this->newQuery()->create($params);
+    }
+
+    public function deleteAd(array $params)
+    {
+        $this->dispatch(new CheckRequiredParams(['ad_id'], $params));
+
+        if (!$ad = $this->newQuery()->find($params['ad_id'])) {
+            throw new \Exception(trans('visiosoft.module.advs::message.ad_doesnt_exist'),404);
+        }
+
+        if ($ad->created_by_id != Auth::id()) {
+            throw new \Exception(trans('visiosoft.module.advs::message.permission_error'),403);
+        }
+
+        return $ad->delete();
     }
 }

From b03a073113960a31d42d81a207a812c66e8190fb Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Sat, 2 Oct 2021 16:37:20 +0300
Subject: [PATCH 18/23] update api

---
 .../advs-module/src/Adv/AdvApiCollection.php  | 54 ++++++++++++++++---
 1 file changed, 48 insertions(+), 6 deletions(-)

diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvApiCollection.php b/addons/default/visiosoft/advs-module/src/Adv/AdvApiCollection.php
index 8423798c0..cd428ce96 100644
--- a/addons/default/visiosoft/advs-module/src/Adv/AdvApiCollection.php
+++ b/addons/default/visiosoft/advs-module/src/Adv/AdvApiCollection.php
@@ -1,5 +1,6 @@
 <?php namespace Visiosoft\AdvsModule\Adv;
 
+use Carbon\Carbon;
 use Illuminate\Foundation\Bus\DispatchesJobs;
 use Illuminate\Support\Facades\Auth;
 use Visiosoft\ConnectModule\Command\CheckRequiredParams;
@@ -23,14 +24,55 @@ class AdvApiCollection extends AdvRepository
     {
         $this->dispatch(new CheckRequiredParams(['ad_id'], $params));
 
-        if (!$ad = $this->newQuery()->find($params['ad_id'])) {
-            throw new \Exception(trans('visiosoft.module.advs::message.ad_doesnt_exist'),404);
-        }
 
-        if ($ad->created_by_id != Auth::id()) {
-            throw new \Exception(trans('visiosoft.module.advs::message.permission_error'),403);
-        }
+        $ad = $this->checkAd($params['ad_id']);
+
+        $this->checkOwner($ad);
 
         return $ad->delete();
     }
+
+    public function updateAd(array $params)
+    {
+        $this->dispatch(new CheckRequiredParams(['ad_id'], $params));
+
+        $ad = $this->checkAd($params['ad_id']);
+
+        $this->checkOwner($ad);
+
+        unset($params['ad_id'],$params['id'], $params['created_at'], $params['updated_at'],
+            $params['deleted_at'], $params['created_by_id'], $params['updated_by_id']);
+
+
+        $update_params = [
+            'updated_by_id' => Auth::id(),
+            'updated_at' => Carbon::now()
+        ];
+
+        $ad->update(array_merge($update_params,$params));
+
+        return $ad;
+    }
+
+    public function getAds()
+    {
+        return $this->currentAds();
+    }
+
+    public function checkAd($id)
+    {
+        if (!$ad = $this->newQuery()->find($id)) {
+            throw new \Exception(trans('visiosoft.module.advs::message.ad_doesnt_exist'), 404);
+            die;
+        }
+        return $ad;
+    }
+
+    public function checkOwner($ad)
+    {
+        if ($ad->created_by_id != Auth::id()) {
+            throw new \Exception(trans('visiosoft.module.advs::message.permission_error'), 403);
+            die;
+        }
+    }
 }

From 803e15955dbd59bd0625df9896bc5e4c6c3739d0 Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Mon, 4 Oct 2021 12:16:22 +0300
Subject: [PATCH 19/23] fix currency converter exception

---
 .../visiosoft/advs-module/resources/lang/en/message.php   | 1 +
 .../visiosoft/advs-module/resources/lang/tr/message.php   | 1 +
 .../advs-module/src/Http/Controller/AdvsController.php    | 8 ++++++--
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/message.php b/addons/default/visiosoft/advs-module/resources/lang/en/message.php
index 8c176b997..6fbadb7b5 100644
--- a/addons/default/visiosoft/advs-module/resources/lang/en/message.php
+++ b/addons/default/visiosoft/advs-module/resources/lang/en/message.php
@@ -33,4 +33,5 @@ return [
 	'status_change' => "Your Ad's Status Has Been Set to :status!",
 	'disabled_detailed_options_for_admin_role' => "Detailed product options are disabled.",
     'permission_error' => 'You do not have permission for this action',
+    'currency_converter_not_available' => 'The currency converter is not available.',
 ];
diff --git a/addons/default/visiosoft/advs-module/resources/lang/tr/message.php b/addons/default/visiosoft/advs-module/resources/lang/tr/message.php
index 74c91afb1..3c59de32d 100644
--- a/addons/default/visiosoft/advs-module/resources/lang/tr/message.php
+++ b/addons/default/visiosoft/advs-module/resources/lang/tr/message.php
@@ -33,4 +33,5 @@ return [
 	'status_change' => "İlanın durumu Ayarland :status !",
 	'disabled_detailed_options_for_admin_role' => "Ayrıntılı ürün seçenekleri devre dışı bırakıldı.",
     'permission_error' => 'Bu işlem için yetkiniz bulunmamaktadır',
+    'currency_converter_not_available' => 'Para birimi çevirici kullanılamıyor.',
 ];
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 4885d2938..fd1b1e83c 100644
--- a/addons/default/visiosoft/advs-module/src/Http/Controller/AdvsController.php
+++ b/addons/default/visiosoft/advs-module/src/Http/Controller/AdvsController.php
@@ -919,7 +919,11 @@ class AdvsController extends PublicController
             if ($is_new_create) {
                 event(new CreatedAd($adv));
             } else {
-                $this->adv_model->foreignCurrency($this->request->currency, $this->request->price, $this->request->update_id, $this->settings_repository, false);
+                try {
+                    $this->adv_model->foreignCurrency($this->request->currency, $this->request->price, $this->request->update_id, $this->settings_repository, false);
+                } catch (\Exception $exception) {
+                    $this->messages->error(trans('visiosoft.module.advs::message.currency_converter_not_available'));
+                }
                 event(new EditedAd($before_editing, $adv));
             }
 
@@ -1007,7 +1011,7 @@ class AdvsController extends PublicController
 
         return $this->view->make(
             'visiosoft.module.advs::new-ad/new-create',
-            compact('id', 'cats_d', 'cats', 'adv', 'custom_fields', 'options', 'hidePrice','is_options', 'configurations')
+            compact('id', 'cats_d', 'cats', 'adv', 'custom_fields', 'options', 'hidePrice', 'is_options', 'configurations')
         );
     }
 

From 354ffb0a50bb78e252471a8f9ac0c12ba19ef260 Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Wed, 6 Oct 2021 09:53:28 +0300
Subject: [PATCH 20/23] fix auth

---
 .../visiosoft/advs-module/src/AdvsModuleServiceProvider.php | 5 +++++
 .../advs-module/src/Http/Controller/AdvsController.php      | 4 ----
 .../src/Http/Controller/MyProfileController.php             | 6 +++++-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php
index 2c0fcdb63..e0aedcb40 100644
--- a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php
+++ b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php
@@ -114,10 +114,12 @@ class AdvsModuleServiceProvider extends AddonServiceProvider
         ],
         'advs/create_adv' => [
             'as' => "advs::create_adv",
+            'middleware' => 'auth',
             'uses' => 'Visiosoft\AdvsModule\Http\Controller\AdvsController@cats',
         ],
         'advs/create_adv/post_cat' => [
             'as' => 'post_adv',
+            'middleware' => 'auth',
             'uses' => 'Visiosoft\AdvsModule\Http\Controller\AdvsController@create',
         ],
         'advs/save_adv' => [
@@ -135,6 +137,7 @@ class AdvsModuleServiceProvider extends AddonServiceProvider
         ],
         'advs/delete/{id}' => [
             'as' => 'advs::delete',
+            'middleware' => 'auth',
             'uses' => 'Visiosoft\AdvsModule\Http\Controller\AdvsController@deleteAd',
         ],
         'adv/addCart/{id}' => [
@@ -205,6 +208,7 @@ class AdvsModuleServiceProvider extends AddonServiceProvider
 
         //Configurations Admin Controller
         'admin/advs/option_configuration/create' => [
+            'middleware' => 'auth',
             'as' => 'visiosoft.module.advs::configrations.create',
             'uses' => 'Visiosoft\AdvsModule\Http\Controller\Admin\OptionConfigurationController@create',
         ],
@@ -215,6 +219,7 @@ class AdvsModuleServiceProvider extends AddonServiceProvider
 
         //Configuration Controller
         'advs/option_configuration/create' => [
+            'middleware' => 'auth',
             'as' => 'visiosoft.module.advs::user.configrations.create',
             'uses' => 'Visiosoft\AdvsModule\Http\Controller\OptionConfigurationController@create',
         ],
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 fd1b1e83c..1ed74021a 100644
--- a/addons/default/visiosoft/advs-module/src/Http/Controller/AdvsController.php
+++ b/addons/default/visiosoft/advs-module/src/Http/Controller/AdvsController.php
@@ -711,7 +711,6 @@ class AdvsController extends PublicController
     public function deleteAd(AdvRepositoryInterface $advs, $id)
     {
         $ad = $this->adv_model->find($id);
-        $this->middleware('auth');
 
         if ($ad->created_by_id != Auth::id()) {
             $this->messages->error(trans('visiosoft.module.advs::message.delete_author_error'));
@@ -743,8 +742,6 @@ class AdvsController extends PublicController
 
     public function create(AdvFormBuilder $formBuilder, CategoryRepositoryInterface $repository)
     {
-        $this->middleware('auth');
-
         $isActive = new AdvModel();
         $cats = $this->request->toArray();
         unset($cats['_token']);
@@ -1059,7 +1056,6 @@ class AdvsController extends PublicController
 
     public function cats()
     {
-        $this->middleware('auth');
         $main_cats = $this->category_repository->getMainCategories();
 
         return $this->view->make('visiosoft.module.advs::new-ad/post-cat', compact('main_cats'));
diff --git a/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php b/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php
index 8042a6013..08fc52ddd 100644
--- a/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php
+++ b/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php
@@ -34,7 +34,11 @@ class MyProfileController extends PublicController
     )
     {
         parent::__construct();
-        $this->middleware('auth');
+
+        if (!Auth::user()) {
+            redirect('/login?redirect=' . url()->current())->send();
+        }
+
         $this->adressRepository = $adressRepository;
         $this->userRepository = $userRepository;
     }

From 1502781aae32cf28fc7686ead58e0fe527680141 Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Wed, 6 Oct 2021 10:02:59 +0300
Subject: [PATCH 21/23] fix auth

---
 .../Http/Controller/MyProfileController.php   |  4 --
 .../src/ProfileModuleServiceProvider.php      | 46 +++++++++++++++----
 2 files changed, 37 insertions(+), 13 deletions(-)

diff --git a/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php b/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php
index 08fc52ddd..1fa2d90d1 100644
--- a/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php
+++ b/addons/default/visiosoft/profile-module/src/Http/Controller/MyProfileController.php
@@ -35,10 +35,6 @@ class MyProfileController extends PublicController
     {
         parent::__construct();
 
-        if (!Auth::user()) {
-            redirect('/login?redirect=' . url()->current())->send();
-        }
-
         $this->adressRepository = $adressRepository;
         $this->userRepository = $userRepository;
     }
diff --git a/addons/default/visiosoft/profile-module/src/ProfileModuleServiceProvider.php b/addons/default/visiosoft/profile-module/src/ProfileModuleServiceProvider.php
index 3cb843f31..ede582c74 100644
--- a/addons/default/visiosoft/profile-module/src/ProfileModuleServiceProvider.php
+++ b/addons/default/visiosoft/profile-module/src/ProfileModuleServiceProvider.php
@@ -46,44 +46,72 @@ class ProfileModuleServiceProvider extends AddonServiceProvider
         // MyProfileController
         'profile/ads' => [
             'as' => 'profile::ads',
+            'middleware' => 'auth',
             'uses' => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@myAds'
         ],
         'profile/adress/ajaxCreate' => [
             'as' => 'visiosoft.module.profile::adress_ajax_create',
+            'middleware' => 'auth',
             'uses' => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@adressAjaxCreate'
         ],
         'profile/adress/ajaxUpdate/{id}' => [
             'as' => 'visiosoft.module.profile::adress_ajax_update',
+            'middleware' => 'auth',
             'uses' => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@adressAjaxUpdate'
         ],
         'profile/adress/ajaxDetail' => [
             'as' => 'visiosoft.module.profile::adress_ajax_detail',
+            'middleware' => 'auth',
             'uses' => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@adressAjaxDetail'
         ],
         'profile' => [
             'as' => 'profile::profile',
+            'middleware' => 'auth',
             'uses' => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@home'
         ],
 	    'profile/detail' => [
 		    'as' => 'profile::detail',
-		    'uses' => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@detail'
+            'middleware' => 'auth',
+            'uses' => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@detail'
 	    ],
 	    'profile/password' => [
 		    'as' => 'profile::password',
-		    'uses' => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@password'
+            'middleware' => 'auth',
+            'uses' => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@password'
 	    ],
-        'profile/class/status/{id},{type}' => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@statusAds',
-        'profile/class/extendTime/{id},{type}' => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@extendAds',
-        'profile/message/show/{id}' => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@showMessage',
+        'profile/class/status/{id},{type}' => [
+            'middleware' => 'auth',
+            'uses' => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@statusAds',
+        ],
+        'profile/class/extendTime/{id},{type}' => [
+            'middleware' => 'auth',
+            'uses' => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@extendAds',
+        ],
+        'profile/message/show/{id}' => [
+            'middleware' => 'auth',
+            'uses'  => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@showMessage',
+        ],
         'profile/close-account' => [
             'middleware' => 'auth',
         	'as' => 'visiosoft.module.profile::profile_close_account',
 	        'uses' => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@disableAccount'
         ],
-        'profile/notification' => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@notification',
-        'ajax/update-user-info' => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@updateAjaxProfile',
-	    'api/changeEducation' => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@changeEducation',
-	    'api/getEducation' => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@getEducation',
+        'profile/notification' => [
+            'uses' => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@notification',
+            'middleware' => 'auth',
+        ],
+        'ajax/update-user-info' => [
+            'middleware' => 'auth',
+            'uses' => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@updateAjaxProfile',
+        ],
+	    'api/changeEducation' => [
+            'middleware' => 'auth',
+            'uses' => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@changeEducation',
+        ],
+	    'api/getEducation' => [
+            'middleware' => 'auth',
+            'uses' => 'Visiosoft\ProfileModule\Http\Controller\MyProfileController@getEducation',
+        ],
 
         // UserAuthenticator
         'login-in' => 'Visiosoft\ProfileModule\Http\Controller\UserAuthenticator@attempt',

From 7086912374d5df34ff5e1b6b9aa70bae6368fb7a Mon Sep 17 00:00:00 2001
From: Muammer Top <muammer@visiosoft.com.tr>
Date: Wed, 6 Oct 2021 10:37:51 +0300
Subject: [PATCH 22/23] #4656 category image error

---
 .../visiosoft/cats-module/src/Category/CategoryModel.php       | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php b/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php
index d72983576..ad2ef643c 100644
--- a/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php
+++ b/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php
@@ -16,8 +16,7 @@ class CategoryModel extends CatsCategoryEntryModel implements CategoryInterface
         if ($this->icon === null) {
             return $this->dispatch(new MakeImageInstance('visiosoft.module.advs::images/listing/sample-cat-icon.svg', 'img'))->url();
         }
-
-        return url($this->icon);
+        return $this->dispatch(new MakeImageInstance($this->icon, 'img'))->url();
     }
 
     public function getCat($id)

From c71a0144b3db0ba1892ecdb73c34a765c7ed8600 Mon Sep 17 00:00:00 2001
From: Muammer Top <muammer@visiosoft.com.tr>
Date: Wed, 6 Oct 2021 10:40:12 +0300
Subject: [PATCH 23/23] #4656 category image error

---
 .../visiosoft/cats-module/src/Category/CategoryModel.php   | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php b/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php
index ad2ef643c..b977a8d47 100644
--- a/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php
+++ b/addons/default/visiosoft/cats-module/src/Category/CategoryModel.php
@@ -13,10 +13,9 @@ class CategoryModel extends CatsCategoryEntryModel implements CategoryInterface
 
     public function getIconUrlAttribute()
     {
-        if ($this->icon === null) {
-            return $this->dispatch(new MakeImageInstance('visiosoft.module.advs::images/listing/sample-cat-icon.svg', 'img'))->url();
-        }
-        return $this->dispatch(new MakeImageInstance($this->icon, 'img'))->url();
+        return $this->dispatch(
+            new MakeImageInstance($this->icon ?? 'visiosoft.module.advs::images/listing/sample-cat-icon.svg', 'img')
+        )->url();
     }
 
     public function getCat($id)