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

make server side routes for trips #22

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 25 additions & 3 deletions database-mongo/models.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ var UserSchema = mongoose.Schema({
var User = mongoose.model('User', UserSchema);

var TripSchema = mongoose.Schema({
id: Number,
user: String,
events: Array,
name: String,
photos: Array,
Expand All @@ -46,7 +46,27 @@ var createTrip = function(obj, callback) {
console.log(trip);
}
})
}
};

var getTrips = function(id, callback) {
Trip.find({user: id}, function(err, trips) {
if (err) {
callback(err, null);
} else {
callback(null, trips);
}
});
};

var removeTrip =function(objId, callback) {
Trip.remove({ObjectId: objId}, function(err, trip) {
if (err) {
callback(err, null);
} else {
callback(null, err);
}
});
};

var createUser = function(obj, callback) {
User.create(obj, function(err, user) {
Expand Down Expand Up @@ -120,4 +140,6 @@ module.exports.createEvent = createEvent;
module.exports.removeEvent = removeEvent;
module.exports.updateEvent = updateEvent;
module.exports.findUser = findUser;
module.exports.createTrip = createTrip;
module.exports.createTrip = createTrip;
module.exports.getTrips = getTrips;
module.exports.removeTrip = removeTrip;
2 changes: 1 addition & 1 deletion react-client/src/app.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ class App extends React.Component {
error: (error) => {
console.error(error);
}
})
});
};

mapRender() {
Expand Down
28 changes: 15 additions & 13 deletions react-client/src/components/save_trip_button.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -29,27 +29,29 @@ class SaveTripButton extends React.Component {
this.setState(newState);
}

handleSubmit (trip) {
let context = this;
event.preventDefault();

handleSubmit () {
let trip = {
events: this.props.events,
name: this.state.name,
photos: [],
participants: []
};

$.ajax({
url: '',
method: 'POST',
data: JSON.stringify(trip),
url: '/createTrip',
type: 'POST',
contentType: 'application/json',
success: function(data) {
console.log('Save trip');
data: JSON.stringify(trip),
success: (trip) => {
console.log('sucess', trip);
},
error: function(err) {
console.log('Error in saving trip');
// this.props.history.push('/');
error: (error) => {
console.log(error);
}
});

}


render () {


Expand Down
36 changes: 33 additions & 3 deletions server/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@ app.get('/getEvents', function(req, res) {

db.getEvents(req.session.passport.user, function(err, events){
if (err) {
res.send(err);
res.status(500).send(err);
} else {
res.send(events);
res.status(200).json(events);
}
})
});
Expand Down Expand Up @@ -70,11 +70,41 @@ app.delete('/removeEvent', function(req, res) {
if (err) {
res.send(err);
} else {
res.status(200).send();
res.status(204).send();
}
})
});

app.post('/createTrip', function(req, res) {
db.createTrip(req.body, function(err, trip) {
if (err) {
res.status(500).send(err);
} else {
res.status(201).json(trip);
}
});
});

app.get('/getTrips', function(req, res) {
db.getTrips(req.session.passport.user, function(err, trips) {
if (err) {
res.status(500).send(err);
} else {
res.status(200).json(trips);
}
});
});

app.delete('/removeTrip', function(req, res) {
db.removeTrip(req.body.ObjectId, function(err, trip) {
if (err) {
res.status(500).send(err);
} else {
res.status(204).send();
}
})
})

app.get('/authenticate', passport.authenticate('google', { scope : ['profile', 'email'] }), function(req, res) {
});

Expand Down
6 changes: 3 additions & 3 deletions server/middleware/initGoogle.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ let passport = require('passport');
let db = require('../../database-mongo/models.js');

passport.use(new GoogleStrategy({
clientID: '898316907945-kk9tkv33a46v17qej06tfce8hmv88g44.apps.googleusercontent.com',
clientSecret: 'SE4ddGm2SWQt8jezDRARRl7U',
callbackURL: 'http://localhost:3000/auth/google/callback'
clientID: process.env.GOOGLE_CLIENT_ID,
clientSecret: process.env.GOOGLE_CLIENT_SECRET,
callbackURL: process.env.GOOGLE_CALLBACK_URL
},
function(accesstoken, refreshToken, profile, done) {
// console.log('this is the accesstoken', accesstoken);
Expand Down