Skip to content

Commit

Permalink
save of the day before I switch to another repository
Browse files Browse the repository at this point in the history
  • Loading branch information
Yiyuan Fang authored and Yiyuan Fang committed Jun 10, 2020
1 parent 07369af commit fbc26b0
Show file tree
Hide file tree
Showing 7 changed files with 62 additions and 2 deletions.
34 changes: 34 additions & 0 deletions package-lock.json

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

2 changes: 2 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
"react": "^16.13.1",
"react-datepicker": "^3.0.0",
"react-dom": "^16.13.1",
"react-redux": "^7.2.0",
"react-scripts": "3.4.1",
"redux": "^4.0.5",
"tachyons": "^4.12.0"
},
"scripts": {
Expand Down
3 changes: 2 additions & 1 deletion src/Airport.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import './Airport.css';
import Basket from './Basket.js';
import './Basket.css';
import {users, airports} from './fakedata.js';
import Scroll from './Scroll';

function Airport () {
const [startDate, setStartDate] = useState(new Date());
Expand All @@ -18,7 +19,7 @@ function Airport () {
<header>
<DatePicker selected = {startDate} onChange= {date => setStartDate(date)}/>
</header>
{airportlist}
<Scroll>{airportlist}</Scroll>
</div>
)
}
Expand Down
Binary file added src/KotoriRose-Bold.woff
Binary file not shown.
10 changes: 10 additions & 0 deletions src/Scroll.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import React from 'react';

const Scroll = (props) => {
return (
<div style= {{overflowY: 'scroll', border:'1px solid grey', height:'500px'}}>
{props.children}
</div>)
};

export default Scroll;
12 changes: 12 additions & 0 deletions src/Top.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
@font-face {
font-family: 'Kotori Rose Bold';
font-style: normal;
font-weight: normal;
src: local('Kotori Rose Bold'), url('KotoriRose-Bold.woff') format('woff');
}

h1{
font-family: 'Kotori Rose Bold';
font-weight: 400;

}
3 changes: 2 additions & 1 deletion src/Top.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
import React from 'react';
import './Top.css';

function Top () {
return (
<div className = "tc">
<div className = "tc f3">
<h1> Welcome to Divvy </h1>
</div>)
}
Expand Down

0 comments on commit fbc26b0

Please sign in to comment.