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

Ryan #2

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

Ryan #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
06fe85c
Changed Login
Rcheng2003 Feb 25, 2023
477a76c
new changes
Rcheng2003 Feb 28, 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
7 changes: 0 additions & 7 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 @@ -7,6 +7,7 @@
"@testing-library/react": "^13.4.0",
"@testing-library/user-event": "^13.5.0",
"bootstrap": "^5.2.3",
"mdb-react-ui-kit": "^5.1.0",
"react": "^18.2.0",
"react-bootstrap": "^2.7.2",
"react-dom": "^18.2.0",
Expand Down
26 changes: 13 additions & 13 deletions src/Components/App/App.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,19 +10,19 @@ import Footer from "../Footer/Footer"

function App(){
return(
//<NavBar/> //for testing purposes, Tashi
<Footer/> //for testing purposes,
// <BrowserRouter>
// <Routes>
// <Route exact path="/" element={<Home/>}></Route>
// <Route exact path="/Community" element={<Community/>}/>
// <Route exact path="/Home" element={<Home/>}/>
// <Route exact path="/Loading" element={<Loading/>}/>
// <Route exact path="/Signup" element={<Signup/>}/>
// <Route exact path="/Login" element={<Login/>}/>
// <Route exact path="/FullRendered" element={<FullRendered/>}/>
// </Routes>
// </BrowserRouter>
<NavBar/>,
<Footer/>,
<BrowserRouter>
<Routes>
<Route exact path="/" element={<Home/>}></Route>
<Route exact path="/Community" element={<Community/>}/>
<Route exact path="/Home" element={<Home/>}/>
<Route exact path="/Loading" element={<Loading/>}/>
<Route exact path="/Signup" element={<Signup/>}/>
<Route exact path="/Login" element={<Login/>}/>
<Route exact path="/FullRendered" element={<FullRendered/>}/>
</Routes>
</BrowserRouter>
)
}

Expand Down
229 changes: 135 additions & 94 deletions src/Components/Login/Login.css
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,45 @@
body {
background-color: white;
font-family: 'Ubuntu', sans-serif;
margin: 0;
}

.main {
width: 700px;
height: 400px;
margin: 7em auto;
border-radius: 1.5em;
}

.sign {
padding-top: 40px;
color: black;
font-family: 'Ubuntu', sans-serif;
font-weight: bold;
font-size: 48px;
}

