From 8fe18d926a69f97b5e3711bb0be0195c83ff1c31 Mon Sep 17 00:00:00 2001
From: Ojas Arora <127867874+Ojas-Arora@users.noreply.github.com>
Date: Fri, 21 Jun 2024 00:02:29 +0530
Subject: [PATCH 1/4] Footer Icons and Go Pro set
---
package-lock.json | 14 +++++++-------
package.json | 2 +-
src/Components/Login.css | 2 +-
.../footer_section/ContactUs/contact_us.js | 2 --
yarn.lock | 8 ++++----
5 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/package-lock.json b/package-lock.json
index 08e86994..48f72568 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -30,7 +30,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"
}
@@ -18718,9 +18718,9 @@
}
},
"node_modules/react-toastify": {
- "version": "8.0.0",
- "resolved": "https://registry.npmjs.org/react-toastify/-/react-toastify-8.0.0.tgz",
- "integrity": "sha512-7a5uhwbJ5Ivp5QyJN8P9M8g+7wksJt51QuYAZW0c3pDOh0Jx8lH7XzNHzzJg4NHup9n4zcqH9rwXknnyzYg2OA==",
+ "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"
},
@@ -35417,9 +35417,9 @@
}
},
"react-toastify": {
- "version": "8.0.0",
- "resolved": "https://registry.npmjs.org/react-toastify/-/react-toastify-8.0.0.tgz",
- "integrity": "sha512-7a5uhwbJ5Ivp5QyJN8P9M8g+7wksJt51QuYAZW0c3pDOh0Jx8lH7XzNHzzJg4NHup9n4zcqH9rwXknnyzYg2OA==",
+ "version": "8.2.0",
+ "resolved": "https://registry.npmjs.org/react-toastify/-/react-toastify-8.2.0.tgz",
+ "integrity": "sha512-Pg2Ju7NngAamarFvLwqrFomJ57u/Ay6i6zfLurt/qPynWkAkOthu6vxfqYpJCyNhHRhR4hu7+bySSeWWJu6PAg==",
"requires": {
"clsx": "^1.1.1"
},
diff --git a/package.json b/package.json
index 6223c138..c0009272 100644
--- 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/Components/Login.css b/src/Components/Login.css
index 35166b12..1de4d789 100644
--- a/src/Components/Login.css
+++ b/src/Components/Login.css
@@ -214,7 +214,7 @@ form.sign-in-form {
.container1:before {
content: "";
position: absolute;
- height: 2000px;
+ height: 1531px;
width: 2000px;
top: -10%;
right: 40%;
diff --git a/src/Components/footer_section/ContactUs/contact_us.js b/src/Components/footer_section/ContactUs/contact_us.js
index cd3e03db..fc16a2ce 100644
--- 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 (
diff --git a/yarn.lock b/yarn.lock
index d5da1cf3..dd57c64f 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -9466,10 +9466,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"
From cc63612636571bf0f2a7b7eef675e04c08ac8f62 Mon Sep 17 00:00:00 2001
From: Ojas Arora <127867874+Ojas-Arora@users.noreply.github.com>
Date: Fri, 21 Jun 2024 00:07:56 +0530
Subject: [PATCH 2/4] Go Pro and Footer Icons Set
---
src/App.js | 4 ----
1 file changed, 4 deletions(-)
diff --git a/src/App.js b/src/App.js
index 36d8c551..63022bd5 100644
--- a/src/App.js
+++ b/src/App.js
@@ -36,14 +36,10 @@ function App() {
} />
} />
} />
-
} />
-
} />
-
}/>
}/>
-
} />
} />
} />
From 5b3b8337ebb3cbd2104e5677e1c483b8504f4b19 Mon Sep 17 00:00:00 2001
From: Ojas Arora <127867874+Ojas-Arora@users.noreply.github.com>
Date: Fri, 21 Jun 2024 00:09:23 +0530
Subject: [PATCH 3/4] Go Pro
---
src/App.js | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/App.js b/src/App.js
index 63022bd5..25e60d27 100644
--- a/src/App.js
+++ b/src/App.js
@@ -44,7 +44,6 @@ function App() {
} />
} />
} />
-
From 8d6ee514a1866deb7a1192ccfecc40620248b53e Mon Sep 17 00:00:00 2001
From: Ojas Arora <127867874+Ojas-Arora@users.noreply.github.com>
Date: Fri, 21 Jun 2024 22:29:19 +0530
Subject: [PATCH 4/4] Social Media Icons
---
src/Components/Login.css | 21 +++++++++++++--------
src/Components/Login.js | 32 +++++++++++++++++---------------
2 files changed, 30 insertions(+), 23 deletions(-)
diff --git a/src/Components/Login.css b/src/Components/Login.css
index 1de4d789..92627201 100644
--- 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: 1531px;
- 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
index 32ff6d01..32feaa3a 100644
--- 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 = () => {