Merge pull request #323 from Ojas-Arora/test

Links Updated
SUGAM-ARORA · Jun 17, 2024 · 904d59e · 904d59e
2 parents 8c188d7 + 6c81970
commit 904d59e
Show file tree

Hide file tree

Showing 14 changed files with 3,149 additions and 251 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,15 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "chrome",
+            "request": "launch",
+            "name": "Launch Chrome against localhost",
+            "url": "http://localhost:8080",
+            "webRoot": "${workspaceFolder}"
+        }
+    ]
+}
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -12,9 +12,11 @@
     "@fortawesome/free-solid-svg-icons": "^6.5.2",
     "@fortawesome/react-fontawesome": "^0.2.2",
     "@mui/icons-material": "^5.15.20",
+    "@react-oauth/google": "^0.12.1",
     "@testing-library/jest-dom": "^6.4.6",
     "@testing-library/react": "^11.1.0",
     "@testing-library/user-event": "^14.5.2",
+    "firebase": "^10.12.2",
     "lottie-react": "^2.4.0",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
@@ -48,4 +50,4 @@
       "last 1 safari version"
     ]
   }
-}
+}
diff --git a/public/1.png b/public/1.png
diff --git a/src/Components/CreateAccount.css b/src/Components/CreateAccount.css
@@ -1,27 +1,78 @@
-.create-account-container {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-   padding: 3rem 0 3rem 0; 
-}
-
-
-.create-account-form {
-  background-color: rgba(0,0,0,0.26);
-  padding: 2rem;
-  border-radius: 25px;
-  border: 3px solid cyan;
-  animation: borderAnimation 8s infinite;
-}
-
-@keyframes borderAnimation {
-  0% { border-color: cyan; }
-  50% { border-color: rgb(235, 235, 15); }
-  25% { border-color: #cf00a3; }
-  75% { border-color: #04aaac; }
-  100% { border-color: cyan; }
-}
-
+/* General styles */
+
+body {
+    background-repeat: no-repeat;
+    background-size: cover;
+    background-position: center center;
+    color: #fff;
+  }
+
+  .create-account-container {
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    height: 100vh;
+  }
+
+  .create-account-form {
+    background-color: rgba(0,0,0,0.26);
+    padding: 2rem;
+    border-radius: 25px;
+    border: 3px solid cyan;
+    width: 67vw;
+    height: 42vw;
+    position: relative;
+    animation: borderAnimation 8s infinite;
+    }
+    @keyframes borderAnimation {
+      0% { border-color: cyan; }
+      50% { border-color: rgb(235, 235, 15); }
+      25% { border-color: #cf00a3; }
+      75% { border-color: #04aaac; }
+      100% { border-color: cyan; }
+  }
+  h1{
+    font-family: "Roboto", sans-serif;
+    color: #fff;
+    text-align: center;
+    margin-top: 1.5vw;
+    font-size: 3rem;
+    font-style:normal;
+    font-weight: 700;
+    line-height: normal;
+
+
+  }
+  p{
+    font-family: "Roboto", sans-serif;
+    margin-top:.5vw;
+  }
+  p span{
+    color: #78a9fa;
+    font-size: 200px;
+    font-weight: bold;
+  }
+  /* Form steps */
+  .form-steps {
+    margin-bottom: 1.5rem;
+  }
+
+  .step {
+    display: flex;
+    align-items: center;
+    margin-bottom: 0.5rem;
+    position: relative;
+  }
+
+  .step:not(:last-child)::after {
+    content: "";
+    position: absolute;
+    top: -10px; /* Adjust as needed to align with circles */
+    left: 90%;
+    width: 100%; /* Adjust as needed */
+    height: 2px; /* Adjust as needed */
+    background: #cf00a3; /* Adjust as needed */
+  }
 
 .step::before {
   content: attr(data-step);

diff --git a/src/Components/CreateAccount.js b/src/Components/CreateAccount.js
@@ -72,13 +72,13 @@ const CreateAccount = () => {
               value={email}
               onChange={(e) => setEmail(e.target.value)}
             />
-             {emailError && <p className="error-message">{emailError}</p>}
+            {emailError && <p className="error-message">{emailError}</p>}
             <button className="next-btn" onClick={handleNextClick}>Next</button>
             <div className="separator">
               </div>
               <div className="signup-options">
                 <button className="facebook-btn">
-                  <i className="fab fa-facebook-f"></i> Sign up with Facebook
+                  <i className="fab fa-github"></i> Sign up with Github
                 </button>
                 <button className="google-btn">
                   <i className="fab fa-google"></i> Sign up with Google
@@ -114,7 +114,7 @@ const CreateAccount = () => {
         required
         style={{ flex: 1}}
       />
-       <button 
+      <button 
 
         onClick={togglePasswordVisibility} 
         style={{ 

diff --git a/src/Components/Footer.css b/src/Components/Footer.css
@@ -50,14 +50,19 @@
   list-style: none;
 }
 
-.footer-link {
+.footer-links li {
   padding: 0.25rem 0;
-  cursor: pointer;
 }
 
-.footer-link a{
+.footer-links a {
   text-decoration: none;
   color: white;
+  transition: color 0.3s, font-size 0.3s;
+}
+
+.footer-links a:hover {
+  color: #cf00a3;
+  font-size: 1.1rem; /* Slightly increase font size on hover */
 }
 
 .footer-icons {
@@ -76,6 +81,7 @@
 
 .footer-icons a i:hover {
   font-size: 2rem;
+  color: #007bff;
 }
 
 .footer-icons a {
@@ -163,6 +169,7 @@
 
   .footer-2 {
     width: 20%;
+    text-align: left;
   }
 
   .footer-icons {

diff --git a/src/Components/Footer.js b/src/Components/Footer.js
@@ -14,45 +14,44 @@ const Footer = () => {
           <div className='footer-2'>
             <p className='footer-section-title'>Company</p>
             <ul className='footer-links'>
-              <li className='footer-link'><a href='/about'>About Us</a></li>
-              <li className='footer-link'>Servives</li>
-              <li className='footer-link'>Careers</li>
-              <li className='footer-link'>Contact Us</li>
+              <li><a href='/about'>About Us</a></li>
+              <li><a href='/services'>Services</a></li>
+              <li><a href='/careers'>Careers</a></li>
+              <li><a href='/contacts'>Contact Us</a></li>
             </ul>
           </div>
           <div className='footer-2'>
             <p className='footer-section-title'>Product</p>
             <ul className='footer-links'>
-              <li className='footer-link'>Blogs</li>
-              <li className='footer-link'>Testimonals</li>
-              <li className='footer-link'>Portfolio</li>
-              <li className='footer-link'>FAQ</li>
+              <li><a href='/blogs'>Blogs</a></li>
+              <li><a href='#'>Testimonials</a></li>
+              <li><a href='#'>Portfolio</a></li>
+              <li><a href='/faq'>FAQ</a></li>
             </ul>
           </div>
           <div className='footer-2'>
             <p className='footer-section-title'>Legal</p>
             <ul className='footer-links'>
-              <a href="/privacypolicy"><li className='footer-link'>Privacy Policy</li></a>
-              <a href="/termsandconditions"><li className='footer-link'>Terms and Conditions</li></a>
-              <a href="/licensing"><li className='footer-link'>Licensing</li></a>
+              <li><a href="/privacypolicy">Privacy Policy</a></li>
+              <li><a href="/termsandconditions">Terms and Conditions</a></li>
+              <li><a href="/licensing">Licensing</a></li>
             </ul>
           </div>
         </div>
       </div>
       <div className='footer-icons footer-icons-md'>
-      <a href="#" target="_blank" rel='noreferrer'>
-          <i class="devicon-linkedin-plain"></i>
+        <a href="#" target="_blank" rel='noreferrer'>
+          <i className="devicon-linkedin-plain"></i>
         </a>
         <a href="https://github.com/SUGAM-ARORA/UniCollab" target="_blank" rel='noreferrer'>
-          <i class="devicon-github-original"></i>
+          <i className="devicon-github-original"></i>
         </a>
         <a href="#" target="_blank" rel='noreferrer'>
-          <i class="devicon-facebook-plain"></i>
+          <i className="devicon-facebook-plain"></i>
         </a>
         <a href="#" target="_blank" rel='noreferrer'>
-          <i class="devicon-twitter-original"></i>
+          <i className="devicon-twitter-original"></i>
         </a>
-
       </div>
       <div className='footer-bottom'>
         <div className='footer-bottom-link'>

diff --git a/src/Components/TopContainer.css b/src/Components/TopContainer.css
@@ -20,7 +20,14 @@
     display: inline;
     padding: 20px;
   }
-
+  .largeview a:hover {
+    color: #cf00a3;
+    font-size: 1.05rem; /* Slightly increase font size on hover */
+  }
+  .open a:hover {
+    color: #cf00a3;
+    font-size: 1.05rem; /* Slightly increase font size on hover */
+  }
   .mobview {
     display: none;
   }

diff --git a/src/Components/TopContainer.js b/src/Components/TopContainer.js
@@ -98,26 +98,26 @@ function TopContainer() {
     <div className="topContainer">
       <div className="navbar">
         <ul className="largeview">
-          <li id="list">Home</li>
+          <li id="list"><a href='/'>Home</a></li>
           <li id="list"><a href='/about'>About Us</a></li>
-          <li id="list">Services</li>
-          <li id="list">Careers</li>
-          <li id="list">Contact</li>
-          <li id="list">Blogs</li>
-          <li id="list">Faq</li>
+          <li id="list"><a href='/services'>Services</a></li>
+          <li id="list"><a href='/careers'>Careers</a></li>
+          <li id="list"><a href='/contacts'>Contact</a></li>
+          <li id="list"><a href='/blogs'>Blogs</a></li>
+          <li id="list"><a href='/faq'>FAQ</a></li>
         </ul>
 
         <div className="mobview">
           <div className="bars" onClick={toggleMenu}><FontAwesomeIcon icon={faBars} /></div>
           <div id="shortview" className={mobMenu ? 'show' : ''}>
-            <ul>
-              <li id="open">Home</li>
-              <li id="open"><a href='/about'>About Us</a></li>
-              <li id="open">Services</li>
-              <li id="open">Careers</li>
-              <li id="open">Contact</li>
-              <li id="open">Blogs</li>
-              <li id="open">Faq</li>
+            <ul className="open">
+              <li><a href='/'>Home</a></li>
+              <li><a href='/about'>About Us</a></li>
+              <li><a href='/services'>Services</a></li>
+              <li><a href='/careers'>Careers</a></li>
+              <li><a href='/contacts'>Contact</a></li>
+              <li><a href='/blogs'>Blogs</a></li>
+              <li><a href='/faq'>FAQ</a></li>
             </ul>
           </div>
         </div>

diff --git a/src/Components/footer_section/Legal/Licensing.js b/src/Components/footer_section/Legal/Licensing.js
@@ -42,6 +42,7 @@ const SubTitle = styled.h3`
 
 const Content = styled.p`
   margin-bottom: 20px;
+  text-align: justify;
 `;
 
 const StyledUl = styled.ul`

diff --git a/src/Components/footer_section/Legal/PrivacyPolicy.js b/src/Components/footer_section/Legal/PrivacyPolicy.js
@@ -42,6 +42,7 @@ const SubTitle = styled.h3`
 
 const Content = styled.p`
   margin-bottom: 20px;
+  text-align: justify;
 `;
 
 const StyledUl = styled.ul`

diff --git a/src/Components/footer_section/Legal/TermsandConditions.js b/src/Components/footer_section/Legal/TermsandConditions.js
@@ -42,6 +42,7 @@ const SubTitle = styled.h3`
 
 const Content = styled.p`
   margin-bottom: 20px;
+  text-align: justify;
 `;
 
 const StyledUl = styled.ul`