Merge branch 'max-programming:main' into alone-y154/local

Alone-Y154 · web-flow · commit e7b4337cf2cf · 2023-10-10T11:49:34.000+05:30
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -392,6 +392,16 @@
         "code",
         "design"
       ]
+    },
+    {
+      "login": "inderharrysingh",
+      "name": "Inderjot Singh",
+      "avatar_url": "https://avatars.githubusercontent.com/u/112561014?v=4",
+      "profile": "https://github.com/inderharrysingh",
+      "contributions": [
+        "design",
+        "code"
+      ]
     }
   ],
   "contributorsPerLine": 7,
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@ A Web app that lets you find eligible repositories for Hacktoberfest!
 Use it here - https://finder.usmans.me
 
 <!-- ALL-CONTRIBUTORS-BADGE:START - Do not remove or modify this section -->
-[![All Contributors](https://img.shields.io/badge/all_contributors-40-orange.svg?style=flat-square)](#contributors-)
+[![All Contributors](https://img.shields.io/badge/all_contributors-41-orange.svg?style=flat-square)](#contributors-)
 <!-- ALL-CONTRIBUTORS-BADGE:END -->
 <a href="https://gitmoji.dev">
   <img src="https://img.shields.io/badge/gitmoji-%20😜%20😍-FFDD67.svg?style=flat-square" alt="Gitmoji">
@@ -126,6 +126,7 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="https://bright-ganache-eb99ae.netlify.app/"><img src="https://avatars.githubusercontent.com/u/80634689?v=4?s=100" width="100px;" alt="Mohit"/><br /><sub><b>Mohit</b></sub></a><br /><a href="https://github.com/max-programming/hacktoberfest-projects/commits?author=Mohit030802" title="Code">💻</a> <a href="#ideas-Mohit030802" title="Ideas, Planning, & Feedback">🤔</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/tmsagarofficial"><img src="https://avatars.githubusercontent.com/u/110724849?v=4?s=100" width="100px;" alt="S A G A R"/><br /><sub><b>S A G A R</b></sub></a><br /><a href="#ideas-tmsagarofficial" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/max-programming/hacktoberfest-projects/commits?author=tmsagarofficial" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://prithvi2k2.github.io/"><img src="https://avatars.githubusercontent.com/u/72189314?v=4?s=100" width="100px;" alt="Prithvi Reddy"/><br /><sub><b>Prithvi Reddy</b></sub></a><br /><a href="https://github.com/max-programming/hacktoberfest-projects/commits?author=prithvi2k2" title="Code">💻</a> <a href="#design-prithvi2k2" title="Design">🎨</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/inderharrysingh"><img src="https://avatars.githubusercontent.com/u/112561014?v=4?s=100" width="100px;" alt="Inderjot Singh"/><br /><sub><b>Inderjot Singh</b></sub></a><br /><a href="#design-inderharrysingh" title="Design">🎨</a> <a href="https://github.com/max-programming/hacktoberfest-projects/commits?author=inderharrysingh" title="Code">💻</a></td>
     </tr>
   </tbody>
 </table>
diff --git a/components/Card.tsx b/components/Card.tsx
@@ -37,7 +37,9 @@ function Card({ repo }: Props) {
             </h2>
           </div>
 
-          <h6 className="my-5 text-2023-manga-2 text-lg">{emojify(repo.description)}</h6>
+          <h6 className="my-5 text-2023-manga-2 text-lg">
+            {emojify(repo.description)}
+          </h6>
 
           <div className="card-actions gap-y-3">
             {repo.topics.map((topic: string) => (
@@ -86,7 +88,9 @@ function Card({ repo }: Props) {
           >
             <GoRepoForked className="text-yellow-200 text-2xl" />
             <div className="flex flex-col">
-              <div className="text-lg xl:text-2xl font-semibold mb-0.5">{repo.forks}</div>
+              <div className="text-lg xl:text-2xl font-semibold mb-0.5">
+                {repo.forks}
+              </div>
               <div className="text-neutral-300 text-xs lg:text-sm">Forks</div>
             </div>
             <div
diff --git a/components/Header.tsx b/components/Header.tsx
@@ -28,10 +28,10 @@ function Header() {
 
           <SearchBar searchBarWrapperStyles="hidden sm:inline-flex flex-1 max-w-md px-6" />
 
-          <div className="flex-none">
+          <div className="flex-none lg:ml-40  md:10">
             <Link
               href="/contributors"
-              className="btn btn-square btn-ghost umami--click--contributors-button"
+              className="btn btn-square btn-ghost umami--click--contributors-button "
             >
               <BsPeopleFill size="1.5rem" color='white' title="Contributors" />
             </Link>
@@ -40,7 +40,7 @@ function Header() {
               href="https://github.com/max-programming/hacktoberfest-projects"
               target="_blank"
               rel="noreferrer"
-              className="btn btn-square btn-ghost umami--click--github-button"
+              className="btn btn-square btn-ghost umami--click--github-button ml-"
             >
               <IoLogoGithub size="1.5rem" color='white' title="GitHub" />
             </a>
@@ -53,4 +53,4 @@ function Header() {
   );
 }
 
-export default Header;
+export default Header;
diff --git a/components/Sort.tsx b/components/Sort.tsx
@@ -25,38 +25,37 @@ export default function Sort() {
 
   const navigationItems = [
     {
-      name: "Best match",
+      name: 'Best match',
       href: { query: { ...router.query } }
     },
     {
-      name: "Most stars",
+      name: 'Most stars',
       href: { query: { ...router.query, s: 'stars', o: 'desc' } }
     },
     {
-      name: "Fewest stars",
+      name: 'Fewest stars',
       href: { query: { ...router.query, s: 'stars', o: 'asc' } }
     },
     {
-      name: "Most forks",
+      name: 'Most forks',
       href: { query: { ...router.query, s: 'forks', o: 'desc' } }
     },
     {
-      name: "Fewest forks",
+      name: 'Fewest forks',
       href: { query: { ...router.query, s: 'forks', o: 'asc' } }
     },
     {
-      name: "Most help wanted issues",
+      name: 'Most help wanted issues',
       href: { query: { ...router.query, s: 'help-wanted-issues', o: 'desc' } }
     },
     {
-      name: "Recently updated",
+      name: 'Recently updated',
       href: { query: { ...router.query, s: 'updated', o: 'desc' } }
     },
     {
-      name: "Least recently updated",
+      name: 'Least recently updated',
       href: { query: { ...router.query, s: 'updated', o: 'asc' } }
-    },
-
+    }
   ];
 
   const selectedSort = (): SortTypes => {
@@ -110,9 +109,7 @@ export default function Sort() {
           <ul tabIndex={0} className="menu menu-vertical">
             {navigationItems.map((item, index) => (
               <li key={index}>
-                <Link href={{ query: item.href.query }}>
-                  {item.name}
-                </Link>
+                <Link href={{ query: item.href.query }}>{item.name}</Link>
               </li>
             ))}
           </ul>
diff --git a/components/StarsFilter.tsx b/components/StarsFilter.tsx
@@ -1,28 +1,28 @@
+import { useEffect } from 'react';
 import { useRouter } from 'next/router';
 import { SubmitHandler, Controller, useForm } from 'react-hook-form';
-import { GoX } from 'react-icons/go';
 
 interface FormValues {
-  startStars: number;
-  endStars: number | string;
+  startStars: number | '';
+  endStars: number | '';
 }
 
 export default function StarsFilter() {
   const router = useRouter();
   const { handleSubmit, control, reset } = useForm<FormValues>({
     defaultValues: {
       startStars: !router.query.startStars
-        ? undefined
+        ? ''
         : +(router.query.startStars as string),
       endStars: !router.query.endStars
-        ? undefined
+        ? ''
         : +(router.query.endStars as string)
     }
   });
 
   const onSubmit: SubmitHandler<FormValues> = ({ startStars, endStars }) => {
     let query;
-    if (typeof endStars === 'number' && endStars < startStars) {
+    if (typeof endStars === 'number' && typeof startStars === 'number' && endStars < startStars) {
       reset({ startStars, endStars: '' });
       query = { startStars };
       const { endStars, ...rest } = router.query;
@@ -36,6 +36,10 @@ export default function StarsFilter() {
     }
   };
 
+  useEffect(() => {
+    reset();
+  }, [router.query?.language, reset]);
+
   return (
     <form
       className="w-full m-2 mx-auto mb-4 lg:w-2/4 form-control"
@@ -75,7 +79,10 @@ export default function StarsFilter() {
           control={control}
         />
 
-        <button className="btn btn-ghost ml-2 text-2023-manga-2 ring-1 ring-2023-manga-2" type="submit">
+        <button
+          className="btn btn-ghost ml-2 text-2023-manga-2 ring-1 ring-2023-manga-2"
+          type="submit"
+        >
           Search
         </button>
       </div>
diff --git a/package.json b/package.json
@@ -41,4 +41,4 @@
     "tailwindcss": "^3.3.3",
     "typescript": "5.2.2"
   }
-}
+}
diff --git a/pages/contributors.tsx b/pages/contributors.tsx
@@ -34,7 +34,9 @@ export default function Contrubutors({ contributors }: Props) {
     <div>
       <Header />
       <div className="container mx-auto mb-5">
-        <h1 className="my-5 text-neutral-100 text-5xl font-bold text-center">Contributors ✨</h1>
+        <h1 className="my-5 text-neutral-100 text-5xl font-bold text-center">
+          Contributors ✨
+        </h1>
         <div className="grid grid-cols-1 gap-4 md:grid-cols-2 lg:grid-cols-4">
           {contributors.map(contributor => (
             <ContributorCard

Original file line number	Diff line number	Diff line change
`@@ -41,4 +41,4 @@`
`41`	`41`	`"tailwindcss": "^3.3.3",`
`42`	`42`	`"typescript": "5.2.2"`
`43`	`43`	`}`
`44`		`-}`
	`44`	`+}`