Merge branch 'zakaria's-branch' into shafei's-branch

Author: AuroraMaestro

backend/Controllers/UserController.js

@@ -35,8 +35,7 @@ exports.updateUserById = async function(req,res) {
   await User.findByIdAndUpdate(ID, req.body.user, {new: true, runValidators: true})
       .then( (user) => {
           res.status(200)
-          res.send({statusCode:200})
-          res.json(user)
+          res.send({statusCode:200 , data: user})
       })
       .catch( (err) => {
         res.send({statusCode : err.status, message : err.message})
@@ -49,8 +48,7 @@ exports.getAllReservedSeats = async function(req,res) {
   Reservation.find()
       .then( (reservedflights) => {
           //res.status(200)
-          res.send({statusCode:200})
-          res.json(reservedflights)
+          res.send({statusCode:200 , data:reservedflights})
       })
       .catch( (err) => {
           //res.status(404)
@@ -67,8 +65,7 @@ exports.getReservedFlightById = async function(req,res) {
   Reservation.findById(ID)
       .then( (reservedflights) => {
           //res.status(200)
-          res.send({statusCode:200})
-          res.json(reservedflights)
+          res.send({statusCode:200 , data:reservedflights})
       })
       .catch( (err) => {
           //res.status(404)
@@ -141,9 +138,6 @@ exports.deleteReservedFlightById = async function(req,res) {
   Reservation.findByIdAndDelete(ID)
       .then(async (reservedflights) => {
 
-        console.log('BEF--------------------------------------------');
-
-        console.log(reservedflights);
 
         await updateReservationSeats(reservedflights.reservedFlightIDs[0],
             reservedflights.cabinClass,
@@ -152,7 +146,6 @@ exports.deleteReservedFlightById = async function(req,res) {
             reservedflights.cabinClass,
             reservedflights.assignedReturnSeats , true);
 
-            console.log('AFTER------------------------------------------------');
 
             let IDuser = reservedflights.reservedUserID;
             let useremail= null;
@@ -175,7 +168,7 @@ exports.deleteReservedFlightById = async function(req,res) {
 
                 };
 
-                transporter.sendMail(options, (err,info)=>{
+                transporter.sendMail(option, (err,info)=>{
 
                 if(err){
                     console.log(err);
@@ -203,14 +196,6 @@ const updateFlight = async function(ID,reservedSeats){
 
 }
 
-//create transporter for sender data
-const transporter = nodemailer.createTransport({
-    service: 'gmail',
-   auth: {
-       user:'guccsen704@gmail.com',
-       pass:'Hossam2021'
-   }
-});
 
 
 const updateReservationSeats = async function(ID,cabinclass,assignedSeats , isCancelled){
@@ -223,8 +208,6 @@ const updateReservationSeats = async function(ID,cabinclass,assignedSeats , isCa
     let newDepSeats = [];
     let newAvailableSeats = 0;
 
-    console.log(assignedSeats, "     ----------------------------");
-
     if(cabinclass.toLowerCase() === 'economy'){
 
         for (let i = 0; i < oldFlight.reservedEconomySeats.length; i++) {
@@ -268,7 +251,6 @@ exports.register = async function(req,res) {
             res.status(200)
             res.json(user)
             res.send({statusCode:200})
-            console.log(user);
         })
         .catch( (err) => {
             if (err.name === "ValidationError") {
@@ -292,6 +274,16 @@ exports.register = async function(req,res) {
             console.log(err.status)})
 }
 
+//create transporter for sender data
+const transporter = nodemailer.createTransport({
+    service: 'gmail',
+   auth: {
+       user:'csenair704no1@gmail.com',
+       pass:'Hossam2021'
+   }
+});
+
+
 exports.sendsummary = async function(req,res){
 
     let ID = req.params.id;
@@ -301,49 +293,46 @@ exports.sendsummary = async function(req,res){
     await User.findById(IDuser)
     .then( (user) => {
 
-        useremail= user.email;
-
+        useremail= 'hossamnew16@gmail.com';
+        console.log('USER SET');
     })
     .catch( (err) => {
-        res.send({statusCode : err.status, message : err.message})
+      //  res.send({statusCode : err.status, message : err.message})
         console.log(err.status)})
-    
-    
-    
+
 
 
 
     await Reservation.findById(ID)
     .then( (reservedflights) => {
-            
+            console.log('RESERV FETCH SUCC , ALSO THICCCCC');
+
             //recevier info
-    const option ={
-    from:'guccsen704@gmail.com',
-    to:useremail,
-    subject :"Summary",
-    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."
+            let mailoption = {
+                from:'csenair704no1@gmail.com',
+                to:'hossamnew16@gmail.com',
+                subject :"Summary",
+                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.`
+            };
+            
+            
+            
+            
+            transporter.sendMail(mailoption, function(err, data){
+            
+                if(err){
+                    console.log('faile',err);
+                }else{
+                    console.log('email sent.....');
+                }
+            })
+
+            console.log('THE FINAL STAGE');
+                res.status(200)
+                res.json(reservedflights)
+                    })
+                
 
-    
-    };
-    
-    
-    transporter.sendMail(options, (err,info)=>{
-    
-    if(err){
-        console.log(err);
-        return;
-    }
-    console.log("Sent: "+ info.response);
-    })
-            res.status(200)
-            res.json(reservedflights)
-        })
         .catch( (err) => {
             res.send({statusCode : err.status, message : err.message})
             console.log(err.status)})

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

@@ -39,15 +39,6 @@ const StyledTableRow = styled(TableRow)(({ theme }) => ({
   },
 }));
 
-const handlesendemailClick = async (e) => {
-
-  await axios.post(`http://localhost:8000/sendsummary/${e.currentTarget.id}`)
-  .then(data => console.log('Senttttt!'));
-
-  
-  
-}
-
 function Reservedflights() {
 
   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

@@ -32,7 +32,7 @@ function ViewProfile(){   //function component declaration
     console.log(update);
     axios.put(`http://localhost:8000/user/update/${id}`,{user:update})  //the update request
     .then(data=>{
-      console.log(data);
+      console.log(data.data);
       console.log("updated successfully")
         //in the then part meaning if the request is successful clear the feilds and set a flag "updated" to true 
         //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