Skip to content

Commit

Permalink
changed color, added signin form
Browse files Browse the repository at this point in the history
  • Loading branch information
Yiyuan Fang authored and Yiyuan Fang committed Jun 11, 2020
1 parent d98cae3 commit 8ce8eaa
Show file tree
Hide file tree
Showing 8 changed files with 650 additions and 4 deletions.
596 changes: 596 additions & 0 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
"@testing-library/jest-dom": "^4.2.4",
"@testing-library/react": "^9.5.0",
"@testing-library/user-event": "^7.2.1",
"express": "^4.17.1",
"nodemon": "^2.0.4",
"react": "^16.13.1",
"react-datepicker": "^3.0.0",
"react-dom": "^16.13.1",
Expand Down
17 changes: 17 additions & 0 deletions server.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
const express = require ('express');

const app = express();

app.get('/', (req, res)=> {
const user {
name: 'Sally',
hobby:'soccer'
}
res.send(user);
});

app.get('/',(req,res) => {
res.send("AHAHAH!");
});

app.listen(3000);
1 change: 0 additions & 1 deletion src/components/Basket.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ function Basket (props) {
</div>

</div>

)
}
export default Basket;
31 changes: 31 additions & 0 deletions src/components/Signin.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
import React from 'react';

function Signin (){
return (
<main class="pa4 black-80">
<form class="measure center">
<fieldset id="sign_up" class="ba b--transparent ph0 mh0">
<legend class="f4 fw6 ph0 mh0">Sign In</legend>
<div class="mt3">
<label class="db fw6 lh-copy f6" for="email-address">Email</label>
<input class="pa2 input-reset ba bg-transparent hover-bg-black hover-white w-100" type="email" name="email-address" id="email-address" />
</div>
<div class="mv3">
<label class="db fw6 lh-copy f6" for="password">Password</label>
<input class="b pa2 input-reset ba bg-transparent hover-bg-black hover-white w-100" type="password" name="password" id="password" />
</div>
<label class="pa0 ma0 lh-copy f6 pointer"><input type="checkbox"/> Remember me</label>
</fieldset>
<div class="">
<input class="b ph3 pv2 input-reset ba b--black bg-transparent grow pointer f6 dib" type="submit" value="Sign in" />
</div>
<div class="lh-copy mt3">
<a href="#0" class="f6 link dim black db">Sign up</a>
<a href="#0" class="f6 link dim black db">Forgot your password?</a>
</div>
</form>
</main>
);
}

export default Signin
2 changes: 0 additions & 2 deletions src/containers/Airport2.css
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,3 @@

}


/*bg-light-yellow dib br4 pa1 ma3 grow */
3 changes: 3 additions & 0 deletions src/containers/Airport2.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import '../components/Basket.css';
import {users, airports} from '../components/fakedata.js';
import Scroll from '../components/Scroll';
import './Airport2.css'
import Signin from '../components/Signin'

class Airport2 extends Component {

Expand All @@ -29,9 +30,11 @@ class Airport2 extends Component {

return (
<div className = "f3 tc">
<Signin/>
<header>
<DatePicker selected = {this.state.startDate} onChange = {this.onChange} />
</header>
<br></br>
<Scroll>
{Airmaps}
</Scroll>
Expand Down
2 changes: 1 addition & 1 deletion src/index.css
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ body {
'Ubuntu', 'Cantarell', 'Fira Sans', 'Droid Sans', 'Helvetica Neue',
sans-serif;
background-repeat: no-repeat;
background: linear-gradient(#e66465, #9198e5);
background: linear-gradient(#EBDEF0, #A9CCE3);
}

code {
Expand Down

0 comments on commit 8ce8eaa

Please sign in to comment.