Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: product availability switch #213

Merged
merged 2 commits into from
Sep 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/food/app/components/CommandCenter/Header.vue
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,5 @@

<script setup lang="ts">
const { icons } = useAppConfig()
const { isNavbarOpened } = useCommandCenter()
const { isNavbarOpened } = useApp()
</script>
5 changes: 2 additions & 3 deletions apps/food/app/components/form/CreateMenuCategory.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
<template>
<form class="space-y-3" @submit="onSubmit">
<UiFormField :key="useId()" :value="menuId" hidden name="menuId" />

<UiFormField v-slot="{ componentField }" name="name">
<UiFormItem>
<div>
Expand Down Expand Up @@ -38,14 +36,15 @@ const { refresh: refreshChannelData } = await useChannel()
const formSchema = toTypedSchema(menuCategoryCreateSchema)
const { handleSubmit, handleReset } = useForm({
const { handleSubmit, handleReset, setFieldValue } = useForm({
validationSchema: formSchema,
})
watch(
() => isOpened,
() => {
handleReset()
setFieldValue('menuId', menuId)
},
)
Expand Down
5 changes: 2 additions & 3 deletions apps/food/app/components/form/CreateProduct.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
<template>
<form class="space-y-3" @submit="onSubmit">
<UiFormField :key="useId()" :value="categoryId" hidden name="categoryId" />

<UiFormField v-slot="{ componentField }" name="name">
<UiFormItem>
<div>
Expand Down Expand Up @@ -50,14 +48,15 @@ const { refresh: refreshChannelData } = await useChannel()

const formSchema = toTypedSchema(productCreateSchema)

const { handleSubmit, handleReset } = useForm({
const { handleSubmit, handleReset, setFieldValue } = useForm({
validationSchema: formSchema,
})

watch(
() => isOpened,
() => {
handleReset()
setFieldValue('categoryId', categoryId)
},
)

Expand Down
5 changes: 2 additions & 3 deletions apps/food/app/components/form/CreateProductVariant.vue
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
<template>
<form class="space-y-3" @submit="onSubmit">
<UiFormField :key="useId()" :value="productId" hidden name="productId" />

<UiFormField v-slot="{ componentField }" name="name">
<UiFormItem>
<div>
Expand Down Expand Up @@ -146,14 +144,15 @@ const { refresh: refreshProducts } = await useProduct()

const formSchema = toTypedSchema(productVariantCreateSchema)

const { handleSubmit, handleReset } = useForm({
const { handleSubmit, handleReset, setFieldValue } = useForm({
validationSchema: formSchema,
})

watch(
() => isOpened,
() => {
handleReset()
setFieldValue('productId', productId)
},
)

Expand Down
21 changes: 14 additions & 7 deletions apps/food/app/components/form/UpdateProduct.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<UiFormMessage />
</div>
<UiFormControl>
<UiInput :key="useId()" :default-value="product?.name" v-bind="componentField" />
<UiInput v-bind="componentField" />
</UiFormControl>
</UiFormItem>
</UiFormField>
Expand All @@ -19,7 +19,7 @@
<UiFormMessage />
</div>
<UiFormControl>
<UiInput :key="useId()" :default-value="product?.description" v-bind="componentField" />
<UiInput v-bind="componentField" />
</UiFormControl>
</UiFormItem>
</UiFormField>
Expand All @@ -31,7 +31,7 @@
<UiFormMessage />
</div>
<UiFormControl>
<UiInput :key="useId()" :default-value="product?.slug" v-bind="componentField" />
<UiInput v-bind="componentField" />
</UiFormControl>
</UiFormItem>
</UiFormField>
Expand All @@ -48,34 +48,41 @@ import { productUpdateSchema } from '~~/server/core/services/product'
import { useForm } from 'vee-validate'
import { useToast } from '~/components/ui/toast'

const { isOpened, product } = defineProps<{
const { isOpened, productId } = defineProps<{
isOpened: boolean
product: any
productId: string
}>()

const emit = defineEmits(['success'])
const { products } = await useProduct()
const product = computed(() => products.value?.find((p) => p.id === productId))

const { toast } = useToast()
const { refresh: refreshChannelData } = await useChannel()
const { refresh: refreshProducts } = await useProduct()

const formSchema = toTypedSchema(productUpdateSchema)

const { handleSubmit, handleReset } = useForm({
const { handleSubmit, handleReset, setValues } = useForm({
validationSchema: formSchema,
})

watch(
() => isOpened,
() => {
handleReset()
setValues({
name: product.value?.name,
description: product.value?.description,
slug: product.value?.slug,
})
},
)

const onSubmit = handleSubmit(async (values, { resetForm }) => {
const { data, error } = await useAsyncData(
'update-product',
() => $fetch(`/api/product/${product.id}`, {
() => $fetch(`/api/product/${product.value?.id}`, {
method: 'PATCH',
body: values,
}),
Expand Down
69 changes: 69 additions & 0 deletions apps/food/app/components/form/UpdateProductAvailability.vue
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
<template>
<form>
<div class="min-w-60 px-4 py-3 bg-neutral-50 rounded-2xl">
<div class="flex items-center gap-4">
<UiSwitch id="product-switch" :default-checked="isAvailableForPurchase" @update:checked="onSubmit()" />
<UiLabel for="product-switch" class="leading-tight">
{{ isAvailableForPurchase ? $t('center.product.available-for-purchase') : $t('center.product.not-available-for-purchase') }}
</UiLabel>
</div>
</div>
</form>
</template>

<script setup lang="ts">
import { toTypedSchema } from '@vee-validate/zod'
import { productUpdateSchema } from '~~/server/core/services/product'
import { useForm } from 'vee-validate'
import { useToast } from '~/components/ui/toast'

const { isAvailableForPurchase, productId } = defineProps<{
isAvailableForPurchase: boolean
productId: string
}>()

const emit = defineEmits(['success'])

const { toast } = useToast()
const { refresh: refreshChannelData } = await useChannel()
const { refresh: refreshProducts } = await useProduct()

const formSchema = toTypedSchema(productUpdateSchema)

const { handleSubmit, handleReset, setFieldValue } = useForm({
validationSchema: formSchema,
})

watch(
() => isAvailableForPurchase,
() => {
handleReset()
setFieldValue('isAvailableForPurchase', isAvailableForPurchase)
},
)

const onSubmit = handleSubmit(async (_, { resetForm }) => {
const { data, error } = await useAsyncData(
'update-product',
() => $fetch(`/api/product/${productId}`, {
method: 'PATCH',
body: {
isAvailableForPurchase: !isAvailableForPurchase,
},
}),
)

if (error.value) {
console.error(error.value)
toast({ title: 'Ошибка', description: '...' })
}

if (data.value) {
await refreshChannelData()
await refreshProducts()
emit('success')
toast({ title: 'Продукт обновлен!', description: 'Сейчас обновим данные.' })
resetForm()
}
})
</script>
28 changes: 19 additions & 9 deletions apps/food/app/components/form/UpdateProductVariant.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<UiFormMessage />
</div>
<UiFormControl>
<UiInput :key="useId()" :default-value="productVariant?.name" v-bind="componentField" placeholder="25 см, 6 шт, на традиционном тесте, и т.п." />
<UiInput v-bind="componentField" placeholder="25 см, 6 шт, на традиционном тесте, и т.п." />
</UiFormControl>
</UiFormItem>
</UiFormField>
Expand All @@ -19,7 +19,7 @@
<UiFormMessage />
</div>
<UiFormControl>
<UiInput :key="useId()" :default-value="productVariant?.gross" v-bind="componentField" type="number" step="any" placeholder="0.00" />
<UiInput v-bind="componentField" type="number" step="any" placeholder="0.00" />
</UiFormControl>
</UiFormItem>
</UiFormField>
Expand All @@ -32,7 +32,7 @@
<UiFormMessage />
</div>
<UiFormControl>
<UiInput :key="useId()" :default-value="productVariant?.weightValue" v-bind="componentField" type="number" step="any" />
<UiInput v-bind="componentField" type="number" step="any" />
</UiFormControl>
</UiFormItem>
</UiFormField>
Expand All @@ -43,7 +43,7 @@
<UiFormLabel>Ед. измерения</UiFormLabel>
<UiFormMessage />
</div>
<UiSelect v-bind="componentField" :key="useId()" :default-value="productVariant?.weightUnit">
<UiSelect v-bind="componentField">
<UiFormControl>
<UiSelectTrigger>
<UiSelectValue placeholder="Выберите" />
Expand Down Expand Up @@ -75,7 +75,7 @@
<UiFormMessage />
</div>
<UiFormControl>
<UiInput :key="useId()" :default-value="productVariant?.calories" v-bind="componentField" type="number" step="any" />
<UiInput v-bind="componentField" type="number" step="any" />
</UiFormControl>
</UiFormItem>
</UiFormField>
Expand All @@ -87,7 +87,7 @@
<UiFormMessage />
</div>
<UiFormControl>
<UiInput :key="useId()" :default-value="productVariant?.protein" v-bind="componentField" type="number" step="any" />
<UiInput v-bind="componentField" type="number" step="any" />
</UiFormControl>
</UiFormItem>
</UiFormField>
Expand All @@ -99,7 +99,7 @@
<UiFormMessage />
</div>
<UiFormControl>
<UiInput :key="useId()" :default-value="productVariant?.fat" v-bind="componentField" type="number" step="any" />
<UiInput v-bind="componentField" type="number" step="any" />
</UiFormControl>
</UiFormItem>
</UiFormField>
Expand All @@ -111,7 +111,7 @@
<UiFormMessage />
</div>
<UiFormControl>
<UiInput :key="useId()" :default-value="productVariant?.carbohydrate" v-bind="componentField" type="number" step="any" />
<UiInput v-bind="componentField" type="number" step="any" />
</UiFormControl>
</UiFormItem>
</UiFormField>
Expand Down Expand Up @@ -145,14 +145,24 @@ const { refresh: refreshProducts } = await useProduct()

const formSchema = toTypedSchema(productVariantUpdateSchema)

const { handleSubmit, handleReset } = useForm({
const { handleSubmit, handleReset, setValues } = useForm({
validationSchema: formSchema,
})

watch(
() => isOpened,
() => {
handleReset()
setValues({
name: productVariant?.name,
gross: productVariant?.gross,
weightValue: productVariant?.weightValue,
weightUnit: productVariant?.weightUnit,
calories: productVariant?.calories,
protein: productVariant?.protein,
fat: productVariant?.fat,
carbohydrate: productVariant?.carbohydrate,
})
},
)

Expand Down
3 changes: 0 additions & 3 deletions apps/food/app/composables/useCommandCenter.ts
Original file line number Diff line number Diff line change
@@ -1,21 +1,18 @@
function _useCommandCenter() {
const route = useRoute()

const isNavbarOpened = ref(false)
const isModalOpened = ref(false)
const searchQuery = ref('')

watch(
() => route.fullPath,
() => {
isNavbarOpened.value = false
isModalOpened.value = false
searchQuery.value = ''
},
)

return {
isNavbarOpened,
isModalOpened,
searchQuery,
}
Expand Down
6 changes: 5 additions & 1 deletion apps/food/app/locales/en-EN.json
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,10 @@
"welcome-message": "We've been waiting for you!",
"to-website": "To Website",
"search-label": "Find anything",
"product": {
"available-for-purchase": "Available for purchase",
"not-available-for-purchase": "Not available for purchase"
},
"menu": {
"dashboard": "Control Panel",
"menu": "Menu",
Expand Down Expand Up @@ -135,7 +139,7 @@
"product-variant": "Delete Product Variant"
},
"edit": {
"title": "Редактировать"
"title": "Edit"
}
},
"error": {
Expand Down
4 changes: 4 additions & 0 deletions apps/food/app/locales/ru-RU.json
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,10 @@
"welcome-message": "Мы вас заждались!",
"to-website": "К веб-сайту",
"search-label": "Найти что-нибудь",
"product": {
"available-for-purchase": "Доступен для покупки",
"not-available-for-purchase": "Недоступен для покупки"
},
"menu": {
"dashboard": "Панель управления",
"menu": "Меню",
Expand Down
Loading
Loading