Merge pull request #353 from Ojas-Arora/test

Create Your Journey Updated
SUGAM-ARORA · Jun 21, 2024 · 7d726c7 · 7d726c7
2 parents bdd3afd + 8d6ee51
commit 7d726c7
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 42 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -25,7 +25,7 @@
     "react-icons": "^5.2.1",
     "react-router-dom": "^6.23.1",
     "react-scripts": "5.0.1",
-    "react-toastify": "^8.0.0",
+    "react-toastify": "^8.2.0",
     "styled-components": "^6.1.11",
     "web-vitals": "^4.1.1"
   },

diff --git a/src/App.js b/src/App.js
@@ -36,19 +36,14 @@ function App() {
           <Route path="/services" element={<Services />} />
           <Route path="/contacts" element={<ContactUs />} />
           <Route path="/termsandconditions" element={<TermsConditions />} />
-
           <Route path="/privacypolicy" element={<PrivacyPolicy />} />
-
           <Route path="/licensing" element={<Licensing />} />
-
           <Route path="/readmore/:id" element={<Readmore/>}/>
           <Route path="/profile/:id" element={<Profiles/>}/>
-
           <Route path="/pricing" element={<Pricing />} />
           <Route path="/projects" element={<MyProjects />} />
           <Route path="/new/project" element={<NewProject />} />
           <Route path="/profile" element={<Profile />} />
-
         </Routes>
         <Footer />
       </div>

diff --git a/src/Components/Login.css b/src/Components/Login.css
@@ -10,6 +10,11 @@ body,
 input {
   font-family: "Poppins", sans-serif;
 }
+.toggle-password:hover {
+  cursor: default;
+  background-color: inherit;
+  transform: none;
+}
 
 .panels-container {
   position: relative;
@@ -79,7 +84,7 @@ form.sign-in-form {
   height: 55px;
   border-radius: 55px;
   display: grid;
-  grid-template-columns: 15% 70% 15%;
+  grid-template-columns: 15% 85%;
   padding: 0 0.4rem;
   position: relative;
 }
@@ -122,7 +127,6 @@ form.sign-in-form {
   align-items: center;
   justify-content: center;
 }
-
 .social-text {
   padding: 0.7rem 0;
   font-size: 1.2rem;
@@ -214,14 +218,14 @@ form.sign-in-form {
 .container1:before {
   content: "";
   position: absolute;
-  height: 2000px;
-  width: 2000px;
+  height: 1520px;
+  width: 800px;
   top: -10%;
-  right: 40%;
+  right: 48%;
   transform: translateY(-50%);
   background-image: linear-gradient(-45deg, #121026 0%, #121026 100%);
   transition: 1.8s ease-in-out;
-  border-radius: 50%;
+  border-radius: 80%;
   z-index: 6;
 }
 
@@ -283,7 +287,8 @@ form.sign-in-form {
 
 .container1.sign-up-mode:before {
   transform: translate(100%, -50%);
-  right: 57.1%;
+  right: 51%;
+  width: 780px;
 }
 
 .container1.sign-up-mode .left-panel .image,
@@ -292,7 +297,7 @@ form.sign-in-form {
 }
 
 .container1.sign-up-mode .signin-signup {
-  left: 25%;
+  left: 28%;
 }
 
 .container1.sign-up-mode form.sign-up-form {

diff --git a/src/Components/Login.js b/src/Components/Login.js
@@ -2,6 +2,8 @@ import React, { useState } from 'react';
 import { Link } from 'react-router-dom';
 import './Login.css';
 import '@fortawesome/fontawesome-free/css/all.min.css';
+import logImg from './Profile/log.svg';
+import registerImg from './Profile/register.svg';
 
 const LogIn = () => {
   const [email, setEmail] = useState('');
@@ -81,7 +83,7 @@ const LogIn = () => {
       <div className="forms-container">
         <div className="signin-signup">
           <form className="sign-in-form" onSubmit={handleNextClick} action="/https://uni-collab.vercel.app/" method="post">
-            <h2 className="title">Adventure Awaits! Log In</h2>
+            <h2 className="title">Step into UniCollab! Log In</h2>
             <div className="input-field">
               <i className="fas fa-user"></i>
               <input
@@ -107,22 +109,22 @@ const LogIn = () => {
             <p className="social-text">Connect with Social Magic</p>
             <div className="social-media">
               <Link to="https://www.facebook.com" className="social-icon">
-                <i className="fab fa-facebook-f"></i>
+                <i className="fab fa-facebook-f" style={{ color: 'darkturquoise' }}></i>
               </Link>
               <Link to="https://www.twitter.com" className="social-icon">
-                <i className="fab fa-twitter"></i>
+                <i className="fab fa-twitter" style={{ color: 'darkturquoise' }}></i>
               </Link>
               <Link to="https://www.gmail.com" className="social-icon">
-                <i className="fab fa-google"></i>
+                <i className="fab fa-google" style={{ color: 'darkturquoise' }}></i>
               </Link>
               <Link to="https://www.linkedin.com" className="social-icon">
-                <i className="fab fa-linkedin-in"></i>
+                <i className="fab fa-linkedin-in" style={{ color: 'darkturquoise' }}></i>
               </Link>
             </div>
           </form>
 
           <form className="sign-up-form" onSubmit={handleSignUpClick} action="/https://uni-collab.vercel.app/" method="post">
-            <h2 className="title">Start Your Journey</h2>
+            <h2 className="title">Start Journey with UniCollab</h2>
             <div className="input-field">
               <i className="fas fa-user"></i>
               <input
@@ -157,16 +159,16 @@ const LogIn = () => {
             <p className="social-text">Connect with Social Magic</p>
             <div className="social-media">
               <Link to="https://www.facebook.com" className="social-icon">
-                <i className="fab fa-facebook-f"></i>
+                <i className="fab fa-facebook-f" style={{ color: 'darkturquoise' }}></i>
               </Link>
               <Link to="https://www.twitter.com" className="social-icon">
-                <i className="fab fa-twitter"></i>
+                <i className="fab fa-twitter" style={{ color: 'darkturquoise' }}></i>
               </Link>
               <Link to="https://www.gmail.com" className="social-icon">
-                <i className="fab fa-google"></i>
+                <i className="fab fa-google" style={{ color: 'darkturquoise' }}></i>
               </Link>
               <Link to="https://www.linkedin.com" className="social-icon">
-                <i className="fab fa-linkedin-in"></i>
+                <i className="fab fa-linkedin-in" style={{ color: 'darkturquoise' }}></i>
               </Link>
             </div>
           </form>
@@ -180,25 +182,25 @@ const LogIn = () => {
             <p>
               Explore our platform and unlock a realm of personalized experiences.
             </p>
-            <br></br>
+            <br />
             <button className="btn transparent" onClick={toggleSignUpMode} style={{ display: 'block', margin: 'auto' }}>
               Become a Member
             </button>
           </div>
-          <img src="/log.svg" className="image" alt="" />
+          <img src={logImg} className="image" alt="Login illustration" />
         </div>
         <div className="panel right-panel">
           <div className="content">
             <h3>Adventure Awaits!</h3>
             <p>
-            Embark on a journey through UniCollab for personalized experiences.
+              Embark on a journey through UniCollab for personalized experiences.
             </p>
-            <br></br>
+            <br />
             <button className="btn transparent" onClick={toggleSignUpMode} style={{ display: 'block', margin: 'auto' }}>
               ENTER YOUR REALM
             </button>
           </div>
-          <img src="./log.svg" className="image" alt="" />
+          <img src={registerImg} className="image" alt="Register illustration" />
         </div>
       </div>
     </div>

diff --git a/src/Components/footer_section/ContactUs/contact_us.js b/src/Components/footer_section/ContactUs/contact_us.js
@@ -5,7 +5,6 @@ import homeIcon from '../../../img/homeicon.png';
 import { ToastContainer, toast, Bounce } from 'react-toastify';
 import 'react-toastify/dist/ReactToastify.css';
 
-
 function ContactUs() {
     const handleSubmit = (event) => {
         event.preventDefault();
@@ -25,7 +24,6 @@ function ContactUs() {
         });
     }
 
-
     return (
         <div className='box'>
             <Link to="/">

diff --git a/yarn.lock b/yarn.lock
@@ -8485,10 +8485,10 @@ react-scripts@5.0.1:
   optionalDependencies:
     fsevents "^2.3.2"
 
-react-toastify@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.npmjs.org/react-toastify/-/react-toastify-8.0.0.tgz"
-  integrity sha512-7a5uhwbJ5Ivp5QyJN8P9M8g+7wksJt51QuYAZW0c3pDOh0Jx8lH7XzNHzzJg4NHup9n4zcqH9rwXknnyzYg2OA==
+react-toastify@^8.2.0:
+  version "8.2.0"
+  resolved "https://registry.npmjs.org/react-toastify/-/react-toastify-8.2.0.tgz"
+  integrity sha512-Pg2Ju7NngAamarFvLwqrFomJ57u/Ay6i6zfLurt/qPynWkAkOthu6vxfqYpJCyNhHRhR4hu7+bySSeWWJu6PAg==
   dependencies:
     clsx "^1.1.1"