Merge pull request #142 from SJSUCSClub/141-improve-sitemapxml-should…

…-include-index-of-generated-sitemaps-use-fs-to-get-tos-and-privacy-mds [Improve] fixed sitemap issue, fixed privacy/tos md build issue
SJSUCSClub · Oct 15, 2024 · e3178d2 · e3178d2
2 parents 3935de8 + fae220f
commit e3178d2
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 11 deletions.
diff --git a/app/(main)/courses/sitemap.ts b/app/(main)/courses/sitemap.ts
@@ -2,6 +2,8 @@ import { CoursesSearchResponse } from '@/types';
 import fetcher from '@/utils/fetcher';
 import { MetadataRoute } from 'next';
 
+export const dynamic = 'force-dynamic';
+
 const sitemapLinksLimit = 50000;
 
 export async function generateSitemaps() {

diff --git a/app/(main)/privacy/page.tsx b/app/(main)/privacy/page.tsx
@@ -1,11 +1,8 @@
 import { MDXRemote } from 'next-mdx-remote/rsc';
-import React from 'react';
+import fs from 'fs';
 
 export default async function Page() {
-  const res = await fetch(
-    process.env.NEXT_PUBLIC_BASE_URL + '/privacy-policy.md',
-  );
-  const markdown = await res.text();
+  const markdown = fs.readFileSync('app/privacy-policy.md', 'utf8');
   return (
     <main>
       <section className="mx-auto flex w-full max-w-content-width items-stretch px-md">

diff --git a/app/(main)/professors/sitemap.ts b/app/(main)/professors/sitemap.ts
@@ -2,6 +2,8 @@ import { ProfessorsSearchResponse } from '@/types';
 import fetcher from '@/utils/fetcher';
 import { MetadataRoute } from 'next';
 
+export const dynamic = 'force-dynamic';
+
 const sitemapLinksLimit = 50000;
 
 export async function generateSitemaps() {

diff --git a/app/(main)/terms/page.tsx b/app/(main)/terms/page.tsx
@@ -1,11 +1,8 @@
 import { MDXRemote } from 'next-mdx-remote/rsc';
-import React from 'react';
+import fs from 'fs';
 
 export default async function Page() {
-  const res = await fetch(
-    process.env.NEXT_PUBLIC_BASE_URL + '/terms-of-service.md',
-  );
-  const markdown = await res.text();
+  const markdown = fs.readFileSync('app/terms-of-service.md', 'utf8');
   return (
     <main>
       <section className="mx-auto flex w-full max-w-content-width items-stretch px-md">

diff --git a/public/privacy-policy.md → app/privacy-policy.md b/public/privacy-policy.md → app/privacy-policy.md
diff --git a/app/sitemap.ts b/app/sitemap.ts
@@ -1,6 +1,22 @@
+import { CoursesSearchResponse, ProfessorsSearchResponse } from '@/types';
+import fetcher from '@/utils/fetcher';
 import { MetadataRoute } from 'next';
 
-export default function sitemap(): MetadataRoute.Sitemap {
+export const dynamic = 'force-dynamic';
+
+const sitemapLinksLimit = 50000;
+
+export default async function sitemap(): Promise<MetadataRoute.Sitemap> {
+  const { total_results: totalCourses } = (await fetcher(
+    process.env.BASE_API_URL + `/core/courses/search?`,
+  )) as CoursesSearchResponse;
+  const { total_results: totalProfessors } = (await fetcher(
+    process.env.BASE_API_URL + `/core/professors/search?`,
+  )) as ProfessorsSearchResponse;
+  const numberOfCourseSitemaps = Math.ceil(totalCourses / sitemapLinksLimit);
+  const numberOfProfessorSitemaps = Math.ceil(
+    totalProfessors / sitemapLinksLimit,
+  );
   return [
     {
       url: `${process.env.NEXT_PUBLIC_BASE_URL}`,
@@ -38,5 +54,17 @@ export default function sitemap(): MetadataRoute.Sitemap {
       // changeFrequency: 'monthly',
       priority: 0.8,
     },
+    ...Array.from({ length: numberOfCourseSitemaps }, (_, i) => ({
+      url: `${process.env.NEXT_PUBLIC_BASE_URL}/courses/sitemap/${i}.xml`,
+      lastModified: new Date().toISOString(),
+      // changeFrequency: 'monthly',
+      priority: 0.6,
+    })),
+    ...Array.from({ length: numberOfProfessorSitemaps }, (_, i) => ({
+      url: `${process.env.NEXT_PUBLIC_BASE_URL}/professors/sitemap/${i}.xml`,
+      lastModified: new Date().toISOString(),
+      // changeFrequency: 'monthly',
+      priority: 0.6,
+    })),
   ];
 }
diff --git a/public/terms-of-service.md → app/terms-of-service.md b/public/terms-of-service.md → app/terms-of-service.md