- +
-

Flight Search

+

Search flights

+
@@ -37,29 +232,28 @@ - - +
+ +
- - +
- +
- +
- - +
+
- - -
+
+
+

Available Flights

- {{flight.departureTime}} | {{flight.arrivalTime}} | ${{ flight.price }} | {{flight.availableSeats}} - - + {{ flight.departureTime }} | {{ flight.arrivalTime }} | ${{ flight.price }} | {{ flight.availableSeats }} + {{ flight.wishlisted ? '❤️' : '🤍' }} @@ -68,13 +262,10 @@
- - -
-
@@ -93,4 +284,5 @@ el: '#app', data: { + isContainerVisible:false, departureCity: '', destination: '', @@ -112,18 +304,7 @@ methods: { async searchFlights() { - console.log("button clicked"); - + this.isContainerVisible = !this.isContainerVisible; if (this.departureCity && this.destination && this.departureDate) { - console.log("Search parameters are valid."); - try { - // Log the params being sent - console.log("Params being sent:", { - departureCity: this.departureCity, - destination: this.destination, - departureDate: this.departureDate, - returnDate: this.showReturnDate ? this.returnDate : null - }); - const response = await axios.get('/api/flights/flight-search', { params: { @@ -135,24 +316,18 @@ }); - console.log("Response received:", response.data); - - // Handle no results if (response.data && response.data.length > 0) { this.flights = response.data; - console.log("Flights found:", this.flights); } else { this.flights = []; alert("No flights found for the given criteria."); } - } catch (error) { console.error("Error fetching flights", error); } } else { - alert("Please select departure city, destination, and date"); + alert("Please select departure city, destination, and date."); this.flights = []; } - } -, + }, bookFlights() { if (!this.selectedFlights.length) { @@ -160,22 +335,19 @@ return; } + const flight = this.selectedFlights[0]; - console.log(this.selectedFlights[0]); const totalCost = flight.price; - const bookingDate = new Date().toISOString().split('T')[0]; - - const bookingData = { - flightId: flight.flightID, - bookingDate: bookingDate, + flightId: flight.flightId, + bookingDate: new Date().toISOString().split('T')[0], status: 'PENDING', totalCost: totalCost }; - console.log("Booking Data",bookingData); + axios.post('/api/bookings', bookingData) .then(response => { 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)}`; }) .catch(error => { @@ -184,23 +356,21 @@ }); }, - logout() { - window.location.href = '/login'; + home() { + window.location.href = '/'; }, async toggleWishlist(flight) { flight.wishlisted = !flight.wishlisted; - const wishlistData = { - targetId: flight.flightID, + targetId: flight.flightId, wishlisted: flight.wishlisted }; try { - const response = await axios.post('/api/wishlists', wishlistData); - console.log("Wishlist updated"); + await axios.post('/api/wishlists', wishlistData); } catch (error) { - console.error("Error updating wishlist:", error.response ? error.response.data : error.message); + console.error("Error updating wishlist:", error); } }, goToWishlistPage() { - window.location.href = '/wishlist'; + window.location.href = '/api/wishlists'; }, showReportPopup() { @@ -211,9 +381,8 @@ }, submitIssue() { - const flight = this.selectedFlights[0]; if (this.issueDescription.trim()) { const reviewData = { userID: 1, - subject: this.subject, + subject: "Issue Report", description: this.issueDescription }; @@ -225,5 +394,5 @@ }) .catch(error => { - console.error("Error submitting issue:", error.response ? error.response.data : error.message); + console.error("Error submitting issue:", error); alert("There was an error submitting your issue. Please try again."); }); @@ -232,32 +401,7 @@ } }, - leaveReview() { - const flight = this.selectedFlights[0]; - if (this.issueDescription.trim()) { - const reviewData = { - userID: 1, - targetID: flight.flightId, - reviewComment: this.issueDescription, - rating: 5, - date: new Date().toISOString().split('T')[0] - }; - - axios.post('/api/support-tickets', reviewData) - .then(response => { - alert("Issue reported successfully!"); - this.closePopup(); - }) - .catch(error => { - console.error("Error submitting issue:", error.response ? error.response.data : error.message); - alert("There was an error submitting your issue. Please try again."); - }); - } else { - alert("Please enter a description for the issue."); - } - }, async fetchFlights() { try { const response = await axios.get('/api/destinations'); - this.cities = response.data.map(departureCity => departureCity.name); this.places = response.data.map(destination => destination.name); @@ -276,12 +420,4 @@ console.error("Error fetching flights", error); }); - axios.get('api/bookings/getAll/${flight.flightId}') - .then(response => { - console.log(response.data); - this.bookings = response.data; - }) - .catch(error => { - console.error("Error fetching flights", error); - }) } }); Index: src/main/resources/static/TransactionPage.html =================================================================== --- src/main/resources/static/TransactionPage.html (revision a70b5a40a9534d47aad3a99f7470481b67596179) +++ src/main/resources/static/TransactionPage.html (revision 986830465c15053d3a25484f02e6e5ef26ceae2e) @@ -8,42 +8,247 @@ + -
-
-

Complete Your Payment

- -
-
- - +
+
+
+
+
+ +
+
+ +
+
+ Expiry date:10/16 + Name:Kumar +
+
+
+
+
+
+ +
+
+ +
+
+ Expiry date:10/16 + Name:Kumar +
+
+
+
+
+
+ +
+
+ +
+
+ Expiry date:10/16 + Name:Kumar +
+
+
+
+
+

Payment Methods

+
+
- -
- - -
- -
- - -
- -
- - -
- - -
- ✅ Payment successful! Redirecting... +
+
+ + +
+ +
+ + +
+ +
+ + +
+ +
+ + +
+
-
-
Index: src/main/resources/static/UserLogin.html =================================================================== --- src/main/resources/static/UserLogin.html (revision a70b5a40a9534d47aad3a99f7470481b67596179) +++ src/main/resources/static/UserLogin.html (revision 986830465c15053d3a25484f02e6e5ef26ceae2e) @@ -35,10 +35,36 @@ data: { email: '', - password: '' + password: '', + userId:'' }, methods: { - loginUser() { + async loginUser() { if (this.email && this.password) { - window.location.href = '/flights'; + try{ + const response = await fetch('/api/user/login', { + method:'POST', + headers: { + 'Content-Type':'application/json' + }, + body: JSON.stringify({ + email:this.email, + password:this.password + }) + }); + if(!response.ok){ + throw new Error('Login failed'); + } + const data = await response.json(); + console.log(data); + if(data.userId){ + console.log('Success'); + window.location.href = `/flights?userId=${encodeURIComponent(data.userId)}`; + }else { + alert('Invalid login credentials'); + } + } catch (error){ + console.error(error); + alert('Login failed. Please try again.'); + } } } Index: src/main/resources/static/Wishlist.html =================================================================== --- src/main/resources/static/Wishlist.html (revision 986830465c15053d3a25484f02e6e5ef26ceae2e) +++ src/main/resources/static/Wishlist.html (revision 986830465c15053d3a25484f02e6e5ef26ceae2e) @@ -0,0 +1,96 @@ + + + + + + SkyChase-mk + + + +
+ Home Icon +

SkyChase

+ +
+ +
+

Test

+
+ + Index: src/main/resources/static/css/main.css =================================================================== --- src/main/resources/static/css/main.css (revision a70b5a40a9534d47aad3a99f7470481b67596179) +++ src/main/resources/static/css/main.css (revision 986830465c15053d3a25484f02e6e5ef26ceae2e) @@ -1,4 +1,4 @@ .signup-container { - background-image: url('../../images/registration.jpg'); + background-image: url('../images/registration.jpg'); background-size: cover; background-position: center; Index: src/main/resources/static/index.html =================================================================== --- src/main/resources/static/index.html (revision a70b5a40a9534d47aad3a99f7470481b67596179) +++ src/main/resources/static/index.html (revision 986830465c15053d3a25484f02e6e5ef26ceae2e) @@ -4,63 +4,94 @@ - Support Tickets - - + SkyChase-mk + - -
-

Support Tickets

-
- -
-
-
-

Subject: {{ ticket.subject }}

-

Date: {{ ticket.date }}

-
-
- -
-
-
- - -
-

Ticket Details

-

Subject: {{ selectedTicket.subject }}

-

Description: {{ selectedTicket.description }}

-

Date: {{ selectedTicket.date }}

- -
-
+
+ Home Icon +

SkyChase

+
- - +
+ + +