Changeset 3a74959

Timestamp:

03/26/25 00:25:45 (2 months ago)

Author:

ste08 <sjovanoska@…>

Branches:

master

Children:

ff72ad2

Parents:

8a947b9

Message:

Review page added

Location:

src/main

Files:

• java/com/example/skychasemk/controller/ReviewController.java (modified) (2 diffs)
• java/com/example/skychasemk/model/Review.java (modified) (1 diff)
• java/com/example/skychasemk/repository/ReviewRepository.java (modified) (2 diffs)
• resources/static/FlightSearch.html (modified) (3 diffs)
• resources/static/ReviewPage.html (modified) (4 diffs)

src/main/java/com/example/skychasemk/controller/ReviewController.java

@@ -2 +2 @@
 
 import com.example.skychasemk.dto.ReviewDTO;
+import com.example.skychasemk.model.Notification;
 import com.example.skychasemk.model.Review;
 import com.example.skychasemk.repository.ReviewRepository;
@@ -27 +28 @@
     }
 
-
-    @GetMapping("/{flightId}")
-    public List<Review> getReviewsByFlightId(@PathVariable("flightId") Integer flightId) {
-        return reviewRepository.findReviews(flightId);
-    }
-
-    // Get review by ID
-    @GetMapping("/{id}")
-    public Optional<Review> getReviewById(@PathVariable("id") Integer reviewID) {
-        return reviewService.getReviewById(reviewID);
+    @GetMapping("/{userId}")
+    public ResponseEntity<List<Review>> getReviewsByFlightId(@PathVariable Integer userId) {
+        List<Review> reviews = reviewRepository.findByUserId(userId);
+        return ResponseEntity.ok(reviews);
     }
 

src/main/java/com/example/skychasemk/model/Review.java

@@ -5 +5 @@
 
 @Entity
-@Table(name="Review")
+@Table(name="review")
 public class Review {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "reviewId")
+    @Column(name = "reviewid")
 
     private Integer reviewID;
-    @Column(name = "userId")
+    @Column(name = "userid")
 
     private Integer userID;
-    @Column(name = "targetId")
+    @Column(name = "targetid")
 
     private Integer targetID;

src/main/java/com/example/skychasemk/repository/ReviewRepository.java

@@ -1 +1 @@
 package com.example.skychasemk.repository;
 
+import com.example.skychasemk.model.Notification;
 import com.example.skychasemk.model.Review;
 import org.springframework.data.jpa.repository.JpaRepository;
@@ -11 +12 @@
     @Query("SELECT r from Review r where r.targetID = :flightId")
     List<Review> findReviews(@Param("flightId") Integer flightId);
+
+    @Query("SELECT r FROM Review r WHERE r.userID = :userId")
+    List<Review> findByUserId(@Param("userId") Integer userId);
 }
 

src/main/resources/static/FlightSearch.html

@@ -277 +277 @@
         <button @click="goToWishlistPage">🤍</button>
         <button @click="goToReports">Monthly Report</button>
+        <button @click="goToReviews">Reviews</button>
         <button @click="home">Log Out</button>
 
@@ -375 +376 @@
             places: [],
             bookings: [],
+            pastBookings: [],
             showReturnDate: false,
             showPopup: false,
@@ -528 +530 @@
                     console.error("Error fetching Destinations", error);
                 }
+            },
+            goToReviews(){
+                window.location.href = `/reviews?userId=${encodeURIComponent(this.userId)}`;
             }
         },

src/main/resources/static/ReviewPage.html

@@ -7 +7 @@
     <link rel="stylesheet" href="/css/main.css">
     <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>
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/normalize/5.0.0/normalize.min.css">
+    <link rel='stylesheet' href='https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.12.0-2/css/all.min.css'>
+    <link href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.4/css/all.min.css" rel="stylesheet">
 </head>
