From 7a10b9d0d479381e6f479251938b107254444d68 Mon Sep 17 00:00:00 2001
From: Kamran Ahmed <kamranahmed.se@gmail.com>
Date: Fri, 18 Oct 2024 22:35:49 +0100
Subject: [PATCH] Fix canonical URLs

---
 src/data/guides/consistency-patterns-in-distributed-systems.md | 1 -
 src/pages/[roadmapId]/projects.astro                           | 2 +-
 src/pages/account/friends.astro                                | 1 +
 src/pages/account/index.astro                                  | 1 +
 src/pages/account/road-card.astro                              | 1 +
 src/pages/account/roadmaps.astro                               | 1 +
 src/pages/account/settings.astro                               | 1 +
 src/pages/account/update-profile.astro                         | 1 +
 src/pages/ai/explore.astro                                     | 2 +-
 src/pages/ai/index.astro                                       | 2 +-
 src/pages/backend/frameworks.astro                             | 2 +-
 src/pages/changelog.astro                                      | 2 +-
 src/pages/community.astro                                      | 2 +-
 src/pages/dashboard.astro                                      | 2 +-
 src/pages/forgot-password.astro                                | 2 +-
 src/pages/get-started.astro                                    | 2 +-
 src/pages/leaderboard.astro                                    | 2 +-
 src/pages/login.astro                                          | 2 +-
 src/pages/privacy.md                                           | 1 +
 src/pages/projects/[projectId]/solutions.astro                 | 2 +-
 src/pages/questions/index.astro                                | 2 +-
 src/pages/team/index.astro                                     | 2 +-
 src/pages/terms.md                                             | 1 +
 23 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/src/data/guides/consistency-patterns-in-distributed-systems.md b/src/data/guides/consistency-patterns-in-distributed-systems.md
index 1f8f5ee2a..821879133 100644
--- a/src/data/guides/consistency-patterns-in-distributed-systems.md
+++ b/src/data/guides/consistency-patterns-in-distributed-systems.md
@@ -6,7 +6,6 @@ seo:
   title: 'Consistency Patterns - roadmap.sh'
   description: 'Everything you need to know about Week, Strong and Eventual Consistency'
 isNew: false
-canonicalUrl: 'https://cs.fyi/guide/consistency-patterns-week-strong-eventual/'
 type: 'textual'
 date: 2023-01-18
 sitemap:
diff --git a/src/pages/[roadmapId]/projects.astro b/src/pages/[roadmapId]/projects.astro
index 78ed00e9b..6f606499a 100644
--- a/src/pages/[roadmapId]/projects.astro
+++ b/src/pages/[roadmapId]/projects.astro
@@ -60,7 +60,7 @@ const { response: userCounts } =
 ---
 
 <BaseLayout
-  permalink={`/${roadmapId}`}
+  permalink={`/${roadmapId}/projects`}
   title={seoTitle}
   description={seoDescription}
   briefTitle={roadmapData.briefTitle}
diff --git a/src/pages/account/friends.astro b/src/pages/account/friends.astro
index fefc393bb..ebaef5450 100644
--- a/src/pages/account/friends.astro
+++ b/src/pages/account/friends.astro
@@ -8,6 +8,7 @@ import { FriendsPage } from '../../components/Friends/FriendsPage';
   title='Friends'
   noIndex={true}
   initialLoadingMessage='Loading friends'
+  permalink="/account/friends"
 >
   <AccountSidebar activePageId='friends' activePageTitle='Friends'>
     <FriendsPage client:only="react" />
diff --git a/src/pages/account/index.astro b/src/pages/account/index.astro
index 08fc68c2a..823ef6a45 100644
--- a/src/pages/account/index.astro
+++ b/src/pages/account/index.astro
@@ -8,6 +8,7 @@ import AccountLayout from '../../layouts/AccountLayout.astro';
   title='Activity'
   noIndex={true}
   initialLoadingMessage={'Loading activity'}
