From c3a61e7f3464a71e689dfe9e42ecc45fddff36c5 Mon Sep 17 00:00:00 2001
From: Kamran Ahmed <kamranahmed.se@gmail.com>
Date: Fri, 15 Mar 2024 03:13:53 +0000
Subject: [PATCH 1/3] Add json ld for author pages

---
 src/data/authors/kamran.md         |  3 ++
 src/layouts/BaseLayout.astro       |  5 ++-
 src/lib/author.ts                  |  4 +++
 src/pages/authors/[authorId].astro | 57 ++++++++++++++++++++----------
 4 files changed, 50 insertions(+), 19 deletions(-)

diff --git a/src/data/authors/kamran.md b/src/data/authors/kamran.md
index 8e5f7c9ee..5b80785c4 100644
--- a/src/data/authors/kamran.md
+++ b/src/data/authors/kamran.md
@@ -1,6 +1,9 @@
 ---
 name: 'Kamran Ahmed'
 imageUrl: '/authors/kamran.jpeg'
+employment:
+  title: 'Founder'
+  company: 'roadmap.sh'
 social:
   linkedin: 'https://www.linkedin.com/in/kamrify'
   twitter: 'https://twitter.com/kamrify'
diff --git a/src/layouts/BaseLayout.astro b/src/layouts/BaseLayout.astro
index ae3adfc96..03518e347 100644
--- a/src/layouts/BaseLayout.astro
+++ b/src/layouts/BaseLayout.astro
@@ -145,7 +145,10 @@ const gaPageIdentifier = Astro.url.pathname
     <slot name='after-header' />
     {
       jsonLd.length > 0 && (
-        <script type='application/ld+json' set:html={JSON.stringify(jsonLd)} />
+        <script
+          type='application/ld+json'
+          set:html={JSON.stringify(jsonLd.length === 1 ? jsonLd[0] : jsonLd)}
+        />
       )
     }
   </head>
