From 43d42173dcf3b859d74b1ccdd6a7eb5ec7e2c67b Mon Sep 17 00:00:00 2001 From: vedatakd Date: Mon, 1 Jul 2019 11:17:46 +0300 Subject: [PATCH 1/5] #8 remove unnecessary field types --- composer.json | 7 ------- 1 file changed, 7 deletions(-) diff --git a/composer.json b/composer.json index 5cc493ac9..509c5675a 100644 --- a/composer.json +++ b/composer.json @@ -27,27 +27,20 @@ "anomaly/page_link_type-extension": "~2.1.0", "anomaly/url_link_type-extension": "~2.1.0", "anomaly/relationship-field_type": "~2.2.0", - "anomaly/colorpicker-field_type": "~2.3.0", "anomaly/polymorphic-field_type": "~2.1.0", "anomaly/checkboxes-field_type": "~2.4.0", - "anomaly/encrypted-field_type": "~2.1.0", "anomaly/datetime-field_type": "~3.0.0", - "anomaly/repeater-field_type": "~1.3.0", "anomaly/language-field_type": "~2.2.0", "anomaly/multiple-field_type": "~2.2.0", "anomaly/textarea-field_type": "~2.1.0", - "anomaly/markdown-field_type": "~3.1.0", "anomaly/wysiwyg-field_type": "~3.1.0", "anomaly/boolean-field_type": "~2.3.0", - "anomaly/country-field_type": "~2.3.0", "anomaly/decimal-field_type": "~2.1.0", "anomaly/integer-field_type": "~2.1.0", "anomaly/editor-field_type": "~3.1.0", "anomaly/select-field_type": "~2.3.0", - "anomaly/slider-field_type": "~3.0.0", "anomaly/addon-field_type": "~2.2.0", "anomaly/email-field_type": "~2.1.0", - "anomaly/state-field_type": "~2.3.0", "anomaly/files-field_type": "~2.2.0", "anomaly/tags-field_type": "~2.3.0", "anomaly/slug-field_type": "~2.1.0", From f3bfba4f708af4215aa14a60af3dc4eb0cbe2f3c Mon Sep 17 00:00:00 2001 From: vedatakd Date: Mon, 1 Jul 2019 11:27:11 +0300 Subject: [PATCH 2/5] #19 Currencies are static in listing page --- .../advs-module/resources/views/partials/list-filter.twig | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/views/partials/list-filter.twig b/addons/default/visiosoft/advs-module/resources/views/partials/list-filter.twig index 64a6c7e7b..54f696b63 100644 --- a/addons/default/visiosoft/advs-module/resources/views/partials/list-filter.twig +++ b/addons/default/visiosoft/advs-module/resources/views/partials/list-filter.twig @@ -161,11 +161,12 @@
+ {% set active_currencies = setting_value('visiosoft.module.advs::enabled_currencies') %} -
From 859aa31909c07fd97d02fb3b6fa46d7702f0b886 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Mon, 1 Jul 2019 11:55:04 +0300 Subject: [PATCH 3/5] #16 Making login button user friendly --- .../resources/css/default/main.css | 45 +++ .../resources/lang/en/fields.php | 5 +- .../resources/lang/tr/fields.php | 5 +- .../resources/views/partials/nav.twig | 279 +++++++++++------- .../src/DefaultThemeServiceProvider.php | 10 +- 5 files changed, 227 insertions(+), 117 deletions(-) diff --git a/addons/default/visiosoft/default-theme/resources/css/default/main.css b/addons/default/visiosoft/default-theme/resources/css/default/main.css index c95a26ff0..637e194f6 100755 --- a/addons/default/visiosoft/default-theme/resources/css/default/main.css +++ b/addons/default/visiosoft/default-theme/resources/css/default/main.css @@ -5870,4 +5870,49 @@ input[name="username"] { .filter-list-items { width: 100%; +} + +#login-dp { + min-width: 250px; + padding: 14px 14px 0; + overflow: hidden; + background-color: rgba(255, 255, 255, .8); +} + +#login-dp .help-block { + font-size: 12px +} + +#login-dp .bottom { + border-top: 1px solid #ddd; + clear: both; + padding: 14px; +} + +#login-dp .social-buttons { + margin: 12px 0 +} + +#login-dp .social-buttons a { + width: 49%; +} + +#login-dp .form-group { + margin-bottom: 10px; +} + +.login-button-dropdown a { + color: #fff !important; +} + +@media (max-width: 768px) { + #login-dp { + background-color: inherit; + color: #fff; + } + + #login-dp .bottom { + background-color: inherit; + border-top: 0 none; + } } \ No newline at end of file diff --git a/addons/default/visiosoft/default-theme/resources/lang/en/fields.php b/addons/default/visiosoft/default-theme/resources/lang/en/fields.php index 490c2a7b9..f7311dac8 100644 --- a/addons/default/visiosoft/default-theme/resources/lang/en/fields.php +++ b/addons/default/visiosoft/default-theme/resources/lang/en/fields.php @@ -9,5 +9,8 @@ return [ 'search' => 'Search', 'categories' => 'Categories', 'city' => 'City', - 'last_search' => 'To Continue Last Search' + 'last_search' => 'To Continue Last Search', + 'join-us' => 'Join Us', + 'sign-in' => 'Sign In', + 'new-here' => 'New here ?', ]; \ No newline at end of file diff --git a/addons/default/visiosoft/default-theme/resources/lang/tr/fields.php b/addons/default/visiosoft/default-theme/resources/lang/tr/fields.php index c6c81847b..377f6b9ac 100644 --- a/addons/default/visiosoft/default-theme/resources/lang/tr/fields.php +++ b/addons/default/visiosoft/default-theme/resources/lang/tr/fields.php @@ -3,5 +3,8 @@ return [ 'post_ad' => 'İlanınızı Gönderin', 'featured_ads' => "Öne Çıkan İlanlar", - 'trending_ads' => 'Popüler İlanlar' + 'trending_ads' => 'Popüler İlanlar', + 'join-us' => 'Üye Ol', + 'sign-in' => 'Üye Girişi', + 'new-here' => 'Avantajlar için ', ]; \ No newline at end of file diff --git a/addons/default/visiosoft/default-theme/resources/views/partials/nav.twig b/addons/default/visiosoft/default-theme/resources/views/partials/nav.twig index cee7f063e..89b54b6b9 100644 --- a/addons/default/visiosoft/default-theme/resources/views/partials/nav.twig +++ b/addons/default/visiosoft/default-theme/resources/views/partials/nav.twig @@ -1,135 +1,188 @@ \ No newline at end of file diff --git a/addons/default/visiosoft/default-theme/src/DefaultThemeServiceProvider.php b/addons/default/visiosoft/default-theme/src/DefaultThemeServiceProvider.php index 3a1ffd65e..61b945eb9 100644 --- a/addons/default/visiosoft/default-theme/src/DefaultThemeServiceProvider.php +++ b/addons/default/visiosoft/default-theme/src/DefaultThemeServiceProvider.php @@ -40,8 +40,14 @@ class DefaultThemeServiceProvider extends AddonServiceProvider * @type array|null */ protected $routes = [ - 'login' => 'Visiosoft\AdvsModule\Http\Controller\advsController@login', - 'register' => 'Visiosoft\AdvsModule\Http\Controller\advsController@register', + 'login' => [ + 'as' => 'stream::login-route', + 'uses' => 'Visiosoft\AdvsModule\Http\Controller\advsController@login', + ], + 'register' => [ + 'as' => 'stream::register-route', + 'uses' => 'Visiosoft\AdvsModule\Http\Controller\advsController@register', + ], 'users/password/forgot' => 'Visiosoft\AdvsModule\Http\Controller\advsController@passwordForgot', 'users/password/reset' => 'Visiosoft\AdvsModule\Http\Controller\advsController@passwordReset', 'authcheck' => 'Visiosoft\AdvsModule\Http\Controller\advsController@authCheck', From 6ad1a5b3fdcea75701b1b9ac9f5e53e6d490e6c7 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Mon, 1 Jul 2019 12:26:03 +0300 Subject: [PATCH 4/5] fix => add favorites button --- addons/default/visiosoft/advs-module/resources/js/favs.js | 4 ++-- .../advs-module/resources/views/advs/list-item.twig | 6 ++++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/js/favs.js b/addons/default/visiosoft/advs-module/resources/js/favs.js index 6ce5cf0c3..5b0280249 100644 --- a/addons/default/visiosoft/advs-module/resources/js/favs.js +++ b/addons/default/visiosoft/advs-module/resources/js/favs.js @@ -7,10 +7,10 @@ fav.checkFav = (id, type, divId, iconId) => { success: function (response) { if(response.length == 0) { $(divId).attr("href", "/favs/add_fav/" + id+ "/"+type); - $(iconId).attr("class", "fa fa-heart-o"); + $(iconId).attr("class", "far fa-heart"); } else { $(divId).attr("href", "/favs/delete_fav/" + id + "/" + "adv"); - $(iconId).attr("class", "fa fa-heart"); + $(iconId).attr("class", "fas fa-heart"); } }, error:function (err) { diff --git a/addons/default/visiosoft/advs-module/resources/views/advs/list-item.twig b/addons/default/visiosoft/advs-module/resources/views/advs/list-item.twig index 18ce1b998..b1153587f 100644 --- a/addons/default/visiosoft/advs-module/resources/views/advs/list-item.twig +++ b/addons/default/visiosoft/advs-module/resources/views/advs/list-item.twig @@ -84,7 +84,7 @@
{% if entries('advs').isEnabled('favs') %} - + {% endif %}