+  permalink="/account"
 >
   <AccountSidebar activePageId='activity' activePageTitle='Activity'>
     <ActivityPage client:only='react' />
diff --git a/src/pages/account/road-card.astro b/src/pages/account/road-card.astro
index afa7993c9..48c3e2274 100644
--- a/src/pages/account/road-card.astro
+++ b/src/pages/account/road-card.astro
@@ -8,6 +8,7 @@ import { RoadCardPage } from '../../components/RoadCard/RoadCardPage';
   title='Road Card'
   noIndex={true}
   initialLoadingMessage='Preparing card'
+  permalink="/account/road-card"
 >
   <AccountSidebar activePageId='road-card' activePageTitle='Road Card'>
     <RoadCardPage client:only="react" />
diff --git a/src/pages/account/roadmaps.astro b/src/pages/account/roadmaps.astro
index 8ba006ed6..bea17e7e6 100644
--- a/src/pages/account/roadmaps.astro
+++ b/src/pages/account/roadmaps.astro
@@ -8,6 +8,7 @@ import { RoadmapListPage } from '../../components/CustomRoadmap/RoadmapListPage'
   title='Roadmaps'
   noIndex={true}
   initialLoadingMessage='Loading roadmaps'
+  permalink="/account/roadmaps"
 >
   <AccountSidebar activePageId='roadmaps' activePageTitle='Roadmaps'>
     <RoadmapListPage client:only='react' />
diff --git a/src/pages/account/settings.astro b/src/pages/account/settings.astro
index 6e96fcfcb..dc52edd64 100644
--- a/src/pages/account/settings.astro
+++ b/src/pages/account/settings.astro
@@ -10,6 +10,7 @@ import { ProfileSettingsPage } from '../../components/ProfileSettings/ProfileSet
   description=''
   noIndex={true}
   initialLoadingMessage={'Loading settings'}
+  permalink="/account/settings"
 >
   <AccountSidebar activePageId='settings' activePageTitle='Settings'>
     <ProfileSettingsPage client:load />
diff --git a/src/pages/account/update-profile.astro b/src/pages/account/update-profile.astro
index 1f8038613..6e84eaa4e 100644
--- a/src/pages/account/update-profile.astro
+++ b/src/pages/account/update-profile.astro
@@ -8,6 +8,7 @@ import AccountLayout from '../../layouts/AccountLayout.astro';
   title='Update Profile'
   noIndex={true}
   initialLoadingMessage={'Loading profile'}
+  permalink="/account/update-profile"
 >
   <AccountSidebar activePageId='profile' activePageTitle='Profile'>
     <UpdatePublicProfileForm client:load />
diff --git a/src/pages/ai/explore.astro b/src/pages/ai/explore.astro
index 0c5eb0406..eccc47aa3 100644
--- a/src/pages/ai/explore.astro
+++ b/src/pages/ai/explore.astro
@@ -3,6 +3,6 @@ import { ExploreAIRoadmap } from '../../components/ExploreAIRoadmap/ExploreAIRoa
 import BaseLayout from '../../layouts/BaseLayout.astro';
 ---
 
-<BaseLayout title='Explore AI Generated Roadmaps'>
+<BaseLayout title='Explore AI Generated Roadmaps' permalink="/ai/explore">
   <ExploreAIRoadmap client:load />
 </BaseLayout>
diff --git a/src/pages/ai/index.astro b/src/pages/ai/index.astro
index 78e003282..c2c7c1e6d 100644
--- a/src/pages/ai/index.astro
+++ b/src/pages/ai/index.astro
@@ -3,6 +3,6 @@ import { GenerateRoadmap } from '../../components/GenerateRoadmap/GenerateRoadma
 import BaseLayout from '../../layouts/BaseLayout.astro';
 ---
 
-<BaseLayout title='Roadmap AI'>
+<BaseLayout title='Roadmap AI' permalink="/ai">
   <GenerateRoadmap client:load />
 </BaseLayout>
