Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Chnges made as per mentioned #704

Merged
merged 5 commits into from
Jul 7, 2023
Merged

Chnges made as per mentioned #704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d4d5bc5
<changes made>
shruuti321 Jul 7, 2023
2f1f984
Merge branch 'master' into gssoc
narayan954 Jul 7, 2023
16a9fc1
Merge branch 'master' into gssoc
narayan954 Jul 7, 2023
379a8d4
fix format and content
narayan954 Jul 7, 2023
dc722fe
some more fix
narayan954 Jul 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,7 +397,6 @@ div#picker {

/* Input */
input {
/* width: 230px; */
width: 100%;
border: 0;
border: 1px solid rgba(104, 85, 224, 1);
Expand Down Expand Up @@ -433,14 +432,19 @@ input {

.have-account {
color: var(--color);
font-size: 13px;
font-size: 15px;
margin: 10px 0;
font-weight: bold;
}

.have-account span {
border-bottom: 2px solid rgb(104, 85, 224);
color: rgb(104, 85, 224);
cursor: pointer;
font-weight: bold;
}

.have-account span:hover {
color: rgb(157, 147, 219);
}

.login-footer {
Expand Down
35 changes: 32 additions & 3 deletions src/pages/Login/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,14 @@

box-sizing: border-box;
}

.login__left {
display: flex;
gap: 1rem;
justify-content: center;
padding: 2.5rem 1rem;
}

.form__top {
padding: 0rem 0 0.8rem 0;
}
Expand All @@ -22,38 +24,45 @@
width: 10rem;
padding-bottom: 0rem;
}

.greetings h3 {
color: var(--color);
font-size: 2rem;
}

.greetings p {
color: var(--color);
font-size: 1.2rem;
padding-top: 0.1rem;
}

.form__bottom {
display: flex;
flex-direction: column;
gap: 0.8rem;
align-items: flex-start;
}

.input__group {
display: flex;
width: 100%;
gap: 0.4rem;
flex-direction: column;
}

.input__group label {
font-size: 1.2rem;
font-weight: 600;
color: var(--color);
}

.input__group input {
padding: 0.6rem 0.9rem;
font-size: 1.2rem;
margin-top: 0;
width: auto;
}

.action__btn {
width: 100%;
padding: 0.8rem 1rem;
Expand All @@ -66,26 +75,32 @@
background: linear-gradient(#fb5d8ca9, #ad3066ba);
transition: all 0.3s ease-in;
}

.login__btn {
margin-top: 0.5rem;
}

.other__login__method {
width: 100%;
}

.other__login__method .or-text {
color: var(--color);
padding: 5px 9px;
}

.option__divider {
margin: 0 auto;
justify-content: center;
justify-items: center;
}

.action__btn:hover {
background: white;
border: 1px solid rgba(104, 85, 224, 1);
color: rgba(104, 85, 224, 1);
}

#password-container {
border: 1px solid rgba(104, 85, 224, 1);
background-color: white;
Expand All @@ -96,6 +111,7 @@
overflow: hidden;
width: 100%;
}

.show__hide--pass {
height: 100%;
background-color: transparent;
Expand All @@ -105,18 +121,21 @@
margin: auto;
margin-left: 7px;
}

.pass__input__container input {
border: none;
border-radius: 0;
padding-right: 2rem;
width: 75%;
}

.google__fb--login {
padding-top: 0.5rem;
display: flex;
flex-direction: column;
gap: 0.7rem;
}

.other__login {
background-color: white;
white-space: nowrap;
Expand All @@ -134,6 +153,7 @@
letter-spacing: 1px;
transition: all 0.3s ease;
}

.other__login img {
width: 1.5rem;
}
Expand All @@ -142,28 +162,34 @@
background-color: #db4437;
border: 1px solid #db4437;
}

.google__fb--login .facebook {
background-color: #3b5998;
border: 1px solid #3b5998;
}

.google__fb--login .google:hover {
background-color: transparent;
color: #db4437;
}

.google__fb--login .facebook:hover {
background-color: transparent;
color: #3b5998;
}

.no__acct {
width: 100%;
text-align: center;
color: black;
font-size: 1.1rem;
}

.no__acct span {
color: #6855e0;
cursor: pointer;
}

.forgot__new {
text-align: center;
width: 100%;
Expand All @@ -179,20 +205,23 @@
}

/* forgot password */

.forgot-pasword {
width: 100%;
text-align: center;
color: var(--color);
font-size: 13px;
font-size: 14px;
margin: 0;
padding: 0.3rem 0;
}

.forgot-pasword span {
border-bottom: 2px solid rgb(104, 85, 224);
color: rgb(104, 85, 224);
cursor: pointer;
font-weight: bold;
}

.forgot-pasword span:hover {
color: rgb(157, 147, 219);
}

/* media query for 840px */
Expand Down
13 changes: 5 additions & 8 deletions src/pages/Login/index.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ const LoginScreen = () => {
auth
.signInWithPopup(googleProvider)
.then(async (val) => {
const userRef = await db
const userRef = db
.collection("users")
.where("uid", "==", val?.user?.uid);
// alert(((await userRef.get()).docs.length))
Expand Down Expand Up @@ -129,7 +129,6 @@ const LoginScreen = () => {
const userRef = await db
.collection("users")
.where("uid", "==", val?.user?.uid);
// alert(((await userRef.get()).docs.length))
if ((await userRef.get()).docs.length < 1) {
const usernameDoc = db.collection(`users`);
await usernameDoc.doc(auth.currentUser.uid).set({
Expand Down Expand Up @@ -265,23 +264,21 @@ const LoginScreen = () => {
<div className="forgot__new">
<div className="forgot-pasword">
<span role={"button"} onClick={navigateToForgot}>
Forgot Password
Forgot Password ? &#160;
</span>
</div>
<div className="have-account">
New User?
Don't have an account ?&#160;
<span role={"button"} onClick={navigateToSignup}>
{" "}
Sign up!
Sign up
</span>
</div>
</div>
</div>
</form>
</div>
<div className="login__right">
{/* <img src={loginRight} alt="website image" /> */}
</div>
<div className="login__right" />
</section>
);
};
Expand Down
Loading