Skip to content

fixed login sign up theme #89

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

Open
HimanshuBarak wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fixed login sign up theme #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
22603fa
fixed login sign up theme
HimanshuBarak Jun 30, 2021
4173980
Merge branch 'Placexp:main' into main
HimanshuBarak Jul 14, 2021
b0f07fb
added mcq page
HimanshuBarak Jul 23, 2021
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
16 changes: 16 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
"react-router-dom": "^5.2.0",
"react-scripts": "4.0.0",
"react-select": "^3.1.1",
"react-tooltip": "^4.2.21",
"serve": "^11.3.2",
"socket.io-client": "^2.3.0",
"styled-components": "^5.2.1",
Expand Down
14 changes: 8 additions & 6 deletions src/Component/Auth/Login.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,8 +122,8 @@ setSubmitting(false);

}
return (
<Container id="login">
<div className="wrapper">
<Container id="login">
<Row>
<Col id="login1">
<h1>Welcome Back!</h1>
Expand All @@ -144,8 +144,8 @@ setSubmitting(false);
<h4 id="link" onClick={()=>setauthpage("forgot") } style={{color:":#834F80"}}>Forgot Password?</h4>
<h4>Not Registered yet?<a id="link" onClick={()=>setauthpage("signup")} style={{color:":#834F80"}}>Sign up</a></h4>
<button> {submitting?( <div>Loading <div class="spinner-border " role="status">
<span class="sr-only">Loading... </span>
</div></div>):'Next'} </button>
<span class="sr-only">Loading... </span>
</div></div>):'Next'} </button>
</form>
):
( <form className="login_form" onSubmit={handlesubmit}>
Expand All @@ -156,15 +156,17 @@ setSubmitting(false);
<h4 id="link" onClick={()=>setauthpage("forgot") } style={{color:":#834F80"}}>Forgot Password?</h4>
<h4>Not Registered yet?<a id="link" onClick={()=>setauthpage("signup")} style={{color:":#834F80"}}>Sign up</a></h4>
<button>{submitting?( <div>Loading <div class="spinner-border " role="status">
<span class="sr-only">Loading... </span>
</div></div>):'Login'}</button><button onClick={()=>setBack(true)}>Back</button>
<span class="sr-only">Loading... </span>
</div></div>):'Login'}</button><button onClick={()=>setBack(true)}>Back</button>
</form>)}
</Container>

</Col>
</Row>

</Container>
</div>



)
Expand Down
184 changes: 89 additions & 95 deletions src/Component/Auth/login.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,111 +1,105 @@
@media screen and (max-width: 800px) {
#login1{
display:none;
}
body{
background:white;
#login1 {
display: none;
}
body {
}
}
@media screen and (min-width: 400px) {
#login{
-webkit-box-shadow: 10px 10px 66px -4px rgba(0,0,0,0.75);
-moz-box-shadow: 10px 10px 66px -4px rgba(0,0,0,0.75);
box-shadow: 15px 15px 16px -4px rgba(0,0,0,0.75);


#login {
box-shadow: 6px 4px 14px -6px rgba(17, 2, 2, 0.75);
-webkit-box-shadow: 6px 4px 14px -6px rgba(17, 2, 2, 0.75);
-moz-box-shadow: 6px 4px 14px -6px rgba(17, 2, 2, 0.75);
}
}

