Changeset de83113 for src/main/resources/static

Timestamp:

02/17/25 21:52:11 (4 months ago)

Author:

ste08 <sjovanoska@…>

Branches:

master

Children:

62bba0c

Parents:

9868304

Message:

Signup,Login,FlightSearch,Booking and Payment working!

Location:

src/main/resources/static

Files:

• FlightSearch.html (modified) (7 diffs)
• TransactionPage.html (modified) (4 diffs)

src/main/resources/static/FlightSearch.html

@@ -252 +252 @@
             <h2>Available Flights</h2>
             <div class="flights-list">
-                <div class="flight-item" v-for="flight in flights" :key="flight.flightId">
+                <div class="flight-item" v-for="flight in flights" :key="flight.flightID">
                     <input type="checkbox" v-model="flight.selected" />
                     <span>{{ flight.departureTime }} | {{ flight.arrivalTime }} | ${{ flight.price }} | {{ flight.availableSeats }}</span>
@@ -295 +295 @@
             showReturnDate: false,
             showPopup: false,
-            issueDescription: ""
+            issueDescription: '',
+            userId:''
         },
         computed: {
@@ -302 +303 @@
             }
         },
+
         methods: {
             async searchFlights() {
@@ -337 +339 @@
 
                 const flight = this.selectedFlights[0];
+                console.log(flight);
                 const totalCost = flight.price;
+
                 const bookingData = {
-                    flightId: flight.flightId,
+                    flightId: flight.flightID,
                     bookingDate: new Date().toISOString().split('T')[0],
                     status: 'PENDING',
-                    totalCost: totalCost
+                    totalCost: totalCost,
+                    userId:this.userId
                 };
-
                 axios.post('/api/bookings', bookingData)
                     .then(response => {
-                        const bookingID = response.data.bookingID;
+                        const bookingID = response.data.bookingId;
                         alert("Booked successfully!");
-                        window.location.href = `/transaction?amount=${encodeURIComponent(totalCost)}&bookingId=${encodeURIComponent(bookingID)}&flightId=${encodeURIComponent(flight.flightId)}`;
+                        window.location.href = `/transaction?amount=${encodeURIComponent(totalCost)}&bookingId=${encodeURIComponent(bookingID)}&flightId=${encodeURIComponent(flight.flightID)}&userId=${encodeURIComponent(this.userId)}`;
                     })
                     .catch(error => {
@@ -383 +387 @@
                 if (this.issueDescription.trim()) {
                     const reviewData = {
-                        userID: 1,
+                        userID: this.userId,
                         subject: "Issue Report",
                         description: this.issueDescription
@@ -413 +417 @@
         mounted() {
             this.fetchFlights();
+            const params = new URLSearchParams(window.location.search);
+            this.userId = params.get("userId");
             axios.get('api/flights')
                 .then(response => {
@@ -420 +426 @@
                     console.error("Error fetching flights", error);
                 });
+
         }
     });

src/main/resources/static/TransactionPage.html

@@ -263 +263 @@
             expiration: '',
             amount: '',
-            paymentSuccess: false
-        },
-        created(){
-            const urlParams = new URLSearchParams(window.location.search);
-            this.flightId = urlParams.get('flightId');
-            this.amount = urlParams.get('amount');
-            this.bookingId = urlParams.get('bookingId')
-
-            const user = JSON.parse(localStorage.getItem("user"));
-            if(user){
-                this.userId = user.id;
-            }
+            paymentSuccess: false,
+            flightId:'',
+            userId:''
         },
         methods: {
@@ -282 +273 @@
                     transaction_date:paymentDate,
                     payment_status:'SUCCESS',
-                    amount:this.amount,
-                    userId:this.userId,
-                    bookingId:this.bookingId
+                    amount:Number(this.amount) || null,
+                    userId:Number(this.userId) || null,
+                    bookingId:Number(this.bookingId) || null
                 };
                 console.log(transaction);
@@ -291 +282 @@
                         console.log(response.data);
                         this.paymentSuccess = true;
+                        this.updateBooking();
                         setTimeout(() => window.location.href = '/flights',2000);
                 })
                     .catch(error => console.error("Payment failed", error));
             },
+            updateBooking() {
+                const booking = {
+                    bookingDate: new Date().toISOString().split('T')[0],
+                    flightId:this.flightId,
+                    payment_status:'SUCCESS',
+                    total_cost:Number(this.amount) || null,
+                    userId:Number(this.userId) || null,
+                    bookingId:Number(this.bookingId) || null
+                };
+                console.log(booking);
+                axios.put(`api/flights/${this.bookingId}`, booking)
+                    .then(response => {
+                        console.log(response.data);
+                    })
+                    .catch(error => console.error("Booking update failed", error));
+            },
             cancelPayment() {
-                window.location.href = '/flights'; // Redirecting to flight search on cancel
+                window.location.href = '/flights';
             },
             validateForm() {
@@ -305 +313 @@
                 );
             }
+        },
+        mounted(){
+            const params = new URLSearchParams(window.location.search);
+            this.userId = params.get("userId");
+            this.bookingId = params.get("bookingId");
+            this.flightId = params.get("flightId");
+            this.amount=params.get("amount");
         }
     });