fix: conflict solved (#1971)

* style: aligned documentation and license in footer (#1954) * chore: Added `star on GitHub` image 🌟🚀 (#1953) * feat: "Start Contribution" with "Star on GitHub" Added Signed-off-by: Nishitbariya <[email protected]> * Fix * Fix Heading Alignment * Heading Alignment Fix * Github Star Button Alignment Fix Signed-off-by: Nishitbariya <[email protected]> * fix : use <Link> tag Signed-off-by: Nishitbariya <[email protected]> * fix : use <Image> tag Signed-off-by: Nishitbariya <[email protected]> --------- Signed-off-by: Nishitbariya <[email protected]> * chore: added new ML Project by Parul1606 #1938 (#1957) * chore: added New ML Project * chore: update project --------- Co-authored-by: Priyankar Pal <[email protected]> * chore(deps): bump @types/node from 20.4.6 to 20.4.7 (#1962) Bumps [@types/node](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/node) from 20.4.6 to 20.4.7. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/node) --- updated-dependencies: - dependency-name: "@types/node" dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * docs: improve contributing guide (#1956) * contributing: Updated the Readme * docs: improve contributing guide --------- Co-authored-by: Priyankar Pal <[email protected]> * chore: project addition by pavitrachavda97 #1958 (#1965) * style: aligned and added responsiveness documentation and license in… (#1964) * style: aligned and added responsiveness documentation and license in footer * style: makeing the footer responsive --------- Signed-off-by: Nishitbariya <[email protected]> Signed-off-by: dependabot[bot] <[email protected]> Co-authored-by: Sahil Chalke <[email protected]> Co-authored-by: Nishitbariya <[email protected]> Co-authored-by: Parul Pandey <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: PAVITRA CHAVDA <[email protected]>
priyankarpal · Aug 5, 2023 · e3d8a22 · e3d8a22
1 parent a50a89b
commit e3d8a22
Show file tree

Hide file tree

Showing 6 changed files with 178 additions and 93 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,9 @@
 .next
 .env
 
+# .vscode
+/.vscode
+
 # testing
 /coverage
 

diff --git a/DB/projects.json b/DB/projects.json
@@ -39,7 +39,6 @@
         "description": "getData of the github users",
         "tech": [
           "reactjs"
-
         ]
       },
       {
@@ -1781,7 +1780,6 @@
           "mui",
           "javascript",
           "css"
-
         ]
       },
       {
@@ -5719,5 +5717,47 @@
         ]
       }
     ]
+  },
+  {
+    "github_username": "Parul1606",
+    "Social_media": {
+      "gitHub": "https://github.com/Parul1606",
+      "LinkedIn": "https://www.linkedin.com/in/parul-pandey-4243aa206/",
+      "Instagram": "https://www.instagram.com/parulll_16/",
+      "YouTube": "https://www.youtube.com/channel/UC4vSo8W9-1U5zZzXmn4usYw",
+      "Twitter": "https://twitter.com/parulpa37629488"
+    },
+    "Projects": [
+      {
+        "link": "https://github.com/Parul1606/Fake-News-Detection",
+        "title": "Fake-News-Detection",
+        "description": "Fake News Detection using ML, DL, LSTM, NLP, Stemming, Lemmatization, and Data Visualization for classifying news articles.",
+        "tech": [
+          "python",
+          "flask"
+        ]
+      }
+    ]
+  },
+  {
+    "github_username": "pavitrachavda97",
+    "Social_media": {
+      "gitHub": "https://github.com/pavitrachavda97",
+      "LinkedIn": "https://www.linkedin.com/in/pavitra-chavda-254b8122a/",
+      "Instagram": "https://www.instagram.com/pavitrachavda_0408/",
+      "Twitter": "https://twitter.com/pavitrachavda"
+    },
+    "Projects": [
+      {
+        "link": "https://github.com/pavitrachavda97/speech-to-text",
+        "title": "Speech-to-text",
+        "description": "The Speech-to-Text system is a powerful tool that allows you to convert spoken language into written text.",
+        "tech": [
+          "reactjs",
+          "html",
+          "css"
+        ]
+      }
+    ]
   }
 ]