diff --git a/src/lib/author.ts b/src/lib/author.ts
index 86afb2a43..ac6606fe4 100644
--- a/src/lib/author.ts
+++ b/src/lib/author.ts
@@ -3,6 +3,10 @@ import type { MarkdownFileType } from './file';
 export interface AuthorFrontmatter {
   name: string;
   imageUrl: string;
+  employment?: {
+    title: string;
+    company: string;
+  };
   social: {
     twitter: string;
     github: string;
diff --git a/src/pages/authors/[authorId].astro b/src/pages/authors/[authorId].astro
index c3d9c349e..022cb93ed 100644
--- a/src/pages/authors/[authorId].astro
+++ b/src/pages/authors/[authorId].astro
@@ -2,10 +2,10 @@
 import BaseLayout from '../../layouts/BaseLayout.astro';
 import AstroIcon from '../../components/AstroIcon.astro';
 import { getGuidesByAuthor } from '../../lib/guide';
-import {getAllVideos, getVideosByAuthor} from '../../lib/video';
+import { getAllVideos, getVideosByAuthor } from '../../lib/video';
 import GuideListItem from '../../components/GuideListItem.astro';
 import { getAuthorById, getAuthorIds } from '../../lib/author';
-import VideoListItem from "../../components/VideoListItem.astro";
+import VideoListItem from '../../components/VideoListItem.astro';
 
 interface Params extends Record<string, string | undefined> {}
 
@@ -19,11 +19,9 @@ export async function getStaticPaths() {
 
 const { authorId } = Astro.params;
 
-console.log(authorId);
-
 const author = await getAuthorById(authorId);
+const authorFrontmatter = author.frontmatter;
 
-console.log(author);
 const guides = await getGuidesByAuthor(authorId);
 const videos = await getVideosByAuthor(authorId);
 ---
@@ -35,14 +33,37 @@ const videos = await getVideosByAuthor(authorId);
   ogImageUrl={`https://roadmap.sh/${author.frontmatter.imageUrl}`}
   description={`${author.frontmatter.name} has written ${guides.length} articles on roadmap.sh on a variety of topics.`}
   noIndex={false}
+  jsonLd={[
+    {
+      '@context': 'https://schema.org/',
+      '@type': 'Person',
+      name: authorFrontmatter.name,
+      url: `https://roadmap.sh/authors/${authorId}`,
+      image: authorFrontmatter.imageUrl.startsWith('http')
+        ? authorFrontmatter.imageUrl
+        : `https://roadmap.sh${authorFrontmatter.imageUrl}`,
+      sameAs: authorFrontmatter.social
+        ? Object.values(authorFrontmatter.social)
+        : [],
+      ...(authorFrontmatter.employment && {
+        jobTitle: authorFrontmatter.employment?.title,
+        worksFor: {
+          '@type': 'Organization',
+          name: authorFrontmatter.employment.company,
+        },
+      }),
+    },
+  ]}
 >
-  <div class='container pt-4 pb-0 md:pb-16 md:pt-8'>
+  <div class='container pb-0 pt-4 md:pb-16 md:pt-8'>
     <div class=''>
       <div class='mb-5 flex items-center gap-8 rounded-3xl py-0 md:py-8'>
-        <div class="flex-grow">
-          <h1 class='text-2xl md:text-3xl font-bold'>{author.frontmatter.name}</h1>
+        <div class='flex-grow'>
+          <h1 class='text-2xl font-bold md:text-3xl'>
+            {authorFrontmatter.name}
+          </h1>
           <div
-            class='mt-1 mb-4 md:mt-4 md:mb-6 flex flex-col gap-3 text-gray-800 [&>p>a]:font-semibold [&>p>a]:underline leading-normal'
+            class='mb-4 mt-1 flex flex-col gap-3 leading-normal text-gray-800 md:mb-6 md:mt-4 [&>p>a]:font-semibold [&>p>a]:underline'
           >
             <author.Content />
           </div>
@@ -50,9 +71,9 @@ const videos = await getVideosByAuthor(authorId);
           <div class='flex items-center justify-between'>
             <div class='flex items-center gap-1.5'>
               {
-                author.frontmatter.social?.github && (
+                authorFrontmatter.social?.github && (
                   <a
-                    href={author.frontmatter.social.github}
+                    href={authorFrontmatter.social.github}
                     target='_blank'
                     class='text-gray-500 transition-colors hover:text-gray-800'
                   >
@@ -61,9 +82,9 @@ const videos = await getVideosByAuthor(authorId);
                 )
               }
               {
-                author.frontmatter.social.twitter && (
+                authorFrontmatter.social.twitter && (
                   <a
-                    href={author.frontmatter.social.twitter}
+                    href={authorFrontmatter.social.twitter}
                     target='_blank'
                     class='text-gray-500 transition-colors hover:text-gray-800'
                   >
@@ -72,9 +93,9 @@ const videos = await getVideosByAuthor(authorId);
                 )
               }
               {
-                author.frontmatter.social.linkedin && (
+                authorFrontmatter.social.linkedin && (
                   <a
-                    href={author.frontmatter.social.linkedin}
+                    href={authorFrontmatter.social.linkedin}
                     target='_blank'
                     class='text-gray-500 transition-colors hover:text-gray-800'
                   >
@@ -83,9 +104,9 @@ const videos = await getVideosByAuthor(authorId);
                 )
               }
               {
-                author.frontmatter.social.website && (
+                authorFrontmatter.social.website && (
                   <a
-                    href={author.frontmatter.social.website}
+                    href={authorFrontmatter.social.website}
                     target='_blank'
                     class='text-gray-500 transition-colors hover:text-gray-800'
                   >
@@ -100,7 +121,7 @@ const videos = await getVideosByAuthor(authorId);
           <img
             alt="Kamran Ahmed's profile picture"
             class='block h-[175px] w-[175px] rounded-full bg-gray-100'
-            src={author.frontmatter.imageUrl}
+            src={authorFrontmatter.imageUrl}
           />
         </div>
       </div>

From 1eb5a9c49d8f5980524404a34c2a8d0ee83ffecf Mon Sep 17 00:00:00 2001
From: Siddharth Vijay Sai <67595252+SiddharthSai4701@users.noreply.github.com>
Date: Mon, 18 Mar 2024 21:13:48 +0530
Subject: [PATCH 2/3] Fix typos in the SQL Roadmap (#5365)

Updated the row query definition. Row queries can return not just one but multiple rows.
---
 src/data/roadmaps/sql/content/107-sub-queries/index.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/data/roadmaps/sql/content/107-sub-queries/index.md b/src/data/roadmaps/sql/content/107-sub-queries/index.md
index b1f8e768a..07cf8a35f 100644
--- a/src/data/roadmaps/sql/content/107-sub-queries/index.md
+++ b/src/data/roadmaps/sql/content/107-sub-queries/index.md
@@ -33,7 +33,7 @@ WHERE  column_name OPERATOR
    WHERE roll_id = (SELECT roll_id FROM student WHERE name='John');
    ```
 
-2. **Row subquery**: It returns single row of two or more values. 
+2. **Row subquery**: It returns a single row or multiple rows of two or more values. 
 
    ```sql
    SELECT * FROM student 
@@ -57,4 +57,4 @@ WHERE  column_name OPERATOR
 
 ## General Note
 
-Subqueries can be either correlated or uncorrelated. A correlated subquery is a subquery that uses values from the outer query. Conversely, an uncorrelated subquery is a subquery that can be run independently of the outer query.
\ No newline at end of file
+Subqueries can be either correlated or uncorrelated. A correlated subquery is a subquery that uses values from the outer query. Conversely, an uncorrelated subquery is a subquery that can be run independently of the outer query.

From ec9d2d4c748d34adb6a663ee65cdb981f57d18f1 Mon Sep 17 00:00:00 2001
From: RMN-001 <63580215+RMN-001@users.noreply.github.com>
Date: Mon, 18 Mar 2024 18:28:57 +0100
Subject: [PATCH 3/3] Fix typo in JavaScript roadmap (#5369)

Correcting the typo.
---
 .../typescript/content/101-typescript-types/104-undefined.md    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/data/roadmaps/typescript/content/101-typescript-types/104-undefined.md b/src/data/roadmaps/typescript/content/101-typescript-types/104-undefined.md
index 0d2fbdfd3..57cd9c511 100644
--- a/src/data/roadmaps/typescript/content/101-typescript-types/104-undefined.md
+++ b/src/data/roadmaps/typescript/content/101-typescript-types/104-undefined.md
@@ -1,6 +1,6 @@
 # undefined
 
-JavaScript has two primitive values used to signal absent or uninitialized value: `null` (absent) and `undefined` (unintialized).
+JavaScript has two primitive values used to signal absent or uninitialized value: `null` (absent) and `undefined` (uninitialized).
 
 TypeScript has two corresponding _types_ by the same names. How these types behave depends on whether you have the `strictNullChecks` option on.