.un {
body {
background-color: white;
font-family: 'Ubuntu', sans-serif;
margin: 0;
}

.main {
width: 700px;
height: 400px;
margin: 7em auto;
border-radius: 1.5em;
}

.sign {
padding-top: 40px;
color: black;
font-family: 'Ubuntu', sans-serif;
font-weight: bold;
font-size: 48px;
}
/*
.un {
width: 76%;
color: rgb(38, 50, 56);
font-weight: 700;
font-size: 14px;
letter-spacing: 1px;
background: rgba(136, 126, 126, 0.04);
padding: 10px 20px;
border: none;
border-radius: 20px;
outline: none;
box-sizing: border-box;
border: 2px solid rgba(0, 0, 0, 0.02);
margin-bottom: 50px;
margin-left: 46px;
text-align: center;
margin-bottom: 27px;
font-family: 'Ubuntu', sans-serif;
}

.pass {
width: 76%;
color: rgb(38, 50, 56);
font-weight: 700;
Expand All @@ -37,80 +57,101 @@
text-align: center;
margin-bottom: 27px;
font-family: 'Ubuntu', sans-serif;
}

form.form1 {
padding-top: 40px;
}
}*/

div.space{
padding-top: 40px;
}

.un:focus, .pass:focus {
border: 2px solid rgba(0, 0, 0, 0.18) !important;

.pass {
width: 76%;
color: rgb(38, 50, 56);
font-weight: 700;
font-size: 14px;
letter-spacing: 1px;
background: rgba(136, 126, 126, 0.04);
padding: 10px 20px;
border: none;
border-radius: 20px;
outline: none;
box-sizing: border-box;
border: 2px solid rgba(0, 0, 0, 0.02);
margin-bottom: 50px;
margin-left: 46px;
text-align: center;
margin-bottom: 27px;
}

.submit {
cursor: pointer;
border-radius: 5em;
color: #fff;
background: linear-gradient(to right, #486856, #507963);
border: 0;
padding-left: 40px;
padding-right: 40px;
padding-bottom: 10px;
padding-top: 10px;
font-family: 'Ubuntu', sans-serif;
}


.un:focus, .pass:focus {
border: 2px solid rgba(0, 0, 0, 0.18) !important;

}

.submit {
cursor: pointer;
border-radius: 5em;
color: #fff;
background: linear-gradient(to right, #486856, #507963);
border: 0;
padding-left: 40px;
padding-right: 40px;
padding-bottom: 10px;
padding-top: 10px;
font-family: 'Ubuntu', sans-serif;
margin-left: 35%;
font-size: 13px;
box-shadow: 0 0 20px 1px rgba(0, 0, 0, 0.04);
}

.forgot {
text-shadow: 0px 0px 3px rgba(117, 117, 117, 0.12);
color: white ;
padding-top: 15px;
}
margin-left: 40%;
font-size: 13px;
box-shadow: 0 0 20px 1px rgba(0, 0, 0, 0.04);
display: absolute;
}

.forgot {
text-shadow: 0px 0px 3px rgba(117, 117, 117, 0.12);
color: white ;
padding-top: 15px;
}

a {
text-shadow: 0px 0px 3px rgba(117, 117, 117, 0.12);
color: green ;
text-decoration: none
}

span.noAccount{
font-size: 12px;
}

a {
text-shadow: 0px 0px 3px rgba(117, 117, 117, 0.12);
color: green ;
text-decoration: none
}
div.login-div{
margin-top: -30px;
}

span.noAccount{
font-size: 12px;
}

div.login-div{
margin-top: -30px;
}
.logo{
position: absolute;
text-align: left;
margin-top: -100px;
}
.nerfLogo{
width: 100px;
height: 100px;
}

.logo{
position: absolute;
text-align: left;
margin-top: -100px;
}
.nerfLogo{
width: 100px;
height: 100px;
}
div.input-block {
position: relative;
}
div.input-block input {
font-weight: 500;
font-size: 1.6rem;
color: #495055;
width: 550px;
padding: 15px 15px;
border-radius: 1rem;
border: 2px solid #D9D9D9;
outline:none;
}
div.input-block span.placeholder {
position: absolute;
margin: 17px 70px;
padding: 0 4px;
font-family: Roboto, sans-serif;
color: #6c757d;
display: flex;
align-items: center;
font-size: 1.6rem;
top: 0;
left: 17px;
transition: all 0.2s;
transform-origin: 0% 0%;
background: none;
pointer-events: none;
}
div.input-block input:valid + span.placeholder,
div.input-block input:focus + span.placeholder {
transform: scale(0.7) translateY(-25px);
}
div.input-block input:focus{
color: #284B63;
border-color: #284B63;
}
div.input-block input:focus + span.placeholder {
color: #284B63;
}
31 changes: 24 additions & 7 deletions src/Components/Login/Login.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,41 @@
import React,{useState} from 'react';
import React from 'react';
import "./Login.css";
import logo from "./pure_logo.png";

function Login() {

return (
<body>
<div class="logo">
<img className="nerfLogo" src={logo}/>
</div>
<div class="main">

<p class="sign">
<div >Login</div>
<div class="login-div"><span class="noAccount"> Don't have an account? <a href="./Signup">Sign Up</a> </span> </div>
</p>
<form class="form1">
<input class="un " type="text" align="center" placeholder="Username"/>
<input class="pass" type="password" align="center" placeholder="Password"/>
<a class="submit" align="center">Sign in</a>
</form>


<div class="space"></div>

<div class="input-block" align="center">
<input type="text" name="input-text" id="input-text" required spellcheck="false"/>
<span class="placeholder">
Username
</span>
</div>

<div class="space"></div>

<div class="input-block" align="center">
<input type="password" name="input-text" id="input-text" required spellcheck="false"/>
<span class="placeholder">
Password
</span>
</div>

<div class="space"></div>
<a class="submit" href="/">Sign in</a>
</div>
</body>
);
Expand Down
Loading