+<style>
+    .popup-overlay {
+        position: fixed;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 100%;
+        background: rgba(0, 0, 0, 0.7);
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        z-index: 1000;
+        overflow:hidden;
+    }
+
+    .popup textarea{
+        width: 100%;
+        padding: 10px;
+        margin-top: 10px;
+        border: 1px solid #ccc;
+        border-radius: 4px;
+        resize: vertical;
+        box-sizing: border-box;
+    }
+
+    .popup {
+        background-color: white;
+        padding: 20px;
+        width: 300px;
+        border-radius: 10px;
+    }
+
+    .popup button {
+        margin-top: 10px;
+        background-color: rebeccapurple;
+        color: white;
+        border: none;
+        padding: 5px;
+        cursor: pointer;
+    }
+
+    .popup button:hover {
+        background-color: mediumpurple;
+    }
+
+    .popup select {
+        width: 100%;
+        padding: 8px;
+        margin: 10px 0;
+        border-radius: 4px;
+        border: 1px solid #ccc;
+    }
+
+    .popup select:focus {
+        outline: none;
+        border-color: #007bff;
+    }
+
+</style>
 <body>
 
@@ -13 +76 @@
     <header class="app-header">
         <button class="logout-btn" @click="logout">Log Out</button>
+        <button class="logout-btn" @click="leaveReview">Leave a review</button>
     </header>
 
@@ -20 +84 @@
 
             <div class="review-list">
-                <div v-for="review in reviews" :key="review.id" class="review-item">
-                    <h3>{{ review.subject }}</h3>
-                    <p>{{ review.description }}</p>
-                    <span>{{ review.date }}</span>
+                <div v-for="review in reviews" :key="review.reviewid" class="review-item">
+                    <h3>{{ review.date }}</h3>
+                    <p>{{ review.reviewComment }}</p>
+                    <span>{{ review.rating }}</span>
                 </div>
             </div>
+        </div>
+    </div>
+</div>
+
+<div v-if="showPopup" class="popup-overlay">
+    <div class="popup">
+        <h3>Leave a review</h3>
+
+        <select v-model="selectedFlightNumber" id="flights">
+            <option value="" disabled selected>Select a flight</option>
+            <option v-for="flight in flights" :key="flight.flightNumber" :value="flight.flightNumber">
+                {{ flight.flightNumber }}
+            </option>
+        </select>
+
+        <textarea v-model="reviewComment" placeholder="Leave a comment here..." rows="5"></textarea>
+
+        <textarea v-model="rating" placeholder="Rate 1-5" rows="1"></textarea>
+
+        <div class="popup-actions">
+            <button @click="submitReview" class="submit-btn">Submit</button>
+            <button @click="closePopup" class="cancel-btn">Cancel</button>
         </div>
     </div>
@@ -34 +120 @@
         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',
-                },
-            ]
+            userId: '',
+            reviews: [],
+            showPopup: false,
+            reviewComment: '',
+            rating: '',
+            flights: [],
+            selectedFlightNumber: ''
         },
         methods: {
             logout() {
                 window.location.href = '/';
+            },
+            async fetchReviews() {
+                try {
+                    const response = await axios.get("api/reviews");
+                    this.reviews = response.data;
+                } catch (error) {
+                    console.error(error);
+                }
+            },
+            leaveReview() {
+                this.showPopup = true;
+            },
+            closePopup() {
+                this.showPopup = false;
+            },
+            submitReview() {
+                if (this.reviewComment.trim() && this.selectedFlightNumber) {
+                    const reviewData = {
+                        userId: this.userId,
+                        flightNumber: this.selectedFlightNumber,
+                        reviewComment: this.reviewComment,
+                        rating: this.rating
+                    };
+
+                    axios.post('/api/reviews', reviewData)
+                        .then(response => {
+                            alert("Review added successfully!");
+                            this.closePopup();
+                        })
+                        .catch(error => {
+                            console.error("Error submitting review:", error);
+                            alert("There was an error submitting your review. Please try again.");
+                        });
+                }
+            },
+            async fetchFlights() {
+                try {
+                    const response = await axios.get('/api/flights');
+                    this.flights = response.data;
+                    console.log(this.flights);
+                } catch (error) {
+                    console.error('Error fetching flights:', error);
+                }
             }
         },
         mounted() {
-            axios.get('api/reviews')
-                .then(response => {
-                    this.review = response.data;
-                })
-                .catch(error => {
-                    console.error("Error fetching reviews", error);
-                });
+            const params = new URLSearchParams(window.location.search);
+            this.userId = params.get("userId");
+            this.fetchReviews();
+            this.fetchFlights();
         }
     });