Merge branch 'main' of https://github.com/Ayushmaanagarwal1211/UniCollab

package.json

@@ -13,7 +13,7 @@
     "@fortawesome/free-brands-svg-icons": "^6.5.2",
     "@fortawesome/free-solid-svg-icons": "^6.5.2",
     "@fortawesome/react-fontawesome": "^0.2.2",
-    "@mui/icons-material": "^5.16.4",
+    "@mui/icons-material": "^5.16.6",
     "@react-oauth/google": "^0.12.1",
     "@testing-library/jest-dom": "^6.4.6",
     "@testing-library/react": "^16.0.0",
@@ -27,11 +27,11 @@
     "react-helmet": "^6.1.0",
     "react-icons": "^5.2.1",
     "react-intl": "^6.6.8",
-    "react-router-dom": "^6.24.1",
+    "react-router-dom": "^6.26.0",
     "react-scripts": "5.0.1",
     "react-toastify": "^10.0.5",
     "styled-components": "^6.1.11",
-    "web-vitals": "^4.2.0"
+    "web-vitals": "^4.2.3"
   },
   "scripts": {
     "start": "react-scripts start",

src/App.js

@@ -7,6 +7,7 @@ import Settings from "./Components/Settings/SettingsPage";
 import About_us from "./Components/footer_section/about_us/About_us";
 import BlogPage from "./Components/footer_section/BlogPage/BlogPage";
 import FAQPage from "./Components/footer_section/FAQPage/FAQPage";
+import PortFolio from "./Components/PortFolio/PortFolio.js"; 
 import Services from "./Components/footer_section/services/Services";
 import ContactUs from "./Components/footer_section/ContactUs/contact_us";
 import Readmore from "./Components/Readmore";

src/Components/CardMain.js

@@ -119,7 +119,7 @@ const features = [
     img: Card9,
     pro: icon,
     hearts: 55,
-    title: "GameOn",
+    title: "BBlocks",
     dev: "ChrisClark",
     type: "Gaming",
     role: "Game Developer, Animator",
@@ -226,7 +226,7 @@ function CardMain() {
           />
           <div className="card_main_name">
             <h2>{project.title}</h2>
-            <div className="card_main_icon">
+            <div className="card_main_icon" style={{ marginTop: '-18px' }}>
               <i>
                 <BsFillHeartFill /> <span>{project.hearts}</span>
               </i>

src/Components/Footer.js

@@ -42,7 +42,7 @@ const Footer = () => {
             <ul className='footer-links'>
               <li><a href='/blogs'><FontAwesomeIcon icon={faBlog} /> Blogs</a></li>
               <li><a href='/Testimonials'><FontAwesomeIcon icon={faStar} /> Testimonials</a></li>
-              <li><a href='#'><FontAwesomeIcon icon={faClipboardList} /> Portfolio</a></li>
+              <li><a href='/PortFolio'><FontAwesomeIcon icon={faClipboardList} /> Portfolio</a></li>
               <li><a href='/faq'><FontAwesomeIcon icon={faQuestionCircle} /> FAQ</a></li>
               <li><a href='/rateus'><FontAwesomeIcon icon={faStar} /> Rate-Us</a></li>
             </ul>

src/Components/Login.css

@@ -245,7 +245,7 @@ form.sign-in-form {
   position: absolute;
   margin-top: 18vh;
   height: 1520px;
-  width: 800px;
+  width: 850px;
   top: -10%;
   right: 53%;
   transform: translateY(-50%);

src/Components/Login.js

@@ -465,8 +465,8 @@ const LogIn = () => {
           </div>
           <img src={logImg} className="image" alt="Log In" />
         </div>
-        <div className="panel right-panel">
-          <div className="content">
+        <div className="panel right-panel1">
+          <div className="content1">
             <h3>One of Us?</h3>
             <p>
               Log in to access your account and continue collaborating and