From c818a442cae6c5d8d1f4c50fc04580b75a0fbc8a Mon Sep 17 00:00:00 2001 From: User Date: Thu, 8 Jun 2023 16:35:03 +0530 Subject: [PATCH] ui fixes --- src/plugins/vuetify/defaults.js | 119 ------------------- src/plugins/vuetify/index.js | 8 +- src/routes/retailer/boxed_order_history.scss | 10 +- src/routes/retailer/boxed_order_history.vue | 17 ++- src/stores/gate/auth.module.js | 3 +- 5 files changed, 18 insertions(+), 139 deletions(-) delete mode 100644 src/plugins/vuetify/defaults.js diff --git a/src/plugins/vuetify/defaults.js b/src/plugins/vuetify/defaults.js deleted file mode 100644 index 572be5e..0000000 --- a/src/plugins/vuetify/defaults.js +++ /dev/null @@ -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', - }, -} diff --git a/src/plugins/vuetify/index.js b/src/plugins/vuetify/index.js index 5dc4fe7..3f40036 100644 --- a/src/plugins/vuetify/index.js +++ b/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, diff --git a/src/routes/retailer/boxed_order_history.scss b/src/routes/retailer/boxed_order_history.scss index 44fa73a..fb376dd 100644 --- a/src/routes/retailer/boxed_order_history.scss +++ b/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{ diff --git a/src/routes/retailer/boxed_order_history.vue b/src/routes/retailer/boxed_order_history.vue index 749fc49..c204e93 100644 --- a/src/routes/retailer/boxed_order_history.vue +++ b/src/routes/retailer/boxed_order_history.vue @@ -55,7 +55,6 @@ variant="outlined" label="Created From" color="primary pt-0" - > @@ -174,23 +173,23 @@ :headers="headers" :items="OrderHistory" :items-per-page="10" - class="elevation-1" + class="elevation-1 set-table-content" > - - + - + diff --git a/src/stores/gate/auth.module.js b/src/stores/gate/auth.module.js index 940d91c..e471200 100644 --- a/src/stores/gate/auth.module.js +++ b/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);