Merge pull request #74 from CSCE331-Fall2024/ehh/navbar-fix

Ehh/navbar fix

backend/app/kiosk/routes.py

@@ -5,6 +5,7 @@
 
 from app.models import Order, OrderMenuItem, OrderMenuItemProduct, MenuItem, ProductItem, Customer, Employee
 from datetime import datetime
+import pytz
 
 @kiosk_bp.route('/', methods=['GET'])
 def customer_kiosk_home():
@@ -398,8 +399,9 @@ def create_order():
 
     try:
         with db.session.begin_nested():
+            formatTime = datetime.now(pytz.timezone('America/Chicago')).strftime('%Y-%m-%d %H:%M:%S')
             order = Order(
-                order_date_time=datetime.now(),
+                order_date_time=formatTime,
                 total_price=total_price,
                 employee_id=None,
                 is_ready=False

backend/requirements.txt

@@ -16,4 +16,5 @@ google-auth==2.36.0
 google-auth-httplib2==0.2.0
 google-auth-oauthlib==1.2.1
 gunicorn==23.0.0
-python-dotenv==1.0.1
+python-dotenv==1.0.1
+pytz==2024.2

frontend/src/styles/navbar.css

@@ -1,5 +1,46 @@
 /* navbar.css */
 
+.navbar-drop, .navbar-drop-signedin {
+    position: absolute; /* Position relative to parent */
+    top: 100%;        /* Place below the button */
+    right: 0;         /* Align to the right edge */
+    background-color: white; 
+    border: 1px solid #ccc; 
+    padding: 10px;
+    z-index: 10;     /* Ensure it appears above other elements */
+  }
+
+  .navbar-drop-option, .navbar-drop-logout {
+    padding: 5px 10px;
+    cursor: pointer; /* Indicate it's clickable */
+    color: #a3080c; /* Set the logout text color to your navbar color */
+    font-weight: bold; /* Optionally make it bold */
+  }
+
+  .navbar-drop-option:hover, .navbar-drop-logout:hover {
+    background-color: #f0f0f0; /* Add a hover effect */
+  }
+
+  /* Styles for the icons in the dropdown */
+  .nav-drop-icon {
+    margin-right: 5px; 
+  }
+
+  .nav-signin-text-container {
+    background-color: #a3080c; /* Match navbar background */
+    padding: 10px; 
+    color: white;
+  }
+
+  .nav-signin-text {
+    margin: 0; /* Remove default margin */
+    font-size: 14px; 
+  }
+
+  .nav-signin-name {
+    cursor: pointer; /* Indicate it's clickable for the dropdown */
+  }
+
 /* Hide navbar on very small screens */
 @media (max-width: 249px) {
     .navbar {