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

updated and redesigned sign in section #16

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

updated and redesigned sign in section #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
"version": "0.1.0",
"private": true,
"dependencies": {
"@fortawesome/fontawesome-svg-core": "^6.5.1",
"@fortawesome/free-brands-svg-icons": "^6.5.1",
"@fortawesome/react-fontawesome": "^0.2.0",
"@material-ui/core": "^4.12.3",
"@testing-library/dom": "^7.21.4",
"@testing-library/jest-dom": "^5.11.4",
Expand All @@ -11,6 +14,7 @@
"firebase": "^9.23.0",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-icons": "^4.12.0",
"react-router-dom": "^6.14.0",
"react-scripts": "4.0.3",
"typescript": "^5.1.3",
Expand Down
64 changes: 63 additions & 1 deletion src/components/Login/Login.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,27 @@

.login-container {
display: flex;
flex-direction: column;
align-items: center;
justify-content: center;
height: 100vh;
margin: auto;

}
.login-container h2{
font-size: 40px;
}

.login-form h2{
font-family:"Brush Script MT",cursive;
font-size: 48px;
margin-bottom: 50px;

}

.login-box{
margin-top: 30px;

}

.login-form {
Expand All @@ -15,17 +33,27 @@
border: 1px solid #ccc;
border-radius: 8px;
background-color: #fff;
height: 52vh;
width: 28vw;

}



.login-form label {
font-weight: bold;
width: 100%;

}

.login-form input {
padding: 0.5rem;
border: 1px solid #ccc;
border-radius: 4px;
width: 19vw;

}


.login-form button {
padding: 0.5rem 1rem;
Expand All @@ -35,7 +63,29 @@
color: #fff;
font-weight: bold;
cursor: pointer;
width: 19vw;
}
.line {
display: flex;
margin-top: 6px;
}
.arrow {
background-color: gray;
height: 1px;
width: 8.6vw;
}
.content {
color: gray;
margin-top: -7px;
margin-left: 4px;
margin-right: 4px;
}
.login-form .google__icon {
margin-top: 12px;
margin-bottom: 15px;
margin-right: 15px;
}


.login-form button:hover {
background-color: #1c3aa9;
Expand All @@ -46,4 +96,16 @@
font-size: 0.8rem;
margin-top: 0.5rem;
}

.sign-up {
margin-top: 30px;
border: 1px solid rgb(195, 195, 195);
padding: 20px;
width: 28vw;
text-align: center;
border-radius: 8px;
}

.sign-up span {
color: rgb(0, 66, 128);
font-weight: 400;
}
48 changes: 36 additions & 12 deletions src/components/Login/Login.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
import React, { useState } from "react";
import { auth, firebase } from "../../firebase/FirebaseInit";
// import { FontAwesomeIcon } from '@fortawesome/react-fontawesome';
// import { faGoogle } from '@fortawesome/free-brands-svg-icons';
import { FaGoogle } from "react-icons/fa";

import './Login.css';

function Login() {
Expand Down Expand Up @@ -61,42 +65,62 @@ function Login() {
return (
<div className="login-container">
<h2>Login Page</h2>
<div className="login-box">

<form className="login-form" onSubmit={handleEmailLogin}>
{/* Email login */}
<label>
Email:
<h2>Photogram</h2>
<div className="email-d">
<input
type="email"
placeholder="Enter email id"
value={email}
onChange={(e) => setEmail(e.target.value)}
/>
</label>
<label>
Password:
</div>

<div className="password-d">
<input
type="password"
placeholder="Password"
value={password}
onChange={(e) => setPassword(e.target.value)}
/>
</label>
<button type="submit">Email Login</button>
</div>
<button type="submit">Login</button>
<div className="line">
<span className="arrow"></span>
<span className="content">OR</span>
<span className="arrow"></span>
</div>

<div className="google_icon">
{/* <button className="google_icon" onClick={handleGoogleLogin}> */}
<FaGoogle/>
{/* </button> */}
<span>Log in with Google</span>
</div>
<p>Forgot password?</p>
</form>

{/* Google login */}
<button className="login-form-button" onClick={handleGoogleLogin}>
{/* <button className="login-form-button" onClick={handleGoogleLogin}>
Google Login
</button>

</button> */}
</div>

{/* Phone number login */}
<form className="login-form" onSubmit={handlePhoneNumberLogin}>
{/* <form className="login-form" onSubmit={handlePhoneNumberLogin}>
<input
type="text"
placeholder="Enter phone number"
value={phoneNumber}
onChange={(e) => setPhoneNumber(e.target.value)}
/>
<button type="submit">Phone Number Login</button>
</form>
</form> */}
<div className="sign-up">
<p>Don't have a accout? <span>Sign Up</span></p></div>
</div>
);
}
Expand Down
31 changes: 31 additions & 0 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1590,6 +1590,32 @@
resolved "https://registry.yarnpkg.com/@firebase/webchannel-wrapper/-/webchannel-wrapper-0.10.1.tgz#60bb2aaf129f9e00621f8d698722ddba6ee1f8ac"
integrity sha512-Dq5rYfEpdeel0bLVN+nfD1VWmzCkK+pJbSjIawGE+RY4+NIJqhbUDDQjvV0NUK84fMfwxvtFoCtEe70HfZjFcw==

"@fortawesome/[email protected]":
version "6.5.1"
resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-6.5.1.tgz#fdb1ec4952b689f5f7aa0bffe46180bb35490032"
integrity sha512-GkWzv+L6d2bI5f/Vk6ikJ9xtl7dfXtoRu3YGE6nq0p/FFqA1ebMOAWg3XgRyb0I6LYyYkiAo+3/KrwuBp8xG7A==

"@fortawesome/fontawesome-svg-core@^6.5.1":
version "6.5.1"
resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-6.5.1.tgz#9d56d46bddad78a7ebb2043a97957039fcebcf0a"
integrity sha512-MfRCYlQPXoLlpem+egxjfkEuP9UQswTrlCOsknus/NcMoblTH2g0jPrapbcIb04KGA7E2GZxbAccGZfWoYgsrQ==
dependencies:
"@fortawesome/fontawesome-common-types" "6.5.1"

"@fortawesome/free-brands-svg-icons@^6.5.1":
version "6.5.1"
resolved "https://registry.yarnpkg.com/@fortawesome/free-brands-svg-icons/-/free-brands-svg-icons-6.5.1.tgz#e948cc02404277cb8ad40fe3573ca75f2830e876"
integrity sha512-093l7DAkx0aEtBq66Sf19MgoZewv1zeY9/4C7vSKPO4qMwEsW/2VYTUTpBtLwfb9T2R73tXaRDPmE4UqLCYHfg==
dependencies:
"@fortawesome/fontawesome-common-types" "6.5.1"

"@fortawesome/react-fontawesome@^0.2.0":
version "0.2.0"
resolved "https://registry.yarnpkg.com/@fortawesome/react-fontawesome/-/react-fontawesome-0.2.0.tgz#d90dd8a9211830b4e3c08e94b63a0ba7291ddcf4"
integrity sha512-uHg75Rb/XORTtVt7OS9WoK8uM276Ufi7gCzshVWkUJbHhh3svsUUeqXerrM96Wm7fRiDzfKRwSoahhMIkGAYHw==
dependencies:
prop-types "^15.8.1"

"@gar/promisify@^1.0.1":
version "1.1.3"
resolved "https://registry.yarnpkg.com/@gar/promisify/-/promisify-1.1.3.tgz#555193ab2e3bb3b6adc3d551c9c030d9e860daf6"
Expand Down Expand Up @@ -10249,6 +10275,11 @@ react-error-overlay@^6.0.9:
resolved "https://registry.yarnpkg.com/react-error-overlay/-/react-error-overlay-6.0.11.tgz#92835de5841c5cf08ba00ddd2d677b6d17ff9adb"
integrity sha512-/6UZ2qgEyH2aqzYZgQPxEnz33NJ2gNsnHA2o5+o4wW9bLM/JYQitNP9xPhsXwC08hMMovfGe/8retsdDsczPRg==

react-icons@^4.12.0:
version "4.12.0"
resolved "https://registry.yarnpkg.com/react-icons/-/react-icons-4.12.0.tgz#54806159a966961bfd5cdb26e492f4dafd6a8d78"
integrity sha512-IBaDuHiShdZqmfc/TwHu6+d6k2ltNCf3AszxNmjJc1KUfXdEeRJOKyNvLmAHaarhzGmTSVygNdyu8/opXv2gaw==

react-is@^16.13.1, react-is@^16.7.0:
version "16.13.1"
resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4"
Expand Down