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.

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

#179 #207

Merged
merged 9 commits into from Apr 3, 2019
Merged

#179 #207

merged 9 commits into from Apr 3, 2019

Conversation

ibishop
Copy link
Collaborator

@ibishop ibishop commented Apr 2, 2019

No description provided.

Login Page, Issue with passing properties
Login Page, Issue with passing properties
# Conflicts:
#	src/components/dashboard/jumbotron/OngoingJumbotron.js
#	src/components/dashboard/jumbotron/OngoingJumbotronContainer.js
#	src/components/dashboard/jumbotron/UpcomingJumbotron.js
# Conflicts:
#	src/components/dashboard/jumbotron/OngoingJumbotron.js
#	src/components/dashboard/jumbotron/OngoingJumbotronContainer.js
#	src/components/dashboard/jumbotron/UpcomingJumbotron.js
@@ -0,0 +1,4 @@
.countdown-elem{
padding: 0 20px;

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This blank space should be removed.

*/
getTimeDiv() {
let currTrip = this.props.currTripInfo.trip;
if (currTrip === null) {
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a purpose for

let currTrip = this.props.currTripInfo.trip;
if (currTrip === null) {
      return;
}

it appears as though it is never being used?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In order to access the trip_start variable, we need the trip to not be null.

@ibishop ibishop merged commit 5b36e4d into master Apr 3, 2019
@evscott evscott deleted the #179 branch April 4, 2019 05:15
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants