Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

minor-fix #14

Merged
merged 3 commits into from
Jul 17, 2023
Merged

minor-fix #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5eeb916
gg-theme css edits
essracetiin Jul 14, 2023
a295ab9
gg-theme css edits
essracetiin Jul 14, 2023
d8a18fb
minor-fix
essracetiin Jul 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions resources/css/detail.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -747,4 +747,27 @@
.swiper-border {
border: 1px solid #e3e3e3;
border-radius: 5px;
}

.bg-purple{
background-color: #483285;
}

.text-purple, .text-purple-light:hover{
color: #483285;
}

.text-purple-light{
color: #8B61FF;
}
.bg-purple-light{
background-color: #e2dbf6;
}
.bg-purple-light:hover{
background-color: #483285;
color: white;
}

.purple-border{
border: 1px solid #483285;
}
7 changes: 2 additions & 5 deletions resources/images/complaints.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions resources/images/rightArrowDetail.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions resources/images/share.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 2 additions & 0 deletions resources/lang/en/field.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,4 +56,6 @@
'my_favs' => 'My Favorites',
'delivery' => 'Delivery',
'delivery_time' => 'This product can be delivered in :day days',

'ask_for_price' => 'Ask for Price',
];
47 changes: 29 additions & 18 deletions resources/views/ad-detail/default.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,19 @@
}
}

</script>



</script>
{% endblock %}
<div class="gg-product-out container mx-auto mt-5 border p-0 rounded">
<div class="container mx-auto mt-2 border rounded">
<div>
{% include "visiosoft.extension.gg_style_provider::ad-detail/partials/breadcrumb" %}
</div>
</div>


<div class="gg-product-out container mx-auto mt-2 border p-0 rounded">
<div class="row p-4 px-5">
{% include "visiosoft.extension.gg_style_provider::ad-detail/partials/slider" %}

Expand Down Expand Up @@ -75,8 +85,8 @@
{% include "visiosoft.extension.gg_style_provider::ad-detail/partials/price_area" %}
</div>
{% else %}
<h6 class="">
{{ trans('visiosoft.theme.sahibinden::field.ask_for_price') }}
<h6>
{{ trans('visiosoft.extension.gg_style_provider::field.ask_for_price') }}
</h6>
{% endif %}
{% endif %}
Expand All @@ -87,33 +97,34 @@
{{ trans('visiosoft.extension.gg_style_provider::field.seller_of_ads') }}
</div>
<span class="me-2">:</span>
<span class="fw-bold text-primary">
<span class="fw-bold text-purple-light mx-1 mr-2">
{% if is_module_enabled('store', 'store') %}
{% set storeDetail = entries('store','store').where('user_id', params.userId).first() %}
{% if storeDetail is not null %}
<a href="{{ url_route('store::view', [storeDetail.slug]) }}" class="d-flex align-items-center">
{% set storeDetail = entries('store','store').where('user_id', params.userId).first() %}
{% if storeDetail is not null %}
<a href="{{ url_route('store::view', [storeDetail.slug]) }}"
class="d-flex align-items-center">
<span class="ml-1">{{ storeDetail.name }}</span>
</a>
{% else %}
{{ user.first_name }}
{% endif %}
{% else %}
{{ user.first_name }}
{% endif %}
{% endif %}
</span> &nbsp;
{% include "visiosoft.extension.gg_style_provider::ad-detail/partials/seller_area" %}
</div>
</div>
<hr class="mb-0" />
<hr class="mb-0"/>

{% include "visiosoft.extension.gg_style_provider::ad-detail/partials/cart" %}

<div class="small my-2">
{{ img('visiosoft.extension.gg_style_provider::images/secured.svg') }}
{{ trans('visiosoft.extension.gg_style_provider::field.assurance', {site: setting_value('streams::name', 'Your Site')}) }}
</div>
<div class="specific-feature p-3 rounded">
<div class="specific-feature p-3 rounded justify-content-around">
{% include "visiosoft.extension.gg_style_provider::ad-detail/partials/actions" %}
{% if is_module_enabled('customfields') %}
{% set delivery_time = fn('getValueWithSlugAndAd','delivery_time', adv.id) %}
{% set delivery_time = fn('getValueWithSlugAndAd','delivery_time', adv.id) %}
{% if delivery_time %}
<div class="h-100 d-flex flex-column align-items-center tooltips">
<div class="feature-img p-1">
Expand All @@ -135,19 +146,19 @@
<div class="container p-0 mt-4 border gg-product-out pb-5 rounded">
<div class="row p-0 m-0">
<div class="gg-urun-alani col-12 mt-3">
<a href="#description" class="title-special primary-border text-white bg-primary">
<a href="#description" class="title-special purple-border text-white bg-purple">
<span>
{{ trans('visiosoft.extension.gg_style_provider::field.seller_desc_for_ads.button')|raw }}
</span>
</a>
{% if is_module_enabled('customfields') and features %}

