Skip to content

Commit 7022467

Browse files
erhanaskerhanask
authored
Merge pull request #20 from serdarekremcakir/srdr-profile
updated default profile views
2 parents a0dbbaa + 61c9c15 commit 7022467

File tree

14 files changed

+161
-79
lines changed

14 files changed

+161
-79
lines changed

‎resources/assets/css/profile-nav.scss‎

Lines changed: 46 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,51 @@
99
}
1010
}
1111

12+
.profile-section{
13+
background-color: #fcfcfc;
14+
}
15+
16+
#btn_prev, #btn_next{
17+
font-size: 16px !important;
18+
}
19+
20+
.profile-wrapper {
21+
@media only screen and (min-width: 768px) {
22+
border: 1px solid #dee2e6;
23+
}
24+
25+
@media only screen and(max-width: 576px){
26+
margin: 40px 0;
27+
}
28+
29+
h3 {
30+
font-size: 1.25rem;
31+
color: #707070;
32+
@media only screen and (min-width: 768px) {
33+
font-size: 1.5rem;
34+
}
35+
36+
& + p {
37+
color: #707070;
38+
font-size: 13px;
39+
@media only screen and (min-width: 768px) {
40+
font-size: 15px;
41+
}
42+
}
43+
}
44+
45+
.btn-sm{
46+
padding: 0.25rem 0.5rem !important;
47+
font-size: .875rem !important;
48+
line-height: 1.5 !important;
49+
border-radius: 0.2rem !important;
50+
}
51+
52+
.btn{
53+
margin-left: 0 !important;
54+
}
55+
}
56+
1257
.profile-navigation {
1358
padding: 1.5rem .25rem;
1459
height: 100%;
@@ -56,22 +101,14 @@
56101
}
57102
}
58103

59-
&:first-child {
60-
p {
61-
font-weight: 500;
62-
color: #707070;
63-
}
64-
}
104+
65105

66106
svg, img {
67107
margin-right: .75rem;
68108
width: 1.5rem;
69109
height: 1.5rem;
70110
flex-shrink: 0;
71111

72-
path {
73-
fill: rgb(80, 80, 80);
74-
}
75112
}
76113

