Skip to content

Commit 69663c9

Browse files
GonzaloGMGonzaloGM
authored
Merge pull request #424 from STS-Rosario/support-ticket
Support ticket
2 parents 8306e5d + a996ceb commit 69663c9

46 files changed

Lines changed: 1707 additions & 412 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎e2e-frontend/screenshots.spec.js-snapshots/admin-dashboard-frontend-linux.png‎

4.72 KB
Loading

‎e2e-frontend/screenshots.spec.js-snapshots/admin-manual-identity-validation-review-frontend-linux.png‎

5.32 KB
Loading

‎e2e-frontend/screenshots.spec.js-snapshots/admin-manual-identity-validations-frontend-linux.png‎

7.48 KB
Loading

‎e2e-frontend/screenshots.spec.js-snapshots/admin-mp-rejected-validation-detail-frontend-linux.png‎

5.31 KB
Loading

‎e2e-frontend/screenshots.spec.js-snapshots/admin-mp-rejected-validations-frontend-linux.png‎

6.17 KB
Loading

‎e2e-frontend/screenshots.spec.js-snapshots/admin-trips-frontend-linux.png‎

4.77 KB
Loading

‎e2e-frontend/screenshots.spec.js-snapshots/admin-users-delete-list-frontend-linux.png‎

5.44 KB
Loading

‎src/components/layouts/AdminLayout.vue‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
<template>
2+
<div class="col-md-24">
3+
<div class="row">
4+
<div class="col-md-4">
5+
<admin-nav></admin-nav>
6+
</div>
7+
<div class="col-md-20 admin-layout-content">
8+
<slot></slot>
9+
</div>
10+
</div>
11+
</div>
12+
</template>
13+
14+
<script>
15+
import adminNav from '../sections/adminNav';
16+
17+
export default {
18+
name: 'admin-layout',
19+
components: {
20+
adminNav
21+
}
22+
};
23+
</script>
24+
25+
<style scoped>
26+
.admin-layout-content {
27+
margin-top: 72px;
28+
}
29+
30+
@media (max-width: 767px) {
31+
.admin-layout-content {
32+
margin-top: 24px;
33+
}
34+
}
35+
</style>

‎src/components/sections/HeaderApp.vue‎

