Merge branch 'dev' into feature/code-block-fix

Alex Patterson · Alex Patterson · commit 86483803da55 · 2021-10-21T11:14:51.000-04:00
diff --git a/frontend/main/.gitignore b/frontend/main/.gitignore
@@ -32,4 +32,7 @@ yarn-error.log*
 
 # vercel
 .vercel
-*.env
+*.env
+
+public/robots.txt
+public/sitemap.xml
diff --git a/frontend/main/next-sitemap.js b/frontend/main/next-sitemap.js
@@ -0,0 +1,18 @@
+module.exports = {
+  siteUrl: process.env.SITE_URL || 'https://codingcat.dev',
+  generateRobotsTxt: true,
+  sitemapSize: 7000,
+  exclude: ['/admin*', '/user*', '/server-sitemap.xml'],
+  robotsTxtOptions: {
+    policies: [
+      {
+        userAgent: '*',
+        allow: '/',
+        disallow: ['/admin*', '/user*'],
+      },
+    ],
+    additionalSitemaps: [
+      `${process.env.SITE_URL || 'https://codingcat.dev'}/server-sitemap.xml`,
+    ],
+  },
+};
diff --git a/frontend/main/package-lock.json b/frontend/main/package-lock.json
diff --git a/frontend/main/package.json b/frontend/main/package.json
@@ -10,6 +10,7 @@
     "emulate:firebase": "npm run --prefix ./../../backend/firebase/ emulated",
     "emulate:next": "cross-env NODE_OPTIONS='--inspect=9230' FIRESTORE_EMULATOR_HOST='localhost:8080' NEXT_PUBLIC_FB_AUTH_HOST='http://localhost:9099' NEXT_PUBLIC_FB_DB_HOST='localhost:9000' NEXT_PUBLIC_FB_FS_HOST='localhost:8080' NEXT_PUBLIC_CS_HOST='localhost:9199' NEXT_PUBLIC_FB_FN_HOST='localhost:5001' next dev",
     "build": "next build",
+    "postbuild": "next-sitemap",
     "start": "next start -p 3000",
     "lint": "next lint"
   },
@@ -80,6 +81,7 @@
     "autoprefixer": "^10.0.2",
     "eslint-config-next": "11.1.2",
     "eslint-config-prettier": "^8.3.0",
+    "next-sitemap": "^1.6.192",
     "postcss": "^8.2.1",
     "postcss-preset-env": "^6.7.0",
     "prettier": "^2.2.1",
diff --git a/frontend/main/src/pages/[...permalink].tsx b/frontend/main/src/pages/[...permalink].tsx
@@ -94,23 +94,25 @@ export default function Post({
 }
 
 export async function getStaticPaths(): Promise<{
-  paths: { params: { type: PostType; slug: string } }[];
+  paths: { params: { permalink: string[] } }[];
   fallback: boolean;
 }> {
-  const paths: { params: { type: PostType; slug: string } }[] = [];
-  [PostType.post, PostType.tutorial, PostType.podcast, PostType.page].forEach(
-    async (postType) => {
-      const docData = await postsService(postType);
-      for (const doc of docData) {
-        paths.push({
-          params: {
-            type: doc.type,
-            slug: doc.slug,
-          },
-        });
-      }
+  const paths: { params: { permalink: string[] } }[] = [];
+  for (const postType of [
+    PostType.post,
+    PostType.tutorial,
+    PostType.podcast,
+    PostType.page,
+  ]) {
+    const docData = await postsService(postType);
+    for (const doc of docData) {
+      paths.push({
+        params: {
+          permalink: [doc.type, doc.slug],
+        },
+      });
     }
-  );
+  }
   return {
     paths,
     fallback: true,
diff --git a/frontend/main/src/pages/course/[coursePath]/index.tsx b/frontend/main/src/pages/course/[coursePath]/index.tsx
@@ -5,6 +5,7 @@ import {
   getSite,
   getStripeProduct,
   postBySlugService,
+  postsService,
 } from '@/services/serversideApi';
 
 import { Post as PostModel, PostType } from '@/models/post.model';
@@ -74,11 +75,22 @@ export default function CoursePage({
 }
 
 export async function getStaticPaths(): Promise<{
-  paths: { params: { type: PostType; slug: string } }[];
+  paths: { params: { coursePath: string } }[];
   fallback: boolean;
 }> {
+  const paths: { params: { coursePath: string } }[] = [];
+  for (const postType of [PostType.course]) {
+    const docData = await postsService(postType);
+    for (const doc of docData) {
+      paths.push({
+        params: {
+          coursePath: doc.slug,
+        },
+      });
+    }
+  }
   return {
-    paths: [],
+    paths,
     fallback: true,
   };
 }
@@ -128,7 +140,7 @@ export async function getStaticProps({
   if (productId) {
     product = await getStripeProduct(productId);
     if (product) {
-      console.log('Product Found and passed.');
+      console.log(`${coursePath} has product: `, product.id);
     }
   }
 
diff --git a/frontend/main/src/pages/server-sitemap.xml/index.tsx b/frontend/main/src/pages/server-sitemap.xml/index.tsx
@@ -0,0 +1,34 @@
+// pages/server-sitemap.xml/index.tsx
+
+import { getServerSideSitemap, ISitemapField } from 'next-sitemap';
+import { GetServerSideProps } from 'next';
+import { PostType } from '@/models/post.model';
+import { postsService } from '@/services/serversideApi';
+
+const url = `${process.env.SITE_URL || 'https://codingcat.dev'}`;
+
+export const getServerSideProps: GetServerSideProps = async (ctx) => {
+  const fields: ISitemapField[] = [];
+  for (const postType of [
+    PostType.post,
+    PostType.tutorial,
+    PostType.podcast,
+    PostType.page,
+    PostType.course,
+  ]) {
+    const docData = await postsService(postType);
+    for (const doc of docData) {
+      fields.push({
+        loc: `${url}/${doc.type}/${doc.slug}`,
+        changefreq: 'daily',
+        priority: 0.7,
+        lastmod: new Date().toISOString(),
+      });
+    }
+  }
+  return getServerSideSitemap(ctx, fields);
+};
+
+// Default export to prevent next.js errors
+const Named = () => {};
+export default Named;
