wip: add more questions

.env.example

@@ -1,3 +1,2 @@
-PUBLIC_API_URL=https://api.roadmap.sh
+PUBLIC_API_URL=http://api.roadmap.sh
 PUBLIC_AVATAR_BASE_URL=https://dodrc8eu8m09s.cloudfront.net/avatars
-PUBLIC_EDITOR_APP_URL=https://draw.roadmap.sh

.github/ISSUE_TEMPLATE/04-roadmap-contribution.yml

@@ -14,12 +14,24 @@ body:
       placeholder: e.g. Roadmap to learn Data Science
     validations:
       required: true
+  - type: dropdown
+    id: browsers
+    attributes:
+      label: Is this roadmap prepared by you or someone else?
+      options:
+        - I prepared this roadmap
+        - I found this roadmap online (please provide a link below)
   - type: textarea
     id: roadmap-description
     attributes:
-      label: Roadmap Link
-      description: Please create the roadmap [using our roadmap editor](https://twitter.com/kamrify/status/1708293162693767426) and submit the roadmap link.
+      label: Roadmap Items
+      description: Please submit a nested list of items which we can convert into the visual. Here is an [example of roadmap items list.](https://gist.github.com/kamranahmedse/98758d2c73799b3a6ce17385e4c548a5).
       placeholder: |
-          https://roadmap.sh/xyz
+          - Item 1
+            - Subitem 1
+            - Subitem 2
+          - Item 2
+            - Subitem 1
+            - Subitem 2
     validations:
-      required: true
+      required: true

.github/workflows/deploy.yml

@@ -1,26 +1,24 @@
-name: App Deployment
+name: Deployment to GH Pages
 on:
   push:
     branches: [ master ]
 env:
   PUBLIC_API_URL: "https://api.roadmap.sh"
-  PUBLIC_EDITOR_APP_URL: "https://draw.roadmap.sh"
   PUBLIC_AVATAR_BASE_URL: "https://dodrc8eu8m09s.cloudfront.net/avatars"
   GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+  PAT: ${{ secrets.PAT }}
   CI: true
 jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v2
       with:
         persist-credentials: false
     - uses: actions/setup-node@v1
       with:
         node-version: 18
-    - name: Prepare Draw Repository
-      run: |
-        git clone https://${{ secrets.GH_PAT }}@github.com/roadmapsh/web-draw.git .temp/web-draw --depth 1
+    - run: git config --global url."https://${{ secrets.PAT }}@github.com/".insteadOf ssh://git@github.com/
     - uses: pnpm/action-setup@v2.2.2
       with:
         version: 7.13.4
@@ -29,7 +27,6 @@ jobs:
         pnpm install
     - name: Generate meta and build
       run: |
-        npm run generate-renderer
         npm run build
         touch ./dist/.nojekyll
         echo 'roadmap.sh' > ./dist/CNAME

.github/workflows/update-deps.yml

@@ -9,7 +9,7 @@ jobs:
   upgrade-deps:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v2
       - uses: actions/setup-node@v3
         with:
           node-version: 18

.gitignore

@@ -1,5 +1,4 @@
 .idea
-.temp
 
 # build output
 dist/
@@ -28,6 +27,3 @@ pnpm-debug.log*
 /playwright/.cache/
 tests-examples
 *.csv
-
-/editor/*
-!/editor/readonly-editor.tsx

.npmrc

@@ -1,2 +1 @@
-auto-install-peers=true
-strict-peer-dependencies=false
+auto-install-peers=true

.prettierrc.cjs

@@ -13,6 +13,6 @@ module.exports = {
   ],
   plugins: [
     require.resolve('prettier-plugin-astro'),
-    'prettier-plugin-tailwindcss',
+    require('prettier-plugin-tailwindcss'),
   ],
 };

editor/readonly-editor.tsx

@@ -1,14 +0,0 @@
-export function ReadonlyEditor(props: any) {
-  return (
-    <div className="fixed bottom-0 left-0 right-0 top-0 z-[9999] border bg-white p-5 text-black">
-      <h2 className="mb-2 text-xl font-semibold">Private Component</h2>
-      <p className="mb-4">
-        Renderer is a private component. If you are a collaborator and have
-        access to it. Run the following command:
-      </p>
-      <code className="mt-5 rounded-md bg-gray-800 p-2 text-white">
-        npm run generate-renderer
-      </code>
-    </div>
-  );
-}

package.json

@@ -1,7 +1,7 @@
 {
   "name": "roadmap.sh",
   "type": "module",
-  "version": "1.0.0",
+  "version": "0.0.1",
   "private": true,
   "scripts": {
     "dev": "astro dev --port 3000",
@@ -16,58 +16,48 @@
     "roadmap-links": "node scripts/roadmap-links.cjs",
     "roadmap-dirs": "node scripts/roadmap-dirs.cjs",
     "roadmap-content": "node scripts/roadmap-content.cjs",
-    "generate-renderer": "sh scripts/generate-renderer.sh",
     "best-practice-dirs": "node scripts/best-practice-dirs.cjs",
     "best-practice-content": "node scripts/best-practice-content.cjs",
     "test:e2e": "playwright test"
   },
   "dependencies": {
-    "@astrojs/react": "^3.0.10",
-    "@astrojs/sitemap": "^3.0.5",
-    "@astrojs/tailwind": "^5.1.0",
-    "@fingerprintjs/fingerprintjs": "^4.2.2",
+    "@astrojs/react": "^3.0.0",
+    "@astrojs/sitemap": "^1.3.3",
+    "@astrojs/tailwind": "^5.0.0",
+    "@fingerprintjs/fingerprintjs": "^3.4.1",
     "@nanostores/react": "^0.7.1",
-    "@types/react": "^18.2.56",
-    "@types/react-dom": "^18.2.19",
-    "astro": "^4.4.0",
-    "astro-compress": "^2.2.10",
-    "clsx": "^2.1.0",
-    "dom-to-image": "^2.6.0",
-    "dracula-prism": "^2.1.16",
-    "jose": "^5.2.2",
+    "@types/react": "^18.0.21",
+    "@types/react-dom": "^18.0.6",
+    "astro": "^3.0.5",
+    "astro-compress": "^2.0.8",
+    "dracula-prism": "^2.1.13",
+    "jose": "^4.14.4",
     "js-cookie": "^3.0.5",
-    "lucide-react": "^0.334.0",
-    "nanoid": "^5.0.5",
-    "nanostores": "^0.9.5",
-    "node-html-parser": "^6.1.12",
-    "npm-check-updates": "^16.14.15",
+    "lucide-react": "^0.274.0",
+    "nanostores": "^0.9.2",
+    "node-html-parser": "^6.1.5",
+    "npm-check-updates": "^16.10.12",
     "prismjs": "^1.29.0",
-    "react": "^18.2.0",
+    "react": "^18.0.0",
     "react-confetti": "^6.1.0",
-    "react-dom": "^18.2.0",
-    "reactflow": "^11.10.4",
-    "rehype-external-links": "^3.0.0",
-    "remark-parse": "^11.0.0",
+    "react-dom": "^18.0.0",
+    "rehype-external-links": "^2.1.0",
     "roadmap-renderer": "^1.0.6",
     "slugify": "^1.6.6",
-    "tailwind-merge": "^2.2.1",
-    "tailwindcss": "^3.4.1",
-    "unified": "^11.0.4",
-    "zustand": "^4.5.1"
+    "tailwindcss": "^3.3.3"
   },
   "devDependencies": {
-    "@playwright/test": "^1.41.2",
-    "@tailwindcss/typography": "^0.5.10",
-    "@types/dom-to-image": "^2.6.7",
-    "@types/js-cookie": "^3.0.6",
-    "@types/prismjs": "^1.26.3",
+    "@playwright/test": "^1.35.1",
+    "@tailwindcss/typography": "^0.5.9",
+    "@types/js-cookie": "^3.0.3",
+    "@types/prismjs": "^1.26.0",
     "csv-parser": "^3.0.0",
-    "gh-pages": "^6.1.1",
+    "gh-pages": "^5.0.0",
     "js-yaml": "^4.1.0",
-    "markdown-it": "^14.0.0",
-    "openai": "^4.28.0",
-    "prettier": "^3.2.5",
-    "prettier-plugin-astro": "^0.13.0",
-    "prettier-plugin-tailwindcss": "^0.5.11"
+    "markdown-it": "^13.0.1",
+    "openai": "^3.3.0",
+    "prettier": "^2.8.8",
+    "prettier-plugin-astro": "^0.10.0",
+    "prettier-plugin-tailwindcss": "^0.3.0"
   }
 }

public/images/hackernews.svg

@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 32 32">
-    <path fill="#94a3b8" d="M5 5v22h22V5zm2 2h18v18H7zm4.5 4l3.5 6v5h2v-5l3.5-6h-2L16 15.281L13.5 11z"></path>
-</svg>

public/images/reddit.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="1em" height="1em" viewBox="0 0 1024 1024"><path fill="#94a3b8" d="M288 568a56 56 0 1 0 112 0a56 56 0 1 0-112 0zm338.7 119.7c-23.1 18.2-68.9 37.8-114.7 37.8s-91.6-19.6-114.7-37.8c-14.4-11.3-35.3-8.9-46.7 5.5s-8.9 35.3 5.5 46.7C396.3 771.6 457.5 792 512 792s115.7-20.4 155.9-52.1a33.25 33.25 0 1 0-41.2-52.2zM960 456c0-61.9-50.1-112-112-112c-42.1 0-78.7 23.2-97.9 57.6c-57.6-31.5-127.7-51.8-204.1-56.5L612.9 195l127.9 36.9c11.5 32.6 42.6 56.1 79.2 56.1c46.4 0 84-37.6 84-84s-37.6-84-84-84c-32 0-59.8 17.9-74 44.2L603.5 123a33.2 33.2 0 0 0-39.6 18.4l-90.8 203.9c-74.5 5.2-142.9 25.4-199.2 56.2A111.94 111.94 0 0 0 176 344c-61.9 0-112 50.1-112 112c0 45.8 27.5 85.1 66.8 102.5c-7.1 21-10.8 43-10.8 65.5c0 154.6 175.5 280 392 280s392-125.4 392-280c0-22.6-3.8-44.5-10.8-65.5C932.5 541.1 960 501.8 960 456zM820 172.5a31.5 31.5 0 1 1 0 63a31.5 31.5 0 0 1 0-63zM120 456c0-30.9 25.1-56 56-56a56 56 0 0 1 50.6 32.1c-29.3 22.2-53.5 47.8-71.5 75.9a56.23 56.23 0 0 1-35.1-52zm392 381.5c-179.8 0-325.5-95.6-325.5-213.5S332.2 410.5 512 410.5S837.5 506.1 837.5 624S691.8 837.5 512 837.5zM868.8 508c-17.9-28.1-42.2-53.7-71.5-75.9c9-18.9 28.3-32.1 50.6-32.1c30.9 0 56 25.1 56 56c.1 23.5-14.5 43.7-35.1 52zM624 568a56 56 0 1 0 112 0a56 56 0 1 0-112 0z"></path></svg>

readme.md

@@ -9,8 +9,8 @@
     <a href="https://roadmap.sh/best-practices">
     	<img src="https://img.shields.io/badge/%E2%9C%A8-Best%20Practices-0a0a0a.svg?style=flat&colorA=0a0a0a" alt="best practices" />
     </a>
-    <a href="https://roadmap.sh/questions">
-    	<img src="https://img.shields.io/badge/%E2%9C%A8-Questions-0a0a0a.svg?style=flat&colorA=0a0a0a" alt="videos" />
+    <a href="https://youtube.com/theroadmap?sub_confirmation=1">
+    	<img src="https://img.shields.io/badge/%E2%9C%A8-Videos-0a0a0a.svg?style=flat&colorA=0a0a0a" alt="videos" />
     </a>
     <a href="https://www.youtube.com/channel/UCA0H2KIWgWTwpTFjSxp0now?sub_confirmation=1">
     	<img src="https://img.shields.io/badge/%E2%9C%A8-YouTube%20Channel-0a0a0a.svg?style=flat&colorA=0a0a0a" alt="roadmaps" />
@@ -24,24 +24,21 @@
 
 Roadmaps are now interactive, you can click the nodes to read more about the topics.
 
-### [View all Roadmaps](https://roadmap.sh) &nbsp;&middot;&nbsp; [Best Practices](https://roadmap.sh/best-practices) &nbsp;&middot;&nbsp; [Questions](https://roadmap.sh/questions)
+### [View all Roadmaps](https://roadmap.sh)
 
 ![](https://i.imgur.com/waxVImv.png)
 
 Here is the list of available roadmaps with more being actively worked upon.
 
 - [Frontend Roadmap](https://roadmap.sh/frontend) / [Frontend Beginner Roadmap](https://roadmap.sh/frontend?r=frontend-beginner)
-- [Backend Roadmap](https://roadmap.sh/backend) / [Backend Beginner Roadmap](https://roadmap.sh/backend?r=backend-beginner)
+- [Backend Roadmap](https://roadmap.sh/backend)
 - [DevOps Roadmap](https://roadmap.sh/devops) / [DevOps Beginner Roadmap](https://roadmap.sh/devops?r=devops-beginner)
 - [Full Stack Roadmap](https://roadmap.sh/full-stack)
 - [Computer Science Roadmap](https://roadmap.sh/computer-science)
-- [Data Structures and Algorithms Roadmap](https://roadmap.sh/datastructures-and-algorithms)
 - [AI and Data Scientist Roadmap](https://roadmap.sh/ai-data-scientist)
-- [MLOps Roadmap](https://roadmap.sh/mlops)
 - [QA Roadmap](https://roadmap.sh/qa)
 - [Python Roadmap](https://roadmap.sh/python)
 - [Software Architect Roadmap](https://roadmap.sh/software-architect)
-- [Game Developer Roadmap](https://roadmap.sh/game-developer) / [Server Side Game Developer](https://roadmap.sh/server-side-game-developer)
 - [Software Design and Architecture Roadmap](https://roadmap.sh/software-design-architecture)
 - [JavaScript Roadmap](https://roadmap.sh/javascript)
 - [TypeScript Roadmap](https://roadmap.sh/typescript)
@@ -55,7 +52,6 @@ Here is the list of available roadmaps with more being actively worked upon.
 - [Android Roadmap](https://roadmap.sh/android)
 - [Flutter Roadmap](https://roadmap.sh/flutter)
 - [Go Roadmap](https://roadmap.sh/golang)
-- [Rust Roadmap](https://roadmap.sh/rust)
 - [Java Roadmap](https://roadmap.sh/java)
 - [Spring Boot Roadmap](https://roadmap.sh/spring-boot)
 - [Design System Roadmap](https://roadmap.sh/design-system)
@@ -70,20 +66,14 @@ Here is the list of available roadmaps with more being actively worked upon.
 - [UX Design Roadmap](https://roadmap.sh/ux-design)
 - [Docker Roadmap](https://roadmap.sh/docker)
 - [Prompt Engineering Roadmap](https://roadmap.sh/prompt-engineering)
-- [Technical Writer Roadmap](https://roadmap.sh/technical-writer)
 
-There are also interactive best practices:
+We have also added a new form of visual content covering best practices:
 
 - [Code Review Best Practices](https://roadmap.sh/best-practices/code-review)
 - [Frontend Performance Best Practices](https://roadmap.sh/best-practices/frontend-performance)
 - [API Security Best Practices](https://roadmap.sh/best-practices/api-security)
 - [AWS Best Practices](https://roadmap.sh/best-practices/aws)
 
-..and questions to help you test, rate and improve your knowledge
-
-- [JavaScript Questions](https://roadmap.sh/questions/javascript)
-- [React Questions](https://roadmap.sh/questions/react)
-
 ![](https://i.imgur.com/waxVImv.png)
 
 ## Share with the community

renderer/index.tsx

@@ -1,14 +0,0 @@
-export function Renderer(props: any) {
-  return (
-    <div className="fixed bottom-0 left-0 right-0 top-0 z-[9999] border bg-white p-5 text-black">
-      <h2 className="mb-2 text-xl font-semibold">Private Component</h2>
-      <p className="mb-4">
-        Renderer is a private component. If you are a collaborator and have
-        access to it. Run the following command:
-      </p>
-      <code className="mt-5 rounded-md bg-gray-800 p-2 text-white">
-        npm run generate-renderer
-      </code>
-    </div>
-  );
-}

renderer/renderer.ts

@@ -1,5 +0,0 @@
-export function renderFlowJSON(data: any, options?: any) {
-  console.warn("renderFlowJSON is not implemented");
-  console.warn("run the following command to generate the renderer:");
-  console.warn("> npm run generate-renderer");
-}

scripts/generate-renderer.sh

@@ -1,32 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-# ignore cloning if .temp/web-draw already exists
-if [ ! -d ".temp/web-draw" ]; then
-  mkdir -p .temp
-  git clone git@github.com:roadmapsh/web-draw.git .temp/web-draw
-fi
-
-rm -rf editor
-mkdir editor
-
-# copy the files at /src/editor/* to /editor
-# while replacing any existing files
-cp -rf .temp/web-draw/src/editor/* editor
-
-# Add @ts-nocheck to the top of each ts and tsx file
-# so that the typescript compiler doesn't complain
-# about the missing types
-find editor -type f \( -name "*.ts" -o -name "*.tsx" \) -print0 | while IFS= read -r -d '' file; do
-  if [ -f "$file" ]; then
-    echo "// @ts-nocheck" > temp
-    cat "$file" >> temp
-    mv temp "$file"
-    echo "Added @ts-nocheck to $file"
-  fi
-done
-
-
-# ignore the worktree changes for the editor directory
-git update-index --assume-unchanged editor/readonly-editor.tsx

scripts/roadmap-content.cjs

@@ -19,12 +19,13 @@ if (!allowedRoadmapIds.includes(roadmapId)) {
 }
 
 const ROADMAP_CONTENT_DIR = path.join(ALL_ROADMAPS_DIR, roadmapId, 'content');
-const OpenAI = require('openai');
-
-const openai = new OpenAI({
+const { Configuration, OpenAIApi } = require('openai');
+const configuration = new Configuration({
   apiKey: OPEN_AI_API_KEY,
 });
 
+const openai = new OpenAIApi(configuration);
+
 function getFilesInFolder(folderPath, fileList = {}) {
   const files = fs.readdirSync(folderPath);
 
@@ -59,16 +60,16 @@ function writeTopicContent(currTopicUrl) {
 
   const roadmapTitle = roadmapId.replace(/-/g, ' ');
 
-  let prompt = `I am reading a guide about "${roadmapTitle}". I am on the topic "${parentTopic}". I want to know more about "${childTopic}". Write me a brief paragraph for that. Your output should be strictly markdown. Do not include anything other than the description in your output. I already know the benefits of each so do not add benefits in the output.`;
+  let prompt = `I am reading a guide about "${roadmapTitle}". I am on the topic "${parentTopic}". I want to know more about "${childTopic}". Write me with a brief summary of that. Content should be in markdown. I already know the benefits of each so do not add benefits in the output. Also include the code examples if applicable to this topic.`;
   if (!childTopic) {
-    prompt = `I am reading a guide about "${roadmapTitle}". I am on the topic "${parentTopic}". I want to know more about "${parentTopic}". Write me a brief paragraph for that. Your output should be strictly markdown. Do not include anything other than the description in your output. I already know the benefits of each so do not add benefits in the output.`;
+    prompt = `I am reading a guide about "${roadmapTitle}". I am on the topic "${parentTopic}". I want to know more about "${parentTopic}". Write me with a brief summary of that. Content should be in markdown. I already know the benefits of each so do not add benefits in the output. Also include the code examples if applicable to this topic.`;
   }
 
   console.log(`Generating '${childTopic || parentTopic}'...`);
 
   return new Promise((resolve, reject) => {
-    openai.chat.completions
-      .create({
+    openai
+      .createChatCompletion({
         model: 'gpt-4',
         messages: [
           {
@@ -78,7 +79,7 @@ function writeTopicContent(currTopicUrl) {
         ],
       })
       .then((response) => {
-        const article = response.choices[0].message.content;
+        const article = response.data.choices[0].message.content;
 
         resolve(article);
       })
@@ -91,7 +92,7 @@ function writeTopicContent(currTopicUrl) {
 async function writeFileForGroup(group, topicUrlToPathMapping) {
   const topicId = group?.properties?.controlName;
   const topicTitle = group?.children?.controls?.control?.find(
-    (control) => control?.typeID === 'Label',
+    (control) => control?.typeID === 'Label'
   )?.properties?.text;
   const currTopicUrl = topicId?.replace(/^\d+-/g, '/')?.replace(/:/g, '/');
   if (!currTopicUrl) {
@@ -137,14 +138,15 @@ async function writeFileForGroup(group, topicUrlToPathMapping) {
 async function run() {
   const topicUrlToPathMapping = getFilesInFolder(ROADMAP_CONTENT_DIR);
 
-  const roadmapJson = require(
-    path.join(ALL_ROADMAPS_DIR, `${roadmapId}/${roadmapId}`),
-  );
+  const roadmapJson = require(path.join(
+      ALL_ROADMAPS_DIR,
+      `${roadmapId}/${roadmapId}`
+  ));
 
   const groups = roadmapJson?.mockup?.controls?.control?.filter(
     (control) =>
       control.typeID === '__group__' &&
-      !control.properties?.controlName?.startsWith('ext_link'),
+      !control.properties?.controlName?.startsWith('ext_link')
   );
 
   if (!OPEN_AI_API_KEY) {

src/components/AccountSidebar.astro

@@ -2,7 +2,6 @@
 import AstroIcon from './AstroIcon.astro';
 import { TeamDropdown } from './TeamDropdown/TeamDropdown';
 import { SidebarFriendsCounter } from './Friends/SidebarFriendsCounter';
-import { Map } from 'lucide-react';
 
 export interface Props {
   activePageId: string;
@@ -27,21 +26,10 @@ const sidebarLinks = [
     href: '/account/friends',
     title: 'Friends',
     id: 'friends',
-    isNew: false,
-    icon: {
-      glyph: 'users',
-      classes: 'h-4 w-4',
-    },
-  },
-  {
-    href: '/account/roadmaps',
-    title: 'Roadmaps',
-    id: 'roadmaps',
     isNew: true,
     icon: {
       glyph: 'users',
       classes: 'h-4 w-4',
-      component: Map,
     },
   },
   {
@@ -97,7 +85,7 @@ const sidebarLinks = [
         }`}
       >
         <AstroIcon icon={'users'} class={`h-4 w-4 mr-2`} />
-         Teams
+        Teams
       </a>
     </li>
     {
@@ -112,16 +100,10 @@ const sidebarLinks = [
                 isActive ? 'bg-slate-100' : ''
               }`}
             >
-              {sidebarLink.icon.component ? (
-                <sidebarLink.icon.component
-                  className={`${sidebarLink.icon.classes} mr-2`}
-                />
-              ) : (
-                <AstroIcon
-                  icon={sidebarLink.icon.glyph}
-                  class={`${sidebarLink.icon.classes} mr-2`}
-                />
-              )}
+              <AstroIcon
+                icon={sidebarLink.icon.glyph}
+                class={`${sidebarLink.icon.classes} mr-2`}
+              />
               {sidebarLink.title}
             </a>
           </li>
@@ -154,25 +136,21 @@ const sidebarLinks = [
                     }`}
                   >
                     <span class='flex flex-grow items-center'>
-                      {sidebarLink.icon.component ? (
-                        <sidebarLink.icon.component
-                          className={`${sidebarLink.icon.classes} mr-2`}
-                        />
-                      ) : (
-                        <AstroIcon
-                          icon={sidebarLink.icon.glyph}
-                          class={`${sidebarLink.icon.classes} mr-2`}
-                        />
-                      )}
+                      <AstroIcon
+                        icon={sidebarLink.icon.glyph}
+                        class={`${sidebarLink.icon.classes} mr-2`}
+                      />
                       {sidebarLink.title}
                     </span>
 
-                    {sidebarLink.isNew && !isActive && (
-                      <span class='relative mr-1 flex items-center'>
-                        <span class='relative rounded-full bg-gray-200 p-1 text-xs' />
-                        <span class='absolute bottom-0 left-0 right-0 top-0 animate-ping rounded-full bg-gray-400 p-1 text-xs' />
-                      </span>
-                    )}
+                    {sidebarLink.isNew &&
+                      sidebarLink.id !== 'friends' &&
+                      !isActive && (
+                        <span class='relative mr-1 flex items-center'>
+                          <span class='relative rounded-full bg-gray-200 p-1 text-xs' />
+                          <span class='absolute bottom-0 left-0 right-0 top-0 animate-ping rounded-full bg-gray-400 p-1 text-xs' />
+                        </span>
+                      )}
 
                     {sidebarLink.id === 'friends' && (
                       <SidebarFriendsCounter client:load />

src/components/Activity/ActivityPage.tsx

@@ -5,17 +5,6 @@ import { ResourceProgress } from './ResourceProgress';
 import { pageProgressMessage } from '../../stores/page';
 import { EmptyActivity } from './EmptyActivity';
 
-type ProgressResponse = {
-  updatedAt: string;
-  title: string;
-  id: string;
-  learning: number;
-  skipped: number;
-  done: number;
-  total: number;
-  isCustomResource: boolean;
-};
-
 export type ActivityResponse = {
   done: {
     today: number;
@@ -24,9 +13,24 @@ export type ActivityResponse = {
   learning: {
     today: number;
     total: number;
-    roadmaps: ProgressResponse[];
-    bestPractices: ProgressResponse[];
-    customs: ProgressResponse[];
+    roadmaps: {
+      title: string;
+      id: string;
+      learning: number;
+      done: number;
+      total: number;
+      skipped: number;
+      updatedAt: string;
+    }[];
+    bestPractices: {
+      title: string;
+      id: string;
+      learning: number;
+      done: number;
+      skipped: number;
+      total: number;
+      updatedAt: string;
+    }[];
   };
   streak: {
     count: number;
@@ -106,8 +110,7 @@ export function ActivityPage() {
                 })
                 .map((roadmap) => (
                   <ResourceProgress
-                    key={roadmap.id}
-                    isCustomResource={roadmap.isCustomResource}
+                      key={roadmap.id}
                     doneCount={roadmap.done || 0}
                     learningCount={roadmap.learning || 0}
                     totalCount={roadmap.total || 0}
@@ -134,8 +137,6 @@ export function ActivityPage() {
                 })
                 .map((bestPractice) => (
                   <ResourceProgress
-                    isCustomResource={bestPractice.isCustomResource}
-                    key={bestPractice.id}
                     doneCount={bestPractice.done || 0}
                     totalCount={bestPractice.total || 0}
                     learningCount={bestPractice.learning || 0}

src/components/Activity/EmptyActivity.tsx

@@ -1,11 +1,14 @@
-import { RoadmapIcon } from "../ReactIcons/RoadmapIcon";
+import RoadmapIcon from '../../icons/roadmap.svg';
 
 export function EmptyActivity() {
   return (
     <div className="rounded-md">
       <div className="flex flex-col items-center p-7 text-center">
-        <RoadmapIcon className="mb-2 w-[60px] h-[60px] sm:h-[120px] sm:w-[120px] opacity-10" />
-
+        <img
+          alt="no roadmaps"
+          src={RoadmapIcon.src}
+          className="mb-2 w-[60px] h-[60px] sm:h-[120px] sm:w-[120px] opacity-10"
+        />
         <h2 className="text-lg sm:text-xl font-bold">No Progress</h2>
         <p className="my-1 sm:my-2 max-w-[400px] text-gray-500 text-sm sm:text-base">
           Progress will appear here as you start tracking your{' '}

src/components/Activity/ResourceProgress.tsx

@@ -3,7 +3,6 @@ import { getRelativeTimeString } from '../../lib/date';
 import { useToast } from '../../hooks/use-toast';
 import { ProgressShareButton } from '../UserProgress/ProgressShareButton';
 import { useState } from 'react';
-import { getUser } from '../../lib/jwt';
 
 type ResourceProgressType = {
   resourceType: 'roadmap' | 'best-practice';
@@ -16,17 +15,14 @@ type ResourceProgressType = {
   skippedCount: number;
   onCleared?: () => void;
   showClearButton?: boolean;
-  isCustomResource: boolean;
 };
 
 export function ResourceProgress(props: ResourceProgressType) {
-  const { showClearButton = true, isCustomResource } = props;
+  const { showClearButton = true } = props;
   const toast = useToast();
   const [isClearing, setIsClearing] = useState(false);
   const [isConfirming, setIsConfirming] = useState(false);
 
-  const userId = getUser()?.id;
-
   const {
     updatedAt,
     resourceType,
@@ -56,8 +52,8 @@ export function ResourceProgress(props: ResourceProgressType) {
       return;
     }
 
-    localStorage.removeItem(`${resourceType}-${resourceId}-${userId}-favorite`);
-    localStorage.removeItem(`${resourceType}-${resourceId}-${userId}-progress`);
+    localStorage.removeItem(`${resourceType}-${resourceId}-favorite`);
+    localStorage.removeItem(`${resourceType}-${resourceId}-progress`);
 
     setIsClearing(false);
     setIsConfirming(false);
@@ -66,15 +62,11 @@ export function ResourceProgress(props: ResourceProgressType) {
     }
   }
 
-  let url =
+  const url =
     resourceType === 'roadmap'
       ? `/${resourceId}`
       : `/best-practices/${resourceId}`;
 
-  if (isCustomResource) {
-    url = `/r?id=${resourceId}`;
-  }
-
   const totalMarked = doneCount + skippedCount;
   const progressPercentage = Math.round((totalMarked / totalCount) * 100);
 
@@ -120,7 +112,6 @@ export function ResourceProgress(props: ResourceProgressType) {
           <ProgressShareButton
             resourceType={resourceType}
             resourceId={resourceId}
-            isCustomResource={isCustomResource}
             className="text-xs font-normal"
             shareIconClassName="w-2.5 h-2.5 stroke-2"
             checkIconClassName="w-2.5 h-2.5"

src/components/AddTeamRoadmap.tsx

@@ -1,6 +1,6 @@
 import { useRef, useState } from 'react';
 import { useOutsideClick } from '../hooks/use-outside-click';
-import { type OptionType, SearchSelector } from './SearchSelector';
+import { OptionType, SearchSelector } from './SearchSelector';
 import type { PageType } from './CommandMenu/CommandMenu';
 import { CheckIcon } from './ReactIcons/CheckIcon';
 import { httpPut } from '../lib/http';

src/components/AppChecklist.tsx

@@ -1,15 +0,0 @@
-import { PartyPopper } from 'lucide-react';
-
-export function AppChecklist() {
-  return (
-    <div className="fixed bottom-6 right-3">
-      <a
-        href="/get-started"
-        className="flex items-center gap-2 rounded-full border border-slate-900 bg-white py-2 pl-3 pr-4 text-sm font-medium hover:bg-zinc-200"
-      >
-        <PartyPopper className="relative -top-[2px] h-[20px] w-[20px] text-purple-600" />
-        Welcome! Start here
-      </a>
-    </div>
-  );
-}

src/components/AstroIcon.astro

@@ -11,16 +11,15 @@ async function getSVG(name: string) {
   const filepath = `/src/icons/${name}.svg`;
 
   const files = import.meta.glob<string>('/src/icons/**/*.svg', {
-    query: '?raw',
     eager: true,
+    as: 'raw',
   });
 