diff --git a/components/Footer.tsx b/components/Footer.tsx
@@ -1,88 +1,96 @@
 import React from "react";
 import { SiTwitter, SiGithub, SiLinkedin } from "react-icons/si";
 import Link from "next/link";
-
+import Image from "next/image";
 function Footer() {
   const getCurrentYear = () => new Date().getFullYear();
 
-
   const footerLinks = [
     {
       name: "Twitter",
       link: "https://twitter.com/priyankarpal",
-      icon: <SiTwitter aria-label="Follow us on Twitter" title="Twitter(External Link)" />,
+      icon: (
+        <SiTwitter
+          aria-label="Follow us on Twitter"
+          title="Twitter(External Link)"
+        />
+      ),
       hover: " text-xl  text-gray-200 cursor-pointer hover:text-purple-500 ",
     },
     {
       name: "GitHub",
       link: "https://github.com/priyankarpal",
-      icon: <SiGithub aria-label="Follow us on GitHub" title="GitHub(External Link)" />,
+      icon: (
+        <SiGithub
+          aria-label="Follow us on GitHub"
+          title="GitHub(External Link)"
+        />
+      ),
       hover: " text-xl  text-gray-200 cursor-pointer hover:text-purple-500 ",
     },
     {
       name: "Linkedin",
       link: "https://linkedin.com/in/priyankarpal",
-      icon: <SiLinkedin aria-label="Follow us on LinkedIn" title="LinkedIn(External Link)" />,
+      icon: (
+        <SiLinkedin
+          aria-label="Follow us on LinkedIn"
+          title="LinkedIn(External Link)"
+        />
+      ),
       hover: " text-xl  text-gray-200 cursor-pointer hover:text-purple-700 ",
-    }
-  ]
+    },
+  ];
 
   const footerdocsLinks = [
     {
       title: "Documentation",
       child: [
         {
           name: "Contributing Guide",
-          link: "https://github.com/priyankarpal/ProjectsHut/blob/main/contributing.md"
+          link: "https://github.com/priyankarpal/ProjectsHut/blob/main/contributing.md",
         },
         {
           name: "Add projects via GitHub",
-          link: "https://github.com/priyankarpal/ProjectsHut/blob/main/contributing.md#how-to-add-your-projects-to-projectshut"
+          link: "https://github.com/priyankarpal/ProjectsHut/blob/main/contributing.md#how-to-add-your-projects-to-projectshut",
         },
         {
           name: "Run the project locally",
-          link: "https://github.com/priyankarpal/ProjectsHut/blob/main/contributing.md#note-alternatively-if-you-prefer-to-run-the-project-locally-follow-these-steps"
-        }
-
-      ]
-    }
-
-  ]
+          link: "https://github.com/priyankarpal/ProjectsHut/blob/main/contributing.md#note-alternatively-if-you-prefer-to-run-the-project-locally-follow-these-steps",
+        },
+      ],
+    },
+  ];
 
   const footerServiceLinks = [
     {
-
       title: "License",
       child: [
         {
           name: "MIT License",
-          link: "https://github.com/priyankarpal/ProjectsHut/blob/main/LICENSE"
+          link: "https://github.com/priyankarpal/ProjectsHut/blob/main/LICENSE",
         },
         {
           name: "Code of Conduct",
-          link: "https://github.com/priyankarpal/ProjectsHut/blob/main/CODE_OF_CONDUCT.md"
+          link: "https://github.com/priyankarpal/ProjectsHut/blob/main/CODE_OF_CONDUCT.md",
         },
-      ]
-    }
-
-
-  ]
+      ],
+    },
+  ];
 
   return (
-    < footer className="border-t border-gray-800 " >
-      <div className="mx-auto max-w-screen-xl pt-16 sm:px-4 sm:pb-[5.65rem] lg:px-8 lg:pb-8">
-        <div className="mt-16 grid grid-cols-1 gap-8 lg:grid-cols-2 lg:gap-32">
-          <div className="mx-auto max-w-sm lg:max-w-none">
-
-            <div className="flex h-10 items-center justify-center lg:justify-start text-white rounded-lg font-extrabold text-[2rem] text-center"> Ph <span className="text-primary">.</span></div>
-            <p
-              className="mt-4 text-center text-gray-200 dark:text-gray-400 lg:text-left lg:text-lg"
-            >
-              Projectshut is an open source web app that enables users to freely publish their projects and create user profiles within the platform
+    <footer className="border-t border-gray-800">
+      <div className="mx-auto max-w-screen-xl pt-8 sm:pt-16 px-4 sm:px-6 lg:px-8 pb-8">
+        <div className="grid grid-cols-1 gap-8 lg:grid-cols-2 lg:gap-4">
+          <div className="text-center lg:text-left">
+            <div className="flex h-10 items-center justify-center lg:justify-start text-white rounded-lg font-extrabold text-2xl">
+              Ph <span className="text-primary">.</span>
+            </div>
+            <p className="mt-4 text-center text-gray-200 dark:text-gray-400 lg:text-left lg:text-lg">
+              Projectshut is an open source web app that enables users to freely
+              publish their projects and create user profiles within the platform.
             </p>
 
-            {/*  for footer nav links */}
-            <div className="mt-6 flex justify-center gap-4 lg:justify-start">
+            <div className="mt-6 flex justify-center lg:justify-start gap-4">
               {footerLinks.map((footerLink) => (
                 <li key={footerLink.link}>
                   <Link
@@ -94,62 +102,87 @@ function Footer() {
                     {footerLink.icon}
                   </Link>
                 </li>
-
               ))}
-
-
             </div>
           </div>
 
-          <div
-            className="grid grid-cols-1 gap-8 text-center lg:grid-cols-2 lg:text-left"
-          >
-            {/* for footer docs links */}
+          <div className="grid grid-cols-1 lg:grid-cols-3 gap-4 mx-auto">
             <ul className="font-medium text-gray-200 pt-5">
               {footerdocsLinks.map((section, index) => (
                 <div key={index}>
-                  <h3 className="text-xl font-extrabold mb-4 text-gray-200">{section.title}</h3>
+                  <h3 className="text-xl font-extrabold mb-4 text-gray-200">
+                    {section.title}
+                  </h3>
                   <ul>
                     {section.child.map((link, linkIndex) => (
                       <li key={linkIndex} className="pt-2">
-                        <Link href={link.link} className="hover:text-primary " rel="noopener noreferrer" target="_blank" aria-label="footer docs link" >{link.name}</Link>
+                        <Link
+                          href={link.link}
+                          className="hover:text-primary"
+                          rel="noopener noreferrer"
+                          target="_blank"
+                          aria-label="footer docs link"
+                        >
+                          {link.name}
+                        </Link>
                       </li>
                     ))}
                   </ul>
                 </div>
               ))}
             </ul>
 
-            <div>
-
-              {/* for footer service links */}
-              <ul className="font-medium text-gray-200">
-                {footerServiceLinks.map((section, index) => (
-                  <div key={index}>
-                    <h3 className="text-xl font-extrabold mt-10 mb-4 text-gray-200">{section.title}</h3>
-                    <ul>
-                      {section.child.map((link, linkIndex) => (
-                        <li key={linkIndex} className="pt-2">
-                          <Link href={link.link} className="hover:text-primary " rel="noopener noreferrer" target="_blank" aria-label="footer service link">{link.name}</Link>
-                        </li>
-                      ))}
-                    </ul>
-                  </div>
-                ))}
-              </ul>
+            <ul className="font-medium text-gray-200">
+              {footerServiceLinks.map((section, index) => (
+                <div key={index}>
+                  <h3 className="text-xl font-extrabold mt-5 mb-4 text-gray-200">
+                    {section.title}
+                  </h3>
+                  <ul>
+                    {section.child.map((link, linkIndex) => (
+                      <li key={linkIndex} className="pt-2">
+                        <Link
+                          href={link.link}
+                          className="hover:text-primary"
+                          rel="noopener noreferrer"
+                          target="_blank"
+                          aria-label="footer service link"
+                        >
+                          {link.name}
+                        </Link>
+                      </li>
+                    ))}
+                  </ul>
+                </div>
+              ))}
+            </ul>
+            <div className="mt-[25px] ">
+              <div className="p-2 bg-white rounded-lg max-w-[160px] mx-auto">
+                <Link
+                  href="https://github.com/priyankarpal/ProjectsHut"
+                  target="_blank"
+                  rel="noreferrer"
+                  aria-label="GitHub repository"
+                >
+                  <Image
+                    src="https://github.com/priyankarpal/ProjectsHut/assets/88102392/0fa9e8f0-349d-4cc8-8e01-1b6e2c27dbbb"
+                    alt="Github-Share-Button"
+                    width={144}
+                    height={46}
+                  />
+                </Link>
+              </div>
             </div>
           </div>
         </div>
-
-        <div className="mt-16 pt-8 dark:border-gray-800">
-          <p className="text-center text-gray-200">
+        <div className="mt-16 pt-8 dark:border-gray-800 text-center lg:text-center lg:text-left">
+          <p className="text-gray-200 mx-auto lg:mx-0">
             © ProjectsHut {getCurrentYear()} All rights reserved
           </p>
         </div>
       </div>
     </footer >
-
   );
 }
 
