Skip to content

Commit d5a4bb0

Browse files
committed
merge with zakarias
1 parent b869655 commit d5a4bb0

File tree

3 files changed

+46
-48
lines changed

3 files changed

+46
-48
lines changed

backend/Controllers/UserController.js

Lines changed: 45 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -195,14 +195,6 @@ const updateFlight = async function(ID,reservedSeats){
195195

196196
}
197197

198-
//create transporter for sender data
199-
const transporter = nodemailer.createTransport({
200-
service: 'gmail',
201-
auth: {
202-
user:'guccsen704@gmail.com',
203-
pass:'Hossam2021'
204-
}
205-
});
206198

207199

208200
const updateReservationSeats = async function(ID,cabinclass,assignedSeats , isCancelled){
@@ -281,6 +273,16 @@ exports.register = async function(req,res) {
281273
console.log(err.status)})
282274
}
283275

276+
//create transporter for sender data
277+
const transporter = nodemailer.createTransport({
278+
service: 'gmail',
279+
auth: {
280+
user:'csenair704no1@gmail.com',
281+
pass:'Hossam2021'
282+
}
283+
});
284+
285+
284286
exports.sendsummary = async function(req,res){
285287

286288
let ID = req.params.id;
@@ -291,48 +293,53 @@ exports.sendsummary = async function(req,res){
291293
.then( (user) => {
292294

293295
useremail= 'hossamnew16@gmail.com';
294-
296+
console.log('USER SET');
295297
})
296298
.catch( (err) => {
297299
// res.send({statusCode : err.status, message : err.message})
298300
console.log(err.status)})
299-
300-
301-
301+
302302

303303

304304

305305
await Reservation.findById(ID)
306306
.then( (reservedflights) => {
307+
console.log('RESERV FETCH SUCC , ALSO THICCCCC');
308+
309+
const textMessage = `
310+
TEZAK 7AMRA , 3ayez teshof el reservation : RO7 el view reserved flight ya ro7 omak
311+
<p> Assigned departure seats : ${reservedflights.assignedDepartureSeats} </p>
312+
<p> Assigned return seats : ${reservedflights.assignedReturnSeats} </p>
313+
`;
314+
307315

316+
308317
//recevier info
309-
const option ={
310-
from:'guccsen704@gmail.com',
311-
to:useremail,
312-
subject :"Summary",
313-
text: "Dear Customer ," +
314-
"\n Here is your summary for the reservation : " +
315-
"\n Reservation number : "+ reservedflights.reservationNumber + "\n" +
316-
"Number of seats : "+ reservedflights.assignedSeats.length + "\n Assigned departure seats : " + reservedflights.assignedDepartureSeats
317-
+ "\n Assigned return seats : "+ reservedflights.assignedReturnSeats + "\n Total price : " +reservedflights.price
318-
+ "\n Number of adults : "+reservedflights.numberOfAdults + "\n Number of children : "+ reservedflights.numberOfChildren +
319-
"\n Thank you for choosing Weeb Airlines."
318+
let mailoption = {
319+
from:'csenair704no1@gmail.com',
320+
to:'hossamnew16@gmail.com',
321+
subject :"Summary",
322+
text:`Dear Customer , \n Here is your summary for the reservation : \n Reservation number : ${reservedflights.reservationNumber} \n Number of seats : ${reservedflights.assignedSeats.length} + "\n Assigned departure seats : " + reservedflights.assignedDepartureSeats + "\n Assigned return seats : "+ reservedflights.assignedReturnSeats + "\n Total price : " + reservedflights.price + "\n Number of adults : "+ reservedflights.numberOfAdults + "\n Number of children : "+ reservedflights.numberOfChildren + "\n Thank you for choosing Weeb Airlines.`
323+
};
324+
325+
326+
327+
328+
transporter.sendMail(mailoption, function(err, data){
329+
330+
if(err){
331+
console.log('faile',err);
332+
}else{
333+
console.log('email sent.....');
334+
}
335+
})
336+
337+
console.log('THE FINAL STAGE');
338+
res.status(200)
339+
res.json(reservedflights)
340+
})
341+
320342

321-
322-
};
323-
324-
325-
transporter.sendMail(option, (err,info)=>{
326-
327-
if(err){
328-
console.log(err);
329-
return;
330-
}
331-
console.log("Sent: "+ info.response);
332-
})
333-
res.status(200)
334-
res.json(reservedflights)
335-
})
336343
.catch( (err) => {
337344
res.send({statusCode : err.status, message : err.message})
338345
console.log(err.status)})

frontend/my-app/src/User/Reservedflights.js

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,6 @@ const StyledTableRow = styled(TableRow)(({ theme }) => ({
3939
},
4040
}));
4141

42-
const handlesendemailClick = async (e) => {
43-
44-
await axios.post(`http://localhost:8000/sendsummary/${e.currentTarget.id}`)
45-
.then(data => console.log('Senttttt!'));
46-
47-
48-
49-
}
50-
5142
function Reservedflights() {
5243

5344
const [rows, setRows] = useState([]); //declare state param named rows for data of sched and its update method setRows

frontend/my-app/src/User/ViewProfile.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ function ViewProfile(){ //function component declaration
5151
console.log(update);
5252
axios.put(`http://localhost:8000/user/update/${id}`,{user:update}) //the update request
5353
.then(data=>{
54-
console.log(data);
54+
console.log(data.data);
5555
console.log("updated successfully")
5656
//in the then part meaning if the request is successful clear the feilds and set a flag "updated" to true
5757
//its part of the state of the component so if you have a listener for it (the useEffect) it will sense that the flag is updated

0 commit comments

Comments
 (0)