{{ adv.title }}

@@ -478,7 +478,9 @@

- + {% if entries('advs').isEnabled('favs') %} + {{ asset_add("scripts.js", "visiosoft.module.advs::js/favs.js") }} + {% endif %} {{ asset_add("scripts.js", "visiosoft.module.advs::js/list-item.js") }} {{ asset_add("scripts.js", "visiosoft.module.advs::js/quantity.js") }} {{ asset_add("scripts.js", "visiosoft.module.advs::js/phoneCounter.js") }} From 37b2c329cd156942dc99490df3976accc6846734 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Mon, 1 Jul 2019 12:42:23 +0300 Subject: [PATCH 5/5] fix => Complaint button appearance --- .../resources/views/advs/list-item.twig | 88 +++++++------------ .../resources/css/default/main.css | 2 +- 2 files changed, 35 insertions(+), 55 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/views/advs/list-item.twig b/addons/default/visiosoft/advs-module/resources/views/advs/list-item.twig index b1153587f..ffa77daa3 100644 --- a/addons/default/visiosoft/advs-module/resources/views/advs/list-item.twig +++ b/addons/default/visiosoft/advs-module/resources/views/advs/list-item.twig @@ -1,7 +1,8 @@ {% extends "theme::layouts/default" %} {% block ogdata %} - + @@ -126,7 +127,8 @@
@@ -166,11 +168,11 @@ {% if(profile.getObject().gsm_phone is not null or profile.office_phone is not null or entries('advs').isEnabled('messages')) %} - -
-

