From c102732b2d3c2653bd209256218a14410fad49a9 Mon Sep 17 00:00:00 2001
From: User <gajanan10@gmail.com>
Date: Thu, 18 May 2023 11:28:51 +0530
Subject: [PATCH] ui fixes

---
 .../gate/ResetPasswordComponent.vue           | 10 +++++--
 src/components/retailer/layout/Layout.vue     | 14 ++++-----
 src/routes/retailer/address_book.vue          | 30 +++++++++----------
 3 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/src/components/gate/ResetPasswordComponent.vue b/src/components/gate/ResetPasswordComponent.vue
index 1d2f179..5352c85 100644
--- a/src/components/gate/ResetPasswordComponent.vue
+++ b/src/components/gate/ResetPasswordComponent.vue
@@ -7,31 +7,35 @@
       <v-alert type="error" v-if="!!resetPasswordError">{{resetPasswordError}}</v-alert>
       <v-alert type="success" v-if="!!resetPasswordMessage">{{resetPasswordMessage}}</v-alert>
       <v-form ref="resetPassword"  v-on:submit.prevent="resetPassword" >
-          <v-text-field v-if="emailTextfield" label="Email Id" class="textfield-border" placeholder="Enter your email id" type="email" ref="email" v-model="email" :rules="emailRules" prepend-icon="mdi-email-outline">
+          <v-text-field v-if="emailTextfield" label="Email Id" variant="underlined" density="compact" class="textfield-border" placeholder="Enter your email id" type="email" ref="email" v-model="email" :rules="emailRules" prepend-icon="mdi-email-outline">
         </v-text-field>
 
         <v-text-field
           type="password"
-          class="textfield-border"
+          class="textfield-border mt-2"
           label="New Password"
           ref="newPassword"
           v-model="newPassword"
           @click="clear()"
           :rules="commonValidationRules.passwordRule"
           required
+          density="compact"
+          variant="underlined"
           prepend-icon="mdi-lock"
         >
         </v-text-field>
 
         <v-text-field
           type="password"
-          class="textfield-border"
+          class="textfield-border mt-2"
           label="Confirm Password"
           ref="confirmPassword"
           v-model="confirmPassword"
           :rules="[passwordConfirmationRule]"
           prepend-icon="mdi-lock"
           required
+          variant="underlined"
+          density="compact"
         >
         </v-text-field>
 
diff --git a/src/components/retailer/layout/Layout.vue b/src/components/retailer/layout/Layout.vue
index 5775537..2d4554d 100644
--- a/src/components/retailer/layout/Layout.vue
+++ b/src/components/retailer/layout/Layout.vue
@@ -1,15 +1,12 @@
 <template>
-  <div class="d-flex flex-column height-100">
-    
-    <span :class="showMenu ? 'sidebar-router-padding-open' : 'sidebar-router-padding-close'">
+  <div class="d-flex flex-column height-100">   
       
     <Header @action="onAction" />
-  </span>
+  
     <v-navigation-drawer
       v-model="showMenu"
       v-if="showMenu"
       :clipped="$vuetify.display.mdAndUp"
-      :permanent="showMenu"
       color="header-bg-color darken-3"
       class="header-bg-color text-white pa-4 mt-6"
     >
@@ -53,7 +50,7 @@
       </v-row>
     </v-navigation-drawer>
     
-    <v-content class="mt-10">
+    <v-content class="mt-10" :class="showMenu ? 'sidebar-router-padding-open' : 'sidebar-router-padding-close'">
       <router-view class="pa-4 mt-10" :class="showMenu ? 'sidebar-router-padding-open' : 'sidebar-router-padding-close'"/>
     </v-content>
      <FooterComponent />
@@ -134,11 +131,12 @@ export default {
     box-shadow: none !important;
 }
 .sidebar-router-padding-open {
-  margin:68px 16px 16px 264px;
+  margin:0 130px 16px 132px;   
 }
 .sidebar-router-padding-close {
-  margin:68px 16px 16px 16px;
+  margin:0 16px 16px 16px;  
 }
+
 </style>
 <style lang="scss">
 
diff --git a/src/routes/retailer/address_book.vue b/src/routes/retailer/address_book.vue
index b40d381..ce9b467 100644
--- a/src/routes/retailer/address_book.vue
+++ b/src/routes/retailer/address_book.vue
@@ -230,29 +230,29 @@
                         ref="firstName"
                         v-model="firstname"
                         color="primary"
-                    density="compact"
-                    variant="outlined"
+                        density="compact"
+                        variant="outlined"
                         :rules="textRules"
-                      ></v-text-field>
-                      <v-text-field
+                        ></v-text-field>
+                        <v-text-field
                         label="Last Name"
                         ref="lastName"
                         v-model="lastname"
                        color="primary"
-                    density="compact"
-                    variant="outlined"
+                       density="compact"
+                       variant="outlined"
                         required
                         :rules="textRules"
-                      ></v-text-field>
-                      <v-text-field
+                        ></v-text-field>
+                        <v-text-field
                         label="Company"
                         ref="company"
                         v-model="company"
                         color="primary"
-                    density="compact"
-                    variant="outlined"
-                      ></v-text-field>
-                      <vue-tel-input
+                        density="compact"
+                        variant="outlined"
+                         ></v-text-field>
+                        <vue-tel-input
                         type="number"
                         v-model="telephone"
                         :defaultCountry="setCountryCode"
@@ -262,8 +262,8 @@
                             : 'phonenumber-custom-input'
                         "
                         @input="validateNumber"
-                      ></vue-tel-input>
-                      <span
+                        ></vue-tel-input>
+                       <span
                         class="red--text caption ml-3"
                         v-show="phoneNumberError"
                         >This field is required</span
@@ -442,7 +442,7 @@ import MeVerifyAddressComponent from "@/components/retailer/address/MeVerifyAddr
 import { loginInterrupt } from "@/services/nav";
 import SnackbarComponent from "@/components/common/SnackbarComponent.vue";
 import ConfirmationDialog from "@/components/common/ConfirmationDialog.vue";
-import { VueTelInput } from "vue3-tel-input";
+import VueTelInput from 'vue-tel-input';
 //import BillingAddressComponent from "@/components/retailer/address/BillingAddressComponent.vue";
 
 import { createHelpers } from "vuex-map-fields";