Merge pull request #1 from JimacoMS4/mess-with-modal-windows

Some cleanup, make form fields required in templates

src/fastapi_app/models.py

@@ -4,7 +4,7 @@
 import typing
 
 from datetime import datetime
-from sqlmodel import Field, Relationship, SQLModel, create_engine
+from sqlmodel import Field, SQLModel, create_engine
 
 POSTGRES_USERNAME = os.environ.get("POSTGRES_USERNAME")
 POSTGRES_PASSWORD = os.environ.get("POSTGRES_PASSWORD")

src/fastapi_app/seed_data.py

@@ -1,8 +1,4 @@
-import json
-import logging
-import pathlib
-
-from sqlmodel import Session, SQLModel, select
+from sqlmodel import SQLModel
 
 from fastapi_app import models
 

src/templates/create_restaurant.html

@@ -15,18 +15,25 @@ <h1>Add New Restaurant</h1>
     <form method="POST" action="{{ url_for('add_restaurant') }}">
         <div class="mb-3">
           <label for="restaurant_name" class="form-label">Name</label>
-          <input type="text" class="form-control" id="restaurant_name" name="restaurant_name">
+          <input type="text" class="form-control" id="restaurant_name" name="restaurant_name", required>
         </div>
         <div class="mb-3">
           <label for="street_address" class="form-label">Street Address</label>
-          <input type="text" class="form-control" id="street_address" name="street_address">
+          <input type="text" class="form-control" id="street_address" name="street_address", required>
         </div>
         <div class="mb-3">
             <label for="description" class="form-label">Description</label>
-            <input type="text" class="form-control" id="description" name="description">
+            <input type="text" class="form-control" id="description" name="description", required>
         </div>
         <button type="submit" class="btn btn-primary">Submit</button>
-        <button type="cancel" class="btn btn-primary">Cancel</button>
+        <button type="button" id="cancelButton" class="btn btn-primary">Cancel</button>
     </form>
+
+    <script>
+      document.getElementById('cancelButton').addEventListener('click', function() {
+          window.location.href = "{{ url_for('index') }}";
+      });
+  </script>
+
 {% endblock %}
 

src/templates/details.html

@@ -21,7 +21,7 @@ <h1>{{ restaurant.name }}</h1>
   </div>
   <div class="row">
       <div class="col-md-2 fw-bold">Rating:</div>
-      <div class="col">{{ restaurant.avg_rating|float }} ({{ restaurant.review_count }} {% if restaurant.review_count == 1 %} review{% else %} reviews{% endif %})</div>                
+      <div class="col">{% if restaurant.review_count %} {{ restaurant.avg_rating|round(3) }} ({{ restaurant.review_count }} {% if restaurant.review_count == 1 %} review{% else %} reviews{% endif %}) {% else %} No ratings yet {% endif %}</div>                
   </div>
 
   <h4 class="mt-5">Reviews</h4>
@@ -72,35 +72,35 @@ <h5 class="modal-title" id="addReviewModalLabel">Add Review</h5>
 
                 <div class="mb-3">                        
                     <label for="user_name" class="form-label fw-bold">Your name</label>
-                    <input type="text" class="form-control" id="user_name" name="user_name">
+                    <input type="text" class="form-control" id="user_name" name="user_name" required>
                   </div>
                   <div class="mb-3">
                     <label class="form-label fw-bold">Rating</label>
 
                     <div class="form-check form-check-inline">
-                        <input class="form-check-input" type="radio" name="rating" id="rating1" value="1">
+                        <input class="form-check-input" type="radio" name="rating" id="rating1" value="1" required>
                         <label class="form-check-label" for="rating1">1</label>
                       </div>
                       <div class="form-check form-check-inline">
-                        <input class="form-check-input" type="radio" name="rating" id="rating2" value="2">
+                        <input class="form-check-input" type="radio" name="rating" id="rating2" value="2" required>
                         <label class="form-check-label" for="rating2">2</label>
                       </div>
                       <div class="form-check form-check-inline">
-                        <input class="form-check-input" type="radio" name="rating" id="rating3" value="3">
+                        <input class="form-check-input" type="radio" name="rating" id="rating3" value="3" required>
                         <label class="form-check-label" for="rating3">3</label>
                       </div>
                       <div class="form-check form-check-inline">
-                        <input class="form-check-input" type="radio" name="rating" id="rating4" value="4">
+                        <input class="form-check-input" type="radio" name="rating" id="rating4" value="4" required>
                         <label class="form-check-label" for="rating3">4</label>
                       </div>
                       <div class="form-check form-check-inline">
-                        <input class="form-check-input" type="radio" name="rating" id="rating5" value="5">
+                        <input class="form-check-input" type="radio" name="rating" id="rating5" value="5" required>
                         <label class="form-check-label" for="rating3">5</label>
                       </div>
                   </div>
                   <div class="mb-3">
                       <label for="review_text" class="form-label fw-bold">Comments</label>
-                      <input type="text" class="form-control" id="review_text" name="review_text">
+                      <input type="text" class="form-control" id="review_text" name="review_text" required>
                   </div>
               </div>
               <div class="modal-footer">