From 0b56a2a223b454f9dbb205ec17711c7b423144a3 Mon Sep 17 00:00:00 2001 From: Alexandro Uc Santos Date: Wed, 25 Sep 2024 20:27:00 -0600 Subject: [PATCH] add: fixes user card & removed logs --- index.html | 2 -- src/components/AttachmentsModal.vue | 2 -- src/components/CardBudget.vue | 1 - src/components/CardCompany.vue | 3 -- src/components/CardFaq.vue | 1 - src/components/CardLoad.vue | 2 +- src/components/CardProposal.vue | 1 - src/components/CardUser.vue | 16 +++++---- src/components/CardVehicle.vue | 2 +- src/components/CreateBudgetModal.vue | 7 ---- src/components/CreateUserModal.vue | 2 -- src/components/CustomPopup.vue | 2 -- src/components/DriverVehicleModal.vue | 3 -- src/components/EditProfileModal.vue | 4 --- src/components/FormChangeEmail.vue | 7 ---- src/components/FormChangePassword.vue | 6 ---- src/components/FormLoadModal.vue | 6 ---- src/components/Header.vue | 5 --- src/components/LoadDetailModal.vue | 3 -- src/components/MapDirections.vue | 7 ---- src/components/NotificationCard.vue | 1 - src/components/NotificationsPopup.vue | 4 --- src/components/Pagination.vue | 1 - src/components/ProfilePopup.vue | 2 -- src/components/Sidebar.vue | 34 ------------------ src/components/StatusVehicleModal.vue | 8 ----- src/components/ui/Cities.vue | 1 - src/components/ui/EditCompanyModal.vue | 5 --- src/components/ui/LoadingModal.vue | 1 - src/components/ui/Products.vue | 2 -- src/components/ui/Segments.vue | 2 -- src/components/ui/States.vue | 2 -- src/components/ui/TruckTypes.vue | 1 - src/composables/useAttachments.js | 2 +- src/composables/useCalendar.js | 1 - src/composables/useCompanyProfile.js | 1 - src/composables/useDirectionRender.js | 50 ++------------------------ src/composables/useDirectory.js | 1 - src/composables/userSearchLoads.js | 1 - src/layouts/AdminLayout.vue | 1 - src/layouts/AuthLayout.vue | 14 -------- src/layouts/PublicLayout.vue | 3 -- src/router/index.js | 12 ------- src/services/auth.js | 1 - src/services/company.js | 22 ------------ src/services/public.js | 25 ------------- src/services/vehicles.js | 6 ---- src/stores/company.js | 5 --- src/stores/loads.js | 17 --------- src/stores/vehicles.js | 4 --- src/views/CalendarView.vue | 1 - src/views/CarriersView.vue | 1 - src/views/CompleteRegisterView.vue | 4 --- src/views/EditProfileView.vue | 4 --- src/views/HomeView.vue | 4 --- src/views/LoadsPublishedView.vue | 9 ----- src/views/LocationsView.vue | 5 --- src/views/LoginView.vue | 6 +--- src/views/MyCompanyView.vue | 8 ----- src/views/RecoveryPasswordView.vue | 1 - src/views/RegisterView.vue | 2 -- src/views/SearchLoadsView.vue | 3 -- src/views/SearchVehiclesView.vue | 2 -- src/views/ShippersView.vue | 6 ---- src/views/TrackingLoadView.vue | 4 --- src/views/UsersView.vue | 1 - src/views/VehiclesView.vue | 9 ----- 67 files changed, 15 insertions(+), 367 deletions(-) diff --git a/index.html b/index.html index d132df6..6b79ce3 100644 --- a/index.html +++ b/index.html @@ -15,9 +15,7 @@
- - diff --git a/src/components/AttachmentsModal.vue b/src/components/AttachmentsModal.vue index 5f3fee6..4222755 100644 --- a/src/components/AttachmentsModal.vue +++ b/src/components/AttachmentsModal.vue @@ -68,7 +68,6 @@ \ No newline at end of file diff --git a/src/components/CardBudget.vue b/src/components/CardBudget.vue index 28d8755..c52f967 100644 --- a/src/components/CardBudget.vue +++ b/src/components/CardBudget.vue @@ -83,7 +83,6 @@

{{ t('calculator.totalBeforeIva') }}: {{ formatCurrency(budget.total_before_tax) }}

{{ t('calculator.totalUtityByKm') }}: {{ formatCurrency( budget.total_utility_per_km) }}

{{ t('calculator.totalUtity') }}: {{ formatCurrency( budget.total_profit ) }}

-

{{ t('calculator.percentUtility') }}: {{ totalPercentage }}

diff --git a/src/components/CardCompany.vue b/src/components/CardCompany.vue index be75c43..15e1792 100644 --- a/src/components/CardCompany.vue +++ b/src/components/CardCompany.vue @@ -19,12 +19,9 @@
- -

