v6 update

This commit is contained in:
Mohit Panjwani
2022-01-10 16:06:17 +05:30
parent b770e6277f
commit bdea879273
722 changed files with 19047 additions and 9186 deletions

View File

@ -0,0 +1,282 @@
<template>
<form class="relative h-full mt-4" @submit.prevent="UpdateCustomerAddress">
<BaseCard>
<div class="mb-6">
<h6 class="font-bold text-left">
{{ $t('settings.menu_title.address_information') }}
</h6>
<p
class="mt-2 text-sm leading-snug text-left text-gray-500"
style="max-width: 680px"
>
{{ $t('settings.address_information.section_description') }}
</p>
</div>
<!-- Billing Address -->
<div class="grid grid-cols-5 gap-4 mb-8">
<h6 class="col-span-5 text-lg font-semibold text-left lg:col-span-1">
{{ $t('customers.billing_address') }}
</h6>
<div
class="grid col-span-5 lg:col-span-4 gap-y-6 gap-x-4 md:grid-cols-6"
>
<BaseInputGroup
:label="$t('customers.name')"
class="w-full md:col-span-3"
>
<BaseInput
v-model.trim="userStore.userForm.billing.name"
type="text"
class="w-full"
name="address_name"
/>
</BaseInputGroup>
<BaseInputGroup
:label="$t('customers.country')"
class="md:col-span-3"
>
<BaseMultiselect
v-model="userStore.userForm.billing.country_id"
value-prop="id"
label="name"
track-by="name"
resolve-on-load
searchable
:options="globalStore.countries"
:placeholder="$t('general.select_country')"
class="w-full"
/>
</BaseInputGroup>
<BaseInputGroup :label="$t('customers.state')" class="md:col-span-3">
<BaseInput
v-model="userStore.userForm.billing.state"
name="billing.state"
type="text"
/>
</BaseInputGroup>
<BaseInputGroup :label="$t('customers.city')" class="md:col-span-3">
<BaseInput
v-model="userStore.userForm.billing.city"
name="billing.city"
type="text"
/>
</BaseInputGroup>
<BaseInputGroup
:label="$t('customers.address')"
class="md:col-span-3"
>
<BaseTextarea
v-model.trim="userStore.userForm.billing.address_street_1"
:placeholder="$t('general.street_1')"
type="text"
name="billing_street1"
:container-class="`mt-3`"
/>
<BaseTextarea
v-model.trim="userStore.userForm.billing.address_street_2"
:placeholder="$t('general.street_2')"
type="text"
class="mt-3"
name="billing_street2"
:container-class="`mt-3`"
/>
</BaseInputGroup>
<div class="md:col-span-3">
<BaseInputGroup :label="$t('customers.phone')" class="text-left">
<BaseInput
v-model.trim="userStore.userForm.billing.phone"
type="text"
name="phone"
/>
</BaseInputGroup>
<BaseInputGroup
:label="$t('customers.zip_code')"
class="mt-2 text-left"
>
<BaseInput
v-model.trim="userStore.userForm.billing.zip"
type="text"
name="zip"
/>
</BaseInputGroup>
</div>
</div>
</div>
<BaseDivider class="mb-5 md:mb-8" />
<!-- Billing Address Copy Button -->
<div class="flex items-center justify-start mb-6 md:justify-end md:mb-0">
<div class="p-1">
<BaseButton
ref="sameAddress"
type="button"
@click="userStore.copyAddress(true)"
>
<template #left="slotProps">
<BaseIcon name="DocumentDuplicateIcon" :class="slotProps.class" />
</template>
{{ $t('customers.copy_billing_address') }}
</BaseButton>
</div>
</div>
<!-- Shipping Address -->
<div class="grid grid-cols-5 gap-4 mb-8">
<h6 class="col-span-5 text-lg font-semibold text-left lg:col-span-1">
{{ $t('customers.shipping_address') }}
</h6>
<div
v-if="userStore.userForm.shipping"
class="grid col-span-5 lg:col-span-4 gap-y-6 gap-x-4 md:grid-cols-6"
>
<BaseInputGroup :label="$t('customers.name')" class="md:col-span-3">
<BaseInput
v-model.trim="userStore.userForm.shipping.name"
type="text"
name="address_name"
/>
</BaseInputGroup>
<BaseInputGroup
:label="$t('customers.country')"
class="md:col-span-3"
>
<BaseMultiselect
v-model="userStore.userForm.shipping.country_id"
value-prop="id"
label="name"
track-by="name"
resolve-on-load
searchable
:options="globalStore.countries"
:placeholder="$t('general.select_country')"
class="w-full"
/>
</BaseInputGroup>
<BaseInputGroup :label="$t('customers.state')" class="md:col-span-3">
<BaseInput
v-model="userStore.userForm.shipping.state"
name="shipping.state"
type="text"
/>
</BaseInputGroup>
<BaseInputGroup :label="$t('customers.city')" class="md:col-span-3">
<BaseInput
v-model="userStore.userForm.shipping.city"
name="shipping.city"
type="text"
/>
</BaseInputGroup>
<BaseInputGroup
:label="$t('customers.address')"
class="md:col-span-3"
>
<BaseTextarea
v-model.trim="userStore.userForm.shipping.address_street_1"
type="text"
:placeholder="$t('general.street_1')"
name="shipping_street1"
/>
<BaseTextarea
v-model.trim="userStore.userForm.shipping.address_street_2"
type="text"
:placeholder="$t('general.street_2')"
name="shipping_street2"
class="mt-3"
/>
</BaseInputGroup>
<div class="md:col-span-3">
<BaseInputGroup :label="$t('customers.phone')" class="text-left">
<BaseInput
v-model.trim="userStore.userForm.shipping.phone"
type="text"
name="phone"
/>
</BaseInputGroup>
<BaseInputGroup
:label="$t('customers.zip_code')"
class="mt-2 text-left"
>
<BaseInput
v-model.trim="userStore.userForm.shipping.zip"
type="text"
name="zip"
/>
</BaseInputGroup>
</div>
</div>
</div>
<div class="flex items-center justify-end">
<BaseButton :loading="isSaving" :disabled="isSaving">
<template #left="slotProps">
<BaseIcon
v-if="!isSaving"
name="SaveIcon"
:class="slotProps.class"
/>
</template>
{{ $t('general.save') }}
</BaseButton>
</div>
</BaseCard>
</form>
</template>
<script setup>
import { useUserStore } from '@/scripts/customer/stores/user'
import { useGlobalStore } from '@/scripts/customer/stores/global'
import { useI18n } from 'vue-i18n'
import { useRoute } from 'vue-router'
import { ref } from 'vue'
//store
const userStore = useUserStore()
const route = useRoute()
const { tm, t } = useI18n()
const globalStore = useGlobalStore()
// local state
let isSaving = ref(false)
// created
globalStore.fetchCountries()
// methods
function UpdateCustomerAddress() {
isSaving.value = true
let data = userStore.userForm
userStore
.updateCurrentUser({
data,
message: tm('customers.address_updated_message'),
})
.then((res) => {
isSaving.value = false
})
.catch((err) => {
isSaving.value = false
})
}
</script>