-
   if (!(filepath in files)) {
     throw new Error(`${filepath} not found`);
   }
 
-  const root = parse(files[filepath].default as string);
+  const root = parse(files[filepath]);
 
   const svg = root.querySelector('svg');
 
@@ -36,4 +35,4 @@ const { attributes: baseAttributes, innerHTML } = await getSVG(icon);
 const svgAttributes = { ...baseAttributes, ...attributes };
 ---
 
-<svg {...svgAttributes} set:html={innerHTML} />
+<svg {...svgAttributes} set:html={innerHTML}></svg>

src/components/AuthenticationFlow/AuthenticationForm.tsx

@@ -1,41 +0,0 @@
-import { useState } from 'react';
-import { GitHubButton } from './GitHubButton';
-import { GoogleButton } from './GoogleButton';
-import { LinkedInButton } from './LinkedInButton';
-import { EmailLoginForm } from './EmailLoginForm';
-import { EmailSignupForm } from './EmailSignupForm';
-
-type AuthenticationFormProps = {
-  type?: 'login' | 'signup';
-};
-
-export function AuthenticationForm(props: AuthenticationFormProps) {
-  const { type = 'login' } = props;
-
-  const [isDisabled, setIsDisabled] = useState(false);
-
-  return (
-    <>
-      <div className="flex w-full flex-col gap-2">
-        <GitHubButton isDisabled={isDisabled} setIsDisabled={setIsDisabled} />
-        <GoogleButton isDisabled={isDisabled} setIsDisabled={setIsDisabled} />
-        <LinkedInButton isDisabled={isDisabled} setIsDisabled={setIsDisabled} />
-      </div>
-
-      <div className="flex w-full items-center gap-2 py-6 text-sm text-slate-600">
-        <div className="h-px w-full bg-slate-200" />
-        OR
-        <div className="h-px w-full bg-slate-200" />
-      </div>
-
-      {type === 'login' ? (
-        <EmailLoginForm isDisabled={isDisabled} setIsDisabled={setIsDisabled} />
-      ) : (
-        <EmailSignupForm
-          isDisabled={isDisabled}
-          setIsDisabled={setIsDisabled}
-        />
-      )}
-    </>
-  );
-}