<a href="#features" class="title-special primary-border">
<a href="#features" class="title-special purple-border">
<span>{{ trans('visiosoft.extension.gg_style_provider::field.ads_custom_fields') }}</span>
</a>
{% endif %}
{% if is_module_enabled('comments') %}
<a href="#comments" class="title-special primary-border">
<a href="#comments" class="title-special purple-border">
<span>{{ trans('visiosoft.module.comments::field.ads_comments') }}</span>
</a>
{% endif %}
Expand All @@ -159,7 +170,7 @@
{{ trans('visiosoft.extension.gg_style_provider::field.seller_desc_for_ads.title', {ads: adv.name})|raw }}
</div>
<div class="my-2">
<i class="fas fa-exclamation-circle text-primary"></i>
<i class="fas fa-exclamation-circle text-purple"></i>
<span class="small">
{{ trans('visiosoft.extension.gg_style_provider::field.seller_desc_for_ads.description')|raw }}
</span>
Expand Down
26 changes: 26 additions & 0 deletions resources/views/ad-detail/partials/breadcrumb.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<div id="breadcrumb" class=" d-flex justify-content-between">
<div class="overflow-hidden d-none d-sm-flex align-items-center py-1">
<span class="text-truncate breadcrumb-detail d-flex">
<a href="{{ url('/') }}" data-toggle="tooltip" data-placement="bottom"
title="{{ trans("visiosoft.module.advs::field.home") }}">
{{ trans("visiosoft.module.advs::field.home") }}
</a>
{% for cat in categories %}
<a class="d-flex align-items-center gap-5" href="{{ url_route('adv_list_seo', [cat.slug]) }}">
<img src="{{ img('visiosoft.extension.gg_style_provider::images/rightArrowDetail.svg').url }}">
{{ cat['name'] }}
</a>
{% endfor %}

</span>

{{ addBlock('ads-list/partials/breadcrumb', {'mainCats': mainCats, 'category': category})|raw }}

</div>
<ul class="overflow-auto text-nowrap d-sm-none mobile-breadcrmub py-2">
<li>
<a href="{{ url('/') }}">{{ trans("visiosoft.module.advs::field.home") }}</a>
</li>
{{ addBlock('ads-list/partials/breadcrumb-mobile', {'mainCats': mainCats, 'category': category})|raw }}
</ul>
</div>
8 changes: 4 additions & 4 deletions resources/views/ad-detail/partials/detail.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
{% if is_module_enabled('customfields') and features %}
<div class="container p-0 mt-4 border gg-product-out pb-5 rounded">
<div class="container p-0 mt-4 mb-4 border gg-product-out pb-5 rounded">
<div class="col-12 m-0 my-3 px-3" id="features">
<div class="fw-600 fs-20">
{{ trans('visiosoft.extension.gg_style_provider::field.features_for_ads.title', { ads_name: adv.name }) }}
</div>
<div class="my-2">
<i class="fas fa-exclamation-circle text-primary"></i>
<i class="fas fa-exclamation-circle text-purple"></i>
<span class="small">{{ trans('visiosoft.extension.gg_style_provider::field.features_for_ads.description') }}</span>
</div>
</div>
<div class="col-lg-12 small">
<div class="container m-0 p-0">
<div class="row m-0 p-0">
<div class="col-12 m-0 p-0">
<div class="bg-special text-white px-3 padding-text">
<div class="bg-purple text-white px-3 padding-text">
{{ adv.name }}
</div>
<div class="row mx-auto">
Expand All @@ -25,7 +25,7 @@
<div class="w-50 px-3 marka-text border padding-text">
{{ feature.name ? feature.name : '' }}
</div>
<div class="w-50 px-3 text-primary border padding-text">
<div class="w-50 px-3 text-purple border padding-text">
{{ feature.custom_field_value }}
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/ad-detail/partials/price_area.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% if is_module_enabled('orders') %}
<div class="price-4 mt-2 text-secondary">
<i class="fas fa-truck me-1"></i>
<i class="fas fa-truck me-1 mr-1"></i>
{% if is_module_enabled('shipping') %}
{{ fn('getShippingAmount', adv.id) }}
{% else %}
Expand Down
4 changes: 2 additions & 2 deletions resources/views/ad-detail/partials/seller_area.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% if is_module_enabled('messages') %}
<a href="#" class="text-decoration-none btn-primary btn-sm fw-bold" data-toggle="modal" data-content="{{ app.auth.id }}"
<a href="#" class="text-decoration-none bg-purple-light btn-sm fw-bold" data-toggle="modal" data-content="{{ app.auth.id }}"
id="message"
{% if not auth_check() %}
onclick="window.location.href = '{{ url_route('anomaly.module.users::login') }}'"
Expand Down Expand Up @@ -28,7 +28,7 @@
value="/*{{ adv.id }}*/">
<textarea required placeholder="{{ trans("visiosoft.module.messages::field.your_message") }}"
rows="5" class="form-control" name="detail"> {{ trans("visiosoft.module.messages::message.seller_area_message") }}</textarea>
<button type="submit" class="btn btn-primary mt-3 w-100">
<button type="submit" class="btn bg-purple-light mt-3 w-100">
{{ trans("visiosoft.module.messages::field.send") }}
</button>
</div>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/ad-detail/partials/top.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
{% endfor %}
</div>
<div class="col-6 mt-auto text-right small">
<a href="#features" class="fw-bold text-primary text-decoration-none"> {{ trans('visiosoft.extension.gg_style_provider::field.all_features') }} </a>
<a href="#features" class="fw-bold text-purple-light text-decoration-none"> {{ trans('visiosoft.extension.gg_style_provider::field.all_features') }} </a>
</div>
</div>
{% endif %}
Expand Down