fix: broken sitemap and directs (#1047)

Co-authored-by: viet nguyen <vietnguyen@noreply>
OpenBeta · Dec 26, 2023 · 673ea55 · 673ea55 · vercel · Dec 26, 2023
1 parent 13ddf4d
commit 673ea55
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 158 deletions.
diff --git a/next.config.js b/next.config.js
@@ -35,6 +35,16 @@ module.exports = {
   },
   async redirects () {
     return [
+      {
+        source: '/areas/:uuid',
+        destination: '/area/:uuid/',
+        permanent: true
+      },
+      {
+        source: '/crag/:uuid',
+        destination: '/area/:uuid/',
+        permanent: true
+      },
       {
         source: '/blog',
         destination: 'https://openbeta.substack.com/',

diff --git a/public/robots.txt b/public/robots.txt
@@ -3,4 +3,5 @@ Disallow: /account/
 Disallow: /api/
 Disallow: /auth/
 Disallow: /basecamp/
+Disallow: /editArea/
 Sitemap: https://openbeta.io/sitemap.xml
diff --git a/src/app/area/[[...slug]]/page.tsx b/src/app/area/[[...slug]]/page.tsx
@@ -186,7 +186,7 @@ export function generateStaticParams (): PageSlugType[] {
 export async function generateMetadata ({ params }: PageWithCatchAllUuidProps): Promise<Metadata> {
   const areaUuid = parseUuidAsFirstParam({ params })
 
-  const { area: { areaName, pathTokens, media } } = await getArea(areaUuid, 'cache-first')
+  const { area: { uuid, areaName, pathTokens, media } } = await getArea(areaUuid, 'cache-first')
 
   let wall = ''
   if (pathTokens.length >= 2) {
@@ -202,6 +202,9 @@ export async function generateMetadata ({ params }: PageWithCatchAllUuidProps):
 
   return {
     title: `${name} climbing area`,
+    alternates: {
+      canonical: `https://openbeta.io/area/${uuid}/${getFriendlySlug(areaName)}`
+    },
     description,
     openGraph: {
       description,

diff --git a/src/app/components/recent/RecentContributionsMap.tsx b/src/app/components/recent/RecentContributionsMap.tsx
@@ -17,7 +17,7 @@ type MetadataWithLatLng = ClimbType | AreaType
 interface FEATURE_PROPS { historyIndex: number, name: string}
 type HISTORY_FEATURE = Feature<Point, FEATURE_PROPS>
 
-const fitBoundsOptions = { padding: 200 }
+const fitBoundsOptions = { padding: 50 }
 
 export const RecentContributionsMap: React.FC<{ history: ChangesetType[] }> = ({ history }) => {
   const features = history.reduce < HISTORY_FEATURE[] >((acc, curr, index) => {

diff --git a/src/pages/crag/[id].tsx b/src/pages/crag/[id].tsx
diff --git a/src/pages/sitemap.xml.tsx b/src/pages/sitemap.xml.tsx
@@ -13,40 +13,6 @@ const query = gql`query UsaAreas( $filter: Filter) {
       pathTokens
       totalClimbs
       density
-      aggregate {
-        byDiscipline {
-            sport {
-              total
-            }
-            trad {
-              total
-            }
-            boulder {
-              total
-            }
-            tr {
-              total
-            }
-            alpine {
-              total
-            }
-            mixed {
-              total
-            }
-            aid {
-              total
-            }
-          }
-      }
-      metadata {
-        lat
-        lng
-        areaId
-      }
-      media {
-        mediaUrl
-        mediaUuid
-      }
     }
   }`
 
@@ -120,7 +86,7 @@ export const getServerSideProps: GetServerSideProps = async ({ res }) => {
             .map(({ uuid }) => {
                 return `
                   <url>
-                    <loc>${baseUrl}/areas/${uuid}</loc>
+                    <loc>${baseUrl}/area/${uuid}</loc>
                     <changefreq>monthly</changefreq>
                     <priority>1.0</priority>
                   </url>