separate pick and guest blocks

codercatdev · codercatdev · commit 3ebbbd0ce33b · 2022-06-26T15:42:08.000-04:00
diff --git a/frontend/main/src/layout/PostLayout.tsx b/frontend/main/src/layout/PostLayout.tsx
@@ -130,9 +130,15 @@ export default function PostLayout({
             <aside className="hidden float-right ml-2 xl:inline-block">
               {recents()}
             </aside>
+            <section className="guests">
+              {post?.guestBlocks && renderBlocks(post.guestBlocks)}
+            </section>
             <section className="content">
               {post?.blocks && renderBlocks(post.blocks)}
             </section>
+            <section className="picks">
+              {post?.pickBlocks && renderBlocks(post.pickBlocks)}
+            </section>
           </article>
         </div>
         <div className="inline-block w-full xl:ml-2 xl:hidden">{recents()}</div>
diff --git a/frontend/main/src/models/post.model.ts b/frontend/main/src/models/post.model.ts
@@ -24,7 +24,9 @@ export interface Post {
   category?: string[] | null; //If null this will be auto assigned 'Unassigned'
   tag?: string[] | null;
   format?: PostFormat; //If null this will be auto assigned 'standard'
+  guestBlocks?: NotionBlock[];
   blocks?: NotionBlock[];
+  pickBlocks?: NotionBlock[];
   slug: string;
   historyId?: string;
   postId?: string;
diff --git a/frontend/main/src/services/notion.server.ts b/frontend/main/src/services/notion.server.ts
@@ -818,11 +818,14 @@ export const getPurrfectStreamPageBlocks = async ({
       queryPurrfectGuestsByStreamId(id),
     ]);
 
+  let guestBlocks: NotionBlock[] = [];
   let blocks: NotionBlock[] = [];
+  let pickBlocks: NotionBlock[] = [];
+
   // Build the markdown for page
   for (const guest of purrfectGuests.results) {
     const b = await getBlocks(guest.id);
-    blocks = [...blocks, ...b];
+    guestBlocks = [...guestBlocks, ...b];
   }
   for (const page of raw.results) {
     blocks = [...blocks, ...(await getChildBlocks(await getBlocks(page.id)))];
@@ -866,7 +869,6 @@ export const getPurrfectStreamPageBlocks = async ({
       picks = [...picks, guest] as any;
     }
   }
-  let pickBlocks: any[] = [];
   if (picks.length > 0) {
     pickBlocks = [
       formatBlock({ type: 'heading_2', content: 'Purrfect Picks' }),
@@ -888,11 +890,12 @@ export const getPurrfectStreamPageBlocks = async ({
       });
     });
   }
-  blocks = [...blocks, ...pickBlocks];
 
   return {
     ...raw.results[0],
+    guestBlocks,
     blocks,
+    pickBlocks,
   };
 };
 
