merge with zakarias

Author: AuroraMaestro

backend/Controllers/UserController.js

@@ -195,14 +195,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){
@@ -281,6 +273,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;
@@ -291,48 +293,53 @@ exports.sendsummary = async function(req,res){
     .then( (user) => {
 
         useremail= 'hossamnew16@gmail.com';
-
+        console.log('USER SET');
     })
     .catch( (err) => {
       //  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');
+
+            const textMessage = `
+            TEZAK 7AMRA , 3ayez teshof el reservation : RO7 el view reserved flight ya ro7 omak
+             <p> Assigned departure seats :  ${reservedflights.assignedDepartureSeats} </p>
+             <p> Assigned return seats : ${reservedflights.assignedReturnSeats} </p>
+             `;
+            
 
+
             //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(option, (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

@@ -51,7 +51,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