Resolve conflicts with main

Author: rishabh3562

.github/workflows/cla-check.yml

@@ -16,31 +16,31 @@ jobs:
         uses: actions/github-script@v7
         with:
           script: |
-            const body = `## 📋 Contributor License Agreement (CLA)
+            const body = `## Contributor License Agreement (CLA)
 
-            Thank you for your contribution to ToolBox!
+            Thank you for your contribution to ToolBox.
 
             **By submitting this pull request, you automatically agree to our [Contributor License Agreement (CLA)](https://github.com/${context.repo.owner}/${context.repo.repo}/blob/main/CLA.md).**
 
-            ### ⚠️ Important Points:
+            ### Key Terms
 
-            - ✅ You grant the project owner exclusive commercial rights to this project
-            - ✅ You waive any claims to commercialization or royalties
-            - ✅ You retain rights to use your contributions for non-commercial purposes
-            - ✅ You confirm your contributions are your original work
-            - ✅ This agreement is automatic upon submission
+            - You grant the project owner exclusive commercial rights to this project
+            - You waive any claims to commercialization or royalties
+            - You retain rights to use your contributions for non-commercial purposes
+            - You confirm your contributions are your original work
+            - This agreement is automatic upon submission
 
-            ### 📖 Full Agreement
+            ### Full Agreement
 
-            Please read the complete [CLA](https://github.com/${context.repo.owner}/${context.repo.repo}/blob/main/CLA.md) for all terms and conditions.
+            Please review the complete [CLA](https://github.com/${context.repo.owner}/${context.repo.repo}/blob/main/CLA.md) for all terms and conditions.
 
-            ### ❓ Questions?
+            ### Questions
 
-            If you have questions about the CLA, please comment on this PR or open a discussion.
+            If you have questions about the CLA, please comment on this pull request or open a discussion.
 
             ---
 
-            **By keeping this PR open or updating it, you confirm your acceptance of the CLA.**`;
+            **By continuing with this pull request, you confirm your acceptance of the CLA.**`;
 
             // Check if we've already commented
             const comments = await github.rest.issues.listComments({
@@ -62,14 +62,3 @@ jobs:
                 body: body
               });
             }
-
-      - name: Add CLA Label
-        uses: actions/github-script@v7
-        with:
-          script: |
-            await github.rest.issues.addLabels({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: context.issue.number,
-              labels: ['cla-required']
-            });

.github/workflows/deploy-docs.yml

@@ -0,0 +1,25 @@
+name: Deploy Docs
+on:
+  push:
+    branches: [ main ]
+    paths:
+      - 'docs/**'
+  workflow_dispatch:
+
+jobs:
+  build-deploy:
+    runs-on: ubuntu-latest
+    defaults:
+      run:
+        working-directory: docs
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+      - run: npm ci
+      - run: npm run build
+      - uses: actions/upload-pages-artifact@v3
+        with:
+          path: docs/build
+      - uses: actions/deploy-pages@v4

app/tools/profile-tracker/page.tsx

@@ -159,15 +159,15 @@ export default function ProfileTrackerPage() {
               All Platforms
             </TabsTrigger>
             {platforms.map((platform) => {
-              const Icon = Icons[platform.icon as keyof typeof Icons];
+              const Icon = Icons[platform.icon as keyof typeof Icons] as React.ComponentType<{ className?: string }>;
               return (
                 <TabsTrigger
                   key={platform.id}
                   value={platform.id}
                   onClick={() => setSelectedPlatform(platform.id as PlatformType)}
                   className="flex items-center gap-2"
                 >
-                  <Icon className={`w-4 h-4 ${platform.color}`} />
+                  {Icon && <Icon className={`w-4 h-4 ${platform.color}`} />}
                   {platform.name}
                 </TabsTrigger>
               );

components/category-tree.tsx

@@ -52,7 +52,7 @@ export function CategoryTree({
         </div>
         {hasSubCategories && (
           <div className="pl-4">
-            {category.subCategories.map((subCategory) =>
+            {category.subCategories?.map((subCategory) =>
               renderCategory(subCategory, depth + 1)
             )}
           </div>

components/profiles/profile-card.tsx

@@ -16,7 +16,7 @@ interface ProfileCardProps {
 
 export function ProfileCard({ profile, onEdit, onDelete }: ProfileCardProps) {
   const platform = getPlatform(profile.platform);
-  const PlatformIcon = platform ? Icons[platform.icon as keyof typeof Icons] : Icons.Globe;
+  const PlatformIcon = (platform ? Icons[platform.icon as keyof typeof Icons] : Icons.Globe) as React.ComponentType<{ className?: string }>;
 
   return (
     <Card className="p-6 hover:shadow-lg transition-shadow">

components/profiles/profile-form.tsx

@@ -74,11 +74,11 @@ export function ProfileForm({ profile, onSubmit, onCancel }: ProfileFormProps) {
               </SelectTrigger>
               <SelectContent>
                 {platforms.map((platform) => {
-                  const Icon = Icons[platform.icon as keyof typeof Icons];
+                  const Icon = Icons[platform.icon as keyof typeof Icons] as React.ComponentType<{ className?: string }>;
                   return (
                     <SelectItem key={platform.id} value={platform.id}>
                       <div className="flex items-center gap-2">
-                        <Icon className={`w-4 h-4 ${platform.color}`} />
+                        {Icon && <Icon className={`w-4 h-4 ${platform.color}`} />}
                         <span>{platform.name}</span>
                       </div>
                     </SelectItem>

components/tool-card.tsx

@@ -9,13 +9,13 @@ interface ToolCardProps {
 }
 
 export function ToolCard({ tool }: ToolCardProps) {
-  const Icon = Icons[tool.icon as keyof typeof Icons];
+  const Icon = Icons[tool.icon as keyof typeof Icons] as React.ComponentType<{ className?: string }>;
 
   return (
     <Card className="p-6 flex flex-col h-full">
       <div className="flex items-start justify-between mb-4">
         <div className="p-2 bg-primary/10 rounded-lg">
-          <Icon className="h-6 w-6 text-primary" />
+          {Icon && <Icon className="h-6 w-6 text-primary" />}
         </div>
       </div>
       <h3 className="text-lg font-semibold mb-2">{tool.name}</h3>

components/ui/calendar.tsx

@@ -54,8 +54,12 @@ function Calendar({
         ...classNames,
       }}
       components={{
-        IconLeft: ({ ...props }) => <ChevronLeft className="h-4 w-4" />,
-        IconRight: ({ ...props }) => <ChevronRight className="h-4 w-4" />,
+        Chevron: ({ orientation }) =>
+          orientation === 'left' ? (
+            <ChevronLeft className="h-4 w-4" />
+          ) : (
+            <ChevronRight className="h-4 w-4" />
+          ),
       }}
       {...props}
     />

docs/.gitignore

@@ -0,0 +1,20 @@
+# Dependencies
+/node_modules
+
+# Production
+/build
+
+# Generated files
+.docusaurus
+.cache-loader
+
+# Misc
+.DS_Store
+.env.local
+.env.development.local
+.env.test.local
+.env.production.local
+
+npm-debug.log*
+yarn-debug.log*
+yarn-error.log*

docs/README.md

@@ -0,0 +1,41 @@
+# Website
+
+This website is built using [Docusaurus](https://docusaurus.io/), a modern static website generator.
+
+## Installation
+
+```bash
+yarn
+```
+
+## Local Development
+
+```bash
+yarn start
+```
+
+This command starts a local development server and opens up a browser window. Most changes are reflected live without having to restart the server.
+
+## Build
+
+```bash
+npm run build
+```
+
+This command generates static content into the `build` directory and can be served using any static contents hosting service.
+
+## Deployment
+
+Using SSH:
+
+```bash
+USE_SSH=true yarn deploy
+```
+
+Not using SSH:
+
+```bash
+GIT_USER=<Your GitHub username> yarn deploy
+```
+
+If you are using GitHub pages for hosting, this command is a convenient way to build the website and push to the `gh-pages` branch.