fix: issues ux

This commit is contained in:
Alexandro Uc Santos
2024-03-02 18:34:14 -06:00
parent 1ab389605d
commit 6a54ed3dbe
14 changed files with 252 additions and 55 deletions

View File

@@ -164,7 +164,6 @@
Evidencias
</button>
<button
v-if="load.load_status !== 'Delivered'"
class="btn-primary-sm"
data-toggle="modal" data-target="#formLoadModal"
@click="openEditModal"

View File

@@ -25,16 +25,16 @@
onMounted(() => {
props.data.forEach(item => {
const index = dataMap.value.findIndex((e) => e.label === item);
if(index === -1) {
const index = dataMap.value.findIndex((e) => e.name?.toUpperCase() === item?.toUpperCase());
if(index === -1) { // Lo agrega
if(props.dataModel) {
const itemModel = props.dataModel.find((e) => e[props.targetFind] === item);
dataMap.value.push({
const itemModel = props.dataModel.find((e) => e[props.targetFind].toUpperCase() === item.toUpperCase());
const itemTem = {
label: (props.targetLabel) ? itemModel[props.targetLabel] : item,
data: 1,
...itemModel
})
};
dataMap.value.push(itemTem)
} else {
dataMap.value.push({
label: item,
@@ -42,11 +42,10 @@
color: 'green'
});
}
} else {
} else { // Lo actualiza
dataMap.value[index].data += 1;
}
});
chartData.value = {
labels: dataMap.value.map((e) => e.label),
datasets: [{

View File

@@ -25,11 +25,11 @@
<RouterLink
v-if="auth.user?.permissions.includes('role_carrier')"
active-class="router-link-active"
class="nav-link" :to="{name: 'search-loads'}">Cargas</RouterLink>
class="nav-link" :to="{name: 'search-loads'}"> <i class="fa-solid fa-truck-ramp-box me-1"></i> Cargas</RouterLink>
<RouterLink
v-if="auth.user?.permissions.includes('role_carrier')"
active-class="router-link-active"
class="nav-link" :to="{name: 'shippers'}">Embarcadores</RouterLink>
class="nav-link" :to="{name: 'shippers'}"><i class="fa-solid fa-book me-1"></i> Embarcadores</RouterLink>
</div>
</div>
</nav>
@@ -40,17 +40,21 @@
display: flex;
flex-direction: row;
justify-content: end;
align-items: center;
}
.custom-navbar {
display: block;
width: calc(100vw - 220px);
background-color: #FFF;
padding: 16px 0px;
}
.nav-options {
margin-left: 32px;
display: flex;
margin-left: 32px;
gap: 1rem;
margin-right: 32px;
}
.btn-menu {
@@ -59,8 +63,8 @@
.nav-link{
cursor: pointer;
color: #413f3c;
font-size: 1.2rem;
color: #FBBA33;
font-size: 1.3rem;
margin-right: 1.2rem;
font-weight: 500;
}
@@ -83,6 +87,18 @@
@media (max-width: 768px) {
.nav-options {
margin-left: 8px;
margin-right: 8px;
gap: 0.5rem;
}
.nav-link{
font-size: 1.1rem;
margin-right: 1.2rem;
font-weight: 500;
}
.custom-navbar {
width: 100vw !important;
}

View File

@@ -22,7 +22,9 @@
<nav id="sidebar">
<div class="sidebar-header">
<div class="logo">
<img src="/images/logo-eta.png" alt="Eta viaporte" width="120">
<a href="https://etaviaporte.com/" target="_blank">
<img src="/images/logo-eta.png" alt="Eta viaporte" width="120">
</a>
</div>
<h2 class="my-4">COVO</h2>
<p><i class="fa-solid fa-user"></i> <span class="ms-2">{{ auth.user?.first_name + ' ' + auth.user?.last_name }}</span></p>
@@ -84,7 +86,7 @@
<i class="fa-solid fa-bullhorn" :class="[route.name === 'published-trucks' ? 'router-link-active' : '']"></i>
<RouterLink
active-class=""
class="nav-link" :to="{name: 'published-trucks'}">Publicaciones</RouterLink>
class="nav-link" :to="{name: 'published-trucks'}">Ofertas aceptadas</RouterLink>
</div>
</li>
<li :class="[route.name === 'calendar' ? 'bg-nav-active' : '']">