-export default Footer;
+export default Footer;
diff --git a/contributing.md b/contributing.md
@@ -59,50 +59,59 @@ git clone https://github.com/<YOUR-USERNAME>/ProjectsHut.git
 cd ProjectsHut
 ```
 
-3.  Install dependencies
+3. Add a reference(remote) to the original repository.
+```
+git remote add upstream https://github.com/priyankarpal/ProjectsHut.git
+```
+
+4. Check the remotes for this repository.
+```
+git remote -v
+```
+
+5.  Install dependencies
 
 ```bash
 pnpm i
 ```
 
 > **Note**: If you don't have pnpm installed in your system then run this command `npm i -g pnpm`
 
-4.  Now do ahead and create a new branch and move to the branch
+6.  Now do ahead and create a new branch and move to the branch
 
 ```bash
 git checkout -b fix-issue-<ISSUE-NUMBER>
 ```
 
 > **Note**: Replace `<ISSUE-NUMBER>` with the issue number you are working on
 
-5.  Run in local
+7.  Run in local
 
 ```bash
 pnpm dev
 ```
 
 > Add new features or fix bugs according to your issue number
 
-6.  After done you can now push this changes, for doing that follow the following command chain
+8.  After done you can now push this changes, for doing that follow the following command chain
 
 - `git status -s` (Shows the changed files)
 - `git add --all` (Will add all the files to staging area)
 - `git commit -m "feat/docs/fix: <EXPLAIN-YOUR_CHANGES>"`
 
   > **Note**: Replace `<EXPLAIN-YOUR_CHANGES>` with the changes you have made. Also, follow the [conventional commits](https://www.conventionalcommits.org/en/v1.0.0/) for writing commit messages
   
-- `git remote add upstream https://github.com/priyankarpal/ProjectsHut.git`
 - `git push origin fix-issue-<ISSUE-NUMBER>`
 
-7.  After this go to your forked GitHub repository and go to `Pull Request` section. Now you might be able to see a pop up saying **Pull Request**. Click on the popup and you will be redirected to pull request page
+9.  After this go to your forked GitHub repository and go to `Pull Request` section. Now you might be able to see a pop up saying **Pull Request**. Click on the popup and you will be redirected to pull request page
 
-8.  Now fill in the form template of the pull request and give the necessary description.
+10.  Now fill in the form template of the pull request and give the necessary description.
 
-9.  Click on **Submit**
+11.  Click on **Submit**
 
-10. Hurray! You just made your first contribution to this project 🎉
+12. Hurray! You just made your first contribution to this project 🎉
 
-11. Wait for your pull request to be reviewed and merged.
+13. Wait for your pull request to be reviewed and merged.
 
 ## Useful Links