View File

@ -0,0 +1,252 @@
<template>
<form class="relative h-full mt-4" @submit.prevent="updateCustomerData">
<BaseCard>
<div>
<h6 class="font-bold text-left">
{{ $t('settings.account_settings.account_settings') }}
</h6>
<p
class="mt-2 text-sm leading-snug text-left text-gray-500"
style="max-width: 680px"
>
{{ $t('settings.account_settings.section_description') }}
</p>
</div>
<div class="grid gap-6 sm:grid-col-1 md:grid-cols-2 mt-6">
<BaseInputGroup
:label="$tc('settings.account_settings.profile_picture')"
>
<BaseFileUploader
v-model="imgFiles"
:avatar="true"
accept="image/*"
@change="onFileInputChange"
@remove="onFileInputRemove"
/>
</BaseInputGroup>
<!-- Empty Column -->
<span></span>
<BaseInputGroup
:label="$tc('settings.account_settings.name')"
:error="
v$.userForm.name.$error && v$.userForm.name.$errors[0].$message
"
required
>
<BaseInput
v-model="userStore.userForm.name"
:invalid="v$.userForm.name.$error"
@input="v$.userForm.name.$touch()"
/>
</BaseInputGroup>
<BaseInputGroup
:label="$tc('settings.account_settings.email')"
:error="
v$.userForm.email.$error && v$.userForm.email.$errors[0].$message
"
required
>
<BaseInput
v-model="userStore.userForm.email"
:invalid="v$.userForm.email.$error"
@input="v$.userForm.email.$touch()"
/>
</BaseInputGroup>
<BaseInputGroup
:error="
v$.userForm.password.$error &&
v$.userForm.password.$errors[0].$message
"
:label="$tc('settings.account_settings.password')"
>
<BaseInput
v-model="userStore.userForm.password"
:type="isShowPassword ? 'text' : 'password'"
:invalid="v$.userForm.password.$error"
@input="v$.userForm.password.$touch()"
>
<template #right>
<BaseIcon
v-if="isShowPassword"
name="EyeOffIcon"
class="w-5 h-5 mr-1 text-gray-500 cursor-pointer"
@click="isShowPassword = !isShowPassword"
/>
<BaseIcon
v-else
name="EyeIcon"
class="w-5 h-5 mr-1 text-gray-500 cursor-pointer"
@click="isShowPassword = !isShowPassword"
/> </template
></BaseInput>
</BaseInputGroup>
<BaseInputGroup
:label="$tc('settings.account_settings.confirm_password')"
:error="
v$.userForm.confirm_password.$error &&
v$.userForm.confirm_password.$errors[0].$message
"
>
<BaseInput
v-model="userStore.userForm.confirm_password"
:type="isShowConfirmPassword ? 'text' : 'password'"
:invalid="v$.userForm.confirm_password.$error"
@input="v$.userForm.confirm_password.$touch()"
>
<template #right>
<BaseIcon
v-if="isShowConfirmPassword"
name="EyeOffIcon"
class="w-5 h-5 mr-1 text-gray-500 cursor-pointer"
@click="isShowConfirmPassword = !isShowConfirmPassword"
/>
<BaseIcon
v-else
name="EyeIcon"
class="w-5 h-5 mr-1 text-gray-500 cursor-pointer"
@click="isShowConfirmPassword = !isShowConfirmPassword"
/> </template
></BaseInput>
</BaseInputGroup>
</div>
<BaseButton :loading="isSaving" :disabled="isSaving" class="mt-6">
<template #left="slotProps">
<BaseIcon v-if="!isSaving" name="SaveIcon" :class="slotProps.class" />
</template>
{{ $t('general.save') }}
</BaseButton>
</BaseCard>
</form>
</template>
<script setup>
import { SaveIcon } from '@heroicons/vue/solid'
import { ref, computed } from 'vue'
import { useGlobalStore } from '@/scripts/customer/stores/global'
import { useUserStore } from '@/scripts/customer/stores/user'
import { useI18n } from 'vue-i18n'
import {
helpers,
sameAs,
email,
required,
minLength,
} from '@vuelidate/validators'
import { useVuelidate } from '@vuelidate/core'
import { useRoute } from 'vue-router'
const userStore = useUserStore()
const globalStore = useGlobalStore()
const route = useRoute()
const { t, tm } = useI18n()
// Local State
let imgFiles = ref([])
let isSaving = ref(false)
let avatarFileBlob = ref(null)
let isShowPassword = ref(false)
let isShowConfirmPassword = ref(false)
if (userStore.userForm.avatar) {
imgFiles.value.push({
image: userStore.userForm.avatar,
})
}
// Validation
const rules = computed(() => {
return {
userForm: {
name: {
required: helpers.withMessage(t('validation.required'), required),
minLength: helpers.withMessage(
t('validation.name_min_length', { count: 3 }),
minLength(3)
),
},
email: {
required: helpers.withMessage(t('validation.required'), required),
email: helpers.withMessage(t('validation.email_incorrect'), email),
},
password: {
minLength: helpers.withMessage(
t('validation.password_min_length', { count: 8 }),
minLength(8)
),
},
confirm_password: {
sameAsPassword: helpers.withMessage(
t('validation.password_incorrect'),
sameAs(userStore.userForm.password)
),
},
},
}
})
const v$ = useVuelidate(
rules,
computed(() => userStore)
)
// created
// methods
function onFileInputChange(fileName, file) {
avatarFileBlob.value = file
}
function onFileInputRemove() {
avatarFileBlob.value = null
}
function updateCustomerData() {
v$.value.userForm.$touch()
if (v$.value.userForm.$invalid) {
return true
}
isSaving.value = true
let data = new FormData()
data.append('name', userStore.userForm.name)
data.append('email', userStore.userForm.email)
if (
userStore.userForm.password != null &&
userStore.userForm.password !== undefined &&
userStore.userForm.password !== ''
) {
data.append('password', userStore.userForm.password)
}
if (avatarFileBlob.value) {
data.append('customer_avatar', avatarFileBlob.value)
}
userStore
.updateCurrentUser({
data,
message: tm('settings.account_settings.updated_message'),
})
.then((res) => {
if (res.data.data) {
isSaving.value = false
userStore.$patch((state) => {
state.userForm.password = ''
state.userForm.confirm_password = ''
})
}
})
.catch((error) => {
isSaving.value = false
})
}
</script>

