Changeset 3d60932 for src/main/resources/static

Timestamp:

02/13/25 10:05:35 (4 months ago)

Author:

ste08 <sjovanoska@…>

Branches:

master

Children:

a70b5a4

Parents:

57e58a3

Message:

Fix commiT

Location:

src/main/resources/static

Files:

• FlightSearch.html (modified) (4 diffs)
• ReviewPage.html (modified) (2 diffs)
• TransactionPage.html (modified) (3 diffs)
• UserSignup.html (modified) (3 diffs)
• WishlistPage.html (modified) (1 diff)

src/main/resources/static/FlightSearch.html

@@ -165 +165 @@
                 const bookingDate = new Date().toISOString().split('T')[0];
 
+
                 const bookingData = {
-                    flightId: flight.flightId,
+                    flightId: flight.flightID,
                     bookingDate: bookingDate,
                     status: 'PENDING',
@@ -174 +175 @@
                 axios.post('/api/bookings', bookingData)
                     .then(response => {
+                        const bookingID = response.data.bookingID;
                         alert("Booked successfully!");
-                        window.location.href = `/transaction?amount=${encodeURIComponent(totalCost)}`;
+                        window.location.href = `/transaction?amount=${encodeURIComponent(totalCost)}&bookingId=${encodeURIComponent(bookingID)}&flightId=${encodeURIComponent(flight.flightID)}`;
                     })
                     .catch(error => {
@@ -189 +191 @@
 
                 const wishlistData = {
-                    targetId: flight.flightId,
+                    targetId: flight.flightID,
                     wishlisted: flight.wishlisted
                 };
@@ -274 +276 @@
                     console.error("Error fetching flights", error);
                 });
-            axios.get('api/bookings/getAll/${flight.flightID}')
+            axios.get('api/bookings/getAll/${flight.flightId}')
                 .then(response => {
                     console.log(response.data);

src/main/resources/static/ReviewPage.html

@@ -20 +20 @@
 
             <div class="review-list">
-                <div v-for="review in reviews" :key="review.id" class="review-item">
-                    <h3>{{ review.subject }}</h3>
-                    <p>{{ review.description }}</p>
+                <div v-for="review in reviews" :key="review.reviewid" class="review-item">
+                    <h3>Description</h3>
+                    <p>{{ review.review_comment }}</p>
                     <span>{{ review.date }}</span>
                 </div>
@@ -29 +29 @@
     </div>
 </div>
-
+<script src="https://cdn.jsdelivr.net/npm/vue@2.6.14/dist/vue.js"></script>
+<script src="https://cdn.jsdelivr.net/npm/axios/dist/axios.min.js"></script>
 <script>
     new Vue({
         el: '#app',
         data: {
-            reviews: [
-                {
-                    id: 1,
-                    subject: 'Great experience!',
-                    description: 'The flight was amazing, the service was excellent, and the views were breathtaking.',
-                    date: '2025-02-01',
-                },
-                {
-                    id: 2,
-                    subject: 'Good but delayed',
-                    description: 'The flight was comfortable, but it was delayed by two hours, which caused some inconvenience.',
-                    date: '2025-02-02',
-                },
-                {
-                    id: 3,
-                    subject: 'Okay, but not perfect',
-                    description: 'Everything was fine, but the food options could have been better.',
-                    date: '2025-02-03',
-                },
-            ]
+            reviews: []
         },
         methods: {
             logout() {
-                // Logic to log out the user, e.g., clearing session or redirecting to home page
-                window.location.href = '/'; // Redirecting to home page
+                window.location.href = '/';
             }
+        },
+        mounted() {
+            axios.get('api/reviews')
+                .then(response => {
+                    this.reviews = response.data;
+                    console.log(response.data);
+                })
+                .catch(error => {
+                    console.error("Error fetching reviews", error);
+                });
         }
     });

src/main/resources/static/TransactionPage.html

@@ -53 +53 @@
         el: '#app',
         data: {
+            bookingId: '',
             cardholder: '',
             cardNumber: '',
@@ -63 +64 @@
             this.flightId = urlParams.get('flightId');
             this.amount = urlParams.get('amount');
+            this.bookingId = urlParams.get('bookingId')
 
             const user = JSON.parse(localStorage.getItem("user"));
@@ -79 +81 @@
                     bookingId:this.bookingId
                 };
-
+                console.log(transaction);
                 axios.post('api/payments', transaction)
                     .then(response => {
-                        console.log("Payment successful");
+                        console.log(response.data);
                         this.paymentSuccess = true;
                         setTimeout(() => window.location.href = '/flights',2000);

src/main/resources/static/UserSignup.html

@@ -35 +35 @@
         <div class="form-group">
             <label for="phoneNumber">Phone Number</label>
-            <input type="text" id="phoneNumber" v-model="phoneNumber" required placeholder="Enter your phone number" />
+            <input type="text" id="phoneNumber" v-model="phone_number" required placeholder="Enter your phone number" />
         </div>
 
@@ -53 +53 @@
             email: '',
             password: '',
-            phoneNumber: ''
+            phone_number: ''
         },
         methods: {
             signupUser() {
-                // Create user data object
                 const userData = {
                     name: this.name,
@@ -63 +62 @@
                     email: this.email,
                     password: this.password,
-                    phoneNumber: this.phoneNumber
+                    phone_number: this.phone_number
                 };
 
-                // Send POST request to the backend
                 axios.post('http://localhost:8080/api/user/signup', userData)
                     .then(response => {

src/main/resources/static/WishlistPage.html

@@ -81 +81 @@
             },
             showReviews(flight) {
-                window.location.href = `/review?flightId=${flight.id}`;
+                window.location.href = `/reviews?flightId=${flight.flightid}`;
             },
             logout() {