Skip to content

fix: name of places #47

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

Merged
yoavnavon merged 1 commit into from
Oct 31, 2019
Merged

fix: name of places #47

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/components/MyTripsCard/MyTripsCard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,11 @@ class MyTripsCard extends Component {
<div className={classes.marginCard}>
<Typography variant="body1" component="p">
<FontAwesomeIcon icon={faCircle} className="start-circle-icon" />
{trip.trip_route.start.name}
{trip.trip_route.start.place_name}
</Typography>
<Typography variant="body1" component="p">
<FontAwesomeIcon icon={faCircle} className="end-circle-icon" />
{trip.trip_route.end.name}
{trip.trip_route.end.place_name}
</Typography>
</div>
<div className={classes.seatsContainer}>
Expand Down
1 change: 0 additions & 1 deletion src/components/MyTripsCard/RequestedTripCard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,6 @@ class RequestedTrip extends Component {
const { reservation_status, driver, trip_route, etd_info } = trip
const date = ParseDate(etd_info.etd)
const time = ParseHour(etd_info.etd)
console.log(trip_route.start.place_name)
return (
<Card className={classes.card}>
<Chip
Expand Down
6 changes: 3 additions & 3 deletions src/components/MyTripsCard/TripDetailsCard.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,8 @@ class TripDetailsCard extends Component {
const { expanded } = this.state
const { classes } = this.props

const departurePoint = trip_route.start.name
const arrivalPoint = trip_route.end.name
const departurePoint = trip_route.start.place_name
const arrivalPoint = trip_route.end.place_name

const date = ParseDate(etd_info.etd)
const time = ParseHour(etd_info.etd)
Expand Down Expand Up @@ -203,7 +203,7 @@ class TripDetailsCard extends Component {
<ListItemIcon>
{this.renderSwitchStop(i, arr.length - 1)}
</ListItemIcon>
<ListItemText primary={point.name} />
<ListItemText primary={point.place_name} />
</ListItem>
))}
</List>
Expand Down
2 changes: 1 addition & 1 deletion src/components/PassengerTrips/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ class PassengerTripCard extends Component {
<ListItemIcon>
{this.renderSwitchStop(i, arr.length - 1)}
</ListItemIcon>
<ListItemText primary={point.name} />
<ListItemText primary={point.place_name} />
</ListItem>
)
})}
Expand Down
2 changes: 1 addition & 1 deletion src/screens/PassengerTrips/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ class PassengerTrips extends Component {
}
return (
<div>
<Grid container spacing={2} justify="center" alignItems="center">
<Grid container spacing={2} justify="center">
{trips.map((trip, index) => {
return (
<Grid item md={4} key={index}>
Expand Down
1 change: 1 addition & 0 deletions src/screens/RequestedTrip/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ RequestedTrip.propTypes = {
userId: PropTypes.string.isRequired,
}).isRequired,
requestedTrips: PropTypes.oneOfType([PropTypes.array, PropTypes.object]),
trips: PropTypes.oneOfType([PropTypes.array, PropTypes.object]),
}

const mapDispatchToProps = dispatch => ({
Expand Down