Merge pull request #1188 from moonshotcommons/feature/HQ-748-canonica…

…ls-canonicalized feat: canonicals canonicalized
moonshotcommons · Mar 5, 2024 · 96861fd · 96861fd
2 parents d77f2ae + a7a2fda
commit 96861fd
Show file tree

Hide file tree

Showing 18 changed files with 27 additions and 22 deletions.
diff --git a/app/(web)/(base page)/(learn)/course-market/[courseId]/page.tsx b/app/(web)/(base page)/(learn)/course-market/[courseId]/page.tsx
@@ -38,7 +38,7 @@ export async function generateMetadata(
   const metadata: Metadata = {
     title: courseDetail.title,
     alternates: {
-      canonical: `https://www.hackquest.io/practices/${courseId}`
+      canonical: `https://www.hackquest.io/practices/${encodeURIComponent(courseId)}`
     }
   };
 

diff --git a/app/(web)/(base page)/(learn)/electives/[courseId]/page.tsx b/app/(web)/(base page)/(learn)/electives/[courseId]/page.tsx
@@ -41,7 +41,7 @@ export async function generateMetadata(
   const metadata: Metadata = {
     title: courseDetail.title,
     alternates: {
-      canonical: `https://www.hackquest.io/electives/${courseId}`
+      canonical: `https://www.hackquest.io/electives/${encodeURIComponent(courseId)}`
     }
   };
 

diff --git a/app/(web)/(base page)/(learn)/learning-track/[learningTrackId]/page.tsx b/app/(web)/(base page)/(learn)/learning-track/[learningTrackId]/page.tsx
@@ -39,7 +39,7 @@ export async function generateMetadata(
   const metadata: Metadata = {
     title: courseDetail.name,
     alternates: {
-      canonical: `https://www.hackquest.io/learning-track/${learningTrackId}`
+      canonical: `https://www.hackquest.io/learning-track/${encodeURIComponent(learningTrackId)}`
     }
   };
 

diff --git a/app/(web)/(base page)/(learn)/learning-track/page.tsx b/app/(web)/(base page)/(learn)/learning-track/page.tsx
@@ -2,9 +2,9 @@ import { Metadata } from 'next';
 import LearninTrack from './components';
 
 export const metadata: Metadata = {
-  title: 'HackQuest Learnin Track',
+  title: 'HackQuest Learning Track',
   alternates: {
-    canonical: 'https://www.hackquest.io/electives'
+    canonical: 'https://www.hackquest.io/learning-track'
   }
 };
 

diff --git a/app/(web)/(base page)/(learn)/practices/[courseId]/page.tsx b/app/(web)/(base page)/(learn)/practices/[courseId]/page.tsx
@@ -38,7 +38,7 @@ export async function generateMetadata(
   const metadata: Metadata = {
     title: courseDetail.title,
     alternates: {
-      canonical: `https://www.hackquest.io/practices/${courseId}`
+      canonical: `https://www.hackquest.io/practices/${encodeURIComponent(courseId)}`
     }
   };
 

diff --git a/app/(web)/(base page)/(resource)/blog/[blogId]/page.tsx b/app/(web)/(base page)/(resource)/blog/[blogId]/page.tsx
@@ -18,7 +18,7 @@ export async function generateMetadata({
     title: blog.title,
     description: blog.description,
     alternates: {
-      canonical: `https://www.hackquest.io/blog/${params.blogId}`
+      canonical: `https://www.hackquest.io/blog/${encodeURIComponent(params.blogId)}`
     }
   };
 }

diff --git a/app/(web)/(base page)/(resource)/glossary/[glossaryId]/page.tsx b/app/(web)/(base page)/(resource)/glossary/[glossaryId]/page.tsx
@@ -21,7 +21,7 @@ export async function generateMetadata({
     title: glossary.title,
     description: glossary.description,
     alternates: {
-      canonical: `https://www.hackquest.io/glossary/${params.glossaryId}`
+      canonical: `https://www.hackquest.io/glossary/${encodeURIComponent(params.glossaryId)}`
     }
   };
 }

diff --git a/app/(web)/(base page)/(resource)/hackathon/[hackathonId]/page.tsx b/app/(web)/(base page)/(resource)/hackathon/[hackathonId]/page.tsx
@@ -17,7 +17,7 @@ export async function generateMetadata({
     title: hackathon.name,
     description: hackathon.about,
     alternates: {
-      canonical: `https://www.hackquest.io/hackathon/${params.hackathonId}`
+      canonical: `https://www.hackquest.io/hackathon/${encodeURIComponent(params.hackathonId)}`
     }
   };
 }

diff --git a/app/(web)/(base page)/(resource)/hackathon/projects/[projectId]/page.tsx b/app/(web)/(base page)/(resource)/hackathon/projects/[projectId]/page.tsx
@@ -21,7 +21,7 @@ export async function generateMetadata({
     title: hackathon.name,
     description: hackathon.description,
     alternates: {
-      canonical: `https://www.hackquest.io/project/${params.projectId}`
+      canonical: `https://www.hackquest.io/projects/${encodeURIComponent(params.projectId)}`
     }
   };
 }

diff --git a/app/mobile/(base page)/(learn)/electives/[courseId]/page.tsx b/app/mobile/(base page)/(learn)/electives/[courseId]/page.tsx
@@ -40,7 +40,7 @@ export async function generateMetadata(
   const metadata: Metadata = {
     title: courseDetail.title,
     alternates: {
-      canonical: `https://www.hackquest.io/electives/${courseId}`
+      canonical: `https://www.hackquest.io/electives/${encodeURIComponent(courseId)}`
     }
   };
 

diff --git a/app/mobile/(base page)/(learn)/learning-track/[[...slug]]/page.tsx b/app/mobile/(base page)/(learn)/learning-track/[[...slug]]/page.tsx
@@ -2,7 +2,10 @@ import { Metadata } from 'next';
 import LearninTrack from '../components';
 
 export const metadata: Metadata = {
-  title: 'HackQuest Learnin Track'
+  title: 'HackQuest Learning Track',
+  alternates: {
+    canonical: 'https://www.hackquest.io/learning-track'
+  }
 };
 
 export default LearninTrack;
diff --git a/app/mobile/(base page)/(learn)/learning-track/[learningTrackId]/page.tsx b/app/mobile/(base page)/(learn)/learning-track/[learningTrackId]/page.tsx
@@ -39,7 +39,7 @@ export async function generateMetadata(
   const metadata: Metadata = {
     title: courseDetail.name,
     alternates: {
-      canonical: `https://www.hackquest.io/learning-track/${learningTrackId}`
+      canonical: `https://www.hackquest.io/learning-track/${encodeURIComponent(learningTrackId)}`
     }
   };
 

diff --git a/app/mobile/(base page)/(learn)/practices/[courseId]/page.tsx b/app/mobile/(base page)/(learn)/practices/[courseId]/page.tsx
@@ -39,7 +39,7 @@ export async function generateMetadata(
   const metadata: Metadata = {
     title: courseDetail.title,
     alternates: {
-      canonical: `https://www.hackquest.io/practices/${courseId}`
+      canonical: `https://www.hackquest.io/practices/${encodeURIComponent(courseId)}`
     }
   };
 

diff --git a/app/mobile/(base page)/(resource)/blog/[blogId]/page.tsx b/app/mobile/(base page)/(resource)/blog/[blogId]/page.tsx
@@ -18,7 +18,7 @@ export async function generateMetadata({
     title: blog.title,
     description: blog.description,
     alternates: {
-      canonical: `https://www.hackquest.io/blog/${params.blogId}`
+      canonical: `https://www.hackquest.io/blog/${encodeURIComponent(params.blogId)}`
     }
   };
 }

diff --git a/app/mobile/(base page)/(resource)/glossary/[glossaryId]/page.tsx b/app/mobile/(base page)/(resource)/glossary/[glossaryId]/page.tsx
@@ -21,7 +21,7 @@ export async function generateMetadata({
     title: glossary.title,
     description: glossary.description,
     alternates: {
-      canonical: `https://www.hackquest.io/glossary/${params.glossaryId}`
+      canonical: `https://www.hackquest.io/glossary/${encodeURIComponent(params.glossaryId)}`
     }
   };
 }

diff --git a/app/mobile/(base page)/(resource)/hackathon/[hackathonId]/page.tsx b/app/mobile/(base page)/(resource)/hackathon/[hackathonId]/page.tsx
@@ -17,7 +17,7 @@ export async function generateMetadata({
     title: hackathon.name,
     description: hackathon.about,
     alternates: {
-      canonical: `https://www.hackquest.io/hackathon/${params.hackathonId}`
+      canonical: `https://www.hackquest.io/hackathon/${encodeURIComponent(params.hackathonId)}`
     }
   };
 }

diff --git a/app/mobile/(base page)/(resource)/hackathon/projects/[projectId]/page.tsx b/app/mobile/(base page)/(resource)/hackathon/projects/[projectId]/page.tsx
@@ -20,7 +20,7 @@ export async function generateMetadata({
     title: hackathon.name,
     description: hackathon.description,
     alternates: {
-      canonical: `https://www.hackquest.io/project/${params.projectId}`
+      canonical: `https://www.hackquest.io/projects/${encodeURIComponent(params.projectId)}`
     }
   };
 }

diff --git a/middleware.ts b/middleware.ts
@@ -12,13 +12,15 @@ export function middleware(request: NextRequest) {
   const userAgent = request.headers.get('user-agent');
   if (!userAgent) return NextResponse.next();
 
-  if (isMobile(userAgent!) && !request.nextUrl.pathname.startsWith('/mobile')) {
-    const url = `/mobile${request.nextUrl.pathname}${request.nextUrl.search}`;
+  const pathname = request.nextUrl.pathname;
+
+  if (isMobile(userAgent!) && !pathname.startsWith('/mobile')) {
+    const url = `/mobile${pathname}${request.nextUrl.search}`;
     return NextResponse.redirect(new URL(url, request.url));
   }
 
-  if (!isMobile(userAgent!) && request.nextUrl.pathname.startsWith('/mobile')) {
-    const newPathname = request.nextUrl.pathname.replace(/^\/mobile/, '');
+  if (!isMobile(userAgent!) && pathname.startsWith('/mobile')) {
+    const newPathname = pathname.replace(/^\/mobile/, '');
     const url = `${newPathname}${request.nextUrl.search}`;
     return NextResponse.redirect(new URL(url, request.url));
   }