add default images

codercatdev · codercatdev · commit 22a0499ff20a · 2022-06-24T09:05:20.000-04:00
diff --git a/frontend/main/src/components/PostMedia.tsx b/frontend/main/src/components/PostMedia.tsx
@@ -23,7 +23,7 @@ export default function PostMedia({
       return false;
     }
   };
-
+  console.log(post);
   return (
     <>
       {post?.coverVideo && Object.keys(post.coverVideo).length ? (
@@ -82,6 +82,17 @@ export default function PostMedia({
               layout="responsive"
               priority
             />
+          ) : !noImage &&
+            (post?.cover?.external?.url || post?.cover?.file?.url) ? (
+            <Image
+              loader={({ src }) => src}
+              src={post?.cover?.external?.url || post?.cover?.file?.url || ''}
+              alt={post.title}
+              width="480"
+              height="270"
+              layout="responsive"
+              priority
+            />
           ) : (
             <></>
           )}
diff --git a/frontend/main/src/components/notion-custom-blocks/RenderBlocks.tsx b/frontend/main/src/components/notion-custom-blocks/RenderBlocks.tsx
@@ -35,7 +35,7 @@ const myMapper = {
         ].includes(media?.src) ? (
           <Image
             className={`${className || ''} object-contain `}
-            src={getCloudinaryPublicId(media?.src?.split('/'))}
+            src={getCloudinaryPublicId(media?.src)}
             alt={media?.alt || media?.name || ''}
             layout="fill"
             height="100%"
diff --git a/frontend/main/src/models/post.model.ts b/frontend/main/src/models/post.model.ts
@@ -28,6 +28,14 @@ export interface Post {
   slug: string;
   historyId?: string;
   postId?: string;
+  cover?: {
+    external?: {
+      url: string;
+    };
+    file?: {
+      url: string;
+    };
+  };
   coverPhoto?: CoverMedia;
   coverVideo?: CoverMedia;
   sections?: Section[];
diff --git a/frontend/main/src/services/notion.server.ts b/frontend/main/src/services/notion.server.ts
@@ -196,7 +196,7 @@ const formatPost = async (
       authors.push(author);
     }
   }
-  let coverPublicId = getCloudinaryPublicId(q?.cover?.external?.url.split('/'));
+  let coverPublicId = getCloudinaryPublicId(q?.cover?.external?.url);
   post = {
     ...post,
     _id: q?.id ? q.id : null,
diff --git a/frontend/main/src/utils/cloudinary/cloudinary.ts b/frontend/main/src/utils/cloudinary/cloudinary.ts
@@ -1,5 +1,18 @@
-export const getCloudinaryPublicId = (coverSegments: string[]): string => {
+export const getCloudinaryPublicId = (cover: string): string => {
   let coverPublicId = '';
+
+  const domains = [
+    'main-codingcatdev-photo',
+    'ccd-cloudinary',
+    'dev-codingcatdev-photo',
+  ];
+
+  if (!domains.some((d) => cover?.includes(d))) {
+    return coverPublicId;
+  }
+
+  const coverSegments = cover?.split('/');
+
   for (let i = coverSegments?.length; i--; i === 0) {
     const segment = coverSegments.at(i);
     if (

Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ const formatPost = async (`
`196`	`196`	`authors.push(author);`
`197`	`197`	`}`
`198`	`198`	`}`
`199`		`- let coverPublicId = getCloudinaryPublicId(q?.cover?.external?.url.split('/'));`
	`199`	`+ let coverPublicId = getCloudinaryPublicId(q?.cover?.external?.url);`
`200`	`200`	`post = {`
`201`	`201`	`...post,`
`202`	`202`	`_id: q?.id ? q.id : null,`