#1749 [arabam-theme] Rest of pages

This commit is contained in:
Diatrex 2020-07-10 16:02:44 +03:00
parent 29a6799ed4
commit 3f6b996eae
3 changed files with 19 additions and 18 deletions

View File

@ -83,10 +83,8 @@ class AdvsModulePlugin extends Plugin
} }
$advModel = new AdvModel(); $advModel = new AdvModel();
return $advModel->newQuery()
->where('advs_advs.created_by_id', $user->id) return $advModel->pendingAdvsByUser()->get();
->where('status', 'passive')
->get();
} }
), ),
new \Twig_SimpleFunction( new \Twig_SimpleFunction(

View File

@ -94,7 +94,11 @@ $('.profile-advs-tab a').on('click', function () {
getMyAdvs($(this).attr('data-type')) getMyAdvs($(this).attr('data-type'))
}); });
getMyAdvs('approved'); const urlString = window.location.href;
const url = new URL(urlString);
let type = url.searchParams.get("type");
type = type ? type : 'approved';
getMyAdvs(type);
function addAdsRow(id, href, image, name, price, city, country, cat1, cat2, status) { function addAdsRow(id, href, image, name, price, city, country, cat1, cat2, status) {

View File

@ -11,22 +11,21 @@
<div class="col-md-12 bg-light advs-section"> <div class="col-md-12 bg-light advs-section">
<nav class="profile-advs-tab"> <nav class="profile-advs-tab">
<div class="nav nav-tabs nav-fill" id="nav-tab" role="tablist"> <div class="nav nav-tabs nav-fill" id="nav-tab" role="tablist">
<a class="nav-item nav-link active text-dark" data-type="approved" id="nav-approved-tab" {% set type = app.request.get('type') ?: 'approved' %}
data-toggle="tab" <a class="nav-item nav-link text-dark{{ type == 'approved' ? ' active' : '' }}"
href="#nav-approved" data-type="approved" id="nav-approved-tab" data-toggle="tab" href="#nav-approved"
role="tab" aria-controls="nav-detail" aria-selected="true"> role="tab" aria-controls="nav-detail" aria-selected="true">
{{ trans('visiosoft.module.advs::field.my_ads.name') }} {{ trans('visiosoft.module.advs::field.my_ads.name') }}
</a> </a>
<a class="nav-item nav-link text-dark" data-type="pending" id="nav-pending-tab" <a class="nav-item nav-link text-dark{{ type == 'pending' ? ' active' : '' }}"
data-toggle="tab" data-type="pending" id="nav-pending-tab" data-toggle="tab" href="#nav-pending"
href="#nav-pending"
role="tab" aria-controls="nav-pending" aria-selected="true"> role="tab" aria-controls="nav-pending" aria-selected="true">
{{ trans('visiosoft.module.advs::field.pending_adv.name') }} {{ trans('visiosoft.module.advs::field.pending_adv.name') }}
</a> </a>
</div> </div>
</nav> </nav>
<div class="bg-dark p-2 mt-2 rounded"> <div class="bg-dark p-2 mt-2 rounded">
<a href="/advs/create_adv" class="btn btn-success"> <a href="{{ url_route('advs::create_adv') }}" class="btn btn-success">
<i class="fas fa-plus-circle"></i> <i class="fas fa-plus-circle"></i>
{{ trans("visiosoft.theme.base::button.post_ad.name") }} {{ trans("visiosoft.theme.base::button.post_ad.name") }}
</a> </a>
@ -35,14 +34,14 @@
</a> </a>
</div> </div>
<div class="tab-content py-3 px-3 px-sm-0" id="nav-tabContent"> <div class="tab-content py-3 px-3 px-sm-0" id="nav-tabContent">
<div class="tab-pane fade show active" id="nav-approved" role="tabpanel" <div class="tab-pane fade{{ type == 'approved' ? ' show active' : '' }}" id="nav-approved"
aria-labelledby="nav-approved-tab"> role="tabpanel" aria-labelledby="nav-approved-tab">
</div> </div>
<div class="tab-pane fade show" id="nav-pending" role="tabpanel" <div class="tab-pane fade{{ type == 'pending' ? ' show active' : '' }}" id="nav-pending"
aria-labelledby="nav-pending-tab"> role="tabpanel" aria-labelledby="nav-pending-tab">
</div> </div>
<div class="tab-pane fade show" id="nav-passive" role="tabpanel" <div class="tab-pane fade" id="nav-passive"
aria-labelledby="nav-passive-tab"> role="tabpanel" aria-labelledby="nav-passive-tab">
</div> </div>
<!-- Pagination links --> <!-- Pagination links -->