From bde46c8064dc4546355b0818beabc9ecfbfc9838 Mon Sep 17 00:00:00 2001 From: Metehan Celik Date: Wed, 5 Jan 2022 16:55:36 +0300 Subject: [PATCH 1/8] added if statement for banner. category cards have carousel now --- .../resources/views/list/gallery.twig | 27 +++++++++++++-- .../base-theme/resources/css/gallery.css | 34 +++++++++++++++++++ 2 files changed, 59 insertions(+), 2 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig b/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig index b72873280..75685f1c1 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig @@ -13,8 +13,16 @@
- - {{ adv.name }} + + {% for key,photo in adv.getViewPhotoUrl %} + + + {% endfor %} +
+ {% for key, photo in adv.getViewPhotoUrl %} +
+ {% endfor %} +
{{ addBlock('list/extra-actions', {'ad': adv, 'vars': _context}, ['favs'])|raw }}
@@ -36,6 +44,19 @@
{% endfor %}
+ {% endblock %} @@ -48,3 +69,5 @@ {{ asset_add("scripts.js", "visiosoft.module.advs::js/list-table.js") }} {% include "theme::scroll-modal" %} {% endblock %} + + diff --git a/addons/default/visiosoft/base-theme/resources/css/gallery.css b/addons/default/visiosoft/base-theme/resources/css/gallery.css index 2d031b42f..64d3d144b 100644 --- a/addons/default/visiosoft/base-theme/resources/css/gallery.css +++ b/addons/default/visiosoft/base-theme/resources/css/gallery.css @@ -52,4 +52,38 @@ } .fs-14{ font-size: 14px; +} +.imgs{ + position: relative; +} +.ads-img{ + position:inherit; +} +.imgs .ads-img { + width: 100%; + height: 100%; + display: none; +} +.imgs .ads-img:first-child { + display: flex; +} +.hover-area{ + position: absolute; + display: flex; + height: 100%; + width: 200px; + top: 0; + left: 0; +} +.hover-0 { + width: 33%; + height: 100%; +} +.hover-1 { + width: 33%; + height: 100%; +} +.hover-2 { + width: 33%; + height: 100%; } \ No newline at end of file From 2086961706c02c35cd0cdf20244e66a4e2d4739b Mon Sep 17 00:00:00 2001 From: Metehan Celik Date: Fri, 7 Jan 2022 23:02:42 +0300 Subject: [PATCH 2/8] gg theme minor changes --- .../defaultadmin-theme/resources/scss/theme/_variables.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/scss/theme/_variables.scss b/addons/default/visiosoft/defaultadmin-theme/resources/scss/theme/_variables.scss index 4d1a5f84a..7e2cf34c1 100644 --- a/addons/default/visiosoft/defaultadmin-theme/resources/scss/theme/_variables.scss +++ b/addons/default/visiosoft/defaultadmin-theme/resources/scss/theme/_variables.scss @@ -164,7 +164,7 @@ $grid-gutter-widths: ( // // Font, line-height, and color for body text, headings, and more. -$font-family-sans-serif: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, sans-serif !default; +$font-family-sans-serif: Roboto, "Helvetica Neue", Arial, sans-serif !default; $font-family-serif: Georgia, "Times New Roman", Times, serif !default; $font-family-monospace: Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace !default; $font-family-base: $font-family-sans-serif !default; From 7dd7d2c8073be1360c8c5b9e1a79d585c74fe55f Mon Sep 17 00:00:00 2001 From: Dia Date: Mon, 10 Jan 2022 11:50:31 +0300 Subject: [PATCH 3/8] #5088 Sistem durumu silinmemeli --- .../visiosoft/advs-module/resources/lang/en/message.php | 1 + .../visiosoft/advs-module/src/Status/StatusObserver.php | 8 ++++++++ 2 files changed, 9 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 b373acc95..1cb33e2d4 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/message.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/message.php @@ -36,4 +36,5 @@ return [ 'currency_converter_not_available' => 'The currency converter is not available.', 'option_saved' => 'Option Saved', 'do_you_want_to_save_the_option' => 'Do you want to save the option?', + 'you_can_not_delete_a_system_status' => 'You can not delete a system status!', ]; diff --git a/addons/default/visiosoft/advs-module/src/Status/StatusObserver.php b/addons/default/visiosoft/advs-module/src/Status/StatusObserver.php index dbdebaeba..4134cbac6 100644 --- a/addons/default/visiosoft/advs-module/src/Status/StatusObserver.php +++ b/addons/default/visiosoft/advs-module/src/Status/StatusObserver.php @@ -1,8 +1,16 @@ is_system) { + abort(403, trans('visiosoft.module.advs::message.you_can_not_delete_a_system_status')); + } + parent::deleting($entry); + } } From 02ba890d3cd085d95baaf864743a9a459c45ef50 Mon Sep 17 00:00:00 2001 From: Metehan Celik Date: Mon, 10 Jan 2022 16:06:11 +0300 Subject: [PATCH 4/8] for loop limited, pages set again --- .../visiosoft/advs-module/resources/views/list/gallery.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig b/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig index 75685f1c1..7b21e20c3 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig @@ -14,7 +14,7 @@
- {% for key,photo in adv.getViewPhotoUrl %} + {% for key,photo in adv.getViewPhotoUrl|slice(0, 3) %} {% endfor %} From 31485e560f42d036d402f47be79b074dcb025c29 Mon Sep 17 00:00:00 2001 From: Metehan Celik Date: Mon, 10 Jan 2022 16:23:45 +0300 Subject: [PATCH 5/8] for loop limited, pages set again --- .../visiosoft/advs-module/resources/views/list/gallery.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig b/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig index 7b21e20c3..b2c9865be 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/gallery.twig @@ -19,7 +19,7 @@ {% endfor %}
- {% for key, photo in adv.getViewPhotoUrl %} + {% for key, photo in adv.getViewPhotoUrl|(0,3) %}
{% endfor %}
From 8e1a670a7fe2e9c76d0c9197bb6b03d6907c2d67 Mon Sep 17 00:00:00 2001 From: Dia Date: Mon, 10 Jan 2022 17:51:21 +0300 Subject: [PATCH 6/8] #5106 gg-theme add to cart options --- .../default/visiosoft/advs-module/resources/lang/en/message.php | 1 + .../visiosoft/advs-module/src/Http/Controller/AdvsController.php | 1 + 2 files changed, 2 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 1cb33e2d4..327dc330e 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/message.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/message.php @@ -37,4 +37,5 @@ return [ 'option_saved' => 'Option Saved', 'do_you_want_to_save_the_option' => 'Do you want to save the option?', 'you_can_not_delete_a_system_status' => 'You can not delete a system status!', + 'product_added_to_cart' => 'Product added to cart!', ]; 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 3723e1a67..4051f986f 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/AdvsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/AdvsController.php @@ -1163,6 +1163,7 @@ class AdvsController extends PublicController if ($adv and $adv->getStatus() == "approved") { $cart = $thisModel->addCart($adv, $quantity, $name); $response['status'] = "success"; + $response['msg'] = trans('visiosoft.module.advs::message.product_added_to_cart'); $count = $cart->getItems()->count; $response['count'] = $count; $response['item'] = [ From 49a3b99689f6a1c866f8beac1121b07e8b340a16 Mon Sep 17 00:00:00 2001 From: Dia Date: Tue, 11 Jan 2022 16:04:32 +0300 Subject: [PATCH 7/8] #5135 emlak24 new project --- .../resources/assets/css/profile-nav.scss | 5 +-- .../resources/assets/css/profile.scss | 36 ++++++++++--------- .../resources/lang/en/field.php | 2 ++ .../views/profile/partials/navigation.twig | 2 +- .../resources/views/profile/profile.twig | 16 ++++++--- 5 files changed, 36 insertions(+), 25 deletions(-) diff --git a/addons/default/visiosoft/profile-module/resources/assets/css/profile-nav.scss b/addons/default/visiosoft/profile-module/resources/assets/css/profile-nav.scss index 526f7bcb1..d17434b63 100644 --- a/addons/default/visiosoft/profile-module/resources/assets/css/profile-nav.scss +++ b/addons/default/visiosoft/profile-module/resources/assets/css/profile-nav.scss @@ -21,6 +21,7 @@ transform: translateX(-100%); -webkit-transition: 300ms ease; transition: 300ms ease; + background-color: #FCFCFC; @media only screen and (min-width: 768px) { height: initial; position: initial; @@ -29,7 +30,7 @@ transform: initial; } @media only screen and (min-width: 992px) { - padding: 1.5rem 2.25rem; + padding: 1.5rem; } &.reveal { @@ -90,4 +91,4 @@ cursor: pointer; background: #000; opacity: .2; -} \ No newline at end of file +} diff --git a/addons/default/visiosoft/profile-module/resources/assets/css/profile.scss b/addons/default/visiosoft/profile-module/resources/assets/css/profile.scss index 969aa6755..c2a847e4f 100644 --- a/addons/default/visiosoft/profile-module/resources/assets/css/profile.scss +++ b/addons/default/visiosoft/profile-module/resources/assets/css/profile.scss @@ -1,4 +1,20 @@ .profile-section { + h3 { + font-size: 1.25rem; + color: #707070; + @media only screen and (min-width: 768px) { + font-size: 1.5rem; + } + + & + p { + color: #707070; + font-size: 13px; + @media only screen and (min-width: 768px) { + font-size: 15px; + } + } + } + .nav-tabs { border-bottom: 1px solid #dee2e6; padding-bottom: 10px; @@ -63,7 +79,6 @@ width: 130px; height: 130px; object-fit: cover; - border-radius: 50%; @media (max-width: 992px) { display: flex; justify-content: center; @@ -116,22 +131,9 @@ form { .new-profile-image { - position: relative; - bottom: 25px; - right: 30px; + top: -10px; + left: -10px; cursor: pointer; - - @media (max-width: 992px) { - bottom: 120px; - left: 100px; - top: auto; - } - - @media (max-width: 576px) { - bottom: auto; - left: auto; - top: 10px; - } } .file-field { visibility: hidden; @@ -176,4 +178,4 @@ height: initial; } } -} \ No newline at end of file +} diff --git a/addons/default/visiosoft/profile-module/resources/lang/en/field.php b/addons/default/visiosoft/profile-module/resources/lang/en/field.php index 1f8b23fc6..948ee3f83 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/en/field.php +++ b/addons/default/visiosoft/profile-module/resources/lang/en/field.php @@ -504,4 +504,6 @@ return [ 'undefined_member' => 'Undefined Member', 'new_membership_report' => 'New Membership Report', 'member_login_reports' => 'Member Login Reports', + + 'profile_instruction' => 'You can edit your profile information from this page.', ]; diff --git a/addons/default/visiosoft/profile-module/resources/views/profile/partials/navigation.twig b/addons/default/visiosoft/profile-module/resources/views/profile/partials/navigation.twig index c976af485..d8fceab49 100644 --- a/addons/default/visiosoft/profile-module/resources/views/profile/partials/navigation.twig +++ b/addons/default/visiosoft/profile-module/resources/views/profile/partials/navigation.twig @@ -2,7 +2,7 @@ nav icon
-