Merge pull request #13 from shaniit-org/dev

update on related details issue
shaniit-org · Nov 25, 2023 · 692525e · 692525e
2 parents 431fc21 + d5e2da9
commit 692525e
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 13 deletions.
diff --git a/src/lib/components/common/RelatedArticle.svelte b/src/lib/components/common/RelatedArticle.svelte
@@ -1,5 +1,6 @@
 <script>
 	import NewsCard from '$lib/components/common/NewsCard.svelte';
+	import EventCard from './EventCard.svelte';
 	/** @type {import('../../types').RelatedArticle[] | undefined} */
 	export let data;
 </script>
@@ -10,7 +11,12 @@
 			<h3 class="text-xl mb-4">Related Articles</h3>
 			<div class="grid grid-cols-1 md:grid-cols-3 lg:grid-cols-4 gap-4 pb-12">
 				{#each data as itm}
-					<NewsCard data={itm} />
+					{#if itm._type == 'event'}
+						<EventCard data={itm} />
+					{/if}
+					{#if itm._type != 'event'}
+						<NewsCard data={itm} />
+					{/if}
 				{/each}
 			</div>
 		</div>

diff --git a/src/routes/events/[slug]/+page.js b/src/routes/events/[slug]/+page.js
@@ -4,6 +4,7 @@ import { getPageData } from '$lib/sanity/query';
 const query = `*[_type =="event" && slug.current==$slug][0]{
     ...,
       "related": *[_type == "event" && _id != ^._id && count(categories[@._ref in ^.^.categories[]._ref]) > 0] | order(publishedAt desc, _createdAt desc) [0..2] {
+          _type,
          title,
             coverImage,
          _id,
@@ -16,16 +17,16 @@ const query = `*[_type =="event" && slug.current==$slug][0]{
  * @type {import('@sveltejs/kit').Load}
  */
 export const load = async ({ params }) => {
-	/** @type {string} */
-	if (params.slug) {
-		/**
-		 * @type {import('$lib/types').EventDetail}
-		 */
-		const data = await getPageData(query, {
-			slug: params.slug
-		});
-		if (data) return { data };
-		else throw error(404, 'not found');
-	}
-	throw error(404, 'not found');
+    /** @type {string} */
+    if (params.slug) {
+        /**
+         * @type {import('$lib/types').EventDetail}
+         */
+        const data = await getPageData(query, {
+            slug: params.slug
+        });
+        if (data) return { data };
+        else throw error(404, 'not found');
+    }
+    throw error(404, 'not found');
 };