sidharth.kothari
/
retailer-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes

This commit is contained in:
rakesh 2023-05-11 17:09:26 +05:30
parent 27246a07b8
commit b2bd44f55b
9 changed files with 36 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
public/static/js/craneRetailerCatalog.js
View File

File diff suppressed because one or more lines are too long

4
public/static/js/magentoCmsCache.js
View File

File diff suppressed because one or more lines are too long

19
src/components/gate/ForgotPasswordComponent.vue
View File

@ -15,20 +15,25 @@
v-model="email"
:rules="emailRules"
prepend-icon="mdi-email-outline"
color="primary"
density="compact"
variant="underlined"
>
</v-text-field>
<div class="mt-5 text-center">
<v-hover v-slot:default="{ hover }">
<v-hover v-slot="{ isHovering, props }">
<v-btn
large
block
:outlined="hover ? false:true"
:variant="isHovering ? 'flat' : 'outlined'"
:color="hover ? 'primary' : 'primary'"
class="mt-6 body"
tile
@click="resetPassword"
:disabled="inProgress"
v-bind="props"
rounded="0"
><v-progress-circular :size="20" color="primary" indeterminate v-if="inProgress"></v-progress-circular>Reset Password</v-btn>
</v-hover>
</div>
@ -36,8 +41,8 @@
<v-row>
<v-col cols="12">
Already have a account sign in here
<v-hover v-slot:default="{ hover }">
<router-link class="text-decoration-none" :to="{name:'LoginPage'}" :class="hover ? 'content-link-hover-color' : 'primary--text'">Sign In</router-link>
<v-hover v-slot="{ isHovering }">
<router-link class="text-decoration-none" :to="{name:'SignInPage'}" :class="isHovering ? 'content-link-hover-color' : 'primary--text'">Sign In</router-link>
</v-hover>
</v-col>
</v-row>
@ -71,9 +76,11 @@ export default {
])
},
methods: {
resetPassword(e) {
async resetPassword(e) {
e.preventDefault();
if (this.$refs.forgotPassword.validate()) {
let validate = await this.$refs.forgotPassword.validate()
if (validate && validate.valid) {
this.$store
.dispatch("registration/forgotPassword")
.then(data => {

13
src/components/gate/SignInComponent.vue
View File

@ -6,12 +6,12 @@
<v-card-text>
<v-alert class="word-break" type="error" v-if="!!errorMessage">{{errorMessage}}</v-alert>
<v-alert class="word-break" type="success" v-if="!!signInMessage">{{signInMessage}}</v-alert>
<v-form ref="siginForm" id=signin-form @submit.prevent="signIn">
<v-text-field label="Email Id" density="compact" class="textfield-border" placeholder="Enter your email id" type="email" ref="email" v-model="email" :rules="emailRules" prepend-icon="mdi-email-outline" variant="underlined">
<v-form ref="siginForm" id=signin-form @submit.prevent="signIn" class="mt-3">
<v-text-field label="Email Id" density="compact" color="primary" placeholder="Enter your email id" type="email" ref="email" v-model="email" :rules="emailRules" prepend-icon="mdi-email-outline" variant="underlined">
</v-text-field>
<v-text-field
<v-text-field
type="password"
class="textfield-border"
color="primary"
label="Password"
placeholder="Enter your password"
ref="password"
@ -91,8 +91,9 @@ export default {
])
},
methods: {
signIn() {
if (this.$refs.siginForm.validate()) {
async signIn() {
let validate = await this.$refs.siginForm.validate()
if (validate && validate.valid) {
this.$store.dispatch("auth/login");
}
}

10
src/components/retailer/layout/Layout.vue
View File

@ -7,7 +7,7 @@
:clipped="$vuetify.display.mdAndUp"
app
color="header-bg-color darken-3"
class=" bg-indigo text-white pa-4 mt-6"
class="header-bg-color text-white pa-4 mt-6"
>
<v-row>
<v-col cols="12" class="pa-0">
@ -49,8 +49,8 @@
</v-row>
</v-navigation-drawer>
<v-content>
<router-view class="pa-4" />
<v-content class="mt-10">
<router-view class="pa-4 mt-10" />
</v-content>
<FooterComponent />
@ -125,6 +125,10 @@ export default {
background-color: #fff !important;
border-color: #fff !important;
}
.header-bg-color{
background-color: #2c50da!important;
box-shadow: none !important;
}
</style>
<style lang="scss">
</style>

2
src/components/retailer/layout/header/Header.scss
View File

@ -47,7 +47,7 @@
box-shadow: none;
}
.header-background-color{
background-color: #2C50DA !important;
background-color: #2c50da!important;
box-shadow: none !important;
}
// .custom-menu:hover::after {

2
src/components/retailer/layout/header/Header.vue
View File

@ -4,7 +4,7 @@
app
color="header-background-color darken-3"
dark
class=" bg-indigo text-white pa-4"
class="header-background-color text-white pa-3"
>
<v-col class="d-flex justify-start pa-0">
<v-app-bar-nav-icon @click="menuAction()" class="header-buttons" />

51
src/plugins/vuetify/theme.js
View File

@ -5,54 +5,9 @@ const theme = {
light: {
dark: false,
colors: {
'primary': '#9155FD',
'secondary': '#8A8D93',
'on-secondary': '#fff',
'success': '#56CA00',
'info': '#16B1FF',
'warning': '#FFB400',
'error': '#FF4C51',
'on-primary': '#FFFFFF',
'on-success': '#FFFFFF',
'on-warning': '#FFFFFF',
'background': '#F4F5FA',
'on-background': '#3A3541',
'on-surface': '#3A3541',
'grey-50': '#FAFAFA',
'grey-100': '#F5F5F5',
'grey-200': '#EEEEEE',
'grey-300': '#E0E0E0',
'grey-400': '#BDBDBD',
'grey-500': '#9E9E9E',
'grey-600': '#757575',
'grey-700': '#616161',
'grey-800': '#424242',
'grey-900': '#212121',
'primary': '#2c50da',
},
variables: {
'border-color': '#3A3541',
'medium-emphasis-opacity': 0.68,
// Shadows
'shadow-key-umbra-opacity': 'rgba(var(--v-theme-on-surface), 0.08)',
'shadow-key-penumbra-opacity': 'rgba(var(--v-theme-on-surface), 0.12)',
'shadow-key-ambient-opacity': 'rgba(var(--v-theme-on-surface), 0.04)',
},
},
dark: {
dark: false,
colors: {
'primary': '#2196f3',
'secondary': '#8A8D93',
'success': '#56CA00',
'info': '#16B1FF',
'warning': '#FFB400',
'error': '#FF4C51',
},
},
}
},
}
export default theme
export default theme

2
src/routes/gate/forgot.password.vue
View File

@ -4,7 +4,7 @@
</div>
</template>
<script>
import ForgotPasswordComponent from "../../components/gate/ForgotPasswordComponent";
import ForgotPasswordComponent from "@/components/gate/ForgotPasswordComponent.vue";
export default {
name: "ForgotPasswordPage",
components: {