Browse Source

ajustes finais layout e fluxo login

Gustavo Zanatta 2 ngày trước cách đây
mục cha
commit
f13bc6726c
2 tập tin đã thay đổi với 39 bổ sung36 xóa
  1. 3 1
      src/pages/dashboard/DashboardPage.vue
  2. 36 35
      src/pages/schedules/SobMedidaPage.vue

+ 3 - 1
src/pages/dashboard/DashboardPage.vue

@@ -22,7 +22,7 @@
       <DashboardTodaySchedules v-if="todaySchedules.length > 0" :data="todaySchedules" @rate="openRatingDialog" />
       <DashboardScrollAreaSchedules />
       <DashboardClientProposals v-if="clientProposals.length > 0" :data="clientProposals" @refresh-data="reloadDashboard" />
-      <DashboardPendingCustomSchedules v-if="clientProposals.length === 0" />
+      <DashboardPendingCustomSchedules v-if="customSchedulesNoProposals.length > 0" />
       <DashboardNextSchedules v-if="nextSchedules.length > 0" :data="nextSchedules" @view-details="openNextScheduleDialog" />
       <DashboardLastDoneSchedules v-if="lastDoneSchedules.length > 0" :data="lastDoneSchedules" />
       <DashboardFavoriteProviders v-if="favoriteProviders.length > 0" :data="favoriteProviders" />
@@ -67,6 +67,7 @@ const summaryInfos = ref({});
 const pendingSchedules = ref([]);
 const nextSchedules = ref([]);
 const clientProposals = ref([]);
+const customSchedulesNoProposals = ref([]);
 const lastDoneSchedules = ref([]);
 const favoriteProviders = ref([]);
 const providersClose = ref([]);
@@ -98,6 +99,7 @@ const reloadDashboard = async () => {
     favoriteProviders.value = response.favoriteProviders ?? [];
     providersClose.value = response.providersClose ?? [];
     clientProposals.value = response.schedulesProposals ?? [];
+    customSchedulesNoProposals.value = response.customSchedulesNoProposals ?? [];
     todaySchedules.value = response.todaySchedules ?? [];
     notifications.value = response.notifications ?? [];
     hasPaymentMethods.value = response.has_payment_methods ?? true;

+ 36 - 35
src/pages/schedules/SobMedidaPage.vue

@@ -155,16 +155,16 @@
         {{ $t('sob_medida.date_and_time') }}
       </div>
 
-      <q-card bordered class="date-card">
+      <div class="calendar-custom shadow-card">
         <q-date
           v-model="selectedDate"
           minimal
           square
           color="purple"
-          class="full-width figma-date calendar-custom"
+          class="full-width figma-date"
           :options="dateOptions"
         />
-      </q-card>
+      </div>
     </div>
   </q-page>
 </template>
@@ -346,6 +346,8 @@ onMounted(async () => {
 .section-title {
   color: #7b61ff;
   margin-bottom: 16px;
+  margin-left: 16px;
+  margin-right: 16px;
 }
 
 .options-grid {
@@ -413,6 +415,13 @@ onMounted(async () => {
   background: #fff;
 }
 
+.calendar-custom {
+  border-radius: 20px;
+  overflow: hidden;
+  background: white;
+  margin: 16px 20px;
+}
+
 
 .range-container {
   position: relative;
@@ -567,31 +576,35 @@ onMounted(async () => {
 }
 
 .calendar-custom {
-  border-radius: 20px;
-  background-color: white !important;
+  :deep(.q-date) {
+    background: white;
+    width: 100%;
+  }
 
-  :deep(.q-date__main) {
-    background-color: white !important;
+  :deep(.q-date__calendar-item--out) {
+    color: #CBD5E1 !important;
+    opacity: 1 !important;
   }
 
-  :deep(.q-date__content) {
-    background-color: white !important;
+  :deep(.q-date__calendar-item--passive) {
+    color: #CBD5E1 !important;
+    opacity: 1 !important;
   }
 
-  :deep(.q-date__calendar) {
-    background-color: white !important;
+  :deep(.q-date__calendar-days .q-btn.disabled .q-btn__content),
+  :deep(.q-date__calendar-days .q-btn[disabled] .q-btn__content) {
+    color: #CBD5E1 !important;
+    opacity: 1 !important;
   }
 
-  :deep(.q-date__calendar-item--out) {
-    .q-btn__content {
-      color: #CBD5E1 !important;
-    }
+  :deep(.q-date__calendar-days .q-btn.disabled),
+  :deep(.q-date__calendar-days .q-btn[disabled]) {
+    opacity: 1 !important;
   }
 
   :deep(.q-date__calendar-days .q-btn__content) {
-    font-family: 'Inter', sans-serif;
     font-weight: 500;
-    color: #1E293B;
+    color: #1E293B !important;
   }
 
   :deep(.q-date__calendar-weekdays > div) {
@@ -601,18 +614,8 @@ onMounted(async () => {
   }
 
   :deep(.q-date__navigation) {
-    .q-btn {
-      color: #1E293B !important;
-    }
-    .q-btn__content {
-      color: #1E293B !important;
-    }
-  }
-
-  :deep(.q-date__nav-btn-month),
-  :deep(.q-date__nav-btn-year) {
-    color: #6366F1 !important;
-    font-weight: 700;
+    .q-btn { color: #6366F1 !important; }
+    .q-btn__content { color: #6366F1 !important; }
   }
 
   :deep(.q-date__event) {
@@ -639,16 +642,14 @@ onMounted(async () => {
     }
   }
 
-  :deep(.q-date__view--months),
-  :deep(.q-date__view--years) {
-    .q-btn {
-      color: #1E293B !important;
-    }
+  :deep(.q-date__view--months .q-btn),
+  :deep(.q-date__view--years .q-btn) {
+    color: #6366F1 !important;
   }
 }
 
 
-/* 🔥 labels pretas */
+/* labels pretas */
 :deep(.q-radio__label),
 :deep(.q-checkbox__label) {
   color: #000 !important;