{{ t('labels.codeId') }}: {{ company.company_code }}

{{ t('labels.dateMembership') }}: {{getDateMonthDay(company.createdAt)}}

{{ t('company.segment') }}: {{ company._categories }}

-

{{ t('labels.locationLoadState') }}: {{company._company_state}}

diff --git a/src/components/CardFaq.vue b/src/components/CardFaq.vue index 4383f52..622d1bd 100644 --- a/src/components/CardFaq.vue +++ b/src/components/CardFaq.vue @@ -44,7 +44,6 @@ import { ref } from 'vue'; width: 100%; padding: 12px 20px; background-color: white; - /* background-color: rgb(184, 236, 234); */ margin-bottom: 15px; filter: drop-shadow(0px 4px 4px rgba(0, 255, 255,0.3)); border-radius: 13px; diff --git a/src/components/CardLoad.vue b/src/components/CardLoad.vue index 09a0c92..9efc4a6 100644 --- a/src/components/CardLoad.vue +++ b/src/components/CardLoad.vue @@ -48,7 +48,7 @@ if(result.isConfirmed) { Swal.fire({ title: t('messages.loading'), - html: t('loads.loadingDel') + '...',// add html attribute if you want or remove + html: t('loads.loadingDel') + '...', allowOutsideClick: false, didOpen: () => { Swal.showLoading() diff --git a/src/components/CardProposal.vue b/src/components/CardProposal.vue index aebed26..4880700 100644 --- a/src/components/CardProposal.vue +++ b/src/components/CardProposal.vue @@ -222,5 +222,4 @@ gap: 0.2rem; } } - \ No newline at end of file diff --git a/src/components/CardUser.vue b/src/components/CardUser.vue index 63239a3..9f74093 100644 --- a/src/components/CardUser.vue +++ b/src/components/CardUser.vue @@ -18,6 +18,8 @@ } }) + + console.log(props.user) defineEmits(['set-user']) @@ -80,22 +82,22 @@

{{ t('global.segments') }}: {{user.categories?.map((e) => e.name).join(', ')}}

-

{{ t('labels.locationLoadCity') }}: {{user._user_city}}

{{ t('labels.locationLoadState') }}: {{user._user_state}}

-

{{ t('labels.truckUsed') }}: {{user._truck_type}}

-

{{ t('labels.userInfo') }}: {{user.user_description}}

+

{{ t('labels.locationLoadCity') }}: {{user._user_city}}

+

{{ t('labels.truckUsed') }}: {{user._truck_type}}

{{ t('labels.memberSince') }}: {{getDateOnly(user.createAt)}}

-

Tipo de afiliación: {{user.company.membership}}

+

{{ t('labels.userInfo') }}: {{user.user_description}}

+

{{ t('global.segments') }}: {{user.categories?.map((e) => e.name).join(', ')}}

-

{{ t('labels.locationLoadCity') }}: {{user.user_city?.join(', ')}}

{{ t('labels.locationLoadState') }}: {{user.user_state?.join(', ')}}

+

{{ t('labels.locationLoadCity') }}: {{user.user_city?.join(', ')}}

{{ t('labels.truckUsed') }}: {{user.truck_type?.join(', ')}}

-

{{ t('labels.userInfo') }}: {{user.user_description}}

{{ t('labels.memberSince') }}: {{getDateOnly(user.createAt)}}

-

Tipo de afiliación: {{user.company.membership}}

+

{{ t('labels.userInfo') }}: {{user.user_description}}

+
diff --git a/src/components/CardVehicle.vue b/src/components/CardVehicle.vue index c22f5dd..b3e989d 100644 --- a/src/components/CardVehicle.vue +++ b/src/components/CardVehicle.vue @@ -37,7 +37,7 @@ if(result.isConfirmed) { Swal.fire({ title: t('messages.loading'), - html: t('vehicles.loadingDel') + '...',// add html attribute if you want or remove + html: t('vehicles.loadingDel') + '...', allowOutsideClick: false, didOpen: () => { Swal.showLoading() diff --git a/src/components/CreateBudgetModal.vue b/src/components/CreateBudgetModal.vue index c0d11d4..92a3122 100644 --- a/src/components/CreateBudgetModal.vue +++ b/src/components/CreateBudgetModal.vue @@ -32,7 +32,6 @@ const { t } = useI18n(); onMounted(() => { - console.log(props.budget); if(props.budget) { budgetForm.budget_id = props.budget._id; budgetForm.client = props.budget.client; @@ -116,10 +115,6 @@ client: null }) - // const total = computed(() => { - - // }); - const totalTravel = computed(() => { budgetForm.total_travel = budgetForm.warehouse_distance * 1 + budgetForm.delivery_distance * 1 + budgetForm.pickup_distance * 1; budgetForm.total_travel = isNaN(budgetForm.total_travel) ? 0.0 : budgetForm.total_travel; @@ -257,7 +252,6 @@