diff --git a/src/pages/backend/frameworks.astro b/src/pages/backend/frameworks.astro
index 2d2e34d5d..de8ee1b6b 100644
--- a/src/pages/backend/frameworks.astro
+++ b/src/pages/backend/frameworks.astro
@@ -25,7 +25,7 @@ const ogImageUrl =
 <BaseLayout
   title={replaceVariables(guideData.seo.title)}
   description={replaceVariables(guideData.seo.description)}
-  permalink={`/backend/languages`}
+  permalink={`/backend/frameworks`}
   canonicalUrl={guideData.canonicalUrl}
   ogImageUrl={ogImageUrl}
 >
diff --git a/src/pages/changelog.astro b/src/pages/changelog.astro
index 4a426e9b3..f3078bcde 100644
--- a/src/pages/changelog.astro
+++ b/src/pages/changelog.astro
@@ -11,7 +11,7 @@ const allChangelogs = await getAllChangelogs();
 <BaseLayout
   title='Changelogs'
   description='Changelogs for the updates and changes to roadmap.sh'
-  permalink='/changelogs'
+  permalink='/changelog'
   noIndex={true}
 >
   <div class='bg-gray-100 px-4'>
diff --git a/src/pages/community.astro b/src/pages/community.astro
index 17103850b..4cb0c529a 100644
--- a/src/pages/community.astro
+++ b/src/pages/community.astro
@@ -7,6 +7,6 @@ const description =
   'Explore the community-created roadmaps to learn new skills, tools, and technologies. You can also create your own roadmap and share it with the world.';
 ---
 
-<BaseLayout title={title} description={description}>
+<BaseLayout title={title} description={description} permalink="/community">
   <DiscoverRoadmaps client:load />
 </BaseLayout>
diff --git a/src/pages/dashboard.astro b/src/pages/dashboard.astro
index 0d6752e46..274847054 100644
--- a/src/pages/dashboard.astro
+++ b/src/pages/dashboard.astro
@@ -56,7 +56,7 @@ const enrichedBestPractices = bestPractices.map((bestPractice) => {
 });
 ---
 
-<BaseLayout title='Dashboard' noIndex={true}>
+<BaseLayout title='Dashboard' noIndex={true} permalink="/dashboard">
   <DashboardPage
     builtInRoleRoadmaps={enrichedRoleRoadmaps}
     builtInSkillRoadmaps={enrichedSkillRoadmaps}
diff --git a/src/pages/forgot-password.astro b/src/pages/forgot-password.astro
index e991a6153..57ed43c07 100644
--- a/src/pages/forgot-password.astro
+++ b/src/pages/forgot-password.astro
@@ -4,7 +4,7 @@ import AccountLayout from '../layouts/AccountLayout.astro';
 import {AccountTerms} from "../components/AccountTerms";
 ---
 
-<AccountLayout title='Forgot Password' noIndex={true}>
+<AccountLayout title='Forgot Password' noIndex={true} permalink="/forgot-password">
   <div class='container'>
     <div
       class='mx-auto flex flex-col items-start justify-start pb-28 pt-10 sm:max-w-[400px] sm:items-center sm:justify-center sm:pt-20'
diff --git a/src/pages/get-started.astro b/src/pages/get-started.astro
index 3b340c06a..f96e007a5 100644
--- a/src/pages/get-started.astro
+++ b/src/pages/get-started.astro
@@ -37,7 +37,7 @@ import { TipItem } from '../components/GetStarted/TipItem';
 <BaseLayout
   title='Developer Roadmaps'
   description={'Step by step guides and paths to learn different tools or technologies'}
-  permalink={'/roadmaps'}
+  permalink={'/get-started'}
 >
   <div class='bg-gradient-to-b from-gray-200 to-white py-4 sm:py-8 md:py-12'>
     <div class='container'>
