fixed merged conflicts

code100x · Apr 1, 2024 · 922f0cc · 922f0cc
1 parent 92176a5
commit 922f0cc
Show file tree

Hide file tree

Showing 3 changed files with 47 additions and 52 deletions.
diff --git a/package.json b/package.json
@@ -34,6 +34,7 @@
     "@radix-ui/react-label": "^2.0.2",
     "@radix-ui/react-navigation-menu": "^1.1.4",
     "@radix-ui/react-slot": "^1.0.2",
+    "@radix-ui/react-tooltip": "^1.0.2",
     "@types/bcrypt": "^5.0.2",
     "@types/jsonwebtoken": "^9.0.5",
     "axios": "^1.6.2",
@@ -43,6 +44,7 @@
     "dayjs": "^1.11.10",
     "discord-oauth2": "^2.11.0",
     "discord.js": "^14.14.1",
+    "fuse.js": "^7.0.0",
     "embla-carousel-react": "^8.0.0",
     "jose": "^5.2.2",
     "jsonwebtoken": "^9.0.2",

diff --git a/src/components/Appbar.tsx b/src/components/Appbar.tsx
@@ -48,61 +48,56 @@ export const Appbar = () => {
               <div className="flex items-center space-x-2">
                 {/* Search Bar for smaller devices */}
                 <MobileScreenSearch />
-                <div className="hidden sm:flex items-center justify-around md:w-auto md:block space-x-2">
-                  <Button variant={'link'} size={'sm'} asChild>
-                    <JoinDiscord isNavigated={false} />
-                  </Button>
-                  <div className="flex items-center space-x-2">
-                    <div className="hidden sm:flex items-center justify-around md:w-auto md:block space-x-2">
-                      {currentPath.includes('courses') && bookmarkPageUrl && (
-                        <Button
-                          variant="link"
-                          className={
-                            currentPath === bookmarkPageUrl
-                              ? 'font-bold underline'
-                              : ''
-                          }
-                          size={'sm'}
-                          asChild
-                        >
-                          <Link href={bookmarkPageUrl}>Bookmarks</Link>
-                        </Button>
-                      )}
-
-                      <Button variant={'link'} size={'sm'} asChild>
-                        <JoinDiscord isNavigated={false} />
+                <div className="flex items-center space-x-2">
+                  <div className="hidden sm:flex items-center justify-around md:w-auto md:block space-x-2">
+                    {currentPath.includes('courses') && bookmarkPageUrl && (
+                      <Button
+                        variant="link"
+                        className={
+                          currentPath === bookmarkPageUrl
+                            ? 'font-bold underline'
+                            : ''
+                        }
+                        size={'sm'}
+                        asChild
+                      >
+                        <Link href={bookmarkPageUrl}>Bookmarks</Link>
                       </Button>
+                    )}
 
-                      <Button size={'sm'} variant={'link'} asChild>
-                        <Link
-                          href={'https://projects.100xdevs.com/'}
-                          target="_blank"
-                        >
-                          Slides
-                        </Link>
-                      </Button>
+                    <Button variant={'link'} size={'sm'} asChild>
+                      <JoinDiscord isNavigated={false} />
+                    </Button>
 
-                      <Button size={'sm'} variant={'link'} asChild>
-                        <Link
-                          href={
-                            'https://github.com/100xdevs-cohort-2/assignments'
-                          }
-                          target="_blank"
-                        >
-                          Assignments
-                        </Link>
-                      </Button>
-                      <Button size={'sm'} variant={'link'} asChild>
-                        <Link href={'/history'}>Watch History</Link>
-                      </Button>
-                      <AppbarAuth />
-                    </div>
+                    <Button size={'sm'} variant={'link'} asChild>
+                      <Link
+                        href={'https://projects.100xdevs.com/'}
+                        target="_blank"
+                      >
+                        Slides
+                      </Link>
+                    </Button>
+
+                    <Button size={'sm'} variant={'link'} asChild>
+                      <Link
+                        href={
+                          'https://github.com/100xdevs-cohort-2/assignments'
+                        }
+                        target="_blank"
+                      >
+                        Assignments
+                      </Link>
+                    </Button>
+                    <Button size={'sm'} variant={'link'} asChild>
+                      <Link href={'/history'}>Watch History</Link>
+                    </Button>
+                    <AppbarAuth />
+                  </div>
 
-                    <ThemeToggler />
+                  <ThemeToggler />
 
-                    <div className="block sm:hidden">
-                      <NavigationMenu />
-                    </div>
+                  <div className="block sm:hidden">
+                    <NavigationMenu />
                   </div>
                 </div>
               </div>

diff --git a/src/components/ContentCard.tsx b/src/components/ContentCard.tsx
@@ -67,8 +67,6 @@ export const ContentCard = ({
           />
         </div>
       )}
-
-      <img src={image} alt={title} className="rounded-md" />
       <div className="flex justify-between mt-2 text-gray-900 dark:text-white">
         <div>{title}</div>
       </div>
-Original file line number
+Diff line change
@@ Expand Up / @@ -67,8 +67,6 @@ export const ContentCard = ({ @@
               />
             </div>
           )}
-          <img src={image} alt={title} className="rounded-md" />
           <div className="flex justify-between mt-2 text-gray-900 dark:text-white">
             <div>{title}</div>
           </div>
@@ Expand Down @@