Merge pull request #1414 from openworld-community/demo

HOTFIX: Fix ld-json
openworld-community · Oct 5, 2024 · 2a562ac · 2a562ac
2 parents 7c61e76 + f2ec208
commit 2a562ac
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 24 deletions.
diff --git a/frontend/components/detailes/Image.vue b/frontend/components/detailes/Image.vue
@@ -1,6 +1,4 @@
 <script setup>
-import { SeoItempropGlobalEnum } from '../../constants/enums/seo';
-
 defineProps({
 	imageUrl: {
 		type: String,
@@ -13,18 +11,14 @@ defineProps({
 });
 </script>
 <template>
-	<div
-		class="event-image event-image__container"
-		:itemprop="SeoItempropGlobalEnum.IMAGE"
-	>
+	<div class="event-image event-image__container">
 		<img
 			v-if="imageUrl"
 			class="event-image__image"
 			:src="imageUrl"
 			width="350"
 			height="250"
 			:alt="altContent"
-			:itemprop="SeoItempropGlobalEnum.IMAGE"
 		/>
 		<img
 			v-else
@@ -33,7 +27,6 @@ defineProps({
 			width="350"
 			height="250"
 			alt=""
-			:itemprop="SeoItempropGlobalEnum.IMAGE"
 		/>
 	</div>
 </template>

diff --git a/frontend/components/detailes/Info.vue b/frontend/components/detailes/Info.vue
@@ -1,7 +1,6 @@
 <script setup lang="ts">
 import type { PropType } from 'vue';
 import type { EventOnPoster } from '../../../common/types';
-import { SeoItempropEventEnum } from '../../constants/enums/seo';
 import { PEREDELANO_CREATOR_ID } from '../../../common/const/eventTypes';
 
 const mobile = inject<boolean>('mobile');
@@ -61,14 +60,12 @@ defineProps({
 		<p
 			v-if="posterEvent.creatorId !== PEREDELANO_CREATOR_ID"
 			class="event-summary__description text3"
-			:itemprop="SeoItempropEventEnum.DESCRIPTION"
 		>
 			{{ posterEvent.description }}
 		</p>
 		<div
 			v-if="posterEvent.creatorId === PEREDELANO_CREATOR_ID"
 			class="event-summary__html-description"
-			:itemprop="SeoItempropEventEnum.DESCRIPTION"
 			v-html="useSanitizer(posterEvent.description)"
 		/>
 		<CommonButton

diff --git a/frontend/pages/event/[id].vue b/frontend/pages/event/[id].vue
@@ -1,7 +1,6 @@
 <script setup lang="ts">
 import { RoutePathEnum } from '@/constants/enums/route';
 import { trimString } from '../../utils/trimString';
-import { SeoItemTypeEnum } from '../../constants/enums/seo';
 
 import { apiRouter } from '../../composables/useApiRouter';
 
@@ -109,8 +108,6 @@ const onEditButtonClick = async () => {
 	<main
 		v-if="posterEvent"
 		class="event"
-		itemscope
-		:itemtype="SeoItemTypeEnum.EVENT"
 	>
 		<DetailesImage
 			:image-url="eventImage"

diff --git a/frontend/utils/dates.ts b/frontend/utils/dates.ts
@@ -165,7 +165,7 @@ export const convertEventDateToLocaleString = (
 };
 
 export const convertToISOString = (epoch: number, timezoneOffset?: string) => {
-	const result = dayjs(epoch).utc().format('YYYY-MM-DDTHH:mm:ss');
+	const result = dayjs(epoch).format('YYYY-MM-DDTHH:mm:ss');
 	return timezoneOffset ? `${result}${timezoneOffset}` : result;
 };
 
@@ -182,7 +182,7 @@ export const convertEventDateToISOString = (
 	} else {
 		time = epoch;
 
-		return convertToISOString(time);
+		return new Date(epoch).toISOString();
 	}
 };
 
@@ -193,11 +193,16 @@ export const getDatesDayDifference = (firstDate: Date, secondDate: Date): number
 	return Math.ceil(diffTime / day);
 };
 
-export const roundTime = (date, interval) => {
+export const roundTime = (date: number, interval: number) => {
 	return Math.ceil(new Date(date).getTime() / (interval * 60 * 1000)) * (interval * 60 * 1000);
 };
 
-export const formatDate = (date, isOnline, timezone, duration) => {
+export const formatDate = (
+	date: number,
+	isOnline: boolean,
+	timezone: Timezone,
+	duration: number
+) => {
 	if (duration) {
 		return `${convertEventDateToLocaleString(date, isOnline, timezone)} - 
 

diff --git a/frontend/utils/ld-json.ts b/frontend/utils/ld-json.ts
@@ -2,12 +2,9 @@ import { SEO_SCHEMA_BASE_URL, SeoItemTypeEnum } from '~/constants/enums/seo';
 import type { EventOnPoster } from '../../common/types';
 import { VITE_DOMAIN } from '~/constants/url';
 import { RoutePathEnum } from '~/constants/enums/route';
-import type { LocationQuery } from '#vue-router';
 import { convertEventDateToISOString } from './dates';
 
-
 export const getJSONEventList = (posterEvents: EventOnPoster[], locale: string, path: string) => {
-
 	return {
 		type: 'application/ld+json',
 		innerHTML: JSON.stringify({
@@ -32,8 +29,6 @@ export const getJSONEventList = (posterEvents: EventOnPoster[], locale: string,
 				'@type': 'SearchAction',
 				target: `${VITE_DOMAIN}${path}?{query}`,
 				query: 'required'
-
-
 			}
 		})
 	};
@@ -53,7 +48,7 @@ export const getJSONEvent = (posterEvent: EventOnPoster) => {
 			),
 			endDate: posterEvent.durationInSeconds
 				? convertEventDateToISOString(
-						posterEvent.date,
+						posterEvent.date + posterEvent.durationInSeconds * 1000,
 						posterEvent.isOnline,
 						posterEvent.timezone
 				  )