Skip to content

Commit

Permalink
changed some css styles
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 ec858b1 commit 1ab2c86
Show file tree
Hide file tree
Showing 6 changed files with 46 additions and 19 deletions.
13 changes: 13 additions & 0 deletions src/components/Basket.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
.basket{
background-color: #AED6F1;
display: table;
justify-content: center;
border-radius: 10px;
padding: 2px;
margin: 4px;
font-size: 1rem;

}


/*tc bg-light-blue fl w-19 br4 pa3 ma*/
7 changes: 4 additions & 3 deletions src/components/Basket.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,12 @@ import './Basket.css'

function Basket (props) {
return (
<div className = 'tc bg-light-blue fl w-20 br3 pa3 ma2 grow'>
<div className = 'basket grow fl w-20'>
<img alt = '' src = '' />
<div>
<h3> {props.airport} <br></br> {props.time} </h3>
<p> {props.name }</p>
{props.time}
<br></br>
{props.name}
</div>

</div>
Expand Down
22 changes: 11 additions & 11 deletions src/components/fakedata.js
Original file line number Diff line number Diff line change
@@ -1,43 +1,43 @@
export const users = [
{
id: 'jfk060110',
month: "5",
time: "10 AM",
month: "6",
time: "10:00",
name: 'Gladys',
airport: 'JFK'
},
{
id: 'ewr060110',
month: "5",
time: "10 AM",
month: "6",
time: "13:00",
name: 'Kevin',
airport: 'EWR'
},
{
id: 'bdl060110',
month: "5",
time: "10 AM",
month: "6",
time: "11:00",
name: 'Bohan',
airport: 'BDL'
},
{
id: 'lga060110',
month:"6",
time: "10 AM",
time: "10:00",
name: 'Archie',
airport: 'LGA'
},
{
id: 'lga060110',
month:"5",
time: "10 AM",
month:"6",
time: "10:00",
name: 'Arash',
airport: 'LGA'
},
{
id: 'lga060110',
month:"5",
time: "10 AM",
month:"6",
time: "10:00",
name: 'Jesus',
airport: 'LGA'
}
Expand Down
1 change: 0 additions & 1 deletion src/containers/Airport.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ export default Airport;

function Block (props) {
const blocklist = users.filter(user => {
{console.log(user.month, props.date.getMonth())}
return (Number(user.month) === (props.date.getMonth()+1) && user.airport.toLowerCase() === props.name.toLowerCase())
})

Expand Down
14 changes: 14 additions & 0 deletions src/containers/Airport2.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
.airportblock {
display : inline-block;
min-height: 100%;
min-width: 20%;
justify-content: center;
background-color: #FCF3CF;
padding: 1px;
margin: 5px;
border-radius: 10px

}


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

class Airport2 extends Component {
constructor (props){
Expand Down Expand Up @@ -41,8 +42,7 @@ function Blocks({date, airports, users}){
})

return (
<div className = "bg-light-yellow fl w-100 br4 pa1 ma3 grow">
{console.log("up airport", airports)}
<div >
{Airmaps}
</div>
);
Expand All @@ -56,9 +56,9 @@ function Block ({date, airport, users}){
const Basketmap = Userlist.map((name, i) => {
return <Basket id = {Userlist[i].id} name = {Userlist[i].name} time = {Userlist[i].time} airport = {Userlist[i].airport} />
})

return (
<div className = "">
<div className = "airportblock grow" >
<h4>{airport}</h4>
{Basketmap}
</div> );

Expand Down

0 comments on commit 1ab2c86

Please sign in to comment.