Lines changed: 40 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -137,50 +137,26 @@
137137
</div>
138138
</router-link>
139139
<div class="header_panel-right">
140-
<modal
141-
:name="'modal'"
142-
v-if="showModal"
143-
@close="showModal = false"
144-
:title="'Test'"
145-
:body="'Body'"
146-
>
147-
<template #header><h3>{{ $t('invitarAmigos') }}</h3></template>
148-
<template #body><div class="social-share">
149-
<a
150-
:href="'https://www.facebook.com/sharer/sharer.php?u=' + shareUrl"
151-
target="_blank"
152-
aria-label="Compartir en Facebook"
153-
class="lnk lnk-social-network lnk-facebook"
154-
>
155-
<i class="fa fa-facebook" aria-hidden="true"></i>
156-
</a>
157-
<a
158-
:href="'https://twitter.com/intent/tweet/?text=' + encodeURIComponent(this.$t('compartirPlataforma')) + '&url=' + shareUrl + '&via=' + config.name_app.toLowerCase() + '&hashtags=carpooling'"
159-
target="_blank"
160-
aria-label="Compartir en Twitter"
161-
class="lnk lnk-social-network lnk-twitter"
162-
>
163-
<i class="fa fa-twitter" aria-hidden="true"></i>
164-
</a>
165-
<a
166-
:href="'whatsapp://send?text=' + encodeURIComponent(this.$t('compartirPlataforma')) + '%20' + shareUrl"
167-
target="_blank"
168-
aria-label="Compartir en Whats App"
169-
class="lnk lnk-social-network lnk-whatsapp"
170-
v-if="isMobile"
171-
>
172-
<i class="fa fa-whatsapp" aria-hidden="true"></i>
173-
</a>
174-
</div></template>
175-
</modal>
176-
<button
177-
v-if="config.trip_card_design !== 'light'"
178-
@click="share"
179-
type="button"
180-
class="btn btn-link"
181-
>
182-
{{ $t('invitarAmigos') }}
183-
</button>
140+
<div class="header-social-links">
141+
<a
142+
href="https://www.instagram.com/carpoolear/?hl=en"
143+
target="_blank"
144+
rel="noopener noreferrer"
145+
class="header-social-link"
146+
aria-label="Instagram Carpoolear"
147+
>
148+
<img :src="instagram_logo" alt="" />
149+
</a>
150+
<a
151+
href="https://www.facebook.com/Carpoolear"
152+
target="_blank"
153+
rel="noopener noreferrer"
154+
class="header-social-link"
155+
aria-label="Facebook Carpoolear"
156+
>
157+
<img :src="facebook_logo" alt="" />
158+
</a>
159+
</div>
184160
<router-link
185161
v-if="config.trip_card_design !== 'light'"
186162
class="btn btn-link trips-link"
@@ -314,7 +290,6 @@ import { useTripsStore } from '../../stores/trips';
314290
import dropdown from '../Dropdown';
315291
import router from '../../router';
316292
import bus from '../../services/bus-event.js';
317-
import modal from '../Modal';
318293
import IdentityValidationCountdownBanner from '../IdentityValidationCountdownBanner.vue';
319294
import { shouldHideDonationOnIOSCapacitor } from '../../services/capacitor.js';
320295
@@ -338,8 +313,8 @@ export default {
338313
'img/' +
339314
process.env.TARGET_APP +
340315
'_logo.png',
341-
showModal: false,
342-
shareUrl: encodeURIComponent(new URL(process.env.WEB_URL).origin)
316+
facebook_logo: process.env.ROUTE_BASE + 'img/fb_logo.png',
317+
instagram_logo: process.env.ROUTE_BASE + 'img/instagram-logo.png'
343318
};
344319
},
345320
@@ -403,17 +378,6 @@ export default {
403378
shouldHideDonationOnIOSCapacitor(user) {
404379
return shouldHideDonationOnIOSCapacitor(user);
405380
},
406-
share() {
407-
// dialogs.message('Message example');
408-
/* if (window && window.plugins && window.plugins.socialsharing && window.plugins.socialsharing.shareWithOptions) {
409-
socialShare.share();
410-
} else {
411-
this.showModal = true;
412-
} */
413-
// Primero necesito ver cuando estoy en App y cuando en Web
414-
this.showModal = true;
415-
},
416-
417381
logout() {
418382
useAuthStore().logout();
419383
},
@@ -446,7 +410,6 @@ export default {
446410
},
447411
components: {
448412
dropdown,
449-
modal,
450413
IdentityValidationCountdownBanner
451414
}
452415
};
@@ -456,6 +419,24 @@ export default {
456419
.trips-link {
457420
font-weight: bold;
458421
}
422+
.header-social-links {
423+
display: inline-flex;
424+
align-items: center;
425+
gap: 0.45rem;
426+
margin-right: 3rem;
427+
vertical-align: middle;
428+
}
429+
.header-social-link img {
430+
width: 22px;
431+
height: 22px;
432+
display: block;
433+
object-fit: contain;
434+
vertical-align: middle;
435+
margin-right: 1rem;
436+
}
437+
.header-social-link:hover img {
438+
opacity: 0.85;
439+
}
459440
.actionbar_icon img {
460441
margin-bottom: 2px;
461442
width: 26px;

‎src/components/sections/adminNav.vue‎

Lines changed: 120 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,44 @@
11
<template>
2-
<div class="col-md-20 col-md-offset-2">
3-
<div class="nav nav-tabs">
4-
<li>
5-
<router-link :to="{ name: 'admin-page' }">{{ $t('adminNavGraficos') }}</router-link>
6-
</li>
7-
<li>
8-
<router-link :to="{ name: 'admin-users' }"
9-
>{{ $t('adminNavUsuarios') }}</router-link
10-
>
11-
</li>
12-
<li>
13-
<router-link :to="{ name: 'admin-trips' }">{{ $t('adminNavViajes') }}</router-link>
14-
</li>
15-
<li>
16-
<router-link :to="{ name: 'admin-banned-users' }">{{ $t('usuariosBloqueados') }}</router-link>
17-
</li>
18-
<li>
19-
<router-link :to="{ name: 'admin-manual-identity-validations' }">{{ $t('validacionesManuales') }}</router-link>
20-
</li>
21-
<li>
22-
<router-link :to="{ name: 'admin-mp-rejected-validations' }">{{ $t('rechazosMercadoPago') }}</router-link>
23-
</li>
2+
<div class="admin-nav-wrapper">
3+
<div class="admin-nav-mobile-header visible-xs">
4+
<button
5+
type="button"
6+
class="btn btn-default admin-nav-mobile-toggle"
7+
@click="toggleMobile"
8+
:aria-label="$t('navegacionAdministracion')"
9+
>
10+
<i class="fa fa-bars" aria-hidden="true"></i>
11+
</button>
12+
<span class="admin-nav-mobile-title">{{ $t('navegacionAdministracion') }}</span>
13+
</div>
14+
15+
<div class="admin-nav-sidebar" :class="{ 'is-mobile-open': mobileOpen }">
16+
<ul class="admin-nav-list">
17+
<li>
18+
<router-link :to="{ name: 'admin-page' }">{{ $t('adminNavGraficos') }}</router-link>
19+
</li>
20+
<li>
21+
<router-link :to="{ name: 'admin-users' }">{{ $t('adminNavUsuarios') }}</router-link>
22+
</li>
23+
<li>
24+
<router-link :to="{ name: 'admin-users-delete-list' }">{{ $t('pedidosDeEliminacionDeCuenta') }}</router-link>
25+
</li>
26+
<li>
27+
<router-link :to="{ name: 'admin-trips' }">{{ $t('adminNavViajes') }}</router-link>
28+
</li>
29+
<li>
30+
<router-link :to="{ name: 'admin-banned-users' }">{{ $t('usuariosBloqueados') }}</router-link>
31+
</li>
32+
<li>
33+
<router-link :to="{ name: 'admin-manual-identity-validations' }">{{ $t('validacionesManuales') }}</router-link>
34+
</li>
35+
<li>
36+
<router-link :to="{ name: 'admin-mp-rejected-validations' }">{{ $t('rechazosMercadoPago') }}</router-link>
37+
</li>
38+
<li>
39+
<router-link :to="{ name: 'admin-support-tickets' }">{{ $t('soporte') }}</router-link>
40+
</li>
41+
</ul>
2442
</div>
2543
</div>
2644
</template>
@@ -29,15 +47,91 @@ export default {
2947
name: 'admin-nav',
3048
data() {
3149
return {
32-
selected: ''
50+
mobileOpen: false
3351
};
3452
},
35-
mounted() {}
53+
watch: {
54+
$route() {
55+
this.mobileOpen = false;
56+
}
57+
},
58+
methods: {
59+
toggleMobile() {
60+
this.mobileOpen = !this.mobileOpen;
61+
}
62+
}
3663
};
3764
</script>
3865

3966
<style scoped>
40-
.nav-pills {
41-
font-size: 1.5em;
67+
.admin-nav-wrapper {
68+
margin-bottom: 16px;
69+
margin-top: 72px;
70+
}
71+
72+
.admin-nav-sidebar {
73+
border: 1px solid #ddd;
74+
border-radius: 6px;
75+
background: #fff;
76+
padding: 12px;
77+
}
78+
79+
.admin-nav-list {
80+
list-style: none;
81+
margin: 0;
82+
padding: 0;
83+
}
84+
85+
.admin-nav-list li + li {
86+
margin-top: 6px;
87+
}
88+
89+
.admin-nav-list a {
90+
display: block;
91+
padding: 8px 10px;
92+
border-radius: 4px;
93+
color: #333;
94+
text-decoration: none;
95+
}
96+
97+
.admin-nav-list a.router-link-active {
98+
background: #f0f6ff;
99+
color: #0f4fa8;
100+
font-weight: 600;
101+
}
102+
103+
.admin-nav-mobile-header {
104+
display: flex;
105+
align-items: center;
106+
gap: 10px;
107+
margin-bottom: 10px;
108+
}
109+
110+
.admin-nav-mobile-toggle {
111+
padding: 6px 10px;
112+
}
113+
114+
.admin-nav-mobile-title {
115+
font-weight: 600;
116+
}
117+
118+
@media (max-width: 767px) {
119+
.admin-nav-wrapper {
120+
margin-top: 92px;
121+
}
122+
123+
.admin-nav-sidebar {
124+
display: none;
125+
}
126+
127+
.admin-nav-sidebar.is-mobile-open {
128+
display: block;
129+
}
130+
}
131+
132+
@media (min-width: 768px) {
133+
.admin-nav-mobile-header {
134+
display: none;
135+
}
42136
}
43137
</style>

0 commit comments

Comments
 (0)
⚡