{{ trans('visiosoft.module.advs::field.contact_with') }}

- {% if(profile.getObject().gsm_phone != null) %} - + +
+

{{ trans('visiosoft.module.advs::field.contact_with') }}

+ {% if(profile.getObject().gsm_phone != null) %} + {{ trans('visiosoft.module.advs::field.click_phone') }} {{ trans("visiosoft.module.advs::field.phone_gsm") }} @@ -181,16 +183,16 @@ {% endif %} - {% endif %} - {% if entries('advs').isEnabled('messages') %} - {{ trans("visiosoft.module.advs::field.send_message") }} - - {% endif %} - {% if entries('advs').isEnabled('comparisons') %} - {% include "visiosoft.module.comparisons::comparebtn" %} - {% endif %} -
+ {% endif %} + {% if entries('advs').isEnabled('messages') %} + {{ trans("visiosoft.module.advs::field.send_message") }} + + {% endif %} + {% if entries('advs').isEnabled('comparisons') %} + {% include "visiosoft.module.comparisons::comparebtn" %} + {% endif %} +
{% endif %} {% if adv_detail_place_code %}
@@ -218,8 +220,12 @@
- + {% if entries('advs').isEnabled('complaints') %} + + {% endif %} + @@ -408,40 +414,14 @@ - + + + + {% if entries('advs').isEnabled('complaints') %} + {% include "visiosoft.module.complaints::modal" %} + {% endif %} + +