#login {
background:white;
display: flex;
flex-direction: column;
text-align: center;
padding: 5px;
max-width: 800px;
padding:0;
margin: auto auto;
margin-top: 40px;

}
#login3 >h1{
color:#1F3D7B;
}
input{
padding:15px;
font-size: 1.1em;
border:none;
background:#f4f4f2;
margin-bottom:15px;
border-radius:5px;
width:70%;
}
#login1 {
background:#1F3D7B;

}
#login1 > h1{
margin-top: 80px;
font-size: 5.4em;
font-weight: 800;
color:white;
}
#login1 >h2{
margin:20px;
font-size: 1.4em;
font-weight:300;
color:white;
}
input:focus{
outline:none;
}
button{
margin:auto auto;
margin-top:20px;
padding:15px;
width:60%;
font-size:1.2em;
background:#1F3D7B;
color:white;
border-radius:5px;
border:none;
}
button:focus{
outline:none;
}
#login3{
padding:25px 0 25px 0;
}
#btn0{
display:flex;
justify-content: center;
padding:15px;
font-size: 1.2em;
border:2px white solid;
background:#1F3D7B;
margin:50px auto;
border-radius: 5px;
width:55%;
color:white;
transition: all .4s ease;
}
#btn0:focus{
outline:none;
}
background: white;
display: flex;
flex-direction: column;
text-align: center;
padding: 5px;
max-width: 800px;
padding: 0;
margin: auto auto;
margin-top: 40px;
}
#login3 > h1 {
color: #6f4a8e;
}
input {
padding: 15px;
font-size: 1.1em;
border: none;
background: #f4f4f2;
margin-bottom: 15px;
border-radius: 5px;
width: 70%;
}
#login1 {
background: #6f4a8e;
}
#login1 > h1 {
margin-top: 80px;
font-size: 5.4em;
font-weight: 800;
color: white;
}
#login1 > h2 {
margin: 20px;
font-size: 1.4em;
font-weight: 300;
color: white;
}
input:focus {
outline: none;
}
button {
margin: auto auto;
margin-top: 20px;
padding: 15px;
width: 60%;
font-size: 1.2em;
background: #6f4a8e;
color: white;
border-radius: 5px;
border: none;
}
button:focus {
outline: none;
}
#login3 {
padding: 25px 0 25px 0;
}
#btn0 {
display: flex;
justify-content: center;
padding: 15px;
font-size: 1.2em;
border: 2px white solid;
background: #6f4a8e;
margin: 50px auto;
border-radius: 5px;
width: 55%;
color: white;
transition: all 0.4s ease;
}
#btn0:focus {
outline: none;
}

#btn0:hover{
background:white;
color:#1F3D7B
#btn0:hover {
background: white;
color: #6f4a8e;
}
.login_icon {

object-fit: contain;
display: block;
margin: 0 auto;
}
#link{
color:#1F3D7B;

#link {
color: #6f4a8e;
}
#link:hover{
#link:hover {
cursor: pointer;
}
}
19 changes: 9 additions & 10 deletions src/Component/Auth/register.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,9 @@
}
@media screen and (min-width: 800px) {
#signup{
-webkit-box-shadow: 10px 10px 66px -4px rgba(0,0,0,0.75);
-moz-box-shadow: 10px 10px 66px -4px rgba(0,0,0,0.75);
box-shadow: 15px 15px 16px -4px rgba(0,0,0,0.75);

box-shadow: 6px 4px 14px -6px rgba(17,2,2,0.75);
-webkit-box-shadow: 6px 4px 14px -6px rgba(17,2,2,0.75);
-moz-box-shadow: 6px 4px 14px -6px rgba(17,2,2,0.75);

}
}
Expand All @@ -28,7 +27,7 @@

}
#signup3 >h1{
color: #1F3D7B;
color: #6F4A8E;
}
input{
padding:15px;
Expand All @@ -40,7 +39,7 @@
width:70%;
}
#signup1 {
background:#1F3D7B;
background:#6F4A8E;

}
#signup1 > h1{
Expand All @@ -64,7 +63,7 @@
padding:15px;
width:60%;
font-size:1.2em;
background:#1F3D7B;
background:#6F4A8E;
color:white;
border-radius:5px;
border:none;
Expand All @@ -82,7 +81,7 @@
font-size: 1.2em;
border:none;
border:2px white solid;
background:#1F3D7B;
background:#6F4A8E;
margin:50px auto;
border-radius: 5px;
width:55%;
Expand All @@ -92,7 +91,7 @@

#btn1:hover{
background:white;
color:#1F3D7B;
color:#6F4A8E;
}
#btn1:focus{
outline:none;
Expand All @@ -105,5 +104,5 @@
margin: 0 auto;
}
#link1{
color:#1F3D7B;
color:#6F4A8E;
}
45 changes: 45 additions & 0 deletions src/Component/Questions/Data.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
let questions =[

{
id:"1.",
title:"What is the time complexity of merge sort?",
op1:"O(n)",
op2:"O(n)",
op3:"O(n)",
op4:"O(n)",
correct:"O(n) is the correct answer",
exp:"This is because whenever your think about the"
},
{
id:"2.",
title:"What is the time complexity of merge sort?",
op1:"O(n)",
op2:"O(n)",
op3:"O(n)",
op4:"O(n)",
correct:"O(n) is the correct answer",
exp:"This is because whenever your think about the"
},
{
id:"3.",
title:"What is the time complexity of merge sort?",
op1:"O(n)",
op2:"O(n)",
op3:"O(n)",
op4:"O(n)",
correct:"O(n) is the correct answer",
exp:"This is because whenever your think about the"
},


]









export default questions;
Loading