From 805ae4a49f1bff150ddba8e91b9d9f3ee2d6c3ed Mon Sep 17 00:00:00 2001 From: Diatrex Date: Tue, 15 Jun 2021 13:39:05 +0300 Subject: [PATCH 01/10] #4148 telescope saves every view --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 6ea064e89..cd33fbb01 100644 --- a/composer.json +++ b/composer.json @@ -61,7 +61,6 @@ "anomaly/settings-module": "~2.4.0", "anomaly/blocks-module": "~1.3.0", "anomaly/search-module": "~3.0.0", - "anomaly/system-module": "~1.1.0", "anomaly/users-module": "~2.5.0", "anomaly/pages-module": "~2.6.0", "anomaly/posts-module": "~2.6.0", @@ -74,6 +73,7 @@ "visiosoft/decimal-field_type": "~2.1.0", "visiosoft/integer-field_type": "~2.1.0", "visiosoft/list-field_type": "*", + "visiosoft/system-module": "~1.1.0", "wirelab/language_switcher-plugin": "^1.3", "visiosoft/addblock-extension": "^1.1", "maatwebsite/excel": "*", From 9c5c9d269be2e6da09a113427080cb9f60ec9823 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Thu, 17 Jun 2021 12:54:31 +0300 Subject: [PATCH 02/10] #4177 --- addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php | 2 +- 1 file changed, 1 insertion(+), 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 967f96c48..9adb892c3 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php @@ -58,7 +58,7 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface $delimiter = '_'; $keyword = str_slug($param['keyword'], $delimiter); $query = $query->where(function ($query) use ($keyword) { - $query->where('advs_advs_translations.advs_desc', 'like', '%' . $keyword . '%') + $query->where('advs_advs_translations.advs_desc', 'like', $keyword) ->orWhere('slug', 'like', '%' . $keyword . '%') ->orWhere('advs_advs_translations.name', 'like', '%' . $keyword . '%'); }); From 4f55c622e9e9054e214347596e8e3326250ca485 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Fri, 18 Jun 2021 14:28:06 +0300 Subject: [PATCH 03/10] #4229 alibaba-theme category area edit --- composer.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 6ea064e89..2d6098803 100644 --- a/composer.json +++ b/composer.json @@ -92,8 +92,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 c5fd81b09fa318783ed96efba56e39dd8bf10484 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Fri, 18 Jun 2021 15:41:01 +0300 Subject: [PATCH 04/10] #4197 [advs-module] Categories breadcrumb not working --- .../advs-module/resources/views/list/partials/breadcrumb.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/breadcrumb.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/breadcrumb.twig index 3b54c0db7..141ae835f 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/partials/breadcrumb.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/breadcrumb.twig @@ -7,7 +7,7 @@ - {{ addBlock('ads-list/partials/breadcrumb', {'mainCats': mainCats, 'category': categoryId})|raw }} + {{ addBlock('ads-list/partials/breadcrumb', {'mainCats': mainCats, 'category': category})|raw }} From 7b13d8f4fc6c3ff0b5ca816be7db85645525da0c Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Mon, 21 Jun 2021 09:52:33 +0300 Subject: [PATCH 05/10] =?UTF-8?q?#4230=20[sahibinden-theme]=20register=20b?= =?UTF-8?q?utton=20is=20not=20working=20=C4=B1n=20dutch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../visiosoft/profile-module/resources/lang/nl/field.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/default/visiosoft/profile-module/resources/lang/nl/field.php b/addons/default/visiosoft/profile-module/resources/lang/nl/field.php index c99219b3d..ac73ab874 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/nl/field.php +++ b/addons/default/visiosoft/profile-module/resources/lang/nl/field.php @@ -2,7 +2,7 @@ return [ 'file' => [ - 'name' => 'foto\\'s' + 'name' => 'foto\'s' ], 'first_name' => [ 'name' => 'Voornaam' From 160861329c7b945319d9bb9a9469fa2b5df03cb7 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Mon, 21 Jun 2021 09:53:19 +0300 Subject: [PATCH 06/10] =?UTF-8?q?#4230=20[sahibinden-theme]=20register=20b?= =?UTF-8?q?utton=20is=20not=20working=20=C4=B1n=20dutch?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 2d6098803..6ea064e89 100644 --- a/composer.json +++ b/composer.json @@ -92,7 +92,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 5adf53606ec607f88681384096c5def9db8e0867 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Mon, 21 Jun 2021 12:24:45 +0300 Subject: [PATCH 07/10] #3862 CSV ad import - Celep --- ...soft.module.advs__create_config_fields.php | 25 +++++++++++++++++++ .../resources/views/layouts/default.twig | 1 + 2 files changed, 26 insertions(+) create mode 100644 addons/default/visiosoft/advs-module/migrations/2021_06_21_114752_visiosoft.module.advs__create_config_fields.php diff --git a/addons/default/visiosoft/advs-module/migrations/2021_06_21_114752_visiosoft.module.advs__create_config_fields.php b/addons/default/visiosoft/advs-module/migrations/2021_06_21_114752_visiosoft.module.advs__create_config_fields.php new file mode 100644 index 000000000..02493c6c2 --- /dev/null +++ b/addons/default/visiosoft/advs-module/migrations/2021_06_21_114752_visiosoft.module.advs__create_config_fields.php @@ -0,0 +1,25 @@ +getDatabasePlatform()->registerDoctrineTypeMapping('point', 'string'); + } + + protected $stream = [ + 'slug' => 'advs', + ]; + + protected $fields = [ + 'config' => 'visiosoft.field_type.json', + ]; + + protected $assignments = [ + 'config' + ]; +} diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/views/layouts/default.twig b/addons/default/visiosoft/defaultadmin-theme/resources/views/layouts/default.twig index 4c0dbe7bb..e43e088b3 100644 --- a/addons/default/visiosoft/defaultadmin-theme/resources/views/layouts/default.twig +++ b/addons/default/visiosoft/defaultadmin-theme/resources/views/layouts/default.twig @@ -4,6 +4,7 @@ {% include "theme::partials/metadata" %} + {% block styles %}{% endblock %} Date: Mon, 21 Jun 2021 15:41:04 +0300 Subject: [PATCH 08/10] =?UTF-8?q?#4045=20Kurs=20Ocify=20d=C3=BCzenlemeleer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/views/new-ad/new-create.twig | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 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 faa206aef..73013aa25 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 @@ -278,17 +278,19 @@ {% endif %} -
- {{ trans('visiosoft.module.advs::field.ad_location') }} -
-
- {% include "visiosoft.module.location::new-ad/map" %} + {% if setting_value('visiosoft.module.location::create_ad_page_location') %} +
+ {{ trans('visiosoft.module.advs::field.ad_location') }} +
+
+ {% include "visiosoft.module.location::new-ad/map" %} - -
+ +
+ {% endif %}
{% if setting_value('visiosoft.module.advs::show_post_ad_agreement') %} From 1ce71411e1affe3c56ba6644715795fabbdff41a Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Tue, 22 Jun 2021 09:24:00 +0300 Subject: [PATCH 09/10] #4177 --- addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php index 9adb892c3..2161d1fe6 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php @@ -58,8 +58,7 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface $delimiter = '_'; $keyword = str_slug($param['keyword'], $delimiter); $query = $query->where(function ($query) use ($keyword) { - $query->where('advs_advs_translations.advs_desc', 'like', $keyword) - ->orWhere('slug', 'like', '%' . $keyword . '%') + $query->where('slug', 'like', '%' . $keyword . '%') ->orWhere('advs_advs_translations.name', 'like', '%' . $keyword . '%'); }); } From 7fe9bc41c8aca89997cf5a89196d69a9d31ac837 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Tue, 22 Jun 2021 10:44:19 +0300 Subject: [PATCH 10/10] #4145 offline design when you have no connection --- .../base-theme/resources/css/offline.scss | 37 +++++++++++++++++++ .../base-theme/resources/images/unplugged.svg | 2 + .../resources/js/theme/initialize.js | 25 ++++++++++--- .../base-theme/resources/lang/en/field.php | 6 +++ .../resources/views/layouts/booking.twig | 2 + .../resources/views/layouts/default.twig | 2 + .../resources/views/layouts/error.twig | 3 ++ .../resources/views/layouts/no-container.twig | 2 + .../resources/views/layouts/page.twig | 2 + .../resources/views/partials/metadata.twig | 1 + .../resources/views/partials/offline.twig | 18 +++++++++ 11 files changed, 95 insertions(+), 5 deletions(-) create mode 100644 addons/default/visiosoft/base-theme/resources/css/offline.scss create mode 100644 addons/default/visiosoft/base-theme/resources/images/unplugged.svg create mode 100644 addons/default/visiosoft/base-theme/resources/views/partials/offline.twig diff --git a/addons/default/visiosoft/base-theme/resources/css/offline.scss b/addons/default/visiosoft/base-theme/resources/css/offline.scss new file mode 100644 index 000000000..03b25a263 --- /dev/null +++ b/addons/default/visiosoft/base-theme/resources/css/offline.scss @@ -0,0 +1,37 @@ +#offline { + display: none; + + & > div { + min-height: 100vh; + + svg { + height: 12rem; + width: auto; + } + + h1 { + font-weight: 400; + font-size: 1.5rem; + } + + p { + color: #7B7B90; + } + + button { + background-color: #ebeeff; + color: #007eff; + padding: .75rem 1.75rem; + font-weight: 700; + border-radius: 7px; + + &:focus { + outline: 5px auto #007eff; + } + + .spinner-border { + display: none; + } + } + } +} \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/images/unplugged.svg b/addons/default/visiosoft/base-theme/resources/images/unplugged.svg new file mode 100644 index 000000000..4152a2b22 --- /dev/null +++ b/addons/default/visiosoft/base-theme/resources/images/unplugged.svg @@ -0,0 +1,2 @@ + + diff --git a/addons/default/visiosoft/base-theme/resources/js/theme/initialize.js b/addons/default/visiosoft/base-theme/resources/js/theme/initialize.js index a52c5dc3e..89c727b4d 100644 --- a/addons/default/visiosoft/base-theme/resources/js/theme/initialize.js +++ b/addons/default/visiosoft/base-theme/resources/js/theme/initialize.js @@ -1,5 +1,20 @@ -// (function (window, document) { -// -// // Go! -// -// })(window, document); +(function (window, document) { + /* Offline */ + window.addEventListener('offline', () => { + $('body > *').hide(); + $('#offline').show(); + }); + + $('#offline button').click(function () { + $('.spinner-border', this).css('display', 'inline-block') + + setTimeout(() => { + if (window.navigator.onLine) { + window.location.reload(); + } else { + $('.spinner-border', this).hide() + } + }, 250) + }) + /* End Offline */ +})(window, document); diff --git a/addons/default/visiosoft/base-theme/resources/lang/en/field.php b/addons/default/visiosoft/base-theme/resources/lang/en/field.php index 4c0d09949..1dbcef01d 100644 --- a/addons/default/visiosoft/base-theme/resources/lang/en/field.php +++ b/addons/default/visiosoft/base-theme/resources/lang/en/field.php @@ -56,4 +56,10 @@ return [ 'list' => 'List', 'instruction_description' => 'Instruction Description', 'instruction_list' => 'Instruction List', + + // Offline + 'connection_problem' => 'Connection problem', + 'your_internet_connection_is_broken' => 'Your internet connection is broken,', + 'we_miss_you_so_much_already' => 'we miss you so much already!', + 'try_again' => 'Try again', ]; \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/views/layouts/booking.twig b/addons/default/visiosoft/base-theme/resources/views/layouts/booking.twig index 04b3fefe9..e7973bae5 100644 --- a/addons/default/visiosoft/base-theme/resources/views/layouts/booking.twig +++ b/addons/default/visiosoft/base-theme/resources/views/layouts/booking.twig @@ -14,5 +14,7 @@ {% endblock %}
+{% include "visiosoft.theme.base::partials/offline" %} + diff --git a/addons/default/visiosoft/base-theme/resources/views/layouts/default.twig b/addons/default/visiosoft/base-theme/resources/views/layouts/default.twig index 76d07b450..a06220c3a 100644 --- a/addons/default/visiosoft/base-theme/resources/views/layouts/default.twig +++ b/addons/default/visiosoft/base-theme/resources/views/layouts/default.twig @@ -35,6 +35,8 @@ +{% include "visiosoft.theme.base::partials/offline" %} + {% include "visiosoft.theme.base::partials/footer" %} {% include "visiosoft.theme.base::partials/assets" %} {% include "visiosoft.theme.base::partials/settings" %} diff --git a/addons/default/visiosoft/base-theme/resources/views/layouts/error.twig b/addons/default/visiosoft/base-theme/resources/views/layouts/error.twig index 4a34650d5..9f42adf74 100644 --- a/addons/default/visiosoft/base-theme/resources/views/layouts/error.twig +++ b/addons/default/visiosoft/base-theme/resources/views/layouts/error.twig @@ -18,6 +18,9 @@ {% block content %}{% endblock %} + +{% include "visiosoft.theme.base::partials/offline" %} + \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/views/layouts/no-container.twig b/addons/default/visiosoft/base-theme/resources/views/layouts/no-container.twig index 20fe9b629..d3b9896bd 100644 --- a/addons/default/visiosoft/base-theme/resources/views/layouts/no-container.twig +++ b/addons/default/visiosoft/base-theme/resources/views/layouts/no-container.twig @@ -34,6 +34,8 @@ +{% include "visiosoft.theme.base::partials/offline" %} + {% include "visiosoft.theme.base::partials/footer" %} {% include "visiosoft.theme.base::partials/assets" %} {% include "visiosoft.theme.base::partials/settings" %} diff --git a/addons/default/visiosoft/base-theme/resources/views/layouts/page.twig b/addons/default/visiosoft/base-theme/resources/views/layouts/page.twig index e4cb45c72..5bfeaa861 100644 --- a/addons/default/visiosoft/base-theme/resources/views/layouts/page.twig +++ b/addons/default/visiosoft/base-theme/resources/views/layouts/page.twig @@ -30,6 +30,8 @@ +{% include "visiosoft.theme.base::partials/offline" %} + {% include "visiosoft.theme.base::partials/footer" %} {% include "visiosoft.theme.base::partials/settings" %} 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 3bc627f64..2ad8eb479 100644 --- a/addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig +++ b/addons/default/visiosoft/base-theme/resources/views/partials/metadata.twig @@ -19,6 +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_script('visiosoft.theme.base::js/visiosoft.js') }} diff --git a/addons/default/visiosoft/base-theme/resources/views/partials/offline.twig b/addons/default/visiosoft/base-theme/resources/views/partials/offline.twig new file mode 100644 index 000000000..e770a409e --- /dev/null +++ b/addons/default/visiosoft/base-theme/resources/views/partials/offline.twig @@ -0,0 +1,18 @@ +
+
+ {{ img('visiosoft.theme.base::images/unplugged.svg').data|raw }} + +

{{ trans('visiosoft.theme.base::field.connection_problem') }}

+ +

+ {{ trans('visiosoft.theme.base::field.your_internet_connection_is_broken') }} +
+ {{ trans('visiosoft.theme.base::field.we_miss_you_so_much_already') }} +

+ + +
+