From e2bedf3c01a629fdc985d4a4466758beb0ff0fb3 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Wed, 8 Sep 2021 13:00:45 +0300 Subject: [PATCH 1/5] #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 e8533fc30900a91fe0df727af03f2aa1b8df7c0d Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Mon, 27 Sep 2021 14:12:17 +0300 Subject: [PATCH 2/5] #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 Date: Mon, 27 Sep 2021 14:14:10 +0300 Subject: [PATCH 3/5] #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 Date: Mon, 27 Sep 2021 15:26:51 +0300 Subject: [PATCH 4/5] #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") }} {{ 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 @@ - Date: Tue, 28 Sep 2021 16:50:06 +0300 Subject: [PATCH 5/5] #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') }}"; @@ -100,4 +105,4 @@ .location-map .nav-tabs .active { background-color: #e5e5e5; } - \ No newline at end of file +