Merge pull request #6 from subhendupsingh/dev

minor bug fixes, style improvements

Author: subhendupsingh

package-lock.json

@@ -1,6 +1,6 @@
 {
 	"name": "sveltekit-notion-blog",
-	"version": "0.1.4",
+	"version": "0.1.6",
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build && npm run package",
@@ -10,7 +10,10 @@
 		"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json",
 		"check:watch": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json --watch",
 		"lint": "prettier --plugin-search-dir . --check . && eslint .",
-		"format": "prettier --plugin-search-dir . --write ."
+		"format": "prettier --plugin-search-dir . --write .",
+		"patch": "npm version patch",
+		"minor": "npm version minor",
+		"publish": "npm publish"
 	},
 	"exports": {
 		".": {

package.json

@@ -7,8 +7,7 @@
 	import BulletList from "./BulletList.svelte";
 	import Embed from "./Embed.svelte";
     export let block: BlockObjectResponse;
-    //$: console.log(block.type, block);
-    
+    //$: console.log("type",block.type);
 </script>
 
 

src/lib/components/Block.svelte

@@ -13,19 +13,19 @@
         if(block.type==="heading_1"){
             return {
                 type: block.type,
-                text: block.heading_1?.rich_text?.[0]?.plain_text,
+                text: block.heading_1?.rich_text?.map((t)=> t.plain_text)?.join(" "),
                 id: block.id
             }
         }else if(block.type==="heading_2"){
             return {
                 type: block.type,
-                text: block.heading_2?.rich_text?.[0]?.plain_text,
+                text: block.heading_2?.rich_text?.map((t)=> t.plain_text)?.join(" "),
                 id: block.id
             }
         }else if(block.type==="heading_3"){
             return {
                 type: block.type,
-                text: block.heading_3?.rich_text?.[0]?.plain_text,
+                text: block.heading_3?.rich_text?.map((t)=> t.plain_text)?.join(" "),
                 id: block.id
             }
         }else{

src/lib/components/BlogPost.svelte

@@ -6,10 +6,10 @@
 
 {#if heading}
     {#if heading.type=="heading_1"}
-        <h1 id={heading.id}>{heading.heading_1.rich_text?.[0]?.plain_text}</h1>
+        <h1 id={heading.id}>{heading.heading_1.rich_text?.map((t)=> t.plain_text)?.join(" ")}</h1>
     {:else if heading.type=="heading_2"}
-        <h2 id={heading.id}>{heading.heading_2.rich_text?.[0]?.plain_text}</h2>
+        <h2 id={heading.id}>{heading.heading_2.rich_text?.map((t)=> t.plain_text)?.join(" ")}</h2>
     {:else if heading.type=="heading_3"}
-        <h3 id={heading.id} class="">{heading.heading_3.rich_text?.[0]?.plain_text}</h3>
+        <h3 id={heading.id} class="">{heading.heading_3.rich_text?.map((t)=> t.plain_text)?.join(" ")}</h3>
     {/if}
 {/if}

src/lib/components/Heading.svelte

@@ -3,8 +3,10 @@
     export let tableOfContent: (TableOfContentItems | undefined)[] | undefined;
 </script>
 
+<h3>Table of Contents</h3>
+
 {#if tableOfContent && tableOfContent?.length > 0}
-    <ul class="not-prose bg-slate-100 rounded-md w-full py-6 list-none">
+    <ul>
         {#each  tableOfContent as content }
             {#if content}
                 {#if content.type == "heading_2"}
@@ -21,4 +23,14 @@
     a {
         @apply text-slate-700;
     }
+
+    ul {
+        background-color: rgb(248 250 252 / 1);
+        list-style-type: none;
+        padding: 4px;
+        border-radius: 0.375rem;
+        padding-top: 1.5rem;
+        padding-bottom: 1.5rem;
+        padding-left: 1.5rem;
+    }
 </style>

src/lib/components/TableOfContent.svelte

@@ -96,6 +96,7 @@ export const getBlocks = async (blogClient: BlogClient,  blockId: string): Promi
             if(!isFullBlock(block)) continue;
             blocks.push(block);
         }
+        
         return ok(blocks);
     }else if(results && results.length == 0){
         return ok([]);
@@ -153,7 +154,7 @@ export const getFAQs = async (blogClent: BlogClient, id: string): Promise<Result
             if(row.type=="table_row"){
                 return {
                     question: row.table_row.cells?.[0]?.[0]?.plain_text,
-                    answer: row.table_row.cells?.[1]?.[0]?.plain_text
+                    answer: row.table_row.cells?.[1]?.map((r)=> r.plain_text)?.join("")
                 }
             }else{
                 return {