src/components/AuthenticationFlow/EmailLoginForm.tsx

@@ -2,16 +2,9 @@ import Cookies from 'js-cookie';
 import type { FormEvent } from 'react';
 import { useState } from 'react';
 import { httpPost } from '../../lib/http';
-import { TOKEN_COOKIE_NAME, setAuthToken } from '../../lib/jwt';
-
-type EmailLoginFormProps = {
-  isDisabled?: boolean;
-  setIsDisabled?: (isDisabled: boolean) => void;
-};
-
-export function EmailLoginForm(props: EmailLoginFormProps) {
-  const { isDisabled, setIsDisabled } = props;
+import { TOKEN_COOKIE_NAME } from '../../lib/jwt';
 
+export function EmailLoginForm() {
   const [email, setEmail] = useState<string>('');
   const [password, setPassword] = useState<string>('');
   const [error, setError] = useState('');
@@ -21,7 +14,6 @@ export function EmailLoginForm(props: EmailLoginFormProps) {
   const handleFormSubmit = async (e: FormEvent<HTMLFormElement>) => {
     e.preventDefault();
     setIsLoading(true);
-    setIsDisabled?.(true);
     setError('');
 
     const { response, error } = await httpPost<{ token: string }>(
@@ -29,12 +21,16 @@ export function EmailLoginForm(props: EmailLoginFormProps) {
       {
         email,
         password,
-      },
+      }
     );
 
     // Log the user in and reload the page
     if (response?.token) {
-      setAuthToken(response.token);
+      Cookies.set(TOKEN_COOKIE_NAME, response.token, {
+        path: '/',
+        expires: 30,
+        domain: import.meta.env.DEV ? 'localhost' : '.roadmap.sh',
+      });
       window.location.reload();
 
       return;
@@ -43,13 +39,12 @@ export function EmailLoginForm(props: EmailLoginFormProps) {
     // @todo use proper types
     if ((error as any).type === 'user_not_verified') {
       window.location.href = `/verification-pending?email=${encodeURIComponent(
-        email,
+        email
       )}`;
       return;
     }
 
     setIsLoading(false);
-    setIsDisabled?.(false);
     setError(error?.message || 'Something went wrong. Please try again later.');
   };
 
@@ -97,7 +92,7 @@ export function EmailLoginForm(props: EmailLoginFormProps) {
 
       <button
         type="submit"
-        disabled={isLoading || isDisabled}
+        disabled={isLoading}
         className="inline-flex w-full items-center justify-center rounded-lg bg-black p-2 py-3 text-sm font-medium text-white outline-none focus:ring-2 focus:ring-black focus:ring-offset-1 disabled:bg-gray-400"
       >
         {isLoading ? 'Please wait...' : 'Continue'}

src/components/AuthenticationFlow/EmailSignupForm.tsx

@@ -1,14 +1,7 @@
 import { type FormEvent, useState } from 'react';
 import { httpPost } from '../../lib/http';
 
-type EmailSignupFormProps = {
-  isDisabled?: boolean;
-  setIsDisabled?: (isDisabled: boolean) => void;
-};
-
-export function EmailSignupForm(props: EmailSignupFormProps) {
-  const { isDisabled, setIsDisabled } = props;
-
+export function EmailSignupForm() {
   const [email, setEmail] = useState('');
   const [password, setPassword] = useState('');
   const [name, setName] = useState('');
@@ -20,7 +13,6 @@ export function EmailSignupForm(props: EmailSignupFormProps) {
     e.preventDefault();
 
     setIsLoading(true);
-    setIsDisabled?.(true);
     setError('');
 
     const { response, error } = await httpPost<{ status: 'ok' }>(
@@ -29,21 +21,20 @@ export function EmailSignupForm(props: EmailSignupFormProps) {
         email,
         password,
         name,
-      },
+      }
     );
 
     if (error || response?.status !== 'ok') {
       setIsLoading(false);
-      setIsDisabled?.(false);
       setError(
-        error?.message || 'Something went wrong. Please try again later.',
+        error?.message || 'Something went wrong. Please try again later.'
       );
 
       return;
     }
 
     window.location.href = `/verification-pending?email=${encodeURIComponent(
-      email,
+      email
     )}`;
   };
 
@@ -99,7 +90,7 @@ export function EmailSignupForm(props: EmailSignupFormProps) {
 
       <button
         type="submit"
-        disabled={isLoading || isDisabled}
+        disabled={isLoading}
         className="inline-flex w-full items-center justify-center rounded-lg bg-black p-2 py-3 text-sm font-medium text-white outline-none focus:ring-2 focus:ring-black focus:ring-offset-1 disabled:bg-gray-400"
       >
         {isLoading ? 'Please wait...' : 'Continue to Verify Email'}

src/components/AuthenticationFlow/GitHubButton.tsx

@@ -1,23 +1,19 @@
 import { useEffect, useState } from 'react';
-import { GitHubIcon } from '../ReactIcons/GitHubIcon.tsx';
+import GitHubIcon from '../../icons/github.svg';
+import SpinnerIcon from '../../icons/spinner.svg';
 import Cookies from 'js-cookie';
-import { TOKEN_COOKIE_NAME, setAuthToken } from '../../lib/jwt';
+import { TOKEN_COOKIE_NAME } from '../../lib/jwt';
 import { httpGet } from '../../lib/http';
-import { Spinner } from '../ReactIcons/Spinner.tsx';
 
-type GitHubButtonProps = {
-  isDisabled?: boolean;
-  setIsDisabled?: (isDisabled: boolean) => void;
-};
+type GitHubButtonProps = {};
 
 const GITHUB_REDIRECT_AT = 'githubRedirectAt';
 const GITHUB_LAST_PAGE = 'githubLastPage';
 
 export function GitHubButton(props: GitHubButtonProps) {
-  const { isDisabled, setIsDisabled } = props;
-
   const [isLoading, setIsLoading] = useState(false);
   const [error, setError] = useState('');
+  const icon = isLoading ? SpinnerIcon : GitHubIcon;
 
   useEffect(() => {
     const urlParams = new URLSearchParams(window.location.search);
@@ -30,18 +26,16 @@ export function GitHubButton(props: GitHubButtonProps) {
     }
 
     setIsLoading(true);
-    setIsDisabled?.(true);
     httpGet<{ token: string }>(
       `${import.meta.env.PUBLIC_API_URL}/v1-github-callback${
         window.location.search
-      }`,
+      }`
     )
       .then(({ response, error }) => {
         if (!response?.token) {
           const errMessage = error?.message || 'Something went wrong.';
           setError(errMessage);
           setIsLoading(false);
-          setIsDisabled?.(false);
 
           return;
         }
@@ -62,47 +56,42 @@ export function GitHubButton(props: GitHubButtonProps) {
           }
         }
 
-        const authRedirectUrl = localStorage.getItem('authRedirect');
-        if (authRedirectUrl) {
-          localStorage.removeItem('authRedirect');
-          redirectUrl = authRedirectUrl;
-        }
-
         localStorage.removeItem(GITHUB_REDIRECT_AT);
         localStorage.removeItem(GITHUB_LAST_PAGE);
-        setAuthToken(response.token);
+        Cookies.set(TOKEN_COOKIE_NAME, response.token, {
+          path: '/',
+          expires: 30,
+          domain: import.meta.env.DEV ? 'localhost' : '.roadmap.sh',
+        });
         window.location.href = redirectUrl;
       })
       .catch((err) => {
         setError('Something went wrong. Please try again later.');
         setIsLoading(false);
-        setIsDisabled?.(false);
       });
   }, []);
 
   const handleClick = async () => {
     setIsLoading(true);
-    setIsDisabled?.(true);
 
     const { response, error } = await httpGet<{ loginUrl: string }>(
-      `${import.meta.env.PUBLIC_API_URL}/v1-github-login`,
+      `${import.meta.env.PUBLIC_API_URL}/v1-github-login`
     );
 
     if (error || !response?.loginUrl) {
       setError(
-        error?.message || 'Something went wrong. Please try again later.',
+        error?.message || 'Something went wrong. Please try again later.'
       );
 
       setIsLoading(false);
-      setIsDisabled?.(false);
       return;
     }
 
     // For non authentication pages, we want to redirect back to the page
     // the user was on before they clicked the social login button
     if (!['/login', '/signup'].includes(window.location.pathname)) {
-      const pagePath = ['/respond-invite', '/befriend', '/r', '/ai'].includes(
-        window.location.pathname,
+      const pagePath = ['/respond-invite', '/befriend'].includes(
+        window.location.pathname
       )
         ? window.location.pathname + window.location.search
         : window.location.pathname;
@@ -118,14 +107,14 @@ export function GitHubButton(props: GitHubButtonProps) {
     <>
       <button
         className="inline-flex h-10 w-full items-center justify-center gap-2 rounded border border-slate-300 bg-white p-2 text-sm font-medium text-black outline-none focus:ring-2 focus:ring-[#333] focus:ring-offset-1 disabled:cursor-not-allowed disabled:opacity-60"
-        disabled={isLoading || isDisabled}
+        disabled={isLoading}
         onClick={handleClick}
       >
-        {isLoading ? (
-          <Spinner className={'h-[18px] w-[18px]'} isDualRing={false} />
-        ) : (
-          <GitHubIcon className={'h-[18px] w-[18px]'} />
-        )}
+        <img
+          src={icon.src}
+          alt="GitHub"
+          className={`h-[18px] w-[18px] ${isLoading ? 'animate-spin' : ''}`}
+        />
         Continue with GitHub
       </button>
       {error && (

src/components/AuthenticationFlow/GoogleButton.tsx

@@ -1,23 +1,19 @@
 import { useEffect, useState } from 'react';
 import Cookies from 'js-cookie';
-import { TOKEN_COOKIE_NAME, setAuthToken } from '../../lib/jwt';
+import GoogleIcon from '../../icons/google.svg';
+import SpinnerIcon from '../../icons/spinner.svg';
+import { TOKEN_COOKIE_NAME } from '../../lib/jwt';
 import { httpGet } from '../../lib/http';
-import { Spinner } from '../ReactIcons/Spinner.tsx';
-import { GoogleIcon } from '../ReactIcons/GoogleIcon.tsx';
 
-type GoogleButtonProps = {
-  isDisabled?: boolean;
-  setIsDisabled?: (isDisabled: boolean) => void;
-};
+type GoogleButtonProps = {};
 
 const GOOGLE_REDIRECT_AT = 'googleRedirectAt';
 const GOOGLE_LAST_PAGE = 'googleLastPage';
 
 export function GoogleButton(props: GoogleButtonProps) {
-  const { isDisabled, setIsDisabled } = props;
-
   const [isLoading, setIsLoading] = useState(false);
   const [error, setError] = useState('');
+  const icon = isLoading ? SpinnerIcon : GoogleIcon;
 
   useEffect(() => {
     const urlParams = new URLSearchParams(window.location.search);
@@ -30,17 +26,15 @@ export function GoogleButton(props: GoogleButtonProps) {
     }
 
     setIsLoading(true);
-    setIsDisabled?.(true);
     httpGet<{ token: string }>(
       `${import.meta.env.PUBLIC_API_URL}/v1-google-callback${
         window.location.search
-      }`,
+      }`
     )
       .then(({ response, error }) => {
         if (!response?.token) {
           setError(error?.message || 'Something went wrong.');
           setIsLoading(false);
-          setIsDisabled?.(false);
 
           return;
         }
@@ -61,35 +55,30 @@ export function GoogleButton(props: GoogleButtonProps) {
           }
         }
 
-        const authRedirectUrl = localStorage.getItem('authRedirect');
-        if (authRedirectUrl) {
-          localStorage.removeItem('authRedirect');
-          redirectUrl = authRedirectUrl;
-        }
-
         localStorage.removeItem(GOOGLE_REDIRECT_AT);
         localStorage.removeItem(GOOGLE_LAST_PAGE);
-        setAuthToken(response.token);
+        Cookies.set(TOKEN_COOKIE_NAME, response.token, {
+          path: '/',
+          expires: 30,
+          domain: import.meta.env.DEV ? 'localhost' : '.roadmap.sh',
+        });
         window.location.href = redirectUrl;
       })
       .catch((err) => {
         setError('Something went wrong. Please try again later.');
         setIsLoading(false);
-        setIsDisabled?.(false);
       });
   }, []);
 
   const handleClick = () => {
     setIsLoading(true);
-    setIsDisabled?.(true);
     httpGet<{ loginUrl: string }>(
-      `${import.meta.env.PUBLIC_API_URL}/v1-google-login`,
+      `${import.meta.env.PUBLIC_API_URL}/v1-google-login`
     )
       .then(({ response, error }) => {
         if (!response?.loginUrl) {
           setError(error?.message || 'Something went wrong.');
           setIsLoading(false);
-          setIsDisabled?.(false);
 
           return;
         }
@@ -97,11 +86,10 @@ export function GoogleButton(props: GoogleButtonProps) {
         // For non authentication pages, we want to redirect back to the page
         // the user was on before they clicked the social login button
         if (!['/login', '/signup'].includes(window.location.pathname)) {
-          const pagePath = ['/respond-invite', '/befriend', '/r', '/ai'].includes(
-            window.location.pathname,
-          )
-            ? window.location.pathname + window.location.search
-            : window.location.pathname;
+          const pagePath =
+            ['/respond-invite', '/befriend'].includes(window.location.pathname)
+              ? window.location.pathname + window.location.search
+              : window.location.pathname;
 
           localStorage.setItem(GOOGLE_REDIRECT_AT, Date.now().toString());
           localStorage.setItem(GOOGLE_LAST_PAGE, pagePath);
@@ -112,7 +100,6 @@ export function GoogleButton(props: GoogleButtonProps) {
       .catch((err) => {
         setError('Something went wrong. Please try again later.');
         setIsLoading(false);
-        setIsDisabled?.(false);
       });
   };
 
@@ -120,14 +107,14 @@ export function GoogleButton(props: GoogleButtonProps) {
     <>
       <button
         className="inline-flex h-10 w-full items-center justify-center gap-2 rounded border border-slate-300 bg-white p-2 text-sm font-medium text-black outline-none focus:ring-2 focus:ring-[#333] focus:ring-offset-1 disabled:cursor-not-allowed disabled:opacity-60"
-        disabled={isLoading || isDisabled}
+        disabled={isLoading}
         onClick={handleClick}
       >
-        {isLoading ? (
-          <Spinner className={'h-[18px] w-[18px]'} isDualRing={false} />
-        ) : (
-          <GoogleIcon className={'h-[18px] w-[18px]'} />
-        )}
+        <img
+          src={icon.src}
+          alt="Google"
+          className={`h-[18px] w-[18px] ${isLoading ? 'animate-spin' : ''}`}
+        />
         Continue with Google
       </button>
       {error && (

src/components/AuthenticationFlow/LinkedInButton.tsx

@@ -1,23 +1,19 @@
 import { useEffect, useState } from 'react';
 import Cookies from 'js-cookie';
-import { TOKEN_COOKIE_NAME, setAuthToken } from '../../lib/jwt';
+import LinkedIn from '../../icons/linkedin.svg';
+import SpinnerIcon from '../../icons/spinner.svg';
+import { TOKEN_COOKIE_NAME } from '../../lib/jwt';
 import { httpGet } from '../../lib/http';
-import { Spinner } from '../ReactIcons/Spinner.tsx';
-import { LinkedInIcon } from '../ReactIcons/LinkedInIcon.tsx';
 
-type LinkedInButtonProps = {
-  isDisabled?: boolean;
-  setIsDisabled?: (isDisabled: boolean) => void;
-};
+type LinkedInButtonProps = {};
 
 const LINKEDIN_REDIRECT_AT = 'linkedInRedirectAt';
 const LINKEDIN_LAST_PAGE = 'linkedInLastPage';
 
 export function LinkedInButton(props: LinkedInButtonProps) {
-  const { isDisabled, setIsDisabled } = props;
-
   const [isLoading, setIsLoading] = useState(false);
   const [error, setError] = useState('');
+  const icon = isLoading ? SpinnerIcon : LinkedIn;
 
   useEffect(() => {
     const urlParams = new URLSearchParams(window.location.search);
@@ -30,17 +26,15 @@ export function LinkedInButton(props: LinkedInButtonProps) {
     }
 
     setIsLoading(true);
-    setIsDisabled?.(true);
     httpGet<{ token: string }>(
       `${import.meta.env.PUBLIC_API_URL}/v1-linkedin-callback${
         window.location.search
-      }`,
+      }`
     )
       .then(({ response, error }) => {
         if (!response?.token) {
           setError(error?.message || 'Something went wrong.');
           setIsLoading(false);
-          setIsDisabled?.(false);
 
           return;
         }
@@ -61,35 +55,30 @@ export function LinkedInButton(props: LinkedInButtonProps) {
           }
         }
 
-        const authRedirectUrl = localStorage.getItem('authRedirect');
-        if (authRedirectUrl) {
-          localStorage.removeItem('authRedirect');
-          redirectUrl = authRedirectUrl;
-        }
-
         localStorage.removeItem(LINKEDIN_REDIRECT_AT);
         localStorage.removeItem(LINKEDIN_LAST_PAGE);
-        setAuthToken(response.token);
+        Cookies.set(TOKEN_COOKIE_NAME, response.token, {
+          path: '/',
+          expires: 30,
+          domain: import.meta.env.DEV ? 'localhost' : '.roadmap.sh',
+        });
         window.location.href = redirectUrl;
       })
       .catch((err) => {
         setError('Something went wrong. Please try again later.');
         setIsLoading(false);
-        setIsDisabled?.(false);
       });
   }, []);
 
   const handleClick = () => {
     setIsLoading(true);
-    setIsDisabled?.(true);
     httpGet<{ loginUrl: string }>(
-      `${import.meta.env.PUBLIC_API_URL}/v1-linkedin-login`,
+      `${import.meta.env.PUBLIC_API_URL}/v1-linkedin-login`
     )
       .then(({ response, error }) => {
         if (!response?.loginUrl) {
           setError(error?.message || 'Something went wrong.');
           setIsLoading(false);
-          setIsDisabled?.(false);
 
           return;
         }
@@ -97,8 +86,8 @@ export function LinkedInButton(props: LinkedInButtonProps) {
         // For non authentication pages, we want to redirect back to the page
         // the user was on before they clicked the social login button
         if (!['/login', '/signup'].includes(window.location.pathname)) {
-          const pagePath = ['/respond-invite', '/befriend', '/r', '/ai'].includes(
-            window.location.pathname,
+          const pagePath = ['/respond-invite', '/befriend'].includes(
+            window.location.pathname
           )
             ? window.location.pathname + window.location.search
             : window.location.pathname;
@@ -112,7 +101,6 @@ export function LinkedInButton(props: LinkedInButtonProps) {
       .catch((err) => {
         setError('Something went wrong. Please try again later.');
         setIsLoading(false);
-        setIsDisabled?.(false);
       });
   };
 
@@ -120,14 +108,14 @@ export function LinkedInButton(props: LinkedInButtonProps) {
     <>
       <button
         className="inline-flex h-10 w-full items-center justify-center gap-2 rounded border border-slate-300 bg-white p-2 text-sm font-medium text-black outline-none focus:ring-2 focus:ring-[#333] focus:ring-offset-1 disabled:cursor-not-allowed disabled:opacity-60"
-        disabled={isLoading || isDisabled}
+        disabled={isLoading}
         onClick={handleClick}
       >
-        {isLoading ? (
-          <Spinner className={'h-[18px] w-[18px]'} isDualRing={false} />
-        ) : (
-          <LinkedInIcon className={'h-[18px] w-[18px]'} />
-        )}
+        <img
+          src={icon.src}
+          alt="Google"
+          className={`h-[18px] w-[18px] ${isLoading ? 'animate-spin' : ''}`}
+        />
         Continue with LinkedIn
       </button>
       {error && (

src/components/AuthenticationFlow/LoginPopup.astro

@@ -1,10 +1,14 @@
 ---
 import Popup from '../Popup/Popup.astro';
-import { AuthenticationForm } from './AuthenticationForm';
+import { EmailLoginForm } from './EmailLoginForm';
+import Divider from './Divider.astro';
+import { GitHubButton } from './GitHubButton';
+import { GoogleButton } from './GoogleButton';
+import { LinkedInButton } from './LinkedInButton';
 ---
 
 <Popup id='login-popup' title='' subtitle=''>
-  <div class='mb-7 text-center'>
+  <div class='text-center'>
     <p class='mb-3 text-2xl font-semibold leading-5 text-slate-900'>
       Login to your account
     </p>
@@ -12,9 +16,19 @@ import { AuthenticationForm } from './AuthenticationForm';
       You must be logged in to perform this action.
     </p>
   </div>
-  <AuthenticationForm client:load />
+
+  <div class='mt-7 flex flex-col gap-2'>
+    <GitHubButton client:load />
+    <GoogleButton client:load />
+    <LinkedInButton client:load />
+  </div>
+
+  <Divider />
+
+  <EmailLoginForm client:load />
+
   <div class='mt-6 text-center text-sm text-slate-600'>
     Don't have an account?{' '}
-    <a href='/signup' class='font-medium text-[#4285f4]'> Sign up</a>
+    <a href='/signup' class='font-medium text-[#4285f4]'>Sign up</a>
   </div>
 </Popup>

src/components/AuthenticationFlow/ResetPasswordForm.tsx

@@ -1,7 +1,7 @@
 import { type FormEvent, useEffect, useState } from 'react';
 import { httpPost } from '../../lib/http';
 import Cookies from 'js-cookie';
-import { TOKEN_COOKIE_NAME, setAuthToken } from '../../lib/jwt';
+import { TOKEN_COOKIE_NAME } from '../../lib/jwt';
 
 export function ResetPasswordForm() {
   const [code, setCode] = useState('');
@@ -37,7 +37,7 @@ export function ResetPasswordForm() {
         newPassword: password,
         confirmPassword: passwordConfirm,
         code,
-      },
+      }
     );
 
     if (error?.message) {
@@ -53,7 +53,11 @@ export function ResetPasswordForm() {
     }
 
     const token = response.token;
-    setAuthToken(response.token);
+    Cookies.set(TOKEN_COOKIE_NAME, token, {
+      path: '/',
+      expires: 30,
+      domain: import.meta.env.DEV ? 'localhost' : '.roadmap.sh',
+    });
     window.location.href = '/';
   };
 

src/components/AuthenticationFlow/TriggerVerifyAccount.tsx

@@ -1,9 +1,9 @@
 import { useEffect, useState } from 'react';
 import Cookies from 'js-cookie';
 import { httpPost } from '../../lib/http';
-import { TOKEN_COOKIE_NAME, setAuthToken } from '../../lib/jwt';
-import { Spinner } from '../ReactIcons/Spinner';
-import { ErrorIcon2 } from '../ReactIcons/ErrorIcon2';
+import ErrorIcon from '../../icons/error.svg';
+import SpinnerIcon from '../../icons/spinner.svg';
+import { TOKEN_COOKIE_NAME } from '../../lib/jwt';
 
 export function TriggerVerifyAccount() {
   const [isLoading, setIsLoading] = useState(true);
@@ -16,7 +16,7 @@ export function TriggerVerifyAccount() {
       `${import.meta.env.PUBLIC_API_URL}/v1-verify-account`,
       {
         code,
-      },
+      }
     )
       .then(({ response, error }) => {
         if (!response?.token) {
@@ -26,7 +26,11 @@ export function TriggerVerifyAccount() {
           return;
         }
 
-        setAuthToken(response.token);
+        Cookies.set(TOKEN_COOKIE_NAME, response.token, {
+          path: '/',
+          expires: 30,
+          domain: import.meta.env.DEV ? 'localhost' : '.roadmap.sh',
+        });
         window.location.href = '/';
       })
       .catch((err) => {
@@ -51,8 +55,20 @@ export function TriggerVerifyAccount() {
   return (
     <div className="mx-auto flex max-w-md flex-col items-center pt-0 sm:pt-12">
       <div className="mx-auto max-w-md text-center">
-        {isLoading && <Spinner className="mx-auto h-16 w-16" />}
-        {error && <ErrorIcon2 className="mx-auto h-16 w-16" />}
+        {isLoading && (
+          <img
+            alt={'Please wait.'}
+            src={SpinnerIcon.src}
+            className={'mx-auto h-16 w-16 animate-spin'}
+          />
+        )}
+        {error && (
+          <img
+            alt={'Please wait.'}
+            src={ErrorIcon.src}
+            className={'mx-auto h-16 w-16'}
+          />
+        )}
         <h2 className="mb-1 mt-4 text-center text-xl font-semibold sm:mb-3 sm:mt-4 sm:text-2xl">
           Verifying your account
         </h2>

src/components/AuthenticationFlow/VerificationEmailMessage.tsx

@@ -1,6 +1,6 @@
 import { useEffect, useState } from 'react';
+import VerifyLetterIcon from '../../icons/verify-letter.svg';
 import { httpPost } from '../../lib/http';
-import { VerifyLetterIcon } from '../ReactIcons/VerifyLetterIcon';
 
 export function VerificationEmailMessage() {
   const [email, setEmail] = useState('..');
@@ -37,7 +37,11 @@ export function VerificationEmailMessage() {
 
   return (
     <div className="mx-auto max-w-md text-center">
-      <VerifyLetterIcon className="mx-auto mb-4 h-20 w-40 sm:h-40" />
+      <img
+        alt="Verify Email"
+        src={VerifyLetterIcon.src}
+        className="mx-auto mb-4 h-20 w-40 sm:h-40"
+      />
       <h2 className="my-2 text-center text-xl font-semibold sm:my-5 sm:text-2xl">
         Verify your email address
       </h2>

src/components/Authenticator/authenticator.ts

@@ -36,7 +36,6 @@ function handleGuest() {
     '/account/notification',
     '/account/update-password',
     '/account/settings',
-    '/account/roadmaps',
     '/account/road-card',
     '/account/friends',
     '/account',
@@ -73,10 +72,7 @@ function handleAuthenticated() {
 
   // If the user is on a guest route, redirect them to the home page
   if (guestRoutes.includes(window.location.pathname)) {
-    const authRedirect = window.localStorage.getItem('authRedirect') || '/';
-    window.localStorage.removeItem('authRedirect');
-
-    window.location.href = authRedirect;
+    window.location.href = '/';
   }
 }
 

src/components/CommandMenu/CommandMenu.tsx

@@ -1,47 +1,35 @@
-import {
-  Fragment,
-  type ReactElement,
-  useEffect,
-  useRef,
-  useState,
-} from 'react';
+import { Fragment, useEffect, useRef, useState } from 'react';
 import { useKeydown } from '../../hooks/use-keydown';
 import { useOutsideClick } from '../../hooks/use-outside-click';
+import BestPracticesIcon from '../../icons/best-practices.svg';
+import ClipboardIcon from '../../icons/clipboard.svg';
+import GuideIcon from '../../icons/guide.svg';
+import HomeIcon from '../../icons/home.svg';
+import RoadmapIcon from '../../icons/roadmap.svg';
+import UserIcon from '../../icons/user.svg';
+import GroupIcon from '../../icons/group.svg';
+import VideoIcon from '../../icons/video.svg';
 import { httpGet } from '../../lib/http';
 import { isLoggedIn } from '../../lib/jwt';
-import { BestPracticesIcon } from '../ReactIcons/BestPracticesIcon.tsx';
-import { UserIcon } from '../ReactIcons/UserIcon.tsx';
-import { GroupIcon } from '../ReactIcons/GroupIcon.tsx';
-import { RoadmapIcon } from '../ReactIcons/RoadmapIcon.tsx';
-import { ClipboardIcon } from '../ReactIcons/ClipboardIcon.tsx';
-import { GuideIcon } from '../ReactIcons/GuideIcon.tsx';
-import { HomeIcon } from '../ReactIcons/HomeIcon.tsx';
-import { VideoIcon } from '../ReactIcons/VideoIcon.tsx';
 
 export type PageType = {
   id: string;
   url: string;
   title: string;
   group: string;
-  icon?: ReactElement;
+  icon?: string;
   isProtected?: boolean;
   metadata?: Record<string, any>;
 };
 
 const defaultPages: PageType[] = [
-  {
-    id: 'home',
-    url: '/',
-    title: 'Home',
-    group: 'Pages',
-    icon: <HomeIcon className="mr-2 h-4 w-4 stroke-2" />,
-  },
+  { id: 'home', url: '/', title: 'Home', group: 'Pages', icon: HomeIcon.src },
   {
     id: 'account',
     url: '/account',
     title: 'Account',
     group: 'Pages',
-    icon: <UserIcon className="mr-2 h-4 w-4 stroke-2" />,
+    icon: UserIcon.src,
     isProtected: true,
   },
   {
@@ -49,15 +37,7 @@ const defaultPages: PageType[] = [
     url: '/team',
     title: 'Teams',
     group: 'Pages',
-    icon: <GroupIcon className="mr-2 h-4 w-4 stroke-2" />,
-    isProtected: true,
-  },
-  {
-    id: 'friends',
-    url: '/account/friends',
-    title: 'Friends',
-    group: 'Pages',
-    icon: <GroupIcon className="mr-2 h-4 w-4 stroke-2" />,
+    icon: GroupIcon.src,
     isProtected: true,
   },
   {
@@ -65,43 +45,35 @@ const defaultPages: PageType[] = [
     url: '/roadmaps',
     title: 'Roadmaps',
     group: 'Pages',
-    icon: <RoadmapIcon className="mr-2 h-4 w-4 stroke-2" />,
-  },
-  {
-    id: 'account-roadmaps',
-    url: '/account/roadmaps',
-    title: 'Custom Roadmaps',
-    group: 'Pages',
-    icon: <RoadmapIcon className="mr-2 h-4 w-4 stroke-2" />,
-    isProtected: true,
+    icon: RoadmapIcon.src,
   },
   {
     id: 'best-practices',
     url: '/best-practices',
     title: 'Best Practices',
     group: 'Pages',
-    icon: <BestPracticesIcon className="mr-2 h-4 w-4 stroke-2" />,
+    icon: BestPracticesIcon.src,
   },
   {
     id: 'questions',
     url: '/questions',
     title: 'Questions',
     group: 'Pages',
-    icon: <ClipboardIcon className="mr-2 h-4 w-4 stroke-2" />,
+    icon: ClipboardIcon.src,
   },
   {
     id: 'guides',
     url: '/guides',
     title: 'Guides',
     group: 'Pages',
-    icon: <GuideIcon className="mr-2 h-4 w-4 stroke-2" />,
+    icon: GuideIcon.src,
   },
   {
     id: 'videos',
     url: '/videos',
     title: 'Videos',
     group: 'Pages',
-    icon: <VideoIcon className="mr-2 h-4 w-4 stroke-2" />,
+    icon: VideoIcon.src,
   },
 ];
 
@@ -211,7 +183,7 @@ export function CommandMenu() {
               } else if (e.key === 'ArrowUp') {
                 const canGoPrev = activeCounter > 0;
                 setActiveCounter(
-                  canGoPrev ? activeCounter - 1 : searchResults.length - 1,
+                  canGoPrev ? activeCounter - 1 : searchResults.length - 1
                 );
               } else if (e.key === 'Tab') {
                 e.preventDefault();
@@ -254,7 +226,13 @@ export function CommandMenu() {
                       {!page.icon && (
                         <span className="mr-2 text-gray-400">{page.group}</span>
                       )}
-                      {page.icon && page.icon}
+                      {page.icon && (
+                        <img
+                          alt={page.title}
+                          src={page.icon}
+                          className="mr-2 h-4 w-4"
+                        />
+                      )}
                       {page.title}
                     </a>
                   </Fragment>

src/components/CreateTeam/NotDropdown.tsx

@@ -1,4 +1,4 @@
-import { ChevronDownIcon } from '../ReactIcons/ChevronDownIcon';
+import ChevronDownIcon from '../../icons/chevron-down.svg';
 
 type NotDropdownProps = {
   onClick: () => void;
@@ -37,7 +37,11 @@ export function NotDropdown(props: NotDropdownProps) {
         </div>
       )}
 
-      <ChevronDownIcon className="relative top-[1px] h-[17px] w-[17px] opacity-40" />
+      <img
+        alt={singularName}
+        src={ChevronDownIcon.src}
+        className={'relative top-[1px] h-[17px] w-[17px] opacity-40'}
+      />
     </div>
   );
 }

src/components/CreateTeam/RoadmapSelector.tsx

@@ -1,53 +1,37 @@
 import { useEffect, useState } from 'react';
 import { httpGet, httpPut } from '../../lib/http';
 import type { PageType } from '../CommandMenu/CommandMenu';
+import ChevronDownIcon from '../../icons/chevron-down.svg';
 import { pageProgressMessage } from '../../stores/page';
+import type { TeamDocument } from './CreateTeamForm';
 import { UpdateTeamResourceModal } from './UpdateTeamResourceModal';
 import { SelectRoadmapModal } from './SelectRoadmapModal';
-import { Map, Shapes } from 'lucide-react';
-import type {
-  AllowedRoadmapVisibility,
-  RoadmapDocument,
-} from '../CustomRoadmap/CreateRoadmap/CreateRoadmapModal';
-import { CreateRoadmapModal } from '../CustomRoadmap/CreateRoadmap/CreateRoadmapModal';
-import { useToast } from '../../hooks/use-toast';
+import { NotDropdown } from './NotDropdown';
 
 export type TeamResourceConfig = {
-  isCustomResource: boolean;
-  title: string;
-  description?: string;
-  visibility?: AllowedRoadmapVisibility;
   resourceId: string;
   resourceType: string;
   removed: string[];
-  topics?: number;
-  sharedTeamMemberIds: string[];
-  sharedFriendIds: string[];
 }[];
 
 type RoadmapSelectorProps = {
   teamId: string;
-  teamResources: TeamResourceConfig;
-  setTeamResources: (config: TeamResourceConfig) => void;
+  teamResourceConfig: TeamResourceConfig;
+  setTeamResourceConfig: (config: TeamResourceConfig) => void;
 };
 
 export function RoadmapSelector(props: RoadmapSelectorProps) {
-  const { teamId, teamResources = [], setTeamResources } = props;
+  const { teamId, teamResourceConfig = [], setTeamResourceConfig } = props;
 
-  const toast = useToast();
-  const [removingRoadmapId, setRemovingRoadmapId] = useState<string>('');
   const [showSelectRoadmapModal, setShowSelectRoadmapModal] = useState(false);
   const [allRoadmaps, setAllRoadmaps] = useState<PageType[]>([]);
   const [changingRoadmapId, setChangingRoadmapId] = useState<string>('');
-  const [isCreatingRoadmap, setIsCreatingRoadmap] = useState<boolean>(false);
-
   const [error, setError] = useState<string>('');
 
   async function loadAllRoadmaps() {
     const { error, response } = await httpGet<PageType[]>(`/pages.json`);
 
     if (error) {
-      toast.error(error.message || 'Something went wrong. Please try again!');
       setError(error.message || 'Something went wrong. Please try again!');
       return;
     }
@@ -88,7 +72,7 @@ export function RoadmapSelector(props: RoadmapSelectorProps) {
       return;
     }
 
-    setTeamResources(response);
+    setTeamResourceConfig(response);
   }
 
   async function onRemove(resourceId: string) {
@@ -122,25 +106,13 @@ export function RoadmapSelector(props: RoadmapSelectorProps) {
       return;
     }
 
-    setTeamResources(response);
+    setTeamResourceConfig(response);
   }
 
   useEffect(() => {
-    loadAllRoadmaps().finally(() => {});
+    loadAllRoadmaps().finally();
   }, []);
 
-  function handleCustomRoadmapCreated(roadmap: RoadmapDocument) {
-    const { _id: roadmapId } = roadmap;
-    if (!roadmapId) {
-      return;
-    }
-
-    loadAllRoadmaps().finally(() => {});
-    addTeamResource(roadmapId).finally(() => {
-      pageProgressMessage.set('');
-    });
-  }
-
   return (
     <div>
       {changingRoadmapId && (
@@ -149,9 +121,9 @@ export function RoadmapSelector(props: RoadmapSelectorProps) {
           resourceId={changingRoadmapId}
           resourceType={'roadmap'}
           teamId={teamId}
-          setTeamResourceConfig={setTeamResources}
+          setTeamResourceConfig={setTeamResourceConfig}
           defaultRemovedItems={
-            teamResources.find((c) => c.resourceId === changingRoadmapId)
+            teamResourceConfig.find((c) => c.resourceId === changingRoadmapId)
               ?.removed || []
           }
         />
@@ -159,7 +131,7 @@ export function RoadmapSelector(props: RoadmapSelectorProps) {
       {showSelectRoadmapModal && (
         <SelectRoadmapModal
           onClose={() => setShowSelectRoadmapModal(false)}
-          teamResourceConfig={teamResources}
+          teamResourceConfig={teamResourceConfig}
           allRoadmaps={allRoadmaps}
           teamId={teamId}
           onRoadmapAdd={(roadmapId) => {
@@ -173,170 +145,72 @@ export function RoadmapSelector(props: RoadmapSelectorProps) {
         />
       )}
 
-      <div className="my-3 flex items-center gap-4">
-        {isCreatingRoadmap && (
-          <CreateRoadmapModal
-            teamId={teamId}
-            onClose={() => setIsCreatingRoadmap(false)}
-            onCreated={(roadmap: RoadmapDocument) => {
-              handleCustomRoadmapCreated(roadmap);
-              setIsCreatingRoadmap(false);
-            }}
-          />
-        )}
-
-        <button
-          className="flex h-10 grow items-center justify-center gap-2 rounded-md border border-black bg-white text-black transition-colors hover:bg-black hover:text-white"
+      <div className="mt-3">
+        <NotDropdown
           onClick={() => {
             setShowSelectRoadmapModal(true);
           }}
-        >
-          <Map className="h-4 w-4 stroke-[2.5]" />
-          Pick from our roadmaps
-        </button>
-
-        <span className="text-base text-gray-400">or</span>
-
-        <button
-          className="flex h-10 grow items-center justify-center gap-2 rounded-md border border-black bg-white text-black transition-colors hover:bg-black hover:text-white"
-          onClick={() => {
-            setIsCreatingRoadmap(true);
-          }}
-        >
-          <Shapes className="h-4 w-4 stroke-[2.5]" />
-          Create Custom Roadmap
-        </button>
+          selectedCount={teamResourceConfig.length}
+          singularName={'roadmap'}
+          pluralName={'roadmaps'}
+        />
       </div>
 
-      {!teamResources.length && (
-        <div className="flex min-h-[240px] flex-col items-center justify-center rounded-lg border">
-          <Map className="mb-2 h-12 w-12 text-gray-300" />
-          <p className={'text-lg font-semibold'}>No roadmaps selected.</p>
-          <p className={'text-base text-gray-400'}>
-            Pick from{' '}
-            <span
-              onClick={() => setShowSelectRoadmapModal(true)}
-              className="cursor-pointer underline"
-            >
-              our roadmaps
-            </span>{' '}
-            or{' '}
-            <span
-              onClick={() => {
-                setIsCreatingRoadmap(true);
-              }}
-              className="cursor-pointer underline"
-            >
-              create a new one
-            </span>
-            .
-          </p>
-        </div>
+      {!teamResourceConfig.length && (
+        <p className={'mb-3 mt-2 text-base text-gray-400'}>
+          No roadmaps selected.
+        </p>
       )}
 
-      {teamResources.length > 0 && (
-        <div className="mb-3 grid grid-cols-1 flex-wrap gap-2.5 sm:grid-cols-3">
-          {teamResources.map(
-            ({
-              isCustomResource,
-              title: roadmapTitle,
-              resourceId,
-              removed: removedTopics,
-              topics,
-            }) => {
-              return (
-                <div
-                  className="relative flex flex-col items-start overflow-hidden rounded-md border border-gray-300"
-                  key={resourceId}
-                >
-                  <div className={'w-full flex-grow px-3 pb-2 pt-4'}>
-                    <span className="mb-0.5 block text-base font-medium leading-snug text-black">
-                      {roadmapTitle}
+      {teamResourceConfig.length > 0 && (
+        <div className="mt-4 grid grid-cols-1 sm:grid-cols-3 flex-wrap gap-2.5">
+          {teamResourceConfig.map(({ resourceId, removed: removedTopics }) => {
+            const roadmapTitle =
+              allRoadmaps.find((roadmap) => roadmap.id === resourceId)?.title ||
+              '...';
+
+            return (
+              <div className="flex flex-col items-start rounded-md border border-gray-300">
+                <div className={'w-full px-3 pb-2 pt-4'}>
+                  <span className="mb-0.5 block text-base font-medium leading-none text-black">
+                    {roadmapTitle}
+                  </span>
+                  {removedTopics.length > 0 ? (
+                    <span className={'text-xs leading-none text-gray-900'}>
+                      {removedTopics.length} topic
+                      {removedTopics.length > 1 ? 's' : ''} removed
+                    </span>
+                  ) : (
+                    <span className="text-xs italic leading-none text-gray-400/60">
+                      No changes made ..
                     </span>
-                    {removedTopics.length > 0 || (topics && topics > 0) ? (
-                      <span className={'text-xs leading-none text-gray-400'}>
-                        {isCustomResource ? (
-                          <>
-                            Custom &middot; {topics} topic
-                            {topics && topics > 1 ? 's' : ''}
-                          </>
-                        ) : (
-                          <>
-                            {removedTopics.length} topic
-                            {removedTopics.length > 1 ? 's' : ''} removed
-                          </>
-                        )}
-                      </span>
-                    ) : (
-                      <span className="text-xs italic leading-none text-gray-400/60">
-                        {isCustomResource
-                          ? 'Placeholder roadmap.'
-                          : 'No changes made ..'}
-                      </span>
-                    )}
-                  </div>
-
-                  {removingRoadmapId === resourceId && (
-                    <div
-                      className={
-                        'flex w-full items-center justify-end p-3 text-sm'
-                      }
-                    >
-                      <span className="text-xs text-gray-500">
-                        Are you sure?{' '}
-                        <button
-                          onClick={() => onRemove(resourceId)}
-                          className="mx-0.5 text-red-500 underline underline-offset-1"
-                        >
-                          Yes
-                        </button>{' '}
-                        <button
-                          onClick={() => setRemovingRoadmapId('')}
-                          className="text-red-500 underline underline-offset-1"
-                        >
-                          No
-                        </button>
-                      </span>
-                    </div>
-                  )}
-                  {(!removingRoadmapId || removingRoadmapId !== resourceId) && (
-                    <div className={'flex w-full justify-between p-3'}>
-                      <button
-                        type="button"
-                        className={
-                          'text-xs text-gray-500 underline hover:text-black focus:outline-none'
-                        }
-                        onClick={() => {
-                          if (isCustomResource) {
-                            window.open(
-                              `${
-                                import.meta.env.PUBLIC_EDITOR_APP_URL
-                              }/${resourceId}`,
-                              '_blank'
-                            );
-                            return;
-                          }
-                          setChangingRoadmapId(resourceId);
-                        }}
-                      >
-                        Customize
-                      </button>
-
-                      <button
-                        type="button"
-                        className={
-                          'text-xs text-red-500 underline hover:text-black'
-                        }
-                        onClick={() => setRemovingRoadmapId(resourceId)}
-                      >
-                        Remove
-                      </button>
-                    </div>
                   )}
                 </div>
-              );
-            }
-          )}
+
+                <div className={'flex w-full justify-between p-3'}>
+                  <button
+                    type="button"
+                    className={
+                      'text-xs text-gray-500 underline hover:text-black focus:outline-none'
+                    }
+                    onClick={() => setChangingRoadmapId(resourceId)}
+                  >
+                    Customize
+                  </button>
+
+                  <button
+                    type="button"
+                    className={
+                      'text-xs text-red-500 underline hover:text-black'
+                    }
+                    onClick={() => onRemove(resourceId)}
+                  >
+                    Remove
+                  </button>
+                </div>
+              </div>
+            );
+          })}
         </div>
       )}
     </div>

src/components/CreateTeam/SelectRoadmapModal.tsx

@@ -3,8 +3,8 @@ import { useKeydown } from '../../hooks/use-keydown';
 import { useOutsideClick } from '../../hooks/use-outside-click';
 import type { PageType } from '../CommandMenu/CommandMenu';
 import type { TeamResourceConfig } from './RoadmapSelector';
+import CloseIcon from '../../icons/close.svg';
 import { SelectRoadmapModalItem } from './SelectRoadmapModalItem';
-import { XIcon } from 'lucide-react';
 
 export type SelectRoadmapModalProps = {
   teamId: string;
@@ -60,11 +60,11 @@ export function SelectRoadmapModal(props: SelectRoadmapModalProps) {
     setSearchResults(searchResults);
   }, [searchText, allRoadmaps]);
 
-  const roleBasedRoadmaps = searchResults.filter(
-    (roadmap) => roadmap?.metadata?.tags?.includes('role-roadmap'),
+  const roleBasedRoadmaps = searchResults.filter((roadmap) =>
+    roadmap?.metadata?.tags?.includes('role-roadmap')
   );
-  const skillBasedRoadmaps = searchResults.filter(
-    (roadmap) => roadmap?.metadata?.tags?.includes('skill-roadmap'),
+  const skillBasedRoadmaps = searchResults.filter((roadmap) =>
+    roadmap?.metadata?.tags?.includes('skill-roadmap')
   );
 
   return (
@@ -79,7 +79,7 @@ export function SelectRoadmapModal(props: SelectRoadmapModalProps) {
             className="popup-close absolute right-2.5 top-3 ml-auto inline-flex items-center rounded-lg bg-transparent p-1.5 text-sm text-gray-400 hover:bg-gray-100 hover:text-gray-900"
             onClick={onClose}
           >
-            <XIcon className="h-4 w-4" />
+            <img alt={'close'} src={CloseIcon.src} className="h-4 w-4" />
             <span className="sr-only">Close modal</span>
           </button>
           <input
@@ -100,13 +100,12 @@ export function SelectRoadmapModal(props: SelectRoadmapModalProps) {
             {roleBasedRoadmaps.length > 0 && (
               <div className="mb-5 flex flex-wrap items-center gap-2">
                 {roleBasedRoadmaps.map((roadmap) => {
-                  const isSelected = !!teamResourceConfig?.find(
-                    (r) => r.resourceId === roadmap.id,
+                  const isSelected = !!teamResourceConfig.find(
+                    (r) => r.resourceId === roadmap.id
                   );
 
                   return (
                     <SelectRoadmapModalItem
-                      key={roadmap.id}
                       title={roadmap.title}
                       isSelected={isSelected}
                       onClick={() => {
@@ -127,12 +126,11 @@ export function SelectRoadmapModal(props: SelectRoadmapModalProps) {
             <div className="flex flex-wrap items-center gap-2">
               {skillBasedRoadmaps.map((roadmap) => {
                 const isSelected = !!teamResourceConfig.find(
-                  (r) => r.resourceId === roadmap.id,
+                  (r) => r.resourceId === roadmap.id
                 );
 
                 return (
                   <SelectRoadmapModalItem
-                    key={roadmap.id}
                     title={roadmap.title}
                     isSelected={isSelected}
                     onClick={() => {

src/components/CreateTeam/Step0.tsx

@@ -1,24 +1,22 @@
+import BuildingIcon from '../../icons/building.svg';
+import UsersIcon from '../../icons/users.svg';
 import type { TeamDocument } from './CreateTeamForm';
 import { httpPut } from '../../lib/http';
 import { useState } from 'react';
 import { NextButton } from './NextButton';
-import { BuildingIcon } from '../ReactIcons/BuildingIcon.tsx';
-import { UsersIcon } from '../ReactIcons/UsersIcon.tsx';
 
 export const validTeamTypes = [
   {
     value: 'company',
     label: 'Company',
-    icon: BuildingIcon,
-    description:
-      'Track the skills and learning progress of the tech team at your company',
+    icon: BuildingIcon.src,
+    description: 'Track the skills and learning progress of the tech team at your company',
   },
   {
     value: 'study_group',
     label: 'Study Group',
-    icon: UsersIcon,
-    description:
-      'Invite your friends or course-mates and track your learning progress together',
+    icon: UsersIcon.src,
+    description: 'Invite your friends or course-mates and track your learning progress together',
   },
 ] as const;
 
@@ -56,7 +54,7 @@ export function Step0(props: Step0Props) {
           teamSize: team.teamSize,
           linkedInUrl: team?.links?.linkedIn || undefined,
         }),
-      },
+      }
     );
 
     if (error || !response) {
@@ -72,28 +70,27 @@ export function Step0(props: Step0Props) {
 
   return (
     <>
-      <div className={'flex flex-col gap-3 sm:flex-row'}>
+      <div className={'flex flex-col sm:flex-row gap-3'}>
         {validTeamTypes.map((validTeamType) => (
           <button
-            key={validTeamType.value}
-            className={`flex flex-grow flex-col items-center rounded-lg border px-5 pb-10 pt-12 ${
+            className={`flex flex-grow flex-col items-center rounded-lg border px-5 py-12 ${
               validTeamType.value == selectedTeamType
                 ? 'border-gray-400 bg-gray-100'
                 : 'border-gray-300 hover:border-gray-400 hover:bg-gray-50'
             }`}
             onClick={() => setSelectedTeamType(validTeamType.value)}
           >
-            {
-              <validTeamType.icon
-                className={`mb-3 h-12 w-12 opacity-10 ${
-                  validTeamType.value === selectedTeamType ? 'opacity-100' : ''
-                }`}
-              />
-            }
+            <img
+              alt={validTeamType.label}
+              src={validTeamType.icon}
+              className={`mb-3 h-12 w-12 opacity-10 ${
+                validTeamType.value === selectedTeamType ? 'opacity-100' : ''
+              }`}
+            />
             <span className="mb-2 block text-2xl font-bold">
               {validTeamType.label}
             </span>
-            <span className="text-sm leading-[21px] text-gray-500">
+            <span className="text-sm text-gray-500 leading-[21px]">
               {validTeamType.description}
             </span>
           </button>
@@ -103,11 +100,11 @@ export function Step0(props: Step0Props) {
       {/*Error message*/}
       {error && <div className="mt-4 text-sm text-red-500">{error}</div>}
 
-      <div className="mt-4 flex flex-col items-stretch justify-between gap-2 md:flex-row md:items-center">
+      <div className="mt-4 flex flex-col md:flex-row items-stretch md:items-center justify-between gap-2">
         <a
           href="/account"
           className={
-            'rounded-md border border-red-400 bg-white px-8 py-2 text-center text-red-500'
+            'rounded-md border border-red-400 bg-white px-8 py-2 text-red-500 text-center'
           }
         >
           Cancel

src/components/CreateTeam/Step1.tsx

@@ -221,11 +221,11 @@ export function Step1(props: Step1Props) {
               setTeamSize((e.target as HTMLSelectElement).value as any)
             }
           >
-            <option value="">
+            <option value="" selected>
               Select team size
             </option>
             {validTeamSizes.map((size) => (
-              <option key={size} value={size}>{size} people</option>
+              <option value={size}>{size} people</option>
             ))}
           </select>
         </div>

src/components/CreateTeam/Step2.tsx

@@ -17,9 +17,7 @@ export function Step2(props: Step2Props) {
     <>
       <div className="mt-4 flex w-full flex-col">
         <div className="mb-1 mt-2">
-          <h2 className="mb-1 text-lg font-bold md:mb-1.5 md:text-2xl">
-            Select Roadmaps
-          </h2>
+          <h2 className="mb-1 md:mb-1.5 text-lg md:text-2xl font-bold">Select Roadmaps</h2>
           <p className="text-sm text-gray-700">
             You can always add and customize your roadmaps later.
           </p>
@@ -27,12 +25,12 @@ export function Step2(props: Step2Props) {
 
         <RoadmapSelector
           teamId={team._id!}
-          teamResources={teamResourceConfig}
-          setTeamResources={setTeamResourceConfig}
+          teamResourceConfig={teamResourceConfig}
+          setTeamResourceConfig={setTeamResourceConfig}
         />
       </div>
 
-      <div className="mt-4 flex flex-col items-stretch justify-between gap-2 md:flex-row md:items-center">
+      <div className="mt-4 flex flex-col md:flex-row items-stretch md:items-center justify-between gap-2">
         <button
           type="button"
           onClick={onBack}
@@ -48,9 +46,8 @@ export function Step2(props: Step2Props) {
           <button
             type="button"
             onClick={onNext}
-            disabled={teamResourceConfig.length !== 0}
             className={
-              'flex-grow rounded-md border border-gray-300 bg-white px-4 py-2 text-gray-500 hover:border-gray-400 hover:text-black md:flex-auto disabled:opacity-50 disabled:pointer-events-none'
+              'flex-grow rounded-md border border-gray-300 bg-white px-4 py-2 text-gray-500 hover:border-gray-400 hover:text-black md:flex-auto'
             }
           >
             Skip for Now

src/components/CreateTeam/Step3.tsx

@@ -178,9 +178,8 @@ export function Step3(props: Step3Props) {
           <button
             type="button"
             onClick={onNext}
-            disabled={users.filter((u) => u.email).length !== 0}
             className={
-              'rounded-md flex-grow md:flex-auto border border-gray-300 bg-white px-4 py-2 text-gray-500 hover:border-gray-400 hover:text-black disabled:opacity-50 disabled:pointer-events-none'
+              'rounded-md flex-grow md:flex-auto border border-gray-300 bg-white px-4 py-2 text-gray-500 hover:border-gray-400 hover:text-black'
             }
           >
             Skip for Now

src/components/CreateTeam/UpdateTeamResourceModal.tsx

@@ -1,14 +1,15 @@
 import { useEffect, useRef, useState } from 'react';
 import { wireframeJSONToSVG } from 'roadmap-renderer';
 import { Spinner } from '../ReactIcons/Spinner';
-import { httpPut } from '../../lib/http';
+import { httpGet, httpPut } from '../../lib/http';
 import { renderTopicProgress } from '../../lib/resource-progress';
 import '../FrameRenderer/FrameRenderer.css';
 import { useOutsideClick } from '../../hooks/use-outside-click';
 import { useKeydown } from '../../hooks/use-keydown';
 import type { TeamResourceConfig } from './RoadmapSelector';
 import { useToast } from '../../hooks/use-toast';
-import {replaceChildren} from "../../lib/dom.ts";
+import { useStore } from '@nanostores/react';
+import { $currentTeam } from '../../stores/team';
 
 export type ProgressMapProps = {
   teamId: string;
@@ -39,6 +40,8 @@ export function UpdateTeamResourceModal(props: ProgressMapProps) {
   const [removedItems, setRemovedItems] =
     useState<string[]>(defaultRemovedItems);
 
+  const currentTeam = useStore($currentTeam);
+
   useEffect(() => {
     function onTopicClick(e: any) {
       const groupEl = e.target.closest('.clickable-group');
@@ -66,9 +69,7 @@ export function UpdateTeamResourceModal(props: ProgressMapProps) {
     };
   }, [removedItems]);
 
-  let resourceJsonUrl = import.meta.env.DEV
-    ? 'http://localhost:3000'
-    : 'https://roadmap.sh';
+  let resourceJsonUrl = 'https://roadmap.sh';
   if (resourceType === 'roadmap') {
     resourceJsonUrl += `/${resourceId}.json`;
   } else {
@@ -82,8 +83,7 @@ export function UpdateTeamResourceModal(props: ProgressMapProps) {
       fontURL: '/fonts/balsamiq.woff2',
     });
 
-    replaceChildren(containerEl.current!, svg);
-    // containerEl.current?.replaceChildren(svg);
+    containerEl.current?.replaceChildren(svg);
 
     // Render team configuration
     removedItems.forEach((topicId: string) => {
@@ -151,7 +151,11 @@ export function UpdateTeamResourceModal(props: ProgressMapProps) {
     <div className="fixed left-0 right-0 top-0 z-50 h-full items-center justify-center overflow-y-auto overflow-x-hidden overscroll-contain bg-black/50">
       <div className="relative mx-auto h-full w-full max-w-4xl p-4 md:h-auto">
         <div
-          id={'customized-roadmap'}
+          id={
+            currentTeam?.type === 'company'
+              ? 'customized-roadmap'
+              : 'original-roadmap'
+          }
           ref={popupBodyEl}
           className="popup-body relative rounded-lg bg-white shadow"
         >

src/components/CreateVersion/CreateVersion.tsx

@@ -1,145 +0,0 @@
-import { useEffect, useState } from 'react';
-import { httpGet, httpPost } from '../../lib/http';
-import { useToast } from '../../hooks/use-toast';
-import { isLoggedIn } from '../../lib/jwt';
-import { GitFork, Loader2, Map } from 'lucide-react';
-import { showLoginPopup } from '../../lib/popup';
-import type { RoadmapDocument } from '../CustomRoadmap/CreateRoadmap/CreateRoadmapModal.tsx';
-
-type CreateVersionProps = {
-  roadmapId: string;
-};
-
-export function CreateVersion(props: CreateVersionProps) {
-  const { roadmapId } = props;
-
-  const toast = useToast();
-  const [isLoading, setIsLoading] = useState(true);
-  const [isCreating, setIsCreating] = useState(false);
-  const [isConfirming, setIsConfirming] = useState(false);
-  const [userVersion, setUserVersion] = useState<RoadmapDocument>();
-
-  async function loadMyVersion() {
-    if (!isLoggedIn()) {
-      return;
-    }
-
-    setIsLoading(true);
-    const { response, error } = await httpGet<RoadmapDocument>(
-      `${import.meta.env.PUBLIC_API_URL}/v1-get-my-version/${roadmapId}`,
-      {},
-    );
-
-    if (error || !response) {
-      setIsLoading(false);
-      return;
-    }
-
-    setIsLoading(false);
-    setUserVersion(response);
-  }
-
-  useEffect(() => {
-    loadMyVersion().finally(() => {
-      setIsLoading(false);
-    });
-  }, []);
-
-  async function createVersion() {
-    if (isCreating || !roadmapId) {
-      return;
-    }
-
-    if (!isLoggedIn()) {
-      showLoginPopup();
-      return;
-    }
-
-    setIsCreating(true);
-    const { response, error } = await httpPost<{ roadmapId: string }>(
-      `${import.meta.env.PUBLIC_API_URL}/v1-create-version/${roadmapId}`,
-      {},
-    );
-
-    if (error || !response) {
-      setIsCreating(false);
-      toast.error(error?.message || 'Failed to create version');
-      return;
-    }
-
-    window.location.href = `${
-      import.meta.env.PUBLIC_EDITOR_APP_URL
-    }/${response?.roadmapId}`;
-  }
-
-  if (isLoading) {
-    return (
-      <div className="h-[30px] w-[312px] animate-pulse rounded-md bg-gray-300"></div>
-    );
-  }
-
-  if (!isLoading && userVersion?._id) {
-    return (
-      <div className={'flex items-center'}>
-        <a
-          href={`/r?id=${userVersion._id}`}
-          className="flex items-center rounded-md border border-blue-400 bg-gray-50 px-2.5 py-1 text-xs font-medium text-blue-600 hover:bg-blue-100 disabled:cursor-not-allowed disabled:bg-gray-100 disabled:hover:bg-gray-100 max-sm:hidden sm:text-sm"
-        >
-          <Map size="15px" className="mr-1.5" />
-          Visit your own version of this Roadmap
-        </a>
-      </div>
-    );
-  }
-
-  if (isConfirming) {
-    return (
-      <p className="flex h-[30px] items-center text-sm text-red-500">
-        Create and edit a custom roadmap from this roadmap?
-        <button
-          onClick={() => {
-            setIsConfirming(false);
-            createVersion().finally(() => null);
-          }}
-          className="ml-2 font-semibold underline underline-offset-2"
-        >
-          Yes
-        </button>
-        <span className="text-xs">&nbsp;/&nbsp;</span>
-        <button
-          className="font-semibold underline underline-offset-2"
-          onClick={() => setIsConfirming(false)}
-        >
-          No
-        </button>
-      </p>
-    );
-  }
-
-  return (
-    <button
-      disabled={isCreating}
-      className="flex items-center justify-center rounded-md border border-gray-300 bg-gray-50 px-2.5 py-1 text-xs font-medium text-black hover:bg-gray-200 disabled:cursor-not-allowed disabled:bg-gray-100 disabled:hover:bg-gray-100 max-sm:hidden sm:text-sm"
-      onClick={() => {
-        if (!isLoggedIn()) {
-          showLoginPopup();
-          return;
-        }
-
-        setIsConfirming(true);
-      }}
-    >
-      {isCreating ? (
-        <>
-          <Loader2 className="mr-2 h-3 w-3 animate-spin stroke-[2.5]" />
-          Please wait ..
-        </>
-      ) : (
-        <>
-          <GitFork className="mr-1.5" size="16px" />
-          Create your own version of this roadmap
-        </>
-      )}
-    </button>
-  );
-}

src/components/CustomRoadmap/CreateRoadmap/CreateRoadmapButton.tsx

@@ -1,50 +0,0 @@
-import { Plus } from 'lucide-react';
-import { isLoggedIn } from '../../../lib/jwt';
-import { showLoginPopup } from '../../../lib/popup';
-import { cn } from '../../../lib/classname';
-import { CreateRoadmapModal } from './CreateRoadmapModal';
-import { useState } from 'react';
-
-type CreateRoadmapButtonProps = {
-  className?: string;
-  text?: string;
-  teamId?: string;
-};
-
-export function CreateRoadmapButton(props: CreateRoadmapButtonProps) {
-  const { teamId, className, text = 'Create your own Roadmap' } = props;
-
-  const [isCreatingRoadmap, setIsCreatingRoadmap] = useState(false);
-
-  function toggleCreateRoadmapHandler() {
-    if (!isLoggedIn()) {
-      return showLoginPopup();
-    }
-
-    setIsCreatingRoadmap(true);
-  }
-
-  return (
-    <>
-      {isCreatingRoadmap && (
-        <CreateRoadmapModal
-          teamId={teamId}
-          onClose={() => {
-            setIsCreatingRoadmap(false);
-          }}
-        />
-      )}
-
-      <button
-        className={cn(
-          'flex h-full w-full items-center justify-center gap-1 overflow-hidden rounded-md border border-dashed border-gray-800 p-3 text-sm text-gray-400 hover:border-gray-600 hover:bg-gray-900 hover:text-gray-300',
-          className,
-        )}
-        onClick={toggleCreateRoadmapHandler}
-      >
-        <Plus size={16} />
-        {text}
-      </button>
-    </>
-  );
-}

src/components/CustomRoadmap/CreateRoadmap/CreateRoadmapModal.tsx

@@ -1,244 +0,0 @@
-import {
-  type FormEvent,
-  type MouseEvent,
-  useEffect,
-  useRef,
-  useState,
-} from 'react';
-import { Loader2 } from 'lucide-react';
-import { Modal } from '../../Modal';
-import { useToast } from '../../../hooks/use-toast';
-import { httpPost } from '../../../lib/http';
-import { cn } from '../../../lib/classname';
-
-export const allowedRoadmapVisibility = [
-  'me',
-  'friends',
-  'team',
-  'public',
-] as const;
-export type AllowedRoadmapVisibility =
-  (typeof allowedRoadmapVisibility)[number];
-export const allowedCustomRoadmapType = ['role', 'skill'] as const;
-export type AllowedCustomRoadmapType =
-  (typeof allowedCustomRoadmapType)[number];
-
-export interface RoadmapDocument {
-  _id?: string;
-  title: string;
-  description?: string;
-  creatorId: string;
-  teamId?: string;
-  isDiscoverable: boolean;
-  type: AllowedCustomRoadmapType;
-  visibility: AllowedRoadmapVisibility;
-  sharedFriendIds?: string[];
-  sharedTeamMemberIds?: string[];
-  nodes: any[];
-  edges: any[];
-  createdAt: Date;
-  updatedAt: Date;
-  canManage: boolean;
-  isCustomResource: boolean;
-}
-
-interface CreateRoadmapModalProps {
-  onClose: () => void;
-  onCreated?: (roadmap: RoadmapDocument) => void;
-  teamId?: string;
-  visibility?: AllowedRoadmapVisibility;
-}
-
-export function CreateRoadmapModal(props: CreateRoadmapModalProps) {
-  const { onClose, onCreated, teamId } = props;
-
-  const titleRef = useRef<HTMLInputElement>(null);
-  const toast = useToast();
-
-  const [isLoading, setIsLoading] = useState(false);
-  const [title, setTitle] = useState('');
-  const [description, setDescription] = useState('');
-  const isInvalidDescription = description?.trim().length > 80;
-
-  async function handleSubmit(
-    e: FormEvent<HTMLFormElement> | MouseEvent<HTMLButtonElement>,
-    redirect: boolean = true,
-  ) {
-    e.preventDefault();
-    if (isLoading) {
-      return;
-    }
-
-    if (title.trim() === '' || isInvalidDescription) {
-      toast.error('Please fill all the fields');
-      return;
-    }
-
-    setIsLoading(true);
-    const { response, error } = await httpPost<RoadmapDocument>(
-      `${import.meta.env.PUBLIC_API_URL}/v1-create-roadmap`,
-      {
-        title,
-        description,
-        ...(teamId && {
-          teamId,
-        }),
-        nodes: [],
-        edges: [],
-      },
-    );
-
-    if (error) {
-      setIsLoading(false);
-      toast.error(error?.message || 'Something went wrong, please try again');
-      return;
-    }
-
-    toast.success('Roadmap created successfully');
-    if (redirect) {
-      window.location.href = `${
-        import.meta.env.PUBLIC_EDITOR_APP_URL
-      }/${response?._id}`;
-      return;
-    }
-
-    if (onCreated) {
-      onCreated(response as RoadmapDocument);
-      return;
-    }
-
-    onClose();
-
-    setTitle('');
-    setDescription('');
-    setIsLoading(false);
-  }
-
-  useEffect(() => {
-    titleRef.current?.focus();
-  }, []);
-
-  return (
-    <Modal
-      onClose={onClose}
-      bodyClassName="p-4"
-      wrapperClassName={cn(teamId && 'max-w-lg')}
-    >
-      <div className="mb-4">
-        <h2 className="text-lg font-medium text-gray-900">Create Roadmap</h2>
-        <p className="mt-1 text-sm text-gray-500">
-          Add a title and description to your roadmap.
-        </p>
-      </div>
-      <form onSubmit={handleSubmit}>
-        <div className="mt-4">
-          <label
-            htmlFor="title"
-            className="block text-xs uppercase text-gray-400"
-          >
-            Roadmap Title
-          </label>
-          <div className="mt-1">
-            <input
-              ref={titleRef}
-              type="text"
-              name="title"
-              id="title"
-              required
-              className="block text-black w-full rounded-md border border-gray-300 px-2.5 py-2 outline-none focus:border-black sm:text-sm"
-              placeholder="Enter Title"
-              value={title}
-              onChange={(e) => setTitle(e.target.value)}
-            />
-          </div>
-        </div>
-        <div className="mt-4">
-          <label
-            htmlFor="description"
-            className="block text-xs uppercase text-gray-400"
-          >
-            Description
-          </label>
-          <div className="relative mt-1">
-            <textarea
-              id="description"
-              name="description"
-              required
-              className={cn(
-                'block text-black h-24 w-full resize-none rounded-md border border-gray-300 px-2.5 py-2 outline-none focus:border-black sm:text-sm',
-                isInvalidDescription && 'border-red-300 bg-red-100'
-              )}
-              placeholder="Enter Description"
-              value={description}
-              onChange={(e) => setDescription(e.target.value)}
-            />
-            <div className="absolute bottom-2 right-2 text-xs text-gray-400">
-              {description.length}/80
-            </div>
-          </div>
-        </div>
-
-        <div
-          className={cn('mt-4 flex justify-between gap-2', teamId && 'mt-8')}
-        >
-          <button
-            onClick={onClose}
-            type="button"
-            className={cn(
-              'block h-9 rounded-md border border-gray-200 bg-white px-4 py-2 text-sm font-medium text-black outline-none hover:border-gray-300 hover:bg-gray-50 focus:border-gray-300 focus:bg-gray-100',
-              !teamId && 'w-full',
-            )}
-          >
-            Cancel
-          </button>
-
-          <div className={cn('flex items-center gap-2', !teamId && 'w-full')}>
-            {teamId && !isLoading && (
-              <button
-                disabled={isLoading}
-                type="button"
-                onClick={(e) => handleSubmit(e, false)}
-                className="flex h-9 items-center justify-center rounded-md border border-black bg-white px-4 py-2 text-sm font-medium text-black outline-none hover:bg-black hover:text-white focus:bg-black focus:text-white"
-              >
-                {isLoading ? (
-                  <Loader2 size={16} className="animate-spin" />
-                ) : (
-                  'Save as Placeholder'
-                )}
-              </button>
-            )}
-
-            <button
-              disabled={isLoading}
-              type="submit"
-              className={cn(
-                'flex h-9 items-center justify-center rounded-md border border-transparent bg-black px-4 py-2 text-sm font-medium text-white outline-none hover:bg-gray-800 focus:bg-gray-800',
-                teamId ? 'hidden sm:flex' : 'w-full',
-              )}
-            >
-              {isLoading ? (
-                <Loader2 size={16} className="animate-spin" />
-              ) : teamId ? (
-                'Continue to Editor'
-              ) : (
-                'Create'
-              )}
-            </button>
-          </div>
-        </div>
-        {teamId && (
-          <>
-            <p className="mt-4 hidden rounded-md border border-orange-200 bg-orange-50 p-2.5 text-sm text-orange-600 sm:block">
-              Preparing the roadmap might take some time, feel free to save it
-              as a placeholder and anyone with the role <strong>admin</strong>{' '}
-              or <strong>manager</strong> can prepare it later.
-            </p>
-            <p className="mt-4 rounded-md border border-orange-200 bg-orange-50 p-2.5 text-sm text-orange-600 sm:hidden">
-              Create a placeholder now and prepare it later.
-            </p>
-          </>
-        )}
-      </form>
-    </Modal>
-  );
-}

src/components/CustomRoadmap/CustomRoadmap.tsx

@@ -1,125 +0,0 @@
-import { useEffect, useState } from 'react';
-import { getUrlParams } from '../../lib/browser';
-import {
-  type AppError,
-  type FetchError,
-  httpGet,
-  httpPost,
-} from '../../lib/http';
-import { RoadmapHeader } from './RoadmapHeader';
-import { TopicDetail } from '../TopicDetail/TopicDetail';
-import type { RoadmapDocument } from './CreateRoadmap/CreateRoadmapModal';
-import { currentRoadmap } from '../../stores/roadmap';
-import { RestrictedPage } from './RestrictedPage';
-import { isLoggedIn } from '../../lib/jwt';
-import { FlowRoadmapRenderer } from './FlowRoadmapRenderer';
-
-export const allowedLinkTypes = [
-  'video',
-  'article',
-  'opensource',
-  'course',
-  'website',
-  'podcast',
-] as const;
-
-export type AllowedLinkTypes = (typeof allowedLinkTypes)[number];
-
-export interface RoadmapContentDocument {
-  _id?: string;
-  roadmapId: string;
-  nodeId: string;
-  title: string;
-  description: string;
-  links: {
-    id: string;
-    type: AllowedLinkTypes;
-    title: string;
-    url: string;
-  }[];
-}
-
-export type CreatorType = {
-  id: string;
-  name: string;
-  avatar: string;
-};
-
-export type GetRoadmapResponse = RoadmapDocument & {
-  canManage: boolean;
-  creator?: CreatorType;
-  team?: CreatorType;
-};
-
-export function hideRoadmapLoader() {
-  const loaderEl = document.querySelector(
-    '[data-roadmap-loader]',
-  ) as HTMLElement;
-  if (loaderEl) {
-    loaderEl.remove();
-  }
-}
-
-type CustomRoadmapProps = {
-  isEmbed?: boolean;
-};
-
-export function CustomRoadmap(props: CustomRoadmapProps) {
-  const { isEmbed = false } = props;
-
-  const { id, secret } = getUrlParams() as { id: string; secret: string };
-
-  const [isLoading, setIsLoading] = useState(true);
-  const [roadmap, setRoadmap] = useState<GetRoadmapResponse | null>(null);
-  const [error, setError] = useState<AppError | FetchError | undefined>();
-
-  async function getRoadmap() {
-    setIsLoading(true);
-
-    const roadmapUrl = new URL(
-      `${import.meta.env.PUBLIC_API_URL}/v1-get-roadmap/${id}`,
-    );
-
-    if (secret) {
-      roadmapUrl.searchParams.set('secret', secret);
-    }
-
-    const { response, error } = await httpGet<GetRoadmapResponse>(
-      roadmapUrl.toString(),
-    );
-
-    if (error || !response) {
-      setError(error);
-      setIsLoading(false);
-      return;
-    }
-
-    document.title = `${response.title} - roadmap.sh`;
-
-    setRoadmap(response);
-    currentRoadmap.set(response);
-    setIsLoading(false);
-  }
-
-  useEffect(() => {
-    getRoadmap().finally(() => {
-      hideRoadmapLoader();
-    });
-  }, []);
-
-  if (isLoading) {
-    return null;
-  }
-
-  if (error) {
-    return <RestrictedPage error={error} />;
-  }
-
-  return (
-    <>
-      {!isEmbed && <RoadmapHeader />}
-      <FlowRoadmapRenderer isEmbed={isEmbed} roadmap={roadmap!} />
-      <TopicDetail isEmbed={isEmbed} canSubmitContribution={false} />
-    </>
-  );
-}

src/components/CustomRoadmap/CustomRoadmapAlert.tsx

@@ -1,55 +0,0 @@
-import { BadgeCheck, MessageCircleHeart, PencilRuler } from 'lucide-react';
-import { showLoginPopup } from '../../lib/popup.ts';
-import { isLoggedIn } from '../../lib/jwt.ts';
-import { useState } from 'react';
-import { CreateRoadmapModal } from './CreateRoadmap/CreateRoadmapModal.tsx';
-
-export function CustomRoadmapAlert() {
-  const [isCreatingRoadmap, setIsCreatingRoadmap] = useState(false);
-
-  return (
-    <>
-      {isCreatingRoadmap && (
-        <CreateRoadmapModal
-          onClose={() => {
-            setIsCreatingRoadmap(false);
-          }}
-        />
-      )}
-      <div className="relative mb-5 mt-0 rounded-md border border-yellow-500 bg-yellow-100 p-2 sm:-mt-6 sm:mb-7 sm:p-2.5">
-        <h2 className="text-base font-semibold text-yellow-800 sm:text-lg">
-          Community Roadmap
-        </h2>
-        <p className="mt-2 mb-2.5 sm:mb-1.5 sm:mt-1 text-sm text-yellow-800 sm:text-base">
-          This is a custom roadmap made by a community member and is not verified by{' '}
-          <span className="font-semibold">roadmap.sh</span>
-        </p>
-        <div className="flex items-start sm:items-center flex-col sm:flex-row gap-2">
-          <a
-            href="/roadmaps"
-            className="inline-flex items-center gap-1.5 text-sm font-semibold text-yellow-700 underline-offset-2 hover:underline"
-          >
-            <BadgeCheck className="h-4 w-4 stroke-[2.5]" />
-            Visit Official Roadmaps
-          </a>
-          <span className="font-black text-yellow-700 hidden sm:block">&middot;</span>
-          <button
-            className="inline-flex items-center gap-1.5 text-sm font-semibold text-yellow-700 underline-offset-2 hover:underline"
-            onClick={() => {
-              if (!isLoggedIn()) {
-                showLoginPopup();
-              } else {
-                setIsCreatingRoadmap(true);
-              }
-            }}
-          >
-            <PencilRuler className="h-4 w-4 stroke-[2.5]" />
-            Create Your Own Roadmap
-          </button>
-        </div>
-
-        <MessageCircleHeart className="absolute bottom-2 right-2 hidden h-12 w-12 text-yellow-500 opacity-50 sm:block" />
-      </div>
-    </>
-  );
-}

src/components/CustomRoadmap/EmbedRoadmapModal.tsx

@@ -1,81 +0,0 @@
-import { useStore } from '@nanostores/react';
-import { Check, Copy } from 'lucide-react';
-
-import { Modal } from '../Modal';
-import { useToast } from '../../hooks/use-toast';
-import { useCopyText } from '../../hooks/use-copy-text';
-import { currentRoadmap, isCurrentRoadmapPersonal } from '../../stores/roadmap';
-import { cn } from '../../lib/classname.ts';
-
-type ShareRoadmapModalProps = {
-  onClose: () => void;
-};
-
-export function EmbedRoadmapModal(props: ShareRoadmapModalProps) {
-  const { onClose } = props;
-
-  const toast = useToast();
-  const $currentRoadmap = useStore(currentRoadmap);
-  const $isCurrentRoadmapPersonal = useStore(isCurrentRoadmapPersonal);
-  const roadmapId = $currentRoadmap?._id!;
-
-  const { copyText, isCopied } = useCopyText();
-
-  const isDev = import.meta.env.DEV;
-  const baseUrl = isDev ? 'http://localhost:3000' : 'https://roadmap.sh';
-
-  const embedHtml = `<iframe src="${baseUrl}/r/embed?id=${roadmapId}" width="100%" height="500px" frameBorder="0"\n></iframe>`;
-
-  return (
-    <Modal onClose={onClose} wrapperClassName={'max-w-[500px]'}>
-      <div className="p-4 pb-0">
-        <h1 className="text-xl font-semibold leading-5 text-gray-900">
-          Embed Roadmap
-        </h1>
-      </div>
-
-      <div className="px-4 pt-3">
-        <p className={'mb-2 text-sm text-gray-500'}>
-          Copy the following HTML code and paste it into your website.
-        </p>
-        <input
-          type="text"
-          value={embedHtml}
-          readOnly={true}
-          onClick={(e) => {
-            e.currentTarget.select();
-            copyText(embedHtml);
-          }}
-          className="w-full resize-none rounded-md border bg-gray-50 p-2 text-sm"
-        />
-      </div>
-
-      <div className="flex items-center justify-between px-4 pb-4 pt-2">
-        <button
-          className={cn(
-            'flex h-9 w-full items-center justify-center rounded-md border border-transparent px-4 py-2 text-sm font-medium text-white outline-none',
-            {
-              'bg-green-500 hover:bg-green-600 focus:bg-green-600': isCopied,
-              'bg-gray-900 hover:bg-gray-800 focus:bg-gray-800': !isCopied,
-            },
-          )}
-          onClick={() => {
-            copyText(embedHtml);
-          }}
-        >
-          {isCopied ? (
-            <>
-              <Check size={14} className="mr-2 stroke-[2.5]" />
-              Copied
-            </>
-          ) : (
-            <>
-              <Copy size={14} className="mr-2 stroke-[2.5]" />
-              Copy Link
-            </>
-          )}
-        </button>
-      </div>
-    </Modal>
-  );
-}

src/components/CustomRoadmap/EmptyRoadmap.tsx

@@ -1,32 +0,0 @@
-import { CircleSlash, PenSquare, Shapes } from 'lucide-react';
-import { cn } from '../../lib/classname';
-
-type EmptyRoadmapProps = {
-  roadmapId: string;
-  canManage: boolean;
-  className?: string;
-};
-
-export function EmptyRoadmap(props: EmptyRoadmapProps) {
-  const { roadmapId, canManage, className } = props;
-  const editUrl = `${import.meta.env.PUBLIC_EDITOR_APP_URL}/${roadmapId}`;
-
-  return (
-    <div className={cn('flex h-full items-center justify-center', className)}>
-      <div className="flex flex-col items-center">
-        <CircleSlash className="mx-auto h-20 w-20 text-gray-400" />
-        <h3 className="mt-2">This roadmap is currently empty.</h3>
-
-        {canManage && (
-          <a
-            href={editUrl}
-            className="mt-4 flex items-center rounded-md bg-gray-500 px-4 py-2 font-medium text-white hover:bg-gray-600"
-          >
-            <Shapes className="mr-2 inline-block h-4 w-4" />
-            Edit Roadmap
-          </a>
-        )}
-      </div>
-    </div>
-  );
-}

src/components/CustomRoadmap/FlowRoadmapRenderer.tsx

@@ -1,170 +0,0 @@
-import { ReadonlyEditor } from '../../../editor/readonly-editor';
-import type { RoadmapDocument } from './CreateRoadmap/CreateRoadmapModal';
-import {
-  refreshProgressCounters,
-  renderResourceProgress,
-  renderTopicProgress,
-  type ResourceProgressType,
-  updateResourceProgress,
-} from '../../lib/resource-progress';
-import { pageProgressMessage } from '../../stores/page';
-import { useToast } from '../../hooks/use-toast';
-import type { Node } from 'reactflow';
-import { type MouseEvent, useCallback, useRef, useState } from 'react';
-import { EmptyRoadmap } from './EmptyRoadmap';
-import { cn } from '../../lib/classname';
-import { totalRoadmapNodes } from '../../stores/roadmap.ts';
-
-type FlowRoadmapRendererProps = {
-  isEmbed?: boolean;
-  roadmap: RoadmapDocument;
-};
-
-export function FlowRoadmapRenderer(props: FlowRoadmapRendererProps) {
-  const { roadmap, isEmbed = false } = props;
-  const roadmapId = String(roadmap._id!);
-
-  const [hideRenderer, setHideRenderer] = useState(false);
-  const editorWrapperRef = useRef<HTMLDivElement>(null);
-
-  const toast = useToast();
-
-  async function updateTopicStatus(
-    topicId: string,
-    newStatus: ResourceProgressType,
-  ) {
-    if (isEmbed) {
-      return;
-    }
-
-    pageProgressMessage.set('Updating progress');
-    updateResourceProgress(
-      {
-        resourceId: roadmapId,
-        resourceType: 'roadmap',
-        topicId,
-      },
-      newStatus,
-    )
-      .then(() => {
-        renderTopicProgress(topicId, newStatus);
-      })
-      .catch((err) => {
-        toast.error('Something went wrong, please try again.');
-        console.error(err);
-      })
-      .finally(() => {
-        pageProgressMessage.set('');
-        refreshProgressCounters();
-      });
-
-    return;
-  }
-
-  const handleTopicRightClick = useCallback((e: MouseEvent, node: Node) => {
-    const target = e?.currentTarget as HTMLDivElement;
-    if (!target) {
-      return;
-    }
-
-    const isCurrentStatusDone = target?.classList.contains('done');
-    updateTopicStatus(node.id, isCurrentStatusDone ? 'pending' : 'done');
-  }, []);
-
-  const handleTopicShiftClick = useCallback((e: MouseEvent, node: Node) => {
-    const target = e?.currentTarget as HTMLDivElement;
-    if (!target) {
-      return;
-    }
-
-    const isCurrentStatusLearning = target?.classList.contains('learning');
-    updateTopicStatus(
-      node.id,
-      isCurrentStatusLearning ? 'pending' : 'learning',
-    );
-  }, []);
-
-  const handleTopicAltClick = useCallback((e: MouseEvent, node: Node) => {
-    const target = e?.currentTarget as HTMLDivElement;
-    if (!target) {
-      return;
-    }
-
-    const isCurrentStatusSkipped = target?.classList.contains('skipped');
-    updateTopicStatus(node.id, isCurrentStatusSkipped ? 'pending' : 'skipped');
-  }, []);
-
-  const handleTopicClick = useCallback((e: MouseEvent, node: Node) => {
-    const target = e?.currentTarget as HTMLDivElement;
-    if (!target) {
-      return;
-    }
-
-    window.dispatchEvent(
-      new CustomEvent('roadmap.node.click', {
-        detail: {
-          topicId: node.id,
-          resourceId: roadmapId,
-          resourceType: 'roadmap',
-          isCustomResource: true,
-        },
-      }),
-    );
-  }, []);
-
-  const handleLinkClick = useCallback((linkId: string, href: string) => {
-    if (!href) {
-      return;
-    }
-
-    const isExternalLink = href.startsWith('http');
-    if (isExternalLink) {
-      window.open(href, '_blank');
-    } else {
-      window.location.href = href;
-    }
-  }, []);
-
-  return (
-    <>
-      {hideRenderer && (
-        <EmptyRoadmap
-          roadmapId={roadmapId}
-          canManage={roadmap.canManage}
-          className="grow"
-        />
-      )}
-      <ReadonlyEditor
-        ref={editorWrapperRef}
-        roadmap={roadmap}
-        className={cn(
-          roadmap?.nodes?.length === 0
-            ? 'grow'
-            : 'min-h-0 max-md:min-h-[1000px]',
-        )}
-        onRendered={() => {
-          renderResourceProgress('roadmap', roadmapId).then(() => {
-            totalRoadmapNodes.set(
-              roadmap?.nodes?.filter((node) => {
-                return ['topic', 'subtopic'].includes(node.type);
-              }).length || 0,
-            );
-
-            if (roadmap?.nodes?.length === 0) {
-              setHideRenderer(true);
-              editorWrapperRef?.current?.classList.add('hidden');
-            }
-          });
-        }}
-        onTopicClick={handleTopicClick}
-        onTopicRightClick={handleTopicRightClick}
-        onTopicShiftClick={handleTopicShiftClick}
-        onTopicAltClick={handleTopicAltClick}
-        onButtonNodeClick={handleLinkClick}
-        onLinkClick={handleLinkClick}
-        fontFamily="Balsamiq Sans"
-        fontURL="/fonts/balsamiq.woff2"
-      />
-    </>
-  );
-}