diff --git a/components.d.ts b/components.d.ts index c7442fe..074ebb5 100644 --- a/components.d.ts +++ b/components.d.ts @@ -11,7 +11,8 @@ declare module 'vue' { Checkbox: typeof import('primevue/checkbox')['default'] ContactInfo: typeof import('./src/components/read/ReadContactInfo.vue')['default'] CreateActionsSection: typeof import('./src/components/create/CreateActionsSection.vue')['default'] - CreateDeliverySection: typeof import('./src/components/create/CreateDeliverySection.vue')['default'] + CreateDeliverySection: typeof import('./src/components/create/CreateMessageDeliveryMethodSection.vue')['default'] + CreateMessageDeliveryMethodSection: typeof import('./src/components/create/CreateMessageDeliveryMethodSection.vue')['default'] CreateMessagesSection: typeof import('./src/components/create/CreateMessagesSection.vue')['default'] CreateNameSection: typeof import('./src/components/create/CreateNameSection.vue')['default'] CreatePlacementSection: typeof import('./src/components/create/CreatePlacementSection.vue')['default'] diff --git a/src/api/qrCode.ts b/src/api/qrCode.ts index 2b489b2..930ba5e 100644 --- a/src/api/qrCode.ts +++ b/src/api/qrCode.ts @@ -6,7 +6,7 @@ const EPOHE = 1731661630981 export const createQrCodeDocument = async ( qrCodeDocPartial: Pick< QRCodeDocument, - 'name' | 'deliveryMethod' | 'placement' | 'actions' | 'user_uuid' | 'predefinedMessage' + 'name' | 'placement' | 'actions' | 'user_uuid' | 'predefinedMessage' | 'messageDeliveryMethod' >, ) => { const uri = Math.abs(Date.now() - EPOHE).toString(36) diff --git a/src/components/create/CreateDeliverySection.vue b/src/components/create/CreateDeliverySection.vue deleted file mode 100644 index 7481002..0000000 --- a/src/components/create/CreateDeliverySection.vue +++ /dev/null @@ -1,32 +0,0 @@ - - - diff --git a/src/components/create/CreateMessageDeliveryMethodSection.vue b/src/components/create/CreateMessageDeliveryMethodSection.vue new file mode 100644 index 0000000..6ef0151 --- /dev/null +++ b/src/components/create/CreateMessageDeliveryMethodSection.vue @@ -0,0 +1,59 @@ + + + diff --git a/src/components/create/CreateSummarySection.vue b/src/components/create/CreateSummarySection.vue index 81af657..ddd8af8 100644 --- a/src/components/create/CreateSummarySection.vue +++ b/src/components/create/CreateSummarySection.vue @@ -27,10 +27,10 @@ import { createQrCodeDocument } from '@/api/qrCode' const router = useRouter() -const { placement, actions, deliveryMethod, user_uuid, predefinedMessage } = defineProps<{ +const { placement, actions, messageDeliveryMethod, user_uuid, predefinedMessage } = defineProps<{ placement: QRCodeDocument['placement'] actions: QRCodeDocument['actions'] - deliveryMethod: QRCodeDocument['deliveryMethod'] + messageDeliveryMethod: QRCodeDocument['messageDeliveryMethod'] | undefined user_uuid: QRCodeDocument['user_uuid'] predefinedMessage: QRCodeDocument['predefinedMessage'] | undefined }>() @@ -42,10 +42,10 @@ async function saveQRCode() { try { const qrCodeDocument = await createQrCodeDocument({ name: name.value, - deliveryMethod, placement, actions, user_uuid, + messageDeliveryMethod, predefinedMessage, }) diff --git a/src/types/DBDocumentTypes/QRCodeDocument.ts b/src/types/DBDocumentTypes/QRCodeDocument.ts index 89f857a..c8dae01 100644 --- a/src/types/DBDocumentTypes/QRCodeDocument.ts +++ b/src/types/DBDocumentTypes/QRCodeDocument.ts @@ -20,7 +20,7 @@ export interface QRCodeDocument extends BaseDocument { /** Название объекта, для которого создан QR‑код, например "Мой автомобиль" */ name: string - deliveryMethod: 'telegram' | 'webPushSubscription' + messageDeliveryMethod: 'telegram' | 'webPushSubscription' /** Тип объекта, для которого создан QR‑код, например "car" */ placement: 'car' | 'pet' | 'door' | 'store' | 'restaurant_table' | 'other' diff --git a/src/views/CreateView.vue b/src/views/CreateView.vue index fdbc4bc..520c6d6 100644 --- a/src/views/CreateView.vue +++ b/src/views/CreateView.vue @@ -26,16 +26,16 @@ v-if="selectedActions.includes('sendMessage')" :isActive="activeSteps.includes('delivery')" > - @@ -45,7 +45,7 @@ @@ -59,13 +59,14 @@