Skip to content

Commit

Permalink
Merge branch 'view-trips-react-setup' of github.com:googleinterns/ste…
Browse files Browse the repository at this point in the history
…p53-2020 into view-trips-react-setup
  • Loading branch information
zghera committed Jul 15, 2020
2 parents a24b1e2 + f24ac9b commit 5118c4b
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 3 deletions.
2 changes: 1 addition & 1 deletion frontend/src/components/ViewActivities/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ class ViewActivities extends React.Component {
</div>
);
}
};
}

export default ViewActivities;
1 change: 1 addition & 0 deletions frontend/src/components/ViewTrips/index.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import React from 'react';

import app from '../Firebase';
import TripsContainer from './trips-container.js'

Expand Down
2 changes: 1 addition & 1 deletion frontend/src/components/ViewTrips/trips-container.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React from 'react';
import Trip from './trip.js';

import Trip from './trip.js';
import * as DATABASE from '../../constants/database.js';


Expand Down
7 changes: 6 additions & 1 deletion frontend/src/constants/database.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,15 @@
* This file specifies the database collection and field names.
*/
export const COLLECTION_TRIPS = 'trips';

export const TRIPS_NAME = 'name';
export const TRIPS_DESCRIPTION = 'description';
export const TRIPS_DESTINATION = 'destination';
export const TRIPS_COLLABORATORS = 'collaborators';
export const TRIPS_START_DATE = 'start_date';
export const TRIPS_END_DATE = 'end_date';

export const COLLECTION_ACTIVITIES = 'activities';
export const ACTIVITIES_START_TIME = 'start_time';
export const ACTIVITIES_END_TIME = 'end_time';
export const ACTIVITIES_TITLE = 'title';
export const ACTIVITIES_DESCRIPTION = 'description';

0 comments on commit 5118c4b

Please sign in to comment.