ui fixes

src/plugins/vuetify/defaults.js

@@ -1,119 +0,0 @@
-export default {
-  VAlert: {
-    density: 'comfortable',
-  },
-  VAvatar: {
-    // ℹ️ Remove after next release
-    variant: 'flat',
-  },
-  VBadge: {
-    // set v-badge default color to primary
-    color: 'primary',
-  },
-  VBtn: {
-    // set v-btn default color to primary
-    color: 'primary',
-  },
-  VChip: {
-    elevation: 0,
-  },
-  VMenu: {
-    VList: {
-      density: 'compact',
-    },
-  },
-  VPagination: {
-    activeColor: 'primary',
-    density: 'comfortable',
-  },
-  VTabs: {
-    // set v-tabs default color to primary
-    color: 'primary',
-  },
-  VTooltip: {
-    // set v-tooltip default location to top
-    location: 'top',
-  },
-
-  // VList: {
-  //   VListItem: {
-  //     activeColor: 'primary',
-  //   },
-  // },
-  VCheckbox: {
-    // set v-checkbox default color to primary
-    color: 'primary',
-    density: 'comfortable',
-    hideDetails: 'auto',
-  },
-  VRadioGroup: {
-    color: 'primary',
-    density: 'comfortable',
-    hideDetails: 'auto',
-  },
-  VRadio: {
-    density: 'comfortable',
-    hideDetails: 'auto',
-  },
-  VSelect: {
-    variant: 'outlined',
-    density: 'comfortable',
-    color: 'primary',
-    hideDetails: 'auto',
-  },
-  VRangeSlider: {
-    // set v-range-slider default color to primary
-    color: 'primary',
-    density: 'comfortable',
-    thumbLabel: true,
-    hideDetails: 'auto',
-  },
-  VRating: {
-    // set v-rating default color to primary
-    color: 'warning',
-  },
-  VProgressCircular: {
-    // set v-progress-circular default color to primary
-    color: 'primary',
-  },
-  VSlider: {
-    // set v-slider default color to primary
-    color: 'primary',
-    hideDetails: 'auto',
-  },
-  VTextField: {
-    variant: 'outlined',
-    density: 'comfortable',
-    color: 'primary',
-    hideDetails: 'auto',
-  },
-  VAutocomplete: {
-    variant: 'outlined',
-    density: 'comfortable',
-    color: 'primary',
-    hideDetails: 'auto',
-  },
-  VCombobox: {
-    variant: 'outlined',
-    density: 'comfortable',
-    color: 'primary',
-    hideDetails: 'auto',
-  },
-  VFileInput: {
-    variant: 'outlined',
-    density: 'comfortable',
-    color: 'primary',
-    hideDetails: 'auto',
-  },
-  VTextarea: {
-    variant: 'outlined',
-    density: 'comfortable',
-    color: 'primary',
-    hideDetails: 'auto',
-  },
-  VSwitch: {
-    // set v-switch default color to primary
-    color: 'primary',
-    hideDetails: 'auto',
-  },
-}

src/plugins/vuetify/index.js

@@ -3,11 +3,12 @@ import { createVuetify } from "vuetify";
 import "@mdi/font/css/materialdesignicons.css";
 import "vuetify/styles";
 import { VDataTable } from 'vuetify/labs/VDataTable'
-import * as labs from 'vuetify/labs/components'
+ 
 import * as directives from 'vuetify/directives'
 import theme from './theme'
 import { VuetifyDateAdapter } from 'vuetify/labs/date/adapters/vuetify'
-
+import * as components from 'vuetify/components'
+import * as labsComponents from 'vuetify/labs/components'
 // Vuetify
 
 export default createVuetify({
@@ -16,7 +17,8 @@ export default createVuetify({
   directives,
     components: {
         VDataTable,
-        ...labs,
+        ...components,
+        ...labsComponents
       },
       date: {
         adapter: VuetifyDateAdapter,

src/routes/retailer/boxed_order_history.scss

@@ -7,24 +7,24 @@
   }
   // *********** data-table styling
 
-  .v-data-table-footer{
+  .set-table-content .v-data-table-footer{
     display: flex;
     justify-content: end;
     margin-top: 30px
   }
-  .v-input__control {
+  .set-table-content .v-input__control {
       padding-top: 2px;
       padding-bottom: 10px;
   }
-  .v-data-table-footer__items-per-page{
+  .set-table-content .v-data-table-footer__items-per-page{
     display: flex;
     margin-right: 10px;
   }
-  .v-data-table-footer__items-per-page > span{
+  .set-table-content .v-data-table-footer__items-per-page > span{
     margin-right: 10px;
     padding-top: 6px
   }
-  .v-data-table-footer__info{
+  .set-table-content .v-data-table-footer__info{
     padding-top: 7px;
   }
   .v-data-table-footer__pagination{

src/routes/retailer/boxed_order_history.vue

@@ -55,7 +55,6 @@
           variant="outlined"
           label="Created From"
           color="primary pt-0"
-
           >
           </v-text-field>
         </v-col>
@@ -174,23 +173,23 @@
                 :headers="headers"
                 :items="OrderHistory"
                 :items-per-page="10"
-                class="elevation-1"
+                class="elevation-1 set-table-content"
               >
                 <template v-slot:item.date="{ item }">
-                  <span>{{ isoStringToNormalDate(item.value.updatedAt) }}</span>
+                  <span>{{ isoStringToNormalDate(item.selectable.updatedAt) }}</span>
                 </template>
                 <template v-slot:item.order="{ item }">
-                  <span>{{ item.value.incrementId }}</span>
+                  <span>{{ item.selectable.incrementId }}</span>
                 </template>
                 
                 <template v-slot:item.salesrepname="{ item }">
                   <span>{{ userInfo.firstname + "" + userInfo.lastname }}</span>
                 </template>
                 <template v-slot:item.status="{ item }">
-                  <span>{{ item.value.status }}</span>
+                  <span>{{ item.selectable.status }}</span>
                 </template>
                 <template v-slot:item.POnumber="{ item }">
-                  <span>{{ item.value.payment.poNumber }}</span>
+                  <span>{{ item.selectable.payment.poNumber }}</span>
                 </template>
                   
                    <template v-slot:item.actions={item}>
@@ -207,8 +206,6 @@
                       </v-hover>
               
             </template>                 
-
-                 
               </v-data-table>
             </v-col>
           </v-row>

src/stores/gate/auth.module.js

@@ -63,11 +63,10 @@ export const auth = {
                 "newsletter": "",
                 "logged": false
             });
+             
         },
         login: async({ commit, state, dispatch }) => {
             try {
-                /* eslint-disable */
-
                 commit('inProgress', true);
                 const token = await doLogin(state.one);