77114
p {

‎resources/images/address.svg‎

Lines changed: 3 additions & 0 deletions
Loading

‎resources/images/details.svg‎

Lines changed: 3 additions & 0 deletions
Loading

‎resources/images/lout.svg‎

Lines changed: 4 additions & 0 deletions
Loading

‎resources/images/myads.svg‎

Lines changed: 3 additions & 0 deletions
Loading

‎resources/images/myprofile.svg‎

Lines changed: 3 additions & 0 deletions
Loading

‎resources/images/pass.svg‎

Lines changed: 3 additions & 0 deletions
Loading

‎resources/views/address/create.twig‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,12 @@
44
{% embed 'visiosoft.module.profile::profile/index' %}
55
{% block detail %}
66
<div class="row px-3">
7-
<div class="col-md-12 bg-dark text-white p-5">
7+
<div class="col-md-12 profile-section px-0 border profile-wrapper">
8+
<div class="tab-content py-3 px-3 px-sm-0" id="nav-tabContent">
9+
<div class="tab-pane fade show active" id="nav-profile" role="tabpanel"
10+
aria-labelledby="nav-profile-tab">
11+
12+
<div class="col-12 mb-4 mb-md-5 mt-md-3 px-3 px-sm-5 ">
813
<h3>
914
{% if request().segment(3) == "edit" %}
1015
{{ trans('visiosoft.module.profile::field.edit_address.name') }}
@@ -13,12 +18,13 @@
1318
{% endif %}
1419
</h3>
1520
</div>
16-
<div class="col-md-12 bg-light profile-section">
21+
22+
<div class="col-md-12 profile-section">
1723
{% set form = form('address').entry(id).actions({'save':'save'}).get() %}
1824

1925
{% set isCompany = form.entry.is_company %}
2026

21-
<div class="card-header tab-card-header">
27+
<div class="card-header bg-transparent tab-card-header">
2228
<ul class="nav nav-tabs card-header-tabs" role="tablist">
2329
<li class="nav-item {% if isCompany %}d-none{% endif %}">
2430
<a class="nav-link active show" id="personal-tab" data-toggle="tab" href="#personal"
@@ -87,6 +93,9 @@
8793

8894
</div>
8995
</div>
96+
</div>
97+
</div>
98+
</div>
9099
<script>
91100
//For Request
92101
var country = "{% if request().segment(3) == "edit" %}{{ form.fields.country.value.id }}{% else %}{{ form.fields.country.value|raw }}{% endif %}";

‎resources/views/address/list.twig‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,15 @@
33
{% block content %}
44
{% embed 'visiosoft.module.profile::profile/index' %}
55
{% block detail %}
6+
7+
<div class="row px-3">
8+
<div class="col-md-12 profile-section border profile-wrapper">
9+
<div class="tab-content py-3 px-3 px-sm-0" id="nav-tabContent">
10+
<div class="tab-pane fade show active" id="nav-profile" role="tabpanel"
11+
aria-labelledby="nav-profile-tab">
12+
613
<table class="table address-table">
7-
<thead class="thead-dark">
14+
<thead class="">
815
<tr>
916
<th scope="col">
1017
<a href="{{ url_route('visiosoft.module.profile::adress_create') }}"
@@ -44,6 +51,11 @@
4451
{% endfor %}
4552
</tbody>
4653
</table>
54+
55+
</div>
56+
</div>
57+
</div>
58+
</div>
4759
{% endblock %}
4860
{% endembed %}
4961
{% endblock %}

‎resources/views/profile/ads.twig‎

Lines changed: 62 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -4,65 +4,70 @@
44
{% embed 'visiosoft.module.profile::profile/index' %}
55
{% block detail %}
66
<div class="row px-3">
7-
<div class="col-md-12 bg-dark text-white p-5 d-flex justify-content-between align-items-center flex-wrap">
8-
<h3>{{ trans('visiosoft.module.advs::field.my_ads.name') }}</h3>
9-
10-
{{ addBlock('profile/ads/header')|raw }}
11-
</div>
12-
13-
<div class="col-md-12 bg-light advs-section">
14-
<nav class="profile-advs-tab">
15-
<div class="nav nav-tabs nav-fill" id="nav-tab" role="tablist">
16-
{% set type = app.request.get('type') ?: 'approved' %}
17-
<a class="nav-item nav-link text-dark{{ type == 'approved' ? ' active' : '' }}"
18-
data-type="approved" id="nav-approved-tab" data-toggle="tab" href="#nav-approved"
19-
role="tab" aria-controls="nav-detail" aria-selected="true">
20-
{{ trans('visiosoft.module.advs::field.my_ads.name') }}
21-
</a>
22-
<a class="nav-item nav-link text-dark{{ type == 'pending' ? ' active' : '' }}"
23-
data-type="pending" id="nav-pending-tab" data-toggle="tab" href="#nav-pending"
24-
role="tab" aria-controls="nav-pending" aria-selected="true">
25-
{{ trans('visiosoft.module.advs::field.pending_adv.name') }}
26-
</a>
27-
</div>
28-
</nav>
29-
<div class="bg-dark p-2 mt-2 rounded">
30-
<a href="{{ url_route('advs::create_adv') }}" class="btn btn-success">
31-
<i class="fas fa-plus-circle"></i>
32-
{{ trans("visiosoft.theme.base::button.post_ad.name") }}
33-
</a>
34-
{% if auth_user().hasRole('admin') and setting_value('visiosoft.module.profile::show_extends_actions') %}
35-
<a href="{{ url_route("advs::extendAll") }}" class="btn btn-primary">
36-
{{ trans('visiosoft.module.profile::button.extend_all') }}
37-
</a>
38-
<a href="{{ url_route("advs::extendAll") }}?unpublished=1" class="btn btn-warning text-white">
39-
{{ trans('visiosoft.module.profile::button.extend_unpublished') }}
40-
</a>
41-
{% endif %}
42-
</div>
7+
<div class="col-md-12 profile-section px-0 border profile-wrapper">
438
<div class="tab-content py-3 px-3 px-sm-0" id="nav-tabContent">
44-
<div class="tab-pane fade{{ type == 'approved' ? ' show active' : '' }}" id="nav-approved"
45-
role="tabpanel" aria-labelledby="nav-approved-tab">
46-
</div>
47-
<div class="tab-pane fade{{ type == 'pending' ? ' show active' : '' }}" id="nav-pending"
48-
role="tabpanel" aria-labelledby="nav-pending-tab">
49-
</div>
50-
<div class="tab-pane fade" id="nav-passive"
51-
role="tabpanel" aria-labelledby="nav-passive-tab">
52-
</div>
9+
<div class="tab-pane fade show active" id="nav-profile" role="tabpanel"
10+
aria-labelledby="nav-profile-tab">
11+
<div class="col-12 mb-4 mb-md-5 mt-md-3 px-3 px-sm-5 ">
12+
<h3>{{ trans('visiosoft.module.advs::field.my_ads.name') }}</h3>
13+
{{ addBlock('profile/ads/header')|raw }}
14+
</div>
15+
<div class="col-md-12 advs-section">
16+
<div class=" p-2 py-3 mt-2 rounded">
17+
<a href="{{ url_route('advs::create_adv') }}" class="btn btn-lg btn-outline-primary">
18+
<i class="fas fa-plus-circle"></i>
19+
{{ trans("visiosoft.theme.base::button.post_ad.name") }}
20+
</a>
21+
{% if auth_user().hasRole('admin') and setting_value('visiosoft.module.profile::show_extends_actions') %}
22+
<a href="{{ url_route("advs::extendAll") }}" class="btn btn-lg btn-outline-secondary">
23+
{{ trans('visiosoft.module.profile::button.extend_all') }}
24+
</a>
25+
<a href="{{ url_route("advs::extendAll") }}?unpublished=1" class="btn btn-lg btn-outline-secondary">
26+
{{ trans('visiosoft.module.profile::button.extend_unpublished') }}
27+
</a>
28+
{% endif %}
29+
</div>
30+
<nav class="profile-advs-tab">
31+
<div class="nav nav-tabs nav-fill" id="nav-tab" role="tablist">
32+
{% set type = app.request.get('type') ?: 'approved' %}
33+
<a class="nav-item nav-link text-dark{{ type == 'approved' ? ' active' : '' }}"
34+
data-type="approved" id="nav-approved-tab" data-toggle="tab" href="#nav-approved"
35+
role="tab" aria-controls="nav-detail" aria-selected="true">
36+
{{ trans('visiosoft.module.advs::field.my_ads.name') }}
37+
</a>
38+
<a class="nav-item nav-link text-dark{{ type == 'pending' ? ' active' : '' }}"
39+
data-type="pending" id="nav-pending-tab" data-toggle="tab" href="#nav-pending"
40+
role="tab" aria-controls="nav-pending" aria-selected="true">
41+
{{ trans('visiosoft.module.advs::field.pending_adv.name') }}
42+
</a>
43+
</div>
44+
</nav>
5345

54-
<!-- Pagination links -->
55-
<nav aria-label="Page navigation example">
56-
<ul class="pagination justify-content-center">
57-
<li class="page-item">
58-
<a id="btn_prev" class="page-link" href="javascript:prevPage()"><</a>
59-
</li>
60-
<li class="page-item"><span id="page" class="page-link">1</span></li>
61-
<li class="page-item">
62-
<a id="btn_next" class="page-link" href="javascript:nextPage()">></a>
63-
</li>
64-
</ul>
65-
</nav>
46+
<div class="tab-content py-3 px-3 px-sm-0" id="nav-tabContent">
47+
<div class="tab-pane fade{{ type == 'approved' ? ' show active' : '' }}" id="nav-approved"
48+
role="tabpanel" aria-labelledby="nav-approved-tab">
49+
</div>
50+
<div class="tab-pane fade{{ type == 'pending' ? ' show active' : '' }}" id="nav-pending"
51+
role="tabpanel" aria-labelledby="nav-pending-tab">
52+
</div>
53+
<div class="tab-pane fade" id="nav-passive"
54+
role="tabpanel" aria-labelledby="nav-passive-tab">
55+
</div>
56+
<!-- Pagination links -->
57+
<nav aria-label="Page navigation example">
58+
<ul class="pagination justify-content-center">
59+
<li class="page-item">
60+
<a id="btn_prev" class="page-link d-flex justify-content-center align-items-center" href="javascript:prevPage()"><</a>
61+
</li>
62+
<li class="page-item"><span id="page" class="page-link d-flex justify-content-center align-items-center">1</span></li>
63+
<li class="page-item">
64+
<a id="btn_next" class="page-link d-flex justify-content-center align-items-center" href="javascript:nextPage()">></a>
65+
</li>
66+
</ul>
67+
</nav>
68+
</div>
69+
</div>
70+
</div>
6671
</div>
6772
</div>
6873
</div>

0 commit comments

Comments
 (0)