diff --git a/src/pages/leaderboard.astro b/src/pages/leaderboard.astro
index c7bf8f95f..bbaa37de3 100644
--- a/src/pages/leaderboard.astro
+++ b/src/pages/leaderboard.astro
@@ -11,7 +11,7 @@ const { response: leaderboardStats, error: leaderboardError } =
   await leaderboardClient.listLeaderboardStats();
 ---
 
-<BaseLayout title='Leaderboard'>
+<BaseLayout title='Leaderboard' permalink="/leaderboard">
   {leaderboardError && <ErrorPage error={leaderboardError} />}
   {
     leaderboardStats && (
diff --git a/src/pages/login.astro b/src/pages/login.astro
index f14e827dd..6ae2e05f9 100644
--- a/src/pages/login.astro
+++ b/src/pages/login.astro
@@ -7,7 +7,7 @@ import AccountLayout from '../layouts/AccountLayout.astro';
 <AccountLayout
   title='Login - roadmap.sh'
   description='Register yourself to receive occasional emails about new roadmaps, updates, guides and videos'
-  permalink={'/signup'}
+  permalink={'/login'}
   noIndex={true}
 >
   <div class='container'>
diff --git a/src/pages/privacy.md b/src/pages/privacy.md
index 16cc0dca7..d8fad76f3 100644
--- a/src/pages/privacy.md
+++ b/src/pages/privacy.md
@@ -2,6 +2,7 @@
 layout: ../layouts/MarkdownLayout.astro
 title: Privacy Policy - roadmap.sh
 noIndex: true
+permalink: /privacy
 ---
 
 # Privacy Policy
diff --git a/src/pages/projects/[projectId]/solutions.astro b/src/pages/projects/[projectId]/solutions.astro
index 15b980730..5d0b821a8 100644
--- a/src/pages/projects/[projectId]/solutions.astro
+++ b/src/pages/projects/[projectId]/solutions.astro
@@ -37,7 +37,7 @@ const githubUrl = `https://github.com/kamranahmedse/developer-roadmap/tree/maste
 ---
 
 <BaseLayout
-  permalink={`/projects/${projectId}`}
+  permalink={`/projects/${projectId}/solutions`}
   title={projectData?.seo?.title}
   briefTitle={projectData.title}
   ogImageUrl={ogImageUrl}
diff --git a/src/pages/questions/index.astro b/src/pages/questions/index.astro
index efa15bb67..1aaca02e7 100644
--- a/src/pages/questions/index.astro
+++ b/src/pages/questions/index.astro
@@ -10,7 +10,7 @@ const questionGroups = await getAllQuestionGroups();
 <BaseLayout
   title='Questions'
   description={'Step by step guides and paths to learn different tools or technologies'}
-  permalink={'/roadmaps'}
+  permalink={'/questions'}
 >
   <SimplePageHeader
     title='Questions'
diff --git a/src/pages/team/index.astro b/src/pages/team/index.astro
index 18367de27..2241ce1e6 100644
--- a/src/pages/team/index.astro
+++ b/src/pages/team/index.astro
@@ -56,7 +56,7 @@ const enrichedBestPractices = bestPractices.map((bestPractice) => {
 });
 ---
 
-<BaseLayout title='Dashboard' noIndex={true}>
+<BaseLayout title='Team' noIndex={true} permalink="/team">
   <DashboardPage
     builtInRoleRoadmaps={enrichedRoleRoadmaps}
     builtInSkillRoadmaps={enrichedSkillRoadmaps}
diff --git a/src/pages/terms.md b/src/pages/terms.md
index 5f44f23d5..ce86ebc68 100644
--- a/src/pages/terms.md
+++ b/src/pages/terms.md
@@ -2,6 +2,7 @@
 layout: ../layouts/MarkdownLayout.astro
 title: Terms and Conditions - roadmap.sh
 noIndex: true
+permalink: /terms
 ---
 
 # Terms of Service