View File

@ -0,0 +1,130 @@
<template>
<BasePage>
<BasePageHeader :title="$tc('settings.setting', 2)" class="pb-6">
<BaseBreadcrumb>
<BaseBreadcrumbItem
:title="$t('general.home')"
:to="`/${companySlug}/customer/dashboard`"
/>
<BaseBreadcrumbItem
:title="$tc('settings.setting', 2)"
:to="`/${companySlug}/customer/settings/customer-profile`"
active
/>
</BaseBreadcrumb>
</BasePageHeader>
<div class="w-full mb-6 select-wrapper xl:hidden">
<aside class="pb-3 lg:col-span-3">
<nav class="space-y-1">
<BaseList>
<BaseListItem
v-for="(menuItem, index) in menuItems"
:key="index"
:title="menuItem.title"
:to="menuItem.link"
:active="hasActiveUrl(menuItem.link)"
:index="index"
class="py-3"
>
<template #icon>
<component :is="menuItem.icon" class="h-5 w-6" />
</template>
</BaseListItem>
</BaseList>
</nav>
</aside>
</div>
<div class="flex">
<div class="hidden mt-1 xl:block min-w-[240px]">
<BaseList>
<BaseListItem
v-for="(menuItem, index) in menuItems"
:key="index"
:title="menuItem.title"
:to="menuItem.link"
:active="hasActiveUrl(menuItem.link)"
:index="index"
class="py-3"
>
<template #icon>
<component :is="menuItem.icon" class="h-5 w-6" />
</template>
</BaseListItem>
</BaseList>
</div>
<div class="w-full overflow-hidden">
<RouterView />
</div>
</div>
</BasePage>
</template>
<script setup>
import { ref, reactive, watchEffect, computed } from 'vue'
import BaseList from '@/scripts/components/list/BaseList.vue'
import BaseListItem from '@/scripts/components/list/BaseListItem.vue'
import { OfficeBuildingIcon, UserIcon } from '@heroicons/vue/outline'
import { useGlobalStore } from '@/scripts/customer/stores/global'
import { useI18n } from 'vue-i18n'
const { t } = useI18n()
//route
const { useRoute, useRouter } = window.VueRouter
const route = useRoute()
const router = useRouter()
const globalStore = useGlobalStore()
const companySlug = computed(() => {
return globalStore.companySlug
})
// local state
const { global } = window.i18n
let currentSetting = ref({})
let activeIndex = ref()
const menuItems = reactive([
{
link: `/${globalStore.companySlug}/customer/settings/customer-profile`,
title: t('settings.account_settings.account_settings'),
icon: UserIcon,
},
{
link: `/${globalStore.companySlug}/customer/settings/address-info`,
title: t('settings.menu_title.address_information'),
icon: OfficeBuildingIcon,
},
])
// watch
watchEffect(() => {
if (route.path === `/${globalStore.companySlug}/customer/settings`) {
router.push({ name: 'customer.profile' })
}
const menu = menuItems.find((item) => {
return item.link === route.path
})
currentSetting.value = { ...menu }
})
// computed props
const dropdownMenuItems = computed(() => {
return menuItems
})
// methods
function hasActiveUrl(url) {
return route.path.indexOf(url) > -1
}
function navigateToSetting(setting) {
return router.push(setting.link)
}
</script>