diff --git a/src/components/Sidebar.vue b/src/components/Sidebar.vue
index 98f6342..f4d1371 100644
--- a/src/components/Sidebar.vue
+++ b/src/components/Sidebar.vue
@@ -32,8 +32,8 @@
-
COVO
- {{ auth.user?.first_name + ' ' + auth.user?.last_name }}
+ {{auth.user?.company?.company_name}}
+ {{ auth.user?.first_name + ' ' + auth.user?.last_name }}
@@ -167,6 +167,18 @@
margin-bottom: 8px;
}
+ .icon-header {
+ font-size: 24px;
+ // color: #FBBA33;
+ color: #FFF;
+ margin-right: 8px;
+ }
+
+ .company-name {
+ font-size: 2rem;
+ font-weight: 900;
+ }
+
.logo {
display: flex;
justify-content: center;
diff --git a/src/services/auth.js b/src/services/auth.js
index 8abc9bb..5341b16 100644
--- a/src/services/auth.js
+++ b/src/services/auth.js
@@ -38,7 +38,6 @@ export const renewToken = async() => {
try {
const endpoint = `/v1/account/authorize/${session}`;
const {data} = await apiPublic.get(endpoint);
- console.log(data);
if(data.accessToken !== null){
return {
msg: 'success',
diff --git a/src/stores/auth.js b/src/stores/auth.js
index 98eafd5..e746dab 100644
--- a/src/stores/auth.js
+++ b/src/stores/auth.js
@@ -34,9 +34,10 @@ export const useAuthStore = defineStore('auth', () => {
user.value = resp.data.user;
sesion.value = resp.data.session_token;
token.value = resp.data.accessToken;
+ console.log(resp.data.user)
localStorage.setItem('session', resp.data.session_token);
localStorage.setItem('access', resp.data.accessToken);
- localStorage.setItem('id', resp.data.user.company);
+ localStorage.setItem('id', resp.data.user.company._id);
checking.value = false;
} else {
noty.show = true;
diff --git a/src/stores/company.js b/src/stores/company.js
index edec500..67f1444 100644
--- a/src/stores/company.js
+++ b/src/stores/company.js
@@ -37,6 +37,7 @@ export const useCompanyStore = defineStore('company', () => {
const getUsersCompany = async(limit = 1, page = 0, reload = false) => {
const companyId = localStorage.getItem('id');
+ console.log(companyId);
if(users.value.length <= 0 || reload === true) {
// const filter = `company=${companyId}`;
const filter = `company=${companyId}&elements=${limit}&page=${page}`;
diff --git a/src/stores/loads.js b/src/stores/loads.js
index 6461af3..b7ee0cb 100644
--- a/src/stores/loads.js
+++ b/src/stores/loads.js
@@ -18,7 +18,7 @@ export const useLoadsStore = defineStore('load', () => {
const companyid = localStorage.getItem('id');
if(loadsDashboard.value.length <= 0 || reload) {
try {
- const endpoint = `/v1/loads/find`;
+ const endpoint = `/v1/loads/find?elements=100`;
const {data} = await api.get(endpoint);
loadsDashboard.value = data.data;
} catch (error) {
@@ -32,8 +32,9 @@ export const useLoadsStore = defineStore('load', () => {
const companyId = localStorage.getItem('id');
try {
if(loadsDashboard.value.length <= 0 || reload) {
- const endpoint = `/v1/proposals/find?carrier=${companyId}`;
+ const endpoint = `/v1/proposals/find?carrier=${companyId}&elements=100`;
const {data} = await api.get(endpoint);
+ console.log(data);
loadsDashboard.value = data.data.map( (e) => e.load);
}
} catch (error) {
diff --git a/src/views/CompleteRegisterView.vue b/src/views/CompleteRegisterView.vue
index 9ccc7dc..ff29f99 100644
--- a/src/views/CompleteRegisterView.vue
+++ b/src/views/CompleteRegisterView.vue
@@ -122,6 +122,8 @@ import Spiner from '../components/ui/Spiner.vue';
///////////////////////////
}
+ /// Falta el populate en la respuesta para completar el registro y luego de recargar la pagina
+
const handleBack = (val) => {
step.value = val;
}
diff --git a/src/views/HomeView.vue b/src/views/HomeView.vue
index cf1c981..d33e0fc 100644
--- a/src/views/HomeView.vue
+++ b/src/views/HomeView.vue
@@ -6,6 +6,7 @@
import { useLoadsStore } from '../stores/loads';
import { onMounted, ref, watch } from 'vue';
import Spiner from '../components/ui/Spiner.vue';
+ import CardEmpty from '../components/CardEmpty.vue';
import { useAuthStore } from '../stores/auth';
import { storeToRefs } from 'pinia';
@@ -33,7 +34,6 @@
}
});
-
const getData = async() => {
loading.value = true;
if(user.value?.permissions === "role_carrier") {
@@ -52,10 +52,15 @@
if(e?.load_status) {
loadsData.value.push(e.load_status);
}
- if( (user.value?.permissions === "role_shipper") && e?.categories) {
+ if( e?.categories) {
segmentsData.value.push(e?.categories[0].name)
}
- if( (user.value?.permissions === "role_shipper" ) && e?.origin?.city) {
+
+ // if( (user.value?.permissions === "role_carrier") && e?.load?.categories) {
+ // segmentsData.value.push(e?.load?.categories[0].name)
+ // }
+
+ if( e?.origin?.city) {
cities.value.push(e?.origin.city)
}
if(e?.origin?.state){
@@ -70,10 +75,8 @@
Dashboard Administrativo
-
-
+
+
Total de cargas este mes
{{ nOfLoads }}
@@ -85,9 +88,7 @@
-
+
Cargas activas
@@ -100,9 +101,7 @@
/>
-
+
Segmentos más usados
@@ -114,11 +113,7 @@
/>
-
-
+
Estados más usados
@@ -129,9 +124,7 @@
/>
-
+
Ciudades más usadas
@@ -142,9 +135,7 @@
/>
-
+
Tipo de transporte más usados
@@ -156,6 +147,9 @@
+
+
+