diff --git a/addons/default/visiosoft/advs-module/resources/lang/tr/field.php b/addons/default/visiosoft/advs-module/resources/lang/tr/field.php index afdb8c5aa..41ce94aad 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/tr/field.php +++ b/addons/default/visiosoft/advs-module/resources/lang/tr/field.php @@ -133,7 +133,7 @@ return [ "list-page" => "Liste Sayfası", "search" => "Arama", "recommended" => "Sizin için Önerilen İlanlar", - "sort_by" => "Göre sırala", + "sort_by" => "Sırala", "pick_option" => "Bir seçenek seçin", "price_high" => "Fiyat pahalıdan ucuza", "price-low" => "Fiyat Düşük Yüksek", diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php index abba3ffb0..68fa0e489 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php @@ -213,7 +213,7 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface $query = $query->orderBy('price', 'asc'); break; case "sort_time": - $query = $query->orderBy('created_at', 'desc'); + $query = $query->orderBy('advs_advs.created_at', 'desc'); break; } } else { @@ -238,10 +238,10 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface { $country = CountryModel::query()->where('location_countries.id', $adv->country_id)->first(); $city = CityModel::query()->where('location_cities.id', $adv->city)->first(); - if($country != null) { + if ($country != null) { $adv->setAttribute('country_name', $country->name); } - if($city != null) { + if ($city != null) { $adv->setAttribute('city_name', $city->name); } return $adv; diff --git a/addons/default/visiosoft/base-theme/resources/css/default/main.css b/addons/default/visiosoft/base-theme/resources/css/default/main.css index c22e29376..db7770bbf 100755 --- a/addons/default/visiosoft/base-theme/resources/css/default/main.css +++ b/addons/default/visiosoft/base-theme/resources/css/default/main.css @@ -1018,7 +1018,7 @@ a.verified i { } .oc-item1 { - border: 1px solid #f3f3f3; + border: 1px solid #e4e1e1; margin: 18px 0; min-height: 152px; border-radius: 2px; @@ -1512,7 +1512,6 @@ a.verified i { } .recommended-ads { - margin-bottom: 0; display: inline-block; } @@ -4856,7 +4855,6 @@ input, select, a, .transition, .favorite-searches { width: 100%; - height: 80px; display: inline-block; margin-top: 40px; border: 1px solid #dedede; @@ -5776,7 +5774,7 @@ input[name="username"] { } .viewType { - color: #5b8dbd !important; + color: #6f6f6f !important; } .table-image { @@ -5996,4 +5994,18 @@ input[name="username"] { transform: rotate(45deg); -webkit-transform: rotate(0deg); overflow: hidden; -} \ No newline at end of file +} +.search-filter-button { + width: 100%; +} +.list-header { + border-bottom: 1px solid #f6f6f6; +} +.list-header .sort-by-list { + margin: 25px; + font-size: 18px; +} + +.list-header .sort-by-list h5{ + font-size: 18px; +} diff --git a/addons/default/visiosoft/base-theme/resources/js/admin-list.js b/addons/default/visiosoft/base-theme/resources/js/list.js similarity index 100% rename from addons/default/visiosoft/base-theme/resources/js/admin-list.js rename to addons/default/visiosoft/base-theme/resources/js/list.js diff --git a/addons/default/visiosoft/base-theme/resources/lang/en/fields.php b/addons/default/visiosoft/base-theme/resources/lang/en/fields.php index 9574ef8a8..f07a8d979 100644 --- a/addons/default/visiosoft/base-theme/resources/lang/en/fields.php +++ b/addons/default/visiosoft/base-theme/resources/lang/en/fields.php @@ -30,4 +30,7 @@ return [ 'content' => [ 'name' => 'Content', ], + 'price' => [ + 'name' => 'Price' + ], ]; \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/lang/en/message.php b/addons/default/visiosoft/base-theme/resources/lang/en/message.php new file mode 100644 index 000000000..71dc80956 --- /dev/null +++ b/addons/default/visiosoft/base-theme/resources/lang/en/message.php @@ -0,0 +1,6 @@ + 'Filter By Search.', +]; + diff --git a/addons/default/visiosoft/base-theme/resources/lang/tr/fields.php b/addons/default/visiosoft/base-theme/resources/lang/tr/fields.php index 8c3358724..6c9433c45 100644 --- a/addons/default/visiosoft/base-theme/resources/lang/tr/fields.php +++ b/addons/default/visiosoft/base-theme/resources/lang/tr/fields.php @@ -1,8 +1,8 @@ 'İlanınızı Gönderin', - 'featured_ads' => "Öne Çıkan İlanlar", + 'post_ad' => 'İlanınızı Gönderin', + 'featured_ads' => "Öne Çıkan İlanlar", 'trending_ads' => 'Popüler İlanlar', 'join-us' => 'Üye Ol', 'sign-in' => 'Üye Girişi', @@ -19,7 +19,6 @@ return [ 'recent_ads' => 'Son ilanlar', - 'email' => [ 'name' => 'Email Adresi', ], @@ -32,4 +31,7 @@ return [ 'content' => [ 'name' => 'Açıklama', ], + 'price' => [ + 'name' => 'Fiyat' + ], ]; \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/lang/tr/message.php b/addons/default/visiosoft/base-theme/resources/lang/tr/message.php new file mode 100644 index 000000000..01617eb80 --- /dev/null +++ b/addons/default/visiosoft/base-theme/resources/lang/tr/message.php @@ -0,0 +1,5 @@ + 'Aramanızı Daraltın.', +]; diff --git a/addons/default/visiosoft/base-theme/resources/views/list/list.twig b/addons/default/visiosoft/base-theme/resources/views/list/list.twig index e0e463f73..f33ad0d73 100644 --- a/addons/default/visiosoft/base-theme/resources/views/list/list.twig +++ b/addons/default/visiosoft/base-theme/resources/views/list/list.twig @@ -1,261 +1,57 @@ {% extends "theme::layouts/default" %} + {% block content %} -
+
+ {% include "theme::partials/messages" %} - -
-
- {% if app.request.get('user') != null or app.request.get('user') != "" %} -
-
-
- -
-
- {{ user.first_name }} {{ user.last_name }} -
-
- {% if userProfile.adv_listing_banner.url == '' %} - - {% else %} - - {% endif %} -
- {% endif %} - -
- {% include "visiosoft.theme.base::list/partials/list-filter" %} - -
- + + +
+
+ {% endblock %} + +
+
- - - - - - {{ asset_add("scripts.js", "visiosoft.theme.base::js/admin-list.js") }} + + {% if entries('advs').isEnabled('favs') %} + {% include "visiosoft.module.favs::list/favorites-modal" %} + {% endif %} + + {{ asset_add("scripts.js", "visiosoft.theme.base::js/list.js") }} {% if entries('advs').isEnabled('comparisons') %} {% include "visiosoft.module.comparisons::comparison" %} {% endif %} + {% endblock %} \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/views/list/map.twig b/addons/default/visiosoft/base-theme/resources/views/list/map.twig index 3e2a07c22..1aa8154d1 100644 --- a/addons/default/visiosoft/base-theme/resources/views/list/map.twig +++ b/addons/default/visiosoft/base-theme/resources/views/list/map.twig @@ -1,32 +1,22 @@ -{% extends "theme::layouts/default" %} -{% block content %} - -
-
- - -
-
- - {% include "visiosoft.theme.base::list/partials/list-filter" %} -
- +{% extends "theme::list/list" %} +{% block listContent %} +
+
+ {% include "visiosoft.theme.base::list/partials/list-filter" %} +
+
-
-
- {{ asset_add("scripts.js", "visiosoft.theme.base::js/admin-list.js") }} + + + {% endblock %} {% block customjs %} diff --git a/addons/default/visiosoft/base-theme/resources/views/list/partials/ads.twig b/addons/default/visiosoft/base-theme/resources/views/list/partials/ads.twig new file mode 100644 index 000000000..1edf1b4aa --- /dev/null +++ b/addons/default/visiosoft/base-theme/resources/views/list/partials/ads.twig @@ -0,0 +1,69 @@ +{% for adv in advs %} + + {% if adv.doping != null %} + + + + + {% if entries('advs').isEnabled('searchbydistance') %} + + {% include "visiosoft.module.searchbydistance::list/filter" %} + + {% endif %} +
- {% if entries('advs').isEnabled('searchbydistance') %} -
- -

- {{ trans("visiosoft.module.searchbydistance::field.searchbydistance") }} - -

-
-
-
- -
-
- - - - - -
-
+
+
+ +
{{ trans('theme::message.filter_by_search_msg') }}
- {{ asset_add("scripts.js", "visiosoft.module.searchbydistance::js/script.js") }} - {% endif %} -
-
-
+
-
+ - -{{ asset_add("scripts.js", "visiosoft.theme.base::js/filterLocation.js") }} + \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/views/list/partials/list-section.twig b/addons/default/visiosoft/base-theme/resources/views/list/partials/list-section.twig new file mode 100644 index 000000000..318e60243 --- /dev/null +++ b/addons/default/visiosoft/base-theme/resources/views/list/partials/list-section.twig @@ -0,0 +1,40 @@ + \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/views/list/partials/list-sort-by.twig b/addons/default/visiosoft/base-theme/resources/views/list/partials/list-sort-by.twig new file mode 100644 index 000000000..1638eb346 --- /dev/null +++ b/addons/default/visiosoft/base-theme/resources/views/list/partials/list-sort-by.twig @@ -0,0 +1,26 @@ + diff --git a/addons/default/visiosoft/base-theme/resources/views/list/partials/user-section.twig b/addons/default/visiosoft/base-theme/resources/views/list/partials/user-section.twig new file mode 100644 index 000000000..b08c11c82 --- /dev/null +++ b/addons/default/visiosoft/base-theme/resources/views/list/partials/user-section.twig @@ -0,0 +1,17 @@ +{% if app.request.get('user') != null or app.request.get('user') != "" %} +
+
+
+ +
+
+ {{ user.first_name }} {{ user.last_name }} +
+
+ {% if userProfile.adv_listing_banner.url == '' %} + + {% else %} + + {% endif %} +
+{% endif %} \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/views/list/table.twig b/addons/default/visiosoft/base-theme/resources/views/list/table.twig index 6095ac784..3ca2edc9e 100644 --- a/addons/default/visiosoft/base-theme/resources/views/list/table.twig +++ b/addons/default/visiosoft/base-theme/resources/views/list/table.twig @@ -1,169 +1,92 @@ -{% extends "theme::layouts/default" %} -{% block content %} - -
-
- {% include "theme::partials/messages" %} - -
-
- {% if app.request.get('user') != null or app.request.get('user') != "" %} -
-
-
- -
-
- {{ user.first_name }} {{ user.last_name }} -
-
- -
- {% endif %} - -
- {% include "visiosoft.theme.base::list/partials/list-filter" %} +{% extends "theme::list/list" %} +{% block listContent %} - -
- - -
-
- - - - - - - {{ asset_add("scripts.js", "visiosoft.theme.base::js/admin-list.js") }} + + +{% endblock %} +{% block customjs %} {{ asset_add("scripts.js", "visiosoft.theme.base::js/list-table.js") }} {% include "theme::scroll-modal" %} {% endblock %} \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/views/new-ad/new-create.twig b/addons/default/visiosoft/base-theme/resources/views/new-ad/new-create.twig index bed119a73..40eedf3de 100644 --- a/addons/default/visiosoft/base-theme/resources/views/new-ad/new-create.twig +++ b/addons/default/visiosoft/base-theme/resources/views/new-ad/new-create.twig @@ -3,20 +3,9 @@
{% include "theme::partials/messages" %} - + + {% include "theme::new-ad/partials/breadcrumb" %} +
@@ -111,42 +102,12 @@
{{ form.fields.files.input |raw }}
- {% for custom_field in custom_fields %} -
- -
- {{ custom_field.custom_field_input|raw }} -
-
- {% endfor %} -
-
-
    -
  • {{ form.fields.country|raw }}
  • -
  • {{ form.fields.city|raw }}
  • -
  • {{ form.fields.district|raw }}
  • -
  • {{ form.fields.neighborhood|raw }}
  • -
  • {{ form.fields.village|raw }}
  • -
-
-
-
-
-
-
diff --git a/addons/default/visiosoft/base-theme/resources/views/new-ad/partials/breadcrumb.twig b/addons/default/visiosoft/base-theme/resources/views/new-ad/partials/breadcrumb.twig new file mode 100644 index 000000000..7c458e2a9 --- /dev/null +++ b/addons/default/visiosoft/base-theme/resources/views/new-ad/partials/breadcrumb.twig @@ -0,0 +1,7 @@ + \ No newline at end of file diff --git a/addons/default/visiosoft/base-theme/resources/views/new-ad/post-cat.twig b/addons/default/visiosoft/base-theme/resources/views/new-ad/post-cat.twig index 285f3ee62..3b5629f05 100644 --- a/addons/default/visiosoft/base-theme/resources/views/new-ad/post-cat.twig +++ b/addons/default/visiosoft/base-theme/resources/views/new-ad/post-cat.twig @@ -2,15 +2,7 @@ {% block content %}
- - + {% include "theme::new-ad/partials/breadcrumb" %}
diff --git a/addons/default/visiosoft/location-module/resources/views/list/filter.twig b/addons/default/visiosoft/location-module/resources/views/list/filter.twig new file mode 100644 index 000000000..67daa63af --- /dev/null +++ b/addons/default/visiosoft/location-module/resources/views/list/filter.twig @@ -0,0 +1,61 @@ +{% if setting_value('visiosoft.module.location::list_page_location') %} +
+ + +
+
+
    +
  • + + +
  • +
  • + + +
  • +
  • + + +
  • +
  • + + +
  • +
  • + + +
  • +
+
+
+
+{% endif %} +{{ asset_add("scripts.js", "visiosoft.theme.base::js/filterLocation.js") }} 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 new file mode 100644 index 000000000..84eb0ae6e --- /dev/null +++ b/addons/default/visiosoft/location-module/resources/views/new-ad/map.twig @@ -0,0 +1,27 @@ +
+
+
    +
  • {{ form.fields.country|raw }}
  • +
  • {{ form.fields.city|raw }}
  • +
  • {{ form.fields.district|raw }}
  • +
  • {{ form.fields.neighborhood|raw }}
  • +
  • {{ form.fields.village|raw }}
  • +
+
+
+
+
+
\ No newline at end of file