From c6ac3b5bf2a633ed5c97803166e3249c445b8e56 Mon Sep 17 00:00:00 2001
From: creme332 <65414576+creme332@users.noreply.github.com>
Date: Thu, 16 May 2024 17:21:28 +0400
Subject: [PATCH] improve form for review submission, show product calories

---
 public/styles/views/Product.css | 15 ++++++++-
 src/views/Product.php           | 58 ++++++++++++++++++++-------------
 2 files changed, 50 insertions(+), 23 deletions(-)

diff --git a/public/styles/views/Product.css b/public/styles/views/Product.css
index 772c5721..664ce091 100644
--- a/public/styles/views/Product.css
+++ b/public/styles/views/Product.css
@@ -23,7 +23,7 @@ ul > li {
   font-size: 15px;
 }
 
-.fill-star{
+.fill-star {
   fill: orange;
 }
 
@@ -33,4 +33,17 @@ article > button {
 
 li > ul {
   padding-left: 5%; /* nesting indentation */
+}
+
+.review__rating input {
+  display: none;
+}
+
+.review__rating input:checked ~ label {
+  color: #aaa;
+}
+
+.review__rating label {
+  color: orange;
+  font-size: 2rem;
 }
\ No newline at end of file
diff --git a/src/views/Product.php b/src/views/Product.php
index 40e83889..89873ac4 100644
--- a/src/views/Product.php
+++ b/src/views/Product.php
@@ -190,7 +190,6 @@ function printComment(StdClass $comment): void
 }
 
 ?>
-
 <dialog id="my-modal">
     <article>
         <a href="#"
@@ -278,7 +277,7 @@ class="close"
                         FILTER_SANITIZE_NUMBER_FLOAT,
                         FILTER_FLAG_ALLOW_FRACTION
                     ) ?></h4>
-                <p>360 calories</p>
+                <p><?= $product->getCalories() ?> calories</p>
             </hgroup>
             <p>
                 <?= htmlspecialchars($product->getDescription()) ?>
@@ -321,33 +320,48 @@ class="close"
         </div>
     </div>
 
-    <h2>Customer Reviews (<?= count($product->getReviews()) ?>)</h2>
-    <form class="grid" method="post">
+    <hgroup>
+        <h3>Rate this product</h3>
+        <p>Tell others what you think</p>
+    </hgroup>
+    <form method="post">
+        <div class="review__rating">
+            <!-- Reference: Alice Campkin: https://codepen.io/alcampk/pen/rNezxXE-->
+            <input type=radio value='0' id='star-0' name='review_rating'/>
+
+            <label for='star-1'>★</label>
+            <input type=radio checked value='1' id='star-1' name='review_rating'/>
+
+            <label for='star-2'>★</label>
+            <input type=radio value='2' id='star-2' name='review_rating'/>
+
+            <label for='star-3'>★</label>
+            <input type=radio value='3' id='star-3' name='review_rating'/>
+
+            <label for='star-4'>★</label>
+            <input type=radio value='4' id='star-4' name='review_rating'/>
+
+            <label for='star-5'>★</label>
+            <input type=radio value='5' id='star-5' name='review_rating'/>
+        </div>
         <label>
-            <input value="<?= htmlspecialchars($default_review) ?>"
-                   required placeholder="Write a new review"
-                   name="review_text" type="text"
+            <textarea id="review-input" name="review_text" id="" cols="30" rows="3"
+                      required
+                      placeholder="Describe your experience"
                 <?php
-                if (isset($_POST['review_text'])) {
+                if (!empty($default_review)) {
                     echo empty($errors['text']) ? 'aria-invalid=false' : 'aria-invalid=true';
-                } ?>
-            >
-        </label>
-        <label>
-            <input value="<?= filter_var($default_rating, FILTER_SANITIZE_NUMBER_INT) ?>"
-                   name=" review_rating" required
-                   type="number" min="1" max="5"
-                   placeholder="Rating"
-                <?php
-                if (isset($_POST['review_rating'])) {
-                    echo empty($errors['rating']) ? 'aria-invalid=false' : 'aria-invalid=true';
-                } ?>
-            >
+                } ?>><?= htmlspecialchars(trim($default_review)) ?></textarea>
+
+
+            <small><?= $errors['text'] ?? "" ?></small>
         </label>
-        <button type="submit" <?= $signed_in_user ? "" : "disabled" ?>>Submit
+        <button style="width: 20%" class="secondary" type="submit" <?= $signed_in_user ? "" : "disabled" ?>>Post
         </button>
     </form>
 
+    <h2>Customer Reviews (<?= count($product->getReviews()) ?>)</h2>
+
     <div style="display: flex; align-items: center; gap:3em;">
         <hgroup>
